MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More debug messages for file-sync

Browse source
This commit is contained in:
Frank 2021-08-11 00:01:36 +02:00
parent a21e7e115b
commit e06543dac6
4 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ru/bclib/BCLib.java
View file

@ -34,7 +34,6 @@ public class BCLib implements ModInitializer {
TagAPI.init(); TagAPI.init();
CraftingRecipes.init(); CraftingRecipes.init();
WorldDataAPI.registerModCache(MOD_ID); WorldDataAPI.registerModCache(MOD_ID);
Configs.save();
DataExchangeAPI.registerDescriptors(List.of( DataExchangeAPI.registerDescriptors(List.of(
HelloClient.DESCRIPTOR, HelloClient.DESCRIPTOR,
@ -42,6 +41,8 @@ public class BCLib implements ModInitializer {
RequestFiles.DESCRIPTOR, RequestFiles.DESCRIPTOR,
SendFiles.DESCRIPTOR SendFiles.DESCRIPTOR
)); ));
Configs.save();
} }
public static boolean isDevEnvironment() { public static boolean isDevEnvironment() {

13
src/main/java/ru/bclib/api/dataexchange/handler/HelloClient.java
View file

@ -73,6 +73,7 @@ public class HelloClient extends DataHandler {
BCLib.LOGGER.info(" - Listing Mod " + modID + " v" + ver); BCLib.LOGGER.info(" - Listing Mod " + modID + " v" + ver);
} }
} else { } else {
BCLib.LOGGER.info("Server will not list Mods.");
buf.writeInt(0); buf.writeInt(0);
} }
@ -92,6 +93,7 @@ public class HelloClient extends DataHandler {
BCLib.LOGGER.info(" - Offering File " + entry); BCLib.LOGGER.info(" - Offering File " + entry);
} }
} else { } else {
BCLib.LOGGER.info("Server will not offer Configs.");
buf.writeInt(0); buf.writeInt(0);
} }
} }
@ -141,20 +143,21 @@ public class HelloClient extends DataHandler {
BCLib.LOGGER.info(" - " + e.getKey() + " (client="+ver+", server="+ver+")"); 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) { for (DataExchange.AutoSyncTriple e : autoSyncedFiles) {
boolean willRequest = false; boolean willRequest = false;
if (e.third == null) { if (e.third == null) {
filesToRequest.add(new AutoSyncID(e.first.modID, e.first.uniqueID));
willRequest = true; 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)) { } else if (e.third.needTransfer.test(e.third.getFileHash(), e.first, e.second)) {
willRequest = true; willRequest = true;
filesToRequest.add(new AutoSyncID(e.first.modID, e.first.uniqueID)); 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()) { if (filesToRequest.size()>0 && SendFiles.acceptFiles()) {

3
src/main/java/ru/bclib/api/dataexchange/handler/HelloServer.java
View file

@ -65,6 +65,7 @@ public class HelloServer extends DataHandler {
@Override @Override
protected void serializeData(FriendlyByteBuf buf) { protected void serializeData(FriendlyByteBuf buf) {
BCLib.LOGGER.info("Sending hello to server.");
buf.writeInt(DataFixerAPI.getModVersion(HelloClient.getBCLibVersion())); 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)) { if (Configs.MAIN_CONFIG.getBoolean(Configs.MAIN_SYNC_CATEGORY, "enabled", true)) {
reply(new HelloClient(), server); reply(new HelloClient(), server);
} else {
BCLib.LOGGER.info("Auto-Sync was disabled on the server.");
} }
} }
} }

1
src/main/java/ru/bclib/config/Configs.java
View file

@ -17,6 +17,7 @@ public class Configs {
public static void save() { public static void save() {
MAIN_CONFIG.saveChanges(); MAIN_CONFIG.saveChanges();
RECIPE_CONFIG.saveChanges(); RECIPE_CONFIG.saveChanges();
if (BCLib.isClient()) { if (BCLib.isClient()) {
CLIENT_CONFIG.saveChanges(); CLIENT_CONFIG.saveChanges();
} }