Fix crash with newer ETF versions

README.md

@@ -1,4 +1,2 @@
 # Puzzle
 Unites optifine replacement mods in a clean & vanilla-style gui
-
-[![Download from Curseforge](https://cf.way2muchnoise.eu/full_563977_downloads%20on%20Curseforge.svg?badge_style=for_the_badge)](https://www.curseforge.com/minecraft/mc-mods/puzzle) [![Download from Modrinth](https://img.shields.io/modrinth/dt/puzzle?color=4&label=Download%20from%20Modrinth&style=for-the-badge)](https://modrinth.com/mod/puzzle) 

build.gradle

@@ -1,6 +1,6 @@
 // Based on https://github.com/OnyxStudios/Cardinal-Components-API/blob/1.17/build.gradle
 plugins {
-    id "fabric-loom" version "1.1-SNAPSHOT" apply false
+    id "fabric-loom" version "0.12-SNAPSHOT" apply false
     id "com.matthewprenger.cursegradle" version "1.4.0"
     id "maven-publish"
     id "java-library"
@@ -122,19 +122,18 @@ dependencies {
     }
     modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
     modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
-    modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
+    modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
     modImplementation ("maven.modrinth:iris:${project.iris_version}")
     modCompileOnly ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
-    modCompileOnlyApi ("maven.modrinth:continuity:${project.continuity_version}")
+    modImplementation ("maven.modrinth:continuity:${project.continuity_version}")
     modImplementation ("maven.modrinth:animatica:${project.animatica_version}")
-    modCompileOnlyApi ("maven.modrinth:colormatic:${project.colormatic_version}")
+    modImplementation ("maven.modrinth:colormatic:${project.colormatic_version}")
     modImplementation ("maven.modrinth:borderless-mining:${project.borderless_mining_version}")
     modImplementation ("maven.modrinth:dynamic-fps:${project.dynamic_fps_version}")
     modImplementation("com.moandjiezana.toml:toml4j:${project.toml4j_version}")
     modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
     modImplementation ("maven.modrinth:cem:${project.cem_version}")
-    modImplementation "com.github.Lortseam.completeconfig:base:${project.complete_config_version}"
+    modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
-    modImplementation ("maven.modrinth:exordium:${project.exordium_version}")
 
     modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
         exclude group: 'com.google.code.gson'

gradle.properties

@@ -3,34 +3,33 @@ org.gradle.jvmargs=-Xmx4G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.19.4-rc2
+	minecraft_version=1.19
-	yarn_mappings=1.19.4-rc2+build.1
+	yarn_mappings=1.19+build.4
-	loader_version=0.14.17
+	loader_version=0.14.8
 
 # Mod Properties
-	mod_version = 1.5.0+1.19.4
+	mod_version = 1.4.2-1.19
 	maven_group = net.puzzlemc
 	archives_base_name = puzzle
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.75.3+1.19.4
+	fabric_version=0.57.0+1.19
-	mod_menu_version = 6.1.0-beta.3
+	mod_menu_version = 4.0.0
-	midnightlib_version=1.2.1-fabric
 	
-	cull_leaves_version = 3.0.2-fabric
+	cull_leaves_version = 2.3.3
-	ldl_version = 2.2.0+1.19.3
+	ldl_version = 2.1.2+1.19
 	lbg_version = 1.3.0+1.19
-	iris_version = 1.5.2+1.19.3
+	iris_version = 1.19.x-v1.2.5
 	continuity_version = 2.0.0+1.19
 	animatica_version = 0.5+1.19
 	colormatic_version = 3.1.2
-	borderless_mining_version = 1.1.6+1.19.3
+	borderless_mining_version = 1.1.5+1.19
-	dynamic_fps_version = v2.2.0
+	dynamic_fps_version = 2.2.0
 	toml4j_version = 0.7.2
 	cit_resewn_version = 1.1.1+1.19
-	cem_version = 0.7.1-1.19.3
+	cem_version = 0.7.1-1.19
-	complete_config_version = 2.2.0
+	complete_config_version = 1.0.0
-	spruceui_version=4.1.0+1.19.3
+	spruceui_version=4.0.0+1.19
-	entitytexturefeatures_version=4.2.0.1.fabric.1.19.3
+	midnightlib_version=0.5.2
-	exordium_version=1.0.3-1.19.4
+	entitytexturefeatures_version=4.3.1.fabric.1.19.2

puzzle-base/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java

@@ -6,19 +6,19 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class PuzzleConfig extends MidnightConfig {
-    @Entry(category = "gui", name = "Disabled integrations") public static List<String> disabledIntegrations = new ArrayList<>();
+    @Entry public static List<String> disabledIntegrations = new ArrayList<>();
-    @Entry(category = "gui", name = "Enable Puzzle button") public static boolean enablePuzzleButton = true;
+    @Entry public static boolean enablePuzzleButton = true;
-    @Entry(category = "debug", name = "Enable debug messages") public static boolean debugMessages = false;
+    @Entry public static boolean debugMessages = false;
 
-    @Entry(category = "debug", name = "puzzle.option.check_for_updates") public static boolean checkUpdates = true;
+    @Entry public static boolean checkUpdates = true;
-    @Entry(category = "gui", name = "puzzle.option.show_version_info") public static boolean showPuzzleInfo = true;
+    @Entry public static boolean showPuzzleInfo = true;
-    @Entry(category = "features", name = "puzzle.option.resourcepack_splash_screen") public static boolean resourcepackSplashScreen = true;
+    @Entry public static boolean resourcepackSplashScreen = true;
-    @Entry(category = "features", name = "puzzle.option.unlimited_model_rotations") public static boolean unlimitedRotations = true;
+    @Entry public static boolean unlimitedRotations = true;
-    @Entry(category = "features", name = "puzzle.option.bigger_custom_models") public static boolean biggerModels = true;
+    @Entry public static boolean biggerModels = true;
 
-    @Entry(category = "features", name = "Splash Background Color") public static int backgroundColor = 15675965;
+    @Entry public static int backgroundColor = 15675965;
-    @Entry(category = "features", name = "Splash Progress Bar Color") public static int progressBarColor = 16777215;
+    @Entry public static int progressBarColor = 16777215;
-    @Entry(category = "features", name = "Splash Progress Bar Background Color") public static int progressBarBackgroundColor = 15675965;
+    @Entry public static int progressBarBackgroundColor = 15675965;
-    @Entry(category = "features", name = "Splash Progress Bar Frame Color") public static int progressFrameColor = 16777215;
+    @Entry public static int progressFrameColor = 16777215;
-    @Entry(category = "features", name = "puzzle.option.better_splash_screen_blend") public static boolean disableBlend = false;
+    @Entry public static boolean disableBlend = false;
 }

puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java

@@ -1,45 +1,59 @@
 package net.puzzlemc.core.mixin;
 
-import net.minecraft.client.gui.widget.PressableTextWidget;
+import net.fabricmc.loader.api.FabricLoader;
 import net.puzzlemc.core.PuzzleCore;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.core.util.UpdateChecker;
 import net.minecraft.client.gui.screen.*;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.Util;
+import net.minecraft.util.math.MathHelper;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Objects;
 
 @Mixin(TitleScreen.class)
 public abstract class MixinTitleScreen extends Screen {
-    private final String versionText = PuzzleCore.version.replace("+", " for ");
+
+    @Shadow @Final private boolean doBackgroundFade;
+    @Shadow private long backgroundFadeStart;
+    private Text puzzleText;
+    private int puzzleTextWidth;
+    private int yOffset;
 
     protected MixinTitleScreen(Text title) {
         super(title);
     }
     @Inject(at = @At("TAIL"), method = "init")
     private void puzzle$init(CallbackInfo ci) {
-        int yOffset = 20;
+        yOffset = 20;
-        Text puzzleText;
+        if (FabricLoader.getInstance().isModLoaded("dashloader")) yOffset = yOffset + 10;
         if (UpdateChecker.isUpToDate) {
-            puzzleText = Text.literal(versionText);
+            puzzleText = Text.of(PuzzleCore.version);
         }
         else {
-            puzzleText = Text.literal("").append(Text.of(versionText+" | ")).append(Text.translatable("puzzle.text.update_available"));
+            puzzleText = Text.translatable("").append(Text.of(PuzzleCore.version + " | ")).append(Text.translatable("puzzle.text.update_available"));
+            this.puzzleTextWidth = this.textRenderer.getWidth(puzzleText);
         }
+    }
+
+    @Inject(at = @At("TAIL"), method = "render")
+    private void puzzle$render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (PuzzleConfig.showPuzzleInfo) {
-            PressableTextWidget text = this.addDrawableChild(new PressableTextWidget(2, this.height - 12 - yOffset, this.textRenderer.getWidth(puzzleText), 10, puzzleText, (button) -> {
+            float f = this.doBackgroundFade ? (float) (Util.getMeasuringTimeMs() - this.backgroundFadeStart) / 1000.0F : 1.0F;
-                if (Objects.requireNonNull(this.client).options.getChatLinksPrompt().getValue()) {
+            float g = this.doBackgroundFade ? MathHelper.clamp(f - 1.0F, 0.0F, 1.0F) : 1.0F;
-                    this.client.setScreen(new ConfirmLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
+            int l = MathHelper.ceil(g * 255.0F) << 24;
-                } else {
+            textRenderer.drawWithShadow(matrices, puzzleText,2,this.height - yOffset, 16777215 | l);
-                    Util.getOperatingSystem().open(PuzzleCore.updateURL);
+            if (mouseX > 2 && mouseX < 2 + this.puzzleTextWidth && mouseY > this.height - yOffset && mouseY < this.height - yOffset + 10) {
+                fill(matrices, 2, this.height - yOffset + 9, 2 + this.puzzleTextWidth, this.height - yOffset + 10, 16777215 | l);
             }
-            }, this.textRenderer));
-            if (UpdateChecker.isUpToDate) text.active = false;
         }
     }
 
@@ -49,4 +63,16 @@ public abstract class MixinTitleScreen extends Screen {
         }
         Objects.requireNonNull(this.client).setScreen(this);
     }
+
+    @Inject(at = @At("HEAD"), method = "mouseClicked",cancellable = true)
+    private void puzzle$mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
+        if (mouseX > 2 && mouseX < (double)(2 + this.puzzleTextWidth) && mouseY > (double)(this.height - yOffset) && mouseY < (double)this.height - yOffset + 10) {
+            if (Objects.requireNonNull(this.client).options.getChatLinksPrompt().getValue()) {
+                this.client.setScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
+            } else {
+                Util.getOperatingSystem().open(PuzzleCore.updateURL);
+            }
+            cir.setReturnValue(false);
+        }
+    }
 }

puzzle-base/src/main/java/net/puzzlemc/core/util/UpdateChecker.java

@@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
 
 public class UpdateChecker {
     private static final Gson GSON = new Gson();
-    private static final String minecraftVersion = MinecraftClient.getInstance().getGameVersion();
+    private static final String minecraftVersion = MinecraftClient.getInstance().getGame().getVersion().getId();
     public static final Logger logger = LogManager.getLogger(PuzzleCore.name);
 
     public static final Type UPDATE_TYPE_TOKEN = new TypeToken<Map<String, String>>(){}.getType();

puzzle-gui/build.gradle

@@ -39,22 +39,21 @@ dependencies {
 	modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
 	modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
 	modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
-	modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
+	modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
  	modImplementation ("maven.modrinth:iris:${project.iris_version}")
 	modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
-	modCompileOnlyApi ("maven.modrinth:colormatic:${project.colormatic_version}")
+	modImplementation ("maven.modrinth:colormatic:${project.colormatic_version}")
 	modImplementation ("maven.modrinth:borderless-mining:${project.borderless_mining_version}")
 	modImplementation ("maven.modrinth:dynamic-fps:${project.dynamic_fps_version}")
 	modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
 	modImplementation ("maven.modrinth:cem:${project.cem_version}")
-	modImplementation "com.github.Lortseam.completeconfig:base:${project.complete_config_version}"
+	modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
-	modImplementation ("maven.modrinth:exordium:${project.exordium_version}")
 
 	modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
 		exclude group: 'com.google.code.gson'
 		exclude group: 'com.google.guava'
 	}
-	modCompileOnlyApi ("maven.modrinth:continuity:${project.continuity_version}") {
+ 	modImplementation ("maven.modrinth:continuity:${project.continuity_version}") {
          exclude module: "modmenu"
  	}
 } 

puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java

@@ -4,14 +4,10 @@ import dev.lambdaurora.lambdabettergrass.LBGConfig;
 import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
 import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
 import dev.lambdaurora.lambdynlights.LambDynLights;
-import dev.tr7zw.exordium.Config;
-import dev.tr7zw.exordium.ExordiumMod;
-import dev.tr7zw.exordium.ExordiumModBase;
 import dynamicfps.DynamicFPSConfig;
 import dynamicfps.DynamicFPSMod;
 import eu.midnightdust.core.MidnightLibClient;
 import eu.midnightdust.cullleaves.config.CullLeavesConfig;
-import eu.midnightdust.lib.util.PlatformFunctions;
 import io.github.kvverti.colormatic.Colormatic;
 import io.github.kvverti.colormatic.ColormaticConfigController;
 import link.infra.borderlessmining.config.ConfigHandler;
@@ -33,7 +29,6 @@ import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
 import traben.entity_texture_features.ETFApi;
 import traben.entity_texture_features.config.ETFConfig;
 import io.github.kvverti.colormatic.ColormaticConfig;
-import traben.entity_texture_features.texture_handlers.ETFManager;
 
 public class PuzzleClient implements ClientModInitializer {
 
@@ -58,7 +53,7 @@ public class PuzzleClient implements ClientModInitializer {
             client.setScreen(PuzzleConfig.getScreen(client.currentScreen, "puzzle"));
         }));
         PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Puzzle")));
-        if (isActive("puzzle-splashscreen")) {
+        if (FabricLoader.getInstance().isModLoaded("puzzle-splashscreen") && !PuzzleConfig.disabledIntegrations.contains("puzzle-splashscreen")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
                 PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
                 PuzzleConfig.write(id);
@@ -66,7 +61,7 @@ public class PuzzleClient implements ClientModInitializer {
                 MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture(PuzzleSplashScreen.LOGO));
             }));
         }
-        if (isActive("puzzle-models")) {
+        if (FabricLoader.getInstance().isModLoaded("puzzle-models") && !PuzzleConfig.disabledIntegrations.contains("puzzle-models")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
                 PuzzleConfig.unlimitedRotations = !PuzzleConfig.unlimitedRotations;
                 PuzzleConfig.write(id);
@@ -76,7 +71,7 @@ public class PuzzleClient implements ClientModInitializer {
                 PuzzleConfig.write(id);
             }));
         }
-        if (isActive("cullleaves")) {
+        if (FabricLoader.getInstance().isModLoaded("cullleaves") && !PuzzleConfig.disabledIntegrations.contains("cullleaves")) {
             PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
             PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("cullleaves.puzzle.option.enabled"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
                 CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
@@ -84,7 +79,7 @@ public class PuzzleClient implements ClientModInitializer {
                 MinecraftClient.getInstance().worldRenderer.reload();
             }));
         }
-        if (isActive("colormatic")) {
+        if (FabricLoader.getInstance().isModLoaded("colormatic") && !PuzzleConfig.disabledIntegrations.contains("colormatic")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Colormatic")));
             ColormaticConfig colormaticConfig = Colormatic.config();
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.clearSky"), (button) -> button.setMessage(colormaticConfig.clearSky ? YES : NO), (button) -> {
@@ -116,7 +111,7 @@ public class PuzzleClient implements ClientModInitializer {
                             catch (NumberFormatException ignored) {}
             }));
         }
-        if (isActive("dynamicfps")) {
+        if (FabricLoader.getInstance().isModLoaded("dynamicfps") && !PuzzleConfig.disabledIntegrations.contains("dynamicfps")) {
             PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Dynamic FPS")));
             DynamicFPSConfig fpsConfig = DynamicFPSMod.config;
             PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.reduce_when_unfocused"), (button) -> button.setMessage(fpsConfig.reduceFPSWhenUnfocused ? YES : NO), (button) -> {
@@ -159,7 +154,7 @@ public class PuzzleClient implements ClientModInitializer {
                         finally {fpsConfig.save();}
                     }));
         }
-        if (isActive("borderlessmining")) {
+        if (FabricLoader.getInstance().isModLoaded("borderlessmining") && !PuzzleConfig.disabledIntegrations.contains("borderlessmining")) {
             PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Borderless Mining")));
             ConfigHandler bmConfig = ConfigHandler.getInstance();
             PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabled"), (button) -> button.setMessage(bmConfig.isEnabledOrPending() ? YES : NO), (button) -> {
@@ -174,13 +169,13 @@ public class PuzzleClient implements ClientModInitializer {
                 }));
             }
         }
-        if (isActive("iris")) {
+        if (FabricLoader.getInstance().isModLoaded("iris") && !PuzzleConfig.disabledIntegrations.contains("iris")) {
             IrisCompat.init();
         }
     }
     public static boolean lateInitDone = false;
     public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
-        if (isActive("lambdynlights")) {
+        if (FabricLoader.getInstance().isModLoaded("lambdynlights") && !PuzzleConfig.disabledIntegrations.contains("lambdynlights")) {
             DynamicLightsConfig ldlConfig = LambDynLights.get().config;
 
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
@@ -191,7 +186,7 @@ public class PuzzleClient implements ClientModInitializer {
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").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.translatable("").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())));
         }
-        if (isActive("citresewn") && CITResewnConfig.INSTANCE != null) {
+        if (FabricLoader.getInstance().isModLoaded("citresewn") && !PuzzleConfig.disabledIntegrations.contains("citresewn") && CITResewnConfig.INSTANCE != null) {
             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) -> {
@@ -221,13 +216,13 @@ public class PuzzleClient implements ClientModInitializer {
                 citConfig.write();
             }));
         }
-        if (isActive("lambdabettergrass")) {
+        if (FabricLoader.getInstance().isModLoaded("lambdabettergrass") && !PuzzleConfig.disabledIntegrations.contains("lambdabettergrass")) {
             LBGConfig lbgConfig = LambdaBetterGrass.get().config;
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("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())));
         }
-        if (isActive("cem") && FabricLoader.getInstance().isModLoaded("completeconfig")) {
+        if (FabricLoader.getInstance().isModLoaded("cem") && FabricLoader.getInstance().isModLoaded("completeconfig") && !PuzzleConfig.disabledIntegrations.contains("cem")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Custom Entity Models")));
             CemConfig cemConfig = (CemConfig) CemConfigFairy.getConfig();
             CemOptions cemOptions = CemConfigFairy.getConfig();
@@ -244,7 +239,7 @@ public class PuzzleClient implements ClientModInitializer {
                 cemConfig.save();
             }));
         }
-        if (isActive("continuity")) {
+        if (FabricLoader.getInstance().isModLoaded("continuity") && !PuzzleConfig.disabledIntegrations.contains("continuity")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
             ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
             contConfig.getOptionMapView().forEach((s, option) -> {
@@ -259,7 +254,7 @@ public class PuzzleClient implements ClientModInitializer {
                 } catch (Exception ignored) {}
             });
         }
-        if (isActive("entity_texture_features")) {
+        if (FabricLoader.getInstance().isModLoaded("entity_texture_features") && !PuzzleConfig.disabledIntegrations.contains("entity_texture_features")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(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) -> {
@@ -284,38 +279,6 @@ public class PuzzleClient implements ClientModInitializer {
                 ETFApi.saveETFConfigChangesAndResetETF();
             }));
         }
-        if (isActive("exordium")) {
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.title")));
-            Config exordiumConfig = ExordiumModBase.instance.config;
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.enableGui"), (button) -> button.setMessage(exordiumConfig.enabledGui ? YES : NO), (button) -> {
-                exordiumConfig.enabledGui = !exordiumConfig.enabledGui;
-                ExordiumModBase.instance.writeConfig();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(5, 60, Text.translatable("text.exordium.targetFramerateGui"), () -> exordiumConfig.targetFPSIngameGui, (button) -> button.setMessage(Text.literal(exordiumConfig.targetFPSIngameGui+"")), (slider) -> {
-                exordiumConfig.targetFPSIngameGui = slider.getInt();
-                ExordiumModBase.instance.writeConfig();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.enabledGuiAnimationSpeedup"), (button) -> button.setMessage(exordiumConfig.enabledGuiAnimationSpeedup ? YES : NO), (button) -> {
-                exordiumConfig.enabledGuiAnimationSpeedup = !exordiumConfig.enabledGuiAnimationSpeedup;
-                ExordiumModBase.instance.writeConfig();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(30, 120, Text.translatable("text.exordium.targetFPSIngameGuiAnimated"), () -> exordiumConfig.targetFPSIngameGuiAnimated, (button) -> button.setMessage(Text.literal(exordiumConfig.targetFPSIngameGuiAnimated+"")), (slider) -> {
-                exordiumConfig.targetFPSIngameGuiAnimated = slider.getInt();
-                ExordiumModBase.instance.writeConfig();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.enableNametagScreenBuffering"), (button) -> button.setMessage(exordiumConfig.enableNametagScreenBuffering ? YES : NO), (button) -> {
-                exordiumConfig.enableNametagScreenBuffering = !exordiumConfig.enableNametagScreenBuffering;
-                ExordiumModBase.instance.writeConfig();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(30, 80, Text.translatable("text.exordium.targetFPSNameTags"), () -> exordiumConfig.targetFPSNameTags, (button) -> button.setMessage(Text.literal(exordiumConfig.targetFPSNameTags+"")), (slider) -> {
-                exordiumConfig.targetFPSNameTags = slider.getInt();
-                ExordiumModBase.instance.writeConfig();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.enableSignBuffering"), (button) -> button.setMessage(exordiumConfig.enableSignBuffering ? YES : NO), (button) -> {
-                exordiumConfig.enableSignBuffering = !exordiumConfig.enableSignBuffering;
-                ExordiumModBase.instance.writeConfig();
-            }));
-        }
         lateInitDone = true;
     }
     public static Text message(CITResewnConfig config) {
@@ -343,7 +306,4 @@ public class PuzzleClient implements ClientModInitializer {
                 return (Text.translatable("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color);
             }
     }
-    public static boolean isActive(String modid) {
-        return PlatformFunctions.isModLoaded(modid) && !PuzzleConfig.disabledIntegrations.contains(modid);
-    }
 }

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java

@@ -1,33 +1,20 @@
 package net.puzzlemc.gui.screen;
 
-import com.google.common.collect.Lists;
-import net.minecraft.client.gui.tab.GridScreenTab;
-import net.minecraft.client.gui.tab.Tab;
-import net.minecraft.client.gui.tab.TabManager;
-import net.minecraft.client.gui.widget.TabNavigationWidget;
 import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.Text;
 import net.puzzlemc.gui.PuzzleApi;
 import net.puzzlemc.gui.PuzzleClient;
-import net.puzzlemc.gui.screen.widget.PuzzleOptionListWidget;
+import net.puzzlemc.gui.screen.page.GraphicsPage;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
+import net.puzzlemc.gui.screen.page.MiscPage;
+import net.puzzlemc.gui.screen.page.PerformancePage;
+import net.puzzlemc.gui.screen.page.ResourcesPage;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;
 
-import java.util.List;
 import java.util.Objects;
 
 public class PuzzleOptionsScreen extends Screen {
-    public PuzzleOptionListWidget list;
-    public List<Text> tooltip = null;
-    public TabManager tabManager = new TabManager(a -> {}, a -> {});
-    public Tab prevTab;
-    public TabNavigationWidget tabNavigation;
-    public static Text graphicsTab = Text.translatable("puzzle.page.graphics");
-    public static Text miscTab = Text.translatable("puzzle.page.misc");
-    public static Text performanceTab = Text.translatable("puzzle.page.performance");
-    public static Text resourcesTab = Text.translatable("puzzle.page.resources");
 
     public PuzzleOptionsScreen(Screen parent) {
         super(Text.translatable("puzzle.screen.title"));
@@ -37,67 +24,25 @@ public class PuzzleOptionsScreen extends Screen {
 
     @Override
     protected void init() {
-        if (!PuzzleClient.lateInitDone) PuzzleClient.lateInit();
-
-        List<Tab> tabs = Lists.newArrayList();
-        if (!PuzzleApi.GRAPHICS_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(graphicsTab));
-        if (!PuzzleApi.RESOURCE_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(resourcesTab));
-        if (!PuzzleApi.PERFORMANCE_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(performanceTab));
-        if (!PuzzleApi.MISC_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(miscTab));
-
-        tabNavigation = TabNavigationWidget.builder(tabManager, this.width).tabs(tabs.toArray(new Tab[0])).build();
-        if (tabs.size() > 1) this.addDrawableChild(tabNavigation);
-        tabNavigation.selectTab(0, false);
-        tabNavigation.init();
-        prevTab = tabManager.getCurrentTab();
-        this.addDrawableChild(tabNavigation);
-        this.list = new PuzzleOptionListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
-        fillList();
-        this.addSelectableChild(this.list);
-
         super.init();
+        if (!PuzzleClient.lateInitDone) PuzzleClient.lateInit();
+        GraphicsPage graphicsPage = new GraphicsPage(this);
+        MiscPage miscPage = new MiscPage(this);
+        PerformancePage performancePage = new PerformancePage(this);
+        ResourcesPage resourcesPage = new ResourcesPage(this);
 
-        this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)).dimensions(this.width / 2 - 100, this.height - 28, 200, 20).build());
+        if (!PuzzleApi.GRAPHICS_OPTIONS.isEmpty()) this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 48 - 6, 150, 20, graphicsPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(graphicsPage)));
-    }
+        if (!PuzzleApi.RESOURCE_OPTIONS.isEmpty()) this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 48 - 6, 150, 20, resourcesPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(resourcesPage)));
-    private void fillList() {
+        if (!PuzzleApi.PERFORMANCE_OPTIONS.isEmpty()) this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 72 - 6, 150, 20, performancePage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(performancePage)));
-        List<PuzzleWidget> options = List.of();
+        if (!PuzzleApi.MISC_OPTIONS.isEmpty()) this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 72 - 6, 150, 20, miscPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(miscPage)));
-        if (tabManager.getCurrentTab() == null) return;
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height / 6 + 168, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
-        else if (tabManager.getCurrentTab().getTitle().equals(graphicsTab)) options = PuzzleApi.GRAPHICS_OPTIONS;
-        else if (tabManager.getCurrentTab().getTitle().equals(miscTab)) options = PuzzleApi.MISC_OPTIONS;
-        else if (tabManager.getCurrentTab().getTitle().equals(performanceTab)) options = PuzzleApi.PERFORMANCE_OPTIONS;
-        else if (tabManager.getCurrentTab().getTitle().equals(resourcesTab)) options = PuzzleApi.RESOURCE_OPTIONS;
-        list.addAll(options);
-    }
-    @Override
-    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        if (this.tabNavigation.trySwitchTabsWithKey(keyCode)) return true;
-        return super.keyPressed(keyCode, scanCode, modifiers);
-    }
-    @Override
-    public void tick() {
-        super.tick();
-        if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
-            prevTab = tabManager.getCurrentTab();
-            this.list.clear();
-            fillList();
-            list.setScrollAmount(0);
-        }
     }
 
     @Override
     public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
         this.renderBackground(matrices);
-        if (client != null && client.world != null) this.list.setRenderBackground(false);
-        this.list.render(matrices, mouseX, mouseY, delta);
 
-        drawCenteredTextWithShadow(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
         super.render(matrices, mouseX, mouseY, delta);
-        if (tooltip != null) {
+        drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
-            if (this.list.getFocused() != null && (this.list.getHoveredEntry() == null || this.list.getHoveredEntry().button == null || !this.list.getHoveredEntry().button.isMouseOver(mouseX, mouseY))) {
-                renderTooltip(matrices, tooltip, this.list.getFocused().getX(), this.list.getFocused().getY() + (this.list.getFocused().getHeight() * 2));
-            }
-            else renderTooltip(matrices, tooltip, mouseX, mouseY);
-        }
-        tooltip = null;
     }
 }

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/AbstractPuzzleOptionsPage.java

@@ -0,0 +1,53 @@
+package net.puzzlemc.gui.screen.page;
+
+import net.minecraft.screen.ScreenTexts;
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.screen.widget.PuzzleOptionListWidget;
+import net.puzzlemc.gui.screen.widget.PuzzleWidget;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.util.math.MatrixStack;
+
+import java.util.List;
+import java.util.Objects;
+
+public abstract class AbstractPuzzleOptionsPage extends Screen {
+    public PuzzleOptionListWidget list;
+    private final List<PuzzleWidget> options;
+    public List<Text> tooltip = null;
+
+    public AbstractPuzzleOptionsPage(Screen parent, Text title, List<PuzzleWidget> options) {
+        super(title);
+        this.parent = parent;
+        this.options = options;
+    }
+    private final Screen parent;
+
+    @Override
+    protected void init() {
+        this.list = new PuzzleOptionListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
+        list.addAll(options);
+        this.addSelectableChild(this.list);
+
+        super.init();
+
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
+    }
+
+    @Override
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        this.renderBackground(matrices);
+        if (client != null && client.world != null) this.list.setRenderBackground(false);
+        this.list.render(matrices, mouseX, mouseY, delta);
+
+        drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
+        super.render(matrices, mouseX, mouseY, delta);
+        if (tooltip != null) {
+            if (this.list.getFocused() != null && (this.list.getHoveredEntry() == null || this.list.getHoveredEntry().button == null || !this.list.getHoveredEntry().button.isMouseOver(mouseX, mouseY))) {
+                renderTooltip(matrices, tooltip, this.list.getFocused().getX() + this.list.getFocused().getWidth(), this.list.getFocused().getY() + (this.list.getFocused().getHeight() * 2));
+            }
+            else renderTooltip(matrices, tooltip, mouseX, mouseY);
+        }
+        tooltip = null;
+    }
+}

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/GraphicsPage.java

@@ -0,0 +1,12 @@
+package net.puzzlemc.gui.screen.page;
+
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.PuzzleApi;
+import net.minecraft.client.gui.screen.Screen;
+
+public class GraphicsPage extends AbstractPuzzleOptionsPage {
+
+    public GraphicsPage(Screen parent) {
+        super(parent, Text.translatable("puzzle.page.graphics"), PuzzleApi.GRAPHICS_OPTIONS);
+    }
+}

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/MiscPage.java

@@ -0,0 +1,12 @@
+package net.puzzlemc.gui.screen.page;
+
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.PuzzleApi;
+import net.minecraft.client.gui.screen.Screen;
+
+public class MiscPage extends AbstractPuzzleOptionsPage {
+
+    public MiscPage(Screen parent) {
+        super(parent, Text.translatable("puzzle.page.misc"), PuzzleApi.MISC_OPTIONS);
+    }
+}

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/PerformancePage.java

@@ -0,0 +1,12 @@
+package net.puzzlemc.gui.screen.page;
+
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.PuzzleApi;
+import net.minecraft.client.gui.screen.Screen;
+
+public class PerformancePage extends AbstractPuzzleOptionsPage {
+
+    public PerformancePage(Screen parent) {
+        super(parent, Text.translatable("puzzle.page.performance"), PuzzleApi.PERFORMANCE_OPTIONS);
+    }
+}

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/ResourcesPage.java

@@ -0,0 +1,12 @@
+package net.puzzlemc.gui.screen.page;
+
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.PuzzleApi;
+import net.minecraft.client.gui.screen.Screen;
+
+public class ResourcesPage extends AbstractPuzzleOptionsPage {
+
+    public ResourcesPage(Screen parent) {
+        super(parent, Text.translatable("puzzle.page.resources"), PuzzleApi.RESOURCE_OPTIONS);
+    }
+}

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleButtonWidget.java

@@ -4,13 +4,11 @@ import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
-import java.util.function.Supplier;
-
 public class PuzzleButtonWidget extends ButtonWidget {
     private final PuzzleWidget.TextAction title;
 
     public PuzzleButtonWidget(int x, int y, int width, int height, PuzzleWidget.TextAction title, PressAction onPress) {
-        super(x, y, width, height, Text.of(""), onPress, Supplier::get);
+        super(x, y, width, height, Text.of(""), onPress);
         this.title = title;
     }
     @Override

puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java

@@ -12,7 +12,7 @@ import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableTextContent;
-import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
+import net.puzzlemc.gui.screen.page.AbstractPuzzleOptionsPage;
 import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
@@ -46,9 +46,6 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
         }
     }
 
-    public void clear() {
-        super.clearEntries();
-    }
     public int getRowWidth() {
         return 400;
     }
@@ -82,13 +79,13 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
 
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
             if (button != null) {
-                button.setY(y);
+                button.y = y;
                 button.render(matrices, mouseX, mouseY, tickDelta);
             }
-            if (button == null) drawCenteredTextWithShadow(matrices,textRenderer, Text.literal("－－－－－－ ").append(text).append(" －－－－－－"),x + 200,y+5,0xFFFFFF);
+            if (button == null) drawCenteredText(matrices,textRenderer, Text.literal("－－－－－－ ").append(text).append(" －－－－－－"),x + 200,y+5,0xFFFFFF);
             else drawTextWithShadow(matrices,textRenderer, text,x+15,y+5,0xFFFFFF);
 
-            if (!(client.currentScreen instanceof PuzzleOptionsScreen page)) return;
+            if (!(client.currentScreen instanceof AbstractPuzzleOptionsPage page)) return;
             if (button != null && (button.isMouseOver(mouseX, mouseY) || ((page.list.getHoveredEntry() == null || page.list.getHoveredEntry().button == null || !page.list.getHoveredEntry().button.isMouseOver(mouseX, mouseY)) && button.isFocused())) && text.getContent() instanceof TranslatableTextContent content) {
                 String key = null;
                 if (I18n.hasTranslation(content.getKey() + ".tooltip")) key = content.getKey() + ".tooltip";
@@ -108,10 +105,10 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
             }
         }
         public int getY() {
-            return button.getY();
+            return button.y;
         }
         public int getX() {
-            return button.getX();
+            return button.x;
         }
         public int getHeight() {
             return button.getHeight();

puzzle-models/src/main/java/net/puzzlemc/models/mixin/MixinModelElementDeserializer.java

@@ -4,8 +4,8 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import net.minecraft.client.render.model.json.ModelElement;
 import net.minecraft.util.JsonHelper;
+import net.minecraft.util.math.Vec3f;
 import net.puzzlemc.core.config.PuzzleConfig;
-import org.joml.Vector3f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ModelElement.Deserializer.class)
 public abstract class MixinModelElementDeserializer {
-    @Shadow protected abstract Vector3f deserializeVec3f(JsonObject object, String name);
+    @Shadow protected abstract Vec3f deserializeVec3f(JsonObject object, String name);
 
     @Inject(at = @At("HEAD"),method = "deserializeRotationAngle", cancellable = true)
     private void puzzle$deserializeRotationAngle(JsonObject object, CallbackInfoReturnable<Float> cir) {
@@ -24,10 +24,10 @@ public abstract class MixinModelElementDeserializer {
         }
     }
     @Inject(at = @At("HEAD"),method = "deserializeTo", cancellable = true)
-    private void puzzle$deserializeTo(JsonObject object, CallbackInfoReturnable<Vector3f> cir) {
+    private void puzzle$deserializeTo(JsonObject object, CallbackInfoReturnable<Vec3f> cir) {
         if (PuzzleConfig.biggerModels) {
-            Vector3f vec3f = this.deserializeVec3f(object, "to");
+            Vec3f vec3f = this.deserializeVec3f(object, "to");
-            if (!(vec3f.x < -32.0F) && !(vec3f.y < -32.0F) && !(vec3f.z < -32.0F) && !(vec3f.x > 48.0F) && !(vec3f.y > 48.0F) && !(vec3f.z > 48.0F)) {
+            if (!(vec3f.getX() < -32.0F) && !(vec3f.getY() < -32.0F) && !(vec3f.getZ() < -32.0F) && !(vec3f.getX() > 48.0F) && !(vec3f.getY() > 48.0F) && !(vec3f.getZ() > 48.0F)) {
                 cir.setReturnValue(vec3f);
             } else {
                 throw new JsonParseException("'to' specifier exceeds the allowed boundaries: " + vec3f);
@@ -35,10 +35,10 @@ public abstract class MixinModelElementDeserializer {
         }
     }
     @Inject(at = @At("HEAD"),method = "deserializeFrom", cancellable = true)
-    private void puzzle$deserializeFrom(JsonObject object, CallbackInfoReturnable<Vector3f> cir) {
+    private void puzzle$deserializeFrom(JsonObject object, CallbackInfoReturnable<Vec3f> cir) {
         if (PuzzleConfig.biggerModels) {
-            Vector3f vec3f = this.deserializeVec3f(object, "from");
+            Vec3f vec3f = this.deserializeVec3f(object, "from");
-            if (!(vec3f.x < -32.0F) && !(vec3f.y < -32.0F) && !(vec3f.z < -32.0F) && !(vec3f.x > 48.0F) && !(vec3f.y > 48.0F) && !(vec3f.z > 48.0F)) {
+            if (!(vec3f.getX() < -32.0F) && !(vec3f.getY() < -32.0F) && !(vec3f.getZ() < -32.0F) && !(vec3f.getX() > 48.0F) && !(vec3f.getY() > 48.0F) && !(vec3f.getZ() > 48.0F)) {
                 cir.setReturnValue(vec3f);
             } else {
                 throw new JsonParseException("'from' specifier exceeds the allowed boundaries: " + vec3f);

puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java

@@ -1,10 +1,7 @@
 package net.puzzlemc.splashscreen;
 
-import com.mojang.blaze3d.platform.TextureUtil;
-import com.mojang.blaze3d.systems.RenderSystem;
 import eu.midnightdust.lib.util.MidnightColorUtil;
 import net.fabricmc.api.ClientModInitializer;
-import net.minecraft.client.texture.AbstractTexture;
 import net.minecraft.client.texture.NativeImageBackedTexture;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.ColorHelper;
@@ -25,13 +22,14 @@ import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 
 import java.awt.*;
-import java.io.*;
+import java.io.File;
-import java.net.URL;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.util.Objects;
 import java.util.Properties;
 
 public class PuzzleSplashScreen implements ClientModInitializer {
@@ -68,6 +66,10 @@ public class PuzzleSplashScreen implements ClientModInitializer {
             public Identifier getFabricId() {
                 return new Identifier("puzzle", "splash_screen");
             }
+
+            public void method_14491(ResourceManager manager) {
+                reload(manager);
+            }
             @Override
             public void reload(ResourceManager manager) {
                 if (PuzzleConfig.resourcepackSplashScreen) {
@@ -104,7 +106,8 @@ public class PuzzleSplashScreen implements ClientModInitializer {
                     manager.findResources("textures", path -> path.getPath().contains("mojangstudios.png")).forEach((id, resource) -> {
                         try (InputStream stream = manager.getResource(id).get().getInputStream()) {
                             Files.copy(stream, LOGO_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
-                            client.getTextureManager().registerTexture(LOGO, new DynamicLogoTexture());
+                            InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
+                            client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input)));
                         } catch (Exception e) {
                             LogManager.getLogger("Puzzle").error("Error occurred while loading custom minecraft logo " + id.toString(), e);
                         }
@@ -135,9 +138,9 @@ public class PuzzleSplashScreen implements ClientModInitializer {
 
         protected TextureData loadTextureData(ResourceManager resourceManager) {
             MinecraftClient minecraftClient = MinecraftClient.getInstance();
-            DefaultResourcePack defaultResourcePack = minecraftClient.getDefaultResourcePack();
+            DefaultResourcePack defaultResourcePack = minecraftClient.getResourcePackProvider().getPack();
             try {
-                InputStream inputStream = Objects.requireNonNull(defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO)).get();
+                InputStream inputStream = defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO);
                 TextureData var6;
                 try {
                     var6 = new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(inputStream));
@@ -152,18 +155,4 @@ public class PuzzleSplashScreen implements ClientModInitializer {
             }
         }
     }
-    @Environment(EnvType.CLIENT)
-    public static class DynamicLogoTexture extends ResourceTexture {
-        public DynamicLogoTexture() {
-            super(LOGO);
-        }
-        protected TextureData loadTextureData(ResourceManager resourceManager) {
-            try {
-                InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
-                return new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(input));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
 }

puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java

@@ -45,7 +45,11 @@ public abstract class MixinSplashScreen extends Overlay {
     private static void puzzle$initSplashscreen(MinecraftClient client, 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());
+                try {
+                    InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
+                    client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input)));
+                } catch (IOException ignored) {
+                }
             }
             if (PuzzleSplashScreen.BACKGROUND_TEXTURE.toFile().exists()) {
                 try {
@@ -64,7 +68,7 @@ public abstract class MixinSplashScreen extends Overlay {
     private void puzzle$betterBlend(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (PuzzleConfig.disableBlend) RenderSystem.defaultBlendFunc();
     }
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/Window;getScaledWidth()I", shift = At.Shift.BEFORE, ordinal = 2))
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/Window;getScaledWidth()I", shift = At.Shift.BEFORE))
     private void puzzle$renderSplashBackground(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE)) {
             int width = client.getWindow().getScaledWidth();
@@ -83,7 +87,7 @@ public abstract class MixinSplashScreen extends Overlay {
             RenderSystem.enableBlend();
             RenderSystem.blendEquation(32774);
             RenderSystem.defaultBlendFunc();
-            RenderSystem.setShader(GameRenderer::getPositionTexProgram);
+            RenderSystem.setShader(GameRenderer::getPositionTexShader);
             RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, s);
             drawTexture(matrices, 0, 0, 0, 0, 0, width, height, width, height);
             RenderSystem.defaultBlendFunc();
@@ -92,11 +96,11 @@ public abstract class MixinSplashScreen extends Overlay {
     }
     @Inject(method = "renderProgressBar", at = @At("HEAD"))
     private void puzzle$addProgressBarBackground(MatrixStack matrices, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
+        RenderSystem.disableBlend();
         if (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) return;
         long l = Util.getMeasuringTimeMs();
         float f = this.reloadCompleteTime > -1L ? (float)(l - this.reloadCompleteTime) / 1000.0F : -1.0F;
         int m = MathHelper.ceil((1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F)) * 255.0F);
-        RenderSystem.disableBlend();
         fill(matrices, minX, minY, maxX, maxY, withAlpha(PuzzleConfig.progressBarBackgroundColor, m));
     }
 

src/main/resources/assets/puzzle/lang/de_de.json

@@ -1,10 +1,10 @@
 {
 	"puzzle.text.update_available":"Ein Update ist verfügbar!",
 	"puzzle.screen.title":"Puzzle Einstellungen",
-	"puzzle.page.graphics":"Grafik",
+	"puzzle.page.graphics":"Grafik Einstellungen",
-	"puzzle.page.resources":"Resourcen",
+	"puzzle.page.resources":"Resourcen Einstellungen",
-	"puzzle.page.performance":"Performance",
+	"puzzle.page.performance":"Performance Einstellungen",
-	"puzzle.page.misc":"Sonstiges",
+	"puzzle.page.misc":"Sonstige Einstellungen",
 	"puzzle.option.check_for_updates":"Auf Updates überprüfen",
 	"puzzle.option.show_version_info":"Zeige Informationen über Puzzle's Version",
 	"puzzle.option.resourcepack_splash_screen":"Nutze Resourcepack-Ladebildschirm",

src/main/resources/assets/puzzle/lang/el_gr.json

@@ -1,10 +1,10 @@
 {
 	"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.show_version_info":"Εμφάνηση έκδοσης του Puzzle",
 	"puzzle.option.resourcepack_splash_screen":"Οθόνη φόρτωσης πακέτου πόρων",

src/main/resources/assets/puzzle/lang/en_us.json

@@ -1,10 +1,10 @@
 {
 	"puzzle.text.update_available":"An update is available!",
 	"puzzle.screen.title":"Puzzle Settings",
-	"puzzle.page.graphics":"Graphics",
+	"puzzle.page.graphics":"Graphics Settings",
-	"puzzle.page.resources":"Resource",
+	"puzzle.page.resources":"Resource Settings",
-	"puzzle.page.performance":"Performance",
+	"puzzle.page.performance":"Performance Settings",
-	"puzzle.page.misc":"Miscellaneous",
+	"puzzle.page.misc":"Miscellaneous Settings",
 	"puzzle.option.check_for_updates":"Check for Updates",
 	"puzzle.option.check_for_updates.tooltip":"Enables Puzzle's built-in update checker",
 	"puzzle.option.show_version_info":"Show Puzzle version info",
@@ -18,9 +18,6 @@
 	"puzzle.option.bigger_custom_models":"Bigger Custom Models",
 	"puzzle.option.bigger_custom_models.tooltip":"Increases the limit of\ncustom block/item model sizes\nfrom 3x3x3 to 5x5x5",
 	"puzzle.midnightconfig.title":"Puzzle Advanced Config",
-	"puzzle.midnightconfig.category.gui":"GUI",
-	"puzzle.midnightconfig.category.features":"Features",
-	"puzzle.midnightconfig.category.debug":"Debug",
 	"puzzle.midnightconfig.tooltip":"Options for advanced users only",
 
 	"cullleaves.puzzle.option.enabled": "Cull Leaves",
@@ -36,7 +33,5 @@
 	"config.dynamicfps.restore_when_hovered.tooltip": "Whether or not to stop the\nFPS limiting while Minecraft is previewed\n(i.e. hovered on task bar or dock)",
 	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Run a garbage collector while\nMinecraft is not focused to\nfree up some RAM",
 	"config.dynamicfps.unfocused_volume.tooltip": "The volume the game should play\nsound at while unfocused\n(i.e. another window is selected)",
-	"config.dynamicfps.hidden_volume.tooltip": "The volume the game should play\nsound at while not visible\n(i.e. minimized, covered by other windows\nor on another virtual desktop)",
+	"config.dynamicfps.hidden_volume.tooltip": "The volume the game should play\nsound at while not visible\n(i.e. minimized, covered by other windows\nor on another virtual desktop)"
-	"entity_texture_features.puzzle.emissive_type.brighter": "§eBrighter",
-	"entity_texture_features.puzzle.emissive_type.default": "§6Default"
 }

src/main/resources/assets/puzzle/lang/et_ee.json

@@ -1,10 +1,10 @@
 {
 	"puzzle.text.update_available":"Uuendus on saadaval!",
 	"puzzle.screen.title":"Puzzle sätted",
-	"puzzle.page.graphics":"Graafika",
+	"puzzle.page.graphics":"Graafikasätted",
-	"puzzle.page.resources":"Ressursi",
+	"puzzle.page.resources":"Ressursisätted",
-	"puzzle.page.performance":"Jõudlus",
+	"puzzle.page.performance":"Jõudlussätted",
-	"puzzle.page.misc":"Muud",
+	"puzzle.page.misc":"Muud sätted",
 	"puzzle.option.check_for_updates":"Uuenduste kontroll",
 	"puzzle.option.show_version_info":"Kuva Puzzle versiooniteavet",
 	"puzzle.option.resourcepack_splash_screen":"Kasuta ressursipaki laadimiskuva",

src/main/resources/assets/puzzle/lang/ko_kr.json

@@ -1,10 +1,10 @@
 {
 	"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.show_version_info":"Puzzle 버전 정보 보기",
 	"puzzle.option.resourcepack_splash_screen":"스플래시 화면에서 리소스팩 사용",

src/main/resources/assets/puzzle/lang/pl_pl.json

@@ -1,10 +1,10 @@
 {
 	"puzzle.text.update_available":"Aktualizacja jest dostępna!",
 	"puzzle.screen.title":"Ustawienia Puzzle",
-	"puzzle.page.graphics":"Grafiki",
+	"puzzle.page.graphics":"Ustawienia grafiki",
-	"puzzle.page.resources":"Zasobów",
+	"puzzle.page.resources":"Ustawienia zasobów",
-	"puzzle.page.performance":"Wydajności",
+	"puzzle.page.performance":"Ustawienia wydajności",
-	"puzzle.page.misc":"Ustawienia",
+	"puzzle.page.misc":"Różne ustawienia",
 	"puzzle.option.check_for_updates":"Sprawdź aktualizacje",
 	"puzzle.option.show_version_info":"Pokaż informacje o wersji Puzzle",
 	"puzzle.option.resourcepack_splash_screen":"Użyj ekranu powitalnego paczek zasobów",

src/main/resources/assets/puzzle/lang/pt_br.json

@@ -1,39 +0,0 @@
-{
-	"puzzle.text.update_available":"Uma atualização está disponível!",
-	"puzzle.screen.title":"Puzzle Definições",
-	"puzzle.page.graphics":"Gráficas",
-	"puzzle.page.resources":"Recursos",
-	"puzzle.page.performance":"Desempenho",
-	"puzzle.page.misc":"Diversas",
-	"puzzle.option.check_for_updates":"Verifique se há atualizações",
-	"puzzle.option.check_for_updates.tooltip":"Ativa o verificador de atualização integrado do Puzzle",
-	"puzzle.option.show_version_info":"Mostrar informações da versão do Puzzle",
-	"puzzle.option.show_version_info.tooltip":"Mostrar informações sobre o atual\nVersão do Puzzle e status de atualização em\na tela de título e o menu F3",
-	"puzzle.option.resourcepack_splash_screen":"Use a tela inicial do pacote de recursos",
-	"puzzle.option.resourcepack_splash_screen.tooltip":"Permite que os pacotes de recursos mudem a aparência\ndo carregamento do Minecraft/splash\ntela usando o formato OptiFine",
-	"puzzle.option.better_splash_screen_blend":"Melhor combinação do logotipo da tela inicial",
-	"puzzle.option.better_splash_screen_blend.tooltip":"Muda o tipo de mistura usado\npelo logotipo na tela inicial\npara trabalhar melhor com logotipos coloridos personalizados",
-	"puzzle.option.unlimited_model_rotations":"Rotações de modelo ilimitadas",
-	"puzzle.option.unlimited_model_rotations.tooltip":"Desbloqueia rotação total de 360° em modelos de itens/blocos personalizados",
-	"puzzle.option.bigger_custom_models":"Modelos personalizados maiores",
-	"puzzle.option.bigger_custom_models.tooltip":"Aumenta o limite de\ntamanhos de modelo de bloco/item personalizados\nde 3x3x3 a 5x5x5",
-	"puzzle.midnightconfig.title":"Configuração avançada do Puzzle",
-	"puzzle.midnightconfig.tooltip":"Opções apenas para usuários avançados",
-
-	"cullleaves.puzzle.option.enabled": "Abate de Folhas",
-	"cullleaves.puzzle.option.enabled.tooltip": "Ative o abate de folhas para melhorar o desempenho",
-	"iris.puzzle.option.enableShaders": "Ativar sombreadores",
-	"iris.puzzle.option.enableShaders.tooltip": "Habilitar ou não shaderpacks",
-	"iris.puzzle.option.open": "ABRIR",
-	"options.iris.shaderPackSelection.tooltip": "Abra uma tela para selecionar\nshaderpacks e configurá-los",
-	"lambdabettergrass.option.mode.tooltip": "Faz os lados de\nblocos de grama se conectam a\nblocos de grama adjacentes",
-	"lambdabettergrass.option.better_snow.tooltip": "Adiciona uma neve puramente visual/camada de musgo\na blocos não completos que\nestão rodeados de neve/musgo",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "Reduz o FPS do Minecraft quando desfocado\n(ou seja, outra janela está focada ou o jogo está oculto)\npara economizar energia e recursos do sistema",
-	"config.dynamicfps.unfocused_fps.tooltip": "A quantidade de quadros por segundo\nMinecraft é permitido\nrenderizar enquanto estiver fora de foco",
-	"config.dynamicfps.restore_when_hovered.tooltip": "Interromper ou não o\nLimitação de FPS enquanto o Minecraft é visualizado\n(ou seja, pairou na barra de tarefas ou dock)",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Execute um coletor de lixo enquanto\nMinecraft não está focado em\nliberar um pouco de RAM",
-	"config.dynamicfps.unfocused_volume.tooltip": "O volume que o jogo deve reproduzir\nsom enquanto desfocado\n(ou seja, outra janela é selecionada)",
-	"config.dynamicfps.hidden_volume.tooltip": "O volume que o jogo deve reproduzir\nsom em enquanto não visível\n(ou seja, minimizado, coberto por outras janelas\nem em outra área de trabalho virtual)",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§eMais brilhante",
-	"entity_texture_features.puzzle.emissive_type.default": "§6Padrão"
-}

src/main/resources/assets/puzzle/lang/ru_ru.json

@@ -1,10 +1,10 @@
 {
 	"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.show_version_info":"Показывать информацию о версии",
@@ -18,13 +18,10 @@
 	"puzzle.option.bigger_custom_models":"Увеличенный размер моделей",
 	"puzzle.option.bigger_custom_models.tooltip":"Увеличить предельный размер\nпользовательских моделей блоков\nи предметов с 3×3×3 до 5×5×5",
 	"puzzle.midnightconfig.title":"Расширенные настройки Puzzle",
-	"puzzle.midnightconfig.category.gui":"Интерфейс",
-	"puzzle.midnightconfig.category.features":"Функционал",
-	"puzzle.midnightconfig.category.debug":"Отладка",
 	"puzzle.midnightconfig.tooltip":"Только для продвинутых пользователей!",
 
-	"cullleaves.puzzle.option.enabled": "Отбраковка листьев",
+	"cullleaves.puzzle.option.enabled": "Отбраковка листвы",
-	"cullleaves.puzzle.option.enabled.tooltip": "Включить отбраковку блоков листьев\nдля улучшения производительности",
+	"cullleaves.puzzle.option.enabled.tooltip": "Включить отбраковку блоков листвы\nдля улучшения производительности",
 	"iris.puzzle.option.enableShaders": "Шейдеры",
 	"iris.puzzle.option.enableShaders.tooltip": "Включить выбранный набор шейдеров",
 	"iris.puzzle.option.open": "Выбрать  ",
@@ -38,11 +35,5 @@
 	"config.dynamicfps.unfocused_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Обычные",
+	"entity_texture_features.puzzle.emissive_type.default": "§6Обычные"
-
-	"modmenu.descriptionTranslation.puzzle": "Функции улучшения внешнего вида и производительности.",
-	"modmenu.descriptionTranslation.puzzle-base": "Общий код всех модулей Puzzle.",
-	"modmenu.descriptionTranslation.puzzle-gui": "Альтернативы Optifine, объединённые в едином меню.",
-	"modmenu.descriptionTranslation.puzzle-models": "Больше свободы моделям блоков и предметов!",
-	"modmenu.descriptionTranslation.puzzle-splashscreen": "Свой экран загрузки при помощи наборов ресурсов."
 }

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

@@ -1,39 +1,17 @@
 {
-	"puzzle.text.update_available": "有新版本可供升級！",
+	"puzzle.text.update_available":"有新版本可供升級！",
-	"puzzle.screen.title": "Puzzle 設定",
+	"puzzle.screen.title":"拼圖設置",
-	"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":"檢查更新",
-	"puzzle.option.check_for_updates.tooltip": "開啟 Puzzle 內建的更新檢查",
+	"puzzle.option.show_version_info":"顯示拼圖版本信息",
-	"puzzle.option.show_version_info": "顯示 Puzzle 版本信息",
+	"puzzle.option.resourcepack_splash_screen":"使用資源包的加載界面",
-	"puzzle.option.show_version_info.tooltip": "在標題畫面和 F3 選單上\n顯示有關目前 Puzzle 版本和更新狀態的資訊",
+	"puzzle.option.disable_splash_screen_blend":"禁止加載界面徽標渲染",
-	"puzzle.option.resourcepack_splash_screen": "使用資源包載入畫面",
+	"puzzle.option.emissive_textures":"發光貼圖",
-	"puzzle.option.resourcepack_splash_screen.tooltip": "使資源包可以使用 OptiFine 格式\n更改 Minecraft 的載入畫面",
+	"puzzle.option.unlimited_model_rotations":"無限模型旋轉",
-	"puzzle.option.better_splash_screen_blend": "更好的載入畫面圖示混和",
+	"puzzle.option.bigger_custom_models":"更大的自定義模型",
-	"puzzle.option.better_splash_screen_blend.tooltip": "更改激活畫面上標誌的混合方式\n以便更好地與自訂顏色的標誌配合使用",
+	"puzzle.option.render_layer_overrides":"覆蓋渲染層",
-	"puzzle.option.unlimited_model_rotations": "無限模型旋轉",
+	"puzzle.midnightconfig.title":"拼圖高級設置"
-	"puzzle.option.unlimited_model_rotations.tooltip": "在自訂方塊／物品模型上解鎖完整 360° 旋轉",
-	"puzzle.option.bigger_custom_models": "更大的自訂模型",
-	"puzzle.option.bigger_custom_models.tooltip": "增加將自訂方塊／物品模型大小\n從 3x3x3 增加到 5x5x5",
-	"puzzle.midnightconfig.title": "Puzzle 進階設定",
-	"puzzle.midnightconfig.tooltip": "給予進階使用者使用的選項",
-
-	"cullleaves.puzzle.option.enabled": "樹葉剔除",
-	"cullleaves.puzzle.option.enabled.tooltip": "開啟樹葉剔除以提升效能。",
-	"iris.puzzle.option.enableShaders": "開啟光影",
-	"iris.puzzle.option.enableShaders.tooltip": "開啟或關閉光影包",
-	"iris.puzzle.option.open": "開",
-	"options.iris.shaderPackSelection.tooltip": "開啟選擇畫面光影包和設定",
-	"lambdabettergrass.option.mode.tooltip": "讓草的側面連接相鄰的草塊",
-	"lambdabettergrass.option.better_snow.tooltip": "對雪塊／苔蘚方塊被包圍的不完整方塊\n增加視覺效果",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "當 Minecraft 失去焦點時限制 FPS\n（如切換到其他視窗或是遊戲被隱藏）\n以節省電源和系統資源",
-	"config.dynamicfps.unfocused_fps.tooltip": "當 Minecraft 失去焦點時允許的最大 FPS",
-	"config.dynamicfps.restore_when_hovered.tooltip": "開啟或關閉預覽 Mineceraft 時是否停止 FPS 限制\n（如停留在工作列或 Dock）",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "當 Minecraft 失去焦點時執行垃圾清理\n以減少一些記憶體",
-	"config.dynamicfps.unfocused_volume.tooltip": "當 Minecraft 失去焦點時撥放的音量\n（如選擇了另一個視窗）",
-	"config.dynamicfps.hidden_volume.tooltip": "遊戲在不可見時應該播放的音量\n（如最小化、被其他視窗覆蓋或在另一個虛擬桌面上）",
-	"entity_texture_features.puzzle.emissive_type.brighter": "§e更亮",
-	"entity_texture_features.puzzle.emissive_type.default": "§6預設"
 }