Update to 1.21.1

NEZNAMY · Aug 10, 2024 · 1a96101 · 1a96101
1 parent 88f40ab
commit 1a96101
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
     api(projects.shared)
-    minecraft("com.mojang:minecraft:1.21")
+    minecraft("com.mojang:minecraft:1.21.1")
     mappings(loom.officialMojangMappings())
     modImplementation("me.lucko:fabric-permissions-api:0.2-SNAPSHOT")
     modImplementation("net.fabricmc:fabric-loader:0.15.9")

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_21;
+import me.neznamy.tab.platforms.fabric.loader.Loader_1_21_1;
 import me.neznamy.tab.shared.ProtocolVersion;
 import me.neznamy.tab.shared.chat.ChatModifier;
 import me.neznamy.tab.shared.chat.TabComponent;
@@ -33,7 +33,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_21();
+    private static final Loader loaderNew = new Loader_1_21_1();
 
     /** Method loader using 1.18.2 */
     private static final Loader loader1_18_2 = createLoader("1_18_2");

diff --git a/.../platforms/fabric/loader/Loader_1_21.java → ...latforms/fabric/loader/Loader_1_21_1.java b/.../platforms/fabric/loader/Loader_1_21.java → ...latforms/fabric/loader/Loader_1_21_1.java
@@ -36,13 +36,10 @@
 import java.util.*;
 
 /**
- * Method loader compiled using Minecraft 1.21.
+ * Method loader compiled using Minecraft 1.21.1.
  */
-@SuppressWarnings({
-        "DataFlowIssue", // Profile is not null on add action
-        "unused" // Actually used, just via reflection
-})
-public class Loader_1_21 implements Loader {
+@SuppressWarnings("DataFlowIssue") // Profile is not null on add action
+public class Loader_1_21_1 implements Loader {
 
     @Override
     @NotNull
@@ -292,10 +289,6 @@ private static class Register1_19_3 {
 
         static final Map<TabList.Action, EnumSet<ClientboundPlayerInfoUpdatePacket.Action>> actionMap = createActionMap();
 
-        public static EnumSet<ClientboundPlayerInfoUpdatePacket.Action> convertAction(TabList.Action action) {
-            return EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.valueOf(action.name()));
-        }
-
         private static Map<TabList.Action, EnumSet<ClientboundPlayerInfoUpdatePacket.Action>> createActionMap() {
             Map<TabList.Action, EnumSet<ClientboundPlayerInfoUpdatePacket.Action>> actions = new EnumMap<>(TabList.Action.class);
             actions.put(TabList.Action.ADD_PLAYER, EnumSet.allOf(ClientboundPlayerInfoUpdatePacket.Action.class));

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -21,7 +21,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"
+      "1.21", "1.21.1"
     ]
   },
   "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_1 (767),
     V1_21   (767),
     V1_20_6 (766),
     V1_20_5 (766),