Update to 1.20.5

Author: henkelmax

changelog.md

@@ -1 +1 @@
-- Added arabic translation
+- Updated to 1.20.5

gradle.properties

@@ -1,18 +1,20 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 
+java_version=21
+
 mod_loader=fabric
-minecraft_version=1.20.4
-minecraft_dependency=1.20.4
-fabric_loader_version=0.14.25
-fabric_loader_dependency=>=0.14.25
-fabric_api_version=0.91.1+1.20.4
-fabric_api_dependency_breaks=<0.91.1+1.20.4
+minecraft_version=1.20.5
+minecraft_dependency=1.20.5
+fabric_loader_version=0.15.10
+fabric_loader_dependency=>=0.15.10
+fabric_api_version=0.97.5+1.20.5
+fabric_api_dependency_breaks=<0.97.5+1.20.5
 
 mod_compatibility_version=1
 
 # Mod information
-mod_version=1.20.4-1.0.6
+mod_version=1.20.5-1.0.6
 mod_id=status
 mod_display_name=Status
 

src/main/java/de/maxhenkel/status/Status.java

@@ -2,10 +2,13 @@
 
 import de.maxhenkel.configbuilder.ConfigBuilder;
 import de.maxhenkel.status.config.ServerConfig;
+import de.maxhenkel.status.net.PlayerStatePacket;
+import de.maxhenkel.status.net.PlayerStatesPacket;
 import de.maxhenkel.status.playerstate.PlayerStateManager;
 import io.netty.buffer.Unpooled;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
+import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerLoginNetworking;
 import net.fabricmc.loader.api.FabricLoader;
@@ -38,6 +41,11 @@ public void onInitialize() {
         } catch (Exception e) {
             LOGGER.error("Failed to read compatibility version");
         }
+
+        PayloadTypeRegistry.playC2S().register(PlayerStatePacket.PLAYER_STATE, PlayerStatePacket.CODEC);
+        PayloadTypeRegistry.playS2C().register(PlayerStatePacket.PLAYER_STATE, PlayerStatePacket.CODEC);
+        PayloadTypeRegistry.playS2C().register(PlayerStatesPacket.PLAYER_STATES, PlayerStatesPacket.CODEC);
+
         STATE_MANAGER = new PlayerStateManager();
 
         ServerLifecycleEvents.SERVER_STARTING.register(server -> {

src/main/java/de/maxhenkel/status/net/NetManager.java

@@ -1,14 +1,15 @@
 package de.maxhenkel.status.net;
 
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 
-public interface Packet<T extends Packet> {
+public interface Packet<T extends Packet<T>> extends CustomPacketPayload {
 
-    ResourceLocation getID();
+    T fromBytes(RegistryFriendlyByteBuf buf);
 
-    T fromBytes(FriendlyByteBuf buf);
+    void toBytes(RegistryFriendlyByteBuf buf);
 
-    void toBytes(FriendlyByteBuf buf);
+    @Override
+    Type<T> type();
 
 }

src/main/java/de/maxhenkel/status/net/Packet.java

@@ -2,12 +2,28 @@
 
 import de.maxhenkel.status.Status;
 import de.maxhenkel.status.playerstate.PlayerState;
-import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
 
 public class PlayerStatePacket implements Packet<PlayerStatePacket> {
 
-    public static final ResourceLocation PLAYER_STATE = new ResourceLocation(Status.MODID, "state");
+    public static final Type<PlayerStatePacket> PLAYER_STATE = new CustomPacketPayload.Type<>(new ResourceLocation(Status.MODID, "state"));
+
+    public static final StreamCodec<RegistryFriendlyByteBuf, PlayerStatePacket> CODEC = new StreamCodec<>() {
+        @Override
+        public void encode(RegistryFriendlyByteBuf buf, PlayerStatePacket packet) {
+            packet.toBytes(buf);
+        }
+
+        @Override
+        public PlayerStatePacket decode(RegistryFriendlyByteBuf buf) {
+            PlayerStatePacket packet = new PlayerStatePacket();
+            packet.fromBytes(buf);
+            return packet;
+        }
+    };
 
     private PlayerState playerState;
 
@@ -24,19 +40,19 @@ public PlayerState getPlayerState() {
     }
 
     @Override
-    public ResourceLocation getID() {
-        return PLAYER_STATE;
-    }
-
-    @Override
-    public PlayerStatePacket fromBytes(FriendlyByteBuf buf) {
+    public PlayerStatePacket fromBytes(RegistryFriendlyByteBuf buf) {
         playerState = PlayerState.fromBytes(buf);
         return this;
     }
 
     @Override
-    public void toBytes(FriendlyByteBuf buf) {
+    public void toBytes(RegistryFriendlyByteBuf buf) {
         playerState.toBytes(buf);
     }
 
+    @Override
+    public Type<PlayerStatePacket> type() {
+        return PLAYER_STATE;
+    }
+
 }

src/main/java/de/maxhenkel/status/net/PlayerStatePacket.java

@@ -2,7 +2,9 @@
 
 import de.maxhenkel.status.Status;
 import de.maxhenkel.status.playerstate.PlayerState;
-import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.HashMap;
@@ -11,9 +13,23 @@
 
 public class PlayerStatesPacket implements Packet<PlayerStatesPacket> {
 
-    private Map<UUID, PlayerState> playerStates;
+    public static final Type<PlayerStatesPacket> PLAYER_STATES = new CustomPacketPayload.Type<>(new ResourceLocation(Status.MODID, "states"));
+
+    public static final StreamCodec<RegistryFriendlyByteBuf, PlayerStatesPacket> CODEC = new StreamCodec<>() {
+        @Override
+        public void encode(RegistryFriendlyByteBuf buf, PlayerStatesPacket packet) {
+            packet.toBytes(buf);
+        }
 
-    public static final ResourceLocation PLAYER_STATES = new ResourceLocation(Status.MODID, "states");
+        @Override
+        public PlayerStatesPacket decode(RegistryFriendlyByteBuf buf) {
+            PlayerStatesPacket packet = new PlayerStatesPacket();
+            packet.fromBytes(buf);
+            return packet;
+        }
+    };
+
+    private Map<UUID, PlayerState> playerStates;
 
     public PlayerStatesPacket() {
 
@@ -28,12 +44,7 @@ public Map<UUID, PlayerState> getPlayerStates() {
     }
 
     @Override
-    public ResourceLocation getID() {
-        return PLAYER_STATES;
-    }
-
-    @Override
-    public PlayerStatesPacket fromBytes(FriendlyByteBuf buf) {
+    public PlayerStatesPacket fromBytes(RegistryFriendlyByteBuf buf) {
         playerStates = new HashMap<>();
         int count = buf.readInt();
         for (int i = 0; i < count; i++) {
@@ -45,11 +56,16 @@ public PlayerStatesPacket fromBytes(FriendlyByteBuf buf) {
     }
 
     @Override
-    public void toBytes(FriendlyByteBuf buf) {
+    public void toBytes(RegistryFriendlyByteBuf buf) {
         buf.writeInt(playerStates.size());
         for (Map.Entry<UUID, PlayerState> entry : playerStates.entrySet()) {
             entry.getValue().toBytes(buf);
         }
     }
 
+    @Override
+    public Type<PlayerStatesPacket> type() {
+        return PLAYER_STATES;
+    }
+
 }

src/main/java/de/maxhenkel/status/net/PlayerStatesPacket.java

@@ -3,9 +3,9 @@
 import de.maxhenkel.status.Status;
 import de.maxhenkel.status.StatusClient;
 import de.maxhenkel.status.events.ClientWorldEvents;
-import de.maxhenkel.status.net.NetManager;
 import de.maxhenkel.status.net.PlayerStatePacket;
 import de.maxhenkel.status.net.PlayerStatesPacket;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
@@ -27,10 +27,10 @@ public class ClientPlayerStateManager {
     public ClientPlayerStateManager() {
         state = getDefaultState();
         states = new HashMap<>();
-        NetManager.registerClientReceiver(PlayerStatePacket.class, (client, handler, responseSender, packet) -> {
+        ClientPlayNetworking.registerGlobalReceiver(PlayerStatePacket.PLAYER_STATE, (packet, context) -> {
             states.put(packet.getPlayerState().getPlayer(), packet.getPlayerState());
         });
-        NetManager.registerClientReceiver(PlayerStatesPacket.class, (client, handler, responseSender, packet) -> {
+        ClientPlayNetworking.registerGlobalReceiver(PlayerStatesPacket.PLAYER_STATES, (packet, context) -> {
             states = packet.getPlayerStates();
         });
         ClientWorldEvents.DISCONNECT.register(this::onDisconnect);
@@ -105,7 +105,7 @@ private void showChangeStatusMessage() {
     }
 
     public void syncOwnState() {
-        NetManager.sendToServer(new PlayerStatePacket(state));
+        ClientPlayNetworking.send(new PlayerStatePacket(state));
     }
 
     @Nullable

src/main/java/de/maxhenkel/status/playerstate/ClientPlayerStateManager.java

@@ -2,9 +2,9 @@
 
 import de.maxhenkel.status.Status;
 import de.maxhenkel.status.events.PlayerEvents;
-import de.maxhenkel.status.net.NetManager;
 import de.maxhenkel.status.net.PlayerStatePacket;
 import de.maxhenkel.status.net.PlayerStatesPacket;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket;
 import net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket;
@@ -25,11 +25,12 @@ public PlayerStateManager() {
         PlayerEvents.PLAYER_LOGGED_IN.register(this::notifyPlayer);
         PlayerEvents.PLAYER_SLEEP.register(this::onSleep);
 
-        NetManager.registerServerReceiver(PlayerStatePacket.class, (server, player, handler, responseSender, packet) -> {
+        ServerPlayNetworking.registerGlobalReceiver(PlayerStatePacket.PLAYER_STATE, (packet, context) -> {
+            ServerPlayer player = context.player();
             PlayerState state = packet.getPlayerState();
             state.setPlayer(player.getUUID());
             states.put(player.getUUID(), state);
-            broadcastState(server, state);
+            broadcastState(player.server, state);
         });
     }
 
@@ -64,12 +65,12 @@ private List<ServerPlayer> getNoSleepPlayers(MinecraftServer server) {
 
     private void broadcastState(MinecraftServer server, PlayerState state) {
         PlayerStatePacket packet = new PlayerStatePacket(state);
-        server.getPlayerList().getPlayers().forEach(p -> NetManager.sendToClient(p, packet));
+        server.getPlayerList().getPlayers().forEach(p -> ServerPlayNetworking.send(p, packet));
     }
 
     private void notifyPlayer(ServerPlayer player) {
         PlayerStatesPacket packet = new PlayerStatesPacket(states);
-        NetManager.sendToClient(player, packet);
+        ServerPlayNetworking.send(player, packet);
         broadcastState(player.server, new PlayerState(player.getUUID()));
     }