feat: experiment with a custom config system

build.gradle.kts

@@ -21,8 +21,6 @@ architectury.common(stonecutter.tree.branches.mapNotNull {
 })
 
 repositories {
-    maven("https://maven.shedaniel.me/")
-    maven("https://maven.isxander.dev/releases")
     maven("https://maven.parchmentmc.org")
 }
 
@@ -36,8 +34,6 @@ dependencies {
     })
 
     modImplementation("net.fabricmc:fabric-loader:${prop("fabric", "loaderVersion")}")
-
-    modCompileOnly("dev.isxander:yet-another-config-lib:${prop("yacl", "version")}")
 }
 
 loom {

fabric/src/main/java/me/chrr/scribble/fabric/ModMenuCompat.java

@@ -3,18 +3,12 @@
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 import me.chrr.scribble.Scribble;
-import net.fabricmc.loader.api.FabricLoader;
 import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
 
 @NullMarked
 public class ModMenuCompat implements ModMenuApi {
     @Override
-    public @Nullable ConfigScreenFactory<?> getModConfigScreenFactory() {
-        if (FabricLoader.getInstance().isModLoaded("yet_another_config_lib_v3")) {
-            return Scribble::buildConfigScreen;
-        }
-
-        return null;
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return Scribble::buildConfigScreen;
     }
 }

fabric/src/main/java/me/chrr/scribble/fabric/ScribbleFabric.java

@@ -14,11 +14,6 @@ public void onInitializeClient() {
         Scribble.init(this);
     }
 
-    @Override
-    protected boolean isModLoaded(String modId) {
-        return FabricLoader.getInstance().isModLoaded(modId);
-    }
-
     @Override
     protected String getModVersion() {
         return FabricLoader.getInstance().getModContainer(Scribble.MOD_ID)

gradle.properties

@@ -19,7 +19,6 @@ neoforge.version=[versioned]
 
 # Dependencies
 modmenu.version=11.0.2
-yacl.version=3.8.1+1.21.11-fabric
 
 # Distribution
 modrinth.id=yXAvIk0x

neoforge/src/main/java/me/chrr/scribble/neoforge/ScribbleNeoForge.java

@@ -17,15 +17,8 @@ public class ScribbleNeoForge extends Scribble.Platform {
     public ScribbleNeoForge(ModContainer mod) {
         Scribble.init(this);
 
-        if (Scribble.platform().HAS_YACL) {
-            mod.registerExtensionPoint(IConfigScreenFactory.class,
-                    (container, parent) -> Scribble.buildConfigScreen(parent));
-        }
-    }
-
-    @Override
-    protected boolean isModLoaded(String modId) {
-        return ModList.get().isLoaded(modId);
+        mod.registerExtensionPoint(IConfigScreenFactory.class,
+                (container, parent) -> Scribble.buildConfigScreen(parent));
     }
 
     @Override

src/main/java/me/chrr/scribble/Scribble.java

@@ -1,9 +1,7 @@
 package me.chrr.scribble;
 
 import me.chrr.scribble.book.FileChooser;
-import me.chrr.scribble.config.Config;
-import me.chrr.scribble.config.ConfigManager;
-import me.chrr.scribble.config.YACLConfigScreenFactory;
+import me.chrr.tapestry.config.gui.TapestryConfigScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.resources.Identifier;
 import org.apache.logging.log4j.LogManager;
@@ -13,24 +11,18 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Optional;
+import java.util.Objects;
 
 @NullMarked
 public class Scribble {
     public static final String MOD_ID = "scribble";
     public static final Logger LOGGER = LogManager.getLogger();
 
-    private static final ConfigManager CONFIG_MANAGER = new ConfigManager();
     private static @Nullable Platform PLATFORM;
 
     public static void init(Platform platform) {
         PLATFORM = platform;
-
-        try {
-            CONFIG_MANAGER.load();
-        } catch (IOException e) {
-            LOGGER.error("failed to load config", e);
-        }
+        ScribbleConfig.INSTANCE.ensureLoaded();
 
         try {
             FileChooser.convertLegacyBooks();
@@ -40,15 +32,11 @@ public static void init(Platform platform) {
     }
 
     public static Screen buildConfigScreen(Screen parent) {
-        return YACLConfigScreenFactory.create(CONFIG_MANAGER, parent);
+        return new TapestryConfigScreen(parent, ScribbleConfig.INSTANCE);
     }
 
     public static Platform platform() {
-        return Optional.ofNullable(PLATFORM).orElseThrow();
-    }
-
-    public static Config config() {
-        return CONFIG_MANAGER.getConfig();
+        return Objects.requireNonNull(PLATFORM);
     }
 
     public static Identifier id(String path) {
@@ -60,9 +48,6 @@ public abstract static class Platform {
         public final Path BOOK_DIR = getGameDir().resolve("books");
 
         public final String VERSION = getModVersion();
-        public final boolean HAS_YACL = isModLoaded("yet_another_config_lib_v3");
-
-        protected abstract boolean isModLoaded(String modId);
 
         protected abstract String getModVersion();
 

src/main/java/me/chrr/scribble/ScribbleConfig.java

@@ -0,0 +1,55 @@
+package me.chrr.scribble;
+
+import com.google.gson.JsonObject;
+import me.chrr.tapestry.config.Binding;
+import me.chrr.tapestry.config.reflect.NamingStrategy;
+import me.chrr.tapestry.config.reflect.ReflectedConfig;
+import me.chrr.tapestry.config.reflect.annotation.*;
+import org.jspecify.annotations.NullMarked;
+
+import java.util.List;
+
+@NullMarked
+@TranslateDisplayNames(prefix = "config.scribble")
+@SerializeName.Strategy(NamingStrategy.SNAKE_CASE)
+public class ScribbleConfig extends ReflectedConfig {
+    public static final ScribbleConfig INSTANCE = load(() -> Scribble.platform().CONFIG_DIR,
+            ScribbleConfig.class, "scribble.client.json", List.of("scribble.json"));
+
+
+    @Header("appearance")
+    @Rebind.Display("doublePageViewing")
+    @DisplayName("double_page_viewing")
+    public int pagesToShow = 1;
+    public boolean centerBookGui = true;
+    public ShowActionButtons showActionButtons = ShowActionButtons.WHEN_EDITING;
+
+    @Header("behaviour")
+    public boolean copyFormattingCodes = true;
+    @Slider.Int(min = 8, max = 128)
+    public int editHistorySize = 32;
+
+    @Header("miscellaneous")
+    public boolean openVanillaBookScreenOnShift = false;
+
+
+    @SuppressWarnings("unused")
+    private final transient Binding<Boolean> doublePageViewing = Binding.of(Boolean.class,
+            () -> this.pagesToShow > 1, (value) -> this.pagesToShow = value ? 2 : 1);
+
+    @UpgradeRewriter(currentVersion = 3)
+    public static void upgrade(int fromVersion, JsonObject config) {
+        if (fromVersion < 3) {
+            // 'show_save_load_buttons' was removed.
+            config.addProperty("show_action_buttons",
+                    config.get("show_save_load_buttons").getAsBoolean() ? "WHEN_EDITING" : "NEVER");
+        }
+    }
+
+
+    public enum ShowActionButtons {
+        ALWAYS,
+        WHEN_EDITING,
+        NEVER,
+    }
+}