fix: move SimpleRegistryMixinInterface into common + fix: can't load …

…language without `language module` enabled.
sakurawald · Jul 15, 2024 · 6730aef · 6730aef
1 parent 7ef57c1
commit 6730aef
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 11 deletions.
diff --git a/...erfaces/SimpleRegistryMixinInterface.java → ...ructure/SimpleRegistryMixinInterface.java b/...erfaces/SimpleRegistryMixinInterface.java → ...ructure/SimpleRegistryMixinInterface.java
@@ -1,4 +1,4 @@
-package io.github.sakurawald.module.initializer.resource_world.interfaces;
+package io.github.sakurawald.module.common.structure;
 
 import net.minecraft.registry.SimpleRegistry;
 import net.minecraft.util.Identifier;

diff --git a/...java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldInitializer.java b/...java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldInitializer.java
@@ -10,7 +10,7 @@
 import io.github.sakurawald.module.initializer.ModuleInitializer;
 import io.github.sakurawald.module.initializer.newbie_welcome.random_teleport.RandomTeleport;
 import io.github.sakurawald.module.initializer.resource_world.interfaces.DimensionOptionsMixinInterface;
-import io.github.sakurawald.module.initializer.resource_world.interfaces.SimpleRegistryMixinInterface;
+import io.github.sakurawald.module.common.structure.SimpleRegistryMixinInterface;
 import io.github.sakurawald.util.CommandUtil;
 import io.github.sakurawald.util.MessageUtil;
 import io.github.sakurawald.util.ScheduleUtil;

diff --git a/...ain/java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldManager.java b/...ain/java/io/github/sakurawald/module/initializer/resource_world/ResourceWorldManager.java
@@ -1,7 +1,7 @@
 package io.github.sakurawald.module.initializer.resource_world;
 
 import io.github.sakurawald.module.ModuleManager;
-import io.github.sakurawald.module.initializer.resource_world.interfaces.SimpleRegistryMixinInterface;
+import io.github.sakurawald.module.common.structure.SimpleRegistryMixinInterface;
 import io.github.sakurawald.module.common.structure.Position;
 import io.github.sakurawald.module.initializer.teleport_warmup.TeleportTicket;
 import io.github.sakurawald.module.initializer.teleport_warmup.TeleportWarmupInitializer;

diff --git a/...e_world/registry/SimpleRegistryMixin.java → ...ternal/low_level/SimpleRegistryMixin.java b/...e_world/registry/SimpleRegistryMixin.java → ...ternal/low_level/SimpleRegistryMixin.java
@@ -1,8 +1,8 @@
-package io.github.sakurawald.module.mixin.resource_world.registry;
+package io.github.sakurawald.module.mixin._internal.low_level;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import io.github.sakurawald.Fuji;
-import io.github.sakurawald.module.initializer.resource_world.interfaces.SimpleRegistryMixinInterface;
+import io.github.sakurawald.module.common.structure.SimpleRegistryMixinInterface;
 import it.unimi.dsi.fastutil.objects.ObjectList;
 import it.unimi.dsi.fastutil.objects.Reference2IntMap;
 import net.minecraft.registry.MutableRegistry;
@@ -24,7 +24,6 @@
 
 @SuppressWarnings("unused")
 @Mixin(SimpleRegistry.class)
-
 public abstract class SimpleRegistryMixin<T> implements SimpleRegistryMixinInterface<T>, MutableRegistry<T> {
 
     @Shadow

diff --git a/src/main/java/io/github/sakurawald/module/mixin/chat/RegistryLoaderMixin.java b/src/main/java/io/github/sakurawald/module/mixin/chat/RegistryLoaderMixin.java
@@ -1,7 +1,6 @@
 package io.github.sakurawald.module.mixin.chat;
 
-import io.github.sakurawald.module.initializer.resource_world.interfaces.SimpleRegistryMixinInterface;
-import io.github.sakurawald.module.mixin.resource_world.registry.SimpleRegistryMixin;
+import io.github.sakurawald.module.common.structure.SimpleRegistryMixinInterface;
 import lombok.extern.slf4j.Slf4j;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.minecraft.network.message.MessageType;

diff --git a/src/main/java/io/github/sakurawald/module/mixin/chat/ServerGamePacketListenerImplMixin.java b/src/main/java/io/github/sakurawald/module/mixin/chat/ServerGamePacketListenerImplMixin.java
@@ -23,7 +23,7 @@ public abstract class ServerGamePacketListenerImplMixin {
     public ServerPlayerEntity player;
 
 
-    @ModifyVariable(method = "handleDecoratedMessage", at = @At(value = "HEAD"))
+    @ModifyVariable(method = "handleDecoratedMessage", at = @At(value = "HEAD"), argsOnly = true)
     public SignedMessage handleChat(SignedMessage before) {
         Text text = module.parseText(player, before.getContent().getString());
         module.getChatHistory().add(text.asComponent());

diff --git a/src/main/java/io/github/sakurawald/util/MessageUtil.java b/src/main/java/io/github/sakurawald/util/MessageUtil.java
@@ -100,7 +100,7 @@ private static void loadLanguageIfAbsent(String lang) {
             default -> null;
         };
 
-        return player == null ? defaultLanguage : player2lang.get(player.getGameProfile().getName());
+        return player == null ? defaultLanguage : player2lang.getOrDefault(player.getGameProfile().getName(), defaultLanguage);
     }
 
     private @NotNull JsonObject getLanguage(String lang) {

diff --git a/src/main/resources/fuji.mixins.json b/src/main/resources/fuji.mixins.json
@@ -46,7 +46,7 @@
     "resource_world.MinecraftServerMixin",
     "resource_world.ServerWorldMixin",
     "resource_world.registry.DimensionOptionsMixin",
-    "resource_world.registry.SimpleRegistryMixin",
+    "_internal.low_level.SimpleRegistryMixin",
     "resource_world.registry.WorldGenSettingsMixin",
     "seen.PlayerListMixin",
     "sit.InteractModifierMixin",