From d28123aacca78ce942352b60441ca2d04497ad43 Mon Sep 17 00:00:00 2001 From: szymon Date: Tue, 4 Aug 2020 18:00:10 +0200 Subject: [PATCH] Moved LivingServer duck interface to core package --- .../textile_backup/{ => core}/LivingServer.java | 2 +- .../mixin/MinecraftServerMixin.java | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) rename src/main/java/net/szum123321/textile_backup/{ => core}/LivingServer.java (56%) diff --git a/src/main/java/net/szum123321/textile_backup/LivingServer.java b/src/main/java/net/szum123321/textile_backup/core/LivingServer.java similarity index 56% rename from src/main/java/net/szum123321/textile_backup/LivingServer.java rename to src/main/java/net/szum123321/textile_backup/core/LivingServer.java index f6a4a5a..7032d12 100644 --- a/src/main/java/net/szum123321/textile_backup/LivingServer.java +++ b/src/main/java/net/szum123321/textile_backup/core/LivingServer.java @@ -1,4 +1,4 @@ -package net.szum123321.textile_backup; +package net.szum123321.textile_backup.core; public interface LivingServer { boolean isAlive(); diff --git a/src/main/java/net/szum123321/textile_backup/mixin/MinecraftServerMixin.java b/src/main/java/net/szum123321/textile_backup/mixin/MinecraftServerMixin.java index d51765e..4e4955b 100644 --- a/src/main/java/net/szum123321/textile_backup/mixin/MinecraftServerMixin.java +++ b/src/main/java/net/szum123321/textile_backup/mixin/MinecraftServerMixin.java @@ -19,7 +19,7 @@ package net.szum123321.textile_backup.mixin; import net.minecraft.server.MinecraftServer; -import net.szum123321.textile_backup.LivingServer; +import net.szum123321.textile_backup.core.LivingServer; import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.core.create.BackupContext; import net.szum123321.textile_backup.core.create.BackupHelper; @@ -34,16 +34,17 @@ public class MinecraftServerMixin implements LivingServer { @Inject(method = "shutdown", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/server/MinecraftServer;save(ZZZ)Z")) public void onFinalWorldSave(CallbackInfo ci) { - if (TextileBackup.CONFIG.shutdownBackup && TextileBackup.globalShutdownBackupFlag.get()) + if (TextileBackup.CONFIG.shutdownBackup && TextileBackup.globalShutdownBackupFlag.get()) { TextileBackup.executorService.submit( BackupHelper.create( - new BackupContext.Builder() - .setServer((MinecraftServer)(Object) this) - .setInitiator(BackupContext.BackupInitiator.Shutdown) - .setComment("shutdown") - .build() - ) + new BackupContext.Builder() + .setServer((MinecraftServer) (Object) this) + .setInitiator(BackupContext.BackupInitiator.Shutdown) + .setComment("shutdown") + .build() + ) ); + } isAlive = false; }