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

Adopted changes for nbt access

Browse source
This commit is contained in:
Frank 2023-12-18 12:16:06 +01:00
parent e3bab37cd0
commit 1258130729
1 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java
View file

@ -156,6 +156,20 @@ public class DataFixerAPI {
return ps; return ps;
} }
private static void makeBackupAndShowToast(LevelStorageSource storageSource, String levelID) {
boolean didOpen = false;
try (LevelStorageSource.LevelStorageAccess access = storageSource.createAccess(levelID);){
didOpen = true;
EditWorldScreen.makeBackupAndShowToast(access);
}
catch (IOException ex) {
if (!didOpen) {
SystemToast.onWorldAccessFailure(Minecraft.getInstance(), levelID);
}
LOGGER.warning("Failed to create backup of level {}", levelID, ex);
}
}
private static boolean fixData(File dir, String levelID, boolean showUI, Consumer<Boolean> onResume) { private static boolean fixData(File dir, String levelID, boolean showUI, Consumer<Boolean> onResume) {
MigrationProfile profile = loadProfileIfNeeded(dir); MigrationProfile profile = loadProfileIfNeeded(dir);
@ -198,7 +212,7 @@ public class DataFixerAPI {
Supplier<State> runner = () -> { Supplier<State> runner = () -> {
if (createBackup) { if (createBackup) {
progress.progressStage(Component.translatable("message.bclib.datafixer.progress.waitbackup")); progress.progressStage(Component.translatable("message.bclib.datafixer.progress.waitbackup"));
EditWorldScreen.makeBackupAndShowToast(Minecraft.getInstance().getLevelSource(), levelID); makeBackupAndShowToast(Minecraft.getInstance().getLevelSource(), levelID);
} }
if (applyFixes) { if (applyFixes) {
@ -305,7 +319,7 @@ public class DataFixerAPI {
progress.progressStage(Component.translatable("message.bclib.datafixer.progress.players")); progress.progressStage(Component.translatable("message.bclib.datafixer.progress.players"));
players.parallelStream().forEach((file) -> { players.parallelStream().forEach((file) -> {
fixPlayer(profile, state, file); fixPlayer(profile, state, file.toPath());
progress.incAtomic(maxProgress); progress.incAtomic(maxProgress);
}); });
@ -362,8 +376,8 @@ public class DataFixerAPI {
} }
if (changed[0]) { if (changed[0]) {
LOGGER.warning("Writing '{}'", profile.getLevelDatFile()); LOGGER.warning("Writing '{}'", profile.getLevelDatPath());
NbtIo.writeCompressed(level, profile.getLevelDatFile()); NbtIo.writeCompressed(level, profile.getLevelDatPath());
} }
} catch (Exception e) { } catch (Exception e) {
BCLib.LOGGER.error("Failed fixing Level-Data."); BCLib.LOGGER.error("Failed fixing Level-Data.");
@ -373,7 +387,7 @@ public class DataFixerAPI {
} }
} }
private static void fixPlayer(MigrationProfile data, State state, File file) { private static void fixPlayer(MigrationProfile data, State state, Path file) {
try { try {
LOGGER.info("Inspecting " + file); LOGGER.info("Inspecting " + file);
@ -387,7 +401,7 @@ public class DataFixerAPI {
} }
} catch (Exception e) { } catch (Exception e) {
BCLib.LOGGER.error("Failed fixing Player-Data."); BCLib.LOGGER.error("Failed fixing Player-Data.");
state.addError("Failed fixing Player-Data in " + file.getName() + " (" + e.getMessage() + ")"); state.addError("Failed fixing Player-Data in " + file.getFileName() + " (" + e.getMessage() + ")");
state.didFail = true; state.didFail = true;
e.printStackTrace(); e.printStackTrace();
} }
@ -587,9 +601,9 @@ public class DataFixerAPI {
Patch.getALL().add(patch.get()); Patch.getALL().add(patch.get());
} }
private static CompoundTag readNbt(File file) throws IOException { private static CompoundTag readNbt(Path file) throws IOException {
try { try {
return NbtIo.readCompressed(file); return NbtIo.readCompressed(file, NbtAccounter.unlimitedHeap());
} catch (ZipException | EOFException e) { } catch (ZipException | EOFException e) {
return NbtIo.read(file); return NbtIo.read(file);
} }