Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<CommandSourceStack> 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()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -44,7 +45,7 @@ public void run() {
private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HHmmss");

public static final LiteralArgumentBuilder<CommandSourceStack> 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"), ""))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,7 +18,7 @@

public class PermissionCommand {
public static final LiteralArgumentBuilder<CommandSourceStack> 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))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -30,7 +31,7 @@

public class RestoreCommand {
public static final LiteralArgumentBuilder<CommandSourceStack> 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<StorageInfo> backups = BackupManager.getSortedBackups();
Expand All @@ -54,7 +55,7 @@ public class RestoreCommand {
);

public static final LiteralArgumentBuilder<CommandSourceStack> 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());
Expand All @@ -65,7 +66,7 @@ public class RestoreCommand {
});

public static final LiteralArgumentBuilder<CommandSourceStack> 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<CommandSourceStack> 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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -88,15 +90,15 @@ public void initPermission() {

public static boolean hasPermission(
@NotNull CommandSourceStack source,
int mcPermission,
Permission mcPermission,
PermissionType modPermission
) {
ServerPlayer player = source.getPlayer();
if (player != null) {
if (checkLocalGamePermission(source)) {
return true;
} else {
return source.hasPermission(mcPermission)
return source.permissions().hasPermission(mcPermission)
|| QuickbakcupmultiReforged.getModContainer()
.getPermissionManager()
.getPlayerPermissionLevel(player.getName().getString()) >= modPermission.level;
Expand All @@ -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()) {
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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