From d748817351e526269d7af30ac9028500e7f739be Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sun, 16 Jun 2024 10:45:42 +0100
Subject: [PATCH] Update Forge to MC 1.21

---
 build.gradle                                           | 10 ++++++++++
 .../luckperms/forge/capabilities/UserCapability.java   |  2 +-
 forge/gradle.properties                                |  4 ++--
 .../forge/messaging/PluginMessageMessenger.java        |  2 +-
 .../forge/service/ForgePermissionHandler.java          |  2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index c8431de6a..e84e73039 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,6 +64,16 @@ subprojects {
     }
 
     repositories {
+        // Fix issue with lwjgl-freetype not being found on macOS / ForgeGradle issue
+        //
+        // Could not resolve all files for configuration ':_compileJava_1'.
+        // Could not find lwjgl-freetype-3.3.3-natives-macos-patch.jar (org.lwjgl:lwjgl-freetype:3.3.3).
+        maven {
+            url "https://libraries.minecraft.net"
+            content {
+                includeModule("org.lwjgl", "lwjgl-freetype")
+            }
+        }
         mavenCentral()
         maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
diff --git a/forge/forge-api/src/main/java/me/lucko/luckperms/forge/capabilities/UserCapability.java b/forge/forge-api/src/main/java/me/lucko/luckperms/forge/capabilities/UserCapability.java
index 9a1323837..e40066ed5 100644
--- a/forge/forge-api/src/main/java/me/lucko/luckperms/forge/capabilities/UserCapability.java
+++ b/forge/forge-api/src/main/java/me/lucko/luckperms/forge/capabilities/UserCapability.java
@@ -41,7 +41,7 @@ public interface UserCapability {
     /**
      * The identifier used for the capability
      */
-    ResourceLocation IDENTIFIER = new ResourceLocation("luckperms", "user");
+    ResourceLocation IDENTIFIER = ResourceLocation.fromNamespaceAndPath("luckperms", "user");
 
     /**
      * The capability instance.
diff --git a/forge/gradle.properties b/forge/gradle.properties
index 2cf5a8eaa..17fed0a6b 100644
--- a/forge/gradle.properties
+++ b/forge/gradle.properties
@@ -1,2 +1,2 @@
-minecraftVersion=1.20.6
-forgeVersion=50.0.9
\ No newline at end of file
+minecraftVersion=1.21
+forgeVersion=51.0.8
\ No newline at end of file
diff --git a/forge/src/main/java/me/lucko/luckperms/forge/messaging/PluginMessageMessenger.java b/forge/src/main/java/me/lucko/luckperms/forge/messaging/PluginMessageMessenger.java
index 6b8278225..2d5abab89 100644
--- a/forge/src/main/java/me/lucko/luckperms/forge/messaging/PluginMessageMessenger.java
+++ b/forge/src/main/java/me/lucko/luckperms/forge/messaging/PluginMessageMessenger.java
@@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class PluginMessageMessenger extends AbstractPluginMessageMessenger implements Messenger {
-    private static final ResourceLocation CHANNEL_ID = new ResourceLocation(AbstractPluginMessageMessenger.CHANNEL);
+    private static final ResourceLocation CHANNEL_ID = ResourceLocation.parse(AbstractPluginMessageMessenger.CHANNEL);
     private static final EventNetworkChannel CHANNEL = ChannelBuilder.named(CHANNEL_ID).eventNetworkChannel();
 
     private final LPForgePlugin plugin;
diff --git a/forge/src/main/java/me/lucko/luckperms/forge/service/ForgePermissionHandler.java b/forge/src/main/java/me/lucko/luckperms/forge/service/ForgePermissionHandler.java
index dcb89efba..805d89d2f 100644
--- a/forge/src/main/java/me/lucko/luckperms/forge/service/ForgePermissionHandler.java
+++ b/forge/src/main/java/me/lucko/luckperms/forge/service/ForgePermissionHandler.java
@@ -52,7 +52,7 @@ import java.util.Set;
 import java.util.UUID;
 
 public class ForgePermissionHandler implements IPermissionHandler {
-    public static final ResourceLocation IDENTIFIER = new ResourceLocation(LPForgeBootstrap.ID, "permission_handler");
+    public static final ResourceLocation IDENTIFIER = ResourceLocation.fromNamespaceAndPath(LPForgeBootstrap.ID, "permission_handler");
 
     private final LPForgePlugin plugin;
     private final Set<PermissionNode<?>> permissionNodes;