diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3bd2387..5ba7088 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,21 +6,25 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: microsoft - java-version: 21 + java-version: 25 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v6 + with: + build-scan-publish: true + build-scan-terms-of-use-url: 'https://gradle.com/terms-of-service' + build-scan-terms-of-use-agree: 'yes' - name: Build run: './gradlew build' - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: Island Menu Jar path: build/libs/*.jar \ No newline at end of file diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml index 7cb3ad3..a4f62d2 100644 --- a/.github/workflows/buildRelease.yml +++ b/.github/workflows/buildRelease.yml @@ -11,16 +11,20 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: microsoft - java-version: 21 + java-version: 25 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v6 + with: + build-scan-publish: true + build-scan-terms-of-use-url: 'https://gradle.com/terms-of-service' + build-scan-terms-of-use-agree: 'yes' - name: Build with Gradle run: './gradlew build' diff --git a/README.md b/README.md index 77e1305..33c1b59 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Island-Menu -Modifies the main menu to be themed around [MCC Island](https://mccisland.net/). Requires [Mod Menu](https://modrinth.com/mod/modmenu), [Cloth Config](https://modrinth.com/mod/cloth-config), and [ServerMainMenu Lib](https://github.com/MoSadie/ServerMainMenu-Lib) +Modifies the main menu to be themed around [MCC Island](https://mccisland.net/). Requires [Mod Menu](https://modrinth.com/mod/modmenu), [Cloth Config](https://modrinth.com/mod/cloth-config), and [SimpleMainMenu Lib](https://github.com/MoSadie/SimpleMainMenu-Lib) ## Features: diff --git a/build.gradle b/build.gradle index 92a8936..1ba33bd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ plugins { - id 'fabric-loom' version '1.9-SNAPSHOT' + id 'net.fabricmc.fabric-loom' version "${loom_version}" } version = project.mod_version group = project.maven_group base { - archivesName = project.archivesBaseName + archivesName = project.archive_base_name } loom { @@ -61,19 +61,18 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + implementation "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" - modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { + api("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") } - modApi("com.terraformersmc:modmenu:${project.mod_menu_version}") + api("com.terraformersmc:modmenu:${project.mod_menu_version}") - //modApi("com.mosadie:ServerMainMenu-Lib:${project.smm_lib_version}") - modApi("maven.modrinth:smm-lib:${project.smm_lib_version}") + //api("com.mosadie:SimpleMainMenu-Lib:${project.smm_lib_version}") + api("maven.modrinth:smm-lib:${project.smm_lib_version}") } processResources { @@ -85,7 +84,7 @@ processResources { } } -def targetJavaVersion = JavaVersion.VERSION_17 +def targetJavaVersion = JavaVersion.VERSION_25 java { @@ -102,6 +101,6 @@ java { jar { from("LICENSE") { - rename { "${it}_${project.archivesBaseName}" } + rename { "${it}_${project.archive_base_name}" } } } diff --git a/gradle.properties b/gradle.properties index 739922d..bedb92f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,19 +2,19 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.4 -yarn_mappings=1.21.4+build.2 -loader_version=0.16.9 +minecraft_version=26.1 +loader_version=0.18.5 +loom_version=1.15-SNAPSHOT -#Fabric api -fabric_version=0.112.0+1.21.4 +# Fabric API +fabric_api_version=0.144.3+26.1 # Mod Properties mod_version=1.4.4 maven_group=com.mosadie -archives_base_name=island-menu +archive_base_name=island-menu # Dependency Versions -smm_lib_version=2.0.4 -cloth_config_version=17.0.144 -mod_menu_version=13.0.0-beta.1 \ No newline at end of file +smm_lib_version=3.0.0 +cloth_config_version=26.1.154 +mod_menu_version=18.0.0-alpha.8 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94113f2..c61a118 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/src/main/java/com/mosadie/islandmenu/client/IslandMenuClient.java b/src/main/java/com/mosadie/islandmenu/client/IslandMenuClient.java index 51d77d7..ea53f44 100644 --- a/src/main/java/com/mosadie/islandmenu/client/IslandMenuClient.java +++ b/src/main/java/com/mosadie/islandmenu/client/IslandMenuClient.java @@ -7,17 +7,17 @@ import com.mosadie.islandmenu.mccapi.MCCApi; import com.mosadie.islandmenu.mccapi.ParticipantsInfo; import com.mosadie.islandmenu.mccapi.Teams; -import com.mosadie.servermainmenu.client.ServerMainMenuLibClient; +import com.mosadie.simplemainmenu.api.SplashText; +import com.mosadie.simplemainmenu.client.SimpleMainMenuLibClient; import me.shedaniel.autoconfig.AutoConfig; import me.shedaniel.autoconfig.ConfigHolder; import me.shedaniel.autoconfig.serializer.GsonConfigSerializer; import net.fabricmc.api.ClientModInitializer; -import net.minecraft.client.MinecraftClient; -import net.minecraft.registry.Registry; -import net.minecraft.text.Text; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.random.Random; +import net.minecraft.client.Minecraft; +import net.minecraft.core.Registry; +import net.minecraft.resources.Identifier; +import net.minecraft.util.RandomSource; +import net.minecraft.world.InteractionResult; import org.apache.commons.lang3.RandomUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,8 +62,9 @@ public class IslandMenuClient implements ClientModInitializer { "Support the %s!" }; - public static String getSplashText() { - String splash = splashOptions[Random.create().nextBetweenExclusive(0, splashOptions.length)]; + public static SplashText getSplashText() { + String splash = splashOptions[RandomSource.create().nextInt(0, splashOptions.length)]; + SplashText.Builder splashTextBuilder = SplashText.builder(); switch(splash) { case MCC_DATE_SPLASH: @@ -71,14 +72,15 @@ public static String getSplashText() { EventInfo eventInfo = mccApi.getEventInfo(); if (eventInfo != null) { if (eventInfo.getData().getDate().after(new Date())) { - String dateString = new SimpleDateFormat("MMMM dd").format(eventInfo.getData().getDate()); - return String.format("Watch MCC %s on %s!", eventInfo.getData().getEvent(), dateString); + String dateString = new SimpleDateFormat("MMMM dd 'at' h:mm a z").format(eventInfo.getData().getDate()); + splashTextBuilder.addLine(String.format("Watch MCC %s on", eventInfo.getData().getEvent())); + splashTextBuilder.addLine(String.format("%s!", dateString)); } else { - return String.format("What did you think of MCC %s?", eventInfo.getData().getEvent()); + splashTextBuilder.addLine(String.format("What did you think of MCC %s?", eventInfo.getData().getEvent())); } } } - return splashOptions[0]; + return splashTextBuilder.build(); case MCC_PLAYER_SPLASH: if (mccApi != null) { @@ -87,7 +89,7 @@ public static String getSplashText() { if (participantsInfo != null) { ParticipantsInfo.ParticipantsData.Participant player = null; - ParticipantsInfo.ParticipantsData.Participant selfPlayer = participantsInfo.getPlayer(MinecraftClient.getInstance().getSession().getUuidOrNull()); + ParticipantsInfo.ParticipantsData.Participant selfPlayer = participantsInfo.getPlayer(Minecraft.getInstance().getGameProfile().id()); if (selfPlayer != null) { LOGGER.debug("MCC Player found! Picking them always for splash text."); player = selfPlayer; @@ -109,23 +111,30 @@ public static String getSplashText() { } } - if (player == null) - return splashOptions[0]; + if (player == null) { + splashTextBuilder.addLine(splashOptions[0]); + return splashTextBuilder.build(); + } + } + + if (player == null || player.getUsername() == null) { + splashTextBuilder.addLine(splashOptions[0]); + return splashTextBuilder.build(); } - if (player == null || player.getUsername() == null) - return splashOptions[0]; + splashTextBuilder.addLine(String.format("Check out %s", player.getUsername())); EventInfo eventInfo = mccApi.getEventInfo(); - String eventString = ""; if (eventInfo != null && eventInfo.getData().getDate().after(new Date())) { - eventString = " in MCC " + eventInfo.getData().getEvent(); + splashTextBuilder.addLine(String.format("in MCC %s!", eventInfo.getData().getEvent())); } - return String.format("Check out %s!", player.getUsername() + eventString); + + return splashTextBuilder.build(); } } - return splashOptions[0]; + splashTextBuilder.addLine(splashOptions[0]); + return splashTextBuilder.build(); case MCC_TEAM_SPLASH: Teams team = null; @@ -135,8 +144,8 @@ public static String getSplashText() { } // If player is in the next/most recent MCC, pick their team. - if ((team == null || team.equals(Teams.NONE)) && mccApi != null && mccApi.getParticipantsInfo() != null && MinecraftClient.getInstance().getSession().getUuidOrNull() != null) { - Teams selfTeam = mccApi.getParticipantsInfo().getPlayerTeam(MinecraftClient.getInstance().getSession().getUuidOrNull()); + if ((team == null || team.equals(Teams.NONE)) && mccApi != null && mccApi.getParticipantsInfo() != null && Minecraft.getInstance().getGameProfile().id() != null) { + Teams selfTeam = mccApi.getParticipantsInfo().getPlayerTeam(Minecraft.getInstance().getGameProfile().id()); if (!selfTeam.equals(Teams.NONE)) { LOGGER.debug("MCC Player team found!"); team = selfTeam; @@ -149,36 +158,25 @@ public static String getSplashText() { String teamString = teamSplashOptions[RandomUtils.nextInt(0, teamSplashOptions.length)]; - return String.format(teamString, team.getName()); + splashTextBuilder.addLine(String.format(teamString, team.getName())); + return splashTextBuilder.build(); default: - return splash; + return splashTextBuilder.addLine(splash).build(); } } private static IslandMenuConfig config; - public static Text getButtonText() { - return Text.translatable("island-menu.menu.join"); - } - - public static String getButtonServerName() { - return "MCC Island"; - } - - public static String getButtonServerAddress() { - return "play.mccisland.net"; - } - @Override public void onInitializeClient() { LOGGER.info("Initializing Island Menu..."); LOGGER.info("Registering Theme..."); - Registry.register(ServerMainMenuLibClient.registry, Identifier.of(IslandMenuClient.MOD_ID, "normal"), normalTheme); - Registry.register(ServerMainMenuLibClient.registry, Identifier.of(IslandMenuClient.MOD_ID, "halloween"), halloweenTheme); - Registry.register(ServerMainMenuLibClient.registry, Identifier.of(IslandMenuClient.MOD_ID, "winter"), winterTheme); + Registry.register(SimpleMainMenuLibClient.registry, Identifier.fromNamespaceAndPath(IslandMenuClient.MOD_ID, "normal"), normalTheme); + Registry.register(SimpleMainMenuLibClient.registry, Identifier.fromNamespaceAndPath(IslandMenuClient.MOD_ID, "halloween"), halloweenTheme); + Registry.register(SimpleMainMenuLibClient.registry, Identifier.fromNamespaceAndPath(IslandMenuClient.MOD_ID, "winter"), winterTheme); LOGGER.info("Configuring Config..."); @@ -200,7 +198,7 @@ public void onInitializeClient() { LOGGER.info("Island Menu Initialized!"); } - private static ActionResult onConfigSave(ConfigHolder islandMenuConfigConfigHolder, IslandMenuConfig islandMenuConfig) { + private static InteractionResult onConfigSave(ConfigHolder islandMenuConfigConfigHolder, IslandMenuConfig islandMenuConfig) { LOGGER.info("Updating config!"); // config = islandMenuConfig; @@ -208,6 +206,6 @@ private static ActionResult onConfigSave(ConfigHolder islandMe if (mccApi == null || !mccApi.getBaseUrl().equalsIgnoreCase(config.devOptions.apiUrl)) mccApi = new MCCApi(config.devOptions.apiUrl); - return ActionResult.PASS; + return InteractionResult.PASS; } } diff --git a/src/main/java/com/mosadie/islandmenu/client/IslandMenuConfig.java b/src/main/java/com/mosadie/islandmenu/client/IslandMenuConfig.java index 4cab6fe..480188f 100644 --- a/src/main/java/com/mosadie/islandmenu/client/IslandMenuConfig.java +++ b/src/main/java/com/mosadie/islandmenu/client/IslandMenuConfig.java @@ -1,6 +1,5 @@ package com.mosadie.islandmenu.client; -import com.mosadie.islandmenu.client.IslandMenuClient; import com.mosadie.islandmenu.mccapi.Teams; import me.shedaniel.autoconfig.ConfigData; import me.shedaniel.autoconfig.annotation.Config; diff --git a/src/main/java/com/mosadie/islandmenu/client/IslandMenuModMenuIntegration.java b/src/main/java/com/mosadie/islandmenu/client/IslandMenuModMenuIntegration.java index 3181d0d..ba5edd9 100644 --- a/src/main/java/com/mosadie/islandmenu/client/IslandMenuModMenuIntegration.java +++ b/src/main/java/com/mosadie/islandmenu/client/IslandMenuModMenuIntegration.java @@ -2,11 +2,11 @@ import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; -import me.shedaniel.autoconfig.AutoConfig; +import me.shedaniel.autoconfig.AutoConfigClient; public class IslandMenuModMenuIntegration implements ModMenuApi { @Override public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> AutoConfig.getConfigScreen(IslandMenuConfig.class, parent).get(); + return parent -> AutoConfigClient.getConfigScreen(IslandMenuConfig.class, parent).get(); } } diff --git a/src/main/java/com/mosadie/islandmenu/client/data/IslandMenuEnLangProvider.java b/src/main/java/com/mosadie/islandmenu/client/data/IslandMenuEnLangProvider.java index 0b07acf..2c662cf 100644 --- a/src/main/java/com/mosadie/islandmenu/client/data/IslandMenuEnLangProvider.java +++ b/src/main/java/com/mosadie/islandmenu/client/data/IslandMenuEnLangProvider.java @@ -1,19 +1,19 @@ package com.mosadie.islandmenu.client.data; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.core.HolderLookup; import java.util.concurrent.CompletableFuture; public class IslandMenuEnLangProvider extends FabricLanguageProvider { - protected IslandMenuEnLangProvider(FabricDataOutput dataOutput, CompletableFuture registryLookup) { - super(dataOutput, registryLookup); + protected IslandMenuEnLangProvider(FabricPackOutput packOutput, CompletableFuture registryLookup) { + super(packOutput, registryLookup); } @Override - public void generateTranslations(RegistryWrapper.WrapperLookup wrapperLookup, TranslationBuilder translationBuilder) { + public void generateTranslations(HolderLookup.Provider registryLookup, TranslationBuilder translationBuilder) { translationBuilder.add("island-menu.menu.join", "Join MCC Island!"); translationBuilder.add("text.autoconfig.island-menu.title", "Island Menu Settings"); @@ -23,6 +23,5 @@ public void generateTranslations(RegistryWrapper.WrapperLookup wrapperLookup, Tr translationBuilder.add("text.autoconfig.island-menu.option.devOptions", "Developer Settings"); translationBuilder.add("text.autoconfig.island-menu.option.devOptions.apiUrl", "MCC API Base URL"); - } } diff --git a/src/main/java/com/mosadie/islandmenu/client/data/IslandMenuHuLangProvider.java b/src/main/java/com/mosadie/islandmenu/client/data/IslandMenuHuLangProvider.java index 2d71956..aa1ae14 100644 --- a/src/main/java/com/mosadie/islandmenu/client/data/IslandMenuHuLangProvider.java +++ b/src/main/java/com/mosadie/islandmenu/client/data/IslandMenuHuLangProvider.java @@ -1,18 +1,18 @@ package com.mosadie.islandmenu.client.data; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.core.HolderLookup; import java.util.concurrent.CompletableFuture; public class IslandMenuHuLangProvider extends FabricLanguageProvider { - protected IslandMenuHuLangProvider(FabricDataOutput dataOutput, CompletableFuture registryLookup) { - super(dataOutput, "hu_hu", registryLookup); + protected IslandMenuHuLangProvider(FabricPackOutput packOutput, CompletableFuture registryLookup) { + super(packOutput, "hu_hu", registryLookup); } @Override - public void generateTranslations(RegistryWrapper.WrapperLookup wrapperLookup, TranslationBuilder translationBuilder) { + public void generateTranslations(HolderLookup.Provider registryLookup, TranslationBuilder translationBuilder) { translationBuilder.add("island-menu.menu.join", "Csatlakozz az MCC Islandre!"); translationBuilder.add("text.autoconfig.island-menu.title", "Island Menu Beállítások"); diff --git a/src/main/java/com/mosadie/islandmenu/client/theme/HalloweenTheme.java b/src/main/java/com/mosadie/islandmenu/client/theme/HalloweenTheme.java index 57c25fb..e17826b 100644 --- a/src/main/java/com/mosadie/islandmenu/client/theme/HalloweenTheme.java +++ b/src/main/java/com/mosadie/islandmenu/client/theme/HalloweenTheme.java @@ -1,6 +1,6 @@ package com.mosadie.islandmenu.client.theme; -import com.mosadie.servermainmenu.api.Util; +import com.mosadie.simplemainmenu.api.Util; public class HalloweenTheme extends NormalTheme { diff --git a/src/main/java/com/mosadie/islandmenu/client/theme/NormalTheme.java b/src/main/java/com/mosadie/islandmenu/client/theme/NormalTheme.java index 92c35d0..7b2a6ec 100644 --- a/src/main/java/com/mosadie/islandmenu/client/theme/NormalTheme.java +++ b/src/main/java/com/mosadie/islandmenu/client/theme/NormalTheme.java @@ -1,10 +1,11 @@ package com.mosadie.islandmenu.client.theme; import com.mosadie.islandmenu.client.IslandMenuClient; -import com.mosadie.servermainmenu.api.MenuTheme; -import com.mosadie.servermainmenu.api.Util; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; +import com.mosadie.simplemainmenu.api.MenuTheme; +import com.mosadie.simplemainmenu.api.SplashText; +import com.mosadie.simplemainmenu.api.Util; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.Identifier; public class NormalTheme implements MenuTheme { @Override @@ -14,17 +15,17 @@ public String getId() { @Override public Identifier getPanorama() { - return Identifier.of(IslandMenuClient.MOD_ID, "textures/gui/title/background/"+ getId() + "/panorama"); + return Identifier.fromNamespaceAndPath(IslandMenuClient.MOD_ID, "textures/gui/title/background/"+ getId() + "/panorama"); } @Override - public String getSplashText() { + public SplashText getSplashText() { return IslandMenuClient.getSplashText(); } @Override - public Text getQuickJoinButtonText() { - return Text.translatable("island-menu.menu.join"); + public Component getQuickJoinButtonComponent() { + return Component.translatable("island-menu.menu.join"); } @Override diff --git a/src/main/java/com/mosadie/islandmenu/client/theme/WinterTheme.java b/src/main/java/com/mosadie/islandmenu/client/theme/WinterTheme.java index 75db641..4ff3ef7 100644 --- a/src/main/java/com/mosadie/islandmenu/client/theme/WinterTheme.java +++ b/src/main/java/com/mosadie/islandmenu/client/theme/WinterTheme.java @@ -1,6 +1,6 @@ package com.mosadie.islandmenu.client.theme; -import com.mosadie.servermainmenu.api.Util; +import com.mosadie.simplemainmenu.api.Util; public class WinterTheme extends NormalTheme { @Override diff --git a/src/main/java/com/mosadie/islandmenu/mccapi/ParticipantsInfo.java b/src/main/java/com/mosadie/islandmenu/mccapi/ParticipantsInfo.java index 2101c4b..c2c9b8d 100644 --- a/src/main/java/com/mosadie/islandmenu/mccapi/ParticipantsInfo.java +++ b/src/main/java/com/mosadie/islandmenu/mccapi/ParticipantsInfo.java @@ -1,7 +1,5 @@ package com.mosadie.islandmenu.mccapi; -import com.mosadie.islandmenu.client.IslandMenuClient; - import java.util.UUID; public class ParticipantsInfo { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 47170cb..0f0d23c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -27,11 +27,11 @@ ] }, "depends": { - "fabricloader": ">=0.15.10", - "fabric-api": ">=0.91.1", - "minecraft": "~1.21", - "modmenu": ">=13.0.0-beta.1", - "cloth-config": ">=17.0.144", - "smm-lib": ">=2.0.4" + "fabricloader": ">=0.18.0", + "fabric-api": ">=0.144.3", + "minecraft": "~26.1", + "modmenu": ">=17.0.0", + "cloth-config": ">=26.0.0", + "smm-lib": ">=3.0.0" } }