hotfix: MidnightLib 1.7.5 compat

- Also fixes crashes when using the EMF mod

build.gradle

@@ -3,7 +3,7 @@ import groovy.json.JsonOutput
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
@@ -70,7 +70,6 @@ subprojects {
 
 
         modCompileOnlyApi ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
-        modCompileOnly("dev.lambdaurora.lambdynamiclights:lambdynamiclights-api:${project.ldl_version}")
         modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
         modCompileOnlyApi "dev.lambdaurora:spruceui:${project.spruceui_version}"
     }

common/src/main/java/net/puzzlemc/gui/PuzzleGui.java

@@ -21,11 +21,12 @@ public class PuzzleGui {
 
     public static void init() {
         MidnightLib.hiddenMods.add("puzzle");
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("\uD83E\uDDE9 Puzzle")));
+        MinecraftClient client = MinecraftClient.getInstance();
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
         PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.midnightconfig.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
-            MinecraftClient.getInstance().setScreen(PuzzleConfig.getScreen(MinecraftClient.getInstance().currentScreen, "puzzle"));
+            client.setScreen(PuzzleConfig.getScreen(client.currentScreen, "puzzle"));
         }));
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("\uD83E\uDDE9 Puzzle")));
+        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Puzzle")));
         PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
             PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
             PuzzleSplashScreen.resetColors();

common/src/main/java/net/puzzlemc/gui/compat/BorderlessMiningCompat.java

@@ -1,6 +1,5 @@
 package net.puzzlemc.gui.compat;
 
-import com.mojang.text2speech.OperatingSystem;
 import link.infra.borderlessmining.config.ConfigHandler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
@@ -12,13 +11,13 @@ import static net.puzzlemc.gui.PuzzleGui.YES;
 
 public class BorderlessMiningCompat {
     public static void init() {
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("\uD83E\uDE9F Borderless Mining")));
+        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 (OperatingSystem.get() == OperatingSystem.MAC_OS) {
+        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());

common/src/main/java/net/puzzlemc/gui/compat/CITRCompat.java

@@ -13,7 +13,7 @@ import static net.minecraft.screen.ScreenTexts.YES;
 public class CITRCompat {
     public static void init() {
         if (CITResewnConfig.INSTANCE != null) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("⛏ CIT Resewn")));
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
             CITResewnConfig citConfig = CITResewnConfig.INSTANCE;
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
                 citConfig.enabled = !citConfig.enabled;

common/src/main/java/net/puzzlemc/gui/compat/ColormaticCompat.java

@@ -12,7 +12,7 @@ import static net.puzzlemc.gui.PuzzleGui.YES;
 
 public class ColormaticCompat {
     public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("\uD83C\uDF08 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;

common/src/main/java/net/puzzlemc/gui/compat/ContinuityCompat.java

@@ -11,7 +11,7 @@ import static net.puzzlemc.gui.PuzzleGui.YES;
 
 public class ContinuityCompat {
     public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("▒ Continuity")));
+        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
         ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
         contConfig.getOptionMapView().forEach((s, option) -> {
             if (s.equals("use_manual_culling")) return;

common/src/main/java/net/puzzlemc/gui/compat/CullLeavesCompat.java

@@ -11,7 +11,7 @@ import static net.puzzlemc.gui.PuzzleGui.YES;
 
 public class CullLeavesCompat {
     public static void init() {
-        PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("\uD83C\uDF43 Cull Leaves")));
+        PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
         PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("cullleaves.puzzle.option.enabled"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
             CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
             CullLeavesConfig.write("cullleaves");

common/src/main/java/net/puzzlemc/gui/compat/EMFCompat.java

@@ -13,9 +13,12 @@ import java.util.NavigableSet;
 import java.util.Objects;
 import java.util.TreeSet;
 
+import static net.puzzlemc.gui.PuzzleGui.NO;
+import static net.puzzlemc.gui.PuzzleGui.YES;
+
 public class EMFCompat {
     public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.literal("\uD83D\uDC37 ").append(Text.translatable("entity_model_features.title"))));
+        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.title")));
         EMFConfig emfConfig = EMF.config().getConfig();
         if (PlatformFunctions.isModLoaded("physicsmod")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.config.physics"), (button) -> button.setMessage(emfConfig.attemptPhysicsModPatch_2 != EMFConfig.PhysicsModCompatChoice.OFF ?

common/src/main/java/net/puzzlemc/gui/compat/ETFCompat.java

@@ -16,7 +16,7 @@ import static net.puzzlemc.gui.PuzzleGui.YES;
 
 public class ETFCompat {
     public static void init() {
-        PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.literal("\uD83D\uDC2E ").append(Text.translatable("config.entity_texture_features.title"))));
+        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;

common/src/main/java/net/puzzlemc/gui/compat/IrisCompat.java

@@ -12,7 +12,7 @@ import net.puzzlemc.gui.screen.widget.PuzzleWidget;
 
 public class IrisCompat {
     public static void init() {
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("\uD83D\uDC41 Iris")));
+        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Iris")));
         PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("iris.puzzle.option.enableShaders"), (button) -> button.setMessage(IrisApi.getInstance().getConfig().areShadersEnabled() ? PuzzleGui.YES : PuzzleGui.NO), (button) -> {
             IrisApiConfig irisConfig = IrisApi.getInstance().getConfig();
             irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());

common/src/main/java/net/puzzlemc/gui/compat/LBGCompat.java

@@ -12,7 +12,7 @@ import static net.puzzlemc.gui.PuzzleGui.YES;
 public class LBGCompat {
     public static void init() {
         LBGConfig lbgConfig = LambdaBetterGrass.get().config;
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("\uD83C\uDF31 LambdaBetterGrass")));
+        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass")));
         PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
         PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
     }

common/src/main/java/net/puzzlemc/gui/compat/LDLCompat.java

@@ -13,9 +13,10 @@ public class LDLCompat {
     public static void init() {
         DynamicLightsConfig ldlConfig = LambDynLights.get().config;
 
-        PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("\uD83D\uDCA1 LambDynamicLights")));
+        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.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())));

common/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java

@@ -37,7 +37,7 @@ public abstract class MixinOptionsScreen extends Screen {
         }
     }
 
-    @Inject(at = @At("TAIL"), method = "refreshWidgetPositions")
+    @Inject(at = @At("TAIL"), method = "initTabNavigation")
     public void puzzle$onResize(CallbackInfo ci) {
         if (PuzzleConfig.enablePuzzleButton) this.puzzle$setButtonPos();
     }

common/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java

@@ -5,7 +5,6 @@ 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.client.input.KeyInput;
 import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.Text;
 import net.puzzlemc.gui.PuzzleApi;
@@ -76,8 +75,9 @@ public class PuzzleOptionsScreen extends Screen {
         list.addAll(options);
     }
     @Override
-    public boolean keyPressed(KeyInput input) {
+    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        return this.tabNavigation.keyPressed(input) || super.keyPressed(input);
+        if (this.tabNavigation.trySwitchTabsWithKey(keyCode)) return true;
+        return super.keyPressed(keyCode, scanCode, modifiers);
     }
     @Override
     public void tick() {
@@ -86,7 +86,7 @@ public class PuzzleOptionsScreen extends Screen {
             prevTab = tabManager.getCurrentTab();
             this.list.clear();
             fillList();
-            list.setScrollY(0);
+            list.setScrollAmount(0);
         }
     }
 }

common/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java

@@ -1,9 +1,6 @@
 package net.puzzlemc.gui.screen.widget;
 
-import eu.midnightdust.lib.config.ButtonEntry;
-import eu.midnightdust.lib.config.EntryInfo;
 import eu.midnightdust.lib.config.MidnightConfig;
-import eu.midnightdust.lib.config.MidnightConfigListWidget;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
@@ -22,7 +19,8 @@ import java.util.List;
 
 import static net.puzzlemc.core.PuzzleCore.LOGGER;
 
-public class PuzzleOptionListWidget extends MidnightConfigListWidget {
+@Environment(EnvType.CLIENT)
+public class PuzzleOptionListWidget extends MidnightConfig.MidnightConfigListWidget {
     TextRenderer textRenderer;
 
     public PuzzleOptionListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l) {
@@ -34,7 +32,6 @@ public class PuzzleOptionListWidget extends MidnightConfigListWidget {
     public void addAll(List<PuzzleWidget> buttons) {
         int buttonX = this.width - 160;
         for (PuzzleWidget button : buttons) {
-            try {
             if (button.buttonType == ButtonType.TEXT)
                 this.addButton(List.of(), Text.literal("").append(button.descriptionText).formatted(Formatting.BOLD));
             else if (button.buttonType == ButtonType.BUTTON)
@@ -46,28 +43,26 @@ public class PuzzleOptionListWidget extends MidnightConfigListWidget {
             else
                 LOGGER.warn("Button {} is missing the buttonType variable. This shouldn't happen!", button);
         }
-            catch (Exception e) {
-                LOGGER.error("Failed to add button {}. Likely caused by an update of the specific mod.", button.descriptionText);
-            }
-
-        }
     }
     public void addButton(List<ClickableWidget> buttons, Text text) {
-        EntryInfo info = new EntryInfo(null, "puzzle");
+        var info = new MidnightConfig.EntryInfo(null, "puzzle-gui");
-        if (buttons.isEmpty()) info.comment = new MidnightConfig.Comment(){
+        info.comment = new MidnightConfig.Comment() {
+            @Override
+            public boolean centered() {
+                return buttons.isEmpty();
+            }
             public Class<? extends Annotation> annotationType() {return null;}
-            public boolean centered() {return true;}
             public String category() {return "";}
             public String name() {return "";}
             public String url() {return "";}
             public String requiredMod() {return "";}
         };
-        var entry = new ButtonEntry(buttons, text, info);
+        var entry = new MidnightConfig.ButtonEntry(buttons, text, info);
         this.addEntry(entry);
     }
     public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
         super.renderWidget(context, mouseX, mouseY, delta);
-        ButtonEntry e = this.getHoveredEntry();
+        MidnightConfig.ButtonEntry e = this.getHoveredEntry();
         if (client.currentScreen instanceof PuzzleOptionsScreen page && e != null && !e.buttons.isEmpty() &&
                 e.text.getContent() instanceof TranslatableTextContent content) {
             ClickableWidget button = e.buttons.getFirst();
@@ -94,7 +89,7 @@ public class PuzzleOptionListWidget extends MidnightConfigListWidget {
     }
 
     @Override
-    public ButtonEntry getHoveredEntry() {
+    public MidnightConfig.ButtonEntry getHoveredEntry() {
         return super.getHoveredEntry();
     }
 }

common/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java

@@ -1,14 +1,8 @@
 package net.puzzlemc.splashscreen;
 
-import com.mojang.blaze3d.pipeline.BlendFunction;
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.DestFactor;
-import com.mojang.blaze3d.platform.SourceFactor;
 import eu.midnightdust.lib.util.MidnightColorUtil;
 import eu.midnightdust.lib.util.PlatformFunctions;
 import net.minecraft.client.texture.NativeImageBackedTexture;
-import net.minecraft.client.texture.TextureContents;
 import net.minecraft.resource.*;
 import net.minecraft.util.Util;
 import net.puzzlemc.core.config.PuzzleConfig;
@@ -17,7 +11,6 @@ import net.minecraft.client.resource.metadata.TextureResourceMetadata;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.texture.ResourceTexture;
 import net.minecraft.util.Identifier;
-import net.puzzlemc.splashscreen.mixin.RenderPipelinesAccessor;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -39,9 +32,8 @@ public class PuzzleSplashScreen {
     public static File CONFIG_PATH = new File(String.valueOf(PlatformFunctions.getConfigDirectory().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 MinecraftClient client = MinecraftClient.getInstance();
+    private static final MinecraftClient client = MinecraftClient.getInstance();
     private static boolean keepBackground = false;
-    private static RenderPipeline CUSTOM_LOGO_PIPELINE;
 
     public static void init() {
         if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistent //
@@ -52,38 +44,8 @@ public class PuzzleSplashScreen {
                 }
             }
         }
-        buildRenderLayer();
     }
 
-    public static RenderPipeline getCustomLogoRenderPipeline() {
-        return CUSTOM_LOGO_PIPELINE;
-    }
-
-    public static void buildRenderLayer() {
-        if (PuzzleConfig.resourcepackSplashScreen) {
-            BlendFunction blendFunction = new BlendFunction(SourceFactor.SRC_ALPHA, DestFactor.ONE);
-            if (PuzzleConfig.disableBlend) blendFunction = null;
-            else if (PuzzleConfig.customBlendFunction.size() == 4) {
-                try {
-                    blendFunction = new BlendFunction(
-                            SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)),
-                            DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)),
-                            SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(2)),
-                            DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(3)));
-                } catch (Exception e) {
-                    LOGGER.error("Incorrect blend function defined in color.properties: {}{}", PuzzleConfig.customBlendFunction, e.getMessage());
-                }
-            }
-
-            var CUSTOM_LOGO_PIPELINE_BUILDER = RenderPipeline.builder(RenderPipelinesAccessor.getPOSITION_TEX_COLOR_SNIPPET())
-                .withLocation("pipeline/mojang_logo_puzzle")
-                .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
-                .withDepthWrite(false);
-            CUSTOM_LOGO_PIPELINE_BUILDER = blendFunction != null ? CUSTOM_LOGO_PIPELINE_BUILDER.withBlend(blendFunction) : CUSTOM_LOGO_PIPELINE_BUILDER.withoutBlend();
-
-            CUSTOM_LOGO_PIPELINE = CUSTOM_LOGO_PIPELINE_BUILDER.build();
-        }
-    }
 
     public static class ReloadListener implements SynchronousResourceReloader {
         public static final ReloadListener INSTANCE = new ReloadListener();
@@ -92,7 +54,6 @@ public class PuzzleSplashScreen {
 
         @Override
         public void reload(ResourceManager manager) {
-            client = MinecraftClient.getInstance();
             if (PuzzleConfig.resourcepackSplashScreen) {
                 PuzzleSplashScreen.resetColors();
                 client.getTextureManager().registerTexture(LOGO, new LogoTexture(LOGO));
@@ -145,7 +106,7 @@ public class PuzzleSplashScreen {
                     try (InputStream stream = resource.getInputStream()) {
                         Files.copy(stream, BACKGROUND_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
                         InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
-                        client.getTextureManager().registerTexture(BACKGROUND, new NativeImageBackedTexture(() -> "splash_screen_background", NativeImage.read(input)));
+                        client.getTextureManager().registerTexture(BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input)));
                         keepBackground = true;
                         PuzzleConfig.hasCustomSplashScreen = true;
                     } catch (Exception e) {
@@ -159,7 +120,6 @@ public class PuzzleSplashScreen {
                 }
                 keepBackground = false;
                 PuzzleConfig.write(MOD_ID);
-                buildRenderLayer();
             }
         }
     }
@@ -177,15 +137,14 @@ public class PuzzleSplashScreen {
     public static class LogoTexture extends ResourceTexture {
         public LogoTexture(Identifier logo) { super(logo); }
 
-        @Override
+        protected TextureData loadTextureData(ResourceManager resourceManager) {
-        public TextureContents loadContents(ResourceManager resourceManager) {
             MinecraftClient minecraftClient = MinecraftClient.getInstance();
             DefaultResourcePack defaultResourcePack = minecraftClient.getDefaultResourcePack();
             try {
                 InputStream inputStream = Objects.requireNonNull(defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO)).get();
-                TextureContents var6;
+                TextureData var6;
                 try {
-                    var6 = new TextureContents(NativeImage.read(inputStream), new TextureResourceMetadata(true, true));
+                    var6 = new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(inputStream));
                 } finally {
                     if (inputStream != null) {
                         inputStream.close();
@@ -193,7 +152,7 @@ public class PuzzleSplashScreen {
                 }
                 return var6;
             } catch (IOException var18) {
-                return TextureContents.createMissing();
+                return new TextureData(var18);
             }
         }
     }
@@ -202,18 +161,13 @@ public class PuzzleSplashScreen {
         public DynamicLogoTexture() {
             super(LOGO);
         }
-        @Override
+        protected TextureData loadTextureData(ResourceManager resourceManager) {
-        public TextureContents loadContents(ResourceManager resourceManager) {
             try {
                 InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
-                return new TextureContents(NativeImage.read(input), new TextureResourceMetadata(true, true));
+                return new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(input));
             } catch (IOException e) {
                 LOGGER.error("Encountered an error during logo loading: ", e);
-                try {
+                return TextureData.load(resourceManager, LOGO);
-                    return TextureContents.load(resourceManager, LOGO);
-                } catch (IOException ex) {
-                    return TextureContents.createMissing();
-                }
             }
         }
     }

common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java

@@ -1,19 +1,16 @@
 package net.puzzlemc.splashscreen.mixin;
 
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.mojang.blaze3d.platform.GlStateManager;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.pipeline.RenderPipeline;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gl.RenderPipelines;
 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.*;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.texture.NativeImageBackedTexture;
-import net.minecraft.client.texture.TextureManager;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
-import net.minecraft.util.math.ColorHelper;
 import net.minecraft.util.math.MathHelper;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.splashscreen.PuzzleSplashScreen;
@@ -29,11 +26,12 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.function.IntSupplier;
 
+import static net.puzzlemc.core.PuzzleCore.LOGGER;
 import static net.puzzlemc.splashscreen.PuzzleSplashScreen.BACKGROUND;
 
 @Mixin(value = SplashOverlay.class, priority = 2000)
 public abstract class MixinSplashScreen extends Overlay {
-    @Shadow @Final public static Identifier LOGO;
+    @Shadow @Final static Identifier LOGO;
     @Shadow private long reloadCompleteTime;
     @Shadow @Final private MinecraftClient client;
     @Shadow @Final private boolean reloading;
@@ -43,16 +41,16 @@ public abstract class MixinSplashScreen extends Overlay {
         return 0;
     }
 
-    @Inject(method = "init", at = @At("TAIL"))
+    @Inject(method = "init(Lnet/minecraft/client/MinecraftClient;)V", at = @At("TAIL"))
-    private static void puzzle$initSplashscreen(TextureManager textureManager, CallbackInfo ci) { // Load our custom textures at game start //
+    private static void puzzle$initSplashscreen(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start //
         if (PuzzleConfig.resourcepackSplashScreen) {
             if (PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) {
-                textureManager.registerTexture(LOGO, new PuzzleSplashScreen.DynamicLogoTexture());
+                client.getTextureManager().registerTexture(LOGO, new PuzzleSplashScreen.DynamicLogoTexture());
             }
             if (PuzzleSplashScreen.BACKGROUND_TEXTURE.toFile().exists()) {
                 try {
                     InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
-                    textureManager.registerTexture(BACKGROUND, new NativeImageBackedTexture(() -> "splash_screen_background", NativeImage.read(input)));
+                    client.getTextureManager().registerTexture(BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input)));
                 } catch (IOException ignored) {}
             }
         }
@@ -62,14 +60,23 @@ public abstract class MixinSplashScreen extends Overlay {
     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)
-    @WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIFFIIIIIII)V"))
+    private void puzzle$betterBlend(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-    private void puzzle$modifyRenderLayer(DrawContext instance, RenderPipeline pipeline, Identifier sprite, int x, int y, float u, float v, int width, int height, int regionWidth, int regionHeight, int textureWidth, int textureHeight, int color, Operation<Void> original) {
+        if (PuzzleConfig.resourcepackSplashScreen) {
-        if (PuzzleConfig.resourcepackSplashScreen)
+            if (PuzzleConfig.disableBlend) RenderSystem.disableBlend();
-            instance.drawTexture(PuzzleSplashScreen.getCustomLogoRenderPipeline(), sprite, x, y, u, v, width, height, regionWidth, regionHeight, textureWidth, textureHeight, color);
+            else if (PuzzleConfig.customBlendFunction.size() == 4) {
-        else instance.drawTexture(pipeline, sprite, x, y, u, v, width, height, textureWidth, textureHeight, color);
+                try {
+                    RenderSystem.blendFuncSeparate(
+                            GlStateManager.SrcFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)),
+                            GlStateManager.DstFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)),
+                            GlStateManager.SrcFactor.valueOf(PuzzleConfig.customBlendFunction.get(2)),
+                            GlStateManager.DstFactor.valueOf(PuzzleConfig.customBlendFunction.get(3)));
+                } catch (Exception e) {
+                    LOGGER.error("Incorrect blend function defined in color.properties: {}{}", PuzzleConfig.customBlendFunction, e.getMessage());
+                }
+            }
+        }
     }
-
     @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;getScaledWindowWidth()I", ordinal = 2))
     private void puzzle$renderSplashBackground(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE) && PuzzleConfig.resourcepackSplashScreen) {
@@ -82,16 +89,24 @@ public abstract class MixinSplashScreen extends Overlay {
             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;
-            context.drawTexture(RenderPipelines.GUI_TEXTURED, BACKGROUND, 0, 0, 0, 0, width, height, width, height, ColorHelper.getWhite(s));
+            RenderSystem.enableBlend();
+            RenderSystem.blendEquation(32774);
+            RenderSystem.defaultBlendFunc();
+            RenderSystem.setShader(GameRenderer::getPositionTexProgram);
+            RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, s);
+            context.drawTexture(BACKGROUND, 0, 0, 1, 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) {
+        context.getMatrices().translate(0, 0, 1f);
         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();
         context.fill(minX, minY, maxX, maxY, withAlpha(PuzzleConfig.progressBarBackgroundColor, m));
     }
 

common/src/main/java/net/puzzlemc/splashscreen/mixin/RenderPipelinesAccessor.java

@@ -1,14 +0,0 @@
-package net.puzzlemc.splashscreen.mixin;
-
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import net.minecraft.client.gl.RenderPipelines;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(RenderPipelines.class)
-public interface RenderPipelinesAccessor {
-    @Accessor
-    static RenderPipeline.Snippet getPOSITION_TEX_COLOR_SNIPPET() {
-        return null;
-    }
-}

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

@@ -1,6 +1,6 @@
 {
 	"puzzle.text.update_available":"Uma atualização está disponível!",
-	"puzzle.screen.title":"Configurações do Puzzle",
+	"puzzle.screen.title":"Puzzle Definições",
 	"puzzle.page.graphics":"Gráficas",
 	"puzzle.page.resources":"Recursos",
 	"puzzle.page.performance":"Desempenho",
@@ -8,19 +8,16 @@
 	"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\n Tela de Título e o Menu F3",
+	"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":"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":"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.title":"Configuração avançada do Puzzle",
-	"puzzle.midnightconfig.category.gui":"GUI",
-	"puzzle.midnightconfig.category.features":"Recursos",
-	"puzzle.midnightconfig.category.internal":"Interno",
 	"puzzle.midnightconfig.tooltip":"Opções apenas para usuários avançados",
 
 	"cullleaves.puzzle.option.enabled": "Abate de Folhas",
@@ -37,6 +34,6 @@
 	"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.brighter": "§eMais brilhante",
 	"entity_texture_features.puzzle.emissive_type.default": "§6Padrão"
 }

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

@@ -1,42 +1,39 @@
 {
-	"puzzle.text.update_available":"有新的更新可用！",
+	"puzzle.text.update_available": "有新版本可供升級！",
-	"puzzle.screen.title":"Puzzle 設定",
+	"puzzle.screen.title": "Puzzle 設定",
-	"puzzle.page.graphics":"圖形",
+	"puzzle.page.graphics": "顯示設定",
-	"puzzle.page.resources":"資源",
+	"puzzle.page.resources": "資源設定",
-	"puzzle.page.performance":"效能",
+	"puzzle.page.performance": "效能設定",
-	"puzzle.page.misc":"其他",
+	"puzzle.page.misc": "其他設定",
-	"puzzle.option.check_for_updates":"檢查更新",
+	"puzzle.option.check_for_updates": "檢查更新",
-	"puzzle.option.check_for_updates.tooltip":"啟用 Puzzle 內建的更新檢查器",
+	"puzzle.option.check_for_updates.tooltip": "開啟 Puzzle 內建的更新檢查",
-	"puzzle.option.show_version_info":"顯示 Puzzle 版本資訊",
+	"puzzle.option.show_version_info": "顯示 Puzzle 版本信息",
-	"puzzle.option.show_version_info.tooltip":"在標題畫面和 F3 選單上顯示\n目前 Puzzle 版本和更新狀態的資訊",
+	"puzzle.option.show_version_info.tooltip": "在標題畫面和 F3 選單上\n顯示有關目前 Puzzle 版本和更新狀態的資訊",
-	"puzzle.option.resourcepack_splash_screen":"使用資源包的啟動畫面",
+	"puzzle.option.resourcepack_splash_screen": "使用資源包載入畫面",
-	"puzzle.option.resourcepack_splash_screen.tooltip":"允許資源包使用 OptiFine 格式變更\nMinecraft 的載入/啟動畫面",
+	"puzzle.option.resourcepack_splash_screen.tooltip": "使資源包可以使用 OptiFine 格式\n更改 Minecraft 的載入畫面",
-	"puzzle.option.better_splash_screen_blend":"更好的啟動畫面標誌混合",
+	"puzzle.option.better_splash_screen_blend": "更好的載入畫面圖示混和",
-	"puzzle.option.better_splash_screen_blend.tooltip":"變更啟動畫面標誌使用的混合類型，\n使其更好地與自訂顏色的標誌配合使用",
+	"puzzle.option.better_splash_screen_blend.tooltip": "更改激活畫面上標誌的混合方式\n以便更好地與自訂顏色的標誌配合使用",
-	"puzzle.option.unlimited_model_rotations":"無限模型旋轉",
+	"puzzle.option.unlimited_model_rotations": "無限模型旋轉",
-	"puzzle.option.unlimited_model_rotations.tooltip":"解鎖自訂方塊/物品模型的完整 360° 旋轉",
+	"puzzle.option.unlimited_model_rotations.tooltip": "在自訂方塊／物品模型上解鎖完整 360° 旋轉",
-	"puzzle.option.bigger_custom_models":"更大的自訂模型",
+	"puzzle.option.bigger_custom_models": "更大的自訂模型",
-	"puzzle.option.bigger_custom_models.tooltip":"將自訂方塊/物品模型的大小限制\n從 3×3×3 增加到 5×5×5",
+	"puzzle.option.bigger_custom_models.tooltip": "增加將自訂方塊／物品模型大小\n從 3x3x3 增加到 5x5x5",
-	"puzzle.midnightconfig.title":"Puzzle 進階設定",
+	"puzzle.midnightconfig.title": "Puzzle 進階設定",
-	"puzzle.midnightconfig.category.gui":"介面",
+	"puzzle.midnightconfig.tooltip": "給予進階使用者使用的選項",
-	"puzzle.midnightconfig.category.features":"功能",
-	"puzzle.midnightconfig.category.internal":"內部",
-	"puzzle.midnightconfig.tooltip":"僅供進階使用者使用的選項",
 
-	"cullleaves.puzzle.option.enabled": "剔除樹葉",
+	"cullleaves.puzzle.option.enabled": "樹葉剔除",
-	"cullleaves.puzzle.option.enabled.tooltip": "啟用樹葉剔除以提升效能",
+	"cullleaves.puzzle.option.enabled.tooltip": "開啟樹葉剔除以提升效能。",
-	"iris.puzzle.option.enableShaders": "啟用光影",
+	"iris.puzzle.option.enableShaders": "開啟光影",
-	"iris.puzzle.option.enableShaders.tooltip": "是否啟用光影包",
+	"iris.puzzle.option.enableShaders.tooltip": "開啟或關閉光影包",
-	"iris.puzzle.option.open": "開啟",
+	"iris.puzzle.option.open": "開",
-	"options.iris.shaderPackSelection.tooltip": "開啟一個畫面以選擇\n並設定光影包",
+	"options.iris.shaderPackSelection.tooltip": "開啟選擇畫面光影包和設定",
-	"lambdabettergrass.option.mode.tooltip": "使草地的側面與\n相鄰的草地連接",
+	"lambdabettergrass.option.mode.tooltip": "讓草的側面連接相鄰的草塊",
-	"lambdabettergrass.option.better_snow.tooltip": "為被雪/苔蘚包圍的非完整方塊\n加入純粹視覺上的雪/苔蘚層",
+	"lambdabettergrass.option.better_snow.tooltip": "對雪塊／苔蘚方塊被包圍的不完整方塊\n增加視覺效果",
-	"config.dynamicfps.reduce_when_unfocused.tooltip": "在未聚焦時降低 Minecraft 的 FPS\n（例如，另一個視窗被聚焦或遊戲被隱藏）\n以節省電力和系統資源",
+	"config.dynamicfps.reduce_when_unfocused.tooltip": "當 Minecraft 失去焦點時限制 FPS\n（如切換到其他視窗或是遊戲被隱藏）\n以節省電源和系統資源",
-	"config.dynamicfps.unfocused_fps.tooltip": "Minecraft 在未聚焦時\n允許繪製的 FPS",
+	"config.dynamicfps.unfocused_fps.tooltip": "當 Minecraft 失去焦點時允許的最大 FPS",
-	"config.dynamicfps.restore_when_hovered.tooltip": "當預覽 Minecraft 時是否停止\nFPS 限制（例如，將滑鼠懸停在工作列或 Dock 上）",
+	"config.dynamicfps.restore_when_hovered.tooltip": "開啟或關閉預覽 Mineceraft 時是否停止 FPS 限制\n（如停留在工作列或 Dock）",
-	"config.dynamicfps.run_gc_on_unfocus.tooltip": "在 Minecraft 未聚焦時執行垃圾回收器\n以釋放一些記憶體",
+	"config.dynamicfps.run_gc_on_unfocus.tooltip": "當 Minecraft 失去焦點時執行垃圾清理\n以減少一些記憶體",
-	"config.dynamicfps.unfocused_volume.tooltip": "遊戲在未聚焦時播放聲音的音量\n（例如，選取了另一個視窗）",
+	"config.dynamicfps.unfocused_volume.tooltip": "當 Minecraft 失去焦點時撥放的音量\n（如選擇了另一個視窗）",
-	"config.dynamicfps.hidden_volume.tooltip": "遊戲在不可見時播放聲音的音量\n（例如，最小化、被其他視窗覆蓋\n或在另一個虛擬桌面上）",
+	"config.dynamicfps.hidden_volume.tooltip": "遊戲在不可見時應該播放的音量\n（如最小化、被其他視窗覆蓋或在另一個虛擬桌面上）",
 	"entity_texture_features.puzzle.emissive_type.brighter": "§e更亮",
 	"entity_texture_features.puzzle.emissive_type.default": "§6預設"
 }

common/src/main/resources/puzzle-models.accesswidener

@@ -1,7 +1,2 @@
 accessWidener	v1	named
 accessible   class   net/minecraft/client/render/model/json/ModelElement$Deserializer
-accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
-accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
-accessible class net/minecraft/client/render/RenderPhase$Texture
-accessible method net/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder texture (Lnet/minecraft/client/render/RenderPhase$TextureBase;)Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder;
-accessible method net/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder build (Z)Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;

common/src/main/resources/puzzle-splashscreen.mixins.json

@@ -3,8 +3,7 @@
   "package": "net.puzzlemc.splashscreen.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "MixinSplashScreen",
+    "MixinSplashScreen"
-    "RenderPipelinesAccessor"
   ],
   "injectors": {
     "defaultRequire": 1

fabric/build.gradle

@@ -26,7 +26,7 @@ dependencies {
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
     modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric")
 
-    modCompileOnlyApi ("com.terraformersmc:modmenu:${project.modmenu_version}") {
+    modImplementation ("com.terraformersmc:modmenu:${project.modmenu_version}") {
         exclude(group: "net.fabricmc.fabric-api")
     }
 
@@ -90,8 +90,7 @@ unifiedPublishing {
             curseforge {
                 token = CURSEFORGE_TOKEN
                 id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version
+                gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
             }
         }
 
@@ -101,8 +100,7 @@ unifiedPublishing {
                 token = MODRINTH_TOKEN
                 id = rootProject.modrinth_id
                 version = "$rootProject.version-$project.name"
-                gameVersions.addAll project.minecraft_version
+                gameVersions.addAll project.minecraft_version, project.supported_versions
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
             }
         }
     }

gradle.properties

@@ -1,13 +1,13 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
 
-minecraft_version=1.21.9
+minecraft_version=1.21
-supported_versions=
+supported_versions=1.21.1
-yarn_mappings=1.21.9+build.1
+yarn_mappings=1.21+build.2
 enabled_platforms=fabric,neoforge
 
 # Mod Properties
-mod_version = 2.1.2
+mod_version = 2.0.1.1
 maven_group = net.puzzlemc
 archives_base_name = puzzle
 release_type=release
@@ -15,19 +15,19 @@ curseforge_id=563977
 modrinth_id=3IuO68q1
 
 # Modloaders
-fabric_loader_version=0.17.2
+fabric_loader_version=0.15.11
-fabric_api_version=0.133.14+1.21.9
+fabric_api_version=0.100.1+1.21
 
-neoforge_version=21.9.3-beta
+neoforge_version=21.0.143
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 # Libraries
-midnightlib_version = 1.8.1+1.21.9
+midnightlib_version = 1.7.5+1.21.1
-modmenu_version = 15.0.0-beta.1
+modmenu_version = 11.0.2
 
 # Mod Integrations
 cull_leaves_version = 3.0.2-fabric
-ldl_version = 4.0.0+1.21.4
+ldl_version = 2.3.2+1.20.1
 lbg_version = 1.5.2+1.20.1
 iris_version = 1.8.0-beta.3+1.21-fabric
 continuity_version = 3.0.0-beta.5+1.21
@@ -40,7 +40,7 @@ cit_resewn_version = 1.1.3+1.20
 complete_config_version = 2.3.0
 spruceui_version=5.0.0+1.20
 emf_version=2.4.1
-etf_version=6.2.10
+etf_version=6.2.9
 exordium_version=1.2.1-1.20.2
 # Required for LBG
 quilt_loader_version=0.19.0-beta.18

gradle/wrapper/gradle-wrapper.properties

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

neoforge/build.gradle

@@ -96,8 +96,7 @@ unifiedPublishing {
             curseforge {
                 token = CURSEFORGE_TOKEN
                 id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version
+                gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
             }
         }
 
@@ -107,8 +106,7 @@ unifiedPublishing {
                 token = MODRINTH_TOKEN
                 id = rootProject.modrinth_id
                 version = "$rootProject.version-$project.name"
-                gameVersions.addAll project.minecraft_version
+                gameVersions.addAll project.minecraft_version, project.supported_versions
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
             }
         }
     }

neoforge/src/main/java/net/puzzlemc/neoforge/PuzzleNeoForge.java

@@ -1,12 +1,11 @@
 package net.puzzlemc.neoforge;
 
-import net.minecraft.util.Identifier;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.client.event.AddClientReloadListenersEvent;
+import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 import net.puzzlemc.core.PuzzleCore;
 import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
@@ -21,11 +20,11 @@ public class PuzzleNeoForge {
         ModList.get().getModContainerById(MOD_ID).orElseThrow().registerExtensionPoint(IConfigScreenFactory.class, (client, parent) -> new PuzzleOptionsScreen(parent));
     }
 
-    @EventBusSubscriber(modid = MOD_ID, value = Dist.CLIENT)
+    @EventBusSubscriber(modid = MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
     public static class MidnightLibBusEvents {
         @SubscribeEvent
-        public static void onResourceReload(AddClientReloadListenersEvent event) {
+        public static void onResourceReload(RegisterClientReloadListenersEvent event) {
-            event.addListener(Identifier.of(MOD_ID, "splash_screen"), PuzzleSplashScreen.ReloadListener.INSTANCE);
+            event.registerReloadListener(PuzzleSplashScreen.ReloadListener.INSTANCE);
         }
     }
 }