Ubujira
/
ironbarrels
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
alexbegt 2018-06-16 23:22:57 -04:00
parent 08cf8e0bb2
commit 81c12fe224
207 changed files with 833 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -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"
}

5
src/api/java/invtweaks/api/container/ChestContainer.java
View File

@ -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,7 +32,7 @@ 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

5
src/main/java/cpw/mods/ironchest/IronChest.java
View File

@ -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()

8
src/main/java/cpw/mods/ironchest/common/blocks/shulker/BlockIronShulkerBox.java
View File

@ -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<ItemStack> 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);
}

53
src/main/java/cpw/mods/ironchest/common/config/Config.java Normal file
View File

@ -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
}

27
src/main/java/cpw/mods/ironchest/common/crafting/condition/IsConfigOptionEnabledConditionFactory.java Normal file
View File

@ -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));
}
}
}

38
src/main/java/cpw/mods/ironchest/common/crafting/condition/OreDictEntryExistsConditionFactory.java
View File

@ -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
* <p>
* 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;
}
}
}

1
src/main/java/cpw/mods/ironchest/common/lib/BlockLists.java
View File

@ -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()

2
src/main/java/cpw/mods/ironchest/common/network/MessageCrystalShulkerSync.java
View File

@ -26,7 +26,9 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
public class MessageCrystalShulkerSync implements IMessage
{
int dimension;
BlockPos pos;
private NonNullList<ItemStack> topStacks;
public MessageCrystalShulkerSync(TileEntityIronShulkerBox tile, NonNullList<ItemStack> stack)

19
src/main/java/cpw/mods/ironchest/common/util/CreativeTabItems.java
View File

@ -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()));
}
}
}
}

2
src/main/resources/assets/ironchest/recipes/_factories.json
View File

@ -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"
}
}

6
src/main/resources/assets/ironchest/recipes/chest/copper/vanilla_copper_chest.json
View File

@ -1,10 +1,4 @@
{
"conditions": [
{
"type": "ironchest:ore_dict_entry_exists",
"ore": "ingotCopper"
}
],
"type": "forge:ore_shaped",
"pattern": [
"MMM",

6
src/main/resources/assets/ironchest/recipes/chest/diamond/silver_diamond_chest.json
View File

@ -1,10 +1,4 @@
{
"conditions": [
{
"type": "ironchest:ore_dict_entry_exists",
"ore": "ingotSilver"
}
],
"type": "forge:ore_shaped",
"pattern": [
"GGG",

6
src/main/resources/assets/ironchest/recipes/chest/gold/silver_gold_chest.json
View File

@ -1,10 +1,4 @@
{
"conditions": [
{
"type": "ironchest:ore_dict_entry_exists",
"ore": "ingotSilver"
}
],
"type": "forge:ore_shaped",
"pattern": [
"MGM",

6
src/main/resources/assets/ironchest/recipes/chest/iron/copper_iron_chest.json
View File

@ -1,10 +1,4 @@
{
"conditions": [
{
"type": "ironchest:ore_dict_entry_exists",
"ore": "ingotCopper"
}
],
"type": "forge:ore_shaped",
"pattern": [
"MGM",

10
src/main/resources/assets/ironchest/recipes/chest/silver/copper_silver_chest.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/chest/silver/iron_silver_chest.json
View File

@ -1,10 +1,4 @@
{
"conditions": [
{
"type": "ironchest:ore_dict_entry_exists",
"ore": "ingotSilver"
}
],
"type": "forge:ore_shaped",
"pattern": [
"MGM",

4
src/main/resources/assets/ironchest/recipes/shulker/black/copper/vanilla_copper_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/black/crystal/diamond_crystal_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

6
src/main/resources/assets/ironchest/recipes/shulker/black/diamond/gold_diamond_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

4
src/main/resources/assets/ironchest/recipes/shulker/black/diamond/silver_diamond_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/black/gold/iron_gold_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

4
src/main/resources/assets/ironchest/recipes/shulker/black/gold/silver_gold_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/black/iron/copper_iron_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/black/iron/vanilla_iron_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

6
src/main/resources/assets/ironchest/recipes/shulker/black/obsidian/diamond_obsidian_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

8
src/main/resources/assets/ironchest/recipes/shulker/black/silver/copper_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/black/silver/iron_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/blue/copper/vanilla_copper_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/blue/crystal/diamond_crystal_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

6
src/main/resources/assets/ironchest/recipes/shulker/blue/diamond/gold_diamond_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

4
src/main/resources/assets/ironchest/recipes/shulker/blue/diamond/silver_diamond_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/blue/gold/iron_gold_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

4
src/main/resources/assets/ironchest/recipes/shulker/blue/gold/silver_gold_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/blue/iron/copper_iron_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/blue/iron/vanilla_iron_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

6
src/main/resources/assets/ironchest/recipes/shulker/blue/obsidian/diamond_obsidian_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

8
src/main/resources/assets/ironchest/recipes/shulker/blue/silver/copper_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/blue/silver/iron_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/brown/copper/vanilla_copper_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/brown/crystal/diamond_crystal_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

6
src/main/resources/assets/ironchest/recipes/shulker/brown/diamond/gold_diamond_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

4
src/main/resources/assets/ironchest/recipes/shulker/brown/diamond/silver_diamond_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/brown/gold/iron_gold_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

4
src/main/resources/assets/ironchest/recipes/shulker/brown/gold/silver_gold_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/brown/iron/copper_iron_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/brown/iron/vanilla_iron_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

6
src/main/resources/assets/ironchest/recipes/shulker/brown/obsidian/diamond_obsidian_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

8
src/main/resources/assets/ironchest/recipes/shulker/brown/silver/copper_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/brown/silver/iron_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/cyan/copper/vanilla_copper_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/cyan/crystal/diamond_crystal_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

6
src/main/resources/assets/ironchest/recipes/shulker/cyan/diamond/gold_diamond_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

4
src/main/resources/assets/ironchest/recipes/shulker/cyan/diamond/silver_diamond_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/cyan/gold/iron_gold_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

4
src/main/resources/assets/ironchest/recipes/shulker/cyan/gold/silver_gold_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/cyan/iron/copper_iron_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/cyan/iron/vanilla_iron_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

6
src/main/resources/assets/ironchest/recipes/shulker/cyan/obsidian/diamond_obsidian_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

8
src/main/resources/assets/ironchest/recipes/shulker/cyan/silver/copper_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/cyan/silver/iron_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/gray/copper/vanilla_copper_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/gray/crystal/diamond_crystal_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

6
src/main/resources/assets/ironchest/recipes/shulker/gray/diamond/gold_diamond_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

4
src/main/resources/assets/ironchest/recipes/shulker/gray/diamond/silver_diamond_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/gray/gold/iron_gold_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

4
src/main/resources/assets/ironchest/recipes/shulker/gray/gold/silver_gold_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/gray/iron/copper_iron_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/gray/iron/vanilla_iron_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

6
src/main/resources/assets/ironchest/recipes/shulker/gray/obsidian/diamond_obsidian_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

8
src/main/resources/assets/ironchest/recipes/shulker/gray/silver/copper_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/gray/silver/iron_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/green/copper/vanilla_copper_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/green/crystal/diamond_crystal_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

6
src/main/resources/assets/ironchest/recipes/shulker/green/diamond/gold_diamond_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

4
src/main/resources/assets/ironchest/recipes/shulker/green/diamond/silver_diamond_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/green/gold/iron_gold_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

4
src/main/resources/assets/ironchest/recipes/shulker/green/gold/silver_gold_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/green/iron/copper_iron_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/green/iron/vanilla_iron_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

6
src/main/resources/assets/ironchest/recipes/shulker/green/obsidian/diamond_obsidian_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

8
src/main/resources/assets/ironchest/recipes/shulker/green/silver/copper_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/green/silver/iron_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/light_blue/copper/vanilla_copper_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/light_blue/crystal/diamond_crystal_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

6
src/main/resources/assets/ironchest/recipes/shulker/light_blue/diamond/gold_diamond_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

4
src/main/resources/assets/ironchest/recipes/shulker/light_blue/diamond/silver_diamond_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/light_blue/gold/iron_gold_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

4
src/main/resources/assets/ironchest/recipes/shulker/light_blue/gold/silver_gold_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/light_blue/iron/copper_iron_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/light_blue/iron/vanilla_iron_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

6
src/main/resources/assets/ironchest/recipes/shulker/light_blue/obsidian/diamond_obsidian_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

8
src/main/resources/assets/ironchest/recipes/shulker/light_blue/silver/copper_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/light_blue/silver/iron_silver_shulker_box.json
View File

@ -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",

4
src/main/resources/assets/ironchest/recipes/shulker/lime/copper/vanilla_copper_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/lime/crystal/diamond_crystal_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

6
src/main/resources/assets/ironchest/recipes/shulker/lime/diamond/gold_diamond_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"GGG",

4
src/main/resources/assets/ironchest/recipes/shulker/lime/diamond/silver_diamond_shulker_box.json
View File

@ -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",

6
src/main/resources/assets/ironchest/recipes/shulker/lime/gold/iron_gold_shulker_box.json
View File

@ -1,4 +1,10 @@
{
"conditions": [
{
"type": "ironchest:is_option_enabled",
"config_setting": "enableShulkerBoxRecipes"
}
],
"type": "ironchest:shulker_box",
"pattern": [
"MMM",

4
src/main/resources/assets/ironchest/recipes/shulker/lime/gold/silver_gold_shulker_box.json
View File

@ -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",

Some files were not shown because too many files have changed in this diff Show More