From 431c7fa3f7c00fceb2241ee3db34f59642ee39ca Mon Sep 17 00:00:00 2001
From: Username404-59 <w.iron.zombie@gmail.com>
Date: Tue, 15 Apr 2025 14:43:51 +0200
Subject: [PATCH] Update to 1.21.2 and make gradle not process access wideners

Signed-off-by: Username404-59 <w.iron.zombie@gmail.com>
---
 build.gradle.kts                              |  2 +-
 .../snowygui/gui/elements/ClickBox.kt         |  4 ++--
 .../snowygui/utils/RenderingUtil.kt           |  4 ++--
 .../src/main/resources/snowygui.accessWidener |  5 +++-
 gradle.properties                             | 24 +++++++++----------
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a28cef4..fde5157 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -242,7 +242,7 @@ allprojects {
                 "forge_version" to rootProject.property("forge_version")
             )
             inputs.properties(modProperties)
-            filesNotMatching(listOf("*.png")) {
+            filesNotMatching(listOf("*.png", "*.accessWidener")) {
                 expand(modProperties)
             }
         }
diff --git a/common/src/main/kotlin/fr/username404/snowygui/gui/elements/ClickBox.kt b/common/src/main/kotlin/fr/username404/snowygui/gui/elements/ClickBox.kt
index f80f7eb..43e4fd0 100644
--- a/common/src/main/kotlin/fr/username404/snowygui/gui/elements/ClickBox.kt
+++ b/common/src/main/kotlin/fr/username404/snowygui/gui/elements/ClickBox.kt
@@ -120,9 +120,9 @@ class ClickBox(
         }
         guiGraphics?.run {
             with(Minecraft.getInstance().font) {
-                drawInBatch(name.string,
+                drawInBatch(Component.nullToEmpty(name.string),
                     (x + 5), (y + 2), Colors.TRANSPARENT.hexValue, false,
-                    pose().last().pose(), bufferSource(), Font.DisplayMode.NORMAL, 0, 15728880, isBidirectional
+                    pose().last().pose(), bufferSource, Font.DisplayMode.NORMAL, 0, 15728880, isBidirectional
                 )
             }
         }
diff --git a/common/src/main/kotlin/fr/username404/snowygui/utils/RenderingUtil.kt b/common/src/main/kotlin/fr/username404/snowygui/utils/RenderingUtil.kt
index 29d833a..325c43b 100644
--- a/common/src/main/kotlin/fr/username404/snowygui/utils/RenderingUtil.kt
+++ b/common/src/main/kotlin/fr/username404/snowygui/utils/RenderingUtil.kt
@@ -8,7 +8,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer
 import com.mojang.blaze3d.vertex.VertexFormat
 import fr.username404.snowygui.gui.feature.Colors
 import fr.username404.snowygui.gui.hextoRGB
-import net.minecraft.client.renderer.GameRenderer
+import net.minecraft.client.renderer.CoreShaders
 
 object RenderingUtil {
     @JvmField val tessellator: Tesselator = Tesselator.getInstance()
@@ -17,7 +17,7 @@ object RenderingUtil {
         setColor(get(0), get(1), get(2), opacity)
     }
     fun colorShader() {
-        RenderSystem.setShader(GameRenderer::getPositionColorShader)
+        RenderSystem.setShader(CoreShaders.POSITION_COLOR)
         RenderSystem.setShaderColor(1F, 1F, 1F, 1F)
     }
     fun prepareDraw() {
diff --git a/common/src/main/resources/snowygui.accessWidener b/common/src/main/resources/snowygui.accessWidener
index e93b5f5..e6479c1 100644
--- a/common/src/main/resources/snowygui.accessWidener
+++ b/common/src/main/resources/snowygui.accessWidener
@@ -1,3 +1,6 @@
 accessWidener v2 named
+
 accessible field net/minecraft/client/OptionInstance value Ljava/lang/Object;
-mutable field net/minecraft/client/OptionInstance value Ljava/lang/Object;
\ No newline at end of file
+mutable field net/minecraft/client/OptionInstance value Ljava/lang/Object;
+
+accessible field net/minecraft/client/gui/GuiGraphics bufferSource Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 74f5831..9ab16af 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,16 +7,16 @@ org.gradle.parallel=true
 org.gradle.unsafe.configuration-cache=on
 org.gradle.vfs.watch=true
 
-minecraft=1.21
-forge_version=21.0.143
-kotlinforforge=5.4.0
-kotlinVer=2.0.0
-kotlin_coroutines_version=1.7.1
-serializationVer=1.7.0
+minecraft=1.21.2
+forge_version=21.2.1-beta
+kotlinforforge=5.7.0
+kotlinVer=2.1.0
+kotlin_coroutines_version=1.9.0
+serializationVer=1.7.3
 fabric_loader_version=0.14.20
-fabric_language_kotlin=1.11.0+kotlin.2.0.0
-fabric_resource_loader_version=1.1.3+b559734490
-fabric_rendering_api_version=5.0.3+d132107690
-fabric_api_base_version=0.4.42+6573ed8c90
-clothconfig_version=15.0.127
-modmenu_version=11.0.0
+fabric_language_kotlin=1.13.0+kotlin.2.1.0
+fabric_resource_loader_version=3.0.5+c47b9d4373
+fabric_rendering_api_version=8.0.5+c47b9d4373
+fabric_api_base_version=0.4.48+c47b9d4373
+clothconfig_version=16.0.143
+modmenu_version=12.0.0