Fix crash with newer ETF versions

Merge pull request #45 from Felix14-v2/1.19
Update ru_ru.json
2025-12-15 19:35:10 +01:00 · 2023-01-05 18:26:01 +01:00 · 2022-08-02 20:46:26 +00:00 · 2022-08-02 23:35:50 +03:00 · 2022-08-02 14:05:47 +02:00 · 2022-08-01 17:41:00 +00:00
50 changed files with 649 additions and 460 deletions
--- a/build.gradle
+++ b/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 {
@@ -135,10 +124,15 @@ dependencies {
    modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
    modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
    modImplementation ("maven.modrinth:iris:${project.iris_version}")
-    modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
+    modCompileOnly ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
    modImplementation ("maven.modrinth:continuity:${project.continuity_version}")
    modImplementation ("maven.modrinth:animatica:${project.animatica_version}")
-    modImplementation ("curse.maven:custom-entity-models-cem-477078:${project.cem_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.gitlab.Lortseam:completeconfig:${project.complete_config_version}"

    modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,30 +1,35 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx4G

 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.18.1
-	yarn_mappings=1.18.1+build.14
-	loader_version=0.12.12
+	minecraft_version=1.19
+	yarn_mappings=1.19+build.4
+	loader_version=0.14.8

 # Mod Properties
-	mod_version = 1.1.0
+	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.45.0+1.18
-	mod_menu_version = 2.0.13
+	fabric_version=0.57.0+1.19
+	mod_menu_version = 4.0.0
 	
-	cull_leaves_version = 2.3.2
-	ldl_version = 2.1.0+1.17
-	lbg_version = 1.2.2+1.17
-	iris_version = 1.18.x-v1.1.4
-	continuity_version = 1.0.3+1.18
-	animatica_version = 0.2+1.18
-	cit_resewn_version = 0.8.1-1.18
-	cem_version = 3561474
+	cull_leaves_version = 2.3.3
+	ldl_version = 2.1.2+1.19
+	lbg_version = 1.3.0+1.19
+	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.5+1.19
+	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
 	complete_config_version = 1.0.0
-	spruceui_version=3.3.2+1.17
-	midnightlib_version=0.3.1
+	spruceui_version=4.0.0+1.19
+	midnightlib_version=0.5.2
+	entitytexturefeatures_version=4.3.1.fabric.1.19.2
--- a/puzzle-base/src/main/java/net/puzzlemc/core/PuzzleCore.java
+++ b/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";
--- a/puzzle-base/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java
+++ b/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;
 }
--- a/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinDebugHud.java
+++ b/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();
--- a/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java
+++ b/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;
@@ -27,19 +26,20 @@ public abstract class MixinTitleScreen extends Screen {
    @Shadow private long backgroundFadeStart;
    private Text puzzleText;
    private int puzzleTextWidth;
-    private int yOffset = 20;
+    private int yOffset;

    protected MixinTitleScreen(Text title) {
        super(title);
    }
    @Inject(at = @At("TAIL"), method = "init")
    private void puzzle$init(CallbackInfo ci) {
+        yOffset = 20;
        if (FabricLoader.getInstance().isModLoaded("dashloader")) yOffset = yOffset + 10;
        if (UpdateChecker.isUpToDate) {
            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);
        }
    }
@@ -67,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);
--- a/puzzle-base/src/main/java/net/puzzlemc/core/util/ColorUtil.java
+++ b/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 ));
-    }
-}
--- a/puzzle-base/src/main/resources/assets/puzzle/icon.png
+++ b/puzzle-base/src/main/resources/assets/puzzle/icon.png
--- a/puzzle-emissives/build.gradle
+++ b/puzzle-emissives/build.gradle
@@ -1,10 +0,0 @@
-archivesBaseName = "puzzle-emissives"
-repositories {
-    maven {
-        url = "https://api.modrinth.com/maven"
-    }
-}
-dependencies {
-    api project(":puzzle-base")
-    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
-}
--- a/puzzle-emissives/src/main/java/net/puzzlemc/emissives/PuzzleEmissiveTextures.java
+++ b/puzzle-emissives/src/main/java/net/puzzlemc/emissives/PuzzleEmissiveTextures.java
@@ -1,60 +0,0 @@
-package net.puzzlemc.emissives;
-
-import net.fabricmc.api.ClientModInitializer;
-import net.puzzlemc.core.config.PuzzleConfig;
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.resource.ResourceType;
-import net.minecraft.util.Identifier;
-import org.apache.logging.log4j.LogManager;
-
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-public class PuzzleEmissiveTextures implements ClientModInitializer {
-    public static final Map<Identifier, Identifier> emissiveTextures = new HashMap<>();
-
-    public void onInitializeClient() {
-        ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
-            @Override
-            public Identifier getFabricId() {
-                return new Identifier("puzzle", "emissive_textures");
-            }
-
-            @Override
-            public void reload(ResourceManager manager) {
-                if (PuzzleConfig.emissiveTextures) {
-                    String suffix = "_e";
-
-                    for (Identifier id : manager.findResources("optifine", path -> path.contains("emissive.properties"))) {
-                        try (InputStream stream = manager.getResource(id).getInputStream()) {
-                            Properties properties = new Properties();
-                            properties.load(stream);
-
-                            if (properties.get("suffix.emissive") != null) {
-                                suffix = properties.get("suffix.emissive").toString();
-                            }
-                        } catch (Exception e) {
-                            LogManager.getLogger("Puzzle").error("Error occurred while loading emissive.properties " + id.toString(), e);
-                        }
-                        String finalSuffix = suffix;
-                        for (Identifier emissiveId : manager.findResources("textures", path -> path.endsWith(finalSuffix + ".png"))) {
-                            try {
-                                String normalTexture = emissiveId.toString();
-                                normalTexture = normalTexture.substring(0, normalTexture.lastIndexOf(finalSuffix));
-                                Identifier normalId =  Identifier.tryParse(normalTexture + ".png");
-                                emissiveTextures.put(normalId, emissiveId);
-                                if (PuzzleConfig.debugMessages) LogManager.getLogger("Puzzle").info(normalId + " " + emissiveId);
-                            } catch (Exception e) {
-                                LogManager.getLogger("Puzzle").error("Error occurred while loading emissive texture " + emissiveId.toString(), e);
-                            }
-                        }
-                    }
-                }
-            }
-        });
-    }
-}
--- a/puzzle-emissives/src/main/java/net/puzzlemc/emissives/mixin/MixinLivingEntityRenderer.java
+++ b/puzzle-emissives/src/main/java/net/puzzlemc/emissives/mixin/MixinLivingEntityRenderer.java
@@ -1,39 +0,0 @@
-package net.puzzlemc.emissives.mixin;
-
-import net.minecraft.client.render.OverlayTexture;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.*;
-import net.minecraft.client.render.entity.feature.FeatureRendererContext;
-import net.minecraft.client.render.entity.model.EntityModel;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.LivingEntity;
-import net.puzzlemc.core.config.PuzzleConfig;
-import net.puzzlemc.emissives.PuzzleEmissiveTextures;
-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;
-
-@Mixin(value = LivingEntityRenderer.class)
-public abstract class MixinLivingEntityRenderer<T extends LivingEntity, M extends EntityModel<T>> extends EntityRenderer<T> implements FeatureRendererContext<T, M> {
-
-    @Shadow public abstract M getModel();
-
-    protected MixinLivingEntityRenderer(EntityRendererFactory.Context ctx) {
-        super(ctx);
-    }
-
-    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/EntityModel;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;IIFFFF)V", shift = At.Shift.AFTER), method = "render*")
-    private void onRender(T entity, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
-        if (PuzzleConfig.emissiveTextures && PuzzleEmissiveTextures.emissiveTextures.containsKey(this.getTexture(entity))) {
-            VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getBeaconBeam(PuzzleEmissiveTextures.emissiveTextures.get(this.getTexture(entity)),true));
-
-            matrices.scale(1.015f,1.015f,1.015f);
-            this.getModel().render(matrices, vertexConsumer, 15728640, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
-            matrices.scale(1f,1f,1f);
-        }
-    }
-}
--- a/puzzle-emissives/src/main/resources/assets/puzzle/icon.png
+++ b/puzzle-emissives/src/main/resources/assets/puzzle/icon.png
--- a/puzzle-emissives/src/main/resources/fabric.mod.json
+++ b/puzzle-emissives/src/main/resources/fabric.mod.json
@@ -1,40 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "puzzle-emissives",
-  "version": "${version}",
-
-  "name": "Puzzle Emissive Textures",
-  "description": "Displays emissive textures on blocks and entities",
-  "authors": [
-    "PuzzleMC",
-    "Motschen"
-  ],
-  "contact": {
-    "homepage": "https://www.midnightdust.eu/",
-    "sources": "https://github.com/TeamMidnightDust/Puzzle",
-    "issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
-  },
-
-  "license": "MIT",
-  "icon": "assets/puzzle/icon.png",
-
-  "environment": "client",
-  "entrypoints": {
-    "client": [
-      "net.puzzlemc.emissives.PuzzleEmissiveTextures"
-    ]
-  },
-  "custom": {
-    "modmenu": {
-      "parent": "puzzle"
-    }
-  },
-
-  "mixins": [
-    "puzzle-emissives.mixins.json"
-  ],
-
-  "depends": {
-    "fabric": "*"
-  }
-}
--- a/puzzle-emissives/src/main/resources/puzzle-emissives.mixins.json
+++ b/puzzle-emissives/src/main/resources/puzzle-emissives.mixins.json
@@ -1,11 +0,0 @@
-{
-  "required": true,
-  "package": "net.puzzlemc.emissives.mixin",
-  "compatibilityLevel": "JAVA_17",
-  "client": [
-    "MixinLivingEntityRenderer"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}
--- a/puzzle-gui/build.gradle
+++ b/puzzle-gui/build.gradle
@@ -42,7 +42,11 @@ dependencies {
 	modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
 	modImplementation ("maven.modrinth:iris:${project.iris_version}")
 	modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
-	modImplementation ("curse.maven:custom-entity-models-cem-477078:${project.cem_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.gitlab.Lortseam:completeconfig:${project.complete_config_version}"

 	modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/IrisCompat.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/IrisCompat.java
@@ -1,23 +1,24 @@
 package net.puzzlemc.gui;

+import eu.midnightdust.lib.util.MidnightColorUtil;
 import net.fabricmc.loader.api.FabricLoader;
 import net.irisshaders.iris.api.v0.IrisApi;
 import net.irisshaders.iris.api.v0.IrisApiConfig;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.puzzlemc.gui.screen.widget.PuzzleWidget;

 public class IrisCompat {
    public static void init() {
        if (FabricLoader.getInstance().isModLoaded("iris")) {
            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Iris")));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Enable Shaders"), (button) -> button.setMessage(IrisApi.getInstance().getConfig().areShadersEnabled() ? PuzzleClient.YES : PuzzleClient.NO), (button) -> {
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("iris.puzzle.option.enableShaders"), (button) -> button.setMessage(IrisApi.getInstance().getConfig().areShadersEnabled() ? PuzzleClient.YES : PuzzleClient.NO), (button) -> {
                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.literal("➥ ").append(Text.translatable("iris.puzzle.option.open").setStyle(Style.EMPTY.withColor(MidnightColorUtil.radialRainbow(0.5f, 1).getRGB())))), (button) -> {
                MinecraftClient client = MinecraftClient.getInstance();
                client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen));
            }));
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleApi.java
+++ b/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");
    }
 }
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java
@@ -4,8 +4,15 @@ import dev.lambdaurora.lambdabettergrass.LBGConfig;
 import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
 import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
 import dev.lambdaurora.lambdynlights.LambDynLights;
+import dynamicfps.DynamicFPSConfig;
+import dynamicfps.DynamicFPSMod;
+import eu.midnightdust.core.MidnightLibClient;
 import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import io.github.kvverti.colormatic.Colormatic;
+import io.github.kvverti.colormatic.ColormaticConfigController;
+import link.infra.borderlessmining.config.ConfigHandler;
 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,88 +23,155 @@ 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.ETFApi;
+import traben.entity_texture_features.config.ETFConfig;
+import io.github.kvverti.colormatic.ColormaticConfig;

 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() {
+        MidnightLibClient.hiddenMods.add("puzzle");
        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-emissives") && !PuzzleConfig.disabledIntegrations.contains("puzzle-emissives")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.emissive_textures"), (button) -> button.setMessage(PuzzleConfig.emissiveTextures ? YES : NO), (button) -> {
-                PuzzleConfig.emissiveTextures = !PuzzleConfig.emissiveTextures;
-                PuzzleConfig.write(id);
+                MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture(PuzzleSplashScreen.LOGO));
            }));
        }
        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);
            }));
        }
        if (FabricLoader.getInstance().isModLoaded("cullleaves") && !PuzzleConfig.disabledIntegrations.contains("cullleaves")) {
            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Cull Leaves"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("cullleaves.puzzle.option.enabled"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
                CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
                CullLeavesConfig.write("cullleaves");
                MinecraftClient.getInstance().worldRenderer.reload();
            }));
        }
+        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) -> {
+                colormaticConfig.clearSky = !colormaticConfig.clearSky;
+                ColormaticConfigController.persist(colormaticConfig);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.clearVoid"), (button) -> button.setMessage(colormaticConfig.clearVoid ? YES : NO), (button) -> {
+                colormaticConfig.clearVoid = !colormaticConfig.clearVoid;
+                ColormaticConfigController.persist(colormaticConfig);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.blendSkyLight"), (button) -> button.setMessage(colormaticConfig.blendSkyLight ? YES : NO), (button) -> {
+                colormaticConfig.blendSkyLight = !colormaticConfig.blendSkyLight;
+                ColormaticConfigController.persist(colormaticConfig);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.flickerBlockLight"), (button) -> button.setMessage(colormaticConfig.flickerBlockLight ? YES : NO), (button) -> {
+                colormaticConfig.flickerBlockLight = !colormaticConfig.flickerBlockLight;
+                ColormaticConfigController.persist(colormaticConfig);
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100, Text.translatable("colormatic.config.option.relativeBlockLightIntensity"),
+                    () -> (int) (100*(1.0 - colormaticConfig.relativeBlockLightIntensityExponent / -16.0)),
+                    (button) -> button.setMessage(Text.translatable("colormatic.config.option.relativeBlockLightIntensity")
+                        .append(": ")
+                        .append(Text.literal(String.valueOf((int)(100 * Math.exp(ColormaticConfig.scaled(colormaticConfig.relativeBlockLightIntensityExponent))))).append("%"))),
+                        (slider) -> {
+                            try {
+                                colormaticConfig.relativeBlockLightIntensityExponent = ((1.00 - ((slider.getInt())/100f)) * -16.0);
+                                ColormaticConfigController.persist(colormaticConfig);
+                            }
+                            catch (NumberFormatException ignored) {}
+            }));
+        }
+        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) -> {
+                fpsConfig.reduceFPSWhenUnfocused = !fpsConfig.reduceFPSWhenUnfocused;
+                fpsConfig.save();
+            }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 60,Text.translatable("config.dynamicfps.unfocused_fps"), () -> fpsConfig.unfocusedFPS,
+                    (button) -> button.setMessage(Text.of(fpsConfig.unfocusedFPS + " FPS")),
+                    (slider) -> {
+                        try {
+                            fpsConfig.unfocusedFPS = slider.getInt();
+                        }
+                        catch (NumberFormatException ignored) {}
+                        finally {fpsConfig.save();}
+                    }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.restore_when_hovered"), (button) -> button.setMessage(fpsConfig.restoreFPSWhenHovered ? YES : NO), (button) -> {
+                fpsConfig.restoreFPSWhenHovered = !fpsConfig.restoreFPSWhenHovered;
+                fpsConfig.save();
+            }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.run_gc_on_unfocus"), (button) -> button.setMessage(fpsConfig.runGCOnUnfocus ? YES : NO), (button) -> {
+                fpsConfig.runGCOnUnfocus = !fpsConfig.runGCOnUnfocus;
+                fpsConfig.save();
+            }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 100,Text.translatable("config.dynamicfps.unfocused_volume"), () -> ((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue(),
+                    (button) -> button.setMessage(Text.of(((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue() + "%")),
+                    (slider) -> {
+                        try {
+                            fpsConfig.unfocusedVolumeMultiplier = ((Number)slider.getInt()).floatValue() / 100;
+                        }
+                        catch (NumberFormatException ignored) {}
+                        finally {fpsConfig.save();}
+                    }));
+            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 100,Text.translatable("config.dynamicfps.hidden_volume"), () -> ((Number)(fpsConfig.hiddenVolumeMultiplier * 100)).intValue(),
+                    (button) -> button.setMessage(Text.of(((Number)(fpsConfig.hiddenVolumeMultiplier * 100)).intValue() + "%")),
+                    (slider) -> {
+                        try {
+                            fpsConfig.hiddenVolumeMultiplier = ((Number)slider.getInt()).floatValue() / 100;
+                        }
+                        catch (NumberFormatException ignored) {}
+                        finally {fpsConfig.save();}
+                    }));
+        }
+        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) -> {
+                bmConfig.setEnabledPending(!bmConfig.isEnabledOrPending());
+                bmConfig.save();
+            }));
+            if (MinecraftClient.IS_SYSTEM_MAC) {
+                PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabledmac"), (button) -> button.setMessage(bmConfig.enableMacOS ? YES : NO), (button) -> {
+                    bmConfig.enableMacOS = !bmConfig.enableMacOS;
+                    bmConfig.setEnabledPending(bmConfig.isEnabled());
+                    bmConfig.save();
+                }));
+            }
+        }
        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();
-            }));
-        }
    }
    public static boolean lateInitDone = false;
    public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
@@ -105,34 +179,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") && CITResewn.INSTANCE != null && 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(new TranslatableText("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
+            CITResewnConfig citConfig = CITResewnConfig.INSTANCE;
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
                citConfig.enabled = !citConfig.enabled;
                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"), () -> citConfig.cache_ms,
                    (button) -> button.setMessage(message(citConfig)),
                    (slider) -> {
                try {
@@ -145,32 +219,72 @@ 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.entity_texture_features.title")));
+            ETFConfig etfConfig = ETFApi.getETFConfigObject;
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
+                etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
+                etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.emissive_mode.title"), (button) -> button.setMessage(
+                    Text.literal(etfConfig.emissiveRenderMode.toString())), (button) -> {
+                etfConfig.emissiveRenderMode = etfConfig.emissiveRenderMode.next();
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
+                etfConfig.enableBlinking = !etfConfig.enableBlinking;
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.player_skin_features.title"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
+                etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
+                ETFApi.saveETFConfigChangesAndResetETF();
+            }));
+        }
        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) {
@@ -189,7 +303,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);
            }
    }
 }
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/config/ModMenuIntegration.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/config/ModMenuIntegration.java
@@ -20,13 +20,12 @@ public class ModMenuIntegration implements ModMenuApi {
    @Override
    public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
        Map<String, ConfigScreenFactory<?>> map = new HashMap<>();
-        map.put("puzzle",PuzzleOptionsScreen::new);
        map.put("puzzle-gui",PuzzleOptionsScreen::new);
        map.put("puzzle-blocks",PuzzleOptionsScreen::new);
        map.put("puzzle-base",PuzzleOptionsScreen::new);
        map.put("puzzle-models",PuzzleOptionsScreen::new);
-        map.put("puzzle-emissives",PuzzleOptionsScreen::new);
        map.put("puzzle-splashscreen",PuzzleOptionsScreen::new);
+        map.put("puzzle",PuzzleOptionsScreen::new);
        return map;
    }
 }
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java
+++ b/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")));
+        }
    }
 }
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/IrisButton.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/IrisButton.java
@@ -1,17 +0,0 @@
-package net.puzzlemc.gui.screen;
-
-import net.coderbot.iris.gui.screen.ShaderPackScreen;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-
-import java.util.Objects;
-
-public class IrisButton extends DrawableHelper {
-    public static ButtonWidget getButton(int x, int y, int width, int height, Screen parent, MinecraftClient client) {
-        ShaderPackScreen shaderPackPage = new ShaderPackScreen(parent);
-        return new ButtonWidget(x, y, width, height, shaderPackPage.getTitle().copy().append("..."), (button) ->
-                Objects.requireNonNull(client).setScreen(shaderPackPage));
-    }
-}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/LoadingScreenBackgrond.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/LoadingScreenBackgrond.java
@@ -1,14 +0,0 @@
-package net.puzzlemc.gui.screen;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.util.math.MatrixStack;
-
-public class LoadingScreenBackgrond {
-    public static void render(MinecraftClient client, MatrixStack matrices, int width, int height, float delta) {
-//        if (client.world != null) {
-//            LogManager.getLogManager().getLogger("Puzzle").info(client.world.getDimension().toString());
-//        }
-//        client.getTextureManager().bindTexture(new Identifier("minecraft","optifine/gui/loading/background0.png"));
-//        DrawableHelper.drawTexture(matrices,0,0,width,height,0,0,width,height,width,height);
-    }
-}
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java
@@ -1,23 +1,23 @@
 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.PuzzleApi;
 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;
@@ -31,13 +31,10 @@ public class PuzzleOptionsScreen extends Screen {
        PerformancePage performancePage = new PerformancePage(this);
        ResourcesPage resourcesPage = new ResourcesPage(this);

-        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)));
-        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)));
-        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)));
-        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 (FabricLoader.getInstance().isModLoaded("iris")) {
-//            this.addDrawableChild(IrisButton.getButton(this.width / 2 - 155, this.height / 6 + 96 - 6, 310, 20, this, client));
-//        }
+        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)));
+        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)));
+        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)));
        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height / 6 + 168, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
    }

--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/AbstractPuzzleOptionsPage.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/AbstractPuzzleOptionsPage.java
@@ -1,21 +1,22 @@
 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;

 public abstract class AbstractPuzzleOptionsPage extends Screen {
-    private PuzzleOptionListWidget list;
+    public PuzzleOptionListWidget list;
    private final List<PuzzleWidget> options;
+    public List<Text> tooltip = null;

-    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;
@@ -41,5 +42,12 @@ public abstract class AbstractPuzzleOptionsPage extends Screen {

        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;
    }
 }
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/GraphicsPage.java
+++ b/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);
    }
 }
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/MiscPage.java
+++ b/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);
    }
 }
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/PerformancePage.java
+++ b/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);
    }
 }
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/ResourcesPage.java
+++ b/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);
    }
 }
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java
@@ -8,9 +8,11 @@ import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.gui.widget.ElementListWidget;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableTextContent;
+import net.puzzlemc.gui.screen.page.AbstractPuzzleOptionsPage;
 import org.apache.logging.log4j.LogManager;

 import java.util.*;
@@ -34,11 +36,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.defaultSliderValue.getAsInt(), 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!");
        }
@@ -52,15 +54,21 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
        return super.getScrollbarPositionX() + 60;
    }

+    @Override
+    public ButtonEntry getHoveredEntry() {
+        return super.getHoveredEntry();
+    }
+
    public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
        private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
        private List<ClickableWidget> buttons = new ArrayList<>();
-        private final ClickableWidget button;
-        private final Text text;
+        public final ClickableWidget button;
+        public final Text text;
+        private MinecraftClient client = MinecraftClient.getInstance();

        private ButtonEntry(ClickableWidget button, Text text) {
            if (button != null)
-            this.buttons.add(button);
+                this.buttons.add(button);
            this.button = button;
            this.text = text;
        }
@@ -74,8 +82,39 @@ 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);
+
+            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";
+                else if (I18n.hasTranslation(content.getKey() + ".desc")) key = content.getKey() + ".desc";
+                if (key == null && content.getKey().endsWith(".title")) {
+                    String strippedContent = content.getKey().substring(0, content.getKey().length()-6);
+                    if (I18n.hasTranslation(strippedContent + ".tooltip")) key = strippedContent + ".tooltip";
+                    else if (I18n.hasTranslation(strippedContent + ".desc")) key = strippedContent + ".desc";
+                }
+
+                if (key != null) {
+                    List<Text> list = new ArrayList<>();
+                    for (String str : I18n.translate(key).split("\n"))
+                        list.add(Text.literal(str));
+                    page.tooltip = list;
+                }
+            }
+        }
+        public int getY() {
+            return button.y;
+        }
+        public int getX() {
+            return button.x;
+        }
+        public int getHeight() {
+            return button.getHeight();
+        }
+        public int getWidth() {
+            return button.getWidth();
        }

        public List<? extends Element> children() {
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleSliderWidget.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleSliderWidget.java
@@ -9,13 +9,12 @@ public class PuzzleSliderWidget extends SliderWidget {
    private final PuzzleWidget.TextAction setTextAction;
    private final PuzzleWidget.ChangeSliderValueAction changeAction;

-    public PuzzleSliderWidget(int min, int max, int x, int y, int width, int height, PuzzleWidget.SetSliderValueAction setValueAction, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
-        super(x,y,width,height,Text.of(""),0);
+    public PuzzleSliderWidget(int min, int max, int x, int y, int width, int height, float defaultValue, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
+        super(x,y,width,height,Text.of(""),(defaultValue-min) / (max - min));

        this.min = min;
        this.max = max;

-        setValueAction.setSliderValue(this);
        this.setTextAction = setTextAction;
        this.changeAction = changeAction;
        this.updateMessage();
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleWidget.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleWidget.java
@@ -4,21 +4,20 @@ 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;
+
+import java.util.function.IntSupplier;

 public class PuzzleWidget {
    public ButtonType buttonType;
    public int min;
    public int max;
    public Text descriptionText;
-    public Text buttonText;
    public TextAction buttonTextAction;
    public ButtonWidget.PressAction onPress;
    public PuzzleWidget.SetTextValueAction setTextValue;
-    public PuzzleWidget.SetSliderValueAction setSliderValue;
+    public IntSupplier defaultSliderValue;
    public PuzzleWidget.ChangeTextValueAction changeTextValue;
    public PuzzleWidget.ChangeSliderValueAction changeSliderValue;

@@ -44,22 +43,24 @@ public class PuzzleWidget {
        this.onPress = onPress;
    }
    /**
-     * Puzzle Slider Widget Container (WIP - Doesn't work)
+     * Puzzle Slider Widget Container
     */
-    public PuzzleWidget(int min, int max, Text descriptionText, PuzzleWidget.SetSliderValueAction setValueAction, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
+    public PuzzleWidget(int min, int max, Text descriptionText, IntSupplier defaultSliderValue, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
        this.buttonType = ButtonType.SLIDER;
        this.min = min;
        this.max = max;
        this.descriptionText = descriptionText;
-        this.setSliderValue = setValueAction;
+        this.defaultSliderValue = defaultSliderValue;
        this.buttonTextAction = setTextAction;
        this.changeSliderValue = changeAction;
    }
    /**
     * Puzzle Text Field Widget Container (WIP - Doesn't work)
     */
-    public PuzzleWidget(Text descriptionText, PuzzleWidget.SetTextValueAction setValue, ChangeTextValueAction changeAction, int a) {
+    public PuzzleWidget(int min, int max, Text descriptionText, PuzzleWidget.SetTextValueAction setValue, ChangeTextValueAction changeAction) {
        this.buttonType = ButtonType.TEXT_FIELD;
+        this.min = min;
+        this.max = max;
        this.descriptionText = descriptionText;
        this.setTextValue = setValue;
        this.changeTextValue = changeAction;
@@ -77,10 +78,6 @@ public class PuzzleWidget {
        void setTextValue(TextFieldWidget textField);
    }
    @Environment(EnvType.CLIENT)
-    public interface SetSliderValueAction {
-        void setSliderValue(PuzzleSliderWidget slider);
-    }
-    @Environment(EnvType.CLIENT)
    public interface TextAction {
        void setTitle(ClickableWidget button);
    }
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/util/ColorUtil.java
+++ b/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 ));
-    }
-}
--- a/puzzle-gui/src/main/resources/assets/puzzle/icon.png
+++ b/puzzle-gui/src/main/resources/assets/puzzle/icon.png
--- a/puzzle-gui/src/main/resources/assets/puzzle/textures/gui/puzzle_button.png
+++ b/puzzle-gui/src/main/resources/assets/puzzle/textures/gui/puzzle_button.png
--- a/puzzle-gui/src/main/resources/fabric.mod.json
+++ b/puzzle-gui/src/main/resources/fabric.mod.json
@@ -38,6 +38,11 @@
  ],

  "depends": {
-    "fabric": "*"
+    "fabric": "*",
+    "midnightlib": "*"
+  },
+  "breaks": {
+    "citresewn": "<=1.0.0+1.18.2",
+    "entity_texture_features": "<3.0.0"
  }
 }
--- a/puzzle-models/src/main/resources/assets/puzzle/icon.png
+++ b/puzzle-models/src/main/resources/assets/puzzle/icon.png
--- a/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
+++ b/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
@@ -1,10 +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;
@@ -33,23 +34,30 @@ import java.util.Properties;

 public class PuzzleSplashScreen implements ClientModInitializer {
    public static final Identifier LOGO = new Identifier("textures/gui/title/mojangstudios.png");
+    public static final Identifier BACKGROUND = new Identifier("optifine/splash_background.png");
    public static File CONFIG_PATH = new File(String.valueOf(FabricLoader.getInstance().getConfigDir().resolve(".puzzle_cache")));
    public static Path LOGO_TEXTURE = Paths.get(CONFIG_PATH + "/mojangstudios.png");
+    public static Path BACKGROUND_TEXTURE = Paths.get(CONFIG_PATH + "/splash_background.png");
    private static final MinecraftClient client = MinecraftClient.getInstance();
+    private static boolean keepBackground = true;

    public static void resetColors() {
        PuzzleConfig.backgroundColor = 15675965;
        PuzzleConfig.progressBarColor = 16777215;
+        PuzzleConfig.progressBarBackgroundColor = 15675965;
        PuzzleConfig.progressFrameColor = 16777215;
+        PuzzleConfig.disableBlend = false;
        PuzzleConfig.write("puzzle");
    }

    public void onInitializeClient() {
        if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistent //
            if (CONFIG_PATH.mkdir()) { // Create our custom config directory //
-                try {
-                    Files.setAttribute(CONFIG_PATH.toPath(), "dos:hidden", true);
-                } catch (IOException ignored) {
+                if (Util.getOperatingSystem().equals(Util.OperatingSystem.WINDOWS)) {
+                    try {
+                        Files.setAttribute(CONFIG_PATH.toPath(), "dos:hidden", true);
+                    } catch (IOException ignored) {
+                    }
                }
            }
        }
@@ -59,56 +67,74 @@ 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());
+                    client.getTextureManager().registerTexture(LOGO, new LogoTexture(LOGO));
+                    client.getTextureManager().registerTexture(BACKGROUND, new LogoTexture(BACKGROUND));

-                    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);
                            InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
-                            if (input != defaultLogo)
                            client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input)));
-                            else Files.delete(LOGO_TEXTURE);
                        } catch (Exception e) {
                            LogManager.getLogger("Puzzle").error("Error occurred while loading custom minecraft logo " + id.toString(), e);
                        }
+                    });
+                    manager.findResources("puzzle", path -> path.getPath().contains("splash_background.png")).forEach((id, resource) -> {
+                        try (InputStream stream = manager.getResource(id).get().getInputStream()) {
+                            Files.copy(stream, BACKGROUND_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
+                            InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
+                            client.getTextureManager().registerTexture(BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input)));
+                            keepBackground = true;
+                        } catch (Exception e) {
+                            LogManager.getLogger("Puzzle").error("Error occurred while loading custom splash background " + id.toString(), e);
+                        }
+                    });
+                    if (!keepBackground) {
+                        try {
+                            Files.delete(BACKGROUND_TEXTURE);
+                        } catch (Exception ignored) {}
                    }
+                    keepBackground = false;
                }
            }
        });
    }
    @Environment(EnvType.CLIENT)
    public static class LogoTexture extends ResourceTexture {
-        public LogoTexture() { super(LOGO); }
+        public LogoTexture(Identifier logo) { super(logo); }

        protected TextureData loadTextureData(ResourceManager resourceManager) {
            MinecraftClient minecraftClient = MinecraftClient.getInstance();
--- a/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java
+++ b/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java
@@ -1,10 +1,10 @@
 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;
 import net.minecraft.client.gui.screen.SplashOverlay;
+import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.texture.NativeImageBackedTexture;
 import net.minecraft.client.util.math.MatrixStack;
@@ -16,75 +16,100 @@ 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.nio.file.Files;
+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
+    private static int withAlpha(int color, int alpha) {
+        return 0;
+    }
+
    @Shadow @Final private MinecraftClient client;

+    @Shadow @Final private boolean reloading;
+
    @Shadow private long reloadStartTime;

    @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 //
-        if (PuzzleConfig.resourcepackSplashScreen && PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) {
-            try {
-                InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
-                client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input)));
-            } catch (IOException ignored) {}
+    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()) {
+                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 {
+                    InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
+                    client.getTextureManager().registerTexture(PuzzleSplashScreen.BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input)));
+                } 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 = "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();
+            int height = client.getWindow().getScaledHeight();
+            long l = Util.getMeasuringTimeMs();
+            float f = this.reloadCompleteTime > -1L ? (float)(l - this.reloadCompleteTime) / 1000.0F : -1.0F;
+            float g = this.reloadStartTime> -1L ? (float)(l - this.reloadStartTime) / 500.0F : -1.0F;
+            float s;
+            if (f >= 1.0F)
+                s = 1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F);
+            else if (reloading)
+                s = MathHelper.clamp(g, 0.0F, 1.0F);
+            else
+                s = 1.0F;
+            RenderSystem.setShaderTexture(0, PuzzleSplashScreen.BACKGROUND);
+            RenderSystem.enableBlend();
+            RenderSystem.blendEquation(32774);
+            RenderSystem.defaultBlendFunc();
+            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();
+            RenderSystem.disableBlend();
+        }
+    }
+    @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));
-    }
-    @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 //
-        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();
+        fill(matrices, minX, minY, maxX, maxY, withAlpha(PuzzleConfig.progressBarBackgroundColor, 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;
+    @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", ordinal = 0), index = 5)
+    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;
-    }
-
 }
--- a/puzzle-splashscreen/src/main/resources/assets/puzzle/icon.png
+++ b/puzzle-splashscreen/src/main/resources/assets/puzzle/icon.png
--- a/puzzle-splashscreen_example_pack.zip
+++ b/puzzle-splashscreen_example_pack.zip
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,4 +12,3 @@ include 'puzzle-base'
 include 'puzzle-splashscreen'
 include 'puzzle-models'
 include 'puzzle-gui'
-include 'puzzle-emissives'
--- a/src/main/resources/assets/puzzle/lang/de_de.json
+++ b/src/main/resources/assets/puzzle/lang/de_de.json
@@ -0,0 +1,39 @@
+{
+	"puzzle.text.update_available":"Ein Update ist verfügbar!",
+	"puzzle.screen.title":"Puzzle Einstellungen",
+	"puzzle.page.graphics":"Grafik Einstellungen",
+	"puzzle.page.resources":"Resourcen Einstellungen",
+	"puzzle.page.performance":"Performance Einstellungen",
+	"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",
+	"puzzle.option.better_splash_screen_blend":"Verbessere das Blending des Splash-Screen-Logos",
+	"puzzle.option.unlimited_model_rotations":"Unbegrenzte Modellrotationen",
+	"puzzle.option.bigger_custom_models":"Größere benutzerdefinierte Modelle",
+	"puzzle.midnightconfig.title":"Erweiterte Puzzle Konfiguration",
+	"puzzle.option.check_for_updates.tooltip": "Aktiviert Puzzle's eingebauten Update-Checker",
+	"puzzle.option.show_version_info.tooltip": "Zeigt Informationen über die Version\nvon Puzzle und die Verfügbarkeit von Updates\nauf dem Titelbildschirm und im F3-Menü",
+	"puzzle.option.resourcepack_splash_screen.tooltip": "Ermöglicht Resourcepacks, das Aussehen\ndes Ladebildschirms mit dem\nOptiFine-Format zu verändern",
+	"puzzle.option.better_splash_screen_blend.tooltip": "Ändert die Art des Blending,\ndie für das Logo auf dem Ladebildschirm benutzt wird,\ndamit es besser mit farbigen Logos funktioniert.",
+	"puzzle.option.unlimited_model_rotations.tooltip": "Schaltet volle 360° Rotation für\nbenutzerdefinierte Item-/Blockmodelle frei",
+	"puzzle.option.bigger_custom_models.tooltip": "Erhöht das Größenlimit für\nbenutzerdefinierte Item-/Blockmodelle\nvon 3x3x3 auf 5x5x5",
+	"puzzle.midnightconfig.tooltip": "Optionen für fortgeschrittene Nutzer",
+
+	"cullleaves.puzzle.option.enabled": "Aktiviere Culling für Blätter",
+	"cullleaves.puzzle.option.enabled.tooltip": "Fügt Occlusion Culling für \nBlätter hinzu, was die Leistung des \nSpiels verbessert",
+	"iris.puzzle.option.enableShaders": "Shader aktivieren",
+	"iris.puzzle.option.enableShaders.tooltip": "Legt fest, ob Shader aktiviert werden sollen",
+	"iris.puzzle.option.open": "ÖFFNEN",
+	"options.iris.shaderPackSelection.tooltip": "Öffnet einen Bildschirm, um Shader\nauszuwählen und zu konfigurieren",
+	"lambdabettergrass.option.mode.tooltip": "Verbindet die Seiten von Grasblöcken\nmit anliegenden Grasblöcken",
+	"lambdabettergrass.option.better_snow.tooltip": "Fügt eine rein visuelle Schnee-/Moosschicht\nunter nicht-volle Blöcke hinzu,\nwelche von Schnee/Moos umgeben sind",
+	"config.dynamicfps.reduce_when_unfocused.tooltip": "Reduziert Minecraft's FPS,\nwährend das Spiel nicht im Fokus ist\n(z.B. wenn ein anderes Fenster fokussiert oder das Spiel versteckt ist)\num Strom und Systemressourcen zu sparen",
+	"config.dynamicfps.unfocused_fps.tooltip": "Die Anzahl der Bilder pro Sekunde (FPS)\nmit denen Minecraft rendern\ndarf, wenn es nicht im Fokus ist",
+	"config.dynamicfps.restore_when_hovered.tooltip": "Legt fest, ob die Limitierung\nder FPS aufgehoben werden soll, wenn Minecraft in der Vorschau erscheint\n(z.B. in der Taskleiste oder Dock überfahren wird)",
+	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Lässt einen Garbage Collector laufen,\nwährend Minecraft nicht im Fokus ist\num etwas Arbeitsspeicher (RAM) freizumachen",
+	"config.dynamicfps.unfocused_volume.tooltip": "Die Lautstärke mit der Minecraft\nGeräusche wiedergeben kann, während es nicht im Fokus ist\n(z.B. wenn ein anderes Fenster fokussiert ist)",
+	"config.dynamicfps.hidden_volume.tooltip": "Die Lautstärke mit der Minecraft\nGeräusche wiedergeben kann, während es nicht im Fokus ist\n(z.B. wenn es minimiert, von anderen Fenstern verdeckt\noder auf einem anderen virtuellen Desktop ist)",
+	"entity_texture_features.puzzle.emissive_type.brighter": "§eHeller",
+	"entity_texture_features.puzzle.emissive_type.default": "§6Normal"
+}
--- a/src/main/resources/assets/puzzle/lang/el_gr.json
+++ b/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"
+}
+
--- a/src/main/resources/assets/puzzle/lang/en_us.json
+++ b/src/main/resources/assets/puzzle/lang/en_us.json
@@ -6,12 +6,32 @@
 	"puzzle.page.performance":"Performance Settings",
 	"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",
+	"puzzle.option.show_version_info.tooltip":"Show information about the current\nPuzzle version and update status on\nthe Title Screen and F3 Menu",
 	"puzzle.option.resourcepack_splash_screen":"Use resourcepack splash screen",
-	"puzzle.option.disable_splash_screen_blend":"Disable splash screen logo blending",
-	"puzzle.option.emissive_textures":"Emissive Textures",
+	"puzzle.option.resourcepack_splash_screen.tooltip":"Enables resourcepacks to change the look\nof Minecraft's loading/splash\nscreen using the OptiFine format",
+	"puzzle.option.better_splash_screen_blend":"Better splash screen logo blending",
+	"puzzle.option.better_splash_screen_blend.tooltip":"Changes the type of blending used\nby the logo on the splash screen\nto work better with custom colored logos",
 	"puzzle.option.unlimited_model_rotations":"Unlimited Model Rotations",
+	"puzzle.option.unlimited_model_rotations.tooltip":"Unlocks full 360° rotation on custom block/item models",
 	"puzzle.option.bigger_custom_models":"Bigger Custom Models",
-	"puzzle.option.render_layer_overrides":"Render Layer Overrides",
-	"puzzle.midnightconfig.title":"Puzzle Advanced Configuration"
+	"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.tooltip":"Options for advanced users only",
+
+	"cullleaves.puzzle.option.enabled": "Cull Leaves",
+	"cullleaves.puzzle.option.enabled.tooltip": "Enable the culling of leaves to enhance performance",
+	"iris.puzzle.option.enableShaders": "Enable Shaders",
+	"iris.puzzle.option.enableShaders.tooltip": "Whether or not to enable shaderpacks",
+	"iris.puzzle.option.open": "OPEN",
+	"options.iris.shaderPackSelection.tooltip": "Open a screen to select\nshaderpacks and configure them",
+	"lambdabettergrass.option.mode.tooltip": "Makes the sides of\ngrass blocks connect to\nadjacent grass blocks",
+	"lambdabettergrass.option.better_snow.tooltip": "Adds a purely visual snow/moss layer\nto non-full blocks that\nare surrounded by snow/moss",
+	"config.dynamicfps.reduce_when_unfocused.tooltip": "Reduces Minecraft's FPS when unfocused\n(i.e. another window is focused or the game is hidden)\nto save power and system resources",
+	"config.dynamicfps.unfocused_fps.tooltip": "The amount of frames per second\nMinecraft is allowed to\nrender at while unfocused",
+	"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)"
 }
--- a/src/main/resources/assets/puzzle/lang/et_ee.json
+++ b/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"
+}
--- a/src/main/resources/assets/puzzle/lang/ko_kr.json
+++ b/src/main/resources/assets/puzzle/lang/ko_kr.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.better_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 고급 환경설정"
+}
--- a/src/main/resources/assets/puzzle/lang/pl_pl.json
+++ b/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"
+}
--- a/src/main/resources/assets/puzzle/lang/ru_ru.json
+++ b/src/main/resources/assets/puzzle/lang/ru_ru.json
@@ -0,0 +1,39 @@
+{
+	"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.check_for_updates.tooltip":"Включить встроенную в Puzzle проверку обновлений",
+	"puzzle.option.show_version_info":"Показывать информацию о версии",
+	"puzzle.option.show_version_info.tooltip":"Отображать информацию о текущей версии\nPuzzle и наличии обновлений\nна главном экране и экране отладки",
+	"puzzle.option.resourcepack_splash_screen":"Пользовательский экран загрузки",
+	"puzzle.option.resourcepack_splash_screen.tooltip":"Разрешить наборам ресурсов изменять\nвнешний вид экрана загрузки Minecraft,\nиспользуя формат OptiFine",
+	"puzzle.option.better_splash_screen_blend":"Улучшенное смешивание логотипа",
+	"puzzle.option.better_splash_screen_blend.tooltip":"Изменить метод смешивания, используемый\nдля логотипа на экране загрузки,\nчтобы улучшить вид с изменёнными цветами",
+	"puzzle.option.unlimited_model_rotations":"Неограниченные повороты моделей",
+	"puzzle.option.unlimited_model_rotations.tooltip":"Разрешить поворот частей\nпользовательских моделей\nблоков/предметов на 360°",
+	"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.tooltip":"Только для продвинутых пользователей!",
+
+	"cullleaves.puzzle.option.enabled": "Отбраковка листвы",
+	"cullleaves.puzzle.option.enabled.tooltip": "Включить отбраковку блоков листвы\nдля улучшения производительности",
+	"iris.puzzle.option.enableShaders": "Шейдеры",
+	"iris.puzzle.option.enableShaders.tooltip": "Включить выбранный набор шейдеров",
+	"iris.puzzle.option.open": "Выбрать  ",
+	"options.iris.shaderPackSelection.tooltip": "Открыть  экран  переключения\nи настройки наборов шейдеров",
+	"lambdabettergrass.option.mode.tooltip": "Включить соединение текстуры\nтравы у соседних блоков дёрна",
+	"lambdabettergrass.option.better_snow.tooltip": "Добавить имитацию наличия слоя снега\nили мха для неполных блоков, имеющих\nсоответствующее окружение",
+	"config.dynamicfps.reduce_when_unfocused.tooltip": "Уменьшать FPS в Minecraft при переходе в фон\nдля экономии энергии и системных ресурсов\n(когда игра свёрнута или активно другое окно)",
+	"config.dynamicfps.unfocused_fps.tooltip": "Фактическое количество\nкадров в секунду, которое\nMinecraft сможет выводить\nв фоновом режиме",
+	"config.dynamicfps.restore_when_hovered.tooltip": "Отключать ограничение FPS,\nкогда на окно с Minecraft\nнаведён курсор мыши",
+	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Запускать сборщик мусора при\nпереходе игры в фон, чтобы\nосвободить пространство в ОЗУ\n(уменьшает число просадок FPS)",
+	"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Обычные"
+}
--- a/src/main/resources/assets/puzzle/lang/zh_cn.json
+++ b/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 高级设置"
+}
--- a/src/main/resources/assets/puzzle/lang/zh_tw.json
+++ b/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":"拼圖高級設置"
+}
Author	SHA1	Message	Date
Motschen	30b647938e	Fix crash with newer ETF versions	2023-01-05 18:26:01 +01:00
Martin Prokoph	a8c89b11c7	Merge pull request #45 from Felix14-v2/1.19 Update ru_ru.json	2022-08-02 20:46:26 +00:00
Felix14-v2	f8ff656daa	Update ru_ru.json	2022-08-02 23:35:50 +03:00
Motschen	f89fc08505	Puzzle 1.4.0 - Fixes, Integrations & Tooltip - Fixed #41 (ETF 4.0+ crashing) - Fixed #39 (Broken update checker) - Fixed slider widgets being broken - Hide buttons when options are empty (Closes #10) - More mod integrations (Closes #20) - DynamicFPS - Borderless Mining - Colormatic - Added tooltips for all Puzzle options - Made everything translatable - Improve German translations	2022-08-02 14:05:47 +02:00
Martin Prokoph	94afc8b0c0	Merge pull request #40 from Madis0/compress Compress images	2022-08-01 17:41:00 +00:00
Martin Prokoph	64aa45a370	Merge pull request #43 from Traben-0/1.19 ETF 4.0 support added	2022-08-01 12:57:16 +00:00
Traben	05bea0aab1	ETF 4.0 support added	2022-08-01 15:01:16 +10:00
Madis	fbb368989e	Compress images	2022-07-20 22:21:44 +03:00
Motschen	795759b4e5	Puzzle 1.3.4 - Custom splashscreen background & fixes - Add the ability to use custom splash screen background images placed in a resourcepack under "assets/minecraft/puzzle/splash_background.png" - Some more fixes regarding splash screen	2022-07-06 20:47:19 +02:00
Martin Prokoph	2410b8ff54	Merge pull request #35 from Felix14-v2/1.19 Update ru_ru.json	2022-07-06 18:42:27 +00:00
Martin Prokoph	d08889f186	Merge pull request #36 from gyular/ko_kr create korean translation	2022-07-06 18:41:51 +00:00
gyular	2886fd509b	create korean translation	2022-06-22 17:22:11 +09:00
Felix14-v2	8be9fc6872	Update ru_ru.json	2022-06-13 18:02:32 +03:00
Motschen	87ebfdd3b6	Puzzle 1.3.3 - Better Splashscreen - Only apply puzzle-splashscreen when needed (fixes #34, fixes #8)	2022-06-12 21:57:15 +02:00
Motschen	e8e563ad7b	Fix crash due to broken MidnightLib version	2022-06-12 09:55:13 +02:00
Motschen	417cd3e2f8	Update to 1.19	2022-06-11 23:37:56 +02:00
Motschen	b95045e21a	Puzzle 1.3.0 - Fix puzzle-splashscreen, update integrations	2022-06-06 15:11:51 +02:00
Motschen	fbbfe773a8	Puzzle 1.2.2 - Update ETF, New translations	2022-05-31 17:37:43 +02:00
Martin Prokoph	222f842386	Merge pull request #31 from Traben-0/1.18 Entity Texture Features V3.0 - patch	2022-05-30 16:49:39 +00:00
Martin Prokoph	f5aad84b90	Merge pull request #30 from Radplay/1.18 Add a polish translation	2022-05-30 16:46:27 +00:00
Martin Prokoph	2d9c069b79	Merge pull request #26 from Wudji/1.18 Create zh_cn.json	2022-05-30 16:45:54 +00:00
Martin Prokoph	06cb75d518	Merge pull request #28 from Guanran928/1.18 zh-cn and zh-tw translations	2022-05-30 16:44:17 +00:00
Martin Prokoph	9c775d8c06	Merge pull request #25 from Madis0/patch-1 Create et_ee.json	2022-05-30 16:43:30 +00:00
Traben	bcda47d94c	ETF 3.0 update	2022-05-30 14:51:28 +10:00
Radplay	01bab4b885	Create pl_pl.json	2022-05-16 18:29:43 +02:00
Guanran928	b008d7b75e	Create zh-tw.json	2022-04-23 02:41:05 +08:00
Guanran928	4a21d9eb91	Create zh-cn.json	2022-04-23 02:39:59 +08:00
Wudji	2332192301	Create zh_cn.json	2022-04-06 08:24:49 +08:00
Madis Otenurm	acefd614ec	Create et_ee.json	2022-04-03 15:51:54 +03:00
Motschen	e55d62d9e9	Merge pull request #22 from RaptaG/patch-1 Create el_gr.json	2022-03-21 20:47:59 +01:00
RaptaG	488a12f417	Greek Translation	2022-03-21 18:35:42 +00:00
Motschen	d282d43f20	Puzzle 1.2.1 - Fix CITResewn 1.0.0+	2022-03-18 14:49:57 +01:00
Motschen	fa52471ade	Puzzle 1.2.0 - 1.18 Fix #18 Fix #17 Fix #13 Russian translations by @Felix14-v2 German translations by @2020Sanoj	2022-03-13 22:00:43 +01:00
Motschen	1ffe62f3af	Merge pull request #11 from Felix14-v2/1.18 Added ru_ru.json	2022-03-13 21:17:23 +01:00
Felix14-v2	5cd113d060	Added ru_ru.json	2022-01-25 12:39:09 +01:00