diff --git a/build.gradle b/build.gradle index 60d4c00..8a6d853 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.4-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' } @@ -16,12 +16,13 @@ repositories { // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. // See https://docs.gradle.org/current/userguide/declaring_repositories.html // for more information about repositories. - - maven { + maven { name 'Xander Maven' url 'https://maven.isxander.dev/releases'} - maven { url "https://maven.terraformersmc.com/releases/" } -} + maven { + name = "Terraformers" + url = "https://maven.terraformersmc.com/releases"} + } loom { splitEnvironmentSourceSets() @@ -48,9 +49,9 @@ dependencies { // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" - modImplementation "dev.isxander.yacl:yet-another-config-lib-fabric:3.3.1+1.20.4" + modImplementation 'dev.isxander:yet-another-config-lib:3.5.0+1.21-fabric' // https://maven.isxander.dev/#/releases/dev/isxander/yacl/yet-another-config-lib-fabric - modImplementation "com.terraformersmc:modmenu:9.0.0" + modImplementation "com.terraformersmc:modmenu:11.0.0-beta.1" } processResources { diff --git a/gradle.properties b/gradle.properties index b4ab9a1..bd5ea66 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,20 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 -loader_version=0.15.3 +minecraft_version=1.21 +yarn_mappings=1.21+build.1 +loader_version=0.15.11 # Mod Properties -mod_version=0.1.4 +mod_version=0.2.0 maven_group=xyz.thewhitedog9487 archives_base_name=ServerAddressSpaceFix # Dependencies -fabric_version=0.93.1+1.20.4 - -loom_libraries_base=https://bmclapi2.bangbang93.com/maven/ -loom_resources_base=https://bmclapi2.bangbang93.com/assets/ -loom_version_manifests=https://bmclapi2.bangbang93.com/mc/game/version_manifest.json -loom_experimental_versions=https://maven.fabricmc.net/net/minecraft/experimental_versions.json -loom_fabric_repository=https://repository.hanbings.io/proxy/ \ No newline at end of file +fabric_version=0.100.1+1.21 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac72c34..a441313 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.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/client/java/xyz/thewhitedog9487/ModMenu.java b/src/client/java/xyz/thewhitedog9487/ModMenu.java index 7f1a34e..d9318f4 100644 --- a/src/client/java/xyz/thewhitedog9487/ModMenu.java +++ b/src/client/java/xyz/thewhitedog9487/ModMenu.java @@ -13,13 +13,13 @@ public class ModMenu implements ModMenuApi { @Override public ConfigScreenFactory getModConfigScreenFactory() { return parent -> YetAnotherConfigLib.createBuilder() - .title(Text.translatable("title.thewhitedog9487.twd-sasf.config")) + .title(Text.translatable("title.twd-sasf.config")) .category(ConfigCategory.createBuilder() - .name(Text.translatable("config.thewhitedog9487.twd-sasf.category.general")) + .name(Text.translatable("config.twd-sasf.category.general")) .option(Option.createBuilder() - .name(Text.translatable("option.thewhitedog9487.twd-sasf.ModEnabled")) + .name(Text.translatable("option.twd-sasf.ModEnabled")) .binding(true, () -> Settings.ModEnabled, newVal -> Settings.ModEnabled = newVal) - .description(OptionDescription.of(Text.translatable("option.thewhitedog9487.twd-sasf.ModEnabled.description"))) + .description(OptionDescription.of(Text.translatable("option.twd-sasf.ModEnabled.description"))) .controller(TickBoxControllerBuilder::create) .build()) .build()) diff --git a/src/client/java/xyz/thewhitedog9487/ServerAddressSpaceFixClient.java b/src/client/java/xyz/thewhitedog9487/ServerAddressSpaceFixClient.java index 5dcf2c0..b5c5ed9 100644 --- a/src/client/java/xyz/thewhitedog9487/ServerAddressSpaceFixClient.java +++ b/src/client/java/xyz/thewhitedog9487/ServerAddressSpaceFixClient.java @@ -9,6 +9,6 @@ public class ServerAddressSpaceFixClient implements ClientModInitializer { @Override public void onInitializeClient() { // This entrypoint is suitable for setting up client-specific logic, such as rendering. - LOGGER.info("ServerAddressSpaceFix正在初始化!"); + LOGGER.info("ServerAddressSpaceFix Loading!"); } } \ No newline at end of file diff --git a/src/main/resources/assets/twd-sasf/lang/en_us.json b/src/main/resources/assets/twd-sasf/lang/en_us.json index 4560e64..4b8d258 100644 --- a/src/main/resources/assets/twd-sasf/lang/en_us.json +++ b/src/main/resources/assets/twd-sasf/lang/en_us.json @@ -3,8 +3,8 @@ "modmenu.descriptionTranslation.twd-sasf": "Fixed the \"unknown host\" bug caused by the server address containing spaces at the beginning and end of the server address when adding a server or connecting directly\nTip: If you need to use the configuration menu, install the YetAnotherConfigLib mod", "twd-sasf.bilibili": "Bilibili", "twd-sasf.blog": "Blog", - "title.thewhitedog9487.twd-sasf.config": "ServerAddressSpaceFix", - "config.thewhitedog9487.twd-sasf.category.general": "General", - "option.thewhitedog9487.twd-sasf.ModEnabled": "Whether To Enable The Mod Feature", - "option.thewhitedog9487.twd-sasf.ModEnabled.description": "There is no need to restart the game, and the modification will take effect immediately after it is saved" + "title.twd-sasf.config": "ServerAddressSpaceFix", + "config.twd-sasf.category.general": "General", + "option.twd-sasf.ModEnabled": "Whether To Enable The Mod Feature", + "option.twd-sasf.ModEnabled.description": "There is no need to restart the game, and the modification will take effect immediately after it is saved" } \ No newline at end of file diff --git a/src/main/resources/assets/twd-sasf/lang/zh_cn.json b/src/main/resources/assets/twd-sasf/lang/zh_cn.json index b416882..03d85e2 100644 --- a/src/main/resources/assets/twd-sasf/lang/zh_cn.json +++ b/src/main/resources/assets/twd-sasf/lang/zh_cn.json @@ -3,8 +3,8 @@ "modmenu.descriptionTranslation.twd-sasf": "修复添加服务器或直接连接时，服务器地址首尾包含空格导致的“未知的主机”Bug\n提示：如果需要使用配置菜单，请安装YetAnotherConfigLib模组", "twd-sasf.bilibili": "哔哩哔哩主页", "twd-sasf.blog": "TheWhiteDog9487的博客", - "title.thewhitedog9487.twd-sasf.config": "服务器地址首尾空格修复", - "config.thewhitedog9487.twd-sasf.category.general": "通用", - "option.thewhitedog9487.twd-sasf.ModEnabled": "是否启用模组功能", - "option.thewhitedog9487.twd-sasf.ModEnabled.description": "无需重启游戏，修改并保存后立刻生效" + "title.twd-sasf.config": "服务器地址首尾空格修复", + "config.twd-sasf.category.general": "通用", + "option.twd-sasf.ModEnabled": "是否启用模组功能", + "option.twd-sasf.ModEnabled.description": "无需重启游戏，修改并保存后立刻生效" } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c7a2aae..8b839fa 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -27,9 +27,9 @@ } ], "depends": { - "fabricloader": ">=0.15.3", - "minecraft": ["1.20","1.20.*"], - "java": ">=17" + "fabricloader": ">=0.15.11", + "minecraft": ["1.21","1.21.*"], + "java": ">=21" }, "suggests": { "another-mod": "*"