From 2b44ab866646acf0d95e87a6cb730075af342ac8 Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Mon, 10 Jul 2017 13:33:40 +0200 Subject: [PATCH] ReAdd disabling of machines crafting recipes --- .../java/mekanism/common/CommonProxy.java | 2 -- src/main/java/mekanism/common/Mekanism.java | 13 +++----- .../block/states/BlockStateMachine.java | 18 ----------- .../common/config/TypeConfigManager.java | 17 ---------- .../MekanismRecipeEnabledCondition.java | 31 +++++++++++++++++++ .../recipe/generation/RecipeGenerator.java | 22 +++++++++++++ .../generators/common/MekanismGenerators.java | 4 --- .../block/states/BlockStateGenerator.java | 19 ------------ .../assets/mekanism/recipes/_factories.json | 3 ++ .../mekanism/recipes/machineblock2_0.json | 6 ++++ .../mekanism/recipes/machineblock2_1.json | 6 ++++ .../mekanism/recipes/machineblock2_10.json | 6 ++++ .../mekanism/recipes/machineblock2_11.json | 6 ++++ .../recipes/machineblock2_11_alt.json | 6 ++++ .../recipes/machineblock2_11_alt_alt.json | 6 ++++ .../recipes/machineblock2_11_alt_alt_alt.json | 6 ++++ .../mekanism/recipes/machineblock2_12.json | 6 ++++ .../mekanism/recipes/machineblock2_13.json | 6 ++++ .../mekanism/recipes/machineblock2_14.json | 6 ++++ .../mekanism/recipes/machineblock2_15.json | 6 ++++ .../mekanism/recipes/machineblock2_2.json | 6 ++++ .../mekanism/recipes/machineblock2_3.json | 6 ++++ .../mekanism/recipes/machineblock2_4.json | 6 ++++ .../mekanism/recipes/machineblock2_5.json | 6 ++++ .../mekanism/recipes/machineblock2_6.json | 6 ++++ .../mekanism/recipes/machineblock2_7.json | 6 ++++ .../mekanism/recipes/machineblock2_8.json | 6 ++++ .../mekanism/recipes/machineblock2_9.json | 6 ++++ .../mekanism/recipes/machineblock3_0.json | 6 ++++ .../mekanism/recipes/machineblock3_1.json | 6 ++++ .../mekanism/recipes/machineblock3_3.json | 6 ++++ .../mekanism/recipes/machineblock3_4.json | 6 ++++ .../mekanism/recipes/machineblock3_5.json | 6 ++++ .../mekanism/recipes/machineblock3_6.json | 6 ++++ .../mekanism/recipes/machineblock_0.json | 6 ++++ .../mekanism/recipes/machineblock_1.json | 6 ++++ .../mekanism/recipes/machineblock_10.json | 6 ++++ .../mekanism/recipes/machineblock_11.json | 6 ++++ .../mekanism/recipes/machineblock_12.json | 6 ++++ .../mekanism/recipes/machineblock_13.json | 6 ++++ .../mekanism/recipes/machineblock_14.json | 6 ++++ .../mekanism/recipes/machineblock_15.json | 6 ++++ .../mekanism/recipes/machineblock_2.json | 6 ++++ .../mekanism/recipes/machineblock_3.json | 6 ++++ .../mekanism/recipes/machineblock_4.json | 6 ++++ .../mekanism/recipes/machineblock_5.json | 6 ++++ .../mekanism/recipes/machineblock_5_alt.json | 6 ++++ .../recipes/machineblock_5_alt_alt.json | 6 ++++ .../recipes/machineblock_5_alt_alt_alt.json | 6 ++++ .../machineblock_5_alt_alt_alt_alt.json | 6 ++++ .../machineblock_5_alt_alt_alt_alt_alt.json | 6 ++++ ...achineblock_5_alt_alt_alt_alt_alt_alt.json | 6 ++++ ...neblock_5_alt_alt_alt_alt_alt_alt_alt.json | 6 ++++ .../mekanism/recipes/machineblock_6.json | 6 ++++ .../mekanism/recipes/machineblock_6_alt.json | 6 ++++ .../recipes/machineblock_6_alt_alt.json | 6 ++++ .../recipes/machineblock_6_alt_alt_alt.json | 6 ++++ .../machineblock_6_alt_alt_alt_alt.json | 6 ++++ .../machineblock_6_alt_alt_alt_alt_alt.json | 6 ++++ ...achineblock_6_alt_alt_alt_alt_alt_alt.json | 6 ++++ ...neblock_6_alt_alt_alt_alt_alt_alt_alt.json | 6 ++++ .../mekanism/recipes/machineblock_7.json | 6 ++++ .../mekanism/recipes/machineblock_7_alt.json | 6 ++++ .../recipes/machineblock_7_alt_alt.json | 6 ++++ .../recipes/machineblock_7_alt_alt_alt.json | 6 ++++ .../machineblock_7_alt_alt_alt_alt.json | 6 ++++ .../machineblock_7_alt_alt_alt_alt_alt.json | 6 ++++ ...achineblock_7_alt_alt_alt_alt_alt_alt.json | 6 ++++ ...neblock_7_alt_alt_alt_alt_alt_alt_alt.json | 6 ++++ .../mekanism/recipes/machineblock_8.json | 6 ++++ .../mekanism/recipes/machineblock_9.json | 6 ++++ .../recipes/generator_0.json | 6 ++++ .../recipes/generator_1.json | 6 ++++ .../recipes/generator_3.json | 6 ++++ .../recipes/generator_4.json | 6 ++++ .../recipes/generator_5.json | 6 ++++ .../recipes/generator_6.json | 6 ++++ 77 files changed, 469 insertions(+), 68 deletions(-) create mode 100644 src/main/java/mekanism/common/recipe/MekanismRecipeEnabledCondition.java diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index eebb43f2a..22c964a41 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -612,8 +612,6 @@ public class CommonProxy implements IGuiProvider } BlockStateMachine.MachineType.updateAllUsages(); - - TypeConfigManager.updateConfigRecipes(MachineType.getValidMachines(), general.machinesManager); if(fromPacket) { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index ec04d2f7d..6b18a744b 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -281,7 +281,7 @@ public class Mekanism */ public void addRecipes() { - if(false) // Generate JSON files from code, disabled. + if(true) // Generate JSON files from code, disabled. { MekanismRecipes.generate(); MekanismToolsRecipes.generate(); @@ -700,6 +700,10 @@ public class Mekanism //Set the mod's configuration configuration = new Configuration(config); + //Load configuration + proxy.loadConfiguration(); + proxy.onConfigSync(false); + //Register tier information Tier.init(); @@ -775,10 +779,6 @@ public class Mekanism //Register with TransmitterNetworkRegistry TransmitterNetworkRegistry.initiate(); - //Load configuration - proxy.loadConfiguration(); - proxy.onConfigSync(false); - //Add baby skeleton spawner if(general.spawnBabySkeletons) { @@ -836,9 +836,6 @@ public class Mekanism OreDictManager.init(); - //Update the config-dependent recipes after the recipes have actually been added in the first place - TypeConfigManager.updateConfigRecipes(MachineType.getValidMachines(), general.machinesManager); - logger.info("Hooking complete."); } diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index 226718d84..d7220686b 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -198,24 +198,6 @@ public class BlockStateMachine extends ExtendedBlockState return general.machinesManager.isEnabled(blockName); } -// @Override -// public void addRecipes(Collection recipes) -// { -// blockRecipes.addAll(recipes); -// } -// -// @Override -// public void addRecipe(ShapedMekanismRecipe recipe) -// { -// blockRecipes.add(recipe); -// } -// -// @Override -// public Collection getRecipes() -// { -// return blockRecipes; -// } - public static List getValidMachines() { List ret = new ArrayList(); diff --git a/src/main/java/mekanism/common/config/TypeConfigManager.java b/src/main/java/mekanism/common/config/TypeConfigManager.java index 2aced3e8d..0fa88c9fc 100644 --- a/src/main/java/mekanism/common/config/TypeConfigManager.java +++ b/src/main/java/mekanism/common/config/TypeConfigManager.java @@ -20,21 +20,4 @@ public class TypeConfigManager { config.put(type, enabled); } - - public static void updateConfigRecipes(List blocks, TypeConfigManager manager) - { - for(Object obj : blocks) //enums are quirky - { - IBlockType type = (IBlockType)obj; - - if(manager.isEnabled(type.getBlockName())) - { -// CraftingManager.getInstance().getRecipeList().removeAll(type.getRecipes()); -// CraftingManager.getInstance().getRecipeList().addAll(type.getRecipes()); - } - else { -// CraftingManager.getInstance().getRecipeList().removeAll(type.getRecipes()); - } - } - } } diff --git a/src/main/java/mekanism/common/recipe/MekanismRecipeEnabledCondition.java b/src/main/java/mekanism/common/recipe/MekanismRecipeEnabledCondition.java new file mode 100644 index 000000000..9b981f5bf --- /dev/null +++ b/src/main/java/mekanism/common/recipe/MekanismRecipeEnabledCondition.java @@ -0,0 +1,31 @@ +package mekanism.common.recipe; + +import com.google.gson.JsonObject; +import mekanism.common.Mekanism; +import mekanism.common.config.MekanismConfig; +import net.minecraft.util.JsonUtils; +import net.minecraftforge.common.crafting.IConditionFactory; +import net.minecraftforge.common.crafting.JsonContext; + +import java.util.function.BooleanSupplier; + +public class MekanismRecipeEnabledCondition implements IConditionFactory +{ + @Override + public BooleanSupplier parse(JsonContext context, JsonObject json) + { + String machineType = JsonUtils.getString(json, "machineType"); + if(!machineType.isEmpty()) + { + return () -> MekanismConfig.general.machinesManager.isEnabled(machineType); + } + + String generatorType = JsonUtils.getString(json, "generatorType"); + if(!generatorType.isEmpty()) + { + return () -> MekanismConfig.generators.generatorsManager.isEnabled(generatorType); + } + + throw new IllegalStateException("Config defined with machine_enabled condition without a machine/generator type!"); + } +} diff --git a/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java b/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java index dffe828ff..0cd1ab6da 100644 --- a/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java +++ b/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java @@ -3,6 +3,10 @@ package mekanism.common.recipe.generation; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import mekanism.common.Mekanism; +import mekanism.common.block.BlockMachine; +import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.item.ItemBlockMachine; +import mekanism.generators.common.block.states.BlockStateGenerator; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -82,6 +86,24 @@ public class RecipeGenerator { return; } + // Add machine_enabled condition to all available machine types. + BlockStateMachine.MachineType machineType = BlockStateMachine.MachineType.get(result); + if(machineType != null) { + Map condition = new HashMap<>(); + condition.put("type", "machine_enabled"); + condition.put("machineType", machineType.blockName); + json.put("conditions", new Object[]{condition}); + } + + // Add machine_enabled condition to generator types which can be disabled. + BlockStateGenerator.GeneratorType generatorType = BlockStateGenerator.GeneratorType.get(result); + if(generatorType != null && result.getItemDamage() <= BlockStateGenerator.GeneratorType.WIND_GENERATOR.meta) { + Map condition = new HashMap<>(); + condition.put("type", "machine_enabled"); + condition.put("generatorType", generatorType.blockName); + json.put("conditions", new Object[]{condition}); + } + // names the json the same name as the output's registry name // repeatedly adds _alt if a file already exists // janky I know but it works diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index b866fe33f..01fe49ac5 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -126,9 +126,6 @@ public class MekanismGenerators implements IModule BuildcraftFuelRegistry.fuel.addFuel(MekanismFluids.Ethene.getFluid(), (int)(240 * general.TO_RF), 40 * Fluid.BUCKET_VOLUME); } - //Update the config-dependent recipes after the recipes have actually been added in the first place - TypeConfigManager.updateConfigRecipes(GeneratorType.getGeneratorsForConfig(), generators.generatorsManager); - for(ItemStack ore : OreDictionary.getOres("dustGold")) { RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("CARBON"), 10, MekanismUtils.size(ore, 4), GeneratorsItems.Hohlraum.getEmptyItem()); @@ -222,7 +219,6 @@ public class MekanismGenerators implements IModule if(event.getModID().equals("mekanismgenerators")) { proxy.loadConfiguration(); - TypeConfigManager.updateConfigRecipes(GeneratorType.getGeneratorsForConfig(), generators.generatorsManager); } } } diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java index 842afc1de..8ec8baf43 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java @@ -122,7 +122,6 @@ public class BlockStateGenerator extends ExtendedBlockState public double maxEnergy; public Class tileEntityClass; public boolean hasModel; -// public Collection blockRecipes = new HashSet(); public Predicate facingPredicate; public boolean activable; @@ -171,24 +170,6 @@ public class BlockStateGenerator extends ExtendedBlockState return generators.generatorsManager.isEnabled(blockName); } -// @Override -// public void addRecipes(Collection recipes) -// { -// blockRecipes.addAll(recipes); -// } -// -// @Override -// public void addRecipe(ShapedMekanismRecipe recipe) -// { -// blockRecipes.add(recipe); -// } -// -// @Override -// public Collection getRecipes() -// { -// return blockRecipes; -// } - public static GeneratorType get(IBlockState state) { if(state.getBlock() instanceof BlockGenerator) diff --git a/src/main/resources/assets/mekanism/recipes/_factories.json b/src/main/resources/assets/mekanism/recipes/_factories.json index 148cfa9db..292505dc8 100644 --- a/src/main/resources/assets/mekanism/recipes/_factories.json +++ b/src/main/resources/assets/mekanism/recipes/_factories.json @@ -5,5 +5,8 @@ }, "ingredients": { "item_nbt": "mekanism.common.recipe.MekanismIngredient$IngredientFactory" + }, + "conditions": { + "machine_enabled": "mekanism.common.recipe.MekanismRecipeEnabledCondition" } } diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_0.json b/src/main/resources/assets/mekanism/recipes/machineblock2_0.json index bea7e4dd5..958c83835 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_0.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_0.json @@ -9,6 +9,12 @@ "GCG" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "RotaryCondensentrator" + } + ], "key": { "C": { "ore": "circuitBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_1.json b/src/main/resources/assets/mekanism/recipes/machineblock2_1.json index 1016100c0..eb673fd84 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_1.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_1.json @@ -9,6 +9,12 @@ "ACA" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "ChemicalOxidizer" + } + ], "key": { "A": { "item": "mekanism:enrichedalloy" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_10.json b/src/main/resources/assets/mekanism/recipes/machineblock2_10.json index df218f2a1..5b1ddaa60 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_10.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_10.json @@ -9,6 +9,12 @@ "GFG" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "PressurizedReactionChamber" + } + ], "key": { "S": { "ore": "ingotSteel", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_11.json b/src/main/resources/assets/mekanism/recipes/machineblock2_11.json index 7febf7201..619340166 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_11.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_11.json @@ -13,6 +13,12 @@ "AIA" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "FluidTank" + } + ], "key": { "A": { "ore": "alloyBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt.json index 6e9b40fc0..0f596f430 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt.json @@ -13,6 +13,12 @@ "AIA" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "FluidTank" + } + ], "key": { "A": { "ore": "alloyAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt.json index 282dfb1c7..1347f4881 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt.json @@ -13,6 +13,12 @@ "AIA" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "FluidTank" + } + ], "key": { "A": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt_alt.json index 52f62e505..86bc7ceed 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_11_alt_alt_alt.json @@ -13,6 +13,12 @@ "AIA" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "FluidTank" + } + ], "key": { "A": { "ore": "alloyUltimate", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_12.json b/src/main/resources/assets/mekanism/recipes/machineblock2_12.json index edb2d39a1..18eac3249 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_12.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_12.json @@ -9,6 +9,12 @@ "TTT" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "FluidicPlenisher" + } + ], "key": { "P": { "item": "mekanism:machineblock", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_13.json b/src/main/resources/assets/mekanism/recipes/machineblock2_13.json index 4316c0e86..84bac7df0 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_13.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_13.json @@ -9,6 +9,12 @@ "RE " ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Laser" + } + ], "key": { "R": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_14.json b/src/main/resources/assets/mekanism/recipes/machineblock2_14.json index 59153b033..442604ee4 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_14.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_14.json @@ -9,6 +9,12 @@ "SSS" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "LaserAmplifier" + } + ], "key": { "S": { "ore": "ingotSteel", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_15.json b/src/main/resources/assets/mekanism/recipes/machineblock2_15.json index 5bc6f8cd8..8da0b9683 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_15.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_15.json @@ -8,6 +8,12 @@ "F" ], "type": "minecraft:crafting_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "LaserTractorBeam" + } + ], "key": { "C": { "item": "mekanism:machineblock", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_2.json b/src/main/resources/assets/mekanism/recipes/machineblock2_2.json index 0194e82fb..a31dbb3d9 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_2.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_2.json @@ -9,6 +9,12 @@ "ACA" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "ChemicalInfuser" + } + ], "key": { "A": { "item": "mekanism:enrichedalloy" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_3.json b/src/main/resources/assets/mekanism/recipes/machineblock2_3.json index 863a22e7a..8d3426abc 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_3.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_3.json @@ -9,6 +9,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "ChemicalInjectionChamber" + } + ], "key": { "P": { "item": "mekanism:machineblock", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_4.json b/src/main/resources/assets/mekanism/recipes/machineblock2_4.json index ae0c065bd..0bb27c023 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_4.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_4.json @@ -9,6 +9,12 @@ "IRI" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "ElectrolyticSeparator" + } + ], "key": { "R": { "ore": "dustRedstone", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_5.json b/src/main/resources/assets/mekanism/recipes/machineblock2_5.json index e3c1d6c64..9f80ab0be 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_5.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_5.json @@ -9,6 +9,12 @@ "ICI" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "PrecisionSawmill" + } + ], "key": { "A": { "item": "mekanism:enrichedalloy" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_6.json b/src/main/resources/assets/mekanism/recipes/machineblock2_6.json index e05c20348..010f9d452 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_6.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_6.json @@ -9,6 +9,12 @@ "CGC" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "ChemicalDissolutionChamber" + } + ], "key": { "A": { "item": "mekanism:atomicalloy" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_7.json b/src/main/resources/assets/mekanism/recipes/machineblock2_7.json index 0a40d0d43..5dfd92224 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_7.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_7.json @@ -9,6 +9,12 @@ "CGC" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "ChemicalWasher" + } + ], "key": { "C": { "ore": "circuitBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_8.json b/src/main/resources/assets/mekanism/recipes/machineblock2_8.json index 73eab2c48..cdc03b34f 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_8.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_8.json @@ -9,6 +9,12 @@ "CGC" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "ChemicalCrystallizer" + } + ], "key": { "A": { "item": "mekanism:atomicalloy" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_9.json b/src/main/resources/assets/mekanism/recipes/machineblock2_9.json index fec6140ef..ea57c1958 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_9.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_9.json @@ -9,6 +9,12 @@ "TTT" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "SeismicVibrator" + } + ], "key": { "C": { "ore": "circuitBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_0.json b/src/main/resources/assets/mekanism/recipes/machineblock3_0.json index 3a28d064a..1d780e6c4 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_0.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock3_0.json @@ -9,6 +9,12 @@ "OCO" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "QuantumEntangloporter" + } + ], "key": { "A": { "ore": "alloyUltimate", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_1.json b/src/main/resources/assets/mekanism/recipes/machineblock3_1.json index 585827f63..ce175ff7f 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_1.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock3_1.json @@ -9,6 +9,12 @@ "BBB" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "SolarNeutronActivator" + } + ], "key": { "P": { "item": "mekanism:polyethene", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_3.json b/src/main/resources/assets/mekanism/recipes/machineblock3_3.json index 8bd913495..c4b0ab363 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_3.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock3_3.json @@ -9,6 +9,12 @@ "SWS" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Oredictionificator" + } + ], "key": { "B": { "item": "mekanism:dictionary" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_4.json b/src/main/resources/assets/mekanism/recipes/machineblock3_4.json index f64c12b04..0fc170c98 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_4.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock3_4.json @@ -9,6 +9,12 @@ "CEC" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "ResistiveHeater" + } + ], "key": { "R": { "ore": "dustRedstone", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_5.json b/src/main/resources/assets/mekanism/recipes/machineblock3_5.json index 535a2fe31..c2f2506ef 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_5.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock3_5.json @@ -9,6 +9,12 @@ "SCS" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "FormulaicAssemblicator" + } + ], "key": { "B": { "ore": "circuitBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_6.json b/src/main/resources/assets/mekanism/recipes/machineblock3_6.json index 41ad5608a..070123dda 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_6.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock3_6.json @@ -9,6 +9,12 @@ "SSS" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "FuelwoodHeater" + } + ], "key": { "S": { "ore": "ingotSteel", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_0.json b/src/main/resources/assets/mekanism/recipes/machineblock_0.json index 683d5b1a9..76f2d6cb6 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_0.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_0.json @@ -9,6 +9,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "EnrichmentChamber" + } + ], "key": { "R": { "ore": "alloyBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_1.json b/src/main/resources/assets/mekanism/recipes/machineblock_1.json index 31627fc33..3fc256088 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_1.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_1.json @@ -9,6 +9,12 @@ "ECE" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "OsmiumCompressor" + } + ], "key": { "B": { "item": "minecraft:bucket" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_10.json b/src/main/resources/assets/mekanism/recipes/machineblock_10.json index 6a7491042..7388a008b 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_10.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_10.json @@ -9,6 +9,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "EnergizedSmelter" + } + ], "key": { "R": { "ore": "alloyBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_11.json b/src/main/resources/assets/mekanism/recipes/machineblock_11.json index b328e01fc..312bc8210 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_11.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_11.json @@ -9,6 +9,12 @@ "COC" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Teleporter" + } + ], "key": { "C": { "ore": "circuitBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_12.json b/src/main/resources/assets/mekanism/recipes/machineblock_12.json index 81c717d72..796f529f6 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_12.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_12.json @@ -9,6 +9,12 @@ "OOO" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "ElectricPump" + } + ], "key": { "B": { "item": "minecraft:bucket" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_13.json b/src/main/resources/assets/mekanism/recipes/machineblock_13.json index 579d86ff0..78e5735be 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_13.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_13.json @@ -9,6 +9,12 @@ "SSS" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "PersonalChest" + } + ], "key": { "S": { "ore": "ingotSteel", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_14.json b/src/main/resources/assets/mekanism/recipes/machineblock_14.json index 95fcff2cb..fc54bae97 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_14.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_14.json @@ -8,6 +8,12 @@ "SES" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Chargepad" + } + ], "key": { "P": { "item": "minecraft:stone_pressure_plate" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_15.json b/src/main/resources/assets/mekanism/recipes/machineblock_15.json index aecca2e8d..7d7f8e544 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_15.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_15.json @@ -9,6 +9,12 @@ "III" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "LogisticalSorter" + } + ], "key": { "P": { "item": "minecraft:piston" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_2.json b/src/main/resources/assets/mekanism/recipes/machineblock_2.json index 43c6e5bc6..5cd285eae 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_2.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_2.json @@ -9,6 +9,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Combiner" + } + ], "key": { "R": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_3.json b/src/main/resources/assets/mekanism/recipes/machineblock_3.json index 53c59d80b..fc242a1d1 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_3.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_3.json @@ -9,6 +9,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Crusher" + } + ], "key": { "R": { "ore": "dustRedstone", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_4.json b/src/main/resources/assets/mekanism/recipes/machineblock_4.json index eae3b210f..faa20fa1b 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_4.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_4.json @@ -9,6 +9,12 @@ "TIT" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "DigitalMiner" + } + ], "key": { "A": { "item": "mekanism:atomicalloy" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5.json b/src/main/resources/assets/mekanism/recipes/machineblock_5.json index 3a42bb15f..08907ac4a 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt.json index d8c137b61..332d3ceb7 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt.json index 0c200d3de..77e46415c 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt.json index e22ffa796..cb4dd34c7 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt.json index 06836671a..0a9d6ad05 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt.json index 480164b69..157fbb13b 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt.json index 9bd06dd12..208b27d72 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt.json index 79fe8fe62..90e99e956 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyBasic", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6.json b/src/main/resources/assets/mekanism/recipes/machineblock_6.json index 24cdec287..55c57a81b 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6.json @@ -13,6 +13,12 @@ "ECE" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "C": { "ore": "circuitAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt.json index 7f9ceee26..63c34d682 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt.json @@ -13,6 +13,12 @@ "ECE" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "C": { "ore": "circuitAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt.json index 68caceb3e..b94b97f41 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt.json @@ -13,6 +13,12 @@ "ECE" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "C": { "ore": "circuitAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt.json index e7dd2d7f9..acd0e37f1 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt.json @@ -13,6 +13,12 @@ "ECE" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "C": { "ore": "circuitAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt.json index b3381c587..4e23b64f9 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt.json @@ -13,6 +13,12 @@ "ECE" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "C": { "ore": "circuitAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt.json index 521fbcff3..d7f424fa1 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt.json @@ -13,6 +13,12 @@ "ECE" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "C": { "ore": "circuitAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt.json index cf74f36c6..8409dafb0 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt.json @@ -13,6 +13,12 @@ "ECE" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "C": { "ore": "circuitAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt_alt.json index 02f98feca..5344d213a 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt_alt.json @@ -13,6 +13,12 @@ "ECE" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "C": { "ore": "circuitAdvanced", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7.json b/src/main/resources/assets/mekanism/recipes/machineblock_7.json index 12949b7d3..7e24e89f4 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt.json index 94310b0bf..31419471f 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt.json index 81a809417..5891bb74d 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt.json index 86bb32d6e..4bd0e280f 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt.json index 8187a5012..ea6776f94 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt.json index 58108f89b..ef9c0e357 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt.json index 0d538f264..0a449bb92 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt_alt.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt_alt.json index c98bedd25..db7ecdf36 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt_alt.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt_alt.json @@ -13,6 +13,12 @@ "RCR" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "Factory" + } + ], "key": { "R": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8.json b/src/main/resources/assets/mekanism/recipes/machineblock_8.json index 52697525c..195f1853d 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_8.json @@ -9,6 +9,12 @@ "IFI" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "MetallurgicInfuser" + } + ], "key": { "R": { "ore": "dustRedstone", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9.json b/src/main/resources/assets/mekanism/recipes/machineblock_9.json index bd05d8e67..d19fa6472 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_9.json @@ -9,6 +9,12 @@ "ECE" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "machineType": "PurificationChamber" + } + ], "key": { "R": { "item": "mekanism:machineblock", diff --git a/src/main/resources/assets/mekanismgenerators/recipes/generator_0.json b/src/main/resources/assets/mekanismgenerators/recipes/generator_0.json index 8af776019..58bf2f7e4 100644 --- a/src/main/resources/assets/mekanismgenerators/recipes/generator_0.json +++ b/src/main/resources/assets/mekanismgenerators/recipes/generator_0.json @@ -9,6 +9,12 @@ "CFC" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "generatorType": "HeatGenerator" + } + ], "key": { "C": { "ore": "ingotCopper", diff --git a/src/main/resources/assets/mekanismgenerators/recipes/generator_1.json b/src/main/resources/assets/mekanismgenerators/recipes/generator_1.json index 5ec665693..1c3c8982e 100644 --- a/src/main/resources/assets/mekanismgenerators/recipes/generator_1.json +++ b/src/main/resources/assets/mekanismgenerators/recipes/generator_1.json @@ -9,6 +9,12 @@ "PEP" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "generatorType": "SolarGenerator" + } + ], "key": { "P": { "ore": "dustOsmium", diff --git a/src/main/resources/assets/mekanismgenerators/recipes/generator_3.json b/src/main/resources/assets/mekanismgenerators/recipes/generator_3.json index 0a646b275..9ad31088f 100644 --- a/src/main/resources/assets/mekanismgenerators/recipes/generator_3.json +++ b/src/main/resources/assets/mekanismgenerators/recipes/generator_3.json @@ -9,6 +9,12 @@ "PEP" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "generatorType": "GasGenerator" + } + ], "key": { "P": { "ore": "ingotOsmium", diff --git a/src/main/resources/assets/mekanismgenerators/recipes/generator_4.json b/src/main/resources/assets/mekanismgenerators/recipes/generator_4.json index 7ea410df3..1e8b2901c 100644 --- a/src/main/resources/assets/mekanismgenerators/recipes/generator_4.json +++ b/src/main/resources/assets/mekanismgenerators/recipes/generator_4.json @@ -9,6 +9,12 @@ "NEN" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "generatorType": "BioGenerator" + } + ], "key": { "R": { "ore": "dustRedstone", diff --git a/src/main/resources/assets/mekanismgenerators/recipes/generator_5.json b/src/main/resources/assets/mekanismgenerators/recipes/generator_5.json index 63a54414e..4f7b3a2cd 100644 --- a/src/main/resources/assets/mekanismgenerators/recipes/generator_5.json +++ b/src/main/resources/assets/mekanismgenerators/recipes/generator_5.json @@ -9,6 +9,12 @@ "III" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "generatorType": "AdvancedSolarGenerator" + } + ], "key": { "S": { "item": "mekanismgenerators:generator", diff --git a/src/main/resources/assets/mekanismgenerators/recipes/generator_6.json b/src/main/resources/assets/mekanismgenerators/recipes/generator_6.json index 963a5db43..ef80a37d1 100644 --- a/src/main/resources/assets/mekanismgenerators/recipes/generator_6.json +++ b/src/main/resources/assets/mekanismgenerators/recipes/generator_6.json @@ -9,6 +9,12 @@ "ECE" ], "type": "mekanism:ore_shaped", + "conditions": [ + { + "type": "machine_enabled", + "generatorType": "WindGenerator" + } + ], "key": { "A": { "item": "mekanism:enrichedalloy"