Puzzle 1.6.1 for 1.20.4

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

build.gradle

@@ -1,6 +1,6 @@
 // Based on https://github.com/OnyxStudios/Cardinal-Components-API/blob/1.17/build.gradle
 plugins {
-    id "fabric-loom" version "1.1-SNAPSHOT" apply false
+    id "fabric-loom" version "1.2-SNAPSHOT" apply false
     id "com.matthewprenger.cursegradle" version "1.4.0"
     id "maven-publish"
     id "java-library"
@@ -131,10 +131,10 @@ dependencies {
     modImplementation ("maven.modrinth:borderless-mining:${project.borderless_mining_version}")
     modImplementation ("maven.modrinth:dynamic-fps:${project.dynamic_fps_version}")
     modImplementation("com.moandjiezana.toml:toml4j:${project.toml4j_version}")
-    modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
+    modImplementation ("maven.modrinth:entitytexturefeatures:${project.etf_version}")
-    modImplementation ("maven.modrinth:cem:${project.cem_version}")
+    modImplementation ("maven.modrinth:entity-model-features:${project.emf_version}")
-    modImplementation "com.github.Lortseam.completeconfig:base:${project.complete_config_version}"
+    modImplementation ("maven.modrinth:completeconfig:${project.complete_config_version}")
-    modImplementation ("maven.modrinth:exordium:${project.exordium_version}")
+    //modImplementation ("maven.modrinth:exordium:${project.exordium_version}")
 
     modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
         exclude group: 'com.google.code.gson'

gradle.properties

@@ -3,34 +3,37 @@ org.gradle.jvmargs=-Xmx4G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.19.4-rc2
+	minecraft_version=1.20.4
-	yarn_mappings=1.19.4-rc2+build.1
+	yarn_mappings=1.20.4+build.1
-	loader_version=0.14.17
+	loader_version=0.15.1
 
 # Mod Properties
-	mod_version = 1.5.0+1.19.4
+	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.75.3+1.19.4
+	fabric_version=0.91.2+1.20.4
-	mod_menu_version = 6.1.0-beta.3
+	mod_menu_version = 7.0.1
-	midnightlib_version=1.2.1-fabric
+	midnightlib_version = 1.5.2-fabric
 	
 	cull_leaves_version = 3.0.2-fabric
-	ldl_version = 2.2.0+1.19.3
+	ldl_version = 2.3.2+1.20.1
-	lbg_version = 1.3.0+1.19
+	lbg_version = 1.5.2+1.20.1
-	iris_version = 1.5.2+1.19.3
+	iris_version = 1.6.9+1.20.2
-	continuity_version = 2.0.0+1.19
+	continuity_version = 3.0.0-beta.3+1.20.1
-	animatica_version = 0.5+1.19
+	animatica_version = 0.6+1.20
 	colormatic_version = 3.1.2
-	borderless_mining_version = 1.1.6+1.19.3
+	borderless_mining_version = 1.1.8+1.20.1
-	dynamic_fps_version = v2.2.0
+	dynamic_fps_version = 3.2.0
 	toml4j_version = 0.7.2
-	cit_resewn_version = 1.1.1+1.19
+	cit_resewn_version = 1.1.3+1.20
-	cem_version = 0.7.1-1.19.3
+	complete_config_version = 2.3.0
-	complete_config_version = 2.2.0
+	spruceui_version=5.0.0+1.20
-	spruceui_version=4.1.0+1.19.3
+	emf_version=1.2
-	entitytexturefeatures_version=4.2.0.1.fabric.1.19.3
+	etf_version=5.0
-	exordium_version=1.0.3-1.19.4
+	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/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,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import java.util.List;
 
 @Mixin(DebugHud.class)
-public abstract class MixinDebugHud extends DrawableHelper {
+public abstract class MixinDebugHud {
     @Inject(at = @At("RETURN"), method = "getRightText")
     private void puzzle$getRightText(CallbackInfoReturnable<List<String>> cir) {
         if (PuzzleConfig.showPuzzleInfo) {

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

@@ -1,8 +1,10 @@
 package net.puzzlemc.core.mixin;
 
+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.text.Text;
@@ -23,7 +25,10 @@ public abstract class MixinTitleScreen extends Screen {
     }
     @Inject(at = @At("TAIL"), method = "init")
     private void puzzle$init(CallbackInfo ci) {
-        int yOffset = 20;
+        int yOffset = 8;
+        if (PlatformFunctions.isModLoaded("modmenu") && ModMenuUtil.hasClassicButton()) {
+            yOffset += 12;
+        }
         Text puzzleText;
         if (UpdateChecker.isUpToDate) {
             puzzleText = Text.literal(versionText);

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-gui/build.gradle

@@ -27,6 +27,7 @@ repositories {
 	maven {
 		url "https://maven.shedaniel.me/"
 	}
+	maven { url "https://maven.quiltmc.org/repository/release/" }
 }
 
 dependencies {
@@ -35,26 +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}")
 	modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
- 	modImplementation ("maven.modrinth:iris:${project.iris_version}")
+	modCompileOnly "org.quiltmc:quilt-loader:${rootProject.quilt_loader_version}"
-	modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_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 ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
+	modImplementation("com.moandjiezana.toml:toml4j:${project.toml4j_version}")
-	modImplementation ("maven.modrinth:cem:${project.cem_version}")
+	modImplementation ("maven.modrinth:entitytexturefeatures:${project.etf_version}")
-	modImplementation "com.github.Lortseam.completeconfig:base:${project.complete_config_version}"
+	modImplementation ("maven.modrinth:entity-model-features:${project.emf_version}")
-	modImplementation ("maven.modrinth:exordium:${project.exordium_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'
 	}
-	modCompileOnlyApi ("maven.modrinth:continuity:${project.continuity_version}") {
-         exclude module: "modmenu"
- 	}
 } 

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

@@ -1,13 +1,12 @@
 package net.puzzlemc.gui;
 
-import eu.midnightdust.lib.util.MidnightColorUtil;
 import net.fabricmc.loader.api.FabricLoader;
 import net.irisshaders.iris.api.v0.IrisApi;
 import net.irisshaders.iris.api.v0.IrisApiConfig;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.text.Style;
 import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import net.puzzlemc.gui.screen.widget.PuzzleWidget;
 
 public class IrisCompat {
@@ -18,7 +17,7 @@ public class IrisCompat {
                 IrisApiConfig irisConfig = IrisApi.getInstance().getConfig();
                 irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());
             }));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.literal("➥ ").append(Text.translatable("iris.puzzle.option.open").setStyle(Style.EMPTY.withColor(MidnightColorUtil.radialRainbow(0.5f, 1).getRGB())))), (button) -> {
+            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/PuzzleClient.java

@@ -4,12 +4,7 @@ import dev.lambdaurora.lambdabettergrass.LBGConfig;
 import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
 import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
 import dev.lambdaurora.lambdynlights.LambDynLights;
-import dev.tr7zw.exordium.Config;
+import eu.midnightdust.core.MidnightLib;
-import dev.tr7zw.exordium.ExordiumMod;
-import dev.tr7zw.exordium.ExordiumModBase;
-import dynamicfps.DynamicFPSConfig;
-import dynamicfps.DynamicFPSMod;
-import eu.midnightdust.core.MidnightLibClient;
 import eu.midnightdust.cullleaves.config.CullLeavesConfig;
 import eu.midnightdust.lib.util.PlatformFunctions;
 import io.github.kvverti.colormatic.Colormatic;
@@ -17,33 +12,31 @@ import io.github.kvverti.colormatic.ColormaticConfigController;
 import link.infra.borderlessmining.config.ConfigHandler;
 import me.pepperbell.continuity.client.config.ContinuityConfig;
 import me.pepperbell.continuity.client.config.Option;
-import net.dorianpb.cem.internal.config.CemConfig;
+import net.minecraft.screen.ScreenTexts;
-import net.dorianpb.cem.internal.config.CemConfigFairy;
+import net.minecraft.util.Identifier;
-import net.dorianpb.cem.internal.config.CemOptions;
 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.util.Formatting;
 import net.puzzlemc.splashscreen.PuzzleSplashScreen;
 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;
-import traben.entity_texture_features.texture_handlers.ETFManager;
 
 public class PuzzleClient implements ClientModInitializer {
 
     public final static String id = "puzzle";
     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() {
-        MidnightLibClient.hiddenMods.add("puzzle");
+        MidnightLib.hiddenMods.add("puzzle");
         MinecraftClient client = MinecraftClient.getInstance();
         PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
         PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.option.check_for_updates"), (button) -> button.setMessage(PuzzleConfig.checkUpdates ? YES : NO), (button) -> {
@@ -116,49 +109,6 @@ public class PuzzleClient implements ClientModInitializer {
                             catch (NumberFormatException ignored) {}
             }));
         }
-        if (isActive("dynamicfps")) {
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Dynamic FPS")));
-            DynamicFPSConfig fpsConfig = DynamicFPSMod.config;
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.reduce_when_unfocused"), (button) -> button.setMessage(fpsConfig.reduceFPSWhenUnfocused ? YES : NO), (button) -> {
-                fpsConfig.reduceFPSWhenUnfocused = !fpsConfig.reduceFPSWhenUnfocused;
-                fpsConfig.save();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 60,Text.translatable("config.dynamicfps.unfocused_fps"), () -> fpsConfig.unfocusedFPS,
-                    (button) -> button.setMessage(Text.of(fpsConfig.unfocusedFPS + " FPS")),
-                    (slider) -> {
-                        try {
-                            fpsConfig.unfocusedFPS = slider.getInt();
-                        }
-                        catch (NumberFormatException ignored) {}
-                        finally {fpsConfig.save();}
-                    }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.restore_when_hovered"), (button) -> button.setMessage(fpsConfig.restoreFPSWhenHovered ? YES : NO), (button) -> {
-                fpsConfig.restoreFPSWhenHovered = !fpsConfig.restoreFPSWhenHovered;
-                fpsConfig.save();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.run_gc_on_unfocus"), (button) -> button.setMessage(fpsConfig.runGCOnUnfocus ? YES : NO), (button) -> {
-                fpsConfig.runGCOnUnfocus = !fpsConfig.runGCOnUnfocus;
-                fpsConfig.save();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 100,Text.translatable("config.dynamicfps.unfocused_volume"), () -> ((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue(),
-                    (button) -> button.setMessage(Text.of(((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue() + "%")),
-                    (slider) -> {
-                        try {
-                            fpsConfig.unfocusedVolumeMultiplier = ((Number)slider.getInt()).floatValue() / 100;
-                        }
-                        catch (NumberFormatException ignored) {}
-                        finally {fpsConfig.save();}
-                    }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 100,Text.translatable("config.dynamicfps.hidden_volume"), () -> ((Number)(fpsConfig.hiddenVolumeMultiplier * 100)).intValue(),
-                    (button) -> button.setMessage(Text.of(((Number)(fpsConfig.hiddenVolumeMultiplier * 100)).intValue() + "%")),
-                    (slider) -> {
-                        try {
-                            fpsConfig.hiddenVolumeMultiplier = ((Number)slider.getInt()).floatValue() / 100;
-                        }
-                        catch (NumberFormatException ignored) {}
-                        finally {fpsConfig.save();}
-                    }));
-        }
         if (isActive("borderlessmining")) {
             PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Borderless Mining")));
             ConfigHandler bmConfig = ConfigHandler.getInstance();
@@ -185,11 +135,11 @@ public class PuzzleClient implements ClientModInitializer {
 
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.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.translatable("").append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.block_entities")), (button) -> button.setMessage(ldlConfig.getBlockEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getBlockEntitiesLightSource().set(!ldlConfig.getBlockEntitiesLightSource().get())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.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.translatable("").append("DynLights: ").append(Text.translatable("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.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.translatable("").append("DynLights: ").append(Text.translatable("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.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.translatable("").append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
+            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 (isActive("citresewn") && CITResewnConfig.INSTANCE != null) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
@@ -227,23 +177,6 @@ public class PuzzleClient implements ClientModInitializer {
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
         }
-        if (isActive("cem") && FabricLoader.getInstance().isModLoaded("completeconfig")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Custom Entity Models")));
-            CemConfig cemConfig = (CemConfig) CemConfigFairy.getConfig();
-            CemOptions cemOptions = CemConfigFairy.getConfig();
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_optifine_folder"), (button) -> button.setMessage(cemConfig.useOptifineFolder() ? YES : NO), (button) -> {
-                ((CemConfigAccessor)cemOptions).setUseOptifineFolder(!cemConfig.useOptifineFolder());
-                cemConfig.save();
-            }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_new_model_creation_fix"), (button) -> button.setMessage(cemConfig.useTransparentParts() ? YES : NO), (button) -> {
-                ((CemConfigAccessor)cemOptions).setUseModelCreationFix(!cemConfig.useTransparentParts());
-                cemConfig.save();
-            }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_old_animations"), (button) -> button.setMessage(cemConfig.useOldAnimations() ? YES : NO), (button) -> {
-                ((CemConfigAccessor)cemOptions).setUseOldAnimations(!cemConfig.useOldAnimations());
-                cemConfig.save();
-            }));
-        }
         if (isActive("continuity")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
             ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
@@ -253,7 +186,6 @@ public class PuzzleClient implements ClientModInitializer {
                     Option.BooleanOption booleanOption = ((Option.BooleanOption)option);
                     PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("options.continuity."+s), (button) -> button.setMessage(booleanOption.get() ? YES : NO), (button) -> {
                         booleanOption.set(!booleanOption.get());
-                        contConfig.onChange();
                         contConfig.save();
                     }));
                 } catch (Exception ignored) {}
@@ -261,7 +193,7 @@ public class PuzzleClient implements ClientModInitializer {
         }
         if (isActive("entity_texture_features")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.title")));
-            ETFConfig etfConfig = ETFApi.getETFConfigObject;
+            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();
@@ -284,38 +216,21 @@ public class PuzzleClient implements ClientModInitializer {
                 ETFApi.saveETFConfigChangesAndResetETF();
             }));
         }
-        if (isActive("exordium")) {
+        if (isActive("entity_model_features")) {
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.title")));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.title")));
-            Config exordiumConfig = ExordiumModBase.instance.config;
+            EMFConfig emfConfig = EMFConfig.getConfig();
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.enableGui"), (button) -> button.setMessage(exordiumConfig.enabledGui ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.config.force_models"), (button) -> button.setMessage(emfConfig.attemptRevertingEntityModelsAlteredByAnotherMod ? YES : NO), (button) -> {
-                exordiumConfig.enabledGui = !exordiumConfig.enabledGui;
+                emfConfig.attemptRevertingEntityModelsAlteredByAnotherMod = !emfConfig.attemptRevertingEntityModelsAlteredByAnotherMod;
-                ExordiumModBase.instance.writeConfig();
+                EMFConfig.EMF_saveConfig();
             }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(5, 60, Text.translatable("text.exordium.targetFramerateGui"), () -> exordiumConfig.targetFPSIngameGui, (button) -> button.setMessage(Text.literal(exordiumConfig.targetFPSIngameGui+"")), (slider) -> {
+            if (PlatformFunctions.isModLoaded("physicsmod")) {
-                exordiumConfig.targetFPSIngameGui = slider.getInt();
+                PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.config.physics"), (button) -> button.setMessage(emfConfig.attemptPhysicsModPatch_2 != EMFConfig.PhysicsModCompatChoice.OFF ?
-                ExordiumModBase.instance.writeConfig();
+                        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();
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.enabledGuiAnimationSpeedup"), (button) -> button.setMessage(exordiumConfig.enabledGuiAnimationSpeedup ? YES : NO), (button) -> {
+                    EMFConfig.EMF_saveConfig();
-                exordiumConfig.enabledGuiAnimationSpeedup = !exordiumConfig.enabledGuiAnimationSpeedup;
-                ExordiumModBase.instance.writeConfig();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(30, 120, Text.translatable("text.exordium.targetFPSIngameGuiAnimated"), () -> exordiumConfig.targetFPSIngameGuiAnimated, (button) -> button.setMessage(Text.literal(exordiumConfig.targetFPSIngameGuiAnimated+"")), (slider) -> {
-                exordiumConfig.targetFPSIngameGuiAnimated = slider.getInt();
-                ExordiumModBase.instance.writeConfig();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.enableNametagScreenBuffering"), (button) -> button.setMessage(exordiumConfig.enableNametagScreenBuffering ? YES : NO), (button) -> {
-                exordiumConfig.enableNametagScreenBuffering = !exordiumConfig.enableNametagScreenBuffering;
-                ExordiumModBase.instance.writeConfig();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(30, 80, Text.translatable("text.exordium.targetFPSNameTags"), () -> exordiumConfig.targetFPSNameTags, (button) -> button.setMessage(Text.literal(exordiumConfig.targetFPSNameTags+"")), (slider) -> {
-                exordiumConfig.targetFPSNameTags = slider.getInt();
-                ExordiumModBase.instance.writeConfig();
-            }));
-            PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.enableSignBuffering"), (button) -> button.setMessage(exordiumConfig.enableSignBuffering ? YES : NO), (button) -> {
-                exordiumConfig.enableSignBuffering = !exordiumConfig.enableSignBuffering;
-                ExordiumModBase.instance.writeConfig();
                 }));
             }
+        }
         lateInitDone = true;
     }
     public static Text message(CITResewnConfig config) {

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,9 +1,8 @@
 package net.puzzlemc.gui.mixin;
 
 import eu.midnightdust.core.config.MidnightLibConfig;
-import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.util.Identifier;
+import net.minecraft.client.gui.widget.TextIconButtonWidget;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.gui.PuzzleClient;
 import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
@@ -19,8 +18,6 @@ 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);
     }
@@ -31,7 +28,9 @@ public abstract class MixinOptionsScreen extends Screen {
             int i = 0;
             if (FabricLoader.getInstance().isModLoaded("lod")) i = i + 358;
             if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.FALSE)) i = i - 25;
-            this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 - 178 + i, this.height / 6 - 12, 20, 20, 0, 0, 20, PUZZLE_ICON_TEXTURE, 32, 64, (buttonWidget) -> (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), Text.translatable("midnightlib.overview.title")));
+            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/PuzzleOptionsScreen.java

@@ -1,6 +1,7 @@
 package net.puzzlemc.gui.screen;
 
 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;
@@ -9,11 +10,9 @@ import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.Text;
 import net.puzzlemc.gui.PuzzleApi;
 import net.puzzlemc.gui.PuzzleClient;
-import net.puzzlemc.gui.screen.widget.PuzzleOptionListWidget;
+import net.puzzlemc.gui.screen.widget.*;
-import net.puzzlemc.gui.screen.widget.PuzzleWidget;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.util.math.MatrixStack;
 
 import java.util.List;
 import java.util.Objects;
@@ -51,11 +50,12 @@ public class PuzzleOptionsScreen extends Screen {
         tabNavigation.init();
         prevTab = tabManager.getCurrentTab();
         this.addDrawableChild(tabNavigation);
-        this.list = new PuzzleOptionListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
+        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());
     }
@@ -85,19 +85,10 @@ public class PuzzleOptionsScreen extends Screen {
     }
 
     @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-        this.renderBackground(matrices);
+        if (client != null && client.world != null) super.renderInGameBackground(context);
-        if (client != null && client.world != null) this.list.setRenderBackground(false);
+        this.list.render(context, mouseX, mouseY, delta);
-        this.list.render(matrices, mouseX, mouseY, delta);
+        super.render(context, mouseX, mouseY, delta);
-
-        drawCenteredTextWithShadow(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
-        super.render(matrices, mouseX, mouseY, delta);
-        if (tooltip != null) {
-            if (this.list.getFocused() != null && (this.list.getHoveredEntry() == null || this.list.getHoveredEntry().button == null || !this.list.getHoveredEntry().button.isMouseOver(mouseX, mouseY))) {
-                renderTooltip(matrices, tooltip, this.list.getFocused().getX(), this.list.getFocused().getY() + (this.list.getFocused().getHeight() * 2));
-            }
-            else renderTooltip(matrices, tooltip, mouseX, mouseY);
-        }
-        tooltip = null;
     }
+    @Override public void renderBackground(DrawContext c, int x, int y, float d) {}
 }

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

@@ -1,7 +1,7 @@
 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;
@@ -14,8 +14,10 @@ public class PuzzleButtonWidget extends ButtonWidget {
         this.title = title;
     }
     @Override
-    public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+    public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+        try {
             title.setTitle(this);
-        super.renderButton(matrices, mouseX, mouseY, delta);
+        } 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,95 +1,50 @@
 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.DrawContext;
-import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.gui.widget.ElementListWidget;
 import net.minecraft.client.resource.language.I18n;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.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) {
+    public PuzzleOptionListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l) {
-        super(minecraftClient, i, j, k, l, m);
+        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 + 25, 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 + 25, 0, 150, 20, button.defaultSliderValue.getAsInt(), 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 + 25, 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 void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
-    public void clear() {
+        super.renderWidget(context, mouseX, mouseY, delta);
-        super.clearEntries();
+        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) {
-    public int getRowWidth() {
+            ClickableWidget button = e.buttons.get(0);
-        return 400;
-    }
-
-    protected int getScrollbarPositionX() {
-        return super.getScrollbarPositionX() + 60;
-    }
-
-    @Override
-    public ButtonEntry getHoveredEntry() {
-        return super.getHoveredEntry();
-    }
-
-    public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
-        private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-        private List<ClickableWidget> buttons = new ArrayList<>();
-        public final ClickableWidget button;
-        public final Text text;
-        private MinecraftClient client = MinecraftClient.getInstance();
-
-        private ButtonEntry(ClickableWidget button, Text text) {
-            if (button != null)
-                this.buttons.add(button);
-            this.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.setY(y);
-                button.render(matrices, mouseX, mouseY, tickDelta);
-            }
-            if (button == null) drawCenteredTextWithShadow(matrices,textRenderer, Text.literal("－－－－－－ ").append(text).append(" －－－－－－"),x + 200,y+5,0xFFFFFF);
-            else drawTextWithShadow(matrices,textRenderer, text,x+15,y+5,0xFFFFFF);
-
-            if (!(client.currentScreen instanceof PuzzleOptionsScreen page)) return;
-            if (button != null && (button.isMouseOver(mouseX, mouseY) || ((page.list.getHoveredEntry() == null || page.list.getHoveredEntry().button == null || !page.list.getHoveredEntry().button.isMouseOver(mouseX, mouseY)) && button.isFocused())) && text.getContent() instanceof TranslatableTextContent content) {
             String key = null;
             if (I18n.hasTranslation(content.getKey() + ".tooltip")) key = content.getKey() + ".tooltip";
             else if (I18n.hasTranslation(content.getKey() + ".desc")) key = content.getKey() + ".desc";
@@ -104,29 +59,16 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
                 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);
             }
         }
     }
-        public int getY() {
-            return button.getY();
-        }
-        public int getX() {
-            return button.getX();
-        }
-        public int getHeight() {
-            return button.getHeight();
-        }
-        public int getWidth() {
-            return button.getWidth();
-        }
-
-        public List<? extends Element> children() {
-            return buttons;
-        }
 
     @Override
-        public List<? extends Selectable> selectableChildren() {
+    public MidnightConfig.ButtonEntry getHoveredEntry() {
-            return buttons;
+        return super.getHoveredEntry();
-        }
     }
 }

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

@@ -17,7 +17,9 @@ public class PuzzleSliderWidget extends SliderWidget {
 
         this.setTextAction = setTextAction;
         this.changeAction = changeAction;
+        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;
+        try {
             setValueAction.setTextValue(this);
+        } catch (Exception e) {e.printStackTrace(); this.setVisible(false);}
     }
     @Override
     public void write(String text) {

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

@@ -3,8 +3,7 @@
   "package": "net.puzzlemc.gui.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "MixinOptionsScreen",
+    "MixinOptionsScreen"
-    "CemConfigAccessor"
   ],
   "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-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/mixin/MixinSplashScreen.java

@@ -2,12 +2,12 @@ package net.puzzlemc.splashscreen.mixin;
 
 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;
@@ -61,12 +61,12 @@ public abstract class MixinSplashScreen extends Overlay {
         return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) ? instance.getAsInt() : PuzzleConfig.backgroundColor | 255 << 24;
     }
     @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;blendFunc(II)V", shift = At.Shift.AFTER), remap = false)
-    private void puzzle$betterBlend(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+    private void puzzle$betterBlend(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (PuzzleConfig.disableBlend) RenderSystem.defaultBlendFunc();
+        if (PuzzleConfig.disableBlend && PuzzleConfig.resourcepackSplashScreen) RenderSystem.defaultBlendFunc();
     }
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/Window;getScaledWidth()I", shift = At.Shift.BEFORE, ordinal = 2))
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;getScaledWindowWidth()I", shift = At.Shift.BEFORE, ordinal = 2))
-    private void puzzle$renderSplashBackground(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+    private void puzzle$renderSplashBackground(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE)) {
+        if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE) && PuzzleConfig.resourcepackSplashScreen) {
             int width = client.getWindow().getScaledWidth();
             int height = client.getWindow().getScaledHeight();
             long l = Util.getMeasuringTimeMs();
@@ -79,32 +79,31 @@ public abstract class MixinSplashScreen extends Overlay {
                 s = MathHelper.clamp(g, 0.0F, 1.0F);
             else
                 s = 1.0F;
-            RenderSystem.setShaderTexture(0, PuzzleSplashScreen.BACKGROUND);
             RenderSystem.enableBlend();
             RenderSystem.blendEquation(32774);
             RenderSystem.defaultBlendFunc();
             RenderSystem.setShader(GameRenderer::getPositionTexProgram);
             RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, s);
-            drawTexture(matrices, 0, 0, 0, 0, 0, width, height, width, height);
+            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(MatrixStack matrices, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
+    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);
         RenderSystem.disableBlend();
-        fill(matrices, minX, minY, maxX, maxY, withAlpha(PuzzleConfig.progressBarBackgroundColor, m));
+        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)
+    @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 = 0), index = 5)
+    @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;
     }

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/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/fabric.mod.json

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