Add 1.21 support

NEZNAMY · Jun 13, 2024 · f96e263 · f96e263
1 parent a22f8ec
commit f96e263
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts
@@ -1,7 +1,7 @@
 dependencies {
     implementation(projects.shared)
     implementation("org.bstats:bstats-bungeecord:3.0.1")
-    compileOnly("net.md-5:bungeecord-proxy:1.20-R0.2-SNAPSHOT")
+    compileOnly("net.md-5:bungeecord-proxy:1.20-R0.3-SNAPSHOT")
     compileOnly("com.github.limework.redisbungee:RedisBungee-Bungee:0.11.0")
     compileOnly("com.github.LeonMangler:PremiumVanishAPI:2.8.8")
 }
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -12,11 +12,11 @@ repositories {
 
 dependencies {
     api(projects.shared)
-    minecraft("com.mojang:minecraft:24w19a")
+    minecraft("com.mojang:minecraft:1.21")
     mappings(loom.officialMojangMappings())
     modImplementation("me.lucko:fabric-permissions-api:0.2-SNAPSHOT")
     modImplementation("net.fabricmc:fabric-loader:0.15.9")
-    val version = "0.97.8+1.20.6"
+    val version = "0.100.1+1.21"
     modImplementation(fabricApi.module("fabric-api-base", version))
     modImplementation(fabricApi.module("fabric-lifecycle-events-v1", version))
     modImplementation(fabricApi.module("fabric-networking-api-v1", version))

diff --git a/fabric/src/main/java/me/neznamy/tab/platforms/fabric/FabricMultiVersion.java b/fabric/src/main/java/me/neznamy/tab/platforms/fabric/FabricMultiVersion.java
@@ -4,7 +4,7 @@
 import io.netty.channel.Channel;
 import lombok.SneakyThrows;
 import me.neznamy.tab.platforms.fabric.loader.Loader;
-import me.neznamy.tab.platforms.fabric.loader.Loader_1_20_5;
+import me.neznamy.tab.platforms.fabric.loader.Loader_1_21;
 import me.neznamy.tab.shared.ProtocolVersion;
 import me.neznamy.tab.shared.backend.EntityData;
 import me.neznamy.tab.shared.backend.Location;
@@ -38,7 +38,7 @@ public class FabricMultiVersion {
     private static final ProtocolVersion serverVersion = ProtocolVersion.fromFriendlyName(FabricTAB.minecraftVersion);
 
     /** Method loader using latest supported MC version */
-    private static final Loader loaderNew = new Loader_1_20_5();
+    private static final Loader loaderNew = new Loader_1_21();
 
     /** Method loader using 1.18.2 */
     private static final Loader loader1_18_2 = createLoader("1_18_2");

diff --git a/...latforms/fabric/loader/Loader_1_20_5.java → .../platforms/fabric/loader/Loader_1_21.java b/...latforms/fabric/loader/Loader_1_20_5.java → .../platforms/fabric/loader/Loader_1_21.java
@@ -42,14 +42,14 @@
 import java.util.*;
 
 /**
- * Method loader compiled using Minecraft 1.20.5.
+ * Method loader compiled using Minecraft 1.21.
  */
 @SuppressWarnings({
         "unchecked", // Java generic types
         "DataFlowIssue", // Profile is not null on add action
         "unused" // Actually used, just via reflection
 })
-public class Loader_1_20_5 implements Loader {
+public class Loader_1_21 implements Loader {
 
     @Override
     @NotNull
@@ -96,7 +96,7 @@ public Style convertModifier(@NotNull ChatModifier modifier, boolean modern) {
                 null,
                 null,
                 null,
-                modifier.getFont() == null ? null : new ResourceLocation(modifier.getFont())
+                modifier.getFont() == null ? null : ResourceLocation.tryParse(modifier.getFont())
         );
     }
 

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -20,7 +20,7 @@
       "1.18", "1.18.1", "1.18.2",
       "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4",
       "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6",
-      "1.21-alpha.24.19.a"
+      "1.21"
     ]
   },
   "recommends": {

diff --git a/shared/src/main/java/me/neznamy/tab/shared/ProtocolVersion.java b/shared/src/main/java/me/neznamy/tab/shared/ProtocolVersion.java
@@ -11,6 +11,7 @@
 public enum ProtocolVersion {
 
     UNKNOWN,
+    V1_21   (767),
     V1_20_6 (766),
     V1_20_5 (766),
     V1_20_4 (765),
@@ -81,7 +82,7 @@ public enum ProtocolVersion {
     private static final ProtocolVersion[] VALUES = values();
 
     /** Newest MC version this plugin jar knows */
-    public static final ProtocolVersion LATEST_KNOWN_VERSION = V1_20_6;
+    public static final ProtocolVersion LATEST_KNOWN_VERSION = VALUES[1];
 
     /** Version's network id found at <a href="https://wiki.vg/Protocol_version_numbers">wiki.vg</a> */
     private final int networkId;