JfMods/Globalization
JfMods
/
Globalization
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: update to 1.20.5
ci/woodpecker/push/jfmod Pipeline was successful Details
ci/woodpecker/tag/jfmod Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2024-04-25 13:51:09 +02:00
parent 53f6d95ef7
commit e3370a9ff5
Signed by: Johannes
GPG Key ID: E76429612C2929F4
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build.gradle.kts
View File

@ -1,15 +1,16 @@
plugins { plugins {
id("jfmod") version "1.5-SNAPSHOT" id("jfmod") version "1.6-SNAPSHOT"
} }
allprojects { group = "io.gitlab.jfronny" } allprojects { group = "io.gitlab.jfronny" }
base.archivesName = "globalization" base.archivesName = "globalization"
jfMod { jfMod {
minecraftVersion = "1.20.4" minecraftVersion = "1.20.5"
yarn("build.1") yarn("build.1")
loaderVersion = "0.15.0" loaderVersion = "0.15.10"
libJfVersion = "3.14.1" libJfVersion = "3.15.3"
fabricApiVersion = "0.97.6+1.20.5"
modrinth { modrinth {
projectId = "globalization" projectId = "globalization"
@ -25,11 +26,15 @@ jfMod {
} }
dependencies { dependencies {
modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}") modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2")
modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1:${jfMod.libJfVersion.get()}") modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1")
// Dev env // Dev env
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${jfMod.libJfVersion.get()}") modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny")
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}") modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil")
modLocalRuntime("com.terraformersmc:modmenu:9.0.0-pre.1") 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")
} }

6
src/client/java/io/gitlab/jfronny/globalization/mixin/TranslationStorageMixin.java
View File

@ -5,6 +5,7 @@ import io.gitlab.jfronny.globalization.GlobalizationMap;
import net.minecraft.client.resource.language.TranslationStorage; import net.minecraft.client.resource.language.TranslationStorage;
import net.minecraft.resource.ResourceManager; import net.minecraft.resource.ResourceManager;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.*;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture; import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
@ -13,7 +14,7 @@ import java.util.*;
@Mixin(TranslationStorage.class) @Mixin(TranslationStorage.class)
public class TranslationStorageMixin { 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<String, String> globalization$createCustomMap(Map<String, String> original) { private static Map<String, String> globalization$createCustomMap(Map<String, String> original) {
if (!original.isEmpty()) throw new IllegalStateException("Non-empty original"); if (!original.isEmpty()) throw new IllegalStateException("Non-empty original");
return new GlobalizationMap(); return new GlobalizationMap();
@ -24,11 +25,12 @@ public class TranslationStorageMixin {
globalization$getMap(map).fork(); 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<String, String> globalization$generateMissing(Map<String, String> source) { private static ImmutableMap<String, String> globalization$generateMissing(Map<String, String> source) {
return ImmutableMap.copyOf(globalization$getMap(source).generateMissing()); return ImmutableMap.copyOf(globalization$getMap(source).generateMissing());
} }
@Unique
private static GlobalizationMap globalization$getMap(Map<String, String> map) { private static GlobalizationMap globalization$getMap(Map<String, String> map) {
return (GlobalizationMap) map; return (GlobalizationMap) map;
} }

4
src/main/java/io/gitlab/jfronny/globalization/Globalization.java
View File

@ -1,7 +1,7 @@
package io.gitlab.jfronny.globalization; package io.gitlab.jfronny.globalization;
import io.gitlab.jfronny.commons.logging.Logger; import io.gitlab.jfronny.commons.logger.SystemLoggerPlus;
public class Globalization { public class Globalization {
public static final Logger LOG = Logger.forName("globalization"); public static final SystemLoggerPlus LOG = SystemLoggerPlus.forName("globalization");
} }