Switch from Cloth Config to NeoForge's config system (#1066)

Author: Technici4n

build.gradle

@@ -277,8 +277,6 @@ dependencies {
         throw new GradleException("Invalid runtime_itemlist_mod value: " + project.runtime_itemlist_mod)
     }
 
-    implementation "me.shedaniel.cloth:cloth-config-neoforge:${project.cloth_config_version}"
-
     localRuntimeOnly compileOnly("curse.maven:jade-324717:${project.jade_file_id}")
 
     // TODO: compileOnly because implementation will cause datagen to crash... hopefully kubejs fixes it soon
@@ -297,7 +295,6 @@ var generateModMetadata = tasks.register("generateModMetadata", ProcessResources
             neo_version: neo_version,
             neo_version_range: neo_version_range,
             mod_version: version,
-            cloth_config_version_range: cloth_config_version_range,
             grandpower_version_range: grandpower_version_range,
             guideme_version_range: guideme_version_range,
             ae2_version_range: ae2_version_range,
@@ -394,7 +391,6 @@ if (System.getenv("CURSEFORGE_API_KEY") && !version.endsWith("-SNAPSHOT")) {
             addGameVersion "Java 21"
 
             relations {
-                requiredDependency "cloth-config"
                 requiredDependency "guideme"
                 optionalDependency "wthit"
                 optionalDependency "emi"
@@ -426,7 +422,6 @@ modrinth {
     gameVersions = [project.minecraft_version]
     loaders = ["neoforge"]
     dependencies {
-        required.project "cloth-config"
         required.project "guideme"
         optional.project "wthit"
         optional.project "emi"

gradle.properties

@@ -25,8 +25,6 @@ modrinth_project=Gov5Dboq
 runtime_itemlist_mod=emi
 
 # Dependency versions
-cloth_config_version=15.0.128
-cloth_config_version_range=[15.0.128, 16)
 grandpower_version=3.0.0
 grandpower_version_range=[3.0.0, 4)
 guideme_version=21.1.5

src/client/java/aztech/modern_industrialization/MIClient.java

@@ -30,6 +30,8 @@
 import aztech.modern_industrialization.blocks.storage.barrel.client.BarrelTooltipComponent;
 import aztech.modern_industrialization.blocks.storage.tank.TankRenderer;
 import aztech.modern_industrialization.client.MIRenderTypes;
+import aztech.modern_industrialization.config.MIClientConfig;
+import aztech.modern_industrialization.config.MIStartupConfig;
 import aztech.modern_industrialization.datagen.MIDatagenClient;
 import aztech.modern_industrialization.datagen.MIDatagenServer;
 import aztech.modern_industrialization.datagen.model.DelegatingModelBuilder;
@@ -70,7 +72,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Supplier;
-import me.shedaniel.autoconfig.AutoConfig;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
@@ -88,6 +89,7 @@
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.fml.config.ModConfig;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.fml.event.lifecycle.FMLConstructModEvent;
 import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent;
@@ -99,6 +101,7 @@
 import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
 import net.neoforged.neoforge.client.event.RegisterRenderBuffersEvent;
 import net.neoforged.neoforge.client.event.RenderFrameEvent;
+import net.neoforged.neoforge.client.gui.ConfigurationScreen;
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 import net.neoforged.neoforge.client.gui.VanillaGuiLayers;
 import net.neoforged.neoforge.common.NeoForge;
@@ -114,6 +117,9 @@ private static void init(FMLConstructModEvent ignored) {
         Objects.requireNonNull(modBus);
         var modContainer = ModLoadingContext.get().getActiveContainer();
 
+        modContainer.registerConfig(ModConfig.Type.CLIENT, MIClientConfig.SPEC);
+        modContainer.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new);
+
         NeoForge.EVENT_BUS.addListener(SteamDrillHighlight::onBlockHighlight);
         NeoForge.EVENT_BUS.addListener(MachineOverlayClient::onBlockOutline);
         DeferredBarrelTextRenderer.init();
@@ -132,7 +138,7 @@ private static void init(FMLConstructModEvent ignored) {
 
             // Apparently tooltips are accessed from the main menu, or something, hence the
             // != null check
-            if (Minecraft.getInstance().level != null && !MIConfig.getConfig().disableFuelTooltips) {
+            if (Minecraft.getInstance().level != null && MIClientConfig.INSTANCE.fuelTooltips.getAsBoolean()) {
                 try {
                     int fuelTime = event.getItemStack().getBurnTime(null);
                     if (fuelTime > 0) {
@@ -144,7 +150,7 @@ private static void init(FMLConstructModEvent ignored) {
                 }
             }
 
-            if (event.getFlags().isAdvanced() && !MIConfig.getConfig().disableItemTagTooltips) {
+            if (event.getFlags().isAdvanced() && MIClientConfig.INSTANCE.itemTagTooltips.getAsBoolean()) {
                 var ids = event.getItemStack().getTags().map(TagKey::location).sorted().toList();
                 for (ResourceLocation id : ids) {
                     event.getToolTip().add(Component.literal("#" + id).setStyle(TextHelper.GRAY_TEXT));
@@ -161,10 +167,6 @@ private static void init(FMLConstructModEvent ignored) {
                     false);
         });
 
-        modContainer.registerExtensionPoint(
-                IConfigScreenFactory.class,
-                (mc, parentScreen) -> AutoConfig.getConfigScreen(MIConfig.class, parentScreen).get());
-
         modBus.addListener(RegisterRenderBuffersEvent.class, event -> {
             event.registerRenderBuffer(MIRenderTypes.cutoutHighlight());
         });
@@ -173,13 +175,13 @@ private static void init(FMLConstructModEvent ignored) {
         if (!ModList.get().isLoaded("emi") && !ModList.get().isLoaded("jei")
                 && !ModList.get().isLoaded("roughlyenoughitems")) {
             NeoForge.EVENT_BUS.addListener(ClientPlayerNetworkEvent.LoggingIn.class, event -> {
-                if (MIConfig.getConfig().enableNoEmiMessage) {
+                if (MIClientConfig.INSTANCE.missingRecipeViewerMessage.getAsBoolean()) {
                     event.getPlayer().displayClientMessage(MIText.NoEmi.text().withStyle(ChatFormatting.GOLD), false);
                 }
             });
         }
 
-        if (MIConfig.getConfig().datagenOnStartup) {
+        if (MIStartupConfig.INSTANCE.datagenOnStartup.getAsBoolean()) {
             modBus.addListener(AddPackFindersEvent.class, event -> {
                 if (event.getPackType() == PackType.CLIENT_RESOURCES) {
                     RuntimeDataGen.run(MIDatagenClient::configure, MIDatagenServer::configure);

src/client/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelRenderer.java

@@ -23,7 +23,7 @@
  */
 package aztech.modern_industrialization.blocks.storage.barrel;
 
-import aztech.modern_industrialization.MIConfig;
+import aztech.modern_industrialization.config.MIClientConfig;
 import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant;
 import aztech.modern_industrialization.util.RenderHelper;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -56,7 +56,7 @@ public void render(@NotNull BarrelBlockEntity entity, float tickDelta, @NotNull
             RenderHelper.drawLockedTexture(entity, matrices, vertexConsumers, itemNameColor);
         }
 
-        if (!MIConfig.getConfig().enableBarrelContentRendering) {
+        if (!MIClientConfig.INSTANCE.barrelContentRendering.getAsBoolean()) {
             return;
         }
         int nesting = barrelNesting.get();

src/client/java/aztech/modern_industrialization/items/armor/HudRenderer.java

@@ -23,8 +23,8 @@
  */
 package aztech.modern_industrialization.items.armor;
 
-import aztech.modern_industrialization.MIConfig;
 import aztech.modern_industrialization.MIText;
+import aztech.modern_industrialization.config.MIClientConfig;
 import aztech.modern_industrialization.items.FluidFuelItemHelper;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.DeltaTracker;
@@ -41,7 +41,7 @@ public static void onRenderHud(GuiGraphics guiGraphics, DeltaTracker deltaTracke
         Minecraft mc = Minecraft.getInstance();
         if (mc.player != null) {
             guiGraphics.pose().pushPose();
-            guiGraphics.pose().translate(0, MIConfig.getConfig().armorHudYPosition, 0);
+            guiGraphics.pose().translate(0, MIClientConfig.INSTANCE.armorHudYPosition.getAsInt(), 0);
             ItemStack chest = mc.player.getItemBySlot(EquipmentSlot.CHEST);
             if (chest.getItem() instanceof JetpackItem jetpack) {
                 boolean active = jetpack.isActivated(chest);

src/client/java/aztech/modern_industrialization/machines/multiblocks/MultiblockMachineBER.java

@@ -23,8 +23,8 @@
  */
 package aztech.modern_industrialization.machines.multiblocks;
 
-import aztech.modern_industrialization.MIConfig;
 import aztech.modern_industrialization.MITags;
+import aztech.modern_industrialization.config.MIClientConfig;
 import aztech.modern_industrialization.machines.MachineBlock;
 import aztech.modern_industrialization.machines.MachineBlockEntityRenderer;
 import aztech.modern_industrialization.util.RenderHelper;
@@ -70,7 +70,7 @@ public void render(MultiblockMachineBlockEntity be, float tickDelta, PoseStack m
 
                 HatchFlags hatchFlag = matcher.getHatchFlags(pos);
                 if (hatchType != null) {
-                    if (MIConfig.getConfig().enableHatchPlacementOverlay && hatchFlag != null && hatchFlag.allows(hatchType)) {
+                    if (MIClientConfig.INSTANCE.hatchPlacementOverlay.getAsBoolean() && hatchFlag != null && hatchFlag.allows(hatchType)) {
                         // Highlight placeable hatches in green
                         matrices.translate(-0.005, -0.005, -0.005);
                         matrices.scale(1.01f, 1.01f, 1.01f);

src/client/java/aztech/modern_industrialization/misc/version/VersionEvents.java

@@ -24,8 +24,8 @@
 package aztech.modern_industrialization.misc.version;
 
 import aztech.modern_industrialization.MI;
-import aztech.modern_industrialization.MIConfig;
 import aztech.modern_industrialization.MIText;
+import aztech.modern_industrialization.config.MIClientConfig;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -103,7 +103,7 @@ private static Version fetchVersion(boolean isIncludeAlphaVersion) throws Except
     public static void startVersionCheck(ModContainer miContainer, LocalPlayer player) {
         new Thread(() -> {
             try {
-                if (MIConfig.getConfig().newVersionMessage) {
+                if (MIClientConfig.INSTANCE.newVersionMessage.getAsBoolean()) {
                     String currentVersion = miContainer.getModInfo().getVersion().toString();
                     Version lastVersion = fetchVersion(currentVersion.contains(alphaPostfix));
 

src/client/java/aztech/modern_industrialization/pipes/MIPipesClient.java

@@ -24,9 +24,9 @@
 package aztech.modern_industrialization.pipes;
 
 import aztech.modern_industrialization.MI;
-import aztech.modern_industrialization.MIConfig;
 import aztech.modern_industrialization.MIItem;
 import aztech.modern_industrialization.MIText;
+import aztech.modern_industrialization.config.MIStartupConfig;
 import aztech.modern_industrialization.pipes.api.PipeNetworkType;
 import aztech.modern_industrialization.pipes.api.PipeRenderer;
 import aztech.modern_industrialization.pipes.impl.PipeBlock;
@@ -134,7 +134,7 @@ private static void registerRenderers() {
             }
         }
 
-        if (MIConfig.loadAe2Compat()) {
+        if (MIStartupConfig.INSTANCE.loadAe2Compat()) {
             try {
                 Class.forName("aztech.modern_industrialization.compat.ae2.MIAEAddonClient")
                         .getMethod("registerPipeRenderers")

src/client/java/aztech/modern_industrialization/pipes/impl/PipeUnbakedModel.java

@@ -24,7 +24,7 @@
 package aztech.modern_industrialization.pipes.impl;
 
 import aztech.modern_industrialization.MI;
-import aztech.modern_industrialization.MIConfig;
+import aztech.modern_industrialization.config.MIStartupConfig;
 import aztech.modern_industrialization.pipes.MIPipesClient;
 import aztech.modern_industrialization.pipes.api.PipeRenderer;
 import aztech.modern_industrialization.thirdparty.fabricrendering.SpriteFinderImpl;
@@ -63,7 +63,7 @@ public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Functio
         }
 
         BakedModel[] meWireConnectors = null;
-        if (MIConfig.loadAe2Compat()) {
+        if (MIStartupConfig.INSTANCE.loadAe2Compat()) {
             meWireConnectors = RotatedModelHelper.loadRotatedModels(ME_WIRE_CONNECTOR_MODEL, baker, spriteGetter);
         }
 

src/client/java/aztech/modern_industrialization/proxy/ClientProxy.java

@@ -24,11 +24,11 @@
 package aztech.modern_industrialization.proxy;
 
 import aztech.modern_industrialization.MIClient;
-import aztech.modern_industrialization.MIConfig;
 import aztech.modern_industrialization.blocks.storage.barrel.BarrelBlockEntity;
 import aztech.modern_industrialization.blocks.storage.barrel.BarrelRenderer;
 import aztech.modern_industrialization.blocks.storage.tank.AbstractTankBlockEntity;
 import aztech.modern_industrialization.blocks.storage.tank.TankRenderer;
+import aztech.modern_industrialization.config.MIClientConfig;
 import aztech.modern_industrialization.items.SteamDrillHooks;
 import aztech.modern_industrialization.machines.gui.MachineMenuClient;
 import aztech.modern_industrialization.machines.gui.MachineMenuCommon;
@@ -119,7 +119,7 @@ public MachineMenuCommon createClientMachineMenu(int syncId, Inventory playerInv
     @Override
     public BlockState getMachineCasingBlockState(BlockState state, BlockAndTintGetter renderView, BlockPos pos) {
         var be = renderView.getBlockEntity(pos); // Note: not safe to access fields!
-        if (!MIConfig.getConfig().enableInterMachineConnectedTextures) {
+        if (!MIClientConfig.INSTANCE.interMachineConnectedTextures.getAsBoolean()) {
             // Use the machine's own state, unless we are a hatch or a multiblock controller of course.
             if (!(be instanceof HatchBlockEntity) && !(be instanceof MultiblockMachineBlockEntity)) {
                 return state;