From be3f32a2828a0a4780e407cc5d751178c0859746 Mon Sep 17 00:00:00 2001 From: Szum123321 Date: Wed, 4 Aug 2021 11:01:25 +0200 Subject: [PATCH] 1.16 --- build.gradle | 2 +- gradle.properties | 10 +++++----- .../textile_backup/TextileBackup.java | 2 +- .../textile_backup/TextileLogger.java | 17 +++++++---------- .../commands/FileSuggestionProvider.java | 2 +- .../commands/create/CleanupCommand.java | 2 +- .../commands/manage/BlacklistCommand.java | 4 ++-- .../commands/manage/DeleteCommand.java | 2 +- .../commands/manage/ListBackupsCommand.java | 2 +- .../commands/manage/WhitelistCommand.java | 4 ++-- .../commands/restore/RestoreBackupCommand.java | 2 +- .../core/create/BackupContext.java | 2 +- .../core/restore/RestoreContext.java | 2 +- src/main/resources/fabric.mod.json | 3 +-- 14 files changed, 26 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index 6ac9b2e..76ed195 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.9-SNAPSHOT' + id 'fabric-loom' version '0.7-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index f1a6bf9..4c2b779 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,18 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -minecraft_version=1.17.1 -yarn_mappings=1.17.1+build.32 +minecraft_version=1.16.5 +yarn_mappings=1.16.5+build.10 loader_version=0.11.6 #Fabric api -fabric_version=0.37.0+1.17 +fabric_version=0.37.1+1.16 #Cloth Config -cloth_version=5.0.37 +cloth_version=4.11.26 #ModMenu -modmenu_version=2.0.4 +modmenu_version=1.16.11 #Lazy DFU for faster dev start lazydfu_version=0.1.2 diff --git a/src/main/java/net/szum123321/textile_backup/TextileBackup.java b/src/main/java/net/szum123321/textile_backup/TextileBackup.java index 7cabff7..6bf196b 100644 --- a/src/main/java/net/szum123321/textile_backup/TextileBackup.java +++ b/src/main/java/net/szum123321/textile_backup/TextileBackup.java @@ -86,7 +86,7 @@ public class TextileBackup implements ModInitializer { return ((config.get().playerWhitelist.contains(ctx.getEntityOrThrow().getEntityName()) || ctx.hasPermissionLevel(config.get().permissionLevel)) && !config.get().playerBlacklist.contains(ctx.getEntityOrThrow().getEntityName())) || - (ctx.getServer().isSinglePlayer() && + (ctx.getMinecraftServer().isSinglePlayer() && config.get().alwaysSingleplayerAllowed); } catch (Exception ignored) { //Command was called from server console. return true; diff --git a/src/main/java/net/szum123321/textile_backup/TextileLogger.java b/src/main/java/net/szum123321/textile_backup/TextileLogger.java index 9036e41..f54da45 100644 --- a/src/main/java/net/szum123321/textile_backup/TextileLogger.java +++ b/src/main/java/net/szum123321/textile_backup/TextileLogger.java @@ -22,6 +22,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.LiteralText; import net.minecraft.text.MutableText; +import net.minecraft.text.TextColor; import net.minecraft.util.Formatting; import net.szum123321.textile_backup.core.create.BackupContext; import org.apache.logging.log4j.Level; @@ -29,7 +30,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.MessageFactory; import org.apache.logging.log4j.message.ParameterizedMessageFactory; -import org.apache.logging.log4j.util.StackLocatorUtil; /* This is practically just a copy-pate of Cotton's ModLogger with a few changes @@ -43,18 +43,11 @@ public class TextileLogger { private final String prefix; private final MutableText prefixText; -/* public TextileLogger(String name, String prefix) { - this.messageFactory = ParameterizedMessageFactory.INSTANCE; - this.logger = LogManager.getLogger(name, messageFactory); - this.prefix = "[" + prefix + "]" + " "; - this.prefixText = new LiteralText(this.prefix).styled(style -> style.withColor(0x5B23DA)); - } -*/ public TextileLogger(String prefix) { this.messageFactory = ParameterizedMessageFactory.INSTANCE; - this.logger = LogManager.getLogger(StackLocatorUtil.getCallerClass(2), messageFactory); + this.logger = LogManager.getLogger(getCallerClass(2), messageFactory); this.prefix = "[" + prefix + "]" + " "; - this.prefixText = new LiteralText(this.prefix).styled(style -> style.withColor(0x5B23DA)); + this.prefixText = new LiteralText(this.prefix).styled(style -> style.withColor(TextColor.fromRgb(0x5B23DA))); } public MutableText getPrefixText() { @@ -151,4 +144,8 @@ public class TextileLogger { public void sendErrorAL(BackupContext context, String msg, Object... args) { sendErrorAL(context.getCommandSource(), msg, args); } + + private static String getCallerClass(int depth) { + return new Throwable().getStackTrace()[depth].getClassName(); + } } diff --git a/src/main/java/net/szum123321/textile_backup/commands/FileSuggestionProvider.java b/src/main/java/net/szum123321/textile_backup/commands/FileSuggestionProvider.java index 99d3d57..14f3994 100644 --- a/src/main/java/net/szum123321/textile_backup/commands/FileSuggestionProvider.java +++ b/src/main/java/net/szum123321/textile_backup/commands/FileSuggestionProvider.java @@ -42,7 +42,7 @@ public final class FileSuggestionProvider implements SuggestionProvider getSuggestions(CommandContext ctx, SuggestionsBuilder builder) throws CommandSyntaxException { String remaining = builder.getRemaining(); - for (RestoreHelper.RestoreableFile file : RestoreHelper.getAvailableBackups(ctx.getSource().getServer())) { + for (RestoreHelper.RestoreableFile file : RestoreHelper.getAvailableBackups(ctx.getSource().getMinecraftServer())) { String formattedCreationTime = file.getCreationTime().format(Statics.defaultDateTimeFormatter); if (formattedCreationTime.startsWith(remaining)) { diff --git a/src/main/java/net/szum123321/textile_backup/commands/create/CleanupCommand.java b/src/main/java/net/szum123321/textile_backup/commands/create/CleanupCommand.java index 4ca516f..5e44864 100644 --- a/src/main/java/net/szum123321/textile_backup/commands/create/CleanupCommand.java +++ b/src/main/java/net/szum123321/textile_backup/commands/create/CleanupCommand.java @@ -38,7 +38,7 @@ public class CleanupCommand { log.sendInfo( source, "Deleted: {} files.", - BackupHelper.executeFileLimit(source, Utilities.getLevelName(source.getServer())) + BackupHelper.executeFileLimit(source, Utilities.getLevelName(source.getMinecraftServer())) ); return 1; diff --git a/src/main/java/net/szum123321/textile_backup/commands/manage/BlacklistCommand.java b/src/main/java/net/szum123321/textile_backup/commands/manage/BlacklistCommand.java index 5baaedd..90fac1e 100644 --- a/src/main/java/net/szum123321/textile_backup/commands/manage/BlacklistCommand.java +++ b/src/main/java/net/szum123321/textile_backup/commands/manage/BlacklistCommand.java @@ -92,7 +92,7 @@ public class BlacklistCommand { builder.append(" successfully."); - ctx.getSource().getServer().getCommandManager().sendCommandTree(player); + ctx.getSource().getMinecraftServer().getCommandManager().sendCommandTree(player); log.sendInfo(ctx.getSource(), builder.toString()); } @@ -109,7 +109,7 @@ public class BlacklistCommand { config.get().playerBlacklist.remove(player.getEntityName()); config.save(); - ctx.getSource().getServer().getCommandManager().sendCommandTree(player); + ctx.getSource().getMinecraftServer().getCommandManager().sendCommandTree(player); log.sendInfo(ctx.getSource(), "Player: {} removed from the blacklist successfully.", player.getEntityName()); } diff --git a/src/main/java/net/szum123321/textile_backup/commands/manage/DeleteCommand.java b/src/main/java/net/szum123321/textile_backup/commands/manage/DeleteCommand.java index d2cae78..d4a6929 100644 --- a/src/main/java/net/szum123321/textile_backup/commands/manage/DeleteCommand.java +++ b/src/main/java/net/szum123321/textile_backup/commands/manage/DeleteCommand.java @@ -57,7 +57,7 @@ public class DeleteCommand { throw CommandExceptions.DATE_TIME_PARSE_COMMAND_EXCEPTION_TYPE.create(e); } - File root = Utilities.getBackupRootPath(Utilities.getLevelName(source.getServer())); + File root = Utilities.getBackupRootPath(Utilities.getLevelName(source.getMinecraftServer())); Optional optionalFile = Arrays.stream(root.listFiles()) .filter(Utilities::isValidBackup) diff --git a/src/main/java/net/szum123321/textile_backup/commands/manage/ListBackupsCommand.java b/src/main/java/net/szum123321/textile_backup/commands/manage/ListBackupsCommand.java index 42c49d9..7d609ca 100644 --- a/src/main/java/net/szum123321/textile_backup/commands/manage/ListBackupsCommand.java +++ b/src/main/java/net/szum123321/textile_backup/commands/manage/ListBackupsCommand.java @@ -33,7 +33,7 @@ public class ListBackupsCommand { public static LiteralArgumentBuilder register() { return CommandManager.literal("list") .executes(ctx -> { StringBuilder builder = new StringBuilder(); - List backups = RestoreHelper.getAvailableBackups(ctx.getSource().getServer()); + List backups = RestoreHelper.getAvailableBackups(ctx.getSource().getMinecraftServer()); if(backups.size() == 0) { builder.append("There a no backups available for this world."); diff --git a/src/main/java/net/szum123321/textile_backup/commands/manage/WhitelistCommand.java b/src/main/java/net/szum123321/textile_backup/commands/manage/WhitelistCommand.java index c5da2f4..31a0c69 100644 --- a/src/main/java/net/szum123321/textile_backup/commands/manage/WhitelistCommand.java +++ b/src/main/java/net/szum123321/textile_backup/commands/manage/WhitelistCommand.java @@ -92,7 +92,7 @@ public class WhitelistCommand { builder.append(" successfully."); - ctx.getSource().getServer().getCommandManager().sendCommandTree(player); + ctx.getSource().getMinecraftServer().getCommandManager().sendCommandTree(player); log.sendInfo(ctx.getSource(), builder.toString()); } @@ -109,7 +109,7 @@ public class WhitelistCommand { config.get().playerWhitelist.remove(player.getEntityName()); config.save(); - ctx.getSource().getServer().getCommandManager().sendCommandTree(player); + ctx.getSource().getMinecraftServer().getCommandManager().sendCommandTree(player); log.sendInfo(ctx.getSource(), "Player: {} removed from the whitelist successfully.", player.getEntityName()); } diff --git a/src/main/java/net/szum123321/textile_backup/commands/restore/RestoreBackupCommand.java b/src/main/java/net/szum123321/textile_backup/commands/restore/RestoreBackupCommand.java index bb516c9..beba511 100644 --- a/src/main/java/net/szum123321/textile_backup/commands/restore/RestoreBackupCommand.java +++ b/src/main/java/net/szum123321/textile_backup/commands/restore/RestoreBackupCommand.java @@ -79,7 +79,7 @@ public class RestoreBackupCommand { throw CommandExceptions.DATE_TIME_PARSE_COMMAND_EXCEPTION_TYPE.create(e); } - Optional backupFile = RestoreHelper.findFileAndLockIfPresent(dateTime, source.getServer()); + Optional backupFile = RestoreHelper.findFileAndLockIfPresent(dateTime, source.getMinecraftServer()); if(backupFile.isPresent()) { log.info("Found file to restore {}", backupFile.get().getFile().getName()); diff --git a/src/main/java/net/szum123321/textile_backup/core/create/BackupContext.java b/src/main/java/net/szum123321/textile_backup/core/create/BackupContext.java index 6ea7298..fef9376 100644 --- a/src/main/java/net/szum123321/textile_backup/core/create/BackupContext.java +++ b/src/main/java/net/szum123321/textile_backup/core/create/BackupContext.java @@ -115,7 +115,7 @@ public record BackupContext(@NotNull MinecraftServer server, } if (server == null) { - if (commandSource != null) setServer(commandSource.getServer()); + if (commandSource != null) setServer(commandSource.getMinecraftServer()); else throw new RuntimeException("Neither MinecraftServer or ServerCommandSource were provided!"); } diff --git a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreContext.java b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreContext.java index 6ccc998..92deadf 100644 --- a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreContext.java +++ b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreContext.java @@ -86,7 +86,7 @@ public record RestoreContext(RestoreHelper.RestoreableFile file, } public RestoreContext build() { - if (server == null) server = serverCommandSource.getServer(); + if (server == null) server = serverCommandSource.getMinecraftServer(); ActionInitiator initiator = serverCommandSource.getEntity() instanceof PlayerEntity ? ActionInitiator.Player : ActionInitiator.ServerConsole; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7a78961..390a7de 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -39,12 +39,11 @@ "depends": { "fabricloader": ">=0.11", "fabric": "*", - "minecraft": "1.17.*", + "minecraft": "1.16.*", "cloth-config2": "*", "java": ">=16" }, "recommends": { - "modmenu": "*" },