From 9ee7ab1b89e73be37722a12012917ccbf46802f9 Mon Sep 17 00:00:00 2001
From: Martin Prokoph <motschen@midnightdust.eu>
Date: Tue, 5 Nov 2024 10:29:04 +0100
Subject: [PATCH] Update to 1.21.3

---
 .../puzzlemc/gui/mixin/MixinOptionsScreen.java |  2 +-
 .../splashscreen/mixin/MixinSplashScreen.java  |  9 ++++-----
 gradle.properties                              | 18 +++++++++---------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/common/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java b/common/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java
index 5076f6a..9ad37e4 100755
--- a/common/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java
+++ b/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 = "initTabNavigation")
+    @Inject(at = @At("TAIL"), method = "refreshWidgetPositions")
     public void puzzle$onResize(CallbackInfo ci) {
         if (PuzzleConfig.enablePuzzleButton) this.puzzle$setButtonPos();
     }
diff --git a/common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java b/common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java
index 903677d..9e2a4a1 100755
--- a/common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java
+++ b/common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java
@@ -11,6 +11,7 @@ import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.texture.NativeImageBackedTexture;
 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;
@@ -31,7 +32,7 @@ import static net.puzzlemc.splashscreen.PuzzleSplashScreen.BACKGROUND;
 
 @Mixin(value = SplashOverlay.class, priority = 2000)
 public abstract class MixinSplashScreen extends Overlay {
-    @Shadow @Final static Identifier LOGO;
+    @Shadow @Final public static Identifier LOGO;
     @Shadow private long reloadCompleteTime;
     @Shadow @Final private MinecraftClient client;
     @Shadow @Final private boolean reloading;
@@ -60,7 +61,7 @@ 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)
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/ColorHelper;getWhite(F)I", shift = At.Shift.AFTER), remap = false)
     private void puzzle$betterBlend(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (PuzzleConfig.resourcepackSplashScreen) {
             if (PuzzleConfig.disableBlend) RenderSystem.disableBlend();
@@ -92,9 +93,7 @@ public abstract class MixinSplashScreen extends Overlay {
             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);
+            context.drawTexture(RenderLayer::getGuiTextured, BACKGROUND, 0, 0, 0, 0, width, height, width, height, ColorHelper.fromFloats(s, 1.0f, 1.0f, 1.0f));
             RenderSystem.defaultBlendFunc();
             RenderSystem.disableBlend();
         }
diff --git a/gradle.properties b/gradle.properties
index aa20398..ee1fc18 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
 
-minecraft_version=1.21
-supported_versions=1.21.1
-yarn_mappings=1.21+build.2
+minecraft_version=1.21.3
+supported_versions=1.21.2
+yarn_mappings=1.21.3+build.2
 enabled_platforms=fabric,neoforge
 
 # Mod Properties
-mod_version = 2.0.1
+mod_version = 2.0.2
 maven_group = net.puzzlemc
 archives_base_name = puzzle
 release_type=release
@@ -15,15 +15,15 @@ curseforge_id=563977
 modrinth_id=3IuO68q1
 
 # Modloaders
-fabric_loader_version=0.15.11
-fabric_api_version=0.100.1+1.21
+fabric_loader_version=0.16.9
+fabric_api_version=0.107.0+1.21.3
 
-neoforge_version=21.0.143
+neoforge_version=21.3.11-beta
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 # Libraries
-midnightlib_version = 1.6.3
-modmenu_version = 11.0.2
+midnightlib_version = 1.6.4
+modmenu_version = 12.0.0-beta.1
 
 # Mod Integrations
 cull_leaves_version = 3.0.2-fabric