diff --git a/src/main/java/ru/bclib/api/dataexchange/handler/HelloClient.java b/src/main/java/ru/bclib/api/dataexchange/handler/HelloClient.java index 63793b5b..2767ac8d 100644 --- a/src/main/java/ru/bclib/api/dataexchange/handler/HelloClient.java +++ b/src/main/java/ru/bclib/api/dataexchange/handler/HelloClient.java @@ -281,6 +281,10 @@ public class HelloClient extends DataHandler { @Override protected void runOnGameThread(Minecraft client, MinecraftServer server, boolean isClient) { + if (!Configs.CLIENT_CONFIG.getBoolean(Configs.MAIN_SYNC_CATEGORY, "enabled", true)) { + BCLib.LOGGER.info("Auto-Sync was disabled on the client."); + return; + } final String localBclibVersion = getBCLibVersion(); BCLib.LOGGER.info("Received Hello from Server. (client=" + localBclibVersion + ", server=" + bclibVersion + ")"); diff --git a/src/main/java/ru/bclib/api/dataexchange/handler/HelloServer.java b/src/main/java/ru/bclib/api/dataexchange/handler/HelloServer.java index b8d43f0e..6b2d40a6 100644 --- a/src/main/java/ru/bclib/api/dataexchange/handler/HelloServer.java +++ b/src/main/java/ru/bclib/api/dataexchange/handler/HelloServer.java @@ -86,6 +86,11 @@ public class HelloServer extends DataHandler { @Override protected void runOnGameThread(Minecraft client, MinecraftServer server, boolean isClient) { + if (!Configs.MAIN_CONFIG.getBoolean(Configs.MAIN_SYNC_CATEGORY, "enabled", true)) { + BCLib.LOGGER.info("Auto-Sync was disabled on the server."); + return; + } + String localBclibVersion = HelloClient.getBCLibVersion(); BCLib.LOGGER.info("Received Hello from Client. (server="+localBclibVersion+", client="+bclibVersion+")"); diff --git a/src/main/java/ru/bclib/api/dataexchange/handler/RequestFiles.java b/src/main/java/ru/bclib/api/dataexchange/handler/RequestFiles.java index 5292b252..cd94db0b 100644 --- a/src/main/java/ru/bclib/api/dataexchange/handler/RequestFiles.java +++ b/src/main/java/ru/bclib/api/dataexchange/handler/RequestFiles.java @@ -8,6 +8,7 @@ import net.minecraft.server.MinecraftServer; import ru.bclib.BCLib; import ru.bclib.api.dataexchange.DataHandler; import ru.bclib.api.dataexchange.DataHandlerDescriptor; +import ru.bclib.config.Configs; import java.util.ArrayList; import java.util.List; @@ -28,6 +29,15 @@ public class RequestFiles extends DataHandler { this.files = files; } + @Override + protected boolean prepareData(boolean isClient) { + if (!Configs.CLIENT_CONFIG.getBoolean(Configs.MAIN_SYNC_CATEGORY, "enabled", true)) { + BCLib.LOGGER.info("Auto-Sync was disabled on the client."); + return false; + } + return true; + } + @Override protected void serializeData(FriendlyByteBuf buf, boolean isClient) { newToken(); @@ -59,6 +69,11 @@ public class RequestFiles extends DataHandler { @Override protected void runOnGameThread(Minecraft client, MinecraftServer server, boolean isClient) { + if (!Configs.MAIN_CONFIG.getBoolean(Configs.MAIN_SYNC_CATEGORY, "enabled", true)) { + BCLib.LOGGER.info("Auto-Sync was disabled on the server."); + return; + } + List syncEntries = files .stream().map(asid -> AutoFileSyncEntry.findMatching(asid)) .filter(e -> e!=null) diff --git a/src/main/java/ru/bclib/api/dataexchange/handler/SendFiles.java b/src/main/java/ru/bclib/api/dataexchange/handler/SendFiles.java index 02300b7a..411e699c 100644 --- a/src/main/java/ru/bclib/api/dataexchange/handler/SendFiles.java +++ b/src/main/java/ru/bclib/api/dataexchange/handler/SendFiles.java @@ -39,7 +39,18 @@ public class SendFiles extends DataHandler { } public static boolean acceptFiles() { - return Configs.CLIENT_CONFIG.getBoolean(Configs.MAIN_SYNC_CATEGORY, "acceptFiles", true); + return Configs.CLIENT_CONFIG.getBoolean(Configs.MAIN_SYNC_CATEGORY, "acceptFiles", true) + && Configs.CLIENT_CONFIG.getBoolean(Configs.MAIN_SYNC_CATEGORY, "enabled", true); + } + + @Override + protected boolean prepareData(boolean isClient) { + if (!Configs.MAIN_CONFIG.getBoolean(Configs.MAIN_SYNC_CATEGORY, "enabled", true)) { + BCLib.LOGGER.info("Auto-Sync was disabled on the server."); + return false; + } + + return true; } @Override