From 7eb86b012e0f3e5a4740bead3aae9ecdc54d83d2 Mon Sep 17 00:00:00 2001
From: hypherionmc <hypherionmc@gmail.com>
Date: Tue, 8 Apr 2025 20:19:03 +0200
Subject: [PATCH] [PORT] Port for 25w15a.... Seriously mojang, JUST STOP....

---
 .jenkins/Jenkinsfile.deploy                                 | 2 +-
 .jenkins/Jenkinsfile.snapshot                               | 4 ++--
 .../craterlib/client/gui/config/CraterConfigScreen.java     | 4 ++--
 .../craterlib/nojang/client/BridgedMinecraft.java           | 2 +-
 .../craterlib/nojang/server/BridgedMinecraftServer.java     | 2 +-
 .../java/com/hypherionmc/craterlib/utils/ChatUtils.java     | 2 +-
 gradle.properties                                           | 6 +++---
 settings.gradle                                             | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.jenkins/Jenkinsfile.deploy b/.jenkins/Jenkinsfile.deploy
index cd9b9d8..017618b 100644
--- a/.jenkins/Jenkinsfile.deploy
+++ b/.jenkins/Jenkinsfile.deploy
@@ -1,5 +1,5 @@
 def JDK = "21"
-def majorMc = "1.21.5";
+def majorMc = "1.21.6";
 
 pipeline {
     agent {
diff --git a/.jenkins/Jenkinsfile.snapshot b/.jenkins/Jenkinsfile.snapshot
index b783fad..489ca38 100644
--- a/.jenkins/Jenkinsfile.snapshot
+++ b/.jenkins/Jenkinsfile.snapshot
@@ -1,9 +1,9 @@
 def projectName = "CraterLib";
 def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
 def JDK = "21";
-def majorMc = "1.21.5";
+def majorMc = "1.21.6";
 def modLoaders = "neoforge|fabric|quilt|paper";
-def supportedMc = "1.21.5-rc1";
+def supportedMc = "25w15a";
 def reltype = "experimental";
 
 pipeline {
diff --git a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
index 439f94e..9539208 100644
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
@@ -179,7 +179,7 @@ public class CraterConfigScreen extends Screen {
 
     @Override
     public void render(@NotNull GuiGraphics matrices, int mouseX, int mouseY, float delta) {
-        overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
+        /*overlayBackground(matrices.pose(), TOP, height - BOTTOM, 32);
         renderScrollBar();
 
         matrices.pose().pushPose();
@@ -198,7 +198,7 @@ public class CraterConfigScreen extends Screen {
             option.render(minecraft, font, 40, y, width - 80, height1, matrices, mouseX, mouseY, delta);
             renderConfigTooltip(matrices, font, mouseX, mouseY, 40, y, font.width(option.text), height1, option.text.getString(), option.getLangKeys().toArray(new String[0]));
             y += height1;
-        }
+        }*/
     }
 
     private void renderScrollBar() {
diff --git a/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java b/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java
index 8d19139..705b009 100644
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/client/BridgedMinecraft.java
@@ -55,7 +55,7 @@ public class BridgedMinecraft {
     }
 
     public String getGameVersion() {
-        return SharedConstants.getCurrentVersion().getName();
+        return SharedConstants.getCurrentVersion().name();
     }
 
     public String getUserName() {
diff --git a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java
index 7bc4ea5..f0cb5d8 100644
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/server/BridgedMinecraftServer.java
@@ -38,7 +38,7 @@ public class BridgedMinecraftServer {
     }
 
     public String getName() {
-        return SharedConstants.getCurrentVersion().getName();
+        return SharedConstants.getCurrentVersion().name();
     }
 
     public boolean usesAuthentication() {
diff --git a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
index 7396010..9e89c94 100644
--- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
@@ -25,7 +25,7 @@ public class ChatUtils {
 
     @Getter
     private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options(
-            JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion())
+            JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version())
     ).build();
 
     private static final MiniMessage miniMessage = MiniMessage.miniMessage();
diff --git a/gradle.properties b/gradle.properties
index 4edf8f5..5406269 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,12 +10,12 @@ mod_id=craterlib
 mod_name=CraterLib
 
 # Shared
-minecraft_version=1.21.5
+minecraft_version=25w15a
 project_group=com.hypherionmc.craterlib
 
 # Fabric
-fabric_loader=0.16.10
-fabric_api=0.119.5+1.21.5
+fabric_loader=0.16.13
+fabric_api=0.119.10+1.21.6
 
 # Forge
 forge_version=50.0.6
diff --git a/settings.gradle b/settings.gradle
index 90bd73d..5839bc6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,6 +14,6 @@ pluginManagement {
 }
 
 rootProject.name = 'CraterLib'
-include("Common", "Fabric", "NeoForge")
+include("Common", "Fabric"/*, "NeoForge"*/)
 //include 'Paper'