Forge cloth config integration

Author: evanbones

forge/src/main/java/org/infernalstudios/celesteconfig/CelestialConfigration.java

@@ -1,20 +1,56 @@
 package org.infernalstudios.celesteconfig;
 
+import me.shedaniel.clothconfig2.api.ConfigBuilder;
+import me.shedaniel.clothconfig2.api.ConfigCategory;
+import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import net.minecraftforge.client.ConfigScreenHandler;
+import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.config.ModConfigEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.infernalstudios.celesteconfig.config.CelestialConfigOptions;
 
 @Mod(Constants.MOD_ID)
 public class CelestialConfigration {
 
     public CelestialConfigration() {
         CelestialConfigOptions.init();
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onConfigLoad);
         CommonClass.init(CelestialConfigOptions.getMoonWidthScalar(), CelestialConfigOptions.getMoonHeightScalar(), CelestialConfigOptions.getSunWidthScalar(), CelestialConfigOptions.getSunHeightScalar());
+
+        ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () ->
+                new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> buildConfigScreen(parent)));
     }
 
-    public void onConfigLoad(ModConfigEvent event) {
-        CommonClass.init(CelestialConfigOptions.getMoonWidthScalar(), CelestialConfigOptions.getMoonHeightScalar(), CelestialConfigOptions.getSunWidthScalar(), CelestialConfigOptions.getSunHeightScalar());
+    public Screen buildConfigScreen(Screen parent) {
+        ConfigBuilder builder = ConfigBuilder.create()
+                .setParentScreen(parent)
+                .setTitle(Component.translatable("text.autoconfig.celesteconfig.title"));
+
+        ConfigCategory general = builder.getOrCreateCategory(Component.translatable("text.autoconfig.celesteconfig.title"));
+        ConfigEntryBuilder entryBuilder = builder.entryBuilder();
+
+        general.addEntry(entryBuilder.startDoubleField(Component.translatable("text.autoconfig.celesteconfig.option.moonWidth"), CelestialConfigOptions.getMoonWidthScalar())
+                .setDefaultValue(1.0D)
+                .setSaveConsumer(CelestialConfigOptions::setMoonWidthScalar)
+                .build());
+
+        general.addEntry(entryBuilder.startDoubleField(Component.translatable("text.autoconfig.celesteconfig.option.moonHeight"), CelestialConfigOptions.getMoonHeightScalar())
+                .setDefaultValue(1.0D)
+                .setSaveConsumer(CelestialConfigOptions::setMoonHeightScalar)
+                .build());
+
+        general.addEntry(entryBuilder.startDoubleField(Component.translatable("text.autoconfig.celesteconfig.option.sunWidth"), CelestialConfigOptions.getSunWidthScalar())
+                .setDefaultValue(1.0D)
+                .setSaveConsumer(CelestialConfigOptions::setSunWidthScalar)
+                .build());
+
+        general.addEntry(entryBuilder.startDoubleField(Component.translatable("text.autoconfig.celesteconfig.option.sunHeight"), CelestialConfigOptions.getSunHeightScalar())
+                .setDefaultValue(1.0D)
+                .setSaveConsumer(CelestialConfigOptions::setSunHeightScalar)
+                .build());
+
+        builder.setSavingRunnable(() -> CommonClass.init(CelestialConfigOptions.getMoonWidthScalar(), CelestialConfigOptions.getMoonHeightScalar(), CelestialConfigOptions.getSunWidthScalar(), CelestialConfigOptions.getSunHeightScalar()));
+
+        return builder.build();
     }
 }

forge/src/main/java/org/infernalstudios/celesteconfig/config/CelestialConfigOptions.java

@@ -23,7 +23,7 @@ public static void init() {
         moonWidthScalar = client_builder.comment("Moon Width Scalar").defineInRange("celesteconfig.moon.width", 1.0D, 0.0D, 100.0D);
         moonHeightScalar = client_builder.comment("Moon Height Scalar").defineInRange("celesteconfig.moon.height", 1.0D, 0.0D, 100.0D);
         sunWidthScalar = client_builder.comment("Sun Width Scalar").defineInRange("celesteconfig.sun.width", 1.0D, 0.0D, 100.0D);
-        sunHeightScalar = client_builder.comment("Moon Height Scalar").defineInRange("celesteconfig.sun.height", 1.0D, 0.0D, 100.0D);
+        sunHeightScalar = client_builder.comment("Sun Height Scalar").defineInRange("celesteconfig.sun.height", 1.0D, 0.0D, 100.0D);
         client_config = client_builder.build();
 
         ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, CelestialConfigOptions.client_config);
@@ -37,16 +37,36 @@ public static double getMoonWidthScalar() {
         return moonWidthScalar.get();
     }
 
+    public static void setMoonWidthScalar(double value) {
+        moonWidthScalar.set(value);
+        client_config.save();
+    }
+
     public static double getMoonHeightScalar() {
         return moonHeightScalar.get();
     }
 
+    public static void setMoonHeightScalar(double value) {
+        moonHeightScalar.set(value);
+        client_config.save();
+    }
+
     public static double getSunWidthScalar() {
         return sunWidthScalar.get();
     }
 
+    public static void setSunWidthScalar(double value) {
+        sunWidthScalar.set(value);
+        client_config.save();
+    }
+
     public static double getSunHeightScalar() {
         return sunHeightScalar.get();
     }
 
+    public static void setSunHeightScalar(double value) {
+        sunHeightScalar.set(value);
+        client_config.save();
+    }
+
 }