From 97f439ab481a6bcdba4179d2ed5df524599325e6 Mon Sep 17 00:00:00 2001 From: Wel Coming Date: Thu, 29 Jan 2026 02:12:50 +0800 Subject: [PATCH] support 1.21.11 --- build.gradle | 2 +- .../quickbakcupmulti/command/DeleteCommand.java | 3 ++- .../quickbakcupmulti/command/MakeCommand.java | 3 ++- .../quickbakcupmulti/command/PermissionCommand.java | 3 ++- .../quickbakcupmulti/command/RestoreCommand.java | 7 ++++--- .../command/settings/SettingCommand.java | 3 ++- .../utils/permission/PermissionManager.java | 8 +++++--- gradle.properties | 10 +++++----- 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index e246479..fdc30db 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false id "architectury-plugin" version "3.4-SNAPSHOT" id "com.github.johnrengelman.shadow" version "8.1.1" apply false diff --git a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/DeleteCommand.java b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/DeleteCommand.java index cb919ce..38cfa90 100644 --- a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/DeleteCommand.java +++ b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/DeleteCommand.java @@ -11,12 +11,13 @@ import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.network.chat.Component; +import net.minecraft.server.permissions.Permissions; import static io.github.skydynamic.quickbakcupmulti.translate.Translate.tr; public class DeleteCommand { public static final LiteralArgumentBuilder cmd = Commands.literal("delete") - .requires(it -> PermissionManager.hasPermission(it, 2, PermissionType.HELPER)) + .requires(it -> PermissionManager.hasPermission(it, Permissions.COMMANDS_GAMEMASTER, PermissionType.HELPER)) .then(Commands.argument("name", StringArgumentType.string()) .suggests(((context, builder) -> { for (StorageInfo info : BackupManager.getBackupsList()) { diff --git a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/MakeCommand.java b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/MakeCommand.java index 5d89fb4..e9df5a6 100644 --- a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/MakeCommand.java +++ b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/MakeCommand.java @@ -10,6 +10,7 @@ import io.github.skydynamic.quickbakcupmulti.utils.permission.PermissionType; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; +import net.minecraft.server.permissions.Permissions; import java.text.SimpleDateFormat; @@ -44,7 +45,7 @@ public void run() { private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HHmmss"); public static final LiteralArgumentBuilder cmd = Commands.literal("make") - .requires(it -> PermissionManager.hasPermission(it, 4, PermissionType.HELPER)) + .requires(it -> PermissionManager.hasPermission(it, Permissions.COMMANDS_OWNER, PermissionType.HELPER)) .executes(it -> makeSaveBackup(it.getSource(), dateFormat.format(System.currentTimeMillis()), "")) .then(Commands.argument("name", StringArgumentType.string()) .executes(it -> makeSaveBackup(it.getSource(), StringArgumentType.getString(it, "name"), "")) diff --git a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/PermissionCommand.java b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/PermissionCommand.java index 9b6beac..8fce050 100644 --- a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/PermissionCommand.java +++ b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/PermissionCommand.java @@ -9,6 +9,7 @@ import net.minecraft.commands.Commands; import net.minecraft.commands.arguments.GameProfileArgument; import net.minecraft.network.chat.Component; +import net.minecraft.server.permissions.Permissions; import net.minecraft.server.players.NameAndId; import java.util.Collection; @@ -17,7 +18,7 @@ public class PermissionCommand { public static final LiteralArgumentBuilder cmd = Commands.literal("permission") - .requires(it -> PermissionManager.hasPermission(it, 4, PermissionType.ADMIN)) + .requires(it -> PermissionManager.hasPermission(it, Permissions.COMMANDS_OWNER, PermissionType.ADMIN)) .then(Commands.literal("set") .then(Commands.argument("player", GameProfileArgument.gameProfile()) .then(Commands.argument("level", IntegerArgumentType.integer(0, 2)) diff --git a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/RestoreCommand.java b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/RestoreCommand.java index 4e7aaa0..239b215 100644 --- a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/RestoreCommand.java +++ b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/RestoreCommand.java @@ -16,6 +16,7 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.permissions.Permissions; import java.util.ArrayList; import java.util.List; @@ -30,7 +31,7 @@ public class RestoreCommand { public static final LiteralArgumentBuilder restoreCmd = Commands.literal("restore") - .requires(it -> PermissionManager.hasPermission(it, 4, PermissionType.ADMIN)) + .requires(it -> PermissionManager.hasPermission(it, Permissions.COMMANDS_OWNER, PermissionType.ADMIN)) .then(Commands.argument("target", StringArgumentType.string()) .suggests(((context, builder) -> { List backups = BackupManager.getSortedBackups(); @@ -54,7 +55,7 @@ public class RestoreCommand { ); public static final LiteralArgumentBuilder confirmCmd = Commands.literal("confirm") - .requires(it -> PermissionManager.hasPermission(it, 4, PermissionType.ADMIN)) + .requires(it -> PermissionManager.hasPermission(it, Permissions.COMMANDS_OWNER, PermissionType.ADMIN)) .executes(it -> { try { executeRestore(it.getSource()); @@ -65,7 +66,7 @@ public class RestoreCommand { }); public static final LiteralArgumentBuilder cancelCmd = Commands.literal("cancel") - .requires(it -> PermissionManager.hasPermission(it, 4, PermissionType.ADMIN)) + .requires(it -> PermissionManager.hasPermission(it, Permissions.COMMANDS_OWNER, PermissionType.ADMIN)) .executes(it -> cancelRestore(it.getSource())); @Getter diff --git a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/settings/SettingCommand.java b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/settings/SettingCommand.java index b8d235a..0d58a69 100644 --- a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/settings/SettingCommand.java +++ b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/settings/SettingCommand.java @@ -5,10 +5,11 @@ import io.github.skydynamic.quickbakcupmulti.utils.permission.PermissionType; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; +import net.minecraft.server.permissions.Permissions; public class SettingCommand { public static final LiteralArgumentBuilder cmd = Commands.literal("setting") - .requires(it -> PermissionManager.hasPermission(it, 4, PermissionType.ADMIN)) + .requires(it -> PermissionManager.hasPermission(it, Permissions.COMMANDS_OWNER, PermissionType.ADMIN)) .then(LangSettingCommand.cmd) .then(RestartModeSettingCommand.cmd) .then(AutoReJoinSettingCommand.cmd); diff --git a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/utils/permission/PermissionManager.java b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/utils/permission/PermissionManager.java index dd041f3..62b15f5 100644 --- a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/utils/permission/PermissionManager.java +++ b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/utils/permission/PermissionManager.java @@ -7,6 +7,8 @@ import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.permissions.Permission; +import net.minecraft.server.permissions.Permissions; import net.minecraft.server.players.NameAndId; import org.jetbrains.annotations.NotNull; @@ -88,7 +90,7 @@ public void initPermission() { public static boolean hasPermission( @NotNull CommandSourceStack source, - int mcPermission, + Permission mcPermission, PermissionType modPermission ) { ServerPlayer player = source.getPlayer(); @@ -96,7 +98,7 @@ public static boolean hasPermission( if (checkLocalGamePermission(source)) { return true; } else { - return source.hasPermission(mcPermission) + return source.permissions().hasPermission(mcPermission) || QuickbakcupmultiReforged.getModContainer() .getPermissionManager() .getPlayerPermissionLevel(player.getName().getString()) >= modPermission.level; @@ -114,7 +116,7 @@ public static boolean checkLocalGamePermission(@NotNull CommandSourceStack sourc } private static boolean getPermission(CommandSourceStack source) throws CommandSyntaxException { - boolean flag = source.hasPermission(4); + boolean flag = source.permissions().hasPermission(Permissions.COMMANDS_OWNER); ServerPlayer player; MinecraftServer server; if (!flag && (server = source.getServer()).isSingleplayer() && (player = source.getPlayer()) != null && source.isPlayer()) { diff --git a/gradle.properties b/gradle.properties index 26395a9..2c3b036 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,11 +8,11 @@ mod_id = quickbakcupmulti_reforged archives_name = QuickBakcupMulti-Reforged enabled_platforms = fabric,neoforge # Minecraft properties -minecraft_version = 1.21.10 -minecraft_supported_versions = [1.21.10, ) +minecraft_version = 1.21.11 +minecraft_supported_versions = [1.21.11, ) # Dependencies -fabric_loader_version = 0.17.0 -fabric_api_version = 0.134.1+1.21.10 -neoforge_version = 21.10.50-beta +fabric_loader_version = 0.18.4 +fabric_api_version = 0.139.4+1.21.11 +neoforge_version = 21.11.37-beta incremental_storage_lib_version=1.3.0+build.25111411.36