Puzzle 1.3.3 - Better Splashscreen

- Only apply puzzle-splashscreen when needed (fixes #34, fixes #8)

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 "0.10-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"
@@ -77,17 +77,6 @@ subprojects {
     version = rootProject.version
 }
 
-sourceSets {
-    testmod {
-        compileClasspath += main.compileClasspath
-        runtimeClasspath += main.runtimeClasspath
-    }
-    test {
-        compileClasspath += main.compileClasspath
-        runtimeClasspath += main.runtimeClasspath
-    }
-}
-
 subprojects.each { remapJar.dependsOn("${it.path}:remapJar") }
 
 repositories {
@@ -139,7 +128,7 @@ dependencies {
     modImplementation ("maven.modrinth:continuity:${project.continuity_version}")
     modImplementation ("maven.modrinth:animatica:${project.animatica_version}")
     modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
-    modImplementation ("curse.maven:custom-entity-models-cem-477078:${project.cem_version}")
+    modImplementation ("maven.modrinth:cem:${project.cem_version}")
     modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
 
     modImplementation("org.aperlambda:lambdajcommon:1.8.1") {

gradle.properties

@@ -3,29 +3,29 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.18.1
-	yarn_mappings=1.18.1+build.14
-	loader_version=0.13.3
+	minecraft_version=1.19
+	yarn_mappings=1.19+build.1
+	loader_version=0.14.6
 
 # Mod Properties
-	mod_version = 1.2.1
+	mod_version = 1.3.3
 	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.45.0+1.18
+	fabric_version=0.55.1+1.19
 	mod_menu_version = 2.0.13
 	
-	cull_leaves_version = 2.3.2
+	cull_leaves_version = 2.3.3
 	ldl_version = 2.1.0+1.17
-	lbg_version = 1.2.2+1.17
-	iris_version = 1.18.x-v1.1.4
+	lbg_version = 1.2.3+1.18
+	iris_version = 1.18.x-v1.2.4
 	continuity_version = 1.0.3+1.18
 	animatica_version = 0.2+1.18
 	cit_resewn_version = 1.0.1+1.18.2
-	cem_version = 3561474
+	cem_version = 0.7.1
 	complete_config_version = 1.0.0
-	spruceui_version=3.3.2+1.17
-	midnightlib_version=0.4.0
-	entitytexturefeatures_version=2.4.5
+	spruceui_version=3.3.3+1.18
+	midnightlib_version=0.5.2
+	entitytexturefeatures_version=3.0.0

puzzle-base/src/main/java/net/puzzlemc/core/PuzzleCore.java

@@ -7,7 +7,7 @@ import net.fabricmc.api.ClientModInitializer;
 
 public class PuzzleCore implements ClientModInitializer {
 
-    public final static String version = "Puzzle "+ FabricLoader.getInstance().getModContainer("puzzle").get().getMetadata().getVersion();
+    public final static String version = "Puzzle "+ (FabricLoader.getInstance().getModContainer("puzzle").isPresent() ? FabricLoader.getInstance().getModContainer("puzzle").get().getMetadata().getVersion() : "Test");
     public final static String name = "Puzzle";
     public final static String id = "puzzle";
     public final static String website = "https://github.com/PuzzleMC/Puzzle";

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

@@ -13,12 +13,12 @@ public class PuzzleConfig extends MidnightConfig {
     @Entry public static boolean checkUpdates = true;
     @Entry public static boolean showPuzzleInfo = true;
     @Entry public static boolean resourcepackSplashScreen = true;
-    @Entry public static boolean disableSplashScreenBlend = false;
-    @Entry public static boolean emissiveTextures = true;
     @Entry public static boolean unlimitedRotations = true;
     @Entry public static boolean biggerModels = true;
 
     @Entry public static int backgroundColor = 15675965;
     @Entry public static int progressBarColor = 16777215;
+    @Entry public static int progressBarBackgroundColor = 15675965;
     @Entry public static int progressFrameColor = 16777215;
+    @Entry public static boolean disableBlend = false;
 }

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

@@ -15,7 +15,7 @@ import java.util.List;
 
 @Mixin(DebugHud.class)
 public abstract class MixinDebugHud extends DrawableHelper {
-    @Inject(at = @At("RETURN"), method = "getRightText", cancellable = true)
+    @Inject(at = @At("RETURN"), method = "getRightText")
     private void puzzle$getRightText(CallbackInfoReturnable<List<String>> cir) {
         if (PuzzleConfig.showPuzzleInfo) {
             List<String> entries = cir.getReturnValue();

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

@@ -7,7 +7,6 @@ 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.text.TranslatableText;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Final;
@@ -40,7 +39,7 @@ public abstract class MixinTitleScreen extends Screen {
             puzzleText = Text.of(PuzzleCore.version);
         }
         else {
-            puzzleText = new TranslatableText("").append(Text.of(PuzzleCore.version + " | ")).append(new TranslatableText("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);
         }
     }
@@ -68,7 +67,7 @@ public abstract class MixinTitleScreen extends Screen {
     @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.chatLinksPrompt) {
+            if (Objects.requireNonNull(this.client).options.getChatLinksPrompt().getValue()) {
                 this.client.setScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
             } else {
                 Util.getOperatingSystem().open(PuzzleCore.updateURL);

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

@@ -1,17 +0,0 @@
-package net.puzzlemc.core.util;
-
-import java.awt.*;
-
-public class ColorUtil {
-    /**
-     * @credit https://stackoverflow.com/questions/4129666/how-to-convert-hex-to-rgb-using-java
-     * @param colorStr e.g. "FFFFFF"
-     * @return
-     */
-    public static Color hex2Rgb(String colorStr) {
-        return new Color(
-                Integer.valueOf( colorStr.substring( 0, 2 ), 16 ),
-                Integer.valueOf( colorStr.substring( 2, 4 ), 16 ),
-                Integer.valueOf( colorStr.substring( 4, 6 ), 16 ));
-    }
-}

puzzle-gui/build.gradle

@@ -43,7 +43,7 @@ dependencies {
  	modImplementation ("maven.modrinth:iris:${project.iris_version}")
 	modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
 	modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
-	modImplementation ("curse.maven:custom-entity-models-cem-477078:${project.cem_version}")
+	modImplementation ("maven.modrinth:cem:${project.cem_version}")
 	modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
 
 	modImplementation("org.aperlambda:lambdajcommon:1.8.1") {

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

@@ -6,7 +6,6 @@ import net.irisshaders.iris.api.v0.IrisApiConfig;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.puzzlemc.gui.screen.widget.PuzzleWidget;
 
 public class IrisCompat {
@@ -17,7 +16,7 @@ public class IrisCompat {
                 IrisApiConfig irisConfig = IrisApi.getInstance().getConfig();
                 irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());
             }));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
                 MinecraftClient client = MinecraftClient.getInstance();
                 client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen));
             }));

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

@@ -18,22 +18,18 @@ public class PuzzleApi {
 
     public static void addToGraphicsOptions(PuzzleWidget button) {
         GRAPHICS_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> Graphics Options");
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Graphics Options");
     }
     public static void addToMiscOptions(PuzzleWidget button) {
         MISC_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> Misc Options");
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Misc Options");
     }
     public static void addToPerformanceOptions(PuzzleWidget button) {
         PERFORMANCE_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + "- > Performance Options");
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + "- > Performance Options");
     }
     public static void addToResourceOptions(PuzzleWidget button) {
         RESOURCE_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> Resource Options");
-    }
-    @Deprecated public static void addToTextureOptions(PuzzleWidget button) {
-        RESOURCE_OPTIONS.add(button);
-        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> LEGACY Texture Options");
+        if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Resource Options");
     }
 }

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

@@ -5,7 +5,9 @@ import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
 import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
 import dev.lambdaurora.lambdynlights.LambDynLights;
 import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import eu.midnightdust.lib.config.AutoModMenu;
 import me.pepperbell.continuity.client.config.ContinuityConfig;
+import me.pepperbell.continuity.client.config.Option;
 import net.dorianpb.cem.internal.config.CemConfig;
 import net.dorianpb.cem.internal.config.CemConfigFairy;
 import net.dorianpb.cem.internal.config.CemOptions;
@@ -16,56 +18,49 @@ import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 import net.puzzlemc.splashscreen.PuzzleSplashScreen;
-import shcm.shsupercm.fabric.citresewn.CITResewn;
 import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
-import traben.entity_texture_features.client.ETF_CLIENT;
-import traben.entity_texture_features.client.ETF_METHODS;
+import traben.entity_texture_features.client.ETFClient;
 import traben.entity_texture_features.config.ETFConfig;
 import traben.entity_texture_features.config.ETFConfigScreen;
 
 public class PuzzleClient implements ClientModInitializer {
 
     public final static String id = "puzzle";
-    public static final Text YES = new TranslatableText("gui.yes").formatted(Formatting.GREEN);
-    public static final Text NO = new TranslatableText("gui.no").formatted(Formatting.RED);
+    public static final Text YES = Text.translatable("gui.yes").formatted(Formatting.GREEN);
+    public static final Text NO = Text.translatable("gui.no").formatted(Formatting.RED);
 
     @Override
     public void onInitializeClient() {
         MinecraftClient client = MinecraftClient.getInstance();
         PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("puzzle.option.check_for_updates"), (button) -> button.setMessage(PuzzleConfig.checkUpdates ? YES : NO), (button) -> {
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.option.check_for_updates"), (button) -> button.setMessage(PuzzleConfig.checkUpdates ? YES : NO), (button) -> {
             PuzzleConfig.checkUpdates = !PuzzleConfig.checkUpdates;
             PuzzleConfig.write(id);
         }));
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("puzzle.option.show_version_info"), (button) -> button.setMessage(PuzzleConfig.showPuzzleInfo ? YES : NO), (button) -> {
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.option.show_version_info"), (button) -> button.setMessage(PuzzleConfig.showPuzzleInfo ? YES : NO), (button) -> {
             PuzzleConfig.showPuzzleInfo = !PuzzleConfig.showPuzzleInfo;
             PuzzleConfig.write(id);
         }));
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("puzzle.midnightconfig.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
+        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")));
         if (FabricLoader.getInstance().isModLoaded("puzzle-splashscreen") && !PuzzleConfig.disabledIntegrations.contains("puzzle-splashscreen")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
+            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);
                 PuzzleSplashScreen.resetColors();
                 MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture());
             }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.disable_splash_screen_blend"), (button) -> button.setMessage(PuzzleConfig.disableSplashScreenBlend ? YES : NO), (button) -> {
-                PuzzleConfig.disableSplashScreenBlend = !PuzzleConfig.disableSplashScreenBlend;
-                PuzzleConfig.write(id);
-            }));
         }
         if (FabricLoader.getInstance().isModLoaded("puzzle-models") && !PuzzleConfig.disabledIntegrations.contains("puzzle-models")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
+            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);
             }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
                 PuzzleConfig.biggerModels = !PuzzleConfig.biggerModels;
                 PuzzleConfig.write(id);
             }));
@@ -81,51 +76,6 @@ public class PuzzleClient implements ClientModInitializer {
         if (FabricLoader.getInstance().isModLoaded("iris") && !PuzzleConfig.disabledIntegrations.contains("iris")) {
             IrisCompat.init();
         }
-
-        if (FabricLoader.getInstance().isModLoaded("continuity") && !PuzzleConfig.disabledIntegrations.contains("continuity")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
-            ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("options.continuity.disable_ctm"), (button) -> button.setMessage(contConfig.disableCTM.get() ? YES : NO), (button) -> {
-                contConfig.disableCTM.set(!contConfig.disableCTM.get());
-                contConfig.onChange();
-                contConfig.save();
-            }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("options.continuity.use_manual_culling"), (button) -> button.setMessage(contConfig.useManualCulling.get() ? YES : NO), (button) -> {
-                contConfig.useManualCulling.set(!contConfig.useManualCulling.get());
-                contConfig.onChange();
-                contConfig.save();
-            }));
-        }
-        if (FabricLoader.getInstance().isModLoaded("entity_texture_features") && !PuzzleConfig.disabledIntegrations.contains("entity_texture_features")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Entity Texture Features")));
-            ETFConfig etfConfig = ETF_CLIENT.ETFConfigData;
-            ETFConfigScreen etfConfigScreen = new ETFConfigScreen();
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Optifine Random mobs"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
-                etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
-                etfConfigScreen.saveConfig();
-                etfConfigScreen.resetVisuals();
-            }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Optifine Emissive entity textures"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
-                etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
-                etfConfigScreen.saveConfig();
-                etfConfigScreen.resetVisuals();
-            }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Emissive texture Z-Fighting / Shader patch"), (button) -> button.setMessage(etfConfig.doShadersEmissiveFix ? YES : NO), (button) -> {
-                etfConfig.doShadersEmissiveFix = !etfConfig.doShadersEmissiveFix;
-                etfConfigScreen.saveConfig();
-                etfConfigScreen.resetVisuals();
-            }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Blinking Mobs"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
-                etfConfig.enableBlinking = !etfConfig.enableBlinking;
-                etfConfigScreen.saveConfig();
-                etfConfigScreen.resetVisuals();
-            }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Player Skin Features"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
-                etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
-                etfConfigScreen.saveConfig();
-                etfConfigScreen.resetVisuals();
-            }));
-        }
     }
     public static boolean lateInitDone = false;
     public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
@@ -133,34 +83,34 @@ public class PuzzleClient implements ClientModInitializer {
             DynamicLightsConfig ldlConfig = LambDynLights.get().config;
 
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("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(new TranslatableText("").append("DynLights: ").append(new TranslatableText("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
+            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.translatable("").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.translatable("").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.translatable("").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.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 (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(new TranslatableText("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
                 citConfig.enabled = !citConfig.enabled;
                 citConfig.write();
                 MinecraftClient.getInstance().reloadResources();
             }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.mute_errors.title"), (button) -> button.setMessage(citConfig.mute_errors ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.mute_errors.title"), (button) -> button.setMessage(citConfig.mute_errors ? YES : NO), (button) -> {
                 citConfig.mute_errors = !citConfig.mute_errors;
                 citConfig.write();
             }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.mute_warns.title"), (button) -> button.setMessage(citConfig.mute_warns ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.mute_warns.title"), (button) -> button.setMessage(citConfig.mute_warns ? YES : NO), (button) -> {
                 citConfig.mute_warns = !citConfig.mute_warns;
                 citConfig.write();
             }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.broken_paths.title"), (button) -> button.setMessage(citConfig.broken_paths ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.broken_paths.title"), (button) -> button.setMessage(citConfig.broken_paths ? YES : NO), (button) -> {
                 citConfig.broken_paths = !citConfig.broken_paths;
                 citConfig.write();
             }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100,new TranslatableText("config.citresewn.cache_ms.title"), (slider) -> slider.setInt(citConfig.cache_ms),
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100,Text.translatable("config.citresewn.cache_ms.title"), (slider) -> slider.setInt(citConfig.cache_ms),
                     (button) -> button.setMessage(message(citConfig)),
                     (slider) -> {
                 try {
@@ -173,32 +123,77 @@ public class PuzzleClient implements ClientModInitializer {
         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(new TranslatableText("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
+            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 (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();
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.cem.use_optifine_folder"), (button) -> button.setMessage(cemConfig.useOptifineFolder() ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_optifine_folder"), (button) -> button.setMessage(cemConfig.useOptifineFolder() ? YES : NO), (button) -> {
                 ((CemConfigAccessor)cemOptions).setUseOptifineFolder(!cemConfig.useOptifineFolder());
                 cemConfig.save();
             }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.cem.use_new_model_creation_fix"), (button) -> button.setMessage(cemConfig.useTransparentParts() ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_new_model_creation_fix"), (button) -> button.setMessage(cemConfig.useTransparentParts() ? YES : NO), (button) -> {
                 ((CemConfigAccessor)cemOptions).setUseModelCreationFix(!cemConfig.useTransparentParts());
                 cemConfig.save();
             }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.cem.use_old_animations"), (button) -> button.setMessage(cemConfig.useOldAnimations() ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_old_animations"), (button) -> button.setMessage(cemConfig.useOldAnimations() ? YES : NO), (button) -> {
                 ((CemConfigAccessor)cemOptions).setUseOldAnimations(!cemConfig.useOldAnimations());
                 cemConfig.save();
             }));
         }
+        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) -> {
+                if (s.equals("use_manual_culling")) return;
+                try {
+                    Option.BooleanOption booleanOption = ((Option.BooleanOption)option);
+                    PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("options.continuity."+s), (button) -> button.setMessage(booleanOption.get() ? YES : NO), (button) -> {
+                        booleanOption.set(!booleanOption.get());
+                        contConfig.onChange();
+                        contConfig.save();
+                    }));
+                } catch (Exception ignored) {}
+            });
+        }
+        if (FabricLoader.getInstance().isModLoaded("entity_texture_features") && !PuzzleConfig.disabledIntegrations.contains("entity_texture_features")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.title")));
+            ETFConfig etfConfig = ETFClient.ETFConfigData;
+            ETFConfigScreen etfConfigScreen = new ETFConfigScreen();
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
+                etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
+                etfConfigScreen.saveConfig();
+                etfConfigScreen.resetVisuals();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
+                etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
+                etfConfigScreen.saveConfig();
+                etfConfigScreen.resetVisuals();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Emissive Texture Rendering Mode"), (button) -> button.setMessage(etfConfig.fullBrightEmissives ? Text.of("Brighter") : Text.of("Default")), (button) -> {
+                etfConfig.fullBrightEmissives  = !etfConfig.fullBrightEmissives ;
+                etfConfigScreen.saveConfig();
+                etfConfigScreen.resetVisuals();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
+                etfConfig.enableBlinking = !etfConfig.enableBlinking;
+                etfConfigScreen.saveConfig();
+                etfConfigScreen.resetVisuals();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Player Skin Features"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
+                etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
+                etfConfigScreen.saveConfig();
+                etfConfigScreen.resetVisuals();
+            }));
+        }
         lateInitDone = true;
     }
     public static Text message(CITResewnConfig config) {
         int ticks = config.cache_ms;
             if (ticks <= 1) {
-                return (new TranslatableText("config.citresewn.cache_ms.ticks." + ticks)).formatted(Formatting.AQUA);
+                return (Text.translatable("config.citresewn.cache_ms.ticks." + ticks)).formatted(Formatting.AQUA);
             } else {
                 Formatting color = Formatting.DARK_RED;
                 if (ticks <= 40) {
@@ -217,7 +212,7 @@ public class PuzzleClient implements ClientModInitializer {
                     color = Formatting.GREEN;
                 }
 
-                return (new TranslatableText("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color);
+                return (Text.translatable("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color);
             }
     }
 }

puzzle-gui/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java

@@ -1,6 +1,8 @@
 package net.puzzlemc.gui.mixin;
 
+import eu.midnightdust.core.config.MidnightLibConfig;
 import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.util.Identifier;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.gui.PuzzleClient;
@@ -8,7 +10,6 @@ import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -25,8 +26,12 @@ public abstract class MixinOptionsScreen extends Screen {
     }
 
     @Inject(at = @At("HEAD"), method = "init")
-    private void midnightlib$init(CallbackInfo ci) {
-        if (PuzzleConfig.enablePuzzleButton)
-            this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 - 178, this.height / 6 - 12, 20, 20, 0, 0, 20, PUZZLE_ICON_TEXTURE, 32, 64, (buttonWidget) -> (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), new TranslatableText("midnightlib.overview.title")));
+    private void puzzle$init(CallbackInfo ci) {
+        if (PuzzleConfig.enablePuzzleButton) {
+            int i = 0;
+            if (FabricLoader.getInstance().isModLoaded("lod")) i = i + 358;
+            if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.FALSE)) i = i - 25;
+            this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 - 178 + i, this.height / 6 - 12, 20, 20, 0, 0, 20, PUZZLE_ICON_TEXTURE, 32, 64, (buttonWidget) -> (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), Text.translatable("midnightlib.overview.title")));
+        }
     }
 }

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

@@ -1,23 +1,22 @@
 package net.puzzlemc.gui.screen;
 
-import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.screen.ScreenTexts;
+import net.minecraft.text.Text;
 import net.puzzlemc.gui.PuzzleClient;
 import net.puzzlemc.gui.screen.page.GraphicsPage;
 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.screen.ScreenTexts;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.TranslatableText;
 
 import java.util.Objects;
 
 public class PuzzleOptionsScreen extends Screen {
 
     public PuzzleOptionsScreen(Screen parent) {
-        super(new TranslatableText("puzzle.screen.title"));
+        super(Text.translatable("puzzle.screen.title"));
         this.parent = parent;
     }
     private final Screen parent;

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

@@ -1,12 +1,12 @@
 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.screen.ScreenTexts;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.TranslatableText;
 
 import java.util.List;
 import java.util.Objects;
@@ -15,7 +15,7 @@ public abstract class AbstractPuzzleOptionsPage extends Screen {
     private PuzzleOptionListWidget list;
     private final List<PuzzleWidget> options;
 
-    public AbstractPuzzleOptionsPage(Screen parent, TranslatableText title, List<PuzzleWidget> options) {
+    public AbstractPuzzleOptionsPage(Screen parent, Text title, List<PuzzleWidget> options) {
         super(title);
         this.parent = parent;
         this.options = options;

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

@@ -1,12 +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;
-import net.minecraft.text.TranslatableText;
 
 public class GraphicsPage extends AbstractPuzzleOptionsPage {
 
     public GraphicsPage(Screen parent) {
-        super(parent, new TranslatableText("puzzle.page.graphics"), PuzzleApi.GRAPHICS_OPTIONS);
+        super(parent, Text.translatable("puzzle.page.graphics"), PuzzleApi.GRAPHICS_OPTIONS);
     }
 }

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

@@ -1,12 +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;
-import net.minecraft.text.TranslatableText;
 
 public class MiscPage extends AbstractPuzzleOptionsPage {
 
     public MiscPage(Screen parent) {
-        super(parent, new TranslatableText("puzzle.page.misc"), PuzzleApi.MISC_OPTIONS);
+        super(parent, Text.translatable("puzzle.page.misc"), PuzzleApi.MISC_OPTIONS);
     }
 }

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

@@ -1,12 +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;
-import net.minecraft.text.TranslatableText;
 
 public class PerformancePage extends AbstractPuzzleOptionsPage {
 
     public PerformancePage(Screen parent) {
-        super(parent, new TranslatableText("puzzle.page.performance"), PuzzleApi.PERFORMANCE_OPTIONS);
+        super(parent, Text.translatable("puzzle.page.performance"), PuzzleApi.PERFORMANCE_OPTIONS);
     }
 }

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

@@ -1,12 +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;
-import net.minecraft.text.TranslatableText;
 
 public class ResourcesPage extends AbstractPuzzleOptionsPage {
 
     public ResourcesPage(Screen parent) {
-        super(parent, new TranslatableText("puzzle.page.resources"), PuzzleApi.RESOURCE_OPTIONS);
+        super(parent, Text.translatable("puzzle.page.resources"), PuzzleApi.RESOURCE_OPTIONS);
     }
 }

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

@@ -9,7 +9,6 @@ import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.gui.widget.ElementListWidget;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 import org.apache.logging.log4j.LogManager;
 
@@ -34,11 +33,11 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
             if (button.buttonType == ButtonType.TEXT) {
                 this.addButton(null, button.descriptionText);
             } else if (button.buttonType == ButtonType.BUTTON) {
-                this.addButton(new PuzzleButtonWidget(this.width / 2 - 155 + 160, 0, 150, 20, button.buttonTextAction, button.onPress), button.descriptionText);
+                this.addButton(new PuzzleButtonWidget(this.width / 2 + 25, 0, 150, 20, button.buttonTextAction, button.onPress), button.descriptionText);
             } else if (button.buttonType == ButtonType.SLIDER) {
-                this.addButton(new PuzzleSliderWidget(button.min, button.max, this.width / 2 - 155 + 160, 0, 150, 20, button.setSliderValue, button.buttonTextAction, button.changeSliderValue), button.descriptionText);
+                this.addButton(new PuzzleSliderWidget(button.min, button.max, this.width / 2 + 25, 0, 150, 20, button.setSliderValue, button.buttonTextAction, button.changeSliderValue), button.descriptionText);
             } else if (button.buttonType == ButtonType.TEXT_FIELD) {
-                this.addButton(new PuzzleTextFieldWidget(textRenderer, this.width / 2 - 155 + 160, 0, 150, 20, button.setTextValue, button.changeTextValue), button.descriptionText);
+                this.addButton(new PuzzleTextFieldWidget(textRenderer, this.width / 2 + 25, 0, 150, 20, button.setTextValue, button.changeTextValue), button.descriptionText);
             } else
                 LogManager.getLogger("Puzzle").warn("Button " + button + " is missing the buttonType variable. This shouldn't happen!");
         }
@@ -74,7 +73,7 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
                 button.y = y;
                 button.render(matrices, mouseX, mouseY, tickDelta);
             }
-            if (button == null) drawCenteredText(matrices,textRenderer, new LiteralText("－－－－－－ ").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);
         }
 

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

@@ -4,10 +4,8 @@ import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.gui.widget.SliderWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 
 public class PuzzleWidget {
     public ButtonType buttonType;

puzzle-gui/src/main/java/net/puzzlemc/gui/util/ColorUtil.java

@@ -1,17 +0,0 @@
-package net.puzzlemc.gui.util;
-
-import java.awt.*;
-
-public class ColorUtil {
-    /**
-     * @credit https://stackoverflow.com/questions/4129666/how-to-convert-hex-to-rgb-using-java
-     * @param colorStr e.g. "FFFFFF"
-     * @return
-     */
-    public static Color hex2Rgb(String colorStr) {
-        return new Color(
-                Integer.valueOf( colorStr.substring( 0, 2 ), 16 ),
-                Integer.valueOf( colorStr.substring( 2, 4 ), 16 ),
-                Integer.valueOf( colorStr.substring( 4, 6 ), 16 ));
-    }
-}

puzzle-gui/src/main/resources/fabric.mod.json

@@ -38,9 +38,11 @@
   ],
 
   "depends": {
-    "fabric": "*"
+    "fabric": "*",
+    "midnightlib": "*"
   },
   "breaks": {
-    "citresewn": "<=1.0.0+1.18.2"
+    "citresewn": "<=1.0.0+1.18.2",
+    "entity_texture_features": "<3.0.0"
   }
 }

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

@@ -1,11 +1,11 @@
 package net.puzzlemc.splashscreen;
 
+import eu.midnightdust.lib.util.MidnightColorUtil;
 import net.fabricmc.api.ClientModInitializer;
 import net.minecraft.client.texture.NativeImageBackedTexture;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.ColorHelper;
 import net.puzzlemc.core.config.PuzzleConfig;
-import net.puzzlemc.core.util.ColorUtil;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
@@ -41,7 +41,9 @@ public class PuzzleSplashScreen implements ClientModInitializer {
     public static void resetColors() {
         PuzzleConfig.backgroundColor = 15675965;
         PuzzleConfig.progressBarColor = 16777215;
+        PuzzleConfig.progressBarBackgroundColor = 15675965;
         PuzzleConfig.progressFrameColor = 16777215;
+        PuzzleConfig.disableBlend = false;
         PuzzleConfig.write("puzzle");
     }
 
@@ -62,38 +64,43 @@ public class PuzzleSplashScreen implements ClientModInitializer {
                 return new Identifier("puzzle", "splash_screen");
             }
 
+            public void method_14491(ResourceManager manager) {
+                reload(manager);
+            }
             @Override
             public void reload(ResourceManager manager) {
                 if (PuzzleConfig.resourcepackSplashScreen) {
                     PuzzleSplashScreen.resetColors();
                     client.getTextureManager().registerTexture(LOGO, new LogoTexture());
 
-                    for (Identifier id : manager.findResources("optifine", path -> path.contains("color.properties"))) {
-                        try (InputStream stream = manager.getResource(id).getInputStream()) {
+                    manager.findResources("optifine", path -> path.getPath().contains("color.properties")).forEach((id, resource) -> {
+                        try (InputStream stream = manager.getResource(id).get().getInputStream()) {
                             Properties properties = new Properties();
                             properties.load(stream);
 
                             if (properties.get("screen.loading") != null) {
-                                Color backgroundColorRGB = ColorUtil.hex2Rgb(properties.get("screen.loading").toString());
-                                PuzzleConfig.backgroundColor = ColorHelper.Argb.getArgb(backgroundColorRGB.getAlpha(), backgroundColorRGB.getRed(), backgroundColorRGB.getGreen(), backgroundColorRGB.getGreen());
+                                PuzzleConfig.backgroundColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading").toString()).getRGB();
                             }
                             if (properties.get("screen.loading.bar") != null) {
-                                Color progressFrameColorRGB = ColorUtil.hex2Rgb(properties.get("screen.loading.bar").toString());
-                                PuzzleConfig.progressFrameColor = ColorHelper.Argb.getArgb(progressFrameColorRGB.getAlpha(), progressFrameColorRGB.getRed(), progressFrameColorRGB.getGreen(), progressFrameColorRGB.getGreen());
+                                PuzzleConfig.progressBarBackgroundColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.bar").toString()).getRGB();
                             }
                             if (properties.get("screen.loading.progress") != null) {
-                                Color progressBarColorRGB = ColorUtil.hex2Rgb(properties.get("screen.loading.progress").toString());
-                                PuzzleConfig.progressBarColor = ColorHelper.Argb.getArgb(progressBarColorRGB.getAlpha(), progressBarColorRGB.getRed(), progressBarColorRGB.getGreen(), progressBarColorRGB.getGreen());
+                                PuzzleConfig.progressBarColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.progress").toString()).getRGB();
                             }
-                            if (properties.get("screen.loading") != null) {
-                                PuzzleConfig.write("puzzle");
+                            if (properties.get("screen.loading.outline") != null) {
+                                PuzzleConfig.progressFrameColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.outline").toString()).getRGB();
                             }
+                            if (properties.get("screen.loading.blend") != null) {
+                                PuzzleConfig.disableBlend = properties.get("screen.loading.blend").toString().equals("off");
+                                PuzzleConfig.progressFrameColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.outline").toString()).getRGB();
+                            }
+                            PuzzleConfig.write("puzzle");
                         } catch (Exception e) {
                             LogManager.getLogger("Puzzle").error("Error occurred while loading color.properties " + id.toString(), e);
                         }
-                    }
-                    for (Identifier id : manager.findResources("textures", path -> path.contains("mojangstudios.png"))) {
-                        try (InputStream stream = manager.getResource(id).getInputStream()) {
+                    });
+                    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);
                             DefaultResourcePack defaultResourcePack = client.getResourcePackProvider().getPack();
                             InputStream defaultLogo = defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO);
@@ -104,7 +111,7 @@ public class PuzzleSplashScreen implements ClientModInitializer {
                         } catch (Exception e) {
                             LogManager.getLogger("Puzzle").error("Error occurred while loading custom minecraft logo " + id.toString(), e);
                         }
-                    }
+                    });
                 }
             }
         });

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

@@ -1,6 +1,5 @@
 package net.puzzlemc.splashscreen.mixin;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Overlay;
@@ -16,26 +15,26 @@ import net.puzzlemc.splashscreen.PuzzleSplashScreen;
 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.ModifyArg;
+import org.spongepowered.asm.mixin.injection.*;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.function.IntSupplier;
 
 @Mixin(value = SplashOverlay.class, priority = 2000)
 public abstract class MixinSplashScreen extends Overlay {
     @Shadow @Final static Identifier LOGO;
     @Shadow private long reloadCompleteTime;
 
-    @Shadow @Final private MinecraftClient client;
-
-    @Shadow private long reloadStartTime;
+    @Shadow
+    private static int withAlpha(int color, int alpha) {
+        return 0;
+    }
 
     @Inject(method = "init(Lnet/minecraft/client/MinecraftClient;)V", at = @At("TAIL"))
-    private static void init(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start //
+    private static void puzzle$initSplashscreen(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start //
         if (PuzzleConfig.resourcepackSplashScreen && PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) {
             try {
                 InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
@@ -43,48 +42,38 @@ public abstract class MixinSplashScreen extends Overlay {
             } catch (IOException ignored) {}
         }
     }
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", shift = At.Shift.AFTER, ordinal = 0))
-    private void modifyBackgroundColor(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Set the Background Color to our configured value //
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Ljava/util/function/IntSupplier;getAsInt()I"))
+    private int puzzle$modifyBackground(IntSupplier instance) { // Set the Progress Bar Frame Color to our configured value //
+        return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) ? instance.getAsInt() : PuzzleConfig.backgroundColor | 255 << 24;
+    }
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;blendFunc(II)V", shift = At.Shift.AFTER), remap = false)
+    private void puzzle$betterBlend(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (PuzzleConfig.disableBlend) RenderSystem.defaultBlendFunc();
+    }
+    @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);
-        if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.backgroundColor != 15675965)
-        fill(matrices, 0, 0, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight(), withAlpha(PuzzleConfig.backgroundColor, m));
+        fill(matrices, minX, minY, maxX, maxY, withAlpha(PuzzleConfig.progressBarBackgroundColor, m));
     }
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", shift = At.Shift.AFTER, ordinal = 1))
-    private void modifyBackgroundColor2(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Set the Background Color to our configured value //
+    @Inject(method = "renderProgressBar", at = @At("TAIL"))
+    private void puzzle$fixProgressBarEnd(MatrixStack matrices, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) { // For some reason the end of the progressbar is colored wrong
+        if (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressFrameColor == 16777215) return;
         long l = Util.getMeasuringTimeMs();
-        float g = this.reloadStartTime > -1L ? (float)(l - this.reloadStartTime) / 500.0F : -1.0F;
-        int m = MathHelper.ceil(MathHelper.clamp(g, 0.15D, 1.0D) * 255.0D);
-        if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.backgroundColor != 15675965)
-            fill(matrices, 0, 0, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight(), withAlpha(PuzzleConfig.backgroundColor, m));
-    }
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;_clear(IZ)V", shift = At.Shift.AFTER))
-    private void modifyBackgroundColor3(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Set the Background Color to our configured value //
-        if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.backgroundColor != 15675965) {
-            int m = PuzzleConfig.backgroundColor;
-            float p = (float) (m >> 16 & 255) / 255.0F;
-            float q = (float) (m >> 8 & 255) / 255.0F;
-            float r = (float) (m & 255) / 255.0F;
-            GlStateManager._clearColor(p, q, r, 1.0F);
-            GlStateManager._clear(16384, MinecraftClient.IS_SYSTEM_MAC);
-        }
-    }
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;enableBlend()V", shift = At.Shift.AFTER), remap = false)
-    private void disableBlend(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (PuzzleConfig.disableSplashScreenBlend) RenderSystem.disableBlend();
+        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);
+        fill(matrices, maxX-1, minY, maxX, maxY, withAlpha(PuzzleConfig.progressFrameColor, m));
     }
 
     @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V"), index = 5)
-    private int modifyProgressFrame(int color) { // Set the Progress Bar Frame Color to our configured value //
-        return PuzzleConfig.progressFrameColor | 255 << 24;
+    private int puzzle$modifyProgressFrame(int color) { // Set the Progress Bar Frame Color to our configured value //
+        return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressFrameColor == 16777215) ? color : PuzzleConfig.progressFrameColor | 255 << 24;
     }
     @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", ordinal = 4), index = 5)
-    private int modifyProgressColor(int color) { // Set the Progress Bar Color to our configured value //
-        return PuzzleConfig.progressBarColor | 255 << 24;
+    private int puzzle$modifyProgressColor(int color) { // Set the Progress Bar Color to our configured value //
+        return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarColor == 16777215) ? color : PuzzleConfig.progressBarColor | 255 << 24;
     }
-    private static int withAlpha(int color, int alpha) {
-        return color & 16777215 | alpha << 24;
-    }
-
 }

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

@@ -8,10 +8,10 @@
 	"puzzle.option.check_for_updates":"Auf Updates überprüfen",
 	"puzzle.option.show_version_info":"Zeige Puzzles Versions Informationen",
 	"puzzle.option.resourcepack_splash_screen":"Nutzte den Resourcepack-splash-Screen",
-	"puzzle.option.disable_splash_screen_blend":"Deaktiviere das Überblenden des Splash-Screen-Logos",
+	"puzzle.option.better_splash_screen_blend":"Verbessere das Blending des Splash-Screen-Logos",
 	"puzzle.option.emissive_textures":"Emissive Texturen",
 	"puzzle.option.unlimited_model_rotations":"Unbegrenzte Modellrotationen",
 	"puzzle.option.bigger_custom_models":"Größere benutzerdefinierte Modelle",
 	"puzzle.option.render_layer_overrides":"Render Layer Overrides",
-	"puzzle.midnightconfig.title":"Erweiterte Puzzle Einstellungen"
+	"puzzle.midnightconfig.title":"Erweiterte Puzzle Konfiguration"
 }

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

@@ -0,0 +1,18 @@
+{
+	"puzzle.text.update_available":"Μια καινούρια έκδοση είναι διαθέσιμη!",
+	"puzzle.screen.title":"Ρυθμίσεις του Puzzle",
+	"puzzle.page.graphics":"Ρυθμίσεις Γραφικών",
+	"puzzle.page.resources":"Ρυθμίσεις Πόρων",
+	"puzzle.page.performance":"Ρυθμίσεις Απόδοσης",
+	"puzzle.page.misc":"Διάφορες Ρυθμίσεις",
+	"puzzle.option.check_for_updates":"Έλεγχος για αναβαθμίσεις",
+	"puzzle.option.show_version_info":"Εμφάνηση έκδοσης του Puzzle",
+	"puzzle.option.resourcepack_splash_screen":"Οθόνη φόρτωσης πακέτου πόρων",
+	"puzzle.option.disable_splash_screen_blend":"Μη ανάμηξη λογότυπου οθ. φόρτωσης",
+	"puzzle.option.emissive_textures":"Λαμπρά Είδη",
+	"puzzle.option.unlimited_model_rotations":"Απεριόριστες Περιστροφές Μοντέλων",
+	"puzzle.option.bigger_custom_models":"Μεγαλύτερα Ειδικά Μοντέλα",
+	"puzzle.option.render_layer_overrides":"Εμφάνηση Παρακάμψεων Στρώσεων",
+	"puzzle.midnightconfig.title":"Εξειδηκευμένες Ρυθμίσεις του Puzzle"
+}
+

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

@@ -8,10 +8,10 @@
 	"puzzle.option.check_for_updates":"Check for Updates",
 	"puzzle.option.show_version_info":"Show Puzzle version info",
 	"puzzle.option.resourcepack_splash_screen":"Use resourcepack splash screen",
-	"puzzle.option.disable_splash_screen_blend":"Disable splash screen logo blending",
+	"puzzle.option.better_splash_screen_blend":"Better splash screen logo blending",
 	"puzzle.option.emissive_textures":"Emissive Textures",
 	"puzzle.option.unlimited_model_rotations":"Unlimited Model Rotations",
 	"puzzle.option.bigger_custom_models":"Bigger Custom Models",
 	"puzzle.option.render_layer_overrides":"Render Layer Overrides",
-	"puzzle.midnightconfig.title":"Puzzle Advanced Configuration"
+	"puzzle.midnightconfig.title":"Puzzle Advanced Config"
 }

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

@@ -0,0 +1,17 @@
+{
+	"puzzle.text.update_available":"Uuendus on saadaval!",
+	"puzzle.screen.title":"Puzzle sätted",
+	"puzzle.page.graphics":"Graafikasätted",
+	"puzzle.page.resources":"Ressursisätted",
+	"puzzle.page.performance":"Jõudlussätted",
+	"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",
+	"puzzle.option.disable_splash_screen_blend":"Keela laadimiskuva logo segunemine",
+	"puzzle.option.emissive_textures":"Hõõguvad tekstuurid",
+	"puzzle.option.unlimited_model_rotations":"Lõpmatud mudelipöörded",
+	"puzzle.option.bigger_custom_models":"Suuremad kohandatud mudelid",
+	"puzzle.option.render_layer_overrides":"Renderduskihi ülekatted",
+	"puzzle.midnightconfig.title":"Puzzle täpsem seadistus"
+}

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

@@ -0,0 +1,17 @@
+{
+	"puzzle.text.update_available":"Aktualizacja jest dostępna!",
+	"puzzle.screen.title":"Ustawienia Puzzle",
+	"puzzle.page.graphics":"Ustawienia grafiki",
+	"puzzle.page.resources":"Ustawienia zasobów",
+	"puzzle.page.performance":"Ustawienia wydajności",
+	"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",
+	"puzzle.option.disable_splash_screen_blend":"Wyłącz mieszanie loga ekranu powitalnego",
+	"puzzle.option.emissive_textures":"Emisyjne tekstury",
+	"puzzle.option.unlimited_model_rotations":"Nielimitowane rotacje modeli",
+	"puzzle.option.bigger_custom_models":"Większe niestandardowe modele",
+	"puzzle.option.render_layer_overrides":"Renderuj nadpisania warstw",
+	"puzzle.midnightconfig.title":"Zaawansowana konfiguracja Puzzle"
+}

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

@@ -0,0 +1,17 @@
+{
+	"puzzle.text.update_available":"更新可用!",
+	"puzzle.screen.title":"Puzzle 设置",
+	"puzzle.page.graphics":"图像设置",
+	"puzzle.page.resources":"资源设置",
+	"puzzle.page.performance":"性能设置",
+	"puzzle.page.misc":"杂项设置",
+	"puzzle.option.check_for_updates":"检查更新",
+	"puzzle.option.show_version_info":"显示 Puzzle 版本信息",
+	"puzzle.option.resourcepack_splash_screen":"使用资源包提供的闪烁标语",
+	"puzzle.option.disable_splash_screen_blend":"禁用闪烁标语闪烁",
+	"puzzle.option.emissive_textures":"发光纹理",
+	"puzzle.option.unlimited_model_rotations":"无限制模型旋转",
+	"puzzle.option.bigger_custom_models":"更大的自定义模型",
+	"puzzle.option.render_layer_overrides":"渲染层覆盖",
+	"puzzle.midnightconfig.title":"Puzzle 高级设置"
+}

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

@@ -0,0 +1,17 @@
+{
+	"puzzle.text.update_available":"有新版本可供升級！",
+	"puzzle.screen.title":"拼圖設置",
+	"puzzle.page.graphics":"顯示設置",
+	"puzzle.page.resources":"資源設置",
+	"puzzle.page.performance":"性能設置",
+	"puzzle.page.misc":"其他設置",
+	"puzzle.option.check_for_updates":"檢查更新",
+	"puzzle.option.show_version_info":"顯示拼圖版本信息",
+	"puzzle.option.resourcepack_splash_screen":"使用資源包的加載界面",
+	"puzzle.option.disable_splash_screen_blend":"禁止加載界面徽標渲染",
+	"puzzle.option.emissive_textures":"發光貼圖",
+	"puzzle.option.unlimited_model_rotations":"無限模型旋轉",
+	"puzzle.option.bigger_custom_models":"更大的自定義模型",
+	"puzzle.option.render_layer_overrides":"覆蓋渲染層",
+	"puzzle.midnightconfig.title":"拼圖高級設置"
+}