Merge branch 'master' into inventory

src/main/java/carpet/commands/CarpetCommand.java

@@ -8,7 +8,9 @@ import carpet.utils.Messenger;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.text.BaseText;
@@ -23,6 +25,14 @@ import static net.minecraft.server.command.CommandSource.suggestMatching;
 
 public class CarpetCommand
 {
+    private static ParsedRule<?> getRule(CommandContext<ServerCommandSource> ctx) throws CommandSyntaxException
+    {
+        String ruleName = StringArgumentType.getString(ctx, "rule");
+        ParsedRule<?> rule = SettingsManager.getRule(ruleName);
+        if (rule == null)
+            throw new SimpleCommandExceptionType(Messenger.c("rb Unknown rule: "+ruleName)).create();
+        return rule;
+    }
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
         LiteralArgumentBuilder<ServerCommandSource> literalargumentbuilder = literal("carpet").requires((player) ->
@@ -41,30 +51,27 @@ public class CarpetCommand
                                 suggests( (c, b)->suggestMatching(SettingsManager.getCategories(), b)).
                                 executes( (c) -> listSettings(c.getSource(),
                                         String.format("CarpetMod Settings matching \"%s\"", StringArgumentType.getString(c, "tag")),
-                                        CarpetServer.settingsManager.getRulesMatching(StringArgumentType.getString(c, "tag"))))));
+                                        CarpetServer.settingsManager.getRulesMatching(StringArgumentType.getString(c, "tag")))))).
+                then(literal("removeDefault").
+                        requires(s -> !CarpetServer.settingsManager.locked).
+                        then(argument("rule", StringArgumentType.word()).
+                                suggests( (c, b) -> suggestMatching(SettingsManager.getRules().stream().map(r -> r.name), b)).
+                                executes((c) -> removeDefault(c.getSource(), getRule(c))))).
+                then(literal("setDefault").
+                        requires(s -> !CarpetServer.settingsManager.locked).
+                        then(argument("rule", StringArgumentType.word()).
+                                suggests( (c, b) -> suggestMatching(SettingsManager.getRules().stream().map(r -> r.name), b)).
+                                then(argument("value", StringArgumentType.word()).
+                                        suggests((c, b)-> suggestMatching(getRule(c).options, b)).
+                                        executes((c) -> setDefault(c.getSource(), getRule(c), StringArgumentType.getString(c, "value")))))).
+                then(argument("rule", StringArgumentType.word()).
+                        suggests( (c, b) -> suggestMatching(SettingsManager.getRules().stream().map(r -> r.name), b)).
+                        requires(s -> !CarpetServer.settingsManager.locked ).
+                        executes( (c) -> displayRuleMenu(c.getSource(),getRule(c))).
+                        then(argument("value", StringArgumentType.word()).
+                                suggests((c, b)-> suggestMatching(getRule(c).options,b)).
+                                executes((c) -> setRule(c.getSource(), getRule(c), StringArgumentType.getString(c, "value")))));
 
-        for (ParsedRule<?> rule: SettingsManager.getRules())
-        {
-            literalargumentbuilder.then(literal(rule.name).executes( (context) ->
-                    displayRuleMenu(context.getSource(),rule)));
-            literalargumentbuilder.then(literal("removeDefault").
-                    requires(s -> !CarpetServer.settingsManager.locked).
-                    then(literal(rule.name).executes((context) ->
-                            removeDefault(context.getSource(), rule))));
-            literalargumentbuilder.then(literal(rule.name).
-                    requires(s -> !CarpetServer.settingsManager.locked).
-                    then(argument("value", StringArgumentType.word()).
-                            suggests((c, b)-> suggestMatching(rule.options,b)).
-                            executes((context) ->
-                                    setRule(context.getSource(), rule, StringArgumentType.getString(context, "value")))));
-            literalargumentbuilder.then(literal("setDefault").
-                    requires(s -> !CarpetServer.settingsManager.locked).
-                    then(literal(rule.name).
-                            then(argument("value", StringArgumentType.word()).
-                                    suggests((c, b)-> suggestMatching(rule.options,b)).
-                                    executes((context) ->
-                                            setDefault(context.getSource(), rule, StringArgumentType.getString(context, "value"))))));
-        }
         dispatcher.register(literalargumentbuilder);
     }
 

src/main/java/carpet/settings/CarpetSettings.java

@@ -25,7 +25,7 @@ import static carpet.settings.RuleCategory.SURVIVAL;
 
 public class CarpetSettings
 {
-    public static final String carpetVersion = "v19_06_24alpha";
+    public static final String carpetVersion = "v190627";
     public static final Logger LOG = LogManager.getLogger();
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;

src/main/java/carpet/settings/ParsedRule.java

@@ -117,7 +117,7 @@ public final class ParsedRule<T> implements Comparable<ParsedRule> {
             if (!value.equals(get()))
             {
                 this.field.set(null, value);
-                SettingsManager.notifyRuleChanged(this, stringValue);
+                SettingsManager.notifyRuleChanged(source, this, stringValue);
             }
         }
         catch (IllegalAccessException e)

src/main/java/carpet/settings/Rule.java

@@ -17,7 +17,7 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-@interface Rule
+public @interface Rule
 {
     /**
      * The rule name, by default the same as the field name

src/main/java/carpet/settings/SettingsManager.java

@@ -7,6 +7,7 @@ import net.minecraft.server.network.ServerPlayerEntity;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.util.TriConsumer;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -25,7 +26,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
 public class SettingsManager
@@ -34,7 +34,7 @@ public class SettingsManager
     private static Map<String, ParsedRule<?>> rules = new HashMap<>();
     public boolean locked;
     private MinecraftServer server;
-    private static List<BiConsumer<ParsedRule<?>, String>> observers = new ArrayList<>();
+    private static List<TriConsumer<ServerCommandSource, ParsedRule<?>, String>> observers = new ArrayList<>();
 
     public SettingsManager(MinecraftServer server)
     {
@@ -53,14 +53,14 @@ public class SettingsManager
         }
     }
 
-    public static void addRuleObserver(BiConsumer<ParsedRule<?>, String> observer)
+    public static void addRuleObserver(TriConsumer<ServerCommandSource, ParsedRule<?>, String> observer)
     {
         observers.add(observer);
     }
 
-    static void notifyRuleChanged(ParsedRule<?> rule, String userTypedValue)
+    static void notifyRuleChanged(ServerCommandSource source, ParsedRule<?> rule, String userTypedValue)
     {
-        observers.forEach(observer -> observer.accept(rule, userTypedValue));
+        observers.forEach(observer -> observer.accept(source, rule, userTypedValue));
     }
 
     public static Iterable<String> getCategories()
@@ -71,7 +71,7 @@ public class SettingsManager
     }
 
 
-    public ParsedRule getRule(String name)
+    public static ParsedRule<?> getRule(String name)
     {
         return rules.get(name);
     }