Fix SyncedKeybinds

Legacy-Edition-Minigames · Feb 24, 2024 · 1145598 · 1145598
1 parent 95f14b6
commit 1145598
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/net/kyrptonaught/serverutils/syncedKeybinds/SyncedKeybinds.java b/src/main/java/net/kyrptonaught/serverutils/syncedKeybinds/SyncedKeybinds.java
@@ -5,6 +5,7 @@
 import net.kyrptonaught.serverutils.ModuleWConfig;
 import net.kyrptonaught.serverutils.ServerUtilsMod;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.Identifier;
 
 public class SyncedKeybinds extends ModuleWConfig<SyncedKeybindsConfig> {
 
@@ -21,7 +22,7 @@ public SyncedKeybindsConfig createDefaultConfig() {
         return new SyncedKeybindsConfig();
     }
 
-    public static void keybindPressed(ServerPlayerEntity player, String keyPressed) {
+    public static void keybindPressed(ServerPlayerEntity player, Identifier keyPressed) {
         SyncedKeybindsConfig.KeybindConfigItem keybind = ServerUtilsMod.SyncedKeybindsModule.getConfig().keybinds.get(keyPressed);
         if (keybind != null)
             CMDHelper.executeAs(player, keybind.triggerCMD);

diff --git a/src/main/java/net/kyrptonaught/serverutils/syncedKeybinds/SyncedKeybindsConfig.java b/src/main/java/net/kyrptonaught/serverutils/syncedKeybinds/SyncedKeybindsConfig.java
@@ -2,20 +2,21 @@
 
 import net.kyrptonaught.serverutils.AbstractConfigFile;
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.util.Identifier;
 
 import java.util.HashMap;
 
 public class SyncedKeybindsConfig extends AbstractConfigFile {
 
-    public HashMap<String, KeybindConfigItem> keybinds = new HashMap<>();
+    public HashMap<Identifier, KeybindConfigItem> keybinds = new HashMap<>();
 
     public static class KeybindConfigItem {
         public String triggerCMD;
         public String keybinding;
         public String controllerBind;
 
-        public void writeToPacket(String id, PacketByteBuf packetByteBuf) {
-            packetByteBuf.writeString(id);
+        public void writeToPacket(Identifier id, PacketByteBuf packetByteBuf) {
+            packetByteBuf.writeIdentifier(id);
             packetByteBuf.writeString(keybinding);
             packetByteBuf.writeString(controllerBind);
         }

diff --git a/src/main/java/net/kyrptonaught/serverutils/syncedKeybinds/SyncedKeybindsNetworking.java b/src/main/java/net/kyrptonaught/serverutils/syncedKeybinds/SyncedKeybindsNetworking.java
@@ -16,15 +16,15 @@ public class SyncedKeybindsNetworking {
 
     public static void registerReceivePacket() {
         ServerPlayNetworking.registerGlobalReceiver(KEYBIND_PRESSED_PACKET, (server, player, serverPlayNetworkHandler, packetByteBuf, packetSender) -> {
-            String keybindId = packetByteBuf.readIdentifier().toString();
+            Identifier keybindId = packetByteBuf.readIdentifier();
 
             server.execute(() -> {
                 SyncedKeybinds.keybindPressed(player, keybindId);
             });
         });
     }
 
-    public static void syncKeybindsToClient(HashMap<String, SyncedKeybindsConfig.KeybindConfigItem> keybinds, PacketSender packetSender) {
+    public static void syncKeybindsToClient(HashMap<Identifier, SyncedKeybindsConfig.KeybindConfigItem> keybinds, PacketSender packetSender) {
         PacketByteBuf packetByteBuf = new PacketByteBuf(Unpooled.buffer());
         packetByteBuf.writeInt(keybinds.size());
         keybinds.forEach((s, keybindConfigItem) -> keybindConfigItem.writeToPacket(s, packetByteBuf));