From 81c12fe22414c62c23b9a87b98c03462634945d0 Mon Sep 17 00:00:00 2001 From: alexbegt Date: Sat, 16 Jun 2018 23:22:57 -0400 Subject: [PATCH] Add a configuration option to allow the user to disable adding the crafting recipes for the Shulker Boxes, and to disable adding Shulker Boxes to the Creative Menu. (JEI support soon?) Add support for OreDict Items added by CraftTweaker Closes #129 Closes #136 --- build.gradle | 6 +-- .../api/container/ChestContainer.java | 7 +-- .../java/cpw/mods/ironchest/IronChest.java | 5 +- .../blocks/shulker/BlockIronShulkerBox.java | 8 +-- .../mods/ironchest/common/config/Config.java | 53 +++++++++++++++++++ ...IsConfigOptionEnabledConditionFactory.java | 27 ++++++++++ .../OreDictEntryExistsConditionFactory.java | 38 ------------- .../mods/ironchest/common/lib/BlockLists.java | 1 - .../network/MessageCrystalShulkerSync.java | 4 +- .../common/util/CreativeTabItems.java | 19 ++++--- .../assets/ironchest/recipes/_factories.json | 2 +- .../chest/copper/vanilla_copper_chest.json | 6 --- .../chest/diamond/silver_diamond_chest.json | 6 --- .../recipes/chest/gold/silver_gold_chest.json | 6 --- .../recipes/chest/iron/copper_iron_chest.json | 6 --- .../chest/silver/copper_silver_chest.json | 10 ---- .../chest/silver/iron_silver_chest.json | 6 --- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../black/gold/iron_gold_shulker_box.json | 6 +++ .../black/gold/silver_gold_shulker_box.json | 4 +- .../black/iron/copper_iron_shulker_box.json | 4 +- .../black/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../black/silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../blue/gold/iron_gold_shulker_box.json | 6 +++ .../blue/gold/silver_gold_shulker_box.json | 4 +- .../blue/iron/copper_iron_shulker_box.json | 4 +- .../blue/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../blue/silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../brown/gold/iron_gold_shulker_box.json | 6 +++ .../brown/gold/silver_gold_shulker_box.json | 4 +- .../brown/iron/copper_iron_shulker_box.json | 4 +- .../brown/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../brown/silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../cyan/gold/iron_gold_shulker_box.json | 6 +++ .../cyan/gold/silver_gold_shulker_box.json | 4 +- .../cyan/iron/copper_iron_shulker_box.json | 4 +- .../cyan/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../cyan/silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../gray/gold/iron_gold_shulker_box.json | 6 +++ .../gray/gold/silver_gold_shulker_box.json | 4 +- .../gray/iron/copper_iron_shulker_box.json | 4 +- .../gray/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../gray/silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../green/gold/iron_gold_shulker_box.json | 6 +++ .../green/gold/silver_gold_shulker_box.json | 4 +- .../green/iron/copper_iron_shulker_box.json | 4 +- .../green/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../green/silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../gold/iron_gold_shulker_box.json | 6 +++ .../gold/silver_gold_shulker_box.json | 4 +- .../iron/copper_iron_shulker_box.json | 4 +- .../iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../lime/gold/iron_gold_shulker_box.json | 6 +++ .../lime/gold/silver_gold_shulker_box.json | 4 +- .../lime/iron/copper_iron_shulker_box.json | 4 +- .../lime/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../lime/silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../magenta/gold/iron_gold_shulker_box.json | 6 +++ .../magenta/gold/silver_gold_shulker_box.json | 4 +- .../magenta/iron/copper_iron_shulker_box.json | 4 +- .../iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../orange/gold/iron_gold_shulker_box.json | 6 +++ .../orange/gold/silver_gold_shulker_box.json | 4 +- .../orange/iron/copper_iron_shulker_box.json | 4 +- .../orange/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../pink/gold/iron_gold_shulker_box.json | 6 +++ .../pink/gold/silver_gold_shulker_box.json | 4 +- .../pink/iron/copper_iron_shulker_box.json | 4 +- .../pink/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../pink/silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../purple/gold/iron_gold_shulker_box.json | 6 +++ .../purple/gold/silver_gold_shulker_box.json | 4 +- .../purple/iron/copper_iron_shulker_box.json | 4 +- .../purple/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../red/diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../red/gold/iron_gold_shulker_box.json | 6 +++ .../red/gold/silver_gold_shulker_box.json | 4 +- .../red/iron/copper_iron_shulker_box.json | 4 +- .../red/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../red/silver/copper_silver_shulker_box.json | 8 +-- .../red/silver/iron_silver_shulker_box.json | 4 +- .../recipes/shulker/shulker_box_coloring.json | 6 +++ .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../silver/gold/iron_gold_shulker_box.json | 6 +++ .../silver/gold/silver_gold_shulker_box.json | 4 +- .../silver/iron/copper_iron_shulker_box.json | 4 +- .../silver/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../white/gold/iron_gold_shulker_box.json | 6 +++ .../white/gold/silver_gold_shulker_box.json | 4 +- .../white/iron/copper_iron_shulker_box.json | 4 +- .../white/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../white/silver/iron_silver_shulker_box.json | 4 +- .../copper/vanilla_copper_shulker_box.json | 4 +- .../crystal/diamond_crystal_shulker_box.json | 6 +++ .../diamond/gold_diamond_shulker_box.json | 6 +++ .../diamond/silver_diamond_shulker_box.json | 4 +- .../yellow/gold/iron_gold_shulker_box.json | 6 +++ .../yellow/gold/silver_gold_shulker_box.json | 4 +- .../yellow/iron/copper_iron_shulker_box.json | 4 +- .../yellow/iron/vanilla_iron_shulker_box.json | 6 +++ .../diamond_obsidian_shulker_box.json | 6 +++ .../silver/copper_silver_shulker_box.json | 8 +-- .../silver/iron_silver_shulker_box.json | 4 +- .../chest/copper_iron_chest_upgrade.json | 6 --- .../chest/copper_silver_chest_upgrade.json | 10 ---- .../chest/silver_gold_chest_upgrade.json | 6 --- .../chest/wood_copper_chest_upgrade.json | 6 --- .../shulker/copper_iron_shulker_upgrade.json | 4 +- .../copper_silver_shulker_upgrade.json | 8 +-- .../diamond_crystal_shulker_upgrade.json | 6 +++ .../diamond_obsidian_shulker_upgrade.json | 6 +++ .../shulker/gold_diamond_shulker_upgrade.json | 6 +++ .../shulker/iron_gold_shulker_upgrade.json | 6 +++ .../shulker/silver_gold_shulker_upgrade.json | 4 +- .../vanilla_copper_shulker_upgrade.json | 4 +- .../shulker/vanilla_iron_shulker_upgrade.json | 6 +++ 207 files changed, 833 insertions(+), 389 deletions(-) create mode 100644 src/main/java/cpw/mods/ironchest/common/config/Config.java create mode 100644 src/main/java/cpw/mods/ironchest/common/crafting/condition/IsConfigOptionEnabledConditionFactory.java delete mode 100644 src/main/java/cpw/mods/ironchest/common/crafting/condition/OreDictEntryExistsConditionFactory.java diff --git a/build.gradle b/build.gradle index fb78009..36892d0 100755 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_1.12.2:4.7.+" + deobfCompile "mezz.jei:jei_1.12.2:4.10.+" } // This is our group. I'm cpw.mods @@ -46,8 +46,8 @@ targetCompatibility = 1.8 // Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here minecraft { - version = "1.12.2-14.23.0.2493" - mappings = "snapshot_20170927" + version = "1.12.2-14.23.4.2708" + mappings = "snapshot_20180616" runDir = "run" } diff --git a/src/api/java/invtweaks/api/container/ChestContainer.java b/src/api/java/invtweaks/api/container/ChestContainer.java index 52a07a3..e148569 100644 --- a/src/api/java/invtweaks/api/container/ChestContainer.java +++ b/src/api/java/invtweaks/api/container/ChestContainer.java @@ -6,7 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * A marker for containers that have a chest-like persistent storage component. Enables the Inventory Tweaks sorting buttons for this container. + * A marker for containers that have a chest-like persistent storage component. Enables the Inventory Tweaks sorting + * buttons for this container. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @@ -31,10 +32,10 @@ public @interface ChestContainer } // Annotation for method to get size of a chest row if it is not a fixed size for this container class - // Signature int func() + // Signature boolean func() @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) @interface IsLargeCallback { } -} \ No newline at end of file +} diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java index 1d28502..f443a8e 100755 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ b/src/main/java/cpw/mods/ironchest/IronChest.java @@ -13,6 +13,7 @@ package cpw.mods.ironchest; import java.util.Properties; import cpw.mods.ironchest.common.CommonProxy; +import cpw.mods.ironchest.common.config.Config; import cpw.mods.ironchest.common.lib.BlockLists; import cpw.mods.ironchest.common.network.MessageCrystalChestSync; import cpw.mods.ironchest.common.network.MessageCrystalShulkerSync; @@ -61,6 +62,8 @@ public class IronChest event.getModMetadata().version = String.format("%s.%s.%s build %s", major, minor, rev, build); } + Config.load(event); + proxy.preInit(); NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy); @@ -79,7 +82,7 @@ public class IronChest BlockLists.createShulkerItemList(); - registerDataFixes(); + this.registerDataFixes(); } public void registerDataFixes() diff --git a/src/main/java/cpw/mods/ironchest/common/blocks/shulker/BlockIronShulkerBox.java b/src/main/java/cpw/mods/ironchest/common/blocks/shulker/BlockIronShulkerBox.java index e99988d..13294cb 100644 --- a/src/main/java/cpw/mods/ironchest/common/blocks/shulker/BlockIronShulkerBox.java +++ b/src/main/java/cpw/mods/ironchest/common/blocks/shulker/BlockIronShulkerBox.java @@ -33,7 +33,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -280,6 +279,7 @@ public class BlockIronShulkerBox extends Block * Can be useful to delay the destruction of tile entities till after harvestBlock * @return True if the block is actually destroyed. */ + @Override public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { return willHarvest || super.removedByPlayer(state, world, pos, player, false); @@ -289,6 +289,7 @@ public class BlockIronShulkerBox extends Block * Spawns the block's drops in the world. By the time this is called the Block has possibly been set to air via * Block.removedByPlayer */ + @Override public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity te, ItemStack stack) { super.harvestBlock(worldIn, player, pos, state, te, stack); @@ -313,6 +314,7 @@ public class BlockIronShulkerBox extends Block * @param state Current state * @param fortune Breakers fortune level */ + @Override public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { TileEntity tileentity = world.getTileEntity(pos); @@ -320,7 +322,7 @@ public class BlockIronShulkerBox extends Block if (tileentity instanceof TileEntityIronShulkerBox) { ItemStack itemstack = ((TileEntityIronShulkerBox) tileentity).getDrop(state, false); - if(!itemstack.isEmpty()) + if (!itemstack.isEmpty()) { drops.add(itemstack); } @@ -338,7 +340,7 @@ public class BlockIronShulkerBox extends Block if (tileentity instanceof TileEntityIronShulkerBox) { ItemStack itemstack = ((TileEntityIronShulkerBox) tileentity).getDrop(state, true); - if(!itemstack.isEmpty()) + if (!itemstack.isEmpty()) { spawnAsEntity(worldIn, pos, itemstack); } diff --git a/src/main/java/cpw/mods/ironchest/common/config/Config.java b/src/main/java/cpw/mods/ironchest/common/config/Config.java new file mode 100644 index 0000000..df56e7b --- /dev/null +++ b/src/main/java/cpw/mods/ironchest/common/config/Config.java @@ -0,0 +1,53 @@ +package cpw.mods.ironchest.common.config; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import cpw.mods.ironchest.IronChest; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +public final class Config +{ + public static Config instance = new Config(); + + public static Logger log = LogManager.getLogger(IronChest.MOD_ID + "-" + "Config"); + + private static final String ENABLE_DISABLE = "ENABLE-DISABLE"; + + private Config() + { + } + + public static void load(FMLPreInitializationEvent event) + { + configFile = new Configuration(event.getSuggestedConfigurationFile(), "0.2", false); + configFile.load(); + + syncConfig(); + } + + public static boolean syncConfig() + { + enableShulkerBoxRecipes = configFile.get(ENABLE_DISABLE, "Enable Shulker Box Recipes", enableShulkerBoxRecipes).getBoolean(enableShulkerBoxRecipes); + addShulkerBoxesToCreative = configFile.get(ENABLE_DISABLE, "Add Shulker Boxes to Creative Menu", addShulkerBoxesToCreative).getBoolean(addShulkerBoxesToCreative); + + // save changes if any + boolean changed = false; + + if (configFile.hasChanged()) + { + configFile.save(); + changed = true; + } + + return changed; + } + + //@formatter:off + public static boolean enableShulkerBoxRecipes = true; + public static boolean addShulkerBoxesToCreative = true; + + static Configuration configFile; + //@formatter:on +} diff --git a/src/main/java/cpw/mods/ironchest/common/crafting/condition/IsConfigOptionEnabledConditionFactory.java b/src/main/java/cpw/mods/ironchest/common/crafting/condition/IsConfigOptionEnabledConditionFactory.java new file mode 100644 index 0000000..335a4bf --- /dev/null +++ b/src/main/java/cpw/mods/ironchest/common/crafting/condition/IsConfigOptionEnabledConditionFactory.java @@ -0,0 +1,27 @@ +package cpw.mods.ironchest.common.crafting.condition; + +import java.util.function.BooleanSupplier; + +import com.google.gson.JsonObject; + +import cpw.mods.ironchest.common.config.Config; +import net.minecraft.util.JsonUtils; +import net.minecraftforge.common.crafting.IConditionFactory; +import net.minecraftforge.common.crafting.JsonContext; + +public class IsConfigOptionEnabledConditionFactory implements IConditionFactory +{ + @Override + public BooleanSupplier parse(JsonContext context, JsonObject json) + { + String configSetting = JsonUtils.getString(json, "config_setting", ""); + + switch (configSetting) + { + case "enableShulkerBoxRecipes": + return () -> Config.enableShulkerBoxRecipes; + default: + throw new RuntimeException(String.format("Invalid config setting: %s", configSetting)); + } + } +} diff --git a/src/main/java/cpw/mods/ironchest/common/crafting/condition/OreDictEntryExistsConditionFactory.java b/src/main/java/cpw/mods/ironchest/common/crafting/condition/OreDictEntryExistsConditionFactory.java deleted file mode 100644 index 1d7f20f..0000000 --- a/src/main/java/cpw/mods/ironchest/common/crafting/condition/OreDictEntryExistsConditionFactory.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 cpw. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - *

- * Contributors: - * cpw - initial API and implementation - ******************************************************************************/ -package cpw.mods.ironchest.common.crafting.condition; - -import java.util.function.BooleanSupplier; - -import com.google.gson.JsonObject; - -import net.minecraft.util.JsonUtils; -import net.minecraftforge.common.crafting.IConditionFactory; -import net.minecraftforge.common.crafting.JsonContext; -import net.minecraftforge.oredict.OreDictionary; - -public class OreDictEntryExistsConditionFactory implements IConditionFactory -{ - @Override - public BooleanSupplier parse(JsonContext context, JsonObject json) - { - String orename = JsonUtils.getString(json, "ore"); - - if (OreDictionary.getOres(orename).isEmpty()) - { - return () -> false; - } - else - { - return () -> true; - } - } -} diff --git a/src/main/java/cpw/mods/ironchest/common/lib/BlockLists.java b/src/main/java/cpw/mods/ironchest/common/lib/BlockLists.java index 7b5cea8..de195de 100644 --- a/src/main/java/cpw/mods/ironchest/common/lib/BlockLists.java +++ b/src/main/java/cpw/mods/ironchest/common/lib/BlockLists.java @@ -57,7 +57,6 @@ public class BlockLists VANILLA_SHULKER_COLORS.add(EnumDyeColor.GREEN); VANILLA_SHULKER_COLORS.add(EnumDyeColor.RED); VANILLA_SHULKER_COLORS.add(EnumDyeColor.BLACK); - } public static void createIronShulkerBlockList() diff --git a/src/main/java/cpw/mods/ironchest/common/network/MessageCrystalShulkerSync.java b/src/main/java/cpw/mods/ironchest/common/network/MessageCrystalShulkerSync.java index bae53ac..c1dd928 100644 --- a/src/main/java/cpw/mods/ironchest/common/network/MessageCrystalShulkerSync.java +++ b/src/main/java/cpw/mods/ironchest/common/network/MessageCrystalShulkerSync.java @@ -26,7 +26,9 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class MessageCrystalShulkerSync implements IMessage { int dimension; + BlockPos pos; + private NonNullList topStacks; public MessageCrystalShulkerSync(TileEntityIronShulkerBox tile, NonNullList stack) @@ -90,4 +92,4 @@ public class MessageCrystalShulkerSync implements IMessage return null; } } -} \ No newline at end of file +} diff --git a/src/main/java/cpw/mods/ironchest/common/util/CreativeTabItems.java b/src/main/java/cpw/mods/ironchest/common/util/CreativeTabItems.java index ad3bb91..b8dcdb2 100644 --- a/src/main/java/cpw/mods/ironchest/common/util/CreativeTabItems.java +++ b/src/main/java/cpw/mods/ironchest/common/util/CreativeTabItems.java @@ -2,6 +2,7 @@ package cpw.mods.ironchest.common.util; import cpw.mods.ironchest.common.blocks.chest.IronChestType; import cpw.mods.ironchest.common.blocks.shulker.IronShulkerBoxType; +import cpw.mods.ironchest.common.config.Config; import cpw.mods.ironchest.common.core.IronChestBlocks; import cpw.mods.ironchest.common.items.ChestChangerType; import cpw.mods.ironchest.common.items.ShulkerBoxChangerType; @@ -22,9 +23,12 @@ public class CreativeTabItems subItems.add(new ItemStack(type.item)); } - for (ShulkerBoxChangerType type : ShulkerBoxChangerType.VALUES) + if (Config.addShulkerBoxesToCreative) { - subItems.add(new ItemStack(type.item)); + for (ShulkerBoxChangerType type : ShulkerBoxChangerType.VALUES) + { + subItems.add(new ItemStack(type.item)); + } } for (IronChestType type : IronChestType.VALUES) @@ -35,13 +39,16 @@ public class CreativeTabItems } } - for (Block shulker : BlockLists.SHULKER_BLOCKS) + if (Config.addShulkerBoxesToCreative) { - for (IronShulkerBoxType type : IronShulkerBoxType.VALUES) + for (Block shulker : BlockLists.SHULKER_BLOCKS) { - if (type.isValidForCreativeMode()) + for (IronShulkerBoxType type : IronShulkerBoxType.VALUES) { - subItems.add(new ItemStack(shulker, 1, type.ordinal())); + if (type.isValidForCreativeMode()) + { + subItems.add(new ItemStack(shulker, 1, type.ordinal())); + } } } } diff --git a/src/main/resources/assets/ironchest/recipes/_factories.json b/src/main/resources/assets/ironchest/recipes/_factories.json index c8ba6c3..f349004 100644 --- a/src/main/resources/assets/ironchest/recipes/_factories.json +++ b/src/main/resources/assets/ironchest/recipes/_factories.json @@ -4,6 +4,6 @@ "shulker_box_coloring": "cpw.mods.ironchest.common.crafting.recipe.ShulkerBoxColorRecipeFactory" }, "conditions": { - "ore_dict_entry_exists": "cpw.mods.ironchest.common.crafting.condition.OreDictEntryExistsConditionFactory" + "is_option_enabled": "cpw.mods.ironchest.common.crafting.condition.IsConfigOptionEnabledConditionFactory" } } \ No newline at end of file diff --git a/src/main/resources/assets/ironchest/recipes/chest/copper/vanilla_copper_chest.json b/src/main/resources/assets/ironchest/recipes/chest/copper/vanilla_copper_chest.json index 6ee8455..8c4e0ff 100644 --- a/src/main/resources/assets/ironchest/recipes/chest/copper/vanilla_copper_chest.json +++ b/src/main/resources/assets/ironchest/recipes/chest/copper/vanilla_copper_chest.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - } - ], "type": "forge:ore_shaped", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/chest/diamond/silver_diamond_chest.json b/src/main/resources/assets/ironchest/recipes/chest/diamond/silver_diamond_chest.json index 61c3e23..9c63437 100644 --- a/src/main/resources/assets/ironchest/recipes/chest/diamond/silver_diamond_chest.json +++ b/src/main/resources/assets/ironchest/recipes/chest/diamond/silver_diamond_chest.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" - } - ], "type": "forge:ore_shaped", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/chest/gold/silver_gold_chest.json b/src/main/resources/assets/ironchest/recipes/chest/gold/silver_gold_chest.json index ac43d6f..c1ce224 100644 --- a/src/main/resources/assets/ironchest/recipes/chest/gold/silver_gold_chest.json +++ b/src/main/resources/assets/ironchest/recipes/chest/gold/silver_gold_chest.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" - } - ], "type": "forge:ore_shaped", "pattern": [ "MGM", diff --git a/src/main/resources/assets/ironchest/recipes/chest/iron/copper_iron_chest.json b/src/main/resources/assets/ironchest/recipes/chest/iron/copper_iron_chest.json index cb8e000..e2ab5d9 100644 --- a/src/main/resources/assets/ironchest/recipes/chest/iron/copper_iron_chest.json +++ b/src/main/resources/assets/ironchest/recipes/chest/iron/copper_iron_chest.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - } - ], "type": "forge:ore_shaped", "pattern": [ "MGM", diff --git a/src/main/resources/assets/ironchest/recipes/chest/silver/copper_silver_chest.json b/src/main/resources/assets/ironchest/recipes/chest/silver/copper_silver_chest.json index 6495de3..3bc77fc 100644 --- a/src/main/resources/assets/ironchest/recipes/chest/silver/copper_silver_chest.json +++ b/src/main/resources/assets/ironchest/recipes/chest/silver/copper_silver_chest.json @@ -1,14 +1,4 @@ { - "conditions": [ - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" - } - ], "type": "forge:ore_shaped", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/chest/silver/iron_silver_chest.json b/src/main/resources/assets/ironchest/recipes/chest/silver/iron_silver_chest.json index a97687c..b308150 100644 --- a/src/main/resources/assets/ironchest/recipes/chest/silver/iron_silver_chest.json +++ b/src/main/resources/assets/ironchest/recipes/chest/silver/iron_silver_chest.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" - } - ], "type": "forge:ore_shaped", "pattern": [ "MGM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/black/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/black/copper/vanilla_copper_shulker_box.json index 707ebb0..3ab8d91 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/black/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/black/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/black/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/black/crystal/diamond_crystal_shulker_box.json index 49abf35..eb4deb9 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/black/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/black/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/black/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/black/diamond/gold_diamond_shulker_box.json index e415a15..999f65d 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/black/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/black/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/black/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/black/diamond/silver_diamond_shulker_box.json index ac1d6c8..0c5b60e 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/black/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/black/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/black/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/black/gold/iron_gold_shulker_box.json index 8541588..6edf188 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/black/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/black/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/black/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/black/gold/silver_gold_shulker_box.json index c60e164..f61f0cd 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/black/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/black/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/black/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/black/iron/copper_iron_shulker_box.json index 95a2ef8..0ae51e8 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/black/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/black/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/black/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/black/iron/vanilla_iron_shulker_box.json index 5a5de5a..9107f58 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/black/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/black/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/black/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/black/obsidian/diamond_obsidian_shulker_box.json index 668d836..e927203 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/black/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/black/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/black/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/black/silver/copper_silver_shulker_box.json index 0b6c17b..2bff8bf 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/black/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/black/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/black/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/black/silver/iron_silver_shulker_box.json index 4d1d114..0adba81 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/black/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/black/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/blue/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/blue/copper/vanilla_copper_shulker_box.json index 56aff0a..ff5c509 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/blue/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/blue/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/blue/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/blue/crystal/diamond_crystal_shulker_box.json index fac94b1..71052fc 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/blue/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/blue/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/blue/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/blue/diamond/gold_diamond_shulker_box.json index 36bedea..9fc4f4b 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/blue/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/blue/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/blue/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/blue/diamond/silver_diamond_shulker_box.json index bbb7b8c..ca3f1a4 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/blue/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/blue/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/blue/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/blue/gold/iron_gold_shulker_box.json index 494c4ad..be5d6c9 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/blue/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/blue/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/blue/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/blue/gold/silver_gold_shulker_box.json index d8c2b84..0bced7d 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/blue/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/blue/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/blue/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/blue/iron/copper_iron_shulker_box.json index 94f41d2..afb94f4 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/blue/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/blue/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/blue/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/blue/iron/vanilla_iron_shulker_box.json index b7ca1ef..f8fcf67 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/blue/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/blue/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/blue/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/blue/obsidian/diamond_obsidian_shulker_box.json index 8b7799a..ecdf2b9 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/blue/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/blue/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/blue/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/blue/silver/copper_silver_shulker_box.json index 45f75c5..c88cbb7 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/blue/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/blue/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/blue/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/blue/silver/iron_silver_shulker_box.json index 93154c3..d146266 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/blue/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/blue/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/brown/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/brown/copper/vanilla_copper_shulker_box.json index afffa1f..0071f83 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/brown/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/brown/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/brown/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/brown/crystal/diamond_crystal_shulker_box.json index c6c5de3..560160a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/brown/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/brown/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/brown/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/brown/diamond/gold_diamond_shulker_box.json index 4399c16..d32872d 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/brown/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/brown/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/brown/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/brown/diamond/silver_diamond_shulker_box.json index 900a5af..149b79a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/brown/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/brown/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/brown/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/brown/gold/iron_gold_shulker_box.json index 3606944..ffb51fd 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/brown/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/brown/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/brown/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/brown/gold/silver_gold_shulker_box.json index bfa0016..b9157a7 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/brown/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/brown/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/brown/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/brown/iron/copper_iron_shulker_box.json index 04f96aa..92663a3 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/brown/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/brown/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/brown/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/brown/iron/vanilla_iron_shulker_box.json index e407be0..7fd3d4f 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/brown/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/brown/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/brown/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/brown/obsidian/diamond_obsidian_shulker_box.json index d4dafe5..ba125fb 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/brown/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/brown/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/brown/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/brown/silver/copper_silver_shulker_box.json index 2fd1d37..99799f3 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/brown/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/brown/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/brown/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/brown/silver/iron_silver_shulker_box.json index 62f6419..a9b43c3 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/brown/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/brown/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/cyan/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/cyan/copper/vanilla_copper_shulker_box.json index d4f8db8..b39a6b4 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/cyan/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/cyan/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/cyan/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/cyan/crystal/diamond_crystal_shulker_box.json index b721bc3..06213e3 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/cyan/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/cyan/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/cyan/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/cyan/diamond/gold_diamond_shulker_box.json index 0165c38..e7495b3 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/cyan/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/cyan/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/cyan/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/cyan/diamond/silver_diamond_shulker_box.json index ccf6ad3..3a225b2 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/cyan/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/cyan/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/cyan/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/cyan/gold/iron_gold_shulker_box.json index bbdf2d4..c1d6dc3 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/cyan/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/cyan/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/cyan/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/cyan/gold/silver_gold_shulker_box.json index ad97fc4..3d06faa 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/cyan/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/cyan/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/cyan/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/cyan/iron/copper_iron_shulker_box.json index 7fc4171..dac96e2 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/cyan/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/cyan/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/cyan/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/cyan/iron/vanilla_iron_shulker_box.json index 5378c38..85e4976 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/cyan/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/cyan/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/cyan/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/cyan/obsidian/diamond_obsidian_shulker_box.json index 8877489..9d60a36 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/cyan/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/cyan/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/cyan/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/cyan/silver/copper_silver_shulker_box.json index ff70f0c..7c94b61 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/cyan/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/cyan/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/cyan/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/cyan/silver/iron_silver_shulker_box.json index a43f48e..a6292ab 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/cyan/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/cyan/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/gray/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/gray/copper/vanilla_copper_shulker_box.json index 43d61b7..d259895 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/gray/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/gray/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/gray/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/gray/crystal/diamond_crystal_shulker_box.json index 71d7606..d132998 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/gray/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/gray/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/gray/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/gray/diamond/gold_diamond_shulker_box.json index 48df6b0..b545c89 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/gray/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/gray/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/gray/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/gray/diamond/silver_diamond_shulker_box.json index 0365793..4b460f5 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/gray/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/gray/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/gray/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/gray/gold/iron_gold_shulker_box.json index e43a8c3..1ae7fbe 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/gray/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/gray/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/gray/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/gray/gold/silver_gold_shulker_box.json index 9c5a7b1..41fd7c1 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/gray/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/gray/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/gray/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/gray/iron/copper_iron_shulker_box.json index 9792ad2..e53b6c9 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/gray/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/gray/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/gray/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/gray/iron/vanilla_iron_shulker_box.json index 41bd283..7683b4a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/gray/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/gray/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/gray/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/gray/obsidian/diamond_obsidian_shulker_box.json index b2e9488..3319213 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/gray/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/gray/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/gray/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/gray/silver/copper_silver_shulker_box.json index 0004fdc..a68f112 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/gray/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/gray/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/gray/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/gray/silver/iron_silver_shulker_box.json index b9449f8..5870be4 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/gray/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/gray/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/green/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/green/copper/vanilla_copper_shulker_box.json index 5f632d8..a1ce187 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/green/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/green/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/green/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/green/crystal/diamond_crystal_shulker_box.json index 17ab372..4284c33 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/green/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/green/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/green/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/green/diamond/gold_diamond_shulker_box.json index 4eaa104..73118a9 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/green/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/green/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/green/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/green/diamond/silver_diamond_shulker_box.json index 25e0410..33d5392 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/green/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/green/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/green/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/green/gold/iron_gold_shulker_box.json index 40fdf1b..6d7fc17 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/green/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/green/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/green/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/green/gold/silver_gold_shulker_box.json index 010452c..75aba53 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/green/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/green/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/green/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/green/iron/copper_iron_shulker_box.json index 0c5fd5e..a57b2a7 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/green/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/green/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/green/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/green/iron/vanilla_iron_shulker_box.json index e421a6f..2e086ec 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/green/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/green/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/green/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/green/obsidian/diamond_obsidian_shulker_box.json index aa12654..44d779a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/green/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/green/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/green/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/green/silver/copper_silver_shulker_box.json index 1d620e0..cfa061f 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/green/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/green/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/green/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/green/silver/iron_silver_shulker_box.json index aa26925..5f7caf5 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/green/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/green/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/copper/vanilla_copper_shulker_box.json index 47b2da6..6418631 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/crystal/diamond_crystal_shulker_box.json index e7931a9..1b7f533 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/diamond/gold_diamond_shulker_box.json index 3ea1f46..cd84f06 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/diamond/silver_diamond_shulker_box.json index f55e108..fc3b802 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/gold/iron_gold_shulker_box.json index baf5b1d..c726629 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/gold/silver_gold_shulker_box.json index e539309..aee69b6 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/iron/copper_iron_shulker_box.json index bfee83e..278458c 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/iron/vanilla_iron_shulker_box.json index d859e60..f935c9a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/obsidian/diamond_obsidian_shulker_box.json index 4bdfb2f..805b884 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/silver/copper_silver_shulker_box.json index 02d1bf9..ef33812 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/silver/iron_silver_shulker_box.json index fa96a26..37248f0 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/light_blue/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/light_blue/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/lime/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/lime/copper/vanilla_copper_shulker_box.json index 65ed5f0..aee3c8a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/lime/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/lime/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/lime/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/lime/crystal/diamond_crystal_shulker_box.json index 629d71b..9a049f8 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/lime/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/lime/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/lime/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/lime/diamond/gold_diamond_shulker_box.json index 2ec7565..a89b2d1 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/lime/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/lime/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/lime/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/lime/diamond/silver_diamond_shulker_box.json index dbd3730..81ac38f 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/lime/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/lime/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/lime/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/lime/gold/iron_gold_shulker_box.json index 37b8537..8929627 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/lime/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/lime/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/lime/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/lime/gold/silver_gold_shulker_box.json index 479e0f5..ff55a55 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/lime/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/lime/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/lime/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/lime/iron/copper_iron_shulker_box.json index 2a19f0e..bb50823 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/lime/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/lime/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/lime/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/lime/iron/vanilla_iron_shulker_box.json index 43f26cc..da08ff8 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/lime/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/lime/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/lime/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/lime/obsidian/diamond_obsidian_shulker_box.json index 30db6d3..7d691e9 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/lime/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/lime/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/lime/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/lime/silver/copper_silver_shulker_box.json index 2508bbc..60e4d87 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/lime/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/lime/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/lime/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/lime/silver/iron_silver_shulker_box.json index 4989ba7..121c37a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/lime/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/lime/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/magenta/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/magenta/copper/vanilla_copper_shulker_box.json index e82cb4b..472586a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/magenta/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/magenta/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/magenta/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/magenta/crystal/diamond_crystal_shulker_box.json index 5b4b453..612b6a6 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/magenta/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/magenta/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/magenta/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/magenta/diamond/gold_diamond_shulker_box.json index 25cc874..fe62455 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/magenta/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/magenta/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/magenta/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/magenta/diamond/silver_diamond_shulker_box.json index d4932de..a3dc172 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/magenta/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/magenta/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/magenta/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/magenta/gold/iron_gold_shulker_box.json index 9570c76..1c5d1ed 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/magenta/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/magenta/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/magenta/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/magenta/gold/silver_gold_shulker_box.json index 58ae2d2..d264b18 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/magenta/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/magenta/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/magenta/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/magenta/iron/copper_iron_shulker_box.json index db98af0..47a2bf7 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/magenta/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/magenta/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/magenta/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/magenta/iron/vanilla_iron_shulker_box.json index 13bd513..d51b631 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/magenta/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/magenta/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/magenta/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/magenta/obsidian/diamond_obsidian_shulker_box.json index 772f5a7..d0433f3 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/magenta/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/magenta/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/magenta/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/magenta/silver/copper_silver_shulker_box.json index d5c3cba..84a3110 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/magenta/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/magenta/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/magenta/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/magenta/silver/iron_silver_shulker_box.json index 354a66b..4630629 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/magenta/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/magenta/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/orange/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/orange/copper/vanilla_copper_shulker_box.json index 58a846d..38b8c30 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/orange/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/orange/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/orange/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/orange/crystal/diamond_crystal_shulker_box.json index 0242246..2f4292a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/orange/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/orange/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/orange/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/orange/diamond/gold_diamond_shulker_box.json index 09e1039..60325b6 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/orange/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/orange/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/orange/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/orange/diamond/silver_diamond_shulker_box.json index 1a8e7be..4baf32a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/orange/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/orange/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/orange/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/orange/gold/iron_gold_shulker_box.json index 50b50aa..5595817 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/orange/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/orange/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/orange/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/orange/gold/silver_gold_shulker_box.json index bcdc47c..c25266c 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/orange/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/orange/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/orange/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/orange/iron/copper_iron_shulker_box.json index ff33cf3..4f96103 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/orange/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/orange/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/orange/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/orange/iron/vanilla_iron_shulker_box.json index 5d7ad2f..4c46fb5 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/orange/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/orange/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/orange/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/orange/obsidian/diamond_obsidian_shulker_box.json index ac571d0..64e4bb5 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/orange/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/orange/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/orange/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/orange/silver/copper_silver_shulker_box.json index c138beb..706d0dc 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/orange/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/orange/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/orange/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/orange/silver/iron_silver_shulker_box.json index 4e15104..d4a332b 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/orange/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/orange/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/pink/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/pink/copper/vanilla_copper_shulker_box.json index 6767ac5..742a940 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/pink/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/pink/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/pink/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/pink/crystal/diamond_crystal_shulker_box.json index 34e3542..79299e9 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/pink/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/pink/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/pink/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/pink/diamond/gold_diamond_shulker_box.json index 92529e5..6a9a87f 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/pink/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/pink/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/pink/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/pink/diamond/silver_diamond_shulker_box.json index 515eb83..e6c1e82 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/pink/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/pink/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/pink/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/pink/gold/iron_gold_shulker_box.json index ddc1f75..ebbcd67 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/pink/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/pink/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/pink/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/pink/gold/silver_gold_shulker_box.json index 265bb59..040563a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/pink/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/pink/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/pink/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/pink/iron/copper_iron_shulker_box.json index 43ed739..2364bac 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/pink/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/pink/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/pink/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/pink/iron/vanilla_iron_shulker_box.json index e0f100d..5dec6f6 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/pink/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/pink/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/pink/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/pink/obsidian/diamond_obsidian_shulker_box.json index afd68dc..ffe1887 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/pink/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/pink/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/pink/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/pink/silver/copper_silver_shulker_box.json index 71e18f0..cf5421f 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/pink/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/pink/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/pink/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/pink/silver/iron_silver_shulker_box.json index fdd7049..01fae8e 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/pink/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/pink/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/purple/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/purple/copper/vanilla_copper_shulker_box.json index f006404..bc37f11 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/purple/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/purple/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/purple/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/purple/crystal/diamond_crystal_shulker_box.json index 1657c0c..36d32c5 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/purple/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/purple/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/purple/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/purple/diamond/gold_diamond_shulker_box.json index acc4d27..d2fd107 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/purple/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/purple/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/purple/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/purple/diamond/silver_diamond_shulker_box.json index 481e19d..5c0834d 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/purple/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/purple/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/purple/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/purple/gold/iron_gold_shulker_box.json index 2bf6a3a..4302acc 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/purple/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/purple/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/purple/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/purple/gold/silver_gold_shulker_box.json index 1856289..36f1a01 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/purple/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/purple/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/purple/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/purple/iron/copper_iron_shulker_box.json index 0f081ba..95328fe 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/purple/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/purple/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/purple/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/purple/iron/vanilla_iron_shulker_box.json index cbba56a..b844dc1 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/purple/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/purple/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/purple/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/purple/obsidian/diamond_obsidian_shulker_box.json index f00d240..fb2b889 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/purple/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/purple/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/purple/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/purple/silver/copper_silver_shulker_box.json index dceb268..55820c0 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/purple/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/purple/silver/copper_silver_shulker_box.json @@ -1,12 +1,12 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" }, { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/purple/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/purple/silver/iron_silver_shulker_box.json index 95c79e3..7171f9c 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/purple/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/purple/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/red/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/red/copper/vanilla_copper_shulker_box.json index 5065513..ee0c7f8 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/red/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/red/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/red/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/red/crystal/diamond_crystal_shulker_box.json index cf93c41..62e526b 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/red/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/red/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/red/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/red/diamond/gold_diamond_shulker_box.json index 868b9bc..b0e35ad 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/red/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/red/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/red/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/red/diamond/silver_diamond_shulker_box.json index 59ebb07..2c8c66d 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/red/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/red/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/red/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/red/gold/iron_gold_shulker_box.json index 6ca074a..c60fe2d 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/red/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/red/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/red/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/red/gold/silver_gold_shulker_box.json index ebbf252..d76563a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/red/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/red/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/red/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/red/iron/copper_iron_shulker_box.json index 6972698..9eb5820 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/red/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/red/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/red/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/red/iron/vanilla_iron_shulker_box.json index 7473e1f..3cdc552 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/red/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/red/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/red/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/red/obsidian/diamond_obsidian_shulker_box.json index 514237c..9af243d 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/red/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/red/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/red/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/red/silver/copper_silver_shulker_box.json index 995d69b..c206775 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/red/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/red/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/red/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/red/silver/iron_silver_shulker_box.json index d2d86bc..a432e5c 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/red/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/red/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/shulker_box_coloring.json b/src/main/resources/assets/ironchest/recipes/shulker/shulker_box_coloring.json index 3dc7c41..fbec769 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/shulker_box_coloring.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/shulker_box_coloring.json @@ -1,3 +1,9 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box_coloring" } \ No newline at end of file diff --git a/src/main/resources/assets/ironchest/recipes/shulker/silver/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/silver/copper/vanilla_copper_shulker_box.json index 43d61b7..d259895 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/silver/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/silver/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/silver/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/silver/crystal/diamond_crystal_shulker_box.json index 71d7606..d132998 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/silver/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/silver/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/silver/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/silver/diamond/gold_diamond_shulker_box.json index 48df6b0..b545c89 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/silver/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/silver/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/silver/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/silver/diamond/silver_diamond_shulker_box.json index 0365793..4b460f5 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/silver/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/silver/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/silver/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/silver/gold/iron_gold_shulker_box.json index e43a8c3..1ae7fbe 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/silver/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/silver/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/silver/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/silver/gold/silver_gold_shulker_box.json index 9c5a7b1..41fd7c1 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/silver/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/silver/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/silver/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/silver/iron/copper_iron_shulker_box.json index 9792ad2..e53b6c9 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/silver/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/silver/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/silver/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/silver/iron/vanilla_iron_shulker_box.json index 41bd283..7683b4a 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/silver/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/silver/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/silver/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/silver/obsidian/diamond_obsidian_shulker_box.json index b2e9488..3319213 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/silver/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/silver/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/silver/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/silver/silver/copper_silver_shulker_box.json index 0004fdc..a68f112 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/silver/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/silver/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/silver/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/silver/silver/iron_silver_shulker_box.json index b9449f8..5870be4 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/silver/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/silver/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/white/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/white/copper/vanilla_copper_shulker_box.json index 6f3f870..d11db23 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/white/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/white/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/white/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/white/crystal/diamond_crystal_shulker_box.json index 017ec80..64e37c2 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/white/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/white/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/white/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/white/diamond/gold_diamond_shulker_box.json index 6ebfa03..59dc3cd 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/white/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/white/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/white/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/white/diamond/silver_diamond_shulker_box.json index 8898a58..b5bbaf1 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/white/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/white/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/white/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/white/gold/iron_gold_shulker_box.json index 2e06a20..21de834 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/white/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/white/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/white/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/white/gold/silver_gold_shulker_box.json index f0b38d0..ada0f28 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/white/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/white/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/white/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/white/iron/copper_iron_shulker_box.json index a4a84f1..3fac7a6 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/white/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/white/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/white/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/white/iron/vanilla_iron_shulker_box.json index 601a5ca..75f45e4 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/white/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/white/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/white/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/white/obsidian/diamond_obsidian_shulker_box.json index 5bd665a..49ac041 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/white/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/white/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/white/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/white/silver/copper_silver_shulker_box.json index 918282e..712a07f 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/white/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/white/silver/copper_silver_shulker_box.json @@ -1,12 +1,12 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" }, { - "type" : "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type" : "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/white/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/white/silver/iron_silver_shulker_box.json index 660a4ef..8af3c31 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/white/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/white/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/yellow/copper/vanilla_copper_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/yellow/copper/vanilla_copper_shulker_box.json index 4bd3c98..9d9b872 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/yellow/copper/vanilla_copper_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/yellow/copper/vanilla_copper_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/yellow/crystal/diamond_crystal_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/yellow/crystal/diamond_crystal_shulker_box.json index d7eab1c..4c286d1 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/yellow/crystal/diamond_crystal_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/yellow/crystal/diamond_crystal_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/yellow/diamond/gold_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/yellow/diamond/gold_diamond_shulker_box.json index 5a1115d..c6dd784 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/yellow/diamond/gold_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/yellow/diamond/gold_diamond_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "GGG", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/yellow/diamond/silver_diamond_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/yellow/diamond/silver_diamond_shulker_box.json index e898f54..78a56f5 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/yellow/diamond/silver_diamond_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/yellow/diamond/silver_diamond_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/yellow/gold/iron_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/yellow/gold/iron_gold_shulker_box.json index 7d343bb..b624aec 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/yellow/gold/iron_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/yellow/gold/iron_gold_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/yellow/gold/silver_gold_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/yellow/gold/silver_gold_shulker_box.json index 65801f8..7143462 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/yellow/gold/silver_gold_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/yellow/gold/silver_gold_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/yellow/iron/copper_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/yellow/iron/copper_iron_shulker_box.json index 5479d10..d83cd59 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/yellow/iron/copper_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/yellow/iron/copper_iron_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/yellow/iron/vanilla_iron_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/yellow/iron/vanilla_iron_shulker_box.json index 4d7ca11..cb72e8c 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/yellow/iron/vanilla_iron_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/yellow/iron/vanilla_iron_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/yellow/obsidian/diamond_obsidian_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/yellow/obsidian/diamond_obsidian_shulker_box.json index 3ec9f82..e8aa65e 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/yellow/obsidian/diamond_obsidian_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/yellow/obsidian/diamond_obsidian_shulker_box.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "ironchest:shulker_box", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/yellow/silver/copper_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/yellow/silver/copper_silver_shulker_box.json index 9c52f1a..b688a13 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/yellow/silver/copper_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/yellow/silver/copper_silver_shulker_box.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/shulker/yellow/silver/iron_silver_shulker_box.json b/src/main/resources/assets/ironchest/recipes/shulker/yellow/silver/iron_silver_shulker_box.json index 23dfa7d..9dee834 100644 --- a/src/main/resources/assets/ironchest/recipes/shulker/yellow/silver/iron_silver_shulker_box.json +++ b/src/main/resources/assets/ironchest/recipes/shulker/yellow/silver/iron_silver_shulker_box.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "ironchest:shulker_box", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/chest/copper_iron_chest_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/chest/copper_iron_chest_upgrade.json index a2e8c73..0b8328e 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/chest/copper_iron_chest_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/chest/copper_iron_chest_upgrade.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - } - ], "type": "forge:ore_shaped", "pattern": [ "MGM", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/chest/copper_silver_chest_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/chest/copper_silver_chest_upgrade.json index fde6fc6..cee67ef 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/chest/copper_silver_chest_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/chest/copper_silver_chest_upgrade.json @@ -1,14 +1,4 @@ { - "conditions": [ - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" - } - ], "type": "forge:ore_shaped", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/chest/silver_gold_chest_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/chest/silver_gold_chest_upgrade.json index 8d0b921..48f9628 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/chest/silver_gold_chest_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/chest/silver_gold_chest_upgrade.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" - } - ], "type": "forge:ore_shaped", "pattern": [ "MGM", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/chest/wood_copper_chest_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/chest/wood_copper_chest_upgrade.json index 6d58cd5..e58d47c 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/chest/wood_copper_chest_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/chest/wood_copper_chest_upgrade.json @@ -1,10 +1,4 @@ { - "conditions": [ - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - } - ], "type": "forge:ore_shaped", "pattern": [ "MMM", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/copper_iron_shulker_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/copper_iron_shulker_upgrade.json index 0cf62ba..26d8b19 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/copper_iron_shulker_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/copper_iron_shulker_upgrade.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "forge:ore_shaped", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/copper_silver_shulker_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/copper_silver_shulker_upgrade.json index f912e62..c879111 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/copper_silver_shulker_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/copper_silver_shulker_upgrade.json @@ -1,12 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" - }, - { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "forge:ore_shaped", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/diamond_crystal_shulker_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/diamond_crystal_shulker_upgrade.json index 9958547..d2e9a83 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/diamond_crystal_shulker_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/diamond_crystal_shulker_upgrade.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "forge:ore_shaped", "pattern": [ "GSG", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/diamond_obsidian_shulker_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/diamond_obsidian_shulker_upgrade.json index 4672c89..7c67ccb 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/diamond_obsidian_shulker_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/diamond_obsidian_shulker_upgrade.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "forge:ore_shaped", "pattern": [ "MGM", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/gold_diamond_shulker_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/gold_diamond_shulker_upgrade.json index a42cd1b..42768c7 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/gold_diamond_shulker_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/gold_diamond_shulker_upgrade.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "forge:ore_shaped", "pattern": [ "GMG", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/iron_gold_shulker_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/iron_gold_shulker_upgrade.json index fdc9193..187ce9e 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/iron_gold_shulker_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/iron_gold_shulker_upgrade.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "forge:ore_shaped", "pattern": [ "MSM", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/silver_gold_shulker_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/silver_gold_shulker_upgrade.json index 0f0579e..f2f1bbb 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/silver_gold_shulker_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/silver_gold_shulker_upgrade.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotSilver" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "forge:ore_shaped", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/vanilla_copper_shulker_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/vanilla_copper_shulker_upgrade.json index 9c57d17..932bb06 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/vanilla_copper_shulker_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/vanilla_copper_shulker_upgrade.json @@ -1,8 +1,8 @@ { "conditions": [ { - "type": "ironchest:ore_dict_entry_exists", - "ore": "ingotCopper" + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" } ], "type": "forge:ore_shaped", diff --git a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/vanilla_iron_shulker_upgrade.json b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/vanilla_iron_shulker_upgrade.json index 746a5e0..a2188f4 100644 --- a/src/main/resources/assets/ironchest/recipes/upgrade/shulker/vanilla_iron_shulker_upgrade.json +++ b/src/main/resources/assets/ironchest/recipes/upgrade/shulker/vanilla_iron_shulker_upgrade.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "ironchest:is_option_enabled", + "config_setting": "enableShulkerBoxRecipes" + } + ], "type": "forge:ore_shaped", "pattern": [ "MMM",