Merge branch 'master' into 1.15

src/main/java/carpet/commands/TestCommand.java

@@ -16,7 +16,10 @@ public class TestCommand
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher)
     {
         dispatcher.register(literal("test").
-                then(literal("dump").executes((c) -> CarpetServer.settingsManager.printAllRulesToLog())).
+                then(literal("dump").
+                        executes((c) -> CarpetServer.settingsManager.printAllRulesToLog(null)).
+                        then(argument("category", word()).
+                                executes( (c) -> CarpetServer.settingsManager.printAllRulesToLog(getString(c, "category"))))).
                 then(argument("first",word()).
                         executes( (c)-> test(c, getString(c, "first")+" 1"))).
                 then(argument("second", word()).

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

@@ -257,13 +257,15 @@ public class SettingsManager
         }).collect(ImmutableList.toImmutableList());
     }
 
-    public int printAllRulesToLog()
+    public int printAllRulesToLog(String category)
     {
         PrintStream ps = System.out;
         ps.println("# "+fancyName+" Settings");
         for (Map.Entry<String, ParsedRule<?>> e : new TreeMap<>(rules).entrySet())
         {
             ParsedRule<?> rule = e.getValue();
+            if (category != null && !rule.categories.contains(category))
+                continue;
             ps.println("## " + rule.name);
             ps.println(rule.description+"  ");
             for (String extra : rule.extraInfo)