Puzzle 1.6.1 for 1.20.4

- Update to 1.20.4
- Re-Use MidnightConfig's list widget -> prettier background

README.md

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

build.gradle

@@ -1,6 +1,6 @@
 // Based on https://github.com/OnyxStudios/Cardinal-Components-API/blob/1.17/build.gradle
 plugins {
-    id "fabric-loom" version "0.10-SNAPSHOT" apply false
+    id "fabric-loom" version "1.2-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 {
@@ -133,13 +122,19 @@ dependencies {
     }
     modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
     modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
-    modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
+    modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
     modImplementation ("maven.modrinth:iris:${project.iris_version}")
-    modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
-    modImplementation ("maven.modrinth:continuity:${project.continuity_version}")
+    modCompileOnly ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
+    modCompileOnlyApi ("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 "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
+    modCompileOnlyApi ("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.etf_version}")
+    modImplementation ("maven.modrinth:entity-model-features:${project.emf_version}")
+    modImplementation ("maven.modrinth:completeconfig:${project.complete_config_version}")
+    //modImplementation ("maven.modrinth:exordium:${project.exordium_version}")
 
     modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
         exclude group: 'com.google.code.gson'

gradle.properties

@@ -1,30 +1,39 @@
 # 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.20.4
+	yarn_mappings=1.20.4+build.1
+	loader_version=0.15.1
 
 # Mod Properties
-	mod_version = 1.1.0
+	mod_version = 1.6.1+1.20.4
 	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.91.2+1.20.4
+	mod_menu_version = 7.0.1
+	midnightlib_version = 1.5.2-fabric
 	
-	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
-	complete_config_version = 1.0.0
-	spruceui_version=3.3.2+1.17
-	midnightlib_version=0.3.1
+	cull_leaves_version = 3.0.2-fabric
+	ldl_version = 2.3.2+1.20.1
+	lbg_version = 1.5.2+1.20.1
+	iris_version = 1.6.9+1.20.2
+	continuity_version = 3.0.0-beta.3+1.20.1
+	animatica_version = 0.6+1.20
+	colormatic_version = 3.1.2
+	borderless_mining_version = 1.1.8+1.20.1
+	dynamic_fps_version = 3.2.0
+	toml4j_version = 0.7.2
+	cit_resewn_version = 1.1.3+1.20
+	complete_config_version = 2.3.0
+	spruceui_version=5.0.0+1.20
+	emf_version=1.2
+	etf_version=5.0
+	exordium_version=1.2.1-1.20.2
+	# Required for LBG
+	quilt_loader_version=0.19.0-beta.18
+	quilt_fabric_api_version=7.0.1+0.83.0-1.20

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

puzzle-base/build.gradle

@@ -1,9 +1,11 @@
 archivesBaseName = "puzzle-base"
 repositories {
+    maven { url "https://maven.terraformersmc.com/releases" }
     maven {
         url = "https://api.modrinth.com/maven"
     }
 }
 dependencies {
     modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
+    modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
 }

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

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

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

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

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

@@ -4,7 +4,6 @@ import com.mojang.blaze3d.platform.GlDebugInfo;
 import net.puzzlemc.core.PuzzleCore;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.core.util.UpdateChecker;
-import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.hud.DebugHud;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -14,8 +13,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import java.util.List;
 
 @Mixin(DebugHud.class)
-public abstract class MixinDebugHud extends DrawableHelper {
-    @Inject(at = @At("RETURN"), method = "getRightText", cancellable = true)
+public abstract class MixinDebugHud {
+    @Inject(at = @At("RETURN"), method = "getRightText")
     private void puzzle$getRightText(CallbackInfoReturnable<List<String>> cir) {
         if (PuzzleConfig.showPuzzleInfo) {
             List<String> entries = cir.getReturnValue();

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

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

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

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

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

@@ -0,0 +1,9 @@
+package net.puzzlemc.core.util;
+
+import com.terraformersmc.modmenu.config.ModMenuConfig;
+
+public class ModMenuUtil {
+    public static boolean hasClassicButton() {
+        return ModMenuConfig.MODIFY_TITLE_SCREEN.getValue() && ModMenuConfig.MODS_BUTTON_STYLE.getValue() == ModMenuConfig.TitleMenuButtonStyle.CLASSIC;
+    }
+}

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

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

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}"
-}

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);
-                            }
-                        }
-                    }
-                }
-            }
-        });
-    }
-}

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);
-        }
-    }
-}

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": "*"
-  }
-}

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
-  }
-}

puzzle-gui/build.gradle

@@ -27,6 +27,7 @@ repositories {
 	maven {
 		url "https://maven.shedaniel.me/"
 	}
+	maven { url "https://maven.quiltmc.org/repository/release/" }
 }
 
 dependencies {
@@ -35,21 +36,28 @@ dependencies {
 
 	modImplementation "dev.lambdaurora:spruceui:${project.spruceui_version}"
 	modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
-
 	modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
+
 	modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
 	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}")
-	modImplementation ("curse.maven:custom-entity-models-cem-477078:${project.cem_version}")
-	modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
+	modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
+	modCompileOnly "org.quiltmc:quilt-loader:${rootProject.quilt_loader_version}"
+	modCompileOnlyApi "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${rootProject.quilt_fabric_api_version}"
+	modCompileOnlyApi ("maven.modrinth:iris:${project.iris_version}")
+	modCompileOnly ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
+	modCompileOnlyApi ("maven.modrinth:continuity:${project.continuity_version}")
+	modCompileOnlyApi ("maven.modrinth:animatica:${project.animatica_version}")
+	modCompileOnlyApi ("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.etf_version}")
+	modImplementation ("maven.modrinth:entity-model-features:${project.emf_version}")
+	modImplementation ("maven.modrinth:completeconfig:${project.complete_config_version}")
+	//modImplementation ("maven.modrinth:exordium:${project.exordium_version}")
 
 	modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
 		exclude group: 'com.google.code.gson'
 		exclude group: 'com.google.guava'
 	}
- 	modImplementation ("maven.modrinth:continuity:${project.continuity_version}") {
-         exclude module: "modmenu"
- 	}
 } 

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

@@ -6,18 +6,18 @@ import net.irisshaders.iris.api.v0.IrisApiConfig;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Formatting;
 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").formatted(Formatting.GOLD))), (button) -> {
                 MinecraftClient client = MinecraftClient.getInstance();
                 client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen));
             }));

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

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

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

@@ -4,135 +4,164 @@ import dev.lambdaurora.lambdabettergrass.LBGConfig;
 import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
 import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
 import dev.lambdaurora.lambdynlights.LambDynLights;
+import eu.midnightdust.core.MidnightLib;
 import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import eu.midnightdust.lib.util.PlatformFunctions;
+import io.github.kvverti.colormatic.Colormatic;
+import io.github.kvverti.colormatic.ColormaticConfigController;
+import link.infra.borderlessmining.config.ConfigHandler;
 import me.pepperbell.continuity.client.config.ContinuityConfig;
-import net.dorianpb.cem.internal.config.CemConfig;
-import net.dorianpb.cem.internal.config.CemConfigFairy;
-import net.dorianpb.cem.internal.config.CemOptions;
+import me.pepperbell.continuity.client.config.Option;
+import net.minecraft.screen.ScreenTexts;
+import net.minecraft.util.Identifier;
 import net.puzzlemc.core.config.PuzzleConfig;
-import net.puzzlemc.gui.mixin.CemConfigAccessor;
 import net.puzzlemc.gui.screen.widget.PuzzleWidget;
 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_model_features.config.EMFConfig;
+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);
+    public static final Identifier PUZZLE_BUTTON = new Identifier(id, "icon/button");
 
     @Override
     public void onInitializeClient() {
+        MidnightLib.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) -> {
+        if (isActive("puzzle-splashscreen")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
                 PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
                 PuzzleConfig.write(id);
                 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);
+                MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture(PuzzleSplashScreen.LOGO));
             }));
         }
-        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);
-            }));
-        }
-        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) -> {
+        if (isActive("puzzle-models")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
                 PuzzleConfig.unlimitedRotations = !PuzzleConfig.unlimitedRotations;
                 PuzzleConfig.write(id);
             }));
-            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")) {
+        if (isActive("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("iris") && !PuzzleConfig.disabledIntegrations.contains("iris")) {
-            IrisCompat.init();
+        if (isActive("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("continuity") && !PuzzleConfig.disabledIntegrations.contains("continuity")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
-            ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("options.continuity.disable_ctm"), (button) -> button.setMessage(contConfig.disableCTM.get() ? YES : NO), (button) -> {
-                contConfig.disableCTM.set(!contConfig.disableCTM.get());
-                contConfig.onChange();
-                contConfig.save();
-            }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("options.continuity.use_manual_culling"), (button) -> button.setMessage(contConfig.useManualCulling.get() ? YES : NO), (button) -> {
-                contConfig.useManualCulling.set(!contConfig.useManualCulling.get());
-                contConfig.onChange();
-                contConfig.save();
+        if (isActive("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 (isActive("iris")) {
+            IrisCompat.init();
         }
     }
     public static boolean lateInitDone = false;
     public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
-        if (FabricLoader.getInstance().isModLoaded("lambdynlights") && !PuzzleConfig.disabledIntegrations.contains("lambdynlights")) {
+        if (isActive("lambdynlights")) {
             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.empty().append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.block_entities")), (button) -> button.setMessage(ldlConfig.getBlockEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getBlockEntitiesLightSource().set(!ldlConfig.getBlockEntitiesLightSource().get())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
         }
-        if (FabricLoader.getInstance().isModLoaded("citresewn") && !PuzzleConfig.disabledIntegrations.contains("citresewn") && CITResewn.INSTANCE != null && CITResewnConfig.INSTANCE() != null) {
+        if (isActive("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 {
@@ -142,35 +171,72 @@ public class PuzzleClient implements ClientModInitializer {
                 citConfig.write();
             }));
         }
-        if (FabricLoader.getInstance().isModLoaded("lambdabettergrass") && !PuzzleConfig.disabledIntegrations.contains("lambdabettergrass")) {
+        if (isActive("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) -> {
-                ((CemConfigAccessor)cemOptions).setUseOptifineFolder(!cemConfig.useOptifineFolder());
-                cemConfig.save();
+        if (isActive("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.save();
+                    }));
+                } catch (Exception ignored) {}
+            });
+        }
+        if (isActive("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(new TranslatableText("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(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(new TranslatableText("config.cem.use_old_animations"), (button) -> button.setMessage(cemConfig.useOldAnimations() ? YES : NO), (button) -> {
-                ((CemConfigAccessor)cemOptions).setUseOldAnimations(!cemConfig.useOldAnimations());
-                cemConfig.save();
+            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();
+            }));
+        }
+        if (isActive("entity_model_features")) {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.title")));
+            EMFConfig emfConfig = EMFConfig.getConfig();
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.config.force_models"), (button) -> button.setMessage(emfConfig.attemptRevertingEntityModelsAlteredByAnotherMod ? YES : NO), (button) -> {
+                emfConfig.attemptRevertingEntityModelsAlteredByAnotherMod = !emfConfig.attemptRevertingEntityModelsAlteredByAnotherMod;
+                EMFConfig.EMF_saveConfig();
+            }));
+            if (PlatformFunctions.isModLoaded("physicsmod")) {
+                PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.config.physics"), (button) -> button.setMessage(emfConfig.attemptPhysicsModPatch_2 != EMFConfig.PhysicsModCompatChoice.OFF ?
+                        Text.translatable("entity_model_features.config." + (emfConfig.attemptPhysicsModPatch_2 == EMFConfig.PhysicsModCompatChoice.VANILLA ? "physics.1" : "physics.2")) : ScreenTexts.OFF), (button) -> {
+                    emfConfig.attemptPhysicsModPatch_2 = emfConfig.attemptPhysicsModPatch_2.next();
+                    EMFConfig.EMF_saveConfig();
+                }));
+            }
         }
         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 +255,10 @@ 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);
             }
     }
+    public static boolean isActive(String modid) {
+        return PlatformFunctions.isModLoaded(modid) && !PuzzleConfig.disabledIntegrations.contains(modid);
+    }
 }

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;
     }
 }

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

@@ -1,17 +0,0 @@
-package net.puzzlemc.gui.mixin;
-
-import net.dorianpb.cem.internal.config.CemConfig;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(value = CemConfig.class, remap = false)
-public interface CemConfigAccessor {
-    @Accessor("use_optifine_folder")
-    void setUseOptifineFolder(boolean value);
-
-    @Accessor("use_new_model_creation_fix")
-    void setUseModelCreationFix(boolean value);
-
-    @Accessor("use_old_animations")
-    void setUseOldAnimations(boolean value);
-}

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

@@ -1,14 +1,14 @@
 package net.puzzlemc.gui.mixin;
 
-import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
-import net.minecraft.util.Identifier;
+import eu.midnightdust.core.config.MidnightLibConfig;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.gui.widget.TextIconButtonWidget;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.gui.PuzzleClient;
 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;
@@ -18,15 +18,19 @@ import java.util.Objects;
 
 @Mixin(OptionsScreen.class)
 public abstract class MixinOptionsScreen extends Screen {
-    private static final Identifier PUZZLE_ICON_TEXTURE = new Identifier(PuzzleClient.id, "textures/gui/puzzle_button.png");
-
     protected MixinOptionsScreen(Text title) {
         super(title);
     }
 
     @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;
+            TextIconButtonWidget iconButton = TextIconButtonWidget.builder(Text.translatable("puzzle.screen.title"), (buttonWidget) -> (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), true).dimension(20, 20).texture(PuzzleClient.PUZZLE_BUTTON, 20, 20).build();
+            iconButton.setPosition(this.width / 2 - 178 + i, this.height / 6 - 12);
+            this.addDrawableChild(iconButton);
+        }
     }
 }

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));
-    }
-}

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);
-    }
-}

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

@@ -1,51 +1,94 @@
 package net.puzzlemc.gui.screen;
 
-import net.fabricmc.loader.api.FabricLoader;
+import com.google.common.collect.Lists;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.tab.GridScreenTab;
+import net.minecraft.client.gui.tab.Tab;
+import net.minecraft.client.gui.tab.TabManager;
+import net.minecraft.client.gui.widget.TabNavigationWidget;
+import net.minecraft.screen.ScreenTexts;
+import net.minecraft.text.Text;
+import net.puzzlemc.gui.PuzzleApi;
 import net.puzzlemc.gui.PuzzleClient;
-import net.puzzlemc.gui.screen.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.puzzlemc.gui.screen.widget.*;
 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 class PuzzleOptionsScreen extends Screen {
+    public PuzzleOptionListWidget list;
+    public List<Text> tooltip = null;
+    public TabManager tabManager = new TabManager(a -> {}, a -> {});
+    public Tab prevTab;
+    public TabNavigationWidget tabNavigation;
+    public static Text graphicsTab = Text.translatable("puzzle.page.graphics");
+    public static Text miscTab = Text.translatable("puzzle.page.misc");
+    public static Text performanceTab = Text.translatable("puzzle.page.performance");
+    public static Text resourcesTab = Text.translatable("puzzle.page.resources");
 
     public PuzzleOptionsScreen(Screen parent) {
-        super(new TranslatableText("puzzle.screen.title"));
+        super(Text.translatable("puzzle.screen.title"));
         this.parent = parent;
     }
     private final Screen parent;
 
     @Override
     protected void init() {
-        super.init();
         if (!PuzzleClient.lateInitDone) PuzzleClient.lateInit();
-        GraphicsPage graphicsPage = new GraphicsPage(this);
-        MiscPage miscPage = new MiscPage(this);
-        PerformancePage performancePage = new PerformancePage(this);
-        ResourcesPage resourcesPage = new ResourcesPage(this);
 
-        this.addDrawableChild(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));
-//        }
-        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height / 6 + 168, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
+        List<Tab> tabs = Lists.newArrayList();
+        if (!PuzzleApi.GRAPHICS_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(graphicsTab));
+        if (!PuzzleApi.RESOURCE_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(resourcesTab));
+        if (!PuzzleApi.PERFORMANCE_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(performanceTab));
+        if (!PuzzleApi.MISC_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(miscTab));
+
+        tabNavigation = TabNavigationWidget.builder(tabManager, this.width).tabs(tabs.toArray(new Tab[0])).build();
+        if (tabs.size() > 1) this.addDrawableChild(tabNavigation);
+        tabNavigation.selectTab(0, false);
+        tabNavigation.init();
+        prevTab = tabManager.getCurrentTab();
+        this.addDrawableChild(tabNavigation);
+        this.list = new PuzzleOptionListWidget(this.client, this.width, this.height - 64, 32, 25);
+        fillList();
+        this.addSelectableChild(this.list);
+
+        super.init();
+        if (client != null && client.world != null) this.list.setRenderBackground(false);
+
+        this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)).dimensions(this.width / 2 - 100, this.height - 28, 200, 20).build());
+    }
+    private void fillList() {
+        List<PuzzleWidget> options = List.of();
+        if (tabManager.getCurrentTab() == null) return;
+        else if (tabManager.getCurrentTab().getTitle().equals(graphicsTab)) options = PuzzleApi.GRAPHICS_OPTIONS;
+        else if (tabManager.getCurrentTab().getTitle().equals(miscTab)) options = PuzzleApi.MISC_OPTIONS;
+        else if (tabManager.getCurrentTab().getTitle().equals(performanceTab)) options = PuzzleApi.PERFORMANCE_OPTIONS;
+        else if (tabManager.getCurrentTab().getTitle().equals(resourcesTab)) options = PuzzleApi.RESOURCE_OPTIONS;
+        list.addAll(options);
+    }
+    @Override
+    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+        if (this.tabNavigation.trySwitchTabsWithKey(keyCode)) return true;
+        return super.keyPressed(keyCode, scanCode, modifiers);
+    }
+    @Override
+    public void tick() {
+        super.tick();
+        if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
+            prevTab = tabManager.getCurrentTab();
+            this.list.clear();
+            fillList();
+            list.setScrollAmount(0);
+        }
     }
 
     @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        this.renderBackground(matrices);
-
-        super.render(matrices, mouseX, mouseY, delta);
-        drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        if (client != null && client.world != null) super.renderInGameBackground(context);
+        this.list.render(context, mouseX, mouseY, delta);
+        super.render(context, mouseX, mouseY, delta);
     }
+    @Override public void renderBackground(DrawContext c, int x, int y, float d) {}
 }

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

@@ -1,45 +0,0 @@
-package net.puzzlemc.gui.screen.page;
-
-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;
-    private final List<PuzzleWidget> options;
-
-    public AbstractPuzzleOptionsPage(Screen parent, TranslatableText title, List<PuzzleWidget> options) {
-        super(title);
-        this.parent = parent;
-        this.options = options;
-    }
-    private final Screen parent;
-
-    @Override
-    protected void init() {
-        this.list = new PuzzleOptionListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
-        list.addAll(options);
-        this.addSelectableChild(this.list);
-
-        super.init();
-
-        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
-    }
-
-    @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        this.renderBackground(matrices);
-        if (client != null && client.world != null) this.list.setRenderBackground(false);
-        this.list.render(matrices, mouseX, mouseY, delta);
-
-        drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
-        super.render(matrices, mouseX, mouseY, delta);
-    }
-}

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

@@ -1,12 +0,0 @@
-package net.puzzlemc.gui.screen.page;
-
-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);
-    }
-}

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

@@ -1,12 +0,0 @@
-package net.puzzlemc.gui.screen.page;
-
-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);
-    }
-}

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

@@ -1,12 +0,0 @@
-package net.puzzlemc.gui.screen.page;
-
-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);
-    }
-}

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

@@ -1,12 +0,0 @@
-package net.puzzlemc.gui.screen.page;
-
-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);
-    }
-}

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

@@ -1,19 +1,23 @@
 package net.puzzlemc.gui.screen.widget;
 
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
+import java.util.function.Supplier;
+
 public class PuzzleButtonWidget extends ButtonWidget {
     private final PuzzleWidget.TextAction title;
 
     public PuzzleButtonWidget(int x, int y, int width, int height, PuzzleWidget.TextAction title, PressAction onPress) {
-        super(x, y, width, height, Text.of(""), onPress);
+        super(x, y, width, height, Text.of(""), onPress, Supplier::get);
         this.title = title;
     }
     @Override
-    public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        title.setTitle(this);
-        super.renderButton(matrices, mouseX, mouseY, delta);
+    public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+        try {
+            title.setTitle(this);
+        } catch (Exception e) {e.fillInStackTrace(); this.visible = false;}
+        super.renderWidget(context, mouseX, mouseY, delta);
     }
 }

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

@@ -1,90 +1,74 @@
 package net.puzzlemc.gui.screen.widget;
 
+import eu.midnightdust.lib.config.MidnightConfig;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.Element;
-import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.gui.widget.ElementListWidget;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.LiteralText;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableTextContent;
+import net.minecraft.util.Formatting;
+import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
 import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 
 @Environment(EnvType.CLIENT)
-public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWidget.ButtonEntry> {
+public class PuzzleOptionListWidget extends MidnightConfig.MidnightConfigListWidget {
     TextRenderer textRenderer;
 
-    public PuzzleOptionListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) {
-        super(minecraftClient, i, j, k, l, m);
+    public PuzzleOptionListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l) {
+        super(minecraftClient, i, j, k, l);
         this.centerListVertically = false;
         textRenderer = minecraftClient.textRenderer;
     }
 
-    public void addButton(ClickableWidget button, Text text) {
-        this.addEntry(ButtonEntry.create(button, text));
-    }
-
     public void addAll(List<PuzzleWidget> buttons) {
         for (PuzzleWidget button : buttons) {
             if (button.buttonType == ButtonType.TEXT) {
-                this.addButton(null, button.descriptionText);
+                this.addButton(List.of(), Text.literal("> ").append(button.descriptionText).formatted(Formatting.BOLD), new MidnightConfig.EntryInfo());
             } 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(List.of(new PuzzleButtonWidget(this.width / 2 + 25, 0, 150, 20, button.buttonTextAction, button.onPress)), button.descriptionText, new MidnightConfig.EntryInfo());
             } 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(List.of(new PuzzleSliderWidget(button.min, button.max, this.width / 2 + 25, 0, 150, 20, button.defaultSliderValue.getAsInt(), button.buttonTextAction, button.changeSliderValue)), button.descriptionText, new MidnightConfig.EntryInfo());
             } 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(List.of(new PuzzleTextFieldWidget(textRenderer, this.width / 2 + 25, 0, 150, 20, button.setTextValue, button.changeTextValue)), button.descriptionText, new MidnightConfig.EntryInfo());
             } else
                 LogManager.getLogger("Puzzle").warn("Button " + button + " is missing the buttonType variable. This shouldn't happen!");
         }
     }
-
-    public int getRowWidth() {
-        return 400;
-    }
-
-    protected int getScrollbarPositionX() {
-        return super.getScrollbarPositionX() + 60;
-    }
-
-    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;
-
-        private ButtonEntry(ClickableWidget button, Text text) {
-            if (button != null)
-            this.buttons.add(button);
-            this.button = button;
-            this.text = text;
-        }
-
-        public static ButtonEntry create(ClickableWidget button, Text text) {
-            return new ButtonEntry(button, text);
-        }
-
-        public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            if (button != null) {
-                button.y = y;
-                button.render(matrices, mouseX, mouseY, tickDelta);
+    public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+        super.renderWidget(context, mouseX, mouseY, delta);
+        MidnightConfig.ButtonEntry e = this.getHoveredEntry();
+        if (client.currentScreen instanceof PuzzleOptionsScreen page && e != null && !e.buttons.isEmpty() && MidnightConfig.ButtonEntry.buttonsWithText.get(e.buttons.get(0)).getContent() instanceof TranslatableTextContent content) {
+            ClickableWidget button = e.buttons.get(0);
+            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 (button == null) drawCenteredText(matrices,textRenderer, new LiteralText("－－－－－－ ").append(text).append(" －－－－－－"),x + 200,y+5,0xFFFFFF);
-            else drawTextWithShadow(matrices,textRenderer, text,x+15,y+5,0xFFFFFF);
-        }
 
-        public List<? extends Element> children() {
-            return buttons;
+            if (key != null) {
+                List<Text> list = new ArrayList<>();
+                for (String str : I18n.translate(key).split("\n"))
+                    list.add(Text.literal(str));
+                page.tooltip = list;
+                if (!button.isMouseOver(mouseX, mouseY)) {
+                    context.drawTooltip(textRenderer, list, button.getX(), button.getY() + (button.getHeight() * 2));
+                }
+                else context.drawTooltip(textRenderer, list, mouseX, mouseY);
+            }
         }
+    }
 
-        @Override
-        public List<? extends Selectable> selectableChildren() {
-            return buttons;
-        }
+    @Override
+    public MidnightConfig.ButtonEntry getHoveredEntry() {
+        return super.getHoveredEntry();
     }
 }

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

@@ -9,16 +9,17 @@ 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();
+        try {
+            this.updateMessage();
+        } catch (Exception e) {e.printStackTrace(); this.visible = false;}
     }
     public int getInt() {
         int difference = max - min;

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

@@ -12,7 +12,9 @@ public class PuzzleTextFieldWidget extends TextFieldWidget {
         super(textRenderer, x, y, width, height, Text.of(""));
         this.setValueAction = setValue;
         this.change = change;
-        setValueAction.setTextValue(this);
+        try {
+            setValueAction.setTextValue(this);
+        } catch (Exception e) {e.printStackTrace(); this.setVisible(false);}
     }
     @Override
     public void write(String text) {

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);
     }

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

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

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

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

puzzle-gui/src/main/resources/puzzle-gui.mixins.json

@@ -3,8 +3,7 @@
   "package": "net.puzzlemc.gui.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "MixinOptionsScreen",
-    "CemConfigAccessor"
+    "MixinOptionsScreen"
   ],
   "injectors": {
     "defaultRequire": 1

puzzle-models/build.gradle

@@ -4,6 +4,7 @@ loom {
     accessWidenerPath =  file("src/main/resources/puzzle-models.accesswidener")
 }
 repositories {
+    maven { url "https://maven.terraformersmc.com/releases" }
     maven {
         url = "https://api.modrinth.com/maven"
     }

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

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

puzzle-splashscreen/build.gradle

@@ -1,5 +1,6 @@
 archivesBaseName = "puzzle-splashscreen"
 repositories {
+    maven { url "https://maven.terraformersmc.com/releases" }
     maven {
         url = "https://api.modrinth.com/maven"
     }

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

@@ -1,10 +1,14 @@
 package net.puzzlemc.splashscreen;
 
+import com.mojang.blaze3d.platform.TextureUtil;
+import com.mojang.blaze3d.systems.RenderSystem;
+import eu.midnightdust.lib.util.MidnightColorUtil;
 import net.fabricmc.api.ClientModInitializer;
+import net.minecraft.client.texture.AbstractTexture;
 import net.minecraft.client.texture.NativeImageBackedTexture;
+import net.minecraft.util.Util;
 import net.minecraft.util.math.ColorHelper;
 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;
@@ -21,35 +25,41 @@ import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 
 import java.awt.*;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.util.Objects;
 import java.util.Properties;
 
 public class PuzzleSplashScreen implements ClientModInitializer {
     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) {
+                    }
                 }
             }
         }
@@ -58,63 +68,76 @@ public class PuzzleSplashScreen implements ClientModInitializer {
             public Identifier getFabricId() {
                 return new Identifier("puzzle", "splash_screen");
             }
-
             @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);
+                            client.getTextureManager().registerTexture(LOGO, new DynamicLogoTexture());
                         } 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();
-            DefaultResourcePack defaultResourcePack = minecraftClient.getResourcePackProvider().getPack();
+            DefaultResourcePack defaultResourcePack = minecraftClient.getDefaultResourcePack();
             try {
-                InputStream inputStream = defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO);
+                InputStream inputStream = Objects.requireNonNull(defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO)).get();
                 TextureData var6;
                 try {
                     var6 = new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(inputStream));
@@ -129,4 +152,18 @@ public class PuzzleSplashScreen implements ClientModInitializer {
             }
         }
     }
+    @Environment(EnvType.CLIENT)
+    public static class DynamicLogoTexture extends ResourceTexture {
+        public DynamicLogoTexture() {
+            super(LOGO);
+        }
+        protected TextureData loadTextureData(ResourceManager resourceManager) {
+            try {
+                InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
+                return new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(input));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
 }

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

@@ -1,13 +1,13 @@
 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.DrawContext;
 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;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.MathHelper;
@@ -16,75 +16,95 @@ 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()) {
+                client.getTextureManager().registerTexture(LOGO, new PuzzleSplashScreen.DynamicLogoTexture());
+            }
+            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(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (PuzzleConfig.disableBlend && PuzzleConfig.resourcepackSplashScreen) RenderSystem.defaultBlendFunc();
+    }
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;getScaledWindowWidth()I", shift = At.Shift.BEFORE, ordinal = 2))
+    private void puzzle$renderSplashBackground(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE) && PuzzleConfig.resourcepackSplashScreen) {
+            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.enableBlend();
+            RenderSystem.blendEquation(32774);
+            RenderSystem.defaultBlendFunc();
+            RenderSystem.setShader(GameRenderer::getPositionTexProgram);
+            RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, s);
+            context.drawTexture(PuzzleSplashScreen.BACKGROUND, 0, 0, 0, 0, 0, width, height, width, height);
+            RenderSystem.defaultBlendFunc();
+            RenderSystem.disableBlend();
+        }
+    }
+    @Inject(method = "renderProgressBar", at = @At("HEAD"))
+    private void puzzle$addProgressBarBackground(DrawContext context, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
+        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();
+        RenderSystem.disableBlend();
+        context.fill(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;
+    @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;fill(IIIII)V"), index = 4)
+    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/DrawContext;fill(IIIII)V", ordinal = 0), index = 4)
+    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;
-    }
-
 }

settings.gradle

@@ -12,4 +12,3 @@ include 'puzzle-base'
 include 'puzzle-splashscreen'
 include 'puzzle-models'
 include 'puzzle-gui'
-include 'puzzle-emissives'

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

@@ -0,0 +1,42 @@
+{
+	"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.option.show_version_info":"Паказваць версію Puzzle",
+	"puzzle.option.show_version_info.tooltip":"Паказваць інфармацыю пра бягучую\nверсію Puzzle и наяўнасць абнаўленняў на\nтытульным экране і меню F3",
+	"puzzle.option.resourcepack_splash_screen":"Выкарыстанне пакетаў рэсурсаў для сплэшэй",
+	"puzzle.option.resourcepack_splash_screen.tooltip":"Уключае пакеты рэсурсаў, якія змяняюць\nзагрузачныя экраны/сплэшы\nMinecraft, якія выкарыстоўваюць фармат 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":"Дазваляе вярчэнне на 360° на карыстальніцкіх мадэляў блокаў/прадметаў",
+	"puzzle.option.bigger_custom_models":"Павялічаныя карыстальніцкія мадэлі",
+	"puzzle.option.bigger_custom_models.tooltip":"Павялічвае ліміт памеру\nкарыстальніцкіх мадэляў блокаў/прадметаў\nз 3x3x3 да 5x5x5",
+	"puzzle.midnightconfig.title":"Пашыраныя налады Puzzle",
+	"puzzle.midnightconfig.category.gui":"GUI",
+	"puzzle.midnightconfig.category.features":"Асаблівасці",
+	"puzzle.midnightconfig.category.debug":"Debug",
+	"puzzle.midnightconfig.tooltip":"Налады толькі для вопытных карыстальнікаў",
+
+	"cullleaves.puzzle.option.enabled": "Адбракоўваць лісце",
+	"cullleaves.puzzle.option.enabled.tooltip": "Уключыць адбракоўванне лісця, каб павялічыць прадукцыйнасць",
+	"iris.puzzle.option.enableShaders": "Уключыць шэйдэры",
+	"iris.puzzle.option.enableShaders.tooltip": "Дазваляе уключаць ці выключаць шэйдэры",
+	"iris.puzzle.option.open": "АДКРЫЦЬ",
+	"options.iris.shaderPackSelection.tooltip": "Адкрывае экран выбару\nшэйдэраў і іх налад",
+	"lambdabettergrass.option.mode.tooltip": "Робіць бакі\nзямлі з дзёрнам злучанымі з\nверхам гэтага блоку",
+	"lambdabettergrass.option.better_snow.tooltip": "Дадае крыху бачны слой снег/імху\nна непоўныя блокі, якія\nакружаны снегам/імхом",
+	"config.dynamicfps.reduce_when_unfocused.tooltip": "Зніжае FPS у Minecraft калі ён не актыўны\n(то бок калі іншая прагракма адчынена ці гульня згорнута)\nкаб захаваць рэсурсы сістэмы",
+	"config.dynamicfps.unfocused_fps.tooltip": "Колькасць кадраў у секунду, калі\nMinecraft згорнуты",
+	"config.dynamicfps.restore_when_hovered.tooltip": "Дазваляе скасаваць ці не\nабмежаванне FPS, калі Minecraft актыны\n(то бок актыўны ці наведзены курсорам з панелі задач)",
+	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Запусціць збіральнік смецця калі\nMinecraft неактыўны,\n каб ачысціць крыху АЗУ",
+	"config.dynamicfps.unfocused_volume.tooltip": "Гучнасць прайгравальных гукаў\nкалі гульня не актыўна\n(то бок іншае акно абрана)",
+	"config.dynamicfps.hidden_volume.tooltip": "Гучнасць прайгравальных гукаў\nкали гульня не бачна\n(то бок згорнута, знаходзіцца пад іншымі вокнамі\nці на ішай віртуальнай машыне)",
+	"entity_texture_features.puzzle.emissive_type.brighter": "§eЯрчэй",
+	"entity_texture_features.puzzle.emissive_type.default": "§6Стандартна"
+}

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",
+	"puzzle.page.resources":"Resourcen",
+	"puzzle.page.performance":"Performance",
+	"puzzle.page.misc":"Sonstiges",
+	"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"
+}

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

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

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

@@ -1,17 +1,42 @@
 {
 	"puzzle.text.update_available":"An update is available!",
 	"puzzle.screen.title":"Puzzle Settings",
-	"puzzle.page.graphics":"Graphics Settings",
-	"puzzle.page.resources":"Resource Settings",
-	"puzzle.page.performance":"Performance Settings",
-	"puzzle.page.misc":"Miscellaneous Settings",
+	"puzzle.page.graphics":"Graphics",
+	"puzzle.page.resources":"Resource",
+	"puzzle.page.performance":"Performance",
+	"puzzle.page.misc":"Miscellaneous",
 	"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.category.gui":"GUI",
+	"puzzle.midnightconfig.category.features":"Features",
+	"puzzle.midnightconfig.category.debug":"Debug",
+	"puzzle.midnightconfig.tooltip":"Options for advanced users only",
+
+	"cullleaves.puzzle.option.enabled": "Cull Leaves",
+	"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)",
+	"entity_texture_features.puzzle.emissive_type.brighter": "§eBrighter",
+	"entity_texture_features.puzzle.emissive_type.default": "§6Default"
 }

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

@@ -0,0 +1,17 @@
+{
+	"puzzle.text.update_available":"Uuendus on saadaval!",
+	"puzzle.screen.title":"Puzzle sätted",
+	"puzzle.page.graphics":"Graafika",
+	"puzzle.page.resources":"Ressursi",
+	"puzzle.page.performance":"Jõudlus",
+	"puzzle.page.misc":"Muud",
+	"puzzle.option.check_for_updates":"Uuenduste kontroll",
+	"puzzle.option.show_version_info":"Kuva Puzzle versiooniteavet",
+	"puzzle.option.resourcepack_splash_screen":"Kasuta ressursipaki laadimiskuva",
+	"puzzle.option.disable_splash_screen_blend":"Keela laadimiskuva logo segunemine",
+	"puzzle.option.emissive_textures":"Hõõguvad tekstuurid",
+	"puzzle.option.unlimited_model_rotations":"Lõpmatud mudelipöörded",
+	"puzzle.option.bigger_custom_models":"Suuremad kohandatud mudelid",
+	"puzzle.option.render_layer_overrides":"Renderduskihi ülekatted",
+	"puzzle.midnightconfig.title":"Puzzle täpsem seadistus"
+}

src/main/resources/assets/puzzle/lang/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 고급 환경설정"
+}

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":"Grafiki",
+	"puzzle.page.resources":"Zasobów",
+	"puzzle.page.performance":"Wydajności",
+	"puzzle.page.misc":"Ustawienia",
+	"puzzle.option.check_for_updates":"Sprawdź aktualizacje",
+	"puzzle.option.show_version_info":"Pokaż informacje o wersji Puzzle",
+	"puzzle.option.resourcepack_splash_screen":"Użyj ekranu powitalnego paczek zasobów",
+	"puzzle.option.disable_splash_screen_blend":"Wyłącz mieszanie loga ekranu powitalnego",
+	"puzzle.option.emissive_textures":"Emisyjne tekstury",
+	"puzzle.option.unlimited_model_rotations":"Nielimitowane rotacje modeli",
+	"puzzle.option.bigger_custom_models":"Większe niestandardowe modele",
+	"puzzle.option.render_layer_overrides":"Renderuj nadpisania warstw",
+	"puzzle.midnightconfig.title":"Zaawansowana konfiguracja Puzzle"
+}

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

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

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

@@ -0,0 +1,48 @@
+{
+	"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.category.gui":"Интерфейс",
+	"puzzle.midnightconfig.category.features":"Функционал",
+	"puzzle.midnightconfig.category.debug":"Отладка",
+	"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Обычные",
+
+	"modmenu.descriptionTranslation.puzzle": "Функции улучшения внешнего вида и производительности.",
+	"modmenu.descriptionTranslation.puzzle-base": "Общий код всех модулей Puzzle.",
+	"modmenu.descriptionTranslation.puzzle-gui": "Альтернативы Optifine, объединённые в едином меню.",
+	"modmenu.descriptionTranslation.puzzle-models": "Больше свободы моделям блоков и предметов!",
+	"modmenu.descriptionTranslation.puzzle-splashscreen": "Свой экран загрузки при помощи наборов ресурсов."
+}

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

@@ -0,0 +1,42 @@
+{
+	"puzzle.text.update_available":"Đã có bản cập nhật!",
+	"puzzle.screen.title":"Cài đặt Puzzle",
+	"puzzle.page.graphics":"Đồ họa",
+	"puzzle.page.resources":"Tài nguyên",
+	"puzzle.page.performance":"Hiệu năng",
+	"puzzle.page.misc":"Khác",
+	"puzzle.option.check_for_updates":"Kiểm tra cập nhật",
+	"puzzle.option.check_for_updates.tooltip":"Bật trình kiểm tra cập nhật tích hợp của Puzzle",
+	"puzzle.option.show_version_info":"Hiển thị thông tin phiên bản Puzzle",
+	"puzzle.option.show_version_info.tooltip":"Hiển thị thông tin về phiên bản \nPuzzle hiện tại và trạng thái cập nhật trên\nMàn hình Tiêu đề và Menu F3",
+	"puzzle.option.resourcepack_splash_screen":"Sử dụng màn hình đốm gói tài nguyên",
+	"puzzle.option.resourcepack_splash_screen.tooltip":"Cho phép gói tài nguyên thay đổi giao diện\nmàn hình tải/đốm\ncủa Minecraft bằng định dạng OptiFine",
+	"puzzle.option.better_splash_screen_blend":"Logo màn hình đốm tốt hơn",
+	"puzzle.option.better_splash_screen_blend.tooltip":"Thay đổi kiểu hòa trộn được sử dụng\nbởi biểu trưng trên màn hình đốm\nđể hoạt động tốt hơn với các biểu trưng có màu tùy chỉnh",
+	"puzzle.option.unlimited_model_rotations":"Xoay mô hình không giới hạn",
+	"puzzle.option.unlimited_model_rotations.tooltip":"Mở khóa xoay 360° đầy đủ trên các mô hình khối/vật phẩm tùy chỉnh",
+	"puzzle.option.bigger_custom_models":"Mô hình tùy chỉnh lớn hơn",
+	"puzzle.option.bigger_custom_models.tooltip":"Tăng giới hạn của\nkích thước mô hình khối/vật phẩm tùy chỉnh\ntừ 3x3x3 lên 5x5x5",
+	"puzzle.midnightconfig.title":"Cấu hình Puzzle nâng cao",
+	"puzzle.midnightconfig.category.gui":"GUI",
+	"puzzle.midnightconfig.category.features":"Tính năng",
+	"puzzle.midnightconfig.category.debug":"Gỡ lỗi",
+	"puzzle.midnightconfig.tooltip":"Tùy chọn chỉ dành cho người dùng nâng cao",
+
+	"cullleaves.puzzle.option.enabled": "Loại bỏ Lá",
+	"cullleaves.puzzle.option.enabled.tooltip": "Bật tính năng loại bỏ lá để nâng cao hiệu suất",
+	"iris.puzzle.option.enableShaders": "Bật Shader",
+	"iris.puzzle.option.enableShaders.tooltip": "Bật shaderpack",
+	"iris.puzzle.option.open": "MỞ",
+	"options.iris.shaderPackSelection.tooltip": "Mở một màn hình để chọn\nshaderpack và định cấu hình chúng",
+	"lambdabettergrass.option.mode.tooltip": "Làm cho các cạnh của\nkhối cỏ kết nối với\nkhối cỏ liền kề",
+	"lambdabettergrass.option.better_snow.tooltip": "Thêm một lớp tuyết/rêu hoàn toàn trực quan\nvào các khối không đầy đủ\nđược bao quanh bởi tuyết/rêu",
+	"config.dynamicfps.reduce_when_unfocused.tooltip": "Giảm FPS của Minecraft khi không tập trung\n(tức là một cửa sổ khác được tập trung hoặc trò chơi bị ẩn)\nđể tiết kiệm năng lượng và tài nguyên hệ thống",
+	"config.dynamicfps.unfocused_fps.tooltip": "Lượng khung hình mỗi giây\nMinecraft được phép\nkết xuất khi không tập trung",
+	"config.dynamicfps.restore_when_hovered.tooltip": "Dừng giới hạn\nFPS trong khi Minecraft được xem trước\n(tức là được di chuột trên thanh tác vụ hoặc thanh công cụ)",
+	"config.dynamicfps.run_gc_on_unfocus.tooltip": "Chạy trình thu gom rác trong khi\nMinecraft không tập trung vào\ngiải phóng một số RAM",
+	"config.dynamicfps.unfocused_volume.tooltip": "Âm lượng mà trò chơi sẽ phát\nâm thanh khi không tập trung\n(tức là một cửa sổ khác được chọn)",
+	"config.dynamicfps.hidden_volume.tooltip": "Âm lượng mà trò chơi sẽ phát\nâm thanh trong khi không hiển thị\n(tức là được thu nhỏ, bị che bởi các cửa sổ khác\ncũng như trên màn hình ảo khác)",
+	"entity_texture_features.puzzle.emissive_type.brighter": "§eSáng hơn",
+	"entity_texture_features.puzzle.emissive_type.default": "§6Mặc định"
+}

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

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

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

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

src/main/resources/fabric.mod.json

@@ -21,6 +21,7 @@
   "environment": "client",
 
   "depends": {
-    "fabric": "*"
+    "fabric": "*",
+    "minecraft": ">=1.20.2"
   }
 }