Merge pull request #87 from notlin4/patch-2

Update traditional Chinese translation

build.gradle

@@ -70,6 +70,7 @@ subprojects {
 
 
         modCompileOnlyApi ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
+        modCompileOnly("dev.lambdaurora.lambdynamiclights:lambdynamiclights-api:${project.ldl_version}")
         modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
         modCompileOnlyApi "dev.lambdaurora:spruceui:${project.spruceui_version}"
     }

common/src/main/java/net/puzzlemc/gui/PuzzleGui.java

@@ -22,11 +22,11 @@ public class PuzzleGui {
     public static void init() {
         MidnightLib.hiddenMods.add("puzzle");
         MinecraftClient client = MinecraftClient.getInstance();
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("\uD83E\uDDE9 Puzzle")));
         PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.midnightconfig.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
             client.setScreen(PuzzleConfig.getScreen(client.currentScreen, "puzzle"));
         }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Puzzle")));
+        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("\uD83E\uDDE9 Puzzle")));
         PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
             PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
             PuzzleSplashScreen.resetColors();

common/src/main/java/net/puzzlemc/gui/compat/BorderlessMiningCompat.java

@@ -11,7 +11,7 @@ import static net.puzzlemc.gui.PuzzleGui.YES;
 
 public class BorderlessMiningCompat {
     public static void init() {
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Borderless Mining")));
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("\uD83E\uDE9F Borderless Mining")));
         ConfigHandler bmConfig = ConfigHandler.getInstance();
         PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabled"), (button) -> button.setMessage(bmConfig.isEnabledOrPending() ? YES : NO), (button) -> {
             bmConfig.setEnabledPending(!bmConfig.isEnabledOrPending());

common/src/main/java/net/puzzlemc/gui/compat/CITRCompat.java

@@ -13,7 +13,7 @@ import static net.minecraft.screen.ScreenTexts.YES;
 public class CITRCompat {
     public static void init() {
         if (CITResewnConfig.INSTANCE != null) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("⛏ CIT Resewn")));
             CITResewnConfig citConfig = CITResewnConfig.INSTANCE;
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
                 citConfig.enabled = !citConfig.enabled;

common/src/main/java/net/puzzlemc/gui/compat/ColormaticCompat.java

@@ -12,7 +12,7 @@ import static net.puzzlemc.gui.PuzzleGui.YES;
 
 public class ColormaticCompat {
     public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Colormatic")));
+        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("\uD83C\uDF08 Colormatic")));
         ColormaticConfig colormaticConfig = Colormatic.config();
         PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.clearSky"), (button) -> button.setMessage(colormaticConfig.clearSky ? YES : NO), (button) -> {
             colormaticConfig.clearSky = !colormaticConfig.clearSky;

common/src/main/java/net/puzzlemc/gui/compat/ContinuityCompat.java

@@ -11,7 +11,7 @@ import static net.puzzlemc.gui.PuzzleGui.YES;
 
 public class ContinuityCompat {
     public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
+        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("▒ Continuity")));
         ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
         contConfig.getOptionMapView().forEach((s, option) -> {
             if (s.equals("use_manual_culling")) return;

common/src/main/java/net/puzzlemc/gui/compat/CullLeavesCompat.java

@@ -11,7 +11,7 @@ import static net.puzzlemc.gui.PuzzleGui.YES;
 
 public class CullLeavesCompat {
     public static void init() {
-        PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
+        PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("\uD83C\uDF43 Cull Leaves")));
         PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("cullleaves.puzzle.option.enabled"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
             CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
             CullLeavesConfig.write("cullleaves");

common/src/main/java/net/puzzlemc/gui/compat/EMFCompat.java

@@ -13,17 +13,10 @@ import java.util.NavigableSet;
 import java.util.Objects;
 import java.util.TreeSet;
 
-import static net.puzzlemc.gui.PuzzleGui.NO;
-import static net.puzzlemc.gui.PuzzleGui.YES;
-
 public class EMFCompat {
     public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.title")));
+        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.literal("\uD83D\uDC37 ").append(Text.translatable("entity_model_features.title"))));
         EMFConfig emfConfig = EMF.config().getConfig();
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.config.force_models"), (button) -> button.setMessage(emfConfig.attemptRevertingEntityModelsAlteredByAnotherMod ? YES : NO), (button) -> {
-            emfConfig.attemptRevertingEntityModelsAlteredByAnotherMod = !emfConfig.attemptRevertingEntityModelsAlteredByAnotherMod;
-            EMF.config().saveToFile();
-        }));
         if (PlatformFunctions.isModLoaded("physicsmod")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.config.physics"), (button) -> button.setMessage(emfConfig.attemptPhysicsModPatch_2 != EMFConfig.PhysicsModCompatChoice.OFF ?
                     Text.translatable("entity_model_features.config." + (emfConfig.attemptPhysicsModPatch_2 == EMFConfig.PhysicsModCompatChoice.VANILLA ? "physics.1" : "physics.2")) : ScreenTexts.OFF), (button) -> {

common/src/main/java/net/puzzlemc/gui/compat/ETFCompat.java

@@ -16,7 +16,7 @@ import static net.puzzlemc.gui.PuzzleGui.YES;
 
 public class ETFCompat {
     public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.title")));
+        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.literal("\uD83D\uDC2E ").append(Text.translatable("config.entity_texture_features.title"))));
         ETFConfig etfConfig = ETFApi.getETFConfigObject();
         PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
             etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;

common/src/main/java/net/puzzlemc/gui/compat/IrisCompat.java

@@ -12,7 +12,7 @@ import net.puzzlemc.gui.screen.widget.PuzzleWidget;
 
 public class IrisCompat {
     public static void init() {
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Iris")));
+        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("\uD83D\uDC41 Iris")));
         PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("iris.puzzle.option.enableShaders"), (button) -> button.setMessage(IrisApi.getInstance().getConfig().areShadersEnabled() ? PuzzleGui.YES : PuzzleGui.NO), (button) -> {
             IrisApiConfig irisConfig = IrisApi.getInstance().getConfig();
             irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());

common/src/main/java/net/puzzlemc/gui/compat/LBGCompat.java

@@ -12,7 +12,7 @@ import static net.puzzlemc.gui.PuzzleGui.YES;
 public class LBGCompat {
     public static void init() {
         LBGConfig lbgConfig = LambdaBetterGrass.get().config;
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass")));
+        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("\uD83C\uDF31 LambdaBetterGrass")));
         PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
         PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
     }

common/src/main/java/net/puzzlemc/gui/compat/LDLCompat.java

@@ -13,10 +13,9 @@ public class LDLCompat {
     public static void init() {
         DynamicLightsConfig ldlConfig = LambDynLights.get().config;
 
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
+        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("\uD83D\uDCA1 LambDynamicLights")));
         PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
         PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.block_entities")), (button) -> button.setMessage(ldlConfig.getBlockEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getBlockEntitiesLightSource().set(!ldlConfig.getBlockEntitiesLightSource().get())));
         PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
         PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
         PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));

common/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java

@@ -86,7 +86,7 @@ public class PuzzleOptionsScreen extends Screen {
             prevTab = tabManager.getCurrentTab();
             this.list.clear();
             fillList();
-            list.setScrollAmount(0);
+            list.setScrollY(0);
         }
     }
 }

common/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java

@@ -13,6 +13,7 @@ import net.minecraft.text.TranslatableTextContent;
 import net.minecraft.util.Formatting;
 import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
 
+import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,6 +32,7 @@ public class PuzzleOptionListWidget extends MidnightConfig.MidnightConfigListWid
     public void addAll(List<PuzzleWidget> buttons) {
         int buttonX = this.width - 160;
         for (PuzzleWidget button : buttons) {
+            try {
                 if (button.buttonType == ButtonType.TEXT)
                     this.addButton(List.of(), Text.literal("").append(button.descriptionText).formatted(Formatting.BOLD));
                 else if (button.buttonType == ButtonType.BUTTON)
@@ -42,10 +44,22 @@ public class PuzzleOptionListWidget extends MidnightConfig.MidnightConfigListWid
                 else
                     LOGGER.warn("Button {} is missing the buttonType variable. This shouldn't happen!", button);
             }
+            catch (Exception e) {
+                LOGGER.error("Failed to add button {}. Likely caused by an update of the specific mod.", button.descriptionText);
+            }
+
+        }
     }
     public void addButton(List<ClickableWidget> buttons, Text text) {
-        var entry = new MidnightConfig.ButtonEntry(buttons, text, new MidnightConfig.EntryInfo());
+        MidnightConfig.EntryInfo info = new MidnightConfig.EntryInfo(null, "puzzle");
-        entry.centered = buttons.isEmpty();
+        if (buttons.isEmpty()) info.comment = new MidnightConfig.Comment(){
+            public Class<? extends Annotation> annotationType() {return null;}
+            public boolean centered() {return true;}
+            public String category() {return "";}
+            public String name() {return "";}
+            public String requiredMod() {return "";}
+        };
+        var entry = new MidnightConfig.ButtonEntry(buttons, text, info);
         this.addEntry(entry);
     }
     public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {

common/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java

@@ -3,6 +3,7 @@ package net.puzzlemc.splashscreen;
 import eu.midnightdust.lib.util.MidnightColorUtil;
 import eu.midnightdust.lib.util.PlatformFunctions;
 import net.minecraft.client.texture.NativeImageBackedTexture;
+import net.minecraft.client.texture.TextureContents;
 import net.minecraft.resource.*;
 import net.minecraft.util.Util;
 import net.puzzlemc.core.config.PuzzleConfig;
@@ -137,14 +138,15 @@ public class PuzzleSplashScreen {
     public static class LogoTexture extends ResourceTexture {
         public LogoTexture(Identifier logo) { super(logo); }
 
-        protected TextureData loadTextureData(ResourceManager resourceManager) {
+        @Override
+        public TextureContents loadContents(ResourceManager resourceManager) {
             MinecraftClient minecraftClient = MinecraftClient.getInstance();
             DefaultResourcePack defaultResourcePack = minecraftClient.getDefaultResourcePack();
             try {
                 InputStream inputStream = Objects.requireNonNull(defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO)).get();
-                TextureData var6;
+                TextureContents var6;
                 try {
-                    var6 = new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(inputStream));
+                    var6 = new TextureContents(NativeImage.read(inputStream), new TextureResourceMetadata(true, true));
                 } finally {
                     if (inputStream != null) {
                         inputStream.close();
@@ -152,7 +154,7 @@ public class PuzzleSplashScreen {
                 }
                 return var6;
             } catch (IOException var18) {
-                return new TextureData(var18);
+                return TextureContents.createMissing();
             }
         }
     }
@@ -161,13 +163,18 @@ public class PuzzleSplashScreen {
         public DynamicLogoTexture() {
             super(LOGO);
         }
-        protected TextureData loadTextureData(ResourceManager resourceManager) {
+        @Override
+        public TextureContents loadContents(ResourceManager resourceManager) {
             try {
                 InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
-                return new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(input));
+                return new TextureContents(NativeImage.read(input), new TextureResourceMetadata(true, true));
             } catch (IOException e) {
                 LOGGER.error("Encountered an error during logo loading: ", e);
-                return TextureData.load(resourceManager, LOGO);
+                try {
+                    return TextureContents.load(resourceManager, LOGO);
+                } catch (IOException ex) {
+                    return TextureContents.createMissing();
+                }
             }
         }
     }

common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java

@@ -9,6 +9,7 @@ import net.minecraft.client.gui.screen.SplashOverlay;
 import net.minecraft.client.render.*;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.texture.NativeImageBackedTexture;
+import net.minecraft.client.texture.TextureManager;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.ColorHelper;
@@ -42,16 +43,16 @@ public abstract class MixinSplashScreen extends Overlay {
         return 0;
     }
 
-    @Inject(method = "init(Lnet/minecraft/client/MinecraftClient;)V", at = @At("TAIL"))
+    @Inject(method = "init", at = @At("TAIL"))
-    private static void puzzle$initSplashscreen(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start //
+    private static void puzzle$initSplashscreen(TextureManager textureManager, CallbackInfo ci) { // Load our custom textures at game start //
         if (PuzzleConfig.resourcepackSplashScreen) {
             if (PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) {
-                client.getTextureManager().registerTexture(LOGO, new PuzzleSplashScreen.DynamicLogoTexture());
+                textureManager.registerTexture(LOGO, new PuzzleSplashScreen.DynamicLogoTexture());
             }
             if (PuzzleSplashScreen.BACKGROUND_TEXTURE.toFile().exists()) {
                 try {
                     InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
-                    client.getTextureManager().registerTexture(BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input)));
+                    textureManager.registerTexture(BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input)));
                 } catch (IOException ignored) {}
             }
         }
@@ -93,6 +94,7 @@ public abstract class MixinSplashScreen extends Overlay {
             RenderSystem.enableBlend();
             RenderSystem.blendEquation(32774);
             RenderSystem.defaultBlendFunc();
+            context.getMatrices().translate(0, 0, 1f);
             context.drawTexture(RenderLayer::getGuiTextured, BACKGROUND, 0, 0, 0, 0, width, height, width, height, ColorHelper.getWhite(s));
             RenderSystem.defaultBlendFunc();
             RenderSystem.disableBlend();

common/src/main/resources/assets/puzzle/lang/zh_tw.json

@@ -1,39 +1,42 @@
 {
-	"puzzle.text.update_available": "有新版本可供升級！",
+	"puzzle.text.update_available":"有新的更新可用！",
 	"puzzle.screen.title":"Puzzle 設定",
-	"puzzle.page.graphics": "顯示設定",
+	"puzzle.page.graphics":"圖形",
-	"puzzle.page.resources": "資源設定",
+	"puzzle.page.resources":"資源",
-	"puzzle.page.performance": "效能設定",
+	"puzzle.page.performance":"效能",
-	"puzzle.page.misc": "其他設定",
+	"puzzle.page.misc":"其他",
 	"puzzle.option.check_for_updates":"檢查更新",
-	"puzzle.option.check_for_updates.tooltip": "開啟 Puzzle 內建的更新檢查",
+	"puzzle.option.check_for_updates.tooltip":"啟用 Puzzle 內建的更新檢查器",
-	"puzzle.option.show_version_info": "顯示 Puzzle 版本信息",
+	"puzzle.option.show_version_info":"顯示 Puzzle 版本資訊",
-	"puzzle.option.show_version_info.tooltip": "在標題畫面和 F3 選單上\n顯示有關目前 Puzzle 版本和更新狀態的資訊",
+	"puzzle.option.show_version_info.tooltip":"在標題畫面和 F3 選單上顯示\n目前 Puzzle 版本和更新狀態的資訊",
-	"puzzle.option.resourcepack_splash_screen": "使用資源包載入畫面",
+	"puzzle.option.resourcepack_splash_screen":"使用資源包的啟動畫面",
-	"puzzle.option.resourcepack_splash_screen.tooltip": "使資源包可以使用 OptiFine 格式\n更改 Minecraft 的載入畫面",
+	"puzzle.option.resourcepack_splash_screen.tooltip":"允許資源包使用 OptiFine 格式變更\nMinecraft 的載入/啟動畫面",
-	"puzzle.option.better_splash_screen_blend": "更好的載入畫面圖示混和",
+	"puzzle.option.better_splash_screen_blend":"更好的啟動畫面標誌混合",
-	"puzzle.option.better_splash_screen_blend.tooltip": "更改激活畫面上標誌的混合方式\n以便更好地與自訂顏色的標誌配合使用",
+	"puzzle.option.better_splash_screen_blend.tooltip":"變更啟動畫面標誌使用的混合類型，\n使其更好地與自訂顏色的標誌配合使用",
 	"puzzle.option.unlimited_model_rotations":"無限模型旋轉",
-	"puzzle.option.unlimited_model_rotations.tooltip": "在自訂方塊／物品模型上解鎖完整 360° 旋轉",
+	"puzzle.option.unlimited_model_rotations.tooltip":"解鎖自訂方塊/物品模型的完整 360° 旋轉",
 	"puzzle.option.bigger_custom_models":"更大的自訂模型",
-	"puzzle.option.bigger_custom_models.tooltip": "增加將自訂方塊／物品模型大小\n從 3x3x3 增加到 5x5x5",
+	"puzzle.option.bigger_custom_models.tooltip":"將自訂方塊/物品模型的大小限制\n從 3×3×3 增加到 5×5×5",
 	"puzzle.midnightconfig.title":"Puzzle 進階設定",
-	"puzzle.midnightconfig.tooltip": "給予進階使用者使用的選項",
+	"puzzle.midnightconfig.category.gui":"介面",
+	"puzzle.midnightconfig.category.features":"功能",
+	"puzzle.midnightconfig.category.internal":"內部",
+	"puzzle.midnightconfig.tooltip":"僅供進階使用者使用的選項",
 
-	"cullleaves.puzzle.option.enabled": "樹葉剔除",
+	"cullleaves.puzzle.option.enabled": "剔除樹葉",
-	"cullleaves.puzzle.option.enabled.tooltip": "開啟樹葉剔除以提升效能。",
+	"cullleaves.puzzle.option.enabled.tooltip": "啟用樹葉剔除以提升效能",
-	"iris.puzzle.option.enableShaders": "開啟光影",
+	"iris.puzzle.option.enableShaders": "啟用光影",
-	"iris.puzzle.option.enableShaders.tooltip": "開啟或關閉光影包",
+	"iris.puzzle.option.enableShaders.tooltip": "是否啟用光影包",
-	"iris.puzzle.option.open": "開",
+	"iris.puzzle.option.open": "開啟",
-	"options.iris.shaderPackSelection.tooltip": "開啟選擇畫面光影包和設定",
+	"options.iris.shaderPackSelection.tooltip": "開啟一個畫面以選擇\n並設定光影包",
-	"lambdabettergrass.option.mode.tooltip": "讓草的側面連接相鄰的草塊",
+	"lambdabettergrass.option.mode.tooltip": "使草地的側面與\n相鄰的草地連接",
-	"lambdabettergrass.option.better_snow.tooltip": "對雪塊／苔蘚方塊被包圍的不完整方塊\n增加視覺效果",
+	"lambdabettergrass.option.better_snow.tooltip": "為被雪/苔蘚包圍的非完整方塊\n加入純粹視覺上的雪/苔蘚層",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "當 Minecraft 失去焦點時限制 FPS\n（如切換到其他視窗或是遊戲被隱藏）\n以節省電源和系統資源",
+	"config.dynamicfps.reduce_when_unfocused.tooltip": "在未聚焦時降低 Minecraft 的 FPS\n（例如，另一個視窗被聚焦或遊戲被隱藏）\n以節省電力和系統資源",
-	"config.dynamicfps.unfocused_fps.tooltip": "當 Minecraft 失去焦點時允許的最大 FPS",
+	"config.dynamicfps.unfocused_fps.tooltip": "Minecraft 在未聚焦時\n允許繪製的 FPS",
-	"config.dynamicfps.restore_when_hovered.tooltip": "開啟或關閉預覽 Mineceraft 時是否停止 FPS 限制\n（如停留在工作列或 Dock）",
+	"config.dynamicfps.restore_when_hovered.tooltip": "當預覽 Minecraft 時是否停止\nFPS 限制（例如，將滑鼠懸停在工作列或 Dock 上）",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "當 Minecraft 失去焦點時執行垃圾清理\n以減少一些記憶體",
+	"config.dynamicfps.run_gc_on_unfocus.tooltip": "在 Minecraft 未聚焦時執行垃圾回收器\n以釋放一些記憶體",
-	"config.dynamicfps.unfocused_volume.tooltip": "當 Minecraft 失去焦點時撥放的音量\n（如選擇了另一個視窗）",
+	"config.dynamicfps.unfocused_volume.tooltip": "遊戲在未聚焦時播放聲音的音量\n（例如，選取了另一個視窗）",
-	"config.dynamicfps.hidden_volume.tooltip": "遊戲在不可見時應該播放的音量\n（如最小化、被其他視窗覆蓋或在另一個虛擬桌面上）",
+	"config.dynamicfps.hidden_volume.tooltip": "遊戲在不可見時播放聲音的音量\n（例如，最小化、被其他視窗覆蓋\n或在另一個虛擬桌面上）",
 	"entity_texture_features.puzzle.emissive_type.brighter": "§e更亮",
 	"entity_texture_features.puzzle.emissive_type.default": "§6預設"
 }

fabric/build.gradle

@@ -90,7 +90,8 @@ unifiedPublishing {
             curseforge {
                 token = CURSEFORGE_TOKEN
                 id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions
+                gameVersions.addAll "Java 21", project.minecraft_version
+                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
             }
         }
 
@@ -100,7 +101,8 @@ unifiedPublishing {
                 token = MODRINTH_TOKEN
                 id = rootProject.modrinth_id
                 version = "$rootProject.version-$project.name"
-                gameVersions.addAll project.minecraft_version, project.supported_versions
+                gameVersions.addAll project.minecraft_version
+                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
             }
         }
     }

gradle.properties

@@ -1,13 +1,13 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
 
-minecraft_version=1.21.3
+minecraft_version=1.21.4
-supported_versions=1.21.2
+supported_versions=
-yarn_mappings=1.21.3+build.2
+yarn_mappings=1.21.4+build.1
 enabled_platforms=fabric,neoforge
 
 # Mod Properties
-mod_version = 2.0.3
+mod_version = 2.0.5
 maven_group = net.puzzlemc
 archives_base_name = puzzle
 release_type=release
@@ -16,18 +16,18 @@ modrinth_id=3IuO68q1
 
 # Modloaders
 fabric_loader_version=0.16.9
-fabric_api_version=0.107.0+1.21.3
+fabric_api_version=0.110.5+1.21.4
 
-neoforge_version=21.3.11-beta
+neoforge_version=21.4.9-beta
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 # Libraries
-midnightlib_version = 1.6.4
+midnightlib_version = 1.7.0+1.21.4
-modmenu_version = 12.0.0-beta.1
+modmenu_version = 13.0.0-beta.1
 
 # Mod Integrations
 cull_leaves_version = 3.0.2-fabric
-ldl_version = 2.3.2+1.20.1
+ldl_version = 4.0.0+1.21.4
 lbg_version = 1.5.2+1.20.1
 iris_version = 1.8.0-beta.3+1.21-fabric
 continuity_version = 3.0.0-beta.5+1.21

neoforge/build.gradle

@@ -96,7 +96,8 @@ unifiedPublishing {
             curseforge {
                 token = CURSEFORGE_TOKEN
                 id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions
+                gameVersions.addAll "Java 21", project.minecraft_version
+                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
             }
         }
 
@@ -106,7 +107,8 @@ unifiedPublishing {
                 token = MODRINTH_TOKEN
                 id = rootProject.modrinth_id
                 version = "$rootProject.version-$project.name"
-                gameVersions.addAll project.minecraft_version, project.supported_versions
+                gameVersions.addAll project.minecraft_version
+                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
             }
         }
     }