diff --git a/src/main/java/ru/bclib/BCLib.java b/src/main/java/ru/bclib/BCLib.java index d284d125..75b13d06 100644 --- a/src/main/java/ru/bclib/BCLib.java +++ b/src/main/java/ru/bclib/BCLib.java @@ -34,7 +34,6 @@ public class BCLib implements ModInitializer { TagAPI.init(); CraftingRecipes.init(); WorldDataAPI.registerModCache(MOD_ID); - Configs.save(); DataExchangeAPI.registerDescriptors(List.of( HelloClient.DESCRIPTOR, @@ -42,6 +41,8 @@ public class BCLib implements ModInitializer { RequestFiles.DESCRIPTOR, SendFiles.DESCRIPTOR )); + + Configs.save(); } public static boolean isDevEnvironment() { 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 f57dd392..218394ce 100644 --- a/src/main/java/ru/bclib/api/dataexchange/handler/HelloClient.java +++ b/src/main/java/ru/bclib/api/dataexchange/handler/HelloClient.java @@ -73,6 +73,7 @@ public class HelloClient extends DataHandler { BCLib.LOGGER.info(" - Listing Mod " + modID + " v" + ver); } } else { + BCLib.LOGGER.info("Server will not list Mods."); buf.writeInt(0); } @@ -92,6 +93,7 @@ public class HelloClient extends DataHandler { BCLib.LOGGER.info(" - Offering File " + entry); } } else { + BCLib.LOGGER.info("Server will not offer Configs."); buf.writeInt(0); } } @@ -141,20 +143,21 @@ public class HelloClient extends DataHandler { BCLib.LOGGER.info(" - " + e.getKey() + " (client="+ver+", server="+ver+")"); } - BCLib.LOGGER.info("Server offered Files to sync."); + if (autoSyncedFiles.size()>0) { + BCLib.LOGGER.info("Files offered by Server:"); + } + final String requestText = SendFiles.acceptFiles()?"requesting":"differs"; for (DataExchange.AutoSyncTriple e : autoSyncedFiles) { boolean willRequest = false; if (e.third == null) { - filesToRequest.add(new AutoSyncID(e.first.modID, e.first.uniqueID)); willRequest = true; - BCLib.LOGGER.info(" - File " + e + ": Does not exist on client."); + filesToRequest.add(new AutoSyncID(e.first.modID, e.first.uniqueID)); } else if (e.third.needTransfer.test(e.third.getFileHash(), e.first, e.second)) { willRequest = true; filesToRequest.add(new AutoSyncID(e.first.modID, e.first.uniqueID)); - BCLib.LOGGER.info(" - File " + e + ": Needs Transfer"); } - BCLib.LOGGER.info(" - " + e + ": " + (willRequest ? " (requesting)":"")); + BCLib.LOGGER.info(" - " + e + ": " + (willRequest ? (" ("+requestText+")" ):"")); } if (filesToRequest.size()>0 && SendFiles.acceptFiles()) { 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 4793d648..545345cc 100644 --- a/src/main/java/ru/bclib/api/dataexchange/handler/HelloServer.java +++ b/src/main/java/ru/bclib/api/dataexchange/handler/HelloServer.java @@ -65,6 +65,7 @@ public class HelloServer extends DataHandler { @Override protected void serializeData(FriendlyByteBuf buf) { + BCLib.LOGGER.info("Sending hello to server."); buf.writeInt(DataFixerAPI.getModVersion(HelloClient.getBCLibVersion())); } @@ -80,6 +81,8 @@ public class HelloServer extends DataHandler { if (Configs.MAIN_CONFIG.getBoolean(Configs.MAIN_SYNC_CATEGORY, "enabled", true)) { reply(new HelloClient(), server); + } else { + BCLib.LOGGER.info("Auto-Sync was disabled on the server."); } } } diff --git a/src/main/java/ru/bclib/config/Configs.java b/src/main/java/ru/bclib/config/Configs.java index db2d0bd6..8b7dec1a 100644 --- a/src/main/java/ru/bclib/config/Configs.java +++ b/src/main/java/ru/bclib/config/Configs.java @@ -17,6 +17,7 @@ public class Configs { public static void save() { MAIN_CONFIG.saveChanges(); RECIPE_CONFIG.saveChanges(); + if (BCLib.isClient()) { CLIENT_CONFIG.saveChanges(); }