fix networked config sync

fix #39
Glease · Jul 12, 2023 · 89f7a09 · 89f7a09
1 parent 7e7b26e
commit 89f7a09
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 22 deletions.
diff --git a/src/main/java/net/glease/tc4tweak/ClientProxy.java b/src/main/java/net/glease/tc4tweak/ClientProxy.java
@@ -10,6 +10,7 @@
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
+import cpw.mods.fml.common.network.FMLNetworkEvent;
 import net.glease.tc4tweak.asm.ASMCallhook;
 import net.glease.tc4tweak.asm.LoadingPlugin;
 import net.glease.tc4tweak.modules.researchBrowser.BrowserPaging;
@@ -31,7 +32,6 @@
 import thaumcraft.common.config.ConfigItems;
 
 public class ClientProxy extends CommonProxy {
-    static final FMLEventHandler instance = new FMLEventHandler();
     static long lastScroll = 0;
     static Field fieldPage = null;
     static Field fieldLastPage = null;
@@ -41,6 +41,8 @@ public class ClientProxy extends CommonProxy {
     private static final int mPrevX = 261, mPrevY = 189, mNextX = -17, mNextY = 189;
     private static final int paneWidth = 256, paneHeight = 181;
 
+    private long updateCounter = 0;
+
     public static void handleMouseInput(GuiResearchTable screen) {
         if (fieldLastPage == null || fieldPage == null || methodPlayScroll == null) return;
         final int dwheel = Mouse.getEventDWheel();
@@ -98,6 +100,11 @@ public static void handleMouseInput(GuiResearchRecipe screen) {
         }
     }
 
+    public ClientProxy() {
+        super();
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
     @Override
     public void preInit(FMLPreInitializationEvent e) {
         super.preInit(e);
@@ -124,8 +131,6 @@ public void preInit(FMLPreInitializationEvent e) {
             System.err.println("Cannot find thaumcraft fields. Research page scrolling will not properly function!");
             err.printStackTrace();
         }
-        MinecraftForge.EVENT_BUS.register(this);
-        FMLCommonHandler.instance().bus().register(instance);
         final IResourceManager resourceManager = Minecraft.getMinecraft().getResourceManager();
         if (resourceManager instanceof IReloadableResourceManager) {
             //noinspection Convert2Lambda
@@ -161,7 +166,6 @@ public void postInit(FMLPostInitializationEvent e) {
         } catch (ReflectiveOperationException ignored) {
             // WG is probably not installed, ignoring
         }
-        FMLCommonHandler.instance().bus().register(this);
     }
 
     @SubscribeEvent
@@ -183,17 +187,20 @@ else if (e.itemStack.getItem() == ConfigItems.itemWandCasting) {
         }
     }
 
-    public static class FMLEventHandler {
-        private long updateCounter = 0;
-
-        @SubscribeEvent
-        public void onTickEnd(TickEvent.ClientTickEvent e) {
-            if (e.phase == TickEvent.Phase.END) {
-                if (++updateCounter > ConfigurationHandler.INSTANCE.getUpdateInterval()) {
-                    updateCounter = 0;
-                    ASMCallhook.updatePostponed();
-                }
+    @SubscribeEvent
+    public void onTickEnd(TickEvent.ClientTickEvent e) {
+        if (e.phase == TickEvent.Phase.END) {
+            if (++updateCounter > ConfigurationHandler.INSTANCE.getUpdateInterval()) {
+                updateCounter = 0;
+                ASMCallhook.updatePostponed();
             }
         }
     }
+
+    @SubscribeEvent
+    public void onServerConnected(FMLNetworkEvent.ClientConnectedToServerEvent e) {
+        if (!e.isLocal) {
+            NetworkedConfiguration.resetClient();
+        }
+    }
 }
diff --git a/src/main/java/net/glease/tc4tweak/CommonProxy.java b/src/main/java/net/glease/tc4tweak/CommonProxy.java
@@ -29,6 +29,10 @@
 import thaumcraft.common.entities.projectile.EntityPrimalArrow;
 
 public class CommonProxy {
+    public CommonProxy() {
+        FMLCommonHandler.instance().bus().register(this);
+    }
+
     public void preInit(FMLPreInitializationEvent e) {
         ConfigurationHandler.INSTANCE.init(e.getSuggestedConfigurationFile());
 
@@ -44,8 +48,7 @@ public void preInit(FMLPreInitializationEvent e) {
 
     public void serverStarted(FMLServerStartedEvent e) {
         FlushableCache.enableAll(true);
-        NetworkedConfiguration.reset();
-        FMLCommonHandler.instance().bus().register(this);
+        NetworkedConfiguration.resetServer();
     }
 
     public void init(FMLInitializationEvent e) {
@@ -93,7 +96,8 @@ private void addDummyCategories(int amount, String categoryPrefix) {
 
     @SubscribeEvent
     public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent e) {
-        if (e.player instanceof EntityPlayerMP && !TC4Tweak.INSTANCE.isAllowAll()) {
+        if (e.player instanceof EntityPlayerMP && !((EntityPlayerMP) e.player).playerNetServerHandler.netManager.isLocalChannel()) {
+            // no point sending config over to a local client
             TC4Tweak.INSTANCE.CHANNEL.sendTo(new MessageSendConfiguration(), (EntityPlayerMP) e.player);
             TC4Tweak.INSTANCE.CHANNEL.sendTo(new MessageSendConfigurationV2(), (EntityPlayerMP) e.player);
         }

diff --git a/src/main/java/net/glease/tc4tweak/network/MessageSendConfigurationV2.java b/src/main/java/net/glease/tc4tweak/network/MessageSendConfigurationV2.java
@@ -20,12 +20,12 @@ public MessageSendConfigurationV2() {
 
     @Override
     public void fromBytes(ByteBuf buf) {
-        ByteBufUtils.writeTag(buf, tag);
+        tag = ByteBufUtils.readTag(buf);
     }
 
     @Override
     public void toBytes(ByteBuf buf) {
-        tag = ByteBufUtils.readTag(buf);
+        ByteBufUtils.writeTag(buf, tag);
     }
 
     @Override

diff --git a/src/main/java/net/glease/tc4tweak/network/NetworkedConfiguration.java b/src/main/java/net/glease/tc4tweak/network/NetworkedConfiguration.java
@@ -4,17 +4,22 @@
 
 public class NetworkedConfiguration {
     static boolean checkWorkbenchRecipes = true;
-    static boolean smallerJar = true;
+    static boolean smallerJar = false;
 
     public static boolean isCheckWorkbenchRecipes() {
         return checkWorkbenchRecipes;
     }
 
-    public static void reset() {
+    public static void resetServer() {
         checkWorkbenchRecipes = ConfigurationHandler.INSTANCE.isCheckWorkbenchRecipes();
         smallerJar = ConfigurationHandler.INSTANCE.isSmallerJars();
     }
 
+    public static void resetClient() {
+        checkWorkbenchRecipes = ConfigurationHandler.INSTANCE.isCheckWorkbenchRecipes();
+        smallerJar = false;
+    }
+
     public static boolean isSmallerJar() {
         return smallerJar;
     }

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.5.12
+1.5.13