From 617573ca095ba2129ba43e74a5f5d79134d3f7d3 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 24 Aug 2021 14:49:29 +0200 Subject: [PATCH] BCLib Syncing fixes --- .../bclib/api/dataexchange/handler/autosync/HelloClient.java | 4 ++-- .../ru/bclib/api/dataexchange/handler/autosync/SendFiles.java | 2 +- src/main/java/ru/bclib/gui/screens/ProgressScreen.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/ru/bclib/api/dataexchange/handler/autosync/HelloClient.java b/src/main/java/ru/bclib/api/dataexchange/handler/autosync/HelloClient.java index 7cc49493..236da5dd 100644 --- a/src/main/java/ru/bclib/api/dataexchange/handler/autosync/HelloClient.java +++ b/src/main/java/ru/bclib/api/dataexchange/handler/autosync/HelloClient.java @@ -432,11 +432,11 @@ public class HelloClient extends DataHandler.FromServer { @Environment(EnvType.CLIENT) private void requestFileDownloads(List files) { BCLib.LOGGER.info("Starting download of Files:" + files.size()); - + final ProgressScreen progress = new ProgressScreen(null, new TranslatableComponent("title.bclib.filesync.progress"), new TranslatableComponent("message.bclib.filesync.progress")); progress.progressStart(new TranslatableComponent("message.bclib.filesync.progress.stage.empty")); ChunkerProgress.setProgressScreen(progress); - + DataExchangeAPI.send(new RequestFiles(files)); } } diff --git a/src/main/java/ru/bclib/api/dataexchange/handler/autosync/SendFiles.java b/src/main/java/ru/bclib/api/dataexchange/handler/autosync/SendFiles.java index 64fa2492..347c5b2f 100644 --- a/src/main/java/ru/bclib/api/dataexchange/handler/autosync/SendFiles.java +++ b/src/main/java/ru/bclib/api/dataexchange/handler/autosync/SendFiles.java @@ -52,7 +52,7 @@ public class SendFiles extends DataHandler.FromServer { @Override protected void serializeDataOnServer(FriendlyByteBuf buf) { List existingFiles = files.stream() - .filter(e -> e.fileName.exists()) + .filter(e -> e!=null &&e.fileName!=null && e.fileName.exists()) .collect(Collectors.toList()); /* //this will try to send a file that was not registered or requested by the client diff --git a/src/main/java/ru/bclib/gui/screens/ProgressScreen.java b/src/main/java/ru/bclib/gui/screens/ProgressScreen.java index 6bceda3c..54680390 100644 --- a/src/main/java/ru/bclib/gui/screens/ProgressScreen.java +++ b/src/main/java/ru/bclib/gui/screens/ProgressScreen.java @@ -151,7 +151,7 @@ public class ProgressScreen extends GridScreen implements ProgressListener { @Override public void progressStart(Component component) { this.progressStage(component); - this.progressStagePercentage(30); + this.progressStagePercentage(0); } @Override