fixed client ignorance bug

Tigereye504 · May 19, 2021 · 932aded · 932aded
1 parent 7bc1a9f
commit 932aded
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 5 deletions.
diff --git a/src/main/java/net/tigereye/chestcavity/ChestCavity.java b/src/main/java/net/tigereye/chestcavity/ChestCavity.java
@@ -50,10 +50,10 @@ public void onInitialize() {
 		CCStatusEffects.register();
 		CCTagOrgans.init();
 		CCCommands.register();
+		CCNetworkingPackets.register();
 		ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(new OrganManager());
 		ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(new GeneratedChestCavityTypeManager());
 		ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(new GeneratedChestCavityAssignmentManager());
-		CCNetworkingPackets.register();
 		CrossModContent.register();
 
 

diff --git a/src/main/java/net/tigereye/chestcavity/ChestCavityClient.java b/src/main/java/net/tigereye/chestcavity/ChestCavityClient.java
@@ -3,6 +3,11 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.minecraft.resource.ResourceType;
+import net.tigereye.chestcavity.chestcavities.organs.OrganManager;
+import net.tigereye.chestcavity.chestcavities.types.json.GeneratedChestCavityAssignmentManager;
+import net.tigereye.chestcavity.chestcavities.types.json.GeneratedChestCavityTypeManager;
 import net.tigereye.chestcavity.interfaces.ChestCavityEntity;
 import net.tigereye.chestcavity.listeners.KeybindingClientListeners;
 import net.tigereye.chestcavity.registration.CCKeybindings;

diff --git a/src/main/java/net/tigereye/chestcavity/ChestCavityServer.java b/src/main/java/net/tigereye/chestcavity/ChestCavityServer.java
@@ -1,7 +1,13 @@
 package net.tigereye.chestcavity;
 
 import net.fabricmc.api.DedicatedServerModInitializer;
+import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.minecraft.resource.ResourceType;
+import net.tigereye.chestcavity.chestcavities.organs.OrganManager;
+import net.tigereye.chestcavity.chestcavities.types.json.GeneratedChestCavityAssignmentManager;
+import net.tigereye.chestcavity.chestcavities.types.json.GeneratedChestCavityTypeManager;
 import net.tigereye.chestcavity.interfaces.ChestCavityEntity;
 import net.tigereye.chestcavity.registration.CCNetworkingPackets;
 import net.tigereye.chestcavity.util.NetworkUtil;
@@ -14,7 +20,7 @@ public class ChestCavityServer implements DedicatedServerModInitializer{
     public void onInitializeServer() {
         ServerPlayNetworking.registerGlobalReceiver(CCNetworkingPackets.RECEIVED_UPDATE_PACKET_ID, (server, player, handler, buf, sender) -> {
             Optional<ChestCavityEntity> optional = ChestCavityEntity.of(player);
-            optional.ifPresent(chestCavityEntity -> NetworkUtil.ReadChestCavityReceiveUpdatePacket(chestCavityEntity.getChestCavityInstance()));
+            optional.ifPresent(chestCavityEntity -> NetworkUtil.ReadChestCavityReceivedUpdatePacket(chestCavityEntity.getChestCavityInstance()));
         });
         ServerPlayNetworking.registerGlobalReceiver(CCNetworkingPackets.HOTKEY_PACKET_ID, (server, player, handler, buf, sender) -> {
             Optional<ChestCavityEntity> optional = ChestCavityEntity.of(player);

diff --git a/src/main/java/net/tigereye/chestcavity/chestcavities/organs/OrganData.java b/src/main/java/net/tigereye/chestcavity/chestcavities/organs/OrganData.java
@@ -7,5 +7,5 @@
 
 public class OrganData {
     public boolean pseudoOrgan;
-    public Map<Identifier,Float> organScores;
+    public Map<Identifier,Float> organScores = new HashMap<>();
 }
diff --git a/src/main/java/net/tigereye/chestcavity/registration/CCNetworkingPackets.java b/src/main/java/net/tigereye/chestcavity/registration/CCNetworkingPackets.java
@@ -1,36 +1,50 @@
 package net.tigereye.chestcavity.registration;
 
+import net.fabricmc.fabric.api.client.networking.v1.ClientLoginNetworking;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents;
+import net.fabricmc.fabric.api.networking.v1.ServerLoginNetworking;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.network.PacketByteBuf;
 import net.minecraft.util.Identifier;
 import net.tigereye.chestcavity.ChestCavity;
 import net.tigereye.chestcavity.interfaces.ChestCavityEntity;
 import net.tigereye.chestcavity.util.NetworkUtil;
 
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 
 public class CCNetworkingPackets {
+    public static final Identifier ORGAN_DATA_PACKET_ID = new Identifier(ChestCavity.MODID,"organ_data");
     public static final Identifier UPDATE_PACKET_ID = new Identifier(ChestCavity.MODID,"update");
     public static final Identifier RECEIVED_UPDATE_PACKET_ID = new Identifier(ChestCavity.MODID,"received_update");
 
     public static final Identifier HOTKEY_PACKET_ID = new Identifier(ChestCavity.MODID, "hotkey");
 
     public static void register(){
+        ServerLoginConnectionEvents.QUERY_START.register(NetworkUtil::sendOrganDataPacket);
         ServerPlayNetworking.registerGlobalReceiver(CCNetworkingPackets.RECEIVED_UPDATE_PACKET_ID, (server, player, handler, buf, sender) -> {
             Optional<ChestCavityEntity> optional = ChestCavityEntity.of(player);
-            optional.ifPresent(chestCavityEntity -> NetworkUtil.ReadChestCavityReceiveUpdatePacket(chestCavityEntity.getChestCavityInstance()));
+            optional.ifPresent(chestCavityEntity -> NetworkUtil.ReadChestCavityReceivedUpdatePacket(chestCavityEntity.getChestCavityInstance()));
         });
 
         ServerPlayNetworking.registerGlobalReceiver(CCNetworkingPackets.HOTKEY_PACKET_ID, (server, player, handler, buf, sender) -> {
             Optional<ChestCavityEntity> optional = ChestCavityEntity.of(player);
             optional.ifPresent(chestCavityEntity -> NetworkUtil.ReadChestCavityHotkeyPacket(chestCavityEntity.getChestCavityInstance(),buf));
         });
+        ServerLoginNetworking.registerGlobalReceiver(CCNetworkingPackets.ORGAN_DATA_PACKET_ID,(server, handler, understood, buf, synchronizer, sender) -> {
+        });
     }
 
     public static void registerClient(){
         ClientPlayNetworking.registerGlobalReceiver(CCNetworkingPackets.UPDATE_PACKET_ID, (client, handler, buf, responseSender) -> {
             Optional<ChestCavityEntity> optional = ChestCavityEntity.of(client.cameraEntity);
             optional.ifPresent(chestCavityEntity -> NetworkUtil.ReadChestCavityUpdatePacket(chestCavityEntity.getChestCavityInstance(), buf));
         });
+        ClientLoginNetworking.registerGlobalReceiver(CCNetworkingPackets.ORGAN_DATA_PACKET_ID, (client, handler, buf, responseSender) -> {
+            NetworkUtil.readOrganDataPacket(buf);
+            return CompletableFuture.completedFuture(PacketByteBufs.empty());
+        });
     }
 }
diff --git a/src/main/java/net/tigereye/chestcavity/util/NetworkUtil.java b/src/main/java/net/tigereye/chestcavity/util/NetworkUtil.java
@@ -2,12 +2,18 @@
 
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.fabricmc.fabric.api.networking.v1.ServerLoginNetworking;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.ServerLoginNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 import net.tigereye.chestcavity.ChestCavity;
 import net.tigereye.chestcavity.chestcavities.instance.ChestCavityInstance;
+import net.tigereye.chestcavity.chestcavities.organs.OrganData;
+import net.tigereye.chestcavity.chestcavities.organs.OrganManager;
 import net.tigereye.chestcavity.listeners.OrganActivationListeners;
 import net.tigereye.chestcavity.registration.CCNetworkingPackets;
 
@@ -58,7 +64,7 @@ public static boolean SendS2CChestCavityUpdatePacket(ChestCavityInstance cc, Pac
         return false;
     }
 
-    public static void ReadChestCavityReceiveUpdatePacket(ChestCavityInstance cc) {
+    public static void ReadChestCavityReceivedUpdatePacket(ChestCavityInstance cc) {
         cc.updatePacket = null;
     }
 
@@ -82,4 +88,40 @@ public static void SendC2SChestCavityHotkeyPacket(Identifier organScore){
         ClientPlayNetworking.send(CCNetworkingPackets.HOTKEY_PACKET_ID, NetworkUtil.WriteChestCavityHotkeyPacket(organScore));
     }
 
+    public static void sendOrganDataPacket(ServerLoginNetworkHandler serverLoginNetworkHandler, MinecraftServer minecraftServer, PacketSender packetSender, ServerLoginNetworking.LoginSynchronizer loginSynchronizer) {
+        PacketByteBuf buf = PacketByteBufs.create();
+        buf.writeInt(OrganManager.GeneratedOrganData.size());
+        OrganManager.GeneratedOrganData.forEach((id,data) -> {
+            buf.writeIdentifier(id);
+            buf.writeBoolean(data.pseudoOrgan);
+            buf.writeInt(data.organScores.size());
+            data.organScores.forEach((ability,score) -> {
+                buf.writeIdentifier(ability);
+                buf.writeFloat(score);
+            });
+        });
+        packetSender.sendPacket(CCNetworkingPackets.ORGAN_DATA_PACKET_ID,buf);
+    }
+
+    public static boolean readOrganDataPacket(PacketByteBuf buf){
+        OrganManager.GeneratedOrganData.clear();
+        try {
+            int organCount = buf.readInt();
+            for (int i = 0; i < organCount; i++) {
+                Identifier organID = buf.readIdentifier();
+                OrganData organData = new OrganData();
+                organData.pseudoOrgan = buf.readBoolean();
+                int organAbilityCount = buf.readInt();
+                for (int j = 0; j < organAbilityCount; j++) {
+                    organData.organScores.put(buf.readIdentifier(), buf.readFloat());
+                }
+                OrganManager.GeneratedOrganData.put(organID, organData);
+            }
+            ChestCavity.LOGGER.info("loaded "+organCount+" organs from server");
+        }
+        catch(Exception e){
+            return false;
+        }
+        return true;
+    }
 }