Merge branch 'master' into 1.15

src/main/java/carpet/commands/CameraModeCommand.java

@@ -1,6 +1,7 @@
 package carpet.commands;
 
 import carpet.settings.CarpetSettings;
+import carpet.settings.SettingsManager;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
@@ -21,13 +22,13 @@ public class CameraModeCommand
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
         LiteralArgumentBuilder<ServerCommandSource> camera = literal("c").
-                requires((player) -> CarpetSettings.commandCameramode).
+                requires((player) -> SettingsManager.canUseCommand(player, CarpetSettings.commandCameramode)).
                 executes((c) -> cameraMode(c.getSource(), c.getSource().getPlayer())).
                 then(argument("player", EntityArgumentType.player()).
                         executes( (c) -> cameraMode(c.getSource(), EntityArgumentType.getPlayer(c, "player"))));
 
         LiteralArgumentBuilder<ServerCommandSource> survival = literal("s").
-                requires((player) -> CarpetSettings.commandCameramode).
+                requires((player) -> SettingsManager.canUseCommand(player, CarpetSettings.commandCameramode)).
                 executes((c) -> survivalMode(
                         c.getSource(),
                         c.getSource().getPlayer())).

src/main/java/carpet/commands/DistanceCommand.java

@@ -1,6 +1,7 @@
 package carpet.commands;
 
 import carpet.settings.CarpetSettings;
+import carpet.settings.SettingsManager;
 import carpet.utils.DistanceCalculator;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -15,7 +16,7 @@ public class DistanceCommand
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
         LiteralArgumentBuilder<ServerCommandSource> command = literal("distance").
-                requires((player) -> CarpetSettings.commandDistance).
+                requires((player) -> SettingsManager.canUseCommand(player, CarpetSettings.commandDistance)).
                 then(literal("from").
                         executes( (c) -> DistanceCalculator.setStart(c.getSource(), c.getSource().getPosition())).
                         then(argument("from", Vec3ArgumentType.vec3()).

src/main/java/carpet/commands/DrawCommand.java

@@ -1,6 +1,7 @@
 package carpet.commands;
 
 import carpet.settings.CarpetSettings;
+import carpet.settings.SettingsManager;
 import carpet.utils.Messenger;
 import com.google.common.collect.Lists;
 import com.mojang.brigadier.CommandDispatcher;
@@ -29,7 +30,7 @@ public class DrawCommand
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
         LiteralArgumentBuilder<ServerCommandSource> command = literal("draw").
-                requires((player) -> CarpetSettings.commandDraw).
+                requires((player) -> SettingsManager.canUseCommand(player, CarpetSettings.commandDraw)).
                 then(literal("sphere").
                         then(argument("center",BlockPosArgumentType.blockPos()).
                                 then(argument("radius",IntegerArgumentType.integer(1)).

src/main/java/carpet/commands/InfoCommand.java

@@ -1,6 +1,7 @@
 package carpet.commands;
 
 import carpet.settings.CarpetSettings;
+import carpet.settings.SettingsManager;
 import carpet.utils.BlockInfo;
 import carpet.utils.EntityInfo;
 import carpet.utils.Messenger;
@@ -29,7 +30,7 @@ public class InfoCommand
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
         LiteralArgumentBuilder<ServerCommandSource> command = literal("info").
-                requires((player) -> CarpetSettings.commandInfo).
+                requires((player) -> SettingsManager.canUseCommand(player, CarpetSettings.commandInfo)).
                 then(literal("block").
                         then(argument("block position", BlockPosArgumentType.blockPos()).
                                 executes( (c) -> infoBlock(

src/main/java/carpet/commands/LogCommand.java

@@ -3,6 +3,7 @@ package carpet.commands;
 import carpet.settings.CarpetSettings;
 import carpet.logging.Logger;
 import carpet.logging.LoggerRegistry;
+import carpet.settings.SettingsManager;
 import carpet.utils.Messenger;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
@@ -26,7 +27,7 @@ public class LogCommand
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
         LiteralArgumentBuilder<ServerCommandSource> literalargumentbuilder = CommandManager.literal("log").
-                requires((player) -> CarpetSettings.commandLog).
+                requires((player) -> SettingsManager.canUseCommand(player, CarpetSettings.commandLog)).
                 executes((context) -> listLogs(context.getSource())).
                 then(CommandManager.literal("clear").
                         executes( (c) -> unsubFromAll(c.getSource(), c.getSource().getName())).

src/main/java/carpet/commands/MobAICommand.java

@@ -1,6 +1,7 @@
 package carpet.commands;
 
 import carpet.settings.CarpetSettings;
+import carpet.settings.SettingsManager;
 import carpet.utils.MobAI;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
@@ -18,7 +19,7 @@ public class MobAICommand
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
         LiteralArgumentBuilder<ServerCommandSource> command = literal("track").
-                requires((player) -> CarpetSettings.commandTrackAI).
+                requires((player) -> SettingsManager.canUseCommand(player, CarpetSettings.commandTrackAI)).
                 then(argument("entity type", EntitySummonArgumentType.entitySummon()).
 
                         suggests( (c, b) -> suggestMatching(MobAI.availbleTypes(), b)).

src/main/java/carpet/commands/PerimeterInfoCommand.java

@@ -1,6 +1,7 @@
 package carpet.commands;
 
 import carpet.settings.CarpetSettings;
+import carpet.settings.SettingsManager;
 import carpet.utils.Messenger;
 import carpet.utils.PerimeterDiagnostics;
 import com.mojang.brigadier.CommandDispatcher;
@@ -22,7 +23,7 @@ public class PerimeterInfoCommand
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
         LiteralArgumentBuilder<ServerCommandSource> command = literal("perimeterinfo").
-                requires((player) -> CarpetSettings.commandPerimeterInfo).
+                requires((player) -> SettingsManager.canUseCommand(player, CarpetSettings.commandPerimeterInfo)).
                 executes( (c) -> perimeterDiagnose(
                         c.getSource(),
                         new BlockPos(c.getSource().getPosition()),

src/main/java/carpet/commands/PlayerCommand.java

@@ -4,6 +4,7 @@ import carpet.helpers.EntityPlayerActionPack;
 import carpet.settings.CarpetSettings;
 import carpet.fakes.ServerPlayerEntityInterface;
 import carpet.patches.EntityPlayerMPFake;
+import carpet.settings.SettingsManager;
 import carpet.utils.Messenger;
 import com.google.common.collect.Sets;
 import com.mojang.authlib.GameProfile;
@@ -44,7 +45,7 @@ public class PlayerCommand
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
         LiteralArgumentBuilder<ServerCommandSource> literalargumentbuilder = literal("player")
-                .requires((player) -> CarpetSettings.commandPlayer)
+                .requires((player) -> SettingsManager.canUseCommand(player, CarpetSettings.commandPlayer))
                 .then(argument("player", StringArgumentType.word())
                         .suggests( (c, b) -> suggestMatching(getPlayers(c.getSource()), b))
                         .then(literal("stop").executes(PlayerCommand::stop))

src/main/java/carpet/commands/SpawnCommand.java

@@ -3,6 +3,7 @@ package carpet.commands;
 import carpet.settings.CarpetSettings;
 import carpet.helpers.HopperCounter;
 import carpet.helpers.TickSpeed;
+import carpet.settings.SettingsManager;
 import carpet.utils.Messenger;
 import carpet.utils.SpawnReporter;
 import com.mojang.brigadier.CommandDispatcher;
@@ -37,7 +38,7 @@ public class SpawnCommand
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
         LiteralArgumentBuilder<ServerCommandSource> literalargumentbuilder = literal("spawn").
-                requires((player) -> CarpetSettings.commandSpawn);
+                requires((player) -> SettingsManager.canUseCommand(player, CarpetSettings.commandSpawn));
 
         literalargumentbuilder.
                 then(literal("list").

src/main/java/carpet/commands/TickCommand.java

@@ -2,6 +2,7 @@ package carpet.commands;
 
 import carpet.settings.CarpetSettings;
 import carpet.helpers.TickSpeed;
+import carpet.settings.SettingsManager;
 import carpet.utils.CarpetProfiler;
 import carpet.utils.Messenger;
 import com.mojang.brigadier.CommandDispatcher;
@@ -26,7 +27,7 @@ public class TickCommand
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
         LiteralArgumentBuilder<ServerCommandSource> literalargumentbuilder = literal("tick").
-                requires((player) -> CarpetSettings.commandTick).
+                requires((player) -> SettingsManager.canUseCommand(player, CarpetSettings.commandTick)).
                 then(literal("rate").
                         executes((c) -> queryTps(c.getSource())).
                         then(argument("rate", floatArg(0.1F, 500.0F)).