Fix #1017: Add config to disable stonecutter and composter recipe gen…

…eration (#1019)
AztechMC · Feb 5, 2025 · ea27dca · ea27dca
1 parent d34f34a
commit ea27dca
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/src/generated/resources/assets/modern_industrialization/lang/en_us.json b/src/generated/resources/assets/modern_industrialization/lang/en_us.json
@@ -1465,6 +1465,7 @@
   "text.autoconfig.modern_industrialization.option.armorHudYPosition": "Space between the top of the screen and the Jetpack/GraviChestPlate overlay text.",
   "text.autoconfig.modern_industrialization.option.baseItemPipeTransfer": "Base amount of items transferred by item pipes every 3 seconds.",
   "text.autoconfig.modern_industrialization.option.colorWaterLava": "Color Water and Lava (Restart needed)",
+  "text.autoconfig.modern_industrialization.option.compostableToPlantOil": "Generate Plant Oil recipes in the Centrifuge for all compostable items.",
   "text.autoconfig.modern_industrialization.option.datagenOnStartup": "Run MI runtime datagen on startup (Restart needed)",
   "text.autoconfig.modern_industrialization.option.disableFuelTooltips": "Disable display of Fuel EU in tooltips",
   "text.autoconfig.modern_industrialization.option.disableItemTagTooltips": "Disable display of Item Tag in tooltips",
@@ -1483,6 +1484,7 @@
   "text.autoconfig.modern_industrialization.option.removeIndustrialistTrades": "Removes trades from the Industrialist villager (Restart needed)",
   "text.autoconfig.modern_industrialization.option.respawnWithGuideBook": "Grant Guidebook at Respawn",
   "text.autoconfig.modern_industrialization.option.spawnWithGuideBook": "Grant Guidebook at Spawn",
+  "text.autoconfig.modern_industrialization.option.stonecutterToCuttingMachine": "Generate Cutting Machine recipes for all Stonecutter recipes.",
   "text.autoconfig.modern_industrialization.title": "Modern Industrialization Menu",
   "text.modern_industrialization.AbsorptionProbability": "Absorption Probability",
   "text.modern_industrialization.AcceptAnyFluidFuels": "Consumes any Fluid Fuel (Check REI for EU/mb production)",

diff --git a/src/main/java/aztech/modern_industrialization/MIConfig.java b/src/main/java/aztech/modern_industrialization/MIConfig.java
@@ -88,6 +88,10 @@ public class MIConfig implements ConfigData {
     public int armorHudYPosition = 4;
     @EnglishTranslation(value = "Base amount of items transferred by item pipes every 3 seconds.")
     public int baseItemPipeTransfer = 16;
+    @EnglishTranslation(value = "Generate Cutting Machine recipes for all Stonecutter recipes.")
+    public boolean stonecutterToCuttingMachine = true;
+    @EnglishTranslation(value = "Generate Plant Oil recipes in the Centrifuge for all compostable items.")
+    public boolean compostableToPlantOil = true;
 
     @ConfigEntry.Gui.Excluded
     private transient volatile static MIConfig instance = null;

diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/CuttingMachineRecipeType.java b/src/main/java/aztech/modern_industrialization/machines/recipe/CuttingMachineRecipeType.java
@@ -41,7 +41,9 @@ protected void fillRecipeList(Level world, List<RecipeHolder<MachineRecipe>> rec
         // Add all stone cutter recipes
         for (var stonecuttingRecipe : world.getRecipeManager().getAllRecipesFor(RecipeType.STONECUTTING)) {
             var recipe = RecipeConversions.ofStonecutting(stonecuttingRecipe, this, world.registryAccess());
-            recipeList.add(recipe);
+            if (recipe != null) {
+                recipeList.add(recipe);
+            }
         }
     }
 }
diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/RecipeConversions.java b/src/main/java/aztech/modern_industrialization/machines/recipe/RecipeConversions.java
@@ -24,6 +24,7 @@
 package aztech.modern_industrialization.machines.recipe;
 
 import aztech.modern_industrialization.MI;
+import aztech.modern_industrialization.MIConfig;
 import aztech.modern_industrialization.MIFluids;
 import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes;
 import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant;
@@ -59,8 +60,13 @@ public static RecipeHolder<MachineRecipe> ofSmelting(RecipeHolder<SmeltingRecipe
         return new RecipeHolder<>(id, recipe);
     }
 
+    @Nullable
     public static RecipeHolder<MachineRecipe> ofStonecutting(RecipeHolder<StonecutterRecipe> holder, MachineRecipeType type,
             RegistryAccess registryAccess) {
+        if (!MIConfig.getConfig().stonecutterToCuttingMachine) {
+            return null;
+        }
+
         ResourceLocation id = ResourceLocation.fromNamespaceAndPath(holder.id().getNamespace(),
                 "/" + holder.id().getPath() + "_exported_mi_cutting_machine");
         var stonecuttingRecipe = holder.value();
@@ -79,6 +85,10 @@ public static RecipeHolder<MachineRecipe> ofStonecutting(RecipeHolder<Stonecutte
 
     @Nullable
     public static RecipeHolder<MachineRecipe> ofCompostable(ItemLike compostable) {
+        if (!MIConfig.getConfig().compostableToPlantOil) {
+            return null;
+        }
+
         if (compostable == null || compostable.asItem() == null) {
             return null; // apparently bad mods do this
         }