Add back config toggles for mod integrations

Author: Juuxel

common/src/main/java/juuxel/adorn/block/variant/BlockVariantSets.java

@@ -15,6 +15,7 @@
 import juuxel.adorn.block.ShelfBlock;
 import juuxel.adorn.block.StepBlock;
 import juuxel.adorn.block.TableBlock;
+import juuxel.adorn.config.ConfigManager;
 import juuxel.adorn.item.ChairBlockItem;
 import juuxel.adorn.item.TableBlockItem;
 import juuxel.adorn.lib.registry.Registered;
@@ -71,8 +72,10 @@ public static void add(BlockVariantSet variantSet) {
     }
 
     public static void loadCompatSets() {
-        for (var set : ServiceLoader.load(BlockVariantSet.class)) {
-            add(set);
+        for (var set : ServiceLoader.load(CompatBlockVariantSet.class)) {
+            if (ConfigManager.isCompatEnabled(set.getModId())) {
+                add(set);
+            }
         }
     }
 

common/src/main/java/juuxel/adorn/block/variant/CompatBlockVariantSet.java

@@ -1,13 +1,5 @@
 package juuxel.adorn.block.variant;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Function;
-
-public abstract class CompatBlockVariantSet implements BlockVariantSet {
-    protected abstract String getModId();
-
-    protected List<BlockVariant> createVariants(Function<String, BlockVariant> factory, String... variants) {
-        return Arrays.stream(variants).map(variant -> factory.apply(getModId() + '/' + variant)).toList();
-    }
+public interface CompatBlockVariantSet extends BlockVariantSet {
+    String getModId();
 }

common/src/main/java/juuxel/adorn/block/variant/PrefixedBlockVariantSet.java

@@ -0,0 +1,11 @@
+package juuxel.adorn.block.variant;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+
+public abstract class PrefixedBlockVariantSet implements CompatBlockVariantSet {
+    protected List<BlockVariant> createVariants(Function<String, BlockVariant> factory, String... variants) {
+        return Arrays.stream(variants).map(variant -> factory.apply(getModId() + '/' + variant)).toList();
+    }
+}

common/src/main/java/juuxel/adorn/config/ConfigManager.java

@@ -38,6 +38,18 @@ public static Config config() {
         return get().config;
     }
 
+    public static boolean isCompatEnabled(String modId) {
+        var compatMap = ConfigManager.config().compat;
+
+        if (!compatMap.containsKey(modId)) {
+            compatMap.put(modId, true);
+            ConfigManager.get().save();
+            return true;
+        }
+
+        return compatMap.get(modId);
+    }
+
     protected abstract Path getConfigDirectory();
 
     private Path getConfigPath() {

fabric/src/main/java/juuxel/adorn/compat/Compat.java

@@ -10,20 +10,8 @@ public static void init() {
         ifModLoaded("towelette", () -> ToweletteCompat.init());
     }
 
-    public static boolean isCompatEnabled(String mod) {
-        var compatMap = ConfigManager.config().compat;
-
-        if (!compatMap.containsKey(mod)) {
-            compatMap.put(mod, true);
-            ConfigManager.get().save();
-            return true;
-        }
-
-        return compatMap.get(mod);
-    }
-
     private static void ifModLoaded(String mod, Runnable fn) {
-        if (isCompatEnabled(mod) && FabricLoader.getInstance().isModLoaded(mod)) {
+        if (ConfigManager.isCompatEnabled(mod) && FabricLoader.getInstance().isModLoaded(mod)) {
             fn.run();
         }
     }

forge/src/main/java/juuxel/adorn/platform/forge/compat/ArchitectsPaletteCompat.java

@@ -1,11 +1,11 @@
 package juuxel.adorn.platform.forge.compat;
 
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.CompatBlockVariantSet;
+import juuxel.adorn.block.variant.PrefixedBlockVariantSet;
 
 import java.util.List;
 
-public final class ArchitectsPaletteCompat extends CompatBlockVariantSet {
+public final class ArchitectsPaletteCompat extends PrefixedBlockVariantSet {
     @Override
     protected String getModId() {
         return "architects_palette";

forge/src/main/java/juuxel/adorn/platform/forge/compat/BiomeMakeoverCompat.java

@@ -1,11 +1,11 @@
 package juuxel.adorn.platform.forge.compat;
 
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.CompatBlockVariantSet;
+import juuxel.adorn.block.variant.PrefixedBlockVariantSet;
 
 import java.util.List;
 
-public final class BiomeMakeoverCompat extends CompatBlockVariantSet {
+public final class BiomeMakeoverCompat extends PrefixedBlockVariantSet {
     @Override
     protected String getModId() {
         return "biomemakeover";

forge/src/main/java/juuxel/adorn/platform/forge/compat/BiomesOPlentyCompat.java

@@ -1,11 +1,11 @@
 package juuxel.adorn.platform.forge.compat;
 
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.CompatBlockVariantSet;
+import juuxel.adorn.block.variant.PrefixedBlockVariantSet;
 
 import java.util.List;
 
-public final class BiomesOPlentyCompat extends CompatBlockVariantSet {
+public final class BiomesOPlentyCompat extends PrefixedBlockVariantSet {
     @Override
     protected String getModId() {
         return "biomesoplenty";

forge/src/main/java/juuxel/adorn/platform/forge/compat/BygCompat.java

@@ -1,11 +1,11 @@
 package juuxel.adorn.platform.forge.compat;
 
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.CompatBlockVariantSet;
+import juuxel.adorn.block.variant.PrefixedBlockVariantSet;
 
 import java.util.List;
 
-public final class BygCompat extends CompatBlockVariantSet {
+public final class BygCompat extends PrefixedBlockVariantSet {
     @Override
     protected String getModId() {
         return "byg";

forge/src/main/java/juuxel/adorn/platform/forge/compat/Compat.java

@@ -18,20 +18,8 @@ public static void init(IEventBus modBus) {
         ((ForgeRegistrar<?>) BlockVariantSets.ITEMS).hook(modBus);
     }
 
-    public static boolean isCompatEnabled(String mod) {
-        var compatMap = ConfigManager.config().compat;
-
-        if (!compatMap.containsKey(mod)) {
-            compatMap.put(mod, true);
-            ConfigManager.get().save();
-            return true;
-        }
-
-        return compatMap.get(mod);
-    }
-
     private static void ifModLoaded(String mod, Runnable fn) {
-        if (isCompatEnabled(mod) && ModList.get().isLoaded(mod)) {
+        if (ConfigManager.isCompatEnabled(mod) && ModList.get().isLoaded(mod)) {
             fn.run();
         }
     }

forge/src/main/java/juuxel/adorn/platform/forge/compat/EcologicsCompat.java

@@ -1,11 +1,11 @@
 package juuxel.adorn.platform.forge.compat;
 
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.CompatBlockVariantSet;
+import juuxel.adorn.block.variant.PrefixedBlockVariantSet;
 
 import java.util.List;
 
-public final class EcologicsCompat extends CompatBlockVariantSet {
+public final class EcologicsCompat extends PrefixedBlockVariantSet {
     @Override
     protected String getModId() {
         return "ecologics";

integrations/src/biomemakeover/java/juuxel/adorn/compat/biomemakeover/BiomeMakeoverCompat.java

@@ -2,15 +2,15 @@
 
 import com.google.auto.service.AutoService;
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.BlockVariantSet;
 import juuxel.adorn.block.variant.CompatBlockVariantSet;
+import juuxel.adorn.block.variant.PrefixedBlockVariantSet;
 
 import java.util.List;
 
-@AutoService(BlockVariantSet.class)
-public final class BiomeMakeoverCompat extends CompatBlockVariantSet {
+@AutoService(CompatBlockVariantSet.class)
+public final class BiomeMakeoverCompat extends PrefixedBlockVariantSet {
     @Override
-    protected String getModId() {
+    public String getModId() {
         return "biomemakeover";
     }
 

integrations/src/blockus/java/juuxel/adorn/compat/blockus/BlockusCompat.java

@@ -2,12 +2,17 @@
 
 import com.google.auto.service.AutoService;
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.BlockVariantSet;
+import juuxel.adorn.block.variant.CompatBlockVariantSet;
 
 import java.util.List;
 
-@AutoService(BlockVariantSet.class)
-public final class BlockusCompat implements BlockVariantSet {
+@AutoService(CompatBlockVariantSet.class)
+public final class BlockusCompat implements CompatBlockVariantSet {
+    @Override
+    public String getModId() {
+        return "blockus";
+    }
+
     @Override
     public List<BlockVariant> getWoodVariants() {
         return List.of(new BlockVariant.Wood("blockus/white_oak"));

integrations/src/byg/java/juuxel/adorn/compat/byg/BygCompat.java

@@ -2,15 +2,15 @@
 
 import com.google.auto.service.AutoService;
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.BlockVariantSet;
 import juuxel.adorn.block.variant.CompatBlockVariantSet;
+import juuxel.adorn.block.variant.PrefixedBlockVariantSet;
 
 import java.util.List;
 
-@AutoService(BlockVariantSet.class)
-public final class BygCompat extends CompatBlockVariantSet {
+@AutoService(CompatBlockVariantSet.class)
+public final class BygCompat extends PrefixedBlockVariantSet {
     @Override
-    protected String getModId() {
+    public String getModId() {
         return "byg";
     }
 

integrations/src/cinderscapes/java/juuxel/adorn/compat/cinderscapes/CinderscapesCompat.java

@@ -2,15 +2,15 @@
 
 import com.google.auto.service.AutoService;
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.BlockVariantSet;
 import juuxel.adorn.block.variant.CompatBlockVariantSet;
+import juuxel.adorn.block.variant.PrefixedBlockVariantSet;
 
 import java.util.List;
 
-@AutoService(BlockVariantSet.class)
-public final class CinderscapesCompat extends CompatBlockVariantSet {
+@AutoService(CompatBlockVariantSet.class)
+public final class CinderscapesCompat extends PrefixedBlockVariantSet {
     @Override
-    protected String getModId() {
+    public String getModId() {
         return "cinderscapes";
     }
 

integrations/src/promenade/java/juuxel/adorn/compat/promenade/PromenadeCompat.java

@@ -2,15 +2,15 @@
 
 import com.google.auto.service.AutoService;
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.BlockVariantSet;
 import juuxel.adorn.block.variant.CompatBlockVariantSet;
+import juuxel.adorn.block.variant.PrefixedBlockVariantSet;
 
 import java.util.List;
 
-@AutoService(BlockVariantSet.class)
-public final class PromenadeCompat extends CompatBlockVariantSet {
+@AutoService(CompatBlockVariantSet.class)
+public final class PromenadeCompat extends PrefixedBlockVariantSet {
     @Override
-    protected String getModId() {
+    public String getModId() {
         return "promenade";
     }
 

integrations/src/techreborn/java/juuxel/adorn/compat/techreborn/TechRebornCompat.java

@@ -2,12 +2,17 @@
 
 import com.google.auto.service.AutoService;
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.BlockVariantSet;
+import juuxel.adorn.block.variant.CompatBlockVariantSet;
 
 import java.util.List;
 
-@AutoService(BlockVariantSet.class)
-public final class TechRebornCompat implements BlockVariantSet {
+@AutoService(CompatBlockVariantSet.class)
+public final class TechRebornCompat implements CompatBlockVariantSet {
+    @Override
+    public String getModId() {
+        return "techreborn";
+    }
+
     @Override
     public List<BlockVariant> getWoodVariants() {
         return List.of(new BlockVariant.Wood("techreborn/rubber"));

integrations/src/terrestria/java/juuxel/adorn/compat/terrestria/TerrestriaCompat.java

@@ -2,15 +2,15 @@
 
 import com.google.auto.service.AutoService;
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.BlockVariantSet;
 import juuxel.adorn.block.variant.CompatBlockVariantSet;
+import juuxel.adorn.block.variant.PrefixedBlockVariantSet;
 
 import java.util.List;
 
-@AutoService(BlockVariantSet.class)
-public final class TerrestriaCompat extends CompatBlockVariantSet {
+@AutoService(CompatBlockVariantSet.class)
+public final class TerrestriaCompat extends PrefixedBlockVariantSet {
     @Override
-    protected String getModId() {
+    public String getModId() {
         return "terrestria";
     }
 

integrations/src/traverse/java/juuxel/adorn/compat/traverse/TraverseCompat.java

@@ -2,12 +2,17 @@
 
 import com.google.auto.service.AutoService;
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.BlockVariantSet;
+import juuxel.adorn.block.variant.CompatBlockVariantSet;
 
 import java.util.List;
 
-@AutoService(BlockVariantSet.class)
-public final class TraverseCompat implements BlockVariantSet {
+@AutoService(CompatBlockVariantSet.class)
+public final class TraverseCompat implements CompatBlockVariantSet {
+    @Override
+    public String getModId() {
+        return "traverse";
+    }
+
     @Override
     public List<BlockVariant> getWoodVariants() {
         return List.of(new BlockVariant.Wood("traverse/fir"));

integrations/src/woods_and_mires/java/juuxel/adorn/compat/wam/WamCompat.java

@@ -2,12 +2,17 @@
 
 import com.google.auto.service.AutoService;
 import juuxel.adorn.block.variant.BlockVariant;
-import juuxel.adorn.block.variant.BlockVariantSet;
+import juuxel.adorn.block.variant.CompatBlockVariantSet;
 
 import java.util.List;
 
-@AutoService(BlockVariantSet.class)
-public final class WamCompat implements BlockVariantSet {
+@AutoService(CompatBlockVariantSet.class)
+public final class WamCompat implements CompatBlockVariantSet {
+    @Override
+    public String getModId() {
+        return "woods_and_mires";
+    }
+
     @Override
     public List<BlockVariant> getWoodVariants() {
         return List.of(new BlockVariant.Wood("woods_and_mires/pine"));