carpet client synchronizations and protocols

src/main/java/carpet/helpers/ClientNetworkHandler.java

@@ -1,59 +0,0 @@
-package carpet.helpers;
-
-import carpet.CarpetServer;
-import carpet.CarpetSettings;
-import carpet.settings.ParsedRule;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.PacketByteBuf;
-
-public class ClientNetworkHandler
-{
-    public static void handleData(Identifier channel, PacketByteBuf data)
-    {
-        if (CarpetServer.CARPET_CHANNEL.equals(channel) && data != null)
-        {
-            int id = data.readVarInt();
-            
-            if (id == 1)
-                setOnJoinInfo(data);
-            else if (id == 2)
-                updateRule(data);
-            else if (id == 3)
-                updateTickRateClient(data);
-        }
-    }
-    
-    private static void setOnJoinInfo(PacketByteBuf data)
-    {
-        CompoundTag compound = data.readCompoundTag();
-        if (compound == null) return;
-        
-        TickSpeed.tickrate(compound.getFloat("Tickrate"));
-        
-        ListTag rulesList = compound.getList("rules", 10);
-        for (Tag tag : rulesList)
-        {
-            CompoundTag ruleNBT = (CompoundTag) tag;
-            String rule = ruleNBT.getString("rule");
-            String value = ruleNBT.getString("value");
-            CarpetServer.settingsManager.getRule(rule).set(null, value);
-        }
-    }
-    
-    private static void updateRule(PacketByteBuf data)
-    {
-        String rule = data.readString();
-        String newValue = data.readString();
-        CarpetServer.settingsManager.getRule(rule).set(null, newValue);
-    }
-    
-    private static void updateTickRateClient(PacketByteBuf data)
-    {
-        float rate = data.readFloat();
-        TickSpeed.tickrate(rate);
-    }
-}

src/main/java/carpet/helpers/ServerNetworkHandler.java

@@ -1,66 +0,0 @@
-package carpet.helpers;
-
-import carpet.CarpetServer;
-import carpet.CarpetSettings;
-import carpet.settings.ParsedRule;
-import io.netty.buffer.Unpooled;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.util.PacketByteBuf;
-
-public class ServerNetworkHandler
-{
-    public static void onPlayerJoin(ServerPlayerEntity playerEntity)
-    {
-        CompoundTag data = new CompoundTag();
-        
-        data.putFloat("Tickrate", TickSpeed.tickrate);
-        
-        ListTag rulesList = new ListTag();
-        for (ParsedRule<?> rule : CarpetServer.settingsManager.getRules())
-        {
-            CompoundTag ruleNBT = new CompoundTag();
-            
-            ruleNBT.putString("rule" ,rule.name);
-            ruleNBT.putString("value", rule.getAsString());
-            ruleNBT.putString("default", rule.defaultAsString);
-            rulesList.add(ruleNBT);
-        }
-        data.put("rules", rulesList);
-        PacketByteBuf packetBuf = new PacketByteBuf(Unpooled.buffer());
-        packetBuf.writeVarInt(1);
-        packetBuf.writeCompoundTag(data);
-        playerEntity.networkHandler.sendPacket(new CustomPayloadS2CPacket(CarpetServer.CARPET_CHANNEL, packetBuf));
-    }
-    
-    public static void sendUpdateToClient(String rule, String newValue, ServerCommandSource source)
-    {
-        PacketByteBuf data = new PacketByteBuf(Unpooled.buffer());
-        
-        data.writeVarInt(2);
-        data.writeString(rule);
-        data.writeString(newValue);
-        for (ServerPlayerEntity player : source.getMinecraftServer().getPlayerManager().getPlayerList())
-        {
-            player.networkHandler.sendPacket(new CustomPayloadS2CPacket(CarpetServer.CARPET_CHANNEL, data));
-        }
-    }
-    
-    public static void sendTickRateToPlayers(float rate)
-    {
-        PacketByteBuf data = new PacketByteBuf(Unpooled.buffer());
-        data.writeVarInt(3);
-        data.writeFloat(rate);
-        if (CarpetServer.minecraft_server != null)
-        {
-            for (ServerPlayerEntity player : CarpetServer.minecraft_server.getPlayerManager().getPlayerList())
-            {
-                player.networkHandler.sendPacket(new CustomPayloadS2CPacket(CarpetServer.CARPET_CHANNEL, data));
-            }
-        }
-    }
-}

src/main/java/carpet/helpers/TickSpeed.java

@@ -5,6 +5,7 @@ import java.util.Map;
 import java.util.function.BiConsumer;
 
 import carpet.CarpetServer;
+import carpet.network.ServerNetworkHandler;
 import carpet.utils.Messenger;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
@@ -177,7 +178,7 @@ public class TickSpeed
         }
     }
     
-    public static void tickrate(float rate)
+    public static void tickrate(float rate, boolean update)
     {
         tickrate = rate;
         long mspt = (long)(1000.0 / tickrate);
@@ -189,7 +190,7 @@ public class TickSpeed
         
         TickSpeed.mspt = (float)mspt;
         
-        notifyTickrateListeners("carpet");
+        if (update) notifyTickrateListeners("carpet");
     }
     
     private static void tickrateChanged(String modId, float rate)
@@ -221,7 +222,7 @@ public class TickSpeed
 	            }
 	        }
         }
-        ServerNetworkHandler.sendTickRateToPlayers(tickrate);
+        ServerNetworkHandler.updateTickSpeedToConnectedPlayers();
     }
     
     public static BiConsumer<String, Float> addTickrateListener(String modId, BiConsumer<String, Float> tickrateListener)