Remove Server config and change commands to always require op

Author: robotgryphon

neoforge-main/src/main/java/dev/compactmods/machines/CompactMachinesCommon.java

@@ -5,7 +5,6 @@
 import dev.compactmods.machines.compat.InterModCompat;
 import dev.compactmods.machines.feature.CMFeaturePacks;
 import dev.compactmods.machines.gamerule.CMGameRules;
-import dev.compactmods.machines.server.ServerConfig;
 import dev.compactmods.machines.dimension.Dimension;
 import dev.compactmods.machines.dimension.WorldBorderFixer;
 import dev.compactmods.machines.machine.Machines;
@@ -39,7 +38,6 @@ public CompactMachinesCommon(IEventBus modBus, ModContainer modContainer) {
 
     private static void initConfigs(ModContainer modContainer) {
         modContainer.registerConfig(ModConfig.Type.COMMON, CommonConfig.CONFIG);
-        modContainer.registerConfig(ModConfig.Type.SERVER, ServerConfig.CONFIG);
     }
 
     private static void prepare() {

neoforge-main/src/main/java/dev/compactmods/machines/command/CMGiveMachineSubcommand.java

@@ -10,7 +10,6 @@
 import dev.compactmods.machines.i18n.RoomTranslations;
 import dev.compactmods.machines.api.room.template.RoomTemplateHelper;
 import dev.compactmods.machines.command.argument.Suggestors;
-import dev.compactmods.machines.server.ServerConfig;
 import dev.compactmods.machines.machine.Machines;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
@@ -27,7 +26,7 @@ public class CMGiveMachineSubcommand {
 
     public static LiteralArgumentBuilder<CommandSourceStack> make() {
         final var subRoot = Commands.literal("give")
-                .requires(cs -> cs.hasPermission(ServerConfig.giveMachineLevel()));
+                .requires(cs -> cs.hasPermission(Commands.LEVEL_GAMEMASTERS));
 
 
         // /cm give new [template]

neoforge-main/src/main/java/dev/compactmods/machines/command/CMRebindSubcommand.java

@@ -7,7 +7,6 @@
 import dev.compactmods.machines.api.CompactMachines;
 import dev.compactmods.machines.i18n.MachineTranslations;
 import dev.compactmods.machines.LoggingUtil;
-import dev.compactmods.machines.server.ServerConfig;
 import dev.compactmods.machines.machine.block.BoundCompactMachineBlockEntity;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
@@ -17,7 +16,7 @@ public class CMRebindSubcommand {
 
     public static LiteralArgumentBuilder<CommandSourceStack> make() {
         final var subRoot = Commands.literal("rebind")
-                .requires(cs -> cs.hasPermission(ServerConfig.rebindLevel()));
+                .requires(cs -> cs.hasPermission(Commands.LEVEL_GAMEMASTERS));
 
         subRoot.then(Commands.argument("pos", BlockPosArgument.blockPos())
                 .then(Commands.argument("bindTo", StringArgumentType.string())

neoforge-main/src/main/java/dev/compactmods/machines/command/CMTeleportSubcommand.java

@@ -10,7 +10,6 @@
 import dev.compactmods.machines.i18n.RoomTranslations;
 import dev.compactmods.machines.api.room.history.RoomEntryPoint;
 import dev.compactmods.machines.command.argument.Suggestors;
-import dev.compactmods.machines.server.ServerConfig;
 import dev.compactmods.machines.room.RoomHelper;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
@@ -25,7 +24,7 @@ public class CMTeleportSubcommand {
 
     public static LiteralArgumentBuilder<CommandSourceStack> make() {
         final var subRoot = Commands.literal("tp")
-                .requires(cs -> cs.hasPermission(ServerConfig.giveMachineLevel()));
+                .requires(cs -> cs.hasPermission(Commands.LEVEL_GAMEMASTERS));
 
         subRoot.then(Commands.argument("room", StringArgumentType.string())
                 .suggests(Suggestors.ROOM_CODES)

neoforge-main/src/main/java/dev/compactmods/machines/command/CMUnbindSubcommand.java

@@ -6,7 +6,6 @@
 import dev.compactmods.machines.LoggingUtil;
 import dev.compactmods.machines.api.dimension.CompactDimension;
 import dev.compactmods.machines.i18n.MachineTranslations;
-import dev.compactmods.machines.server.ServerConfig;
 import dev.compactmods.machines.machine.Machines;
 import dev.compactmods.machines.machine.block.BoundCompactMachineBlockEntity;
 import net.minecraft.commands.CommandSourceStack;
@@ -18,7 +17,7 @@ public class CMUnbindSubcommand {
 
     public static LiteralArgumentBuilder<CommandSourceStack> make() {
         final var subRoot = Commands.literal("unbind")
-                .requires(cs -> cs.hasPermission(ServerConfig.rebindLevel()));
+                .requires(cs -> cs.hasPermission(Commands.LEVEL_GAMEMASTERS));
 
         subRoot.then(Commands.argument("pos", BlockPosArgument.blockPos())
                 .executes(CMUnbindSubcommand::doUnbind));

neoforge-main/src/main/java/dev/compactmods/machines/command/RoomUpgradesSubcommand.java

@@ -10,7 +10,6 @@
 import dev.compactmods.machines.command.argument.Suggestors;
 import dev.compactmods.machines.feature.CMFeatureFlags;
 import dev.compactmods.machines.room.upgrade.RoomUpgrades;
-import dev.compactmods.machines.server.ServerConfig;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.commands.arguments.ResourceLocationArgument;
@@ -27,7 +26,8 @@ public class RoomUpgradesSubcommand {
 
     public static LiteralArgumentBuilder<CommandSourceStack> make() {
         final var subRoot = Commands.literal("upgrades")
-                .requires(cs -> CMFeatureFlags.ROOM_UPGRADES.isSubsetOf(cs.enabledFeatures()) && cs.hasPermission(ServerConfig.giveMachineLevel()));
+                .requires(cs -> CMFeatureFlags.ROOM_UPGRADES.isSubsetOf(cs.enabledFeatures())
+                        && cs.hasPermission(Commands.LEVEL_GAMEMASTERS));
 
         // /cm upgrades add [id]
         subRoot.then(Commands.literal("add")

neoforge-main/src/main/java/dev/compactmods/machines/command/SpawnSubcommand.java

@@ -5,7 +5,6 @@
 import com.mojang.brigadier.context.CommandContext;
 import dev.compactmods.machines.api.CompactMachines;
 import dev.compactmods.machines.i18n.CommandTranslations;
-import dev.compactmods.machines.server.ServerConfig;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.network.chat.Component;
@@ -16,7 +15,7 @@ public class SpawnSubcommand {
         final var spawnRoot = Commands.literal("spawn");
 
         final var resetSpawn = Commands.literal("reset")
-                .requires(cs -> cs.hasPermission(ServerConfig.changeRoomSpawn()))
+                .requires(cs -> cs.hasPermission(Commands.LEVEL_GAMEMASTERS))
                 .then(Commands.argument("room", StringArgumentType.string())
                         .executes(SpawnSubcommand::resetRoomSpawn));