CleanroomMC · brachy84 · Feb 19, 2024 · Feb 19, 2024 · Feb 19, 2024 · Feb 19, 2024
diff --git a/src/main/java/com/cleanroommc/groovyscript/api/IScriptReloadable.java b/src/main/java/com/cleanroommc/groovyscript/api/IScriptReloadable.java
@@ -2,8 +2,6 @@
 
 import org.jetbrains.annotations.ApiStatus;
 
-import java.util.Collection;
-
 public interface IScriptReloadable extends INamed {
 
     @GroovyBlacklist
@@ -13,4 +11,10 @@ public interface IScriptReloadable extends INamed {
     @GroovyBlacklist
     @ApiStatus.OverrideOnly
     void afterScriptLoad();
+
+    @GroovyBlacklist
+    default boolean isEnabled() {
+        return true;
+    }
+
 }
diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/ModPropertyContainer.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/ModPropertyContainer.java
@@ -1,9 +1,6 @@
 package com.cleanroommc.groovyscript.compat.mods;
 
-import com.cleanroommc.groovyscript.api.GroovyBlacklist;
-import com.cleanroommc.groovyscript.api.IDynamicGroovyProperty;
-import com.cleanroommc.groovyscript.api.IScriptReloadable;
-import com.cleanroommc.groovyscript.api.IVirtualizedRegistrar;
+import com.cleanroommc.groovyscript.api.*;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
@@ -32,7 +29,16 @@ public Collection<IScriptReloadable> getRegistries() {
 
     @Override
     public @Nullable Object getProperty(String name) {
-        return registries.get(name);
+        IScriptReloadable registry = registries.get(name);
+        if (registry == null) {
+            GroovyLog.get().error("Attempted to access registry {}, but could not find a registry with that name", name);
+            return null;
+        }
+        if (!registry.isEnabled()) {
+            GroovyLog.get().error("Attempted to access registry {}, but that registry was disabled", registry.getName());
+            return null;
+        }
+        return registry;
     }
 
     /**

diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/evilcraft/BloodInfuser.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/evilcraft/BloodInfuser.java
@@ -12,6 +12,8 @@
 import net.minecraftforge.fluids.FluidStack;
 import org.cyclops.cyclopscore.recipe.custom.api.IRecipe;
 import org.cyclops.cyclopscore.recipe.custom.component.IngredientRecipeComponent;
+import org.cyclops.evilcraft.Configs;
+import org.cyclops.evilcraft.block.BloodInfuserConfig;
 import org.cyclops.evilcraft.core.recipe.custom.DurationXpRecipeProperties;
 import org.cyclops.evilcraft.core.recipe.custom.IngredientFluidStackAndTierRecipeComponent;
 import org.jetbrains.annotations.Nullable;
@@ -23,6 +25,11 @@ public BloodInfuser() {
         super();
     }
 
+    @Override
+    public boolean isEnabled() {
+        return Configs.isEnabled(BloodInfuserConfig.class);
+    }
+
     @RecipeBuilderDescription(example = {
             @Example(".input(item('minecraft:clay')).output(item('minecraft:clay')).fluidInput(fluid('evilcraftblood') * 1000).tier(3).duration(100).xp(10000)"),
             @Example(".input(item('minecraft:gold_ingot')).output(item('minecraft:clay')).fluidInput(100000)"),

diff --git a/...ain/java/com/cleanroommc/groovyscript/compat/mods/evilcraft/EnvironmentalAccumulator.java b/...ain/java/com/cleanroommc/groovyscript/compat/mods/evilcraft/EnvironmentalAccumulator.java
@@ -8,6 +8,7 @@
 import com.cleanroommc.groovyscript.registry.VirtualizedRegistry;
 import net.minecraft.item.ItemStack;
 import org.cyclops.cyclopscore.recipe.custom.api.IRecipe;
+import org.cyclops.evilcraft.Configs;
 import org.cyclops.evilcraft.block.EnvironmentalAccumulatorConfig;
 import org.cyclops.evilcraft.core.recipe.custom.EnvironmentalAccumulatorRecipeComponent;
 import org.cyclops.evilcraft.core.recipe.custom.EnvironmentalAccumulatorRecipeProperties;
@@ -23,6 +24,11 @@ public EnvironmentalAccumulator() {
         super();
     }
 
+    @Override
+    public boolean isEnabled() {
+        return Configs.isEnabled(EnvironmentalAccumulatorConfig.class);
+    }
+
     @RecipeBuilderDescription(example = {
             @Example(".input(item('minecraft:clay')).output(item('minecraft:clay') * 2).inputWeather(weather('clear')).outputWeather(weather('rain')).processingspeed(1).cooldowntime(1000).duration(10)"),
             @Example(".input(item('minecraft:gold_ingot')).output(item('minecraft:diamond')).inputWeather(weather('rain')).outputWeather(weather('lightning')).speed(10).cooldown(1)"),

diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/forestry/Forestry.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/forestry/Forestry.java
@@ -8,7 +8,6 @@
 import forestry.api.genetics.AlleleManager;
 import forestry.apiculture.genetics.alleles.AlleleBeeSpecies;
 import forestry.modules.ForestryModuleUids;
-import org.jetbrains.annotations.Nullable;
 
 public class Forestry extends ModPropertyContainer {
 
@@ -39,18 +38,6 @@ public Forestry() {
         addRegistry(beeMutations);
     }
 
-    @Override
-    public void initialize() {
-        GameObjectHandlerManager.registerGameObjectHandler("forestry", "species", Forestry::parseSpecies);
-    }
-
-    @Override
-    public @Nullable Object getProperty(String name) {
-        Object registry = super.getProperty(name);
-        if (registry instanceof ForestryRegistry<?> && !((ForestryRegistry<?>) registry).isEnabled()) return null;
-        return registry;
-    }
-
     public static Result<AlleleBeeSpecies> parseSpecies(String mainArg, Object... args) {
         if (!ForestryAPI.moduleManager.isModuleEnabled("forestry", ForestryModuleUids.APICULTURE)) {
             return Result.error("Can't get bee species while apiculture is disabled.");
@@ -71,4 +58,9 @@ protected static String getNormalName(String name) {
         String capital = name.substring(0, 1).toUpperCase() + name.substring(1);
         return "species" + capital;
     }
+
+    @Override
+    public void initialize() {
+        GameObjectHandlerManager.registerGameObjectHandler("forestry", "species", Forestry::parseSpecies);
+    }
 }
diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/integrateddynamics/DryingBasin.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/integrateddynamics/DryingBasin.java
@@ -11,6 +11,10 @@
 import org.cyclops.cyclopscore.recipe.custom.api.IRecipe;
 import org.cyclops.cyclopscore.recipe.custom.component.DurationRecipeProperties;
 import org.cyclops.cyclopscore.recipe.custom.component.IngredientAndFluidStackRecipeComponent;
+import org.cyclops.integrateddynamics.Configs;
+import org.cyclops.integrateddynamics.block.BlockDryingBasin;
+import org.cyclops.integrateddynamics.block.BlockDryingBasinConfig;
+import org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasin;
 import org.jetbrains.annotations.Nullable;
 
 @RegistryDescription
@@ -20,6 +24,11 @@ public DryingBasin() {
         super();
     }
 
+    @Override
+    public boolean isEnabled() {
+        return Configs.isEnabled(BlockDryingBasinConfig.class);
+    }
+
     @RecipeBuilderDescription(example = {
             @Example(".input(item('minecraft:gold_ingot')).output(item('minecraft:clay')).fluidInput(fluid('water') * 500).fluidOutput(fluid('lava') * 2000).mechanical().duration(5)"),
             @Example(".output(item('minecraft:clay')).fluidInput(fluid('water') * 2000)")
@@ -30,8 +39,8 @@ public RecipeBuilder recipeBuilder() {
 
     @Override
     public void onReload() {
-        removeScripted().forEach(org.cyclops.integrateddynamics.block.BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes()::remove);
-        restoreFromBackup().forEach(org.cyclops.integrateddynamics.block.BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes()::add);
+        removeScripted().forEach(BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes()::remove);
+        restoreFromBackup().forEach(BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes()::add);
     }
 
     public void add(IRecipe<IngredientAndFluidStackRecipeComponent, IngredientAndFluidStackRecipeComponent, DurationRecipeProperties> recipe) {
@@ -41,19 +50,19 @@ public void add(IRecipe<IngredientAndFluidStackRecipeComponent, IngredientAndFlu
     public void add(IRecipe<IngredientAndFluidStackRecipeComponent, IngredientAndFluidStackRecipeComponent, DurationRecipeProperties> recipe, boolean add) {
         if (recipe == null) return;
         addScripted(recipe);
-        if (add) org.cyclops.integrateddynamics.block.BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes().add(recipe);
+        if (add) BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes().add(recipe);
     }
 
     public boolean remove(IRecipe<IngredientAndFluidStackRecipeComponent, IngredientAndFluidStackRecipeComponent, DurationRecipeProperties> recipe) {
         if (recipe == null) return false;
         addBackup(recipe);
-        org.cyclops.integrateddynamics.block.BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes().remove(recipe);
+        BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes().remove(recipe);
         return true;
     }
 
     @MethodDescription(description = "groovyscript.wiki.removeByInput")
     public boolean removeByInput(ItemStack input) {
-        return org.cyclops.integrateddynamics.block.BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes().removeIf(r -> {
+        return BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes().removeIf(r -> {
             if (r.getInput().getIngredient().test(input)) {
                 addBackup(r);
                 return true;
@@ -64,7 +73,7 @@ public boolean removeByInput(ItemStack input) {
 
     @MethodDescription(description = "groovyscript.wiki.removeByOutput")
     public boolean removeByOutput(ItemStack input) {
-        return org.cyclops.integrateddynamics.block.BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes().removeIf(r -> {
+        return BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes().removeIf(r -> {
             if (r.getOutput().getIngredient().test(input)) {
                 addBackup(r);
                 return true;
@@ -75,13 +84,13 @@ public boolean removeByOutput(ItemStack input) {
 
     @MethodDescription(description = "groovyscript.wiki.removeAll", priority = 2000, example = @Example(commented = true))
     public void removeAll() {
-        org.cyclops.integrateddynamics.block.BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes().forEach(this::addBackup);
-        org.cyclops.integrateddynamics.block.BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes().clear();
+        BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes().forEach(this::addBackup);
+        BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes().clear();
     }
 
     @MethodDescription(description = "groovyscript.wiki.streamRecipes", type = MethodDescription.Type.QUERY)
     public SimpleObjectStream<IRecipe<IngredientAndFluidStackRecipeComponent, IngredientAndFluidStackRecipeComponent, DurationRecipeProperties>> streamRecipes() {
-        return new SimpleObjectStream<>(org.cyclops.integrateddynamics.block.BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes())
+        return new SimpleObjectStream<>(BlockDryingBasin.getInstance().getRecipeRegistry().allRecipes())
                 .setRemover(this::remove);
     }
 
@@ -137,6 +146,8 @@ public void validate(GroovyLog.Msg msg) {
             msg.add(output.isEmpty() && fluidOutput.isEmpty(), "either output or fluidOutput must have an entry, yet both were empty");
             msg.add(duration < 0, "duration must be a non negative integer, yet it was {}", duration);
             msg.add(!basic && !mechanical, "either basic or mechanical must be true");
+            msg.add(basic && !ModSupport.INTEGRATED_DYNAMICS.get().dryingBasin.isEnabled(), "basic is enabled, yet the Drying Basin is disabled via config");
+            msg.add(mechanical && !ModSupport.INTEGRATED_DYNAMICS.get().mechanicalDryingBasin.isEnabled(), "mechanic is enabled, yet the Mechanical Drying Basin is disabled via config");
         }
 
         @Override
@@ -148,15 +159,15 @@ public void validate(GroovyLog.Msg msg) {
 
             if (basic) {
                 ModSupport.INTEGRATED_DYNAMICS.get().dryingBasin.add(
-                        org.cyclops.integrateddynamics.block.BlockDryingBasin.getInstance().getRecipeRegistry().registerRecipe(
+                        BlockDryingBasin.getInstance().getRecipeRegistry().registerRecipe(
                                 new IngredientAndFluidStackRecipeComponent(itemInput, true, fluidInput.getOrEmpty(0)),
                                 new IngredientAndFluidStackRecipeComponent(output.get(0), fluidOutput.getOrEmpty(0)),
                                 new DurationRecipeProperties(duration)
                         ), false);
             }
             if (mechanical) {
                 ModSupport.INTEGRATED_DYNAMICS.get().mechanicalDryingBasin.add(
-                        org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().registerRecipe(
+                        BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().registerRecipe(
                                 new IngredientAndFluidStackRecipeComponent(itemInput, true, fluidInput.getOrEmpty(0)),
                                 new IngredientAndFluidStackRecipeComponent(output.getOrEmpty(0), fluidOutput.getOrEmpty(0)),
                                 new DurationRecipeProperties(duration)

diff --git a/...va/com/cleanroommc/groovyscript/compat/mods/integrateddynamics/MechanicalDryingBasin.java b/...va/com/cleanroommc/groovyscript/compat/mods/integrateddynamics/MechanicalDryingBasin.java
@@ -7,6 +7,9 @@
 import org.cyclops.cyclopscore.recipe.custom.api.IRecipe;
 import org.cyclops.cyclopscore.recipe.custom.component.DurationRecipeProperties;
 import org.cyclops.cyclopscore.recipe.custom.component.IngredientAndFluidStackRecipeComponent;
+import org.cyclops.integrateddynamics.Configs;
+import org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasin;
+import org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasinConfig;
 
 @RegistryDescription
 public class MechanicalDryingBasin extends VirtualizedRegistry<IRecipe<IngredientAndFluidStackRecipeComponent, IngredientAndFluidStackRecipeComponent, DurationRecipeProperties>> {
@@ -15,15 +18,20 @@ public MechanicalDryingBasin() {
         super();
     }
 
+    @Override
+    public boolean isEnabled() {
+        return Configs.isEnabled(BlockMechanicalDryingBasinConfig.class);
+    }
+
     @RecipeBuilderDescription(example = @Example(".input(item('minecraft:diamond')).fluidInput(fluid('water') * 50).fluidOutput(fluid('lava') * 20000).duration(300)"), requirement = @Property(property = "mechanical", defaultValue = "true"))
     public DryingBasin.RecipeBuilder recipeBuilder() {
         return new DryingBasin.RecipeBuilder().mechanical();
     }
 
     @Override
     public void onReload() {
-        removeScripted().forEach(org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes()::remove);
-        restoreFromBackup().forEach(org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes()::add);
+        removeScripted().forEach(BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes()::remove);
+        restoreFromBackup().forEach(BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes()::add);
     }
 
     public void add(IRecipe<IngredientAndFluidStackRecipeComponent, IngredientAndFluidStackRecipeComponent, DurationRecipeProperties> recipe) {
@@ -33,19 +41,19 @@ public void add(IRecipe<IngredientAndFluidStackRecipeComponent, IngredientAndFlu
     public void add(IRecipe<IngredientAndFluidStackRecipeComponent, IngredientAndFluidStackRecipeComponent, DurationRecipeProperties> recipe, boolean add) {
         if (recipe == null) return;
         addScripted(recipe);
-        if (add) org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes().add(recipe);
+        if (add) BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes().add(recipe);
     }
 
     public boolean remove(IRecipe<IngredientAndFluidStackRecipeComponent, IngredientAndFluidStackRecipeComponent, DurationRecipeProperties> recipe) {
         if (recipe == null) return false;
         addBackup(recipe);
-        org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes().remove(recipe);
+        BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes().remove(recipe);
         return true;
     }
 
     @MethodDescription(description = "groovyscript.wiki.removeByInput")
     public boolean removeByInput(ItemStack input) {
-        return org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes().removeIf(r -> {
+        return BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes().removeIf(r -> {
             if (r.getInput().getIngredient().test(input)) {
                 addBackup(r);
                 return true;
@@ -56,7 +64,7 @@ public boolean removeByInput(ItemStack input) {
 
     @MethodDescription(description = "groovyscript.wiki.removeByOutput")
     public boolean removeByOutput(ItemStack input) {
-        return org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes().removeIf(r -> {
+        return BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes().removeIf(r -> {
             if (r.getOutput().getIngredient().test(input)) {
                 addBackup(r);
                 return true;
@@ -67,13 +75,13 @@ public boolean removeByOutput(ItemStack input) {
 
     @MethodDescription(description = "groovyscript.wiki.removeAll", priority = 2000, example = @Example(commented = true))
     public void removeAll() {
-        org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes().forEach(this::addBackup);
-        org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes().clear();
+        BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes().forEach(this::addBackup);
+        BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes().clear();
     }
 
     @MethodDescription(description = "groovyscript.wiki.streamRecipes", type = MethodDescription.Type.QUERY)
     public SimpleObjectStream<IRecipe<IngredientAndFluidStackRecipeComponent, IngredientAndFluidStackRecipeComponent, DurationRecipeProperties>> streamRecipes() {
-        return new SimpleObjectStream<>(org.cyclops.integrateddynamics.block.BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes())
+        return new SimpleObjectStream<>(BlockMechanicalDryingBasin.getInstance().getRecipeRegistry().allRecipes())
                 .setRemover(this::remove);
     }
 }