Remove BPLevel, GodMode, NoStamina, SetWorldLevel, UnlimitEnergy, UnlockTower commands

src/main/java/emu/grasscutter/command/commands/GodModeCommand.java

@@ -1,35 +0,0 @@
-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.player.Player;
-
-import java.util.List;
-
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(label = "godmode", usage = "godmode [on|off|toggle]", permission = "player.godmode", permissionTargeted = "player.godmode.others", description = "commands.godmode.description")
-public final class GodModeCommand implements CommandHandler {
-
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        boolean enabled = !targetPlayer.inGodmode();
-        if (args.size() == 1) {
-            switch (args.get(0).toLowerCase()) {
-                case "on":
-                    enabled = true;
-                    break;
-                case "off":
-                    enabled = false;
-                    break;
-                case "toggle":
-                    break;  // Already toggled
-                default:
-                    break;
-            }
-        }
-
-        targetPlayer.setGodmode(enabled);
-        CommandHandler.sendMessage(sender, translate(sender, "commands.godmode.success", (enabled ? translate(sender, "commands.status.enabled") : translate(sender, "commands.status.disabled")), targetPlayer.getNickname()));
-    }
-}

src/main/java/emu/grasscutter/command/commands/NoStaminaCommand.java

@@ -1,34 +0,0 @@
-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.player.Player;
-
-import java.util.List;
-
-import static emu.grasscutter.utils.Language.translate;
-
-
-@Command(label = "nostamina", usage = "nostamina [on|off|toggle]", aliases = {"ns"}, permission = "player.nostamina", permissionTargeted = "player.nostamina.others", description = "commands.nostamina.description")
-public final class NoStaminaCommand implements CommandHandler {
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        boolean stamina = !targetPlayer.getStamina();
-        if (args.size() == 1) {
-            switch (args.get(0).toLowerCase()) {
-                case "on":
-                    stamina = true;
-                    break;
-                case "off":
-                    stamina = false;
-                    break;
-                default:
-                    // toggled
-                    break;
-            }
-        }
-        targetPlayer.setStamina(stamina); //Set
-
-        CommandHandler.sendMessage(sender, translate(sender, "commands.nostamina.success", (stamina ? translate(sender, "commands.status.enabled") : translate(sender, "commands.status.disabled")), targetPlayer.getNickname()));
-    }
-}

src/main/java/emu/grasscutter/command/commands/SetBPLevelCommand.java

@@ -1,22 +0,0 @@
-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.player.Player;
-
-import java.util.List;
-
-@Command(label = "setbp", usage = "", aliases = "bp",permission = "player.setbp", description = "")
-public final class SetBPLevelCommand implements CommandHandler {
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.size() < 1) {
-            CommandHandler.sendMessage(sender , "Need a arg");
-            return;
-        }
-
-        int level = Integer.parseInt(args.get(0));
-
-        sender.getBattlePassManager().addPoints(level);
-    }
-}

src/main/java/emu/grasscutter/command/commands/SetPropCommand.java

@@ -0,0 +1,205 @@
+package emu.grasscutter.command.commands;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.tower.TowerLevelRecord;
+
+@Command(label = "setprop", usage = "setprop|prop <prop> <value>", aliases = {"prop"}, permission = "player.setprop", permissionTargeted = "player.setprop.others", description = "commands.setProp.description")
+public final class SetPropCommand implements CommandHandler {
+    static enum PseudoProp {
+        NONE,
+        WORLD_LEVEL,
+        TOWER_LEVEL,
+        BP_LEVEL,
+        GOD_MODE,
+        NO_STAMINA,
+        UNLIMITED_ENERGY
+    }
+
+    static class Prop {
+        String name;
+        PlayerProperty prop;
+        PseudoProp pseudoProp;
+
+        public Prop(PlayerProperty prop) {
+            this(prop.toString(), prop, PseudoProp.NONE);
+        }
+
+        public Prop(String name) {
+            this(name, PlayerProperty.PROP_NONE, PseudoProp.NONE);
+        }
+
+        public Prop(String name, PseudoProp pseudoProp) {
+            this(name, PlayerProperty.PROP_NONE, pseudoProp);
+        }
+
+        public Prop(String name, PlayerProperty prop) {
+            this(name, prop, PseudoProp.NONE);
+        }
+
+        public Prop(String name, PlayerProperty prop, PseudoProp pseudoProp) {
+            this.name = name;
+            this.prop = prop;
+            this.pseudoProp = pseudoProp;
+        }
+    }
+    
+    Map<String, Prop> props;
+    
+    public SetPropCommand() {
+        this.props = new HashMap<>();
+        // Full PlayerProperty enum that won't be advertised but can be used by devs
+        for (PlayerProperty prop : PlayerProperty.values()) {
+            String name = prop.toString().substring(5);  // PROP_EXP -> EXP
+            String key = name.toLowerCase();  // EXP -> exp
+            this.props.put(key, new Prop(name, prop));
+        }
+        // Add special props
+        Prop worldlevel = new Prop("World Level", PlayerProperty.PROP_PLAYER_WORLD_LEVEL, PseudoProp.WORLD_LEVEL);
+        this.props.put("worldlevel", worldlevel);
+        this.props.put("wl", worldlevel);
+
+        Prop abyss = new Prop("Tower Level", PseudoProp.TOWER_LEVEL);
+        this.props.put("abyss", abyss);
+        this.props.put("abyssfloor", abyss);
+        this.props.put("ut", abyss);
+        this.props.put("tower", abyss);
+        this.props.put("towerlevel", abyss);
+        this.props.put("unlocktower", abyss);
+
+        Prop bplevel = new Prop("BP Level", PseudoProp.BP_LEVEL);
+        this.props.put("bplevel", bplevel);
+        this.props.put("bp", bplevel);
+        this.props.put("battlepass", bplevel);
+
+        Prop godmode = new Prop("godmode", PseudoProp.GOD_MODE);
+        this.props.put("godmode", godmode);
+        this.props.put("god", godmode);
+
+        Prop nostamina = new Prop("nostamina", PseudoProp.NO_STAMINA);
+        this.props.put("nostamina", nostamina);
+        this.props.put("nostam", nostamina);
+        this.props.put("ns", nostamina);
+
+        Prop unlimitedenergy = new Prop("unlimitedenergy", PseudoProp.UNLIMITED_ENERGY);
+        this.props.put("unlimitedenergy", unlimitedenergy);
+        this.props.put("ue", unlimitedenergy);
+    }
+
+    @Override
+    public void execute(Player sender, Player targetPlayer, List<String> args) {
+        if (args.size() != 2) {
+            CommandHandler.sendTranslatedMessage(sender, "commands.setProp.usage");
+            return;
+        }
+        String propStr = args.get(0).toLowerCase();
+        String valueStr = args.get(1).toLowerCase();
+        int value;
+        
+        if (!props.containsKey(propStr)) {
+            CommandHandler.sendTranslatedMessage(sender, "commands.setProp.usage");
+            return;
+        }
+        try {
+            value = switch(valueStr.toLowerCase()) {
+                case "on", "true" -> 1;
+                case "off", "false" -> 0;
+                case "toggle" -> -1;
+                default -> Integer.parseInt(valueStr);
+            };
+        } catch (NumberFormatException ignored) {
+            CommandHandler.sendTranslatedMessage(sender, "commands.execution.argument_error");
+            return;
+        }
+
+        boolean success = false;
+        Prop prop = props.get(propStr);
+
+        success = switch (prop.pseudoProp) {
+            case WORLD_LEVEL -> targetPlayer.setWorldLevel(value);
+            case BP_LEVEL -> targetPlayer.getBattlePassManager().setLevel(value);
+            case TOWER_LEVEL -> this.setTowerLevel(sender, targetPlayer, value);
+            case GOD_MODE, NO_STAMINA, UNLIMITED_ENERGY -> this.setBool(sender, targetPlayer, prop.pseudoProp, value);
+            default -> targetPlayer.setProperty(prop.prop, value);
+        };
+
+        if (success) {
+            if (targetPlayer == sender) {
+                CommandHandler.sendTranslatedMessage(sender, "commands.generic.set_to", prop.name, valueStr);
+            } else {
+                String uidStr = targetPlayer.getAccount().getId();
+                CommandHandler.sendTranslatedMessage(sender, "commands.generic.set_for_to", prop.name, uidStr, valueStr);
+            }
+        } else {
+            if (prop.prop != PlayerProperty.PROP_NONE) {  // PseudoProps need to do their own error messages
+                String min = Integer.toString(targetPlayer.getPropertyMin(prop.prop));
+                String max = Integer.toString(targetPlayer.getPropertyMax(prop.prop));
+                CommandHandler.sendTranslatedMessage(sender, "commands.generic.invalid.value_between", prop.name, min, max);
+            }
+        }
+    }
+
+    private boolean setTowerLevel(Player sender, Player targetPlayer, int topFloor) {
+        List<Integer> floorIds = targetPlayer.getServer().getTowerScheduleManager().getAllFloors();
+        if (topFloor < 0 || topFloor > floorIds.size()) {
+            String min = Integer.toString(0);
+            String max = Integer.toString(floorIds.size());
+            CommandHandler.sendTranslatedMessage(sender, "commands.generic.invalid.value_between", "Tower Level", min, max);
+            return false;
+        }
+
+        Map<Integer, TowerLevelRecord> recordMap = targetPlayer.getTowerManager().getRecordMap();
+        // Add records for each unlocked floor
+        for (int floor : floorIds.subList(0, topFloor)) {
+            if (!recordMap.containsKey(floor)) {
+                recordMap.put(floor, new TowerLevelRecord(floor));
+            }
+        }
+        // Remove records for each floor past our target
+        for (int floor : floorIds.subList(topFloor, floorIds.size())) {
+            if (recordMap.containsKey(floor)) {
+                recordMap.remove(floor);
+            }
+        }
+        // Six stars required on Floor 8 to unlock Floor 9+
+        if (topFloor > 8) {
+            recordMap.get(floorIds.get(7)).setLevelStars(0, 6);  // levelIds seem to start at 1 for Floor 1 Chamber 1, so this doesn't get shown at all
+        }
+        return true;
+    }
+
+    private boolean setBool(Player sender, Player targetPlayer, PseudoProp pseudoProp, int value) {
+        boolean enabled = switch (pseudoProp) {
+            case GOD_MODE -> targetPlayer.inGodmode();
+            case NO_STAMINA -> targetPlayer.getUnlimitedStamina();
+            case UNLIMITED_ENERGY -> !targetPlayer.getEnergyManager().getEnergyUsage();
+            default -> false;
+        };
+        enabled = switch (value) {
+            case -1 -> !enabled;
+            case 0 -> false;
+            default -> true;
+        };
+
+        switch (pseudoProp) {
+            case GOD_MODE:
+                targetPlayer.setGodmode(enabled);
+                break;
+            case NO_STAMINA:
+                targetPlayer.setUnlimitedStamina(enabled);
+                break;
+            case UNLIMITED_ENERGY:
+                targetPlayer.getEnergyManager().setEnergyUsage(!enabled);
+                break;
+            default:
+                return false;
+        }
+        return true;
+    }
+}

src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java

@@ -10,7 +10,6 @@ import emu.grasscutter.game.entity.EntityAvatar;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
-import static emu.grasscutter.utils.Language.translate;
 
 @Command(label = "setstats", usage = "setstats|stats <stat> <value>", aliases = {"stats"}, permission = "player.setstats", permissionTargeted = "player.setstats.others", description = "commands.setStats.description")
 public final class SetStatsCommand implements CommandHandler {
@@ -65,8 +64,6 @@ public final class SetStatsCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
-        String syntax = sender == null ? translate(sender, "commands.setStats.usage_console") : translate(sender, "commands.setStats.usage_ingame");
-        String usage = syntax + translate(sender, "commands.setStats.help_message");
         String statStr;
         String valueStr;
 
@@ -74,7 +71,7 @@ public final class SetStatsCommand implements CommandHandler {
             statStr = args.get(0).toLowerCase();
             valueStr = args.get(1);
         } else {
-            CommandHandler.sendMessage(sender, usage);
+            CommandHandler.sendTranslatedMessage(sender, "commands.setStats.usage");
             return;
         }
 
@@ -88,7 +85,7 @@ public final class SetStatsCommand implements CommandHandler {
                 value = Float.parseFloat(valueStr);
             }
         } catch (NumberFormatException ignored) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.setStats.value_error"));
+            CommandHandler.sendTranslatedMessage(sender, "commands.generic.invalid.statValue");
             return;
         }
 
@@ -102,13 +99,13 @@ public final class SetStatsCommand implements CommandHandler {
                 valueStr = String.format("%.0f", value);
             }
             if (targetPlayer == sender) {
-                CommandHandler.sendMessage(sender, translate(sender, "commands.setStats.set_self", stat.name, valueStr));
+                CommandHandler.sendTranslatedMessage(sender, "commands.generic.set_to", stat.name, valueStr);
             } else {
                 String uidStr = targetPlayer.getAccount().getId();
-                CommandHandler.sendMessage(sender, translate(sender, "commands.setStats.set_for_uid", stat.name, uidStr, valueStr));
+                CommandHandler.sendTranslatedMessage(sender, "commands.generic.set_for_to", stat.name, uidStr, valueStr);
             }
         } else {
-            CommandHandler.sendMessage(sender, usage);
+            CommandHandler.sendTranslatedMessage(sender, "commands.setStats.usage");
         }
         return;
     }

src/main/java/emu/grasscutter/command/commands/SetWorldLevelCommand.java

@@ -1,39 +0,0 @@
-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.player.Player;
-
-import java.util.List;
-
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(label = "setworldlevel", usage = "setworldlevel <level>",
-        aliases = {"setworldlvl"}, permission = "player.setworldlevel", permissionTargeted = "player.setworldlevel.others", description = "commands.setWorldLevel.description")
-public final class SetWorldLevelCommand implements CommandHandler {
-
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.size() < 1) {
-            CommandHandler.sendMessage(sender, translate(sender, "commands.setWorldLevel.usage"));
-            return;
-        }
-
-        try {
-            int level = Integer.parseInt(args.get(0));
-            if (level > 8 || level < 0) {
-                CommandHandler.sendMessage(sender, translate(sender, "commands.setWorldLevel.value_error"));
-                return;
-            }
-
-            // Set in both world and player props
-            targetPlayer.getWorld().setWorldLevel(level);
-            targetPlayer.setWorldLevel(level);
-
-            CommandHandler.sendMessage(sender, translate(sender, "commands.setWorldLevel.success", Integer.toString(level)));
-        } catch (NumberFormatException ignored) {
-            CommandHandler.sendMessage(null, translate(sender, "commands.setWorldLevel.invalid_world_level"));
-        }
-    }
-}

src/main/java/emu/grasscutter/command/commands/UnlimitEnergyCommand.java

@@ -1,55 +0,0 @@
-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.managers.energy.EnergyManager;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.player.TeamManager;
-import emu.grasscutter.game.props.ElementType;
-import emu.grasscutter.net.proto.PropChangeReasonOuterClass;
-import emu.grasscutter.utils.Position;
-
-import java.util.List;
-
-import static emu.grasscutter.Configuration.GAME_OPTIONS;
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(label = "unlimitenergy", usage = "unlimitenergy [on|off|toggle]", aliases = {"ule"}, permission = "player.unlimitenergy", permissionTargeted = "player.unlimitenergy.others", description = "commands.unlimitenergy.description")
-public final class UnlimitEnergyCommand implements CommandHandler {
-
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if(!GAME_OPTIONS.energyUsage){
-            CommandHandler.sendMessage(sender, translate(sender, "commands.unlimitenergy.config_error"));
-            return;
-        }
-        Boolean status = targetPlayer.getEnergyManager().getEnergyUsage();
-        if (args.size() == 1) {
-            switch (args.get(0).toLowerCase()) {
-                case "on":
-                    status = true;
-                    break;
-                case "off":
-                    status = false;
-                    break;
-                default:
-                    status = !status;
-                    break;
-            }
-        }
-        EnergyManager energyManager=targetPlayer.getEnergyManager();
-        energyManager.setEnergyUsage(!status);
-        // if unlimitEnergy is enable , make currentActiveTeam's Avatar full-energy
-        if (status) {
-            for (EntityAvatar entityAvatar : targetPlayer.getTeamManager().getActiveTeam()) {
-                entityAvatar.addEnergy(1000,
-                        PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_GM,true);
-            }
-        }
-
-        CommandHandler.sendMessage(sender, translate(sender, "commands.unlimitenergy.success", (status ? translate(sender, "commands.status.enabled") : translate(sender, "commands.status.disabled")), targetPlayer.getNickname()));
-    }
-}

src/main/java/emu/grasscutter/command/commands/UnlockTowerCommand.java

@@ -1,32 +0,0 @@
-package emu.grasscutter.command.commands;
-
-import emu.grasscutter.command.Command;
-import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.tower.TowerLevelRecord;
-
-import java.util.List;
-
-import static emu.grasscutter.utils.Language.translate;
-
-@Command(label = "unlocktower", usage = "unlocktower", aliases = {"ut"}, permission = "player.unlocktower", permissionTargeted = "player.unlocktower.others",
-description = "commands.unlocktower.description")
-public class UnlockTowerCommand implements CommandHandler {
-
-    @Override
-    public void execute(Player sender, Player targetPlayer, List<String> args) {
-        unlockFloor(targetPlayer, targetPlayer.getServer().getTowerScheduleManager()
-                .getCurrentTowerScheduleData().getEntranceFloorId());
-
-        unlockFloor(targetPlayer, targetPlayer.getServer().getTowerScheduleManager()
-                .getScheduleFloors());
-
-        CommandHandler.sendMessage(sender, translate(sender, "commands.unlocktower.success"));
-    }
-
-    public void unlockFloor(Player player, List<Integer> floors){
-        floors.stream()
-                .filter(id -> !player.getTowerManager().getRecordMap().containsKey(id))
-                .forEach(id -> player.getTowerManager().getRecordMap().put(id, new TowerLevelRecord(id)));
-    }
-}