settings ported to the annotation based system

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

@@ -6,6 +6,8 @@ import carpet.utils.Messenger;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.dedicated.DedicatedServer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static carpet.settings.RuleCategory.BUGFIX;
 import static carpet.settings.RuleCategory.COMMANDS;
@@ -15,8 +17,13 @@ import static carpet.settings.RuleCategory.FEATURE;
 import static carpet.settings.RuleCategory.OPTIMIZATIONS;
 import static carpet.settings.RuleCategory.SURVIVAL;
 
-public class Settings
+public class CarpetSettings
 {
+    public static final String carpetVersion = "v19_06_04alpha";
+    public static final Logger LOG = LogManager.getLogger();
+    public static boolean skipGenerationChecks = false;
+    public static boolean impendingFillSkipUpdates = false;
+
     @Rule(
             desc = "Fixes server crashing supposedly on falling behind 60s in ONE tick, yeah bs.",
             extra = "Fixed 1.12 watchdog crash in 1.13 pre-releases, reintroduced with 1.13, GG.",
@@ -225,7 +232,7 @@ public class Settings
     @Rule(desc = "fill/clone/setblock and structure blocks cause block updates", category = CREATIVE)
     public static boolean fillUpdates = true;
 
-    private class PushLimitLimits extends Validator<Integer> {
+    private static class PushLimitLimits extends Validator<Integer> {
         @Override Integer validate(ServerCommandSource source, ParsedRule<Integer> currentRule, Integer newValue, String string) {
             return (newValue>0 && newValue < 1024) ? newValue : null;
         }
@@ -246,7 +253,7 @@ public class Settings
     )
     public static int railPowerLimit = 9;
 
-    private class FillLimitLimits extends Validator<Integer> {
+    private static class FillLimitLimits extends Validator<Integer> {
         @Override Integer validate(ServerCommandSource source, ParsedRule<Integer> currentRule, Integer newValue, String string) {
             return (newValue>0 && newValue < 20000000) ? newValue : null;
         }
@@ -270,7 +277,7 @@ public class Settings
     @Rule(desc = "One player is required on the server to cause night to pass", category = SURVIVAL)
     public static boolean onePlayerSleeping = false;
 
-    private class SetMotd extends Validator<String> {
+    private static class SetMotd extends Validator<String> {
         @Override String validate(ServerCommandSource source, ParsedRule<String> currentRule, String newValue, String string) {
             customMOTD = newValue; // accelerate a smidge
             ((MinecraftServer_motdInterface) CarpetServer.minecraft_server).checkMOTD();
@@ -289,7 +296,7 @@ public class Settings
     @Rule(desc = "Cactus in dispensers rotates blocks.", extra = "Rotates block anti-clockwise if possible", category = FEATURE)
     public static boolean rotatorBlock = false;
 
-    private class ViewDistanceValidator extends Validator<Integer>
+    private static class ViewDistanceValidator extends Validator<Integer>
     {
         @Override Integer validate(ServerCommandSource source, ParsedRule<Integer> currentRule, Integer newValue, String string)
         {
@@ -323,7 +330,7 @@ public class Settings
     )
     public static int viewDistance = 0;
 
-    private class DisableSpawnChunksValidator extends Validator<Boolean> {
+    private static class DisableSpawnChunksValidator extends Validator<Boolean> {
         @Override Boolean validate(ServerCommandSource source, ParsedRule<Boolean> currentRule, Boolean newValue, String string) {
             if (!newValue)
                 Messenger.m(source, "w Spawn chunks re-enabled. Visit spawn to load them?");
@@ -337,7 +344,7 @@ public class Settings
     )
     public static boolean disableSpawnChunks = false;
 
-    private class KelpLimit extends Validator<Integer> {
+    private static class KelpLimit extends Validator<Integer> {
         @Override Integer validate(ServerCommandSource source, ParsedRule<Integer> currentRule, Integer newValue, String string) {
             return (newValue>=0 && newValue <=25)?newValue:null;
         }

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

@@ -71,8 +71,9 @@ public final class ParsedRule<T> implements Comparable<ParsedRule> {
     }
 
 
-    public ParsedRule<T> set(ServerCommandSource source, String value) {
-        if (CarpetServer.settingsManager.locked)
+    public ParsedRule<T> set(ServerCommandSource source, String value)
+    {
+        if (CarpetServer.settingsManager != null && CarpetServer.settingsManager.locked)
             return null;
         if (type == String.class)
         {
@@ -98,8 +99,10 @@ public final class ParsedRule<T> implements Comparable<ParsedRule> {
         }
     }
 
-    ParsedRule<T> set(ServerCommandSource source, T value, String stringValue) {
-        try {
+    ParsedRule<T> set(ServerCommandSource source, T value, String stringValue)
+    {
+        try
+        {
             for (Validator<T> validator : this.validators)
             {
                 value = validator.validate(source, this, value, stringValue);
@@ -120,55 +123,68 @@ public final class ParsedRule<T> implements Comparable<ParsedRule> {
         return this;
     }
 
-    public T get() {
-        try {
+    public T get()
+    {
+        try
+        {
             return (T) this.field.get(null);
-        } catch (IllegalAccessException e) {
+        }
+        catch (IllegalAccessException e)
+        {
             throw new IllegalStateException(e);
         }
     }
 
-    public String getAsString() {
+    public String getAsString()
+    {
         return convertToString(get());
     }
 
-    public boolean getBoolValue() {
+    public boolean getBoolValue()
+    {
         if (type == boolean.class) return (Boolean) get();
         if (type.isAssignableFrom(Number.class)) return ((Number) get()).doubleValue() > 0;
         return false;
     }
 
-    public boolean isDefault() {
+    public boolean isDefault()
+    {
         return defaultValue.equals(get());
     }
 
-    public void resetToDefault(ServerCommandSource source) {
+    public void resetToDefault(ServerCommandSource source)
+    {
         set(source, defaultValue, defaultAsString);
     }
 
 
-    private static String convertToString(Object value) {
+    private static String convertToString(Object value)
+    {
         if (value instanceof Enum) return ((Enum) value).name().toLowerCase(Locale.ROOT);
         return value.toString();
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(Object obj)
+    {
         return obj.getClass() == ParsedRule.class && ((ParsedRule) obj).name.equals(this.name);
     }
 
     @Override
-    public int hashCode() {
+    public int hashCode()
+    {
         return this.name.hashCode();
     }
 
     @Override
-    public int compareTo(ParsedRule o) {
+    public int compareTo(ParsedRule o)
+    {
         return this.name.compareTo(o.name);
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         return this.name + ": " + getAsString();
     }
 }

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

@@ -1,6 +1,5 @@
 package carpet.settings;
 
-import carpet.CarpetSettings;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.ServerCommandSource;
@@ -35,7 +34,6 @@ public class SettingsManager {
             Rule rule = f.getAnnotation(Rule.class);
             if (rule == null) continue;
             ParsedRule parsed = new ParsedRule(f, rule);
-            CarpetSettings.LOG.error("REGISTERED RULE: "+parsed.name);
             rules.put(parsed.name, parsed);
         }
     }