From f984ebbb4652c23ef5b9bb867ec2db4d361233d9 Mon Sep 17 00:00:00 2001
From: Wolfdv1 <DwhEmailPc@gmail.com>
Date: Sun, 16 Jun 2024 11:45:09 +0200
Subject: [PATCH] Update Fabric to MC 1.21 (#3918)

Co-authored-by: Wolfdv1 <Wolfdv1@github.com>
---
 fabric/build.gradle                                       | 8 ++++----
 .../me/lucko/luckperms/fabric/FabricSenderFactory.java    | 2 +-
 .../fabric/messaging/PluginMessageMessenger.java          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fabric/build.gradle b/fabric/build.gradle
index b7d5ce67a..285853274 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -13,9 +13,9 @@ repositories {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    minecraft 'com.mojang:minecraft:1.20.6'
-    mappings 'net.fabricmc:yarn:1.20.6+build.1:v2'
-    modImplementation 'net.fabricmc:fabric-loader:0.15.10'
+    minecraft 'com.mojang:minecraft:1.21'
+    mappings 'net.fabricmc:yarn:1.21+build.1'
+    modImplementation 'net.fabricmc:fabric-loader:0.15.11'
 
     Set<String> apiModules = [
             'fabric-api-base',
@@ -25,7 +25,7 @@ dependencies {
     ]
 
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, '0.97.8+1.20.6'))
+        modImplementation(fabricApi.module(it, '0.100.1+1.21'))
     }
 
     include(modImplementation('me.lucko:fabric-permissions-api:0.3.1'))
diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java
index 528621da8..b63cef8ea 100644
--- a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java
+++ b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java
@@ -77,7 +77,7 @@ public class FabricSenderFactory extends SenderFactory<LPFabricPlugin, ServerCom
     protected void sendMessage(ServerCommandSource sender, Component message) {
         final Locale locale;
         if (sender.getEntity() instanceof ServerPlayerEntity) {
-            String language = ((ServerPlayerEntity) sender.getEntity()).getClientOptions().language();
+            String language = ((ServerPlayerEntity) sender.getEntity()).getClientOptions().comp_1951();
             locale = language == null ? null : TranslationManager.parseLocale(language);
         } else {
             locale = null;
diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/PluginMessageMessenger.java b/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/PluginMessageMessenger.java
index ffec7e578..bcc96802e 100644
--- a/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/PluginMessageMessenger.java
+++ b/fabric/src/main/java/me/lucko/luckperms/fabric/messaging/PluginMessageMessenger.java
@@ -48,7 +48,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class PluginMessageMessenger extends AbstractPluginMessageMessenger implements ServerPlayNetworking.PlayPayloadHandler<PluginMessageMessenger.PluginMessagePayload> {
-    private static final Identifier CHANNEL = new Identifier(AbstractPluginMessageMessenger.CHANNEL);
+    private static final Identifier CHANNEL = Identifier.of(AbstractPluginMessageMessenger.CHANNEL);
 
     private final LPFabricPlugin plugin;