From 7061419af0196bd86632ca5ae78ce81c8b5a121e Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Sat, 28 Oct 2023 21:33:26 +0200 Subject: [PATCH] fix config synchronization --- .../impl/config/ConfigurationManagerImpl.java | 7 ++++--- .../impl/config/net/SyncRequestHandler.java | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/ConfigurationManagerImpl.java b/src/main/java/com/falsepattern/lib/internal/impl/config/ConfigurationManagerImpl.java index 83c6b20..eb58ef2 100644 --- a/src/main/java/com/falsepattern/lib/internal/impl/config/ConfigurationManagerImpl.java +++ b/src/main/java/com/falsepattern/lib/internal/impl/config/ConfigurationManagerImpl.java @@ -161,8 +161,9 @@ public final class ConfigurationManagerImpl { } public static void receiveReply(DataInput input) throws IOException { - if (!AllConfigSyncEvent.postStart()) { - Share.LOG.warn("Config synchronization was cancelled by event."); + if (AllConfigSyncEvent.postStart()) { + Share.LOG.warn("All config synchronization was cancelled by event."); + return; } int count = input.readInt(); for (int i = 0; i < count; i++) { @@ -182,7 +183,7 @@ public final class ConfigurationManagerImpl { + serializedName); continue; } - if (!ConfigSyncEvent.postStart(clazz)) { + if (ConfigSyncEvent.postStart(clazz)) { input.skipBytes(dataSize); Share.LOG.warn("Config synchronization was cancelled by event for: " + serializedName); continue; diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/net/SyncRequestHandler.java b/src/main/java/com/falsepattern/lib/internal/impl/config/net/SyncRequestHandler.java index 2f5ff80..657e37e 100644 --- a/src/main/java/com/falsepattern/lib/internal/impl/config/net/SyncRequestHandler.java +++ b/src/main/java/com/falsepattern/lib/internal/impl/config/net/SyncRequestHandler.java @@ -24,12 +24,16 @@ import com.falsepattern.lib.internal.FalsePatternLib; import com.falsepattern.lib.internal.Share; import lombok.val; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayerMP; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import java.io.IOException; +import java.util.Objects; public class SyncRequestHandler implements IMessageHandler { @Override @@ -38,6 +42,12 @@ public class SyncRequestHandler implements IMessageHandler