Config refactor

build.gradle

@@ -30,10 +30,10 @@ repositories {
     maven {
         url 'https://maven.neoforged.net/releases'
     }
-    maven {
+    /*maven {
         name = 'papermc'
         url = 'https://repo.papermc.io/repository/maven-public/'
-    }
+    }*/
     maven {
         url "https://libraries.minecraft.net"
     }
@@ -44,6 +44,11 @@ repositories {
         name = "Terraformers"
         url = "https://maven.terraformersmc.com/"
     }
+    maven {
+        name "lemonnik's maven"
+        url "https://maven.lemonnik.dev/releases/"
+    }
+
 }
 
 def use_architectury_loom = project.platform in ['fabric', 'quilt', 'forge', 'neoforge']
@@ -183,6 +188,12 @@ dependencies {
         paperweight.paperDevBundle("${project.minecraft_version}-R0.1-SNAPSHOT")
     }
 
+    if (mcVersion < 260100) {
+        modImplementation "dev.lemonnik:fern_config:${project.fern_version}"
+    } else {
+        implementation "dev.lemonnik:fern_config:${project.fern_version}"
+    }
+
     implementation "net.snackbag.shit:shit:${project.shit_version}"
 }
 
@@ -191,7 +202,7 @@ if (use_architectury_loom) {
         runConfigs.configureEach {
             // to make sure it generates all "Minecraft Client (:subproject_name)" applications
             ideConfigGenerated = true
-            vmArgs ['']
+            vmArgs []
         }
 
         if (project.platform == 'forge') {

fern-updater.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+OLD_PREFIX="1.2.0"
+NEW_PREFIX="1.3.0"
+
+find versions -type f -name "gradle.properties" | while read -r file; do
+    sed -i "s/\(fern_version=\)${OLD_PREFIX}/\1${NEW_PREFIX}/" "$file"
+    echo "Updated $file"
+done

gradle.properties

@@ -8,7 +8,7 @@ dev.kikugie.stonecutter.hard_mode=true
 # Mod Properties
 mod_id=tt20
 mod_name=TT20
-mod_version=0.8.3
+mod_version=1.8.3
 maven_group=net.snackbag
 
 mod_description=TT20 helps reduce lag by optimizing how ticks work when the server's TPS is low.
@@ -24,6 +24,7 @@ shit_version=1.2.3
 # Versioned Dependencies
 minecraft_version=[VERSIONED]
 platform=[VERSIONED]
+fern_version=[VERSIONED]
 
 # Mods
 minecraft_dependency=[VERSIONED]

src/main/java/net/snackbag/tt20/ModUpdater.java

@@ -24,8 +24,8 @@ public class ModUpdater {
     }
 
     public static void check() {
-        if (!TT20.config.automaticUpdater()) {
-            TT20.LOGGER.info("(TT20) Not checking for updates, because the updater is disabled. Current patch: " + TT20.PATCH);
+        if (!TT20.config.enabled.get() || !TT20.config.updateChecker.get()) {
+            TT20.LOGGER.info("(TT20) Not checking for updates, because the updater or mod is disabled. Current patch: " + TT20.PATCH);
             return;
         }
 

src/main/java/net/snackbag/tt20/TT20.java

@@ -25,8 +25,6 @@
 //? 1.18.2
 //import net.minecraft.network.chat.TextComponent;
 
-import net.snackbag.tt20.config.BlockEntityMaskConfig;
-import net.snackbag.tt20.config.MainConfig;
 import net.snackbag.tt20.util.TPSCalculator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,11 +48,10 @@ public class TT20
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 	public static final TPSCalculator TPS_CALCULATOR = new TPSCalculator();
 
-	public static final String VERSION = /*$ mod_version */"0.8.3";
+	public static final String VERSION = /*$ mod_version */"1.8.3";
 	public static final int PATCH = 3;
 
-	public static final MainConfig config = new MainConfig();
-	public static final BlockEntityMaskConfig blockEntityMaskConfig = new BlockEntityMaskConfig();
+	public static final TT20Config config = new TT20Config();
 
 	//? if fabric
 	@Override public void onInitialize()
@@ -71,6 +68,8 @@ public class TT20
 	{
 		LOGGER.info("Starting TT20...");
 
+		config.reload();
+
 		CompletableFuture.runAsync(() -> {
 			try {
 				ModUpdater.check();

src/main/java/net/snackbag/tt20/TT20Command.java

@@ -30,36 +30,34 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
     }
 
     private static int executeStatus(CommandContext<CommandSourceStack> context) {
-        sendMessage(context, literal("§7TT20 enabled: " + (TT20.config.enabled() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Block entity acceleration: " + (TT20.config.blockEntityAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Block breaking acceleration: " + (TT20.config.blockBreakingAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Potion effect acceleration: " + (TT20.config.potionEffectAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Fluid acceleration: " + (TT20.config.fluidAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Pickup acceleration: " + (TT20.config.pickupAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Eating acceleration: " + (TT20.config.eatingAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Portal acceleration: " + (TT20.config.portalAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Sleeping acceleration: " + (TT20.config.sleepingAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Time acceleration: " + (TT20.config.timeAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Bow pull acceleration: " + (TT20.config.bowAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Crossbow pull acceleration: " + (TT20.config.crossbowAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7TNT acceleration: " + (TT20.config.tntAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Vanilla Lagback: " + (TT20.config.vanillaLagback() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Random tickspeed acceleration: " + (TT20.config.randomTickSpeedAcceleration() ? "§aON" : "§cOFF")));
-        sendMessage(context, literal("§7Server watchdog: " + (TT20.config.serverWatchdog() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7TT20 enabled: " + (TT20.config.enabled.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Block entity acceleration: " + (TT20.config.blockEntity.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Block breaking acceleration: " + (TT20.config.blockBreaking.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Potion effect acceleration: " + (TT20.config.potionEffect.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Fluid acceleration: " + (TT20.config.fluid.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Pickup acceleration: " + (TT20.config.pickup.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Eating acceleration: " + (TT20.config.eating.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Portal acceleration: " + (TT20.config.portal.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Sleeping acceleration: " + (TT20.config.sleeping.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Time acceleration: " + (TT20.config.time.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Bow pull acceleration: " + (TT20.config.bow.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Crossbow pull acceleration: " + (TT20.config.crossbow.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7TNT acceleration: " + (TT20.config.tnt.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Vanilla Lagback: " + (TT20.config.lagback.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Random tickspeed acceleration: " + (TT20.config.randomTickSpeed.get() ? "§aON" : "§cOFF")));
+        sendMessage(context, literal("§7Server watchdog: " + (TT20.config.watchdog.get() ? "§aON" : "§cOFF")));
         executeTps(context, false);
         sendMessage(context, literal("\n§8Version: §7" + TT20.VERSION));
         sendMessage(context, literal("§8MSPT: §7" + TT20.TPS_CALCULATOR.getMSPT()));
         sendMessage(context, literal("§8Missed ticks: §7" + TPSUtil.formatMissedTicks(TT20.TPS_CALCULATOR.getAllMissedTicks())));
-        sendMessage(context, literal("§8Automatic updater: §7" + (TT20.config.automaticUpdater() ? "§aenabled" : "§cdisabled")));
+        sendMessage(context, literal("§8Updater checker: §7" + (TT20.config.updateChecker.get() ? "§aenabled" : "§cdisabled")));
 
         return 1;
     }
 
     private static int executeReload(CommandContext<CommandSourceStack> context) {
         TT20.config.reload();
         sendMessage(context, literal("Reloaded config"));
-        TT20.blockEntityMaskConfig.reload();
-        sendMessage(context, literal("Reloaded block entity mask config"));
 
         return 1;
     }
@@ -81,19 +79,19 @@ private static int executeTps(CommandContext<CommandSourceStack> context, boolea
     }
 
     private static int executeToggle(CommandContext<CommandSourceStack> context) {
-        TT20.config.enabled(!TT20.config.enabled());
+        TT20.config.enabled.set(!TT20.config.enabled.get());
         TT20.config.save();
 
-        String enabledText = TT20.config.enabled() ? "enabled" : "disabled";
+        String enabledText = TT20.config.enabled.get() ? "enabled" : "disabled";
         sendMessage(context, literal("TT20 is now " + enabledText));
 
         return 1;
     }
 
 
     private static int executeMain(CommandContext<CommandSourceStack> context) {
-        sendMessage(context, literal("Running TT20 version " + TT20.VERSION));
-        sendMessage(context, literal("Enabled: " + TT20.config.enabled()));
+        sendMessage(context, literal("Running TT20 version " + TT20.VERSION + " (PATCH: " + TT20.PATCH + ")"));
+        sendMessage(context, literal("Enabled: " + TT20.config.enabled.get()));
 
         return 1;
     }

src/main/java/net/snackbag/tt20/TT20Config.java

@@ -0,0 +1,66 @@
+package net.snackbag.tt20;
+
+import dev.lemonnik.fern_config.CConfig;
+import dev.lemonnik.fern_config.CExporter;
+import dev.lemonnik.fern_config.types.CBoolean;
+import dev.lemonnik.fern_config.types.CEnum;
+import dev.lemonnik.fern_config.types.CMask;
+import dev.lemonnik.fern_config.utils.CCategory;
+import dev.lemonnik.fern_config.utils.MaskType;
+
+//? if >1.19.2 {
+import net.minecraft.core.registries.BuiltInRegistries;
+//?} else {
+/*import net.minecraft.core.Registry;
+*///?}
+
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings("deprecation")
+public class TT20Config extends CConfig {
+    @Override
+    public @NotNull String getFileName() {
+        return TT20.MOD_ID;
+    }
+
+    @Override
+    protected @NotNull CExporter.Format getFormat() {
+        return CExporter.Format.JSON5;
+    }
+
+    private static final CCategory MAIN = CCategory.of("main", "Main TT20 configuration");
+
+    public final CBoolean enabled             = register(MAIN, new CBoolean("enabled",           "Controls if TT20 is accelerating anything",                                                        true));
+    public final CBoolean blockEntity         = register(MAIN, new CBoolean("blockEntity",       "ex. furnace work speed, this requires Block Entity Mask to be set up! (causes more lag otherwise)",false));
+    public final CBoolean blockBreaking       = register(MAIN, new CBoolean("blockBreaking",     "block breaking acceleration",                                                                      true));
+    public final CBoolean eating              = register(MAIN, new CBoolean("eating",            "food consumption acceleration",                                                                    true));
+    public final CBoolean potionEffect        = register(MAIN, new CBoolean("potionEffect",      "effect duration acceleration",                                                                     true));
+    public final CBoolean fluid               = register(MAIN, new CBoolean("fluid",             "fluid flow acceleration",                                                                          true));
+    public final CBoolean pickup              = register(MAIN, new CBoolean("pickup",            "item pickup acceleration",                                                                         true));
+    public final CBoolean portal              = register(MAIN, new CBoolean("portal",            "time in portal acceleration",                                                                      true));
+    public final CBoolean sleeping            = register(MAIN, new CBoolean("sleeping",          "time laying in bed acceleration",                                                                  true));
+    public final CBoolean time                = register(MAIN, new CBoolean("time",              "daytime acceleration",                                                                             true));
+    public final CBoolean bow                 = register(MAIN, new CBoolean("bow",               "bow charge acceleration",                                                                          true));
+    public final CBoolean crossbow            = register(MAIN, new CBoolean("crossbow",          "crossbow charge acceleration",                                                                     true));
+    public final CBoolean randomTickSpeed     = register(MAIN, new CBoolean("randomTickSpeed",   "random tick speed acceleration (ex. crop growth)",                                                 true));
+    public final CBoolean tnt                 = register(MAIN, new CBoolean("tnt",               "tnt timer acceleration",                                                                           false));
+    public final CBoolean lagback             = register(MAIN, new CBoolean("lagback",           "vanilla player lagback",                                                                           true));
+    public final CBoolean watchdog            = register(MAIN, new CBoolean("watchdog",          "server watchdog (vanilla's stop server after 1 minute of freeze behaviour)",                       true));
+
+    public final CBoolean updateChecker       = register(MAIN, new CBoolean("updateChecker",      "automatic update checker",                                                                        true));
+
+    public final CMask blockEntityMask        = register(MAIN, new CMask("blocks", "Block Entity Mask configuration, only change this if you know what you're doing!",
+            //? if >1.19.2 {
+            BuiltInRegistries.BLOCK,
+            //?} else {
+            /*Registry.BLOCK,
+            *///?}
+            new CEnum<>(
+                    "type",
+                    "mask type",
+                    MaskType.class,
+                    MaskType.WHITELIST
+            ),
+            "*:*")
+    );
+}