From a4a51b7cd8f85610b9a47d5b575de7e777e88376 Mon Sep 17 00:00:00 2001
From: HypherionSA <hypherionmc@gmail.com>
Date: Tue, 17 Jun 2025 19:16:28 +0200
Subject: [PATCH] 1.21.6 prep

---
 Paper/build.gradle                                          | 4 ++--
 .../com/hypherionmc/craterlib/common/PaperCompatHelper.java | 1 +
 .../com/hypherionmc/craterlib/common/PaperLoaderHelper.java | 2 +-
 build.gradle                                                | 6 +++---
 gradle.properties                                           | 4 ++--
 gradle/wrapper/gradle-wrapper.properties                    | 2 +-
 settings.gradle                                             | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Paper/build.gradle b/Paper/build.gradle
index d08b6a6..6544d6b 100644
--- a/Paper/build.gradle
+++ b/Paper/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "io.papermc.paperweight.userdev" version "1.7.3"
+    id "io.papermc.paperweight.userdev" version "2.0.0-beta.17"
     id "xyz.jpenilla.run-paper" version "2.3.0"
 }
 
@@ -56,7 +56,7 @@ processResources {
 compileTestJava.enabled = false
 
 tasks.assemble {
-    dependsOn(tasks.reobfJar)
+    dependsOn(tasks.shadowJar)
 }
 
 publisher {
diff --git a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java
index d2d84da..c4532b9 100644
--- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java
+++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java
@@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.ChatUtils;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.MetadataValue;
diff --git a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java
index 2206ada..f54c6d1 100644
--- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java
+++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperLoaderHelper.java
@@ -30,7 +30,7 @@ public class PaperLoaderHelper implements ModloaderEnvironment {
 
     @Override
     public String getGameVersion() {
-        return SharedConstants.getCurrentVersion().getName();
+        return SharedConstants.getCurrentVersion().name();
     }
 
     @Override
diff --git a/build.gradle b/build.gradle
index d89c76f..1992229 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,15 +3,15 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
     id "xyz.wagyourtail.unimined" version "1.3.9" apply false
     id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
-    id "com.hypherionmc.modutils.orion" version "1.0.24"
-    id "com.hypherionmc.modutils.orion.origami" version "1.0.24" apply false
+    id "com.hypherionmc.modutils.orion" version "1.0.28"
+    id "com.hypherionmc.modutils.orion.origami" version "1.0.28" apply false
     id 'maven-publish'
 }
 
 var relType = project.properties["releaseType"] ?: "${release_type}"
 
 ext {
-    isPort = true //(relType == 'experimental')
+    isPort = false //(relType == 'experimental')
 }
 
 orion.setup {
diff --git a/gradle.properties b/gradle.properties
index 94f1ba5..b105c9b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ mod_id=craterlib
 mod_name=CraterLib
 
 # Shared
-minecraft_version=1.21.6-pre3
+minecraft_version=1.21.6
 project_group=com.hypherionmc.craterlib
 
 # Fabric
@@ -21,7 +21,7 @@ fabric_api=0.126.0+1.21.6
 forge_version=50.0.6
 
 # NeoForged
-neoforge_version=21.5.0-alpha.1.21.6-pre3.20250606.211419
+neoforge_version=0-beta
 
 # Dependencies
 moon_config=1.0.12
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 48c0a02..5c82cb0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 90bd73d..e3b6e5f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,5 +15,5 @@ pluginManagement {
 
 rootProject.name = 'CraterLib'
 include("Common", "Fabric", "NeoForge")
-//include 'Paper'
+include 'Paper'