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

Sync Screen offers user-options

Browse source
This commit is contained in:
Frank 2021-08-19 20:12:01 +02:00
parent d46e375501
commit dfe25a9599
7 changed files with 144 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/bclib/api/dataexchange/handler/autosync/AutoFileSyncEntry.java
View file

@ -6,6 +6,7 @@ import ru.bclib.api.dataexchange.DataHandler;
import ru.bclib.api.dataexchange.SyncFileHash;
import ru.bclib.api.dataexchange.handler.autosync.AutoSync.NeedTransferPredicate;
import ru.bclib.api.dataexchange.handler.autosync.SyncFolderDescriptor.SubFile;
import ru.bclib.config.Config;
import ru.bclib.util.ModUtil;
import ru.bclib.util.Pair;
import ru.bclib.util.ModUtil.ModInfo;
@ -108,6 +109,7 @@ class AutoFileSyncEntry extends AutoSyncID {
this.requestContent = requestContent;
}
public SyncFileHash getFileHash() {
if (hash == null) {
hash = SyncFileHash.create(modID, fileName, uniqueID);

5
src/main/java/ru/bclib/api/dataexchange/handler/autosync/AutoSyncID.java
View file

@ -3,6 +3,7 @@ package ru.bclib.api.dataexchange.handler.autosync;
import net.minecraft.network.FriendlyByteBuf;
import org.jetbrains.annotations.NotNull;
import ru.bclib.api.dataexchange.DataHandler;
import ru.bclib.config.Config;
import ru.bclib.util.ModUtil;
import java.io.File;
@ -134,4 +135,8 @@ public class AutoSyncID {
return new AutoSyncID(modID, uID);
}
}
public boolean isConfigFile(){
return this.uniqueID.startsWith(Config.CONFIG_SYNC_PREFIX);
}
}

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

@ -330,7 +330,7 @@ public class HelloClient extends DataHandler.FromServer {
//Files can only get placed within that folder
if ((filesToRequest.size() > 0 || filesToRemove.size() > 0) && ClientConfig.isAcceptingFiles()) {
showDownloadConfigs(client, filesToRequest, filesToRemove);
showSyncFilesScreen(client, filesToRequest, filesToRemove);
return;
}
}
@ -350,40 +350,67 @@ public class HelloClient extends DataHandler.FromServer {
}
@Environment(EnvType.CLIENT)
protected void showDownloadConfigs(Minecraft client, List<AutoSyncID> files, final List<AutoSyncID.ForDirectFileRequest> filesToRemove) {
client.setScreen(new SyncFilesScreen((download) -> {
protected void showSyncFilesScreen(Minecraft client, List<AutoSyncID> files, final List<AutoSyncID.ForDirectFileRequest> filesToRemove) {
int configFiles = 0;
int singleFiles = 0;
int folderFiles = 0;
int modFiles = 0;
for (AutoSyncID aid : files){
if (aid.isConfigFile()){
configFiles++;
} else if (aid instanceof AutoSyncID.ForModFileRequest){
modFiles++;
} else if (aid instanceof AutoSyncID.ForDirectFileRequest){
folderFiles++;
} else {
singleFiles++;
}
}
client.setScreen(new SyncFilesScreen(modFiles, configFiles, singleFiles, folderFiles, filesToRemove.size(), (downloadMods, downloadConfigs, downloadFiles, removeFiles) -> {
Minecraft.getInstance()
.setScreen((Screen) null);
if (download) {
if (downloadMods || downloadConfigs || downloadFiles) {
BCLib.LOGGER.info("Updating local Files:");
List<AutoSyncID.WithContentOverride> localChanges = new ArrayList<>(files.toArray().length);
List<AutoSyncID> requestFiles = new ArrayList<>(files.toArray().length);
files.forEach(aid -> {
if (aid instanceof WithContentOverride) {
final WithContentOverride aidc = (WithContentOverride) aid;
BCLib.LOGGER.info(" - " + aid + " (updating Content)");
SendFiles.writeSyncedFile(aid, aidc.contentWrapper.getRawContent(), aidc.localFile);
if (aid.isConfigFile() && downloadConfigs){
processOfferedFile(requestFiles, aid);
} else if (aid instanceof AutoSyncID.ForModFileRequest && downloadMods){
processOfferedFile(requestFiles, aid);
} else if (downloadFiles){
processOfferedFile(requestFiles, aid);
}
else {
requestFiles.add(aid);
BCLib.LOGGER.info(" - " + aid + " (requesting)");
}
});
filesToRemove.forEach(aid -> {
BCLib.LOGGER.info(" - " + aid.relFile + " (removing)");
aid.relFile.delete();
});
requestFileDownloads(requestFiles);
}
if (removeFiles) {
filesToRemove.forEach(aid -> {
BCLib.LOGGER.info(" - " + aid.relFile + " (removing)");
aid.relFile.delete();
});
}
}));
}
private void processOfferedFile(List<AutoSyncID> requestFiles, AutoSyncID aid) {
if (aid instanceof WithContentOverride) {
final WithContentOverride aidc = (WithContentOverride) aid;
BCLib.LOGGER.info(" - " + aid + " (updating Content)");
SendFiles.writeSyncedFile(aid, aidc.contentWrapper.getRawContent(), aidc.localFile);
}
else {
requestFiles.add(aid);
BCLib.LOGGER.info(" - " + aid + " (requesting)");
}
}
private void requestBCLibDownload(Consumer<Boolean> whenFinished) {
BCLib.LOGGER.warning("Starting download of BCLib");
whenFinished.accept(true);