Automatic world saving is disabled when backup is being made
parent
fd69b2ae6b
commit
a002d49ecf
|
@ -19,6 +19,7 @@
|
||||||
package net.szum123321.textile_backup.core;
|
package net.szum123321.textile_backup.core;
|
||||||
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.server.world.ServerWorld;
|
||||||
import net.minecraft.util.registry.Registry;
|
import net.minecraft.util.registry.Registry;
|
||||||
import net.minecraft.util.registry.RegistryKey;
|
import net.minecraft.util.registry.RegistryKey;
|
||||||
import net.minecraft.world.dimension.DimensionType;
|
import net.minecraft.world.dimension.DimensionType;
|
||||||
|
@ -49,6 +50,22 @@ public class Utilities {
|
||||||
.getWorldDirectory(RegistryKey.of(Registry.DIMENSION, DimensionType.OVERWORLD_REGISTRY_KEY.getValue()));
|
.getWorldDirectory(RegistryKey.of(Registry.DIMENSION, DimensionType.OVERWORLD_REGISTRY_KEY.getValue()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void disableWorldSaving(MinecraftServer server) {
|
||||||
|
for (ServerWorld serverWorld : server.getWorlds()) {
|
||||||
|
if (serverWorld != null && !serverWorld.savingDisabled) {
|
||||||
|
serverWorld.savingDisabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void enableWorldSaving(MinecraftServer server) {
|
||||||
|
for (ServerWorld serverWorld : server.getWorlds()) {
|
||||||
|
if (serverWorld != null && serverWorld.savingDisabled) {
|
||||||
|
serverWorld.savingDisabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean isWindows() {
|
public static boolean isWindows() {
|
||||||
return System.getProperty("os.name").toLowerCase().contains("win");
|
return System.getProperty("os.name").toLowerCase().contains("win");
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,7 +53,10 @@ public class BackupHelper {
|
||||||
if (ctx.shouldSave()) {
|
if (ctx.shouldSave()) {
|
||||||
Statics.LOGGER.sendInfo(ctx.getCommandSource(), "Saving server...");
|
Statics.LOGGER.sendInfo(ctx.getCommandSource(), "Saving server...");
|
||||||
Statics.LOGGER.info( "Saving server...");
|
Statics.LOGGER.info( "Saving server...");
|
||||||
ctx.getServer().save(true, true, false);
|
|
||||||
|
ctx.getServer().save(true, true, true);
|
||||||
|
|
||||||
|
Utilities.disableWorldSaving(ctx.getServer());
|
||||||
}
|
}
|
||||||
|
|
||||||
return new MakeBackupRunnable(ctx);
|
return new MakeBackupRunnable(ctx);
|
||||||
|
|
|
@ -35,71 +35,75 @@ public class MakeBackupRunnable implements Runnable {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
Statics.LOGGER.sendInfo(context.getCommandSource(), "Starting backup");
|
|
||||||
Statics.LOGGER.info("Starting backup");
|
|
||||||
|
|
||||||
File world = Utilities.getWorldFolder(context.getServer());
|
|
||||||
|
|
||||||
Statics.LOGGER.trace("Minecraft world is: {}", world);
|
|
||||||
|
|
||||||
File outFile = Utilities
|
|
||||||
.getBackupRootPath(Utilities.getLevelName(context.getServer()))
|
|
||||||
.toPath()
|
|
||||||
.resolve(getFileName())
|
|
||||||
.toFile();
|
|
||||||
|
|
||||||
Statics.LOGGER.trace("Outfile is: {}", outFile);
|
|
||||||
|
|
||||||
outFile.getParentFile().mkdirs();
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
outFile.createNewFile();
|
Statics.LOGGER.sendInfo(context.getCommandSource(), "Starting backup");
|
||||||
} catch (IOException e) {
|
Statics.LOGGER.info("Starting backup");
|
||||||
Statics.LOGGER.error("An exception occurred when trying to create new backup file!", e);
|
|
||||||
Statics.LOGGER.sendError(context.getCommandSource(), "An exception occurred when trying to create new backup file!");
|
|
||||||
|
|
||||||
return;
|
File world = Utilities.getWorldFolder(context.getServer());
|
||||||
|
|
||||||
|
Statics.LOGGER.trace("Minecraft world is: {}", world);
|
||||||
|
|
||||||
|
File outFile = Utilities
|
||||||
|
.getBackupRootPath(Utilities.getLevelName(context.getServer()))
|
||||||
|
.toPath()
|
||||||
|
.resolve(getFileName())
|
||||||
|
.toFile();
|
||||||
|
|
||||||
|
Statics.LOGGER.trace("Outfile is: {}", outFile);
|
||||||
|
|
||||||
|
outFile.getParentFile().mkdirs();
|
||||||
|
|
||||||
|
try {
|
||||||
|
outFile.createNewFile();
|
||||||
|
} catch (IOException e) {
|
||||||
|
Statics.LOGGER.error("An exception occurred when trying to create new backup file!", e);
|
||||||
|
Statics.LOGGER.sendError(context.getCommandSource(), "An exception occurred when trying to create new backup file!");
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int coreCount;
|
||||||
|
|
||||||
|
if(Statics.CONFIG.compressionCoreCountLimit <= 0) {
|
||||||
|
coreCount = Runtime.getRuntime().availableProcessors();
|
||||||
|
} else {
|
||||||
|
coreCount = Math.min(Statics.CONFIG.compressionCoreCountLimit, Runtime.getRuntime().availableProcessors());
|
||||||
|
}
|
||||||
|
|
||||||
|
Statics.LOGGER.trace("Running compression on {} threads. Available cores = {}", coreCount, Runtime.getRuntime().availableProcessors());
|
||||||
|
|
||||||
|
switch (Statics.CONFIG.format) {
|
||||||
|
case ZIP:
|
||||||
|
ParallelZipCompressor.createArchive(world, outFile, context, coreCount);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case BZIP2:
|
||||||
|
ParallelBZip2Compressor.getInstance().createArchive(world, outFile, context, coreCount);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case GZIP:
|
||||||
|
ParallelGzipCompressor.getInstance().createArchive(world, outFile, context, coreCount);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case LZMA:
|
||||||
|
LZMACompressor.getInstance().createArchive(world, outFile, context, coreCount);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
Statics.LOGGER.warn("Specified compressor ({}) is not supported! Zip will be used instead!", Statics.CONFIG.format);
|
||||||
|
Statics.LOGGER.sendError(context.getCommandSource(), "Error! No correct compression format specified! Using default compressor!");
|
||||||
|
|
||||||
|
ParallelZipCompressor.createArchive(world, outFile, context, coreCount);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
BackupHelper.executeFileLimit(context.getCommandSource(), Utilities.getLevelName(context.getServer()));
|
||||||
|
|
||||||
|
Statics.LOGGER.sendInfo(context, "Done!");
|
||||||
|
Statics.LOGGER.info("Done!");
|
||||||
|
} finally {
|
||||||
|
Utilities.enableWorldSaving(context.getServer());
|
||||||
}
|
}
|
||||||
|
|
||||||
int coreCount;
|
|
||||||
|
|
||||||
if(Statics.CONFIG.compressionCoreCountLimit <= 0) {
|
|
||||||
coreCount = Runtime.getRuntime().availableProcessors();
|
|
||||||
} else {
|
|
||||||
coreCount = Math.min(Statics.CONFIG.compressionCoreCountLimit, Runtime.getRuntime().availableProcessors());
|
|
||||||
}
|
|
||||||
|
|
||||||
Statics.LOGGER.trace("Running compression on {} threads. Available cores = {}", coreCount, Runtime.getRuntime().availableProcessors());
|
|
||||||
|
|
||||||
switch (Statics.CONFIG.format) {
|
|
||||||
case ZIP:
|
|
||||||
ParallelZipCompressor.createArchive(world, outFile, context, coreCount);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case BZIP2:
|
|
||||||
ParallelBZip2Compressor.getInstance().createArchive(world, outFile, context, coreCount);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case GZIP:
|
|
||||||
ParallelGzipCompressor.getInstance().createArchive(world, outFile, context, coreCount);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case LZMA:
|
|
||||||
LZMACompressor.getInstance().createArchive(world, outFile, context, coreCount);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
Statics.LOGGER.warn("Specified compressor ({}) is not supported! Zip will be used instead!", Statics.CONFIG.format);
|
|
||||||
Statics.LOGGER.sendError(context.getCommandSource(), "Error! No correct compression format specified! Using default compressor!");
|
|
||||||
|
|
||||||
ParallelZipCompressor.createArchive(world, outFile, context, coreCount);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
BackupHelper.executeFileLimit(context.getCommandSource(), Utilities.getLevelName(context.getServer()));
|
|
||||||
|
|
||||||
Statics.LOGGER.sendInfo(context, "Done!");
|
|
||||||
Statics.LOGGER.info("Done!");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getFileName(){
|
private String getFileName(){
|
||||||
|
|
Loading…
Reference in New Issue