Update to 1.21

Patbox · Jun 5, 2024 · 343bcc1 · 343bcc1
1 parent b4a1473
commit 343bcc1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,16 +4,15 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
 
-minecraft_version=1.20.5-rc2
-yarn_mappings=1.20.5-rc2+build.1
-loader_version=0.15.10
-
-#Fabric api
-fabric_version=0.97.3+1.20.5
+minecraft_version=1.21-pre2
+yarn_mappings=1.21-pre2+build.2
+loader_version=0.15.11
 
+# Fabric API
+fabric_version=0.99.4+1.21
 
 # Mod Properties
-	mod_version = 0.4.0+1.20.5
+	mod_version = 0.5.0+1.21
 	maven_group = eu.pb4
 	archives_base_name = sidebar-api
 

diff --git a/src/main/java/eu/pb4/sidebars/impl/SidebarAPIMod.java b/src/main/java/eu/pb4/sidebars/impl/SidebarAPIMod.java
@@ -21,7 +21,7 @@ public class SidebarAPIMod implements ModInitializer {
     @Override
     public void onInitialize() {
         for (int x = 0; x < 15; x++) {
-            String fakePlayerName = String.format("$pb§%s§r", Integer.toHexString(x));
+            String fakePlayerName = String.format("$.%s", Integer.toHexString(x));
             FAKE_PLAYER_NAMES.add(fakePlayerName);
         }
     }

diff --git a/src/main/java/eu/pb4/sidebars/mixin/ServerPlayNetworkHandlerMixin.java b/src/main/java/eu/pb4/sidebars/mixin/ServerPlayNetworkHandlerMixin.java
@@ -6,6 +6,7 @@
 import eu.pb4.sidebars.api.lines.SidebarLine;
 import eu.pb4.sidebars.impl.SidebarHolder;
 import net.minecraft.network.ClientConnection;
+import net.minecraft.network.DisconnectionInfo;
 import net.minecraft.network.packet.s2c.play.*;
 import net.minecraft.scoreboard.ScoreboardDisplaySlot;
 import net.minecraft.scoreboard.ServerScoreboard;
@@ -48,7 +49,7 @@ public ServerPlayNetworkHandlerMixin(MinecraftServer server, ClientConnection co
     }
 
     @Inject(method = "onDisconnected", at = @At("TAIL"))
-    private void sidebarApi$removeFromSidebars(Text reason, CallbackInfo ci) {
+    private void sidebarApi$removeFromSidebars(DisconnectionInfo info, CallbackInfo ci) {
         var handler = (ServerPlayNetworkHandler) (Object) this;
         for (SidebarInterface sidebar : new HashSet<>(this.sidebarApi$sidebars)) {
             sidebar.disconnected(handler);

diff --git a/src/testmod/java/eu/pb4/sidebarstest/TestMod.java b/src/testmod/java/eu/pb4/sidebarstest/TestMod.java
@@ -45,7 +45,7 @@ private static int test(CommandContext<ServerCommandSource> objectCommandContext
                                 null,
                                 null,
                                 null,
-                                Math.random() > 0.6 ? new Identifier("default") : Math.random() > 0.3 ? new Identifier("uniform") : new Identifier("alt")
+                                Math.random() > 0.6 ? Identifier.of("default") : Math.random() > 0.3 ? Identifier.of("uniform") : Identifier.of("alt")
                                 )
                 ), new StyledNumberFormat( StyleAccessor.invokeInit(
                         TextColor.fromRgb((int) (Math.random() * 0xFFFFFF)),
@@ -57,7 +57,7 @@ private static int test(CommandContext<ServerCommandSource> objectCommandContext
                         null,
                         null,
                         null,
-                        Math.random() > 0.6 ? new Identifier("default") : Math.random() > 0.3 ? new Identifier("uniform") : new Identifier("alt")
+                        Math.random() > 0.6 ? Identifier.of("default") : Math.random() > 0.3 ? Identifier.of("uniform") : Identifier.of("alt")
                 )));
             }
 
@@ -97,7 +97,7 @@ private static int test2(CommandContext<ServerCommandSource> objectCommandContex
                             null,
                             null,
                             null,
-                            Math.random() > 0.6 ? new Identifier("default") : Math.random() > 0.3 ? new Identifier("uniform") : new Identifier("alt")
+                            Math.random() > 0.6 ? Identifier.of("default") : Math.random() > 0.3 ? Identifier.of("uniform") : Identifier.of("alt")
                     )
             ));
 
@@ -130,7 +130,7 @@ private static int test3(CommandContext<ServerCommandSource> objectCommandContex
                             null,
                             null,
                             null,
-                            Math.random() > 0.6 ? new Identifier("default") : Math.random() > 0.3 ? new Identifier("uniform") : new Identifier("alt")
+                            Math.random() > 0.6 ? Identifier.of("default") : Math.random() > 0.3 ? Identifier.of("uniform") : Identifier.of("alt")
                     )
             ));
             int speed = (int) (Math.random() * 20);