From e3370a9ff5a54fd7e3fe5cebd094324dce8fa310 Mon Sep 17 00:00:00 2001 From: JFronny Date: Thu, 25 Apr 2024 13:51:09 +0200 Subject: [PATCH] chore: update to 1.20.5 --- build.gradle.kts | 23 +++++++++++-------- .../mixin/TranslationStorageMixin.java | 6 +++-- .../jfronny/globalization/Globalization.java | 4 ++-- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9ee69bc..fbf6221 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,15 +1,16 @@ plugins { - id("jfmod") version "1.5-SNAPSHOT" + id("jfmod") version "1.6-SNAPSHOT" } allprojects { group = "io.gitlab.jfronny" } base.archivesName = "globalization" jfMod { - minecraftVersion = "1.20.4" + minecraftVersion = "1.20.5" yarn("build.1") - loaderVersion = "0.15.0" - libJfVersion = "3.14.1" + loaderVersion = "0.15.10" + libJfVersion = "3.15.3" + fabricApiVersion = "0.97.6+1.20.5" modrinth { projectId = "globalization" @@ -25,11 +26,15 @@ jfMod { } dependencies { - modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}") - modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1:${jfMod.libJfVersion.get()}") + modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2") + modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1") // Dev env - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${jfMod.libJfVersion.get()}") - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}") - modLocalRuntime("com.terraformersmc:modmenu:9.0.0-pre.1") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil") + modLocalRuntime("com.terraformersmc:modmenu:10.0.0-beta.1") + // for modmenu + modLocalRuntime("net.fabricmc.fabric-api:fabric-resource-loader-v0") + modLocalRuntime("net.fabricmc.fabric-api:fabric-screen-api-v1") + modLocalRuntime("net.fabricmc.fabric-api:fabric-key-binding-api-v1") } diff --git a/src/client/java/io/gitlab/jfronny/globalization/mixin/TranslationStorageMixin.java b/src/client/java/io/gitlab/jfronny/globalization/mixin/TranslationStorageMixin.java index 9a88a9b..876e2b0 100644 --- a/src/client/java/io/gitlab/jfronny/globalization/mixin/TranslationStorageMixin.java +++ b/src/client/java/io/gitlab/jfronny/globalization/mixin/TranslationStorageMixin.java @@ -5,6 +5,7 @@ import io.gitlab.jfronny.globalization.GlobalizationMap; import net.minecraft.client.resource.language.TranslationStorage; import net.minecraft.resource.ResourceManager; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; @@ -13,7 +14,7 @@ import java.util.*; @Mixin(TranslationStorage.class) public class TranslationStorageMixin { - @ModifyVariable(method = "load(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Z)Lnet/minecraft/client/resource/language/TranslationStorage;", at = @At(value = "INVOKE_ASSIGN", target = "Lcom/google/common/collect/Maps;newHashMap()Ljava/util/HashMap;"), index = 3) + @ModifyVariable(method = "load(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Z)Lnet/minecraft/client/resource/language/TranslationStorage;", at = @At(value = "INVOKE_ASSIGN", target = "Lcom/google/common/collect/Maps;newHashMap()Ljava/util/HashMap;", remap = false), index = 3) private static Map globalization$createCustomMap(Map original) { if (!original.isEmpty()) throw new IllegalStateException("Non-empty original"); return new GlobalizationMap(); @@ -24,11 +25,12 @@ public class TranslationStorageMixin { globalization$getMap(map).fork(); } - @Redirect(method = "load(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Z)Lnet/minecraft/client/resource/language/TranslationStorage;", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableMap;copyOf(Ljava/util/Map;)Lcom/google/common/collect/ImmutableMap;")) + @Redirect(method = "load(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Z)Lnet/minecraft/client/resource/language/TranslationStorage;", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableMap;copyOf(Ljava/util/Map;)Lcom/google/common/collect/ImmutableMap;", remap = false)) private static ImmutableMap globalization$generateMissing(Map source) { return ImmutableMap.copyOf(globalization$getMap(source).generateMissing()); } + @Unique private static GlobalizationMap globalization$getMap(Map map) { return (GlobalizationMap) map; } diff --git a/src/main/java/io/gitlab/jfronny/globalization/Globalization.java b/src/main/java/io/gitlab/jfronny/globalization/Globalization.java index ef54ce1..e96efd5 100644 --- a/src/main/java/io/gitlab/jfronny/globalization/Globalization.java +++ b/src/main/java/io/gitlab/jfronny/globalization/Globalization.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.globalization; -import io.gitlab.jfronny.commons.logging.Logger; +import io.gitlab.jfronny.commons.logger.SystemLoggerPlus; public class Globalization { - public static final Logger LOG = Logger.forName("globalization"); + public static final SystemLoggerPlus LOG = SystemLoggerPlus.forName("globalization"); }