From 0801bf8074c89eecd7c76defa192b61475ccfc2e Mon Sep 17 00:00:00 2001 From: Nikolay Raspopov Date: Sat, 11 Nov 2017 10:04:38 +0300 Subject: [PATCH 001/111] Updated Russian translation Added shulker box, GUI and DirtyChest 9000! --- .../assets/ironchest/lang/ru_RU.lang | 156 ++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/src/main/resources/assets/ironchest/lang/ru_RU.lang b/src/main/resources/assets/ironchest/lang/ru_RU.lang index 709ddcfe..46606e7c 100755 --- a/src/main/resources/assets/ironchest/lang/ru_RU.lang +++ b/src/main/resources/assets/ironchest/lang/ru_RU.lang @@ -9,6 +9,7 @@ tile.ironchest.chest.copper.name=Медный сундук tile.ironchest.chest.silver.name=Серебряный сундук tile.ironchest.chest.crystal.name=Кристальный сундук tile.ironchest.chest.obsidian.name=Обсидиановый сундук +tile.ironchest.chest.dirtchest9000.name=Земляной Сундук 9000! item.ironchest.chest.iron_gold.name=Улучшение из железного в золотой сундук item.ironchest.chest.gold_diamond.name=Улучшение из золотого в алмазный сундук @@ -19,3 +20,158 @@ item.ironchest.chest.diamond_crystal.name=Улучшение из алмазно item.ironchest.chest.wood_iron.name=Улучшение из деревянного в железный сундук item.ironchest.chest.wood_copper.name=Улучшение из деревянного в медный сундук item.ironchest.chest.diamond_obsidian.name=Улучшение из алмазного в обсидиановый сундук + +book.ironchest.dirtchest9000.title=Инструкция к Земляной Сундук 9000! +book.ironchest.dirtchest9000.page1="Встречайте новый Земляной Сундук 9000! Мы надеемся, что вы будете рады многие годы хранить вашу стопку земли в этом приспособлении для хранения." +book.ironchest.dirtchest9000.page2="Применение: просто вставьте выбранную стопку земли в высоко восприимчивый слот, и насладитесь удобством легкого доступа к земле каждый раз, когда вы проходите мимо сундука!" +book.ironchest.dirtchest9000.page3="Мы надеемся, что вам понравилась эта инструкция, и надеемся, что вы будете использовать наши продукты и в будущем! С Уважением, авторы Земляного Сундука 9000." +book.ironchest.dirtchest9000.page4="Гарантия: Этот продукт не имеет никакой гарантии. Ваша земля может не сохраниться, она может медленно просочиться наружу, или, наоборот, может вовсе ничего не произойти." +book.ironchest.dirtchest9000.page5="Земляной Сундук 9000 является экологически чистым. Пожалуйста, утилизируйте эту инструкцию ответственно, а, не так, как обычно, выкидывая в лаву, иначе мы расстроимся." + +####################### +# Shulker Boxes # +####################### + +tile.ironchest.shulker_box.iron.white.name=Белый Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.orange.name=Оранжевый Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.magenta.name=Фиолетовый Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.light_blue.name=Светло-синий Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.yellow.name=Жёлтый Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.lime.name=Лаймовый Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.pink.name=Розовый Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.gray.name=Серый Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.silver.name=Светло-серый Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.cyan.name=Голубой Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.purple.name=Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.blue.name=Синий Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.brown.name=Коричневый Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.green.name=Зелёный Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.red.name=Красный Железный Шалкеровый ящик +tile.ironchest.shulker_box.iron.black.name=Чёрный Железный Шалкеровый ящик + +tile.ironchest.shulker_box.gold.white.name=Белый Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.orange.name=Оранжевый Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.magenta.name=Фиолетовый Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.light_blue.name=Светло-синий Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.yellow.name=Жёлтый Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.lime.name=Лаймовый Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.pink.name=Розовый Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.gray.name=Серый Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.silver.name=Светло-серый Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.cyan.name=Голубой Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.purple.name=Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.blue.name=Синий Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.brown.name=Коричневый Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.green.name=Зелёный Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.red.name=Красный Золотой Шалкеровый ящик +tile.ironchest.shulker_box.gold.black.name=Чёрный Золотой Шалкеровый ящик + +tile.ironchest.shulker_box.diamond.white.name=Белый Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.orange.name=Оранжевый Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.magenta.name=Фиолетовый Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.light_blue.name=Светло-синий Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.yellow.name=Жёлтый Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.lime.name=Лаймовый Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.pink.name=Розовый Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.gray.name=Серый Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.silver.name=Светло-серый Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.cyan.name=Голубой Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.purple.name=Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.blue.name=Синий Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.brown.name=Коричневый Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.green.name=Зелёный Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.red.name=Красный Алмазный Шалкеровый ящик +tile.ironchest.shulker_box.diamond.black.name=Чёрный Алмазный Шалкеровый ящик + +tile.ironchest.shulker_box.copper.white.name=Белый Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.orange.name=Оранжевый Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.magenta.name=Фиолетовый Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.light_blue.name=Светло-синий Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.yellow.name=Жёлтый Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.lime.name=Лаймовый Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.pink.name=Розовый Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.gray.name=Серый Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.silver.name=Светло-серый Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.cyan.name=Голубой Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.purple.name=Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.blue.name=Синий Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.brown.name=Коричневый Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.green.name=Зелёный Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.red.name=Красный Медный Шалкеровый ящик +tile.ironchest.shulker_box.copper.black.name=Чёрный Медный Шалкеровый ящик + +tile.ironchest.shulker_box.silver.white.name=Белый Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.orange.name=Оранжевый Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.magenta.name=Фиолетовый Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.light_blue.name=Светло-синий Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.yellow.name=Жёлтый Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.lime.name=Лаймовый Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.pink.name=Розовый Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.gray.name=Серый Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.silver.name=Светло-серый Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.cyan.name=Голубой Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.purple.name=Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.blue.name=Синий Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.brown.name=Коричневый Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.green.name=Зелёный Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.red.name=Красный Серебряный Шалкеровый ящик +tile.ironchest.shulker_box.silver.black.name=Чёрный Серебряный Шалкеровый ящик + +tile.ironchest.shulker_box.crystal.white.name=Белый Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.orange.name=Оранжевый Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.magenta.name=Фиолетовый Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.light_blue.name=Светло-синий Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.yellow.name=Жёлтый Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.lime.name=Лаймовый Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.pink.name=Розовый Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.gray.name=Серый Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.silver.name=Светло-серый Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.cyan.name=Голубой Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.purple.name=Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.blue.name=Синий Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.brown.name=Коричневый Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.green.name=Зелёный Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.red.name=Красный Кристальный Шалкеровый ящик +tile.ironchest.shulker_box.crystal.black.name=Чёрный Кристальный Шалкеровый ящик + +tile.ironchest.shulker_box.obsidian.white.name=Белый Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.orange.name=Оранжевый Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.magenta.name=Фиолетовый Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.light_blue.name=Светло-синий Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.yellow.name=Жёлтый Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.lime.name=Лаймовый Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.pink.name=Розовый Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.gray.name=Серый Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.silver.name=Светло-серый Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.cyan.name=Голубой Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.purple.name=Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.blue.name=Синий Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.brown.name=Коричневый Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.green.name=Зелёный Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.red.name=Красный Обсидиановый Шалкеровый ящик +tile.ironchest.shulker_box.obsidian.black.name=Чёрный Обсидиановый Шалкеровый ящик + +item.ironchest.shulker_box.iron_gold.name=Улучшение из железного в золотой Шалкеровый ящик +item.ironchest.shulker_box.iron_gold.tooltip=Используется для улучшения из железного в золотой Шалкеровый ящик\nЦвет ящика остаётся тем же самым. +item.ironchest.shulker_box.gold_diamond.name=Улучшение из золотого в алмазный Шалкеровый ящик +item.ironchest.shulker_box.gold_diamond.tooltip=Используется для улучшения из золотого в алмазный Шалкеровый ящик\nЦвет ящика остаётся тем же самым. +item.ironchest.shulker_box.copper_silver.name=Улучшение из медного в серебряный Шалкеровый ящик +item.ironchest.shulker_box.copper_silver.tooltip=Используется для улучшения из медного в серебряный Шалкеровый ящик\nЦвет ящика остаётся тем же самым. +item.ironchest.shulker_box.silver_gold.name=Улучшение из серебряного в золотой Шалкеровый ящик +item.ironchest.shulker_box.silver_gold.tooltip=Используется для улучшения из серебряного в золотой Шалкеровый ящик\nЦвет ящика остаётся тем же самым. +item.ironchest.shulker_box.copper_iron.name=Улучшение из медного в железный Шалкеровый ящик +item.ironchest.shulker_box.copper_iron.tooltip=Используется для улучшения из медного в железный Шалкеровый ящик\nЦвет ящика остаётся тем же самым. +item.ironchest.shulker_box.diamond_crystal.name=Улучшение из алмазного в кристальный Шалкеровый ящик +item.ironchest.shulker_box.diamond_crystal.tooltip=Используется для улучшения из алмазного в кристальный Шалкеровый ящик\nЦвет ящика остаётся тем же самым. +item.ironchest.shulker_box.vanilla_iron.name=Улучшение из обычного в железный Шалкеровый ящик +item.ironchest.shulker_box.vanilla_iron.tooltip=Используется для улучшения из обычного в железный Шалкеровый ящик\nЦвет ящика остаётся тем же самым. +item.ironchest.shulker_box.vanilla_copper.name=Улучшение из обычного в медный Шалкеровый ящик +item.ironchest.shulker_box.vanilla_copper.tooltip=Используется для улучшения из обычного в медный Шалкеровый ящик\nЦвет ящика остаётся тем же самым. +item.ironchest.shulker_box.diamond_obsidian.name=Улучшение из алмазного в обсидиановый Шалкеровый ящик +item.ironchest.shulker_box.diamond_obsidian.tooltip=Используется для улучшения из алмазного в обсидиановый Шалкеровый ящик\nЦвет ящика остаётся тем же самым. + +############## +# GUIs # +############## + +itemGroup.ironchest=Железные сундуки From 5a9c3d77df80b52a00a0c52d3a7d91fd5734ef98 Mon Sep 17 00:00:00 2001 From: alexbegt Date: Sat, 17 Feb 2018 12:38:11 -0500 Subject: [PATCH 002/111] Run DataFixer on the Chest's and Shulker Boxes, and fix the conflicting recipes reguarding the shulker upgrades. Closes #115, #117 --- src/main/java/cpw/mods/ironchest/IronChest.java | 13 +++++++++++++ .../tileentity/chest/TileEntityIronChest.java | 8 ++++++++ .../shulker/TileEntityIronShulkerBox.java | 14 ++++++++++++-- .../shulker/copper_iron_shulker_upgrade.json | 4 ++-- .../shulker/copper_silver_shulker_upgrade.json | 2 +- .../shulker/diamond_crystal_shulker_upgrade.json | 2 +- .../shulker/diamond_obsidian_shulker_upgrade.json | 2 +- .../shulker/gold_diamond_shulker_upgrade.json | 6 +++--- .../upgrade/shulker/iron_gold_shulker_upgrade.json | 2 +- .../shulker/silver_gold_shulker_upgrade.json | 4 ++-- 10 files changed, 44 insertions(+), 13 deletions(-) diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java index 45f0de29..1d285025 100755 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ b/src/main/java/cpw/mods/ironchest/IronChest.java @@ -16,9 +16,13 @@ import cpw.mods.ironchest.common.lib.BlockLists; import cpw.mods.ironchest.common.network.MessageCrystalChestSync; import cpw.mods.ironchest.common.network.MessageCrystalShulkerSync; +import cpw.mods.ironchest.common.tileentity.chest.TileEntityIronChest; +import cpw.mods.ironchest.common.tileentity.shulker.TileEntityIronShulkerBox; import cpw.mods.ironchest.common.util.MissingMappingsHandler; import cpw.mods.ironchest.common.util.OcelotsSitOnChestsHandler; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.CompoundDataFixer; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; @@ -74,6 +78,15 @@ public void init(FMLInitializationEvent event) packetHandler.registerMessage(MessageCrystalShulkerSync.Handler.class, MessageCrystalShulkerSync.class, messageId++, Side.CLIENT); BlockLists.createShulkerItemList(); + + registerDataFixes(); } + public void registerDataFixes() + { + CompoundDataFixer dataFixer = FMLCommonHandler.instance().getDataFixer(); + + TileEntityIronChest.registerFixesChest(dataFixer); + TileEntityIronShulkerBox.registerFixesShulkerBox(dataFixer); + } } diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/chest/TileEntityIronChest.java b/src/main/java/cpw/mods/ironchest/common/tileentity/chest/TileEntityIronChest.java index 82484179..fa88db35 100755 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/chest/TileEntityIronChest.java +++ b/src/main/java/cpw/mods/ironchest/common/tileentity/chest/TileEntityIronChest.java @@ -35,6 +35,9 @@ import net.minecraft.util.ITickable; import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; +import net.minecraft.util.datafix.DataFixer; +import net.minecraft.util.datafix.FixTypes; +import net.minecraft.util.datafix.walkers.ItemStackDataLists; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.util.Constants; import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; @@ -630,4 +633,9 @@ public void receiveMessageFromServer(NonNullList topStacks) { this.topStacks = topStacks; } + + public static void registerFixesChest(DataFixer fixer) + { + fixer.registerWalker(FixTypes.BLOCK_ENTITY, new ItemStackDataLists(TileEntityIronChest.class, new String[] { "Items" })); + } } diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/shulker/TileEntityIronShulkerBox.java b/src/main/java/cpw/mods/ironchest/common/tileentity/shulker/TileEntityIronShulkerBox.java index e324664d..4cba0f7b 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/shulker/TileEntityIronShulkerBox.java +++ b/src/main/java/cpw/mods/ironchest/common/tileentity/shulker/TileEntityIronShulkerBox.java @@ -43,6 +43,9 @@ import net.minecraft.util.ITickable; import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; +import net.minecraft.util.datafix.DataFixer; +import net.minecraft.util.datafix.FixTypes; +import net.minecraft.util.datafix.walkers.ItemStackDataLists; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraftforge.fml.relauncher.Side; @@ -185,7 +188,8 @@ protected void sortTopStacks() int compressedIdx = 0; - mainLoop: for (int i = 0; i < this.getSizeInventory(); i++) + mainLoop: + for (int i = 0; i < this.getSizeInventory(); i++) { ItemStack itemStack = this.getItems().get(i); @@ -228,7 +232,8 @@ protected void sortTopStacks() this.hadStuff = true; - Collections.sort(tempCopy, new Comparator() { + Collections.sort(tempCopy, new Comparator() + { @Override public int compare(ItemStack stack1, ItemStack stack2) { @@ -792,4 +797,9 @@ public static enum AnimationStatus { CLOSED, OPENING, OPENED, CLOSING; } + + public static void registerFixesShulkerBox(DataFixer fixer) + { + fixer.registerWalker(FixTypes.BLOCK_ENTITY, new ItemStackDataLists(TileEntityIronShulkerBox.class, new String[] { "Items" })); + } } 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 cfe9f79b..4bb6610a 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 @@ -7,8 +7,8 @@ ], "type": "forge:ore_shaped", "pattern": [ - "MGM", - "GSG", + "GG", + "MSM", "MGM" ], "key": { 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 44d59531..f912e62d 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 @@ -11,8 +11,8 @@ ], "type": "forge:ore_shaped", "pattern": [ - "MMM", "MSM", + "MMM", "MMM" ], "key": { 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 efa5d33c..99585477 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,8 +1,8 @@ { "type": "forge:ore_shaped", "pattern": [ - "GGG", "GSG", + "GGG", "GGG" ], "key": { 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 5421bc9d..4672c89c 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,8 +1,8 @@ { "type": "forge:ore_shaped", "pattern": [ - "MMM", "MGM", + "MMM", "MMM" ], "key": { 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 c4453f5b..a42cd1b2 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,9 +1,9 @@ { "type": "forge:ore_shaped", "pattern": [ - "GGG", - "MSM", - "GGG" + "GMG", + "GSG", + "GMG" ], "key": { "M": { 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 f2922b6d..fdc91933 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,8 +1,8 @@ { "type": "forge:ore_shaped", "pattern": [ - "MMM", "MSM", + "MMM", "MMM" ], "key": { 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 bd415620..0f0579eb 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 @@ -7,8 +7,8 @@ ], "type": "forge:ore_shaped", "pattern": [ - "MGM", - "GSG", + "MSM", + "GGG", "MGM" ], "key": { From 7d0770d0a9c35b366bc3e69d5c9e34a012d27c0d Mon Sep 17 00:00:00 2001 From: The_Fireplace Date: Sat, 17 Feb 2018 21:43:00 -0600 Subject: [PATCH 003/111] Added en_UD.lang --- .../assets/ironchest/lang/en_UD.lang | 168 ++++++++++++++++++ 1 file changed, 168 insertions(+) create mode 100644 src/main/resources/assets/ironchest/lang/en_UD.lang diff --git a/src/main/resources/assets/ironchest/lang/en_UD.lang b/src/main/resources/assets/ironchest/lang/en_UD.lang new file mode 100644 index 00000000..2a39f1c4 --- /dev/null +++ b/src/main/resources/assets/ironchest/lang/en_UD.lang @@ -0,0 +1,168 @@ + +tile.ironchest.chest.iron.name=ʇsǝɥƆ uoɹI +tile.ironchest.chest.gold.name=ʇsǝɥƆ pꞁo⅁ +tile.ironchest.chest.diamond.name=ʇsǝɥƆ puoɯɐᴉᗡ +tile.ironchest.chest.copper.name=ʇsǝɥƆ ɹǝddoƆ +tile.ironchest.chest.silver.name=ʇsǝɥƆ ɹǝʌꞁᴉS +tile.ironchest.chest.crystal.name=ʇsǝɥƆ ꞁɐʇsʎɹƆ +tile.ironchest.chest.obsidian.name=ʇsǝɥƆ uɐᴉpᴉsqO +tile.ironchest.chest.dirtchest9000.name=¡0006 ʇsǝɥƆʇɹᴉᗡ + +item.ironchest.chest.iron_gold.name=ǝpɐɹᵷd∩ ʇsǝɥƆ pꞁo⅁ oʇ uoɹI +item.ironchest.chest.gold_diamond.name=ǝpɐɹᵷd∩ ʇsǝɥƆ puoɯɐᴉᗡ oʇ pꞁo⅁ +item.ironchest.chest.copper_silver.name=ǝpɐɹᵷd∩ ʇsǝɥƆ ɹǝʌꞁᴉS oʇ ɹǝddoƆ +item.ironchest.chest.silver_gold.name=ǝpɐɹᵷd∩ ʇsǝɥƆ pꞁo⅁ oʇ ɹǝʌꞁᴉS +item.ironchest.chest.copper_iron.name=ǝpɐɹᵷd∩ ʇsǝɥƆ uoɹI oʇ ɹǝddoƆ +item.ironchest.chest.diamond_crystal.name=ǝpɐɹᵷd∩ ʇsǝɥƆ ꞁɐʇsʎɹƆ oʇ puoɯɐᴉᗡ +item.ironchest.chest.wood_iron.name=ǝpɐɹᵷd∩ ʇsǝɥƆ uoɹI oʇ pooM +item.ironchest.chest.wood_copper.name=ǝpɐɹᵷd∩ ʇsǝɥƆ ɹǝddoƆ oʇ pooM +item.ironchest.chest.diamond_obsidian.name=ǝpɐɹᵷd∩ ʇsǝɥƆ uɐᴉpᴉsqO oʇ puoɯɐᴉᗡ + +book.ironchest.dirtchest9000.title=¡0006 ʇsǝɥƆʇɹᴉᗡ ɹnoʎ ǝsn oʇ ʍoH +book.ironchest.dirtchest9000.page1=„˙ʎʇᴉꞁᴉʇn ǝᵷɐɹoʇs ɹno uᴉ ʇɹᴉp ɟo ʞɔɐʇs ɹnoʎ ᵷuᴉɹoʇs ɟo sɹɐǝʎ ʎddɐɥ ʎuɐɯ ʎoɾuǝ ꞁꞁᴉʍ noʎ ǝdoɥ ǝM ¡0006 ʇsǝɥƆʇɹᴉᗡ ʍǝu ɹnoʎ oʇ ǝɯoɔꞁǝM„ +book.ironchest.dirtchest9000.page2=„¡ʇsǝɥɔ sᴉɥʇ ʎq ssɐd noʎ ǝɯᴉʇ ʎuɐ 'noʎ oʇ ǝꞁqɐꞁᴉɐʌɐ ʇɹᴉp ʇɐɥʇ ᵷuᴉʌɐɥ ɟo ǝɔuǝᴉuǝʌuoɔ ʇɐǝɹᵷ ǝɥʇ ʎoɾuǝ puɐ ʇoꞁs ǝʌᴉʇdǝɔǝɹ ʎꞁɥᵷᴉɥ ǝɥʇ oʇuᴉ ǝɔᴉoɥɔ ɹnoʎ ɟo ʇɹᴉp ɟo ʞɔɐʇs ǝɥʇ ʇɹǝsuᴉ ʎꞁdɯᴉs :ǝᵷɐs∩„ +book.ironchest.dirtchest9000.page3=„˙pǝʇɐɹodɹoɔuᴉ sɹǝʇᴉɹʍ ꞁɐnuɐɯ 0006 ʇsǝɥƆʇɹᴉᗡ ǝɥ⟘ 'spɹɐᵷǝɹ puᴉʞ ¡ǝɹnʇnɟ uᴉ sʇɔnpoɹd ɹno ᵷuᴉsn ɹǝpᴉsuoɔ ꞁꞁᴉʍ noʎ ǝdoɥ puɐ 'ꞁɐnuɐɯ uoᴉʇɔnɹʇsuᴉ sᴉɥʇ ᵷuᴉʍǝᴉʌǝɹ pǝʎoɾuǝ ǝʌɐɥ noʎ ǝdoɥ ǝM„ +book.ironchest.dirtchest9000.page4=„˙ꞁꞁɐ ʇɐ ᵷuᴉɥʇʎuɐ op ʇou ʎɐɯ ʇᴉ 'ʎꞁǝʌᴉʇɐuɹǝʇꞁɐ ɹo 'ʇuǝɯuoɹᴉʌuǝ ǝɥʇ oʇuᴉ ɥɔǝǝꞁ ʎꞁʍoꞁs ʎɐɯ ʇᴉ 'pǝɹoʇs ǝq ʇou ʎɐɯ ʇɹᴉp ɹno⅄ ˙puᴉʞ ʎuɐ ɟo ʎʇuɐɹɹɐʍ ou sɐɥ ʇɔnpoɹd sᴉɥ⟘ :ʎʇuɐɹɹɐM„ +book.ironchest.dirtchest9000.page5=„˙pɐs ʎɹǝʌ ǝq pꞁnoʍ ǝM ˙ɐʌɐꞁ ǝɯos oʇuᴉ ʇᴉ ʞɔnɥɔ ʇsnɾ op noʎ ɹǝʌǝʇɐɥʍ ʇou op puɐ 'ʎꞁqᴉsuodsǝɹ ʞooq ǝpᴉnᵷ sᴉɥʇ ɟo ǝsodsᴉp ǝsɐǝꞁԀ ˙ʇuǝɯuoɹᴉʌuǝ ǝɥʇ oʇ puᴉʞ sᴉ 0006 ʇsǝɥƆʇɹᴉᗡ„ + + +tile.ironchest.shulker_box.iron.white.name=xoᗺ ɹǝʞꞁnɥS uoɹI ǝʇᴉɥM +tile.ironchest.shulker_box.iron.orange.name=xoᗺ ɹǝʞꞁnɥS uoɹI ǝᵷuɐɹO +tile.ironchest.shulker_box.iron.magenta.name=xoᗺ ɹǝʞꞁnɥS uoɹI ɐʇuǝᵷɐW +tile.ironchest.shulker_box.iron.light_blue.name=xoᗺ ɹǝʞꞁnɥS uoɹI ǝnꞁᗺ ʇɥᵷᴉꞀ +tile.ironchest.shulker_box.iron.yellow.name=xoᗺ ɹǝʞꞁnɥS uoɹI ʍoꞁꞁǝ⅄ +tile.ironchest.shulker_box.iron.lime.name=xoᗺ ɹǝʞꞁnɥS uoɹI ǝɯᴉꞀ +tile.ironchest.shulker_box.iron.pink.name=xoᗺ ɹǝʞꞁnɥS uoɹI ʞuᴉԀ +tile.ironchest.shulker_box.iron.gray.name=xoᗺ ɹǝʞꞁnɥS uoɹI ʎɐɹ⅁ +tile.ironchest.shulker_box.iron.silver.name=xoᗺ ɹǝʞꞁnɥS uoɹI ɹǝʌꞁᴉS +tile.ironchest.shulker_box.iron.cyan.name=xoᗺ ɹǝʞꞁnɥS uoɹI uɐʎƆ +tile.ironchest.shulker_box.iron.purple.name=xoᗺ ɹǝʞꞁnɥS uoɹI ǝꞁdɹnԀ +tile.ironchest.shulker_box.iron.blue.name=xoᗺ ɹǝʞꞁnɥS uoɹI ǝnꞁᗺ +tile.ironchest.shulker_box.iron.brown.name=xoᗺ ɹǝʞꞁnɥS uoɹI uʍoɹᗺ +tile.ironchest.shulker_box.iron.green.name=xoᗺ ɹǝʞꞁnɥS uoɹI uǝǝɹ⅁ +tile.ironchest.shulker_box.iron.red.name=xoᗺ ɹǝʞꞁnɥS uoɹI pǝᴚ +tile.ironchest.shulker_box.iron.black.name=xoᗺ ɹǝʞꞁnɥS uoɹI ʞɔɐꞁᗺ + +tile.ironchest.shulker_box.gold.white.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ǝʇᴉɥM +tile.ironchest.shulker_box.gold.orange.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ǝᵷuɐɹO +tile.ironchest.shulker_box.gold.magenta.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ɐʇuǝᵷɐW +tile.ironchest.shulker_box.gold.light_blue.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ǝnꞁᗺ ʇɥᵷᴉꞀ +tile.ironchest.shulker_box.gold.yellow.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ʍoꞁꞁǝ⅄ +tile.ironchest.shulker_box.gold.lime.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ǝɯᴉꞀ +tile.ironchest.shulker_box.gold.pink.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ʞuᴉԀ +tile.ironchest.shulker_box.gold.gray.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ʎɐɹ⅁ +tile.ironchest.shulker_box.gold.silver.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ɹǝʌꞁᴉS +tile.ironchest.shulker_box.gold.cyan.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ uɐʎƆ +tile.ironchest.shulker_box.gold.purple.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ǝꞁdɹnԀ +tile.ironchest.shulker_box.gold.blue.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ǝnꞁᗺ +tile.ironchest.shulker_box.gold.brown.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ uʍoɹᗺ +tile.ironchest.shulker_box.gold.green.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ uǝǝɹ⅁ +tile.ironchest.shulker_box.gold.red.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ pǝᴚ +tile.ironchest.shulker_box.gold.black.name=xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ʞɔɐꞁᗺ + +tile.ironchest.shulker_box.diamond.white.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ǝʇᴉɥM +tile.ironchest.shulker_box.diamond.orange.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ǝᵷuɐɹO +tile.ironchest.shulker_box.diamond.magenta.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ɐʇuǝᵷɐW +tile.ironchest.shulker_box.diamond.light_blue.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ǝnꞁᗺ ʇɥᵷᴉꞀ +tile.ironchest.shulker_box.diamond.yellow.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ʍoꞁꞁǝ⅄ +tile.ironchest.shulker_box.diamond.lime.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ǝɯᴉꞀ +tile.ironchest.shulker_box.diamond.pink.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ʞuᴉԀ +tile.ironchest.shulker_box.diamond.gray.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ʎɐɹ⅁ +tile.ironchest.shulker_box.diamond.silver.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ɹǝʌꞁᴉS +tile.ironchest.shulker_box.diamond.cyan.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ uɐʎƆ +tile.ironchest.shulker_box.diamond.purple.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ǝꞁdɹnԀ +tile.ironchest.shulker_box.diamond.blue.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ǝnꞁᗺ +tile.ironchest.shulker_box.diamond.brown.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ uʍoɹᗺ +tile.ironchest.shulker_box.diamond.green.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ uǝǝɹ⅁ +tile.ironchest.shulker_box.diamond.red.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ pǝᴚ +tile.ironchest.shulker_box.diamond.black.name=xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ʞɔɐꞁᗺ + +tile.ironchest.shulker_box.copper.white.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ǝʇᴉɥM +tile.ironchest.shulker_box.copper.orange.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ǝᵷuɐɹO +tile.ironchest.shulker_box.copper.magenta.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ɐʇuǝᵷɐW +tile.ironchest.shulker_box.copper.light_blue.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ǝnꞁᗺ ʇɥᵷᴉꞀ +tile.ironchest.shulker_box.copper.yellow.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ʍoꞁꞁǝ⅄ +tile.ironchest.shulker_box.copper.lime.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ǝɯᴉꞀ +tile.ironchest.shulker_box.copper.pink.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ʞuᴉԀ +tile.ironchest.shulker_box.copper.gray.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ʎɐɹ⅁ +tile.ironchest.shulker_box.copper.silver.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ɹǝʌꞁᴉS +tile.ironchest.shulker_box.copper.cyan.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ uɐʎƆ +tile.ironchest.shulker_box.copper.purple.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ǝꞁdɹnԀ +tile.ironchest.shulker_box.copper.blue.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ǝnꞁᗺ +tile.ironchest.shulker_box.copper.brown.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ uʍoɹᗺ +tile.ironchest.shulker_box.copper.green.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ uǝǝɹ⅁ +tile.ironchest.shulker_box.copper.red.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ pǝᴚ +tile.ironchest.shulker_box.copper.black.name=xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ʞɔɐꞁᗺ + +tile.ironchest.shulker_box.silver.white.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ǝʇᴉɥM +tile.ironchest.shulker_box.silver.orange.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ǝᵷuɐɹO +tile.ironchest.shulker_box.silver.magenta.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ɐʇuǝᵷɐW +tile.ironchest.shulker_box.silver.light_blue.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ǝnꞁᗺ ʇɥᵷᴉꞀ +tile.ironchest.shulker_box.silver.yellow.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ʍoꞁꞁǝ⅄ +tile.ironchest.shulker_box.silver.lime.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ǝɯᴉꞀ +tile.ironchest.shulker_box.silver.pink.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ʞuᴉԀ +tile.ironchest.shulker_box.silver.gray.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ʎɐɹ⅁ +tile.ironchest.shulker_box.silver.silver.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ɹǝʌꞁᴉS +tile.ironchest.shulker_box.silver.cyan.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS uɐʎƆ +tile.ironchest.shulker_box.silver.purple.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ǝꞁdɹnԀ +tile.ironchest.shulker_box.silver.blue.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ǝnꞁᗺ +tile.ironchest.shulker_box.silver.brown.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS uʍoɹᗺ +tile.ironchest.shulker_box.silver.green.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS uǝǝɹ⅁ +tile.ironchest.shulker_box.silver.red.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS pǝᴚ +tile.ironchest.shulker_box.silver.black.name=xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ʞɔɐꞁᗺ + +tile.ironchest.shulker_box.crystal.white.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ǝʇᴉɥM +tile.ironchest.shulker_box.crystal.orange.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ǝᵷuɐɹO +tile.ironchest.shulker_box.crystal.magenta.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ɐʇuǝᵷɐW +tile.ironchest.shulker_box.crystal.light_blue.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ǝnꞁᗺ ʇɥᵷᴉꞀ +tile.ironchest.shulker_box.crystal.yellow.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ʍoꞁꞁǝ⅄ +tile.ironchest.shulker_box.crystal.lime.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ǝɯᴉꞀ +tile.ironchest.shulker_box.crystal.pink.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ʞuᴉԀ +tile.ironchest.shulker_box.crystal.gray.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ʎɐɹ⅁ +tile.ironchest.shulker_box.crystal.silver.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ɹǝʌꞁᴉS +tile.ironchest.shulker_box.crystal.cyan.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ uɐʎƆ +tile.ironchest.shulker_box.crystal.purple.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ǝꞁdɹnԀ +tile.ironchest.shulker_box.crystal.blue.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ǝnꞁᗺ +tile.ironchest.shulker_box.crystal.brown.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ uʍoɹᗺ +tile.ironchest.shulker_box.crystal.green.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ uǝǝɹ⅁ +tile.ironchest.shulker_box.crystal.red.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ pǝᴚ +tile.ironchest.shulker_box.crystal.black.name=xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ʞɔɐꞁᗺ + +tile.ironchest.shulker_box.obsidian.white.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ǝʇᴉɥM +tile.ironchest.shulker_box.obsidian.orange.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ǝᵷuɐɹO +tile.ironchest.shulker_box.obsidian.magenta.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ɐʇuǝᵷɐW +tile.ironchest.shulker_box.obsidian.light_blue.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ǝnꞁᗺ ʇɥᵷᴉꞀ +tile.ironchest.shulker_box.obsidian.yellow.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ʍoꞁꞁǝ⅄ +tile.ironchest.shulker_box.obsidian.lime.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ǝɯᴉꞀ +tile.ironchest.shulker_box.obsidian.pink.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ʞuᴉԀ +tile.ironchest.shulker_box.obsidian.gray.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ʎɐɹ⅁ +tile.ironchest.shulker_box.obsidian.silver.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ɹǝʌꞁᴉS +tile.ironchest.shulker_box.obsidian.cyan.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO uɐʎƆ +tile.ironchest.shulker_box.obsidian.purple.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ǝꞁdɹnԀ +tile.ironchest.shulker_box.obsidian.blue.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ǝnꞁᗺ +tile.ironchest.shulker_box.obsidian.brown.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO uʍoɹᗺ +tile.ironchest.shulker_box.obsidian.green.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO uǝǝɹ⅁ +tile.ironchest.shulker_box.obsidian.red.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO pǝᴚ +tile.ironchest.shulker_box.obsidian.black.name=xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ʞɔɐꞁᗺ + +item.ironchest.shulker_box.iron_gold.name=ǝpɐɹᵷd∩ xoᗺ ɹǝʞꞁnɥS pꞁo⅁ oʇ uoɹI +item.ironchest.shulker_box.iron_gold.tooltip=˙ǝɯɐs ǝɥʇ ʎɐʇs ꞁꞁᴉʍ xoᗺ ɹǝʞꞁnɥS ǝɥʇ ɟo ɹoꞁoɔ ǝɥ⟘\nxoᗺ ɹǝʞꞁnɥS pꞁo⅁ ɐ oʇ xoᗺ ɹǝʞꞁnɥS uoɹI ɐ ǝpɐɹᵷdn oʇ pǝs∩ +item.ironchest.shulker_box.gold_diamond.name=ǝpɐɹᵷd∩ xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ oʇ pꞁo⅁ +item.ironchest.shulker_box.gold_diamond.tooltip=˙ǝɯɐs ǝɥʇ ʎɐʇs ꞁꞁᴉʍ xoᗺ ɹǝʞꞁnɥS ǝɥʇ ɟo ɹoꞁoɔ ǝɥ⟘\nxoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ɐ oʇ xoᗺ ɹǝʞꞁnɥS pꞁo⅁ ɐ ǝpɐɹᵷdn oʇ pǝs∩ +item.ironchest.shulker_box.copper_silver.name=ǝpɐɹᵷd∩ xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS oʇ ɹǝddoƆ +item.ironchest.shulker_box.copper_silver.tooltip=˙ǝɯɐs ǝɥʇ ʎɐʇs ꞁꞁᴉʍ xoᗺ ɹǝʞꞁnɥS ǝɥʇ ɟo ɹoꞁoɔ ǝɥ⟘\nxoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ɐ oʇ xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ɐ ǝpɐɹᵷdn oʇ pǝs∩ +item.ironchest.shulker_box.silver_gold.name=ǝpɐɹᵷd∩ xoᗺ ɹǝʞꞁnɥS pꞁo⅁ oʇ ɹǝʌꞁᴉS +item.ironchest.shulker_box.silver_gold.tooltip=˙ǝɯɐs ǝɥʇ ʎɐʇs ꞁꞁᴉʍ xoᗺ ɹǝʞꞁnɥS ǝɥʇ ɟo ɹoꞁoɔ ǝɥ⟘\nxoᗺ ɹǝʞꞁnɥS pꞁo⅁ ɐ oʇ xoᗺ ɹǝʞꞁnɥS ɹǝʌꞁᴉS ɐ ǝpɐɹᵷdn oʇ pǝs∩ +item.ironchest.shulker_box.copper_iron.name=ǝpɐɹᵷd∩ xoᗺ ɹǝʞꞁnɥS uoɹI oʇ ɹǝddoƆ +item.ironchest.shulker_box.copper_iron.tooltip=˙ǝɯɐs ǝɥʇ ʎɐʇs ꞁꞁᴉʍ xoᗺ ɹǝʞꞁnɥS ǝɥʇ ɟo ɹoꞁoɔ ǝɥ⟘\nxoᗺ ɹǝʞꞁnɥS uoɹI ɐ oʇ xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ɐ ǝpɐɹᵷdn oʇ pǝs∩ +item.ironchest.shulker_box.diamond_crystal.name=ǝpɐɹᵷd∩ xoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ oʇ puoɯɐᴉᗡ +item.ironchest.shulker_box.diamond_crystal.tooltip=˙ǝɯɐs ǝɥʇ ʎɐʇs ꞁꞁᴉʍ xoᗺ ɹǝʞꞁnɥS ǝɥʇ ɟo ɹoꞁoɔ ǝɥ⟘\nxoᗺ ɹǝʞꞁnɥS ꞁɐʇsʎɹƆ ɐ oʇ xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ɐ ǝpɐɹᵷdn oʇ pǝs∩ +item.ironchest.shulker_box.vanilla_iron.name=ǝpɐɹᵷd∩ xoᗺ ɹǝʞꞁnɥS uoɹI oʇ ɐꞁꞁᴉuɐᴧ +item.ironchest.shulker_box.vanilla_iron.tooltip=˙ǝɯɐs ǝɥʇ ʎɐʇs ꞁꞁᴉʍ xoᗺ ɹǝʞꞁnɥS ǝɥʇ ɟo ɹoꞁoɔ ǝɥ⟘\nxoᗺ ɹǝʞꞁnɥS uoɹI ɐ oʇ xoᗺ ɹǝʞꞁnɥS ɐꞁꞁᴉuɐᴧ ɐ ǝpɐɹᵷdn oʇ pǝs∩ +item.ironchest.shulker_box.vanilla_copper.name=ǝpɐɹᵷd∩ xoᗺ ɹǝʞꞁnɥS ɹǝddoƆ oʇ ɐꞁꞁᴉuɐᴧ +item.ironchest.shulker_box.vanilla_copper.tooltip=˙ǝɯɐs ǝɥʇ ʎɐʇs ꞁꞁᴉʍ xoᗺ ɹǝʞꞁnɥS ǝɥʇ ɟo ɹoꞁoɔ ǝɥ⟘\nxoᗺ ɹǝʞꞁnɥS ɹǝddoƆ ɐ oʇ xoᗺ ɹǝʞꞁnɥS ɐꞁꞁᴉuɐᴧ ɐ ǝpɐɹᵷdn oʇ pǝs∩ +item.ironchest.shulker_box.diamond_obsidian.name=ǝpɐɹᵷd∩ xoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO oʇ puoɯɐᴉᗡ +item.ironchest.shulker_box.diamond_obsidian.tooltip=˙ǝɯɐs ǝɥʇ ʎɐʇs ꞁꞁᴉʍ xoᗺ ɹǝʞꞁnɥS ǝɥʇ ɟo ɹoꞁoɔ ǝɥ⟘\nxoᗺ ɹǝʞꞁnɥS uɐᴉpᴉsqO ɐ oʇ xoᗺ ɹǝʞꞁnɥS puoɯɐᴉᗡ ɐ ǝpɐɹᵷdn oʇ pǝs∩ + + +itemGroup.ironchest=sʇsǝɥƆ uoɹI From a7735c115d76d7b102decbed1802df778961e430 Mon Sep 17 00:00:00 2001 From: alexbegt Date: Wed, 21 Feb 2018 14:40:04 -0500 Subject: [PATCH 004/111] Fix broken recipe --- .../recipes/upgrade/shulker/copper_iron_shulker_upgrade.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4bb6610a..0cf62bac 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 @@ -7,7 +7,7 @@ ], "type": "forge:ore_shaped", "pattern": [ - "GG", + "GGG", "MSM", "MGM" ], From 612cf234d915e34ffc7fddf337ad091a452dbaf1 Mon Sep 17 00:00:00 2001 From: koh <36918206+koh-gh@users.noreply.github.com> Date: Tue, 10 Apr 2018 10:01:43 +0900 Subject: [PATCH 005/111] Create ja_JP.lang (#128) Add ja_JP.lang file. --- .../assets/ironchest/lang/ja_JP.lang | 177 ++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 src/main/resources/assets/ironchest/lang/ja_JP.lang diff --git a/src/main/resources/assets/ironchest/lang/ja_JP.lang b/src/main/resources/assets/ironchest/lang/ja_JP.lang new file mode 100644 index 00000000..4389efea --- /dev/null +++ b/src/main/resources/assets/ironchest/lang/ja_JP.lang @@ -0,0 +1,177 @@ +################ +# Chests # +################ + +tile.ironchest.chest.iron.name=鉄のチェスト +tile.ironchest.chest.gold.name=金のチェスト +tile.ironchest.chest.diamond.name=ダイヤのチェスト +tile.ironchest.chest.copper.name=銅のチェスト +tile.ironchest.chest.silver.name=銀のチェスト +tile.ironchest.chest.crystal.name=クリスタルチェスト +tile.ironchest.chest.obsidian.name=黒曜石のチェスト +tile.ironchest.chest.dirtchest9000.name=ダートチェスト9000! + +item.ironchest.chest.iron_gold.name=鉄から金のチェストにアップグレード +item.ironchest.chest.gold_diamond.name=金からダイヤのチェストにアップグレード +item.ironchest.chest.copper_silver.name=銅から銀のチェストにアップグレード +item.ironchest.chest.silver_gold.name=銀から金のチェストにアップグレード +item.ironchest.chest.copper_iron.name=銅から鉄のチェストにアップグレード +item.ironchest.chest.diamond_crystal.name=ダイヤからクリスタルチェストにアップグレード +item.ironchest.chest.wood_iron.name=通常から鉄のチェストにアップグレード +item.ironchest.chest.wood_copper.name=通常から銅のチェストにアップグレード +item.ironchest.chest.diamond_obsidian.name=ダイヤから黒曜石のチェストにアップグレード + +book.ironchest.dirtchest9000.title=ダートチェスト9000!使用法 +book.ironchest.dirtchest9000.page1="ダートチェスト9000! にようこそ。我々はこれに土を格納して、あなたが楽しい日々を送ることを願っています。" +book.ironchest.dirtchest9000.page2="使い方: お好きな土を格納して下さい。これでこのチェストのそばを通るといつでも土の温もりを感じることができます。" +book.ironchest.dirtchest9000.page3="この取扱説明書を読んで楽しんでくれると幸いです。将来的にはこのチェストが正式に採用されることを期待しています。敬具。 ダートチェスト9000! 取扱説明書著者より。" +book.ironchest.dirtchest9000.page4="保証について: 本製品はいかなる保証も致しません。土は正しく保管されないかもしれませんし、少しずつ自然に帰っていくかもしれません。逆に、何も起こらないかもしれません。" +book.ironchest.dirtchest9000.page5="ダートチェスト9000! は環境に配慮しています。責任を持ってこの取扱説明書を廃棄して下さい。溶岩の中に投げ込むなんてことはお止め下さい。とても悲しくなってしまいます。" + +####################### +# Shulker Boxes # +####################### + +tile.ironchest.shulker_box.iron.white.name=白色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.orange.name=橙色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.magenta.name=赤紫色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.light_blue.name=空色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.yellow.name=黄色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.lime.name=黄緑色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.pink.name=桃色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.gray.name=灰色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.silver.name=薄灰色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.cyan.name=青緑色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.purple.name=紫色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.blue.name=青色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.brown.name=茶色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.green.name=緑色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.red.name=赤色の鉄のシュルカーボックス +tile.ironchest.shulker_box.iron.black.name=黒色の鉄のシュルカーボックス + +tile.ironchest.shulker_box.gold.white.name=白色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.orange.name=橙色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.magenta.name=赤紫色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.light_blue.name=空色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.yellow.name=黄色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.lime.name=黄緑色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.pink.name=桃色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.gray.name=灰色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.silver.name=薄灰色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.cyan.name=青緑色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.purple.name=紫色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.blue.name=青色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.brown.name=茶色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.green.name=緑色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.red.name=赤色の金のシュルカーボックス +tile.ironchest.shulker_box.gold.black.name=黒色の金のシュルカーボックス + +tile.ironchest.shulker_box.diamond.white.name=白色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.orange.name=橙色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.magenta.name=赤紫色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.light_blue.name=空色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.yellow.name=黄色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.lime.name=黄緑色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.pink.name=桃色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.gray.name=灰色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.silver.name=薄灰色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.cyan.name=青緑色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.purple.name=紫色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.blue.name=青色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.brown.name=茶色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.green.name=緑色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.red.name=赤色のダイヤのシュルカーボックス +tile.ironchest.shulker_box.diamond.black.name=黒色のダイヤのシュルカーボックス + +tile.ironchest.shulker_box.copper.white.name=白色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.orange.name=橙色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.magenta.name=赤紫色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.light_blue.name=空色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.yellow.name=黄色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.lime.name=黄緑色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.pink.name=桃色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.gray.name=灰色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.silver.name=薄灰色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.cyan.name=青緑色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.purple.name=紫色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.blue.name=青色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.brown.name=茶色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.green.name=緑色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.red.name=赤色の銅のシュルカーボックス +tile.ironchest.shulker_box.copper.black.name=黒色の銅のシュルカーボックス + +tile.ironchest.shulker_box.silver.white.name=白色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.orange.name=橙色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.magenta.name=赤紫色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.light_blue.name=空色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.yellow.name=黄色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.lime.name=黄緑色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.pink.name=桃色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.gray.name=灰色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.silver.name=薄灰色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.cyan.name=青緑色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.purple.name=紫色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.blue.name=青色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.brown.name=茶色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.green.name=緑色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.red.name=赤色の銀のシュルカーボックス +tile.ironchest.shulker_box.silver.black.name=黒色の銀のシュルカーボックス + +tile.ironchest.shulker_box.crystal.white.name=白色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.orange.name=橙色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.magenta.name=赤紫色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.light_blue.name=空色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.yellow.name=黄色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.lime.name=黄緑色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.pink.name=桃色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.gray.name=灰色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.silver.name=薄灰色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.cyan.name=青緑色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.purple.name=紫色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.blue.name=青色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.brown.name=茶色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.green.name=緑色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.red.name=赤色のクリスタルシュルカーボックス +tile.ironchest.shulker_box.crystal.black.name=黒色のクリスタルシュルカーボックス + +tile.ironchest.shulker_box.obsidian.white.name=白色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.orange.name=橙色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.magenta.name=赤紫色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.light_blue.name=空色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.yellow.name=黄色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.lime.name=黄緑色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.pink.name=桃色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.gray.name=灰色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.silver.name=薄灰色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.cyan.name=青緑色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.purple.name=紫色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.blue.name=青色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.brown.name=茶色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.green.name=緑色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.red.name=赤色の黒曜石のシュルカーボックス +tile.ironchest.shulker_box.obsidian.black.name=黒色の黒曜石のシュルカーボックス + +item.ironchest.shulker_box.iron_gold.name=鉄から金のシュルカーボックスにアップグレード +item.ironchest.shulker_box.iron_gold.tooltip=鉄から金のシュルカーボックスにアップグレードする際に使用。\nシュルカーボックスの色は変わりません。 +item.ironchest.shulker_box.gold_diamond.name=金からダイヤのシュルカーボックスにアップグレード +item.ironchest.shulker_box.gold_diamond.tooltip=金からダイヤのシュルカーボックスアップグレードする際に使用。\nシュルカーボックスの色は変わりません。 +item.ironchest.shulker_box.copper_silver.name=銅から銀のシュルカーボックスにアップグレード +item.ironchest.shulker_box.copper_silver.tooltip=銅から銀のシュルカーボックスにアップグレードする際に使用。\nシュルカーボックスの色は変わりません。 +item.ironchest.shulker_box.silver_gold.name=銀から金のシュルカーボックスにアップグレード +item.ironchest.shulker_box.silver_gold.tooltip=銀から金のシュルカーボックスにアップグレードする際に使用。\nシュルカーボックスの色は変わりません。 +item.ironchest.shulker_box.copper_iron.name=銅から鉄のシュルカーボックスにアップグレード +item.ironchest.shulker_box.copper_iron.tooltip=銅から鉄のシュルカーボックスにアップグレードする際に使用。\nシュルカーボックスの色は変わりません。 +item.ironchest.shulker_box.diamond_crystal.name=ダイヤからクリスタルシュルカーボックスにアップグレード +item.ironchest.shulker_box.diamond_crystal.tooltip=ダイヤからクリスタルシュルカーボックスにアップグレードする際に使用。\nシュルカーボックスの色は変わりません。 +item.ironchest.shulker_box.vanilla_iron.name=通常から鉄のシュルカーボックスにアップグレード +item.ironchest.shulker_box.vanilla_iron.tooltip=通常から鉄のシュルカーボックスにアップグレードする際に使用。\nシュルカーボックスの色は変わりません。 +item.ironchest.shulker_box.vanilla_copper.name=通常から銅のシュルカーボックスにアップグレード +item.ironchest.shulker_box.vanilla_copper.tooltip=通常から銅のシュルカーボックスにアップグレードする際に使用。\nシュルカーボックスの色は変わりません。 +item.ironchest.shulker_box.diamond_obsidian.name=ダイヤから黒曜石のシュルカーボックスにアップグレード +item.ironchest.shulker_box.diamond_obsidian.tooltip=ダイヤから黒曜石のシュルカーボックスにアップグレードする際に使用。\nシュルカーボックスの色は変わりません。 + +############## +# GUIs # +############## + +itemGroup.ironchest=Iron Chests From 5cdce170c7f89db211f8300860ecbec700c1ac0d Mon Sep 17 00:00:00 2001 From: "Joseph C. Sible" Date: Mon, 9 Apr 2018 21:12:13 -0400 Subject: [PATCH 006/111] Don't send the entire NBT tag to the client (#133) The only extra bit of NBT the client needs here is facing. If we send everything, then the client will know about the loot table when there is one, which will result in this crash: java.lang.NullPointerException: Rendering screen at net.minecraft.tileentity.TileEntityLockableLoot.fillWithLoot(TileEntityLockableLoot.java:59) at cpw.mods.ironchest.common.tileentity.chest.TileEntityIronChest.getStackInSlot(TileEntityIronChest.java:138) at net.minecraft.inventory.Slot.getStack(Slot.java:81) at net.minecraft.client.gui.inventory.GuiContainer.drawSlot(GuiContainer.java:234) at net.minecraft.client.gui.inventory.GuiContainer.drawScreen(GuiContainer.java:116) at cpw.mods.ironchest.client.gui.chest.GUIChest.drawScreen(GUIChest.java:100) at net.minecraftforge.client.ForgeHooksClient.drawScreen(ForgeHooksClient.java:368) at net.minecraft.client.renderer.EntityRenderer.updateCameraAndRender(EntityRenderer.java:1177) at net.minecraft.client.Minecraft.runGameLoop(Minecraft.java:1207) at net.minecraft.client.Minecraft.run(Minecraft.java:441) at net.minecraft.client.main.Main.main(Main.java:118) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at net.minecraft.launchwrapper.Launch.launch(Launch.java:135) at net.minecraft.launchwrapper.Launch.main(Launch.java:28) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at net.minecraftforge.gradle.GradleStartCommon.launch(GradleStartCommon.java:97) at GradleStart.main(GradleStart.java:25) --- .../common/tileentity/chest/TileEntityIronChest.java | 4 +++- .../common/tileentity/shulker/TileEntityIronShulkerBox.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/chest/TileEntityIronChest.java b/src/main/java/cpw/mods/ironchest/common/tileentity/chest/TileEntityIronChest.java index fa88db35..b54013a4 100755 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/chest/TileEntityIronChest.java +++ b/src/main/java/cpw/mods/ironchest/common/tileentity/chest/TileEntityIronChest.java @@ -593,7 +593,9 @@ public boolean canRenderBreaking() @Override public NBTTagCompound getUpdateTag() { - return this.writeToNBT(new NBTTagCompound()); + NBTTagCompound compound = super.getUpdateTag(); + compound.setByte("facing", (byte) this.facing.ordinal()); + return compound; } @Override diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/shulker/TileEntityIronShulkerBox.java b/src/main/java/cpw/mods/ironchest/common/tileentity/shulker/TileEntityIronShulkerBox.java index 4cba0f7b..9b523161 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/shulker/TileEntityIronShulkerBox.java +++ b/src/main/java/cpw/mods/ironchest/common/tileentity/shulker/TileEntityIronShulkerBox.java @@ -673,7 +673,9 @@ public boolean canRenderBreaking() @Override public NBTTagCompound getUpdateTag() { - return this.writeToNBT(new NBTTagCompound()); + NBTTagCompound compound = super.getUpdateTag(); + compound.setByte("facing", (byte) this.facing.ordinal()); + return compound; } @Override From 08cf8e0bb2f2592c529b4d541a828302ac02c00b Mon Sep 17 00:00:00 2001 From: "Joseph C. Sible" Date: Sat, 16 Jun 2018 21:06:41 -0400 Subject: [PATCH 007/111] Fix #131 (#132) --- .../blocks/shulker/BlockIronShulkerBox.java | 79 +++++++++++++------ .../shulker/TileEntityIronShulkerBox.java | 31 +++++++- 2 files changed, 84 insertions(+), 26 deletions(-) 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 62bbd436..e99988d9 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 @@ -261,6 +261,40 @@ public int damageDropped(IBlockState state) return state.getValue(VARIANT_PROP).ordinal(); } + /** + * Called when a player removes a block. This is responsible for + * actually destroying the block, and the block is intact at time of call. + * This is called regardless of whether the player can harvest the block or + * not. + * + * Return true if the block is actually destroyed. + * + * Note: When used in multiplayer, this is called on both client and + * server sides! + * + * @param state The current state. + * @param world The current world + * @param player The player damaging the block, may be null + * @param pos Block position in world + * @param willHarvest True if Block.harvestBlock will be called after this, if the return in true. + * Can be useful to delay the destruction of tile entities till after harvestBlock + * @return True if the block is actually destroyed. + */ + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + { + return willHarvest || super.removedByPlayer(state, world, pos, player, false); + } + + /** + * 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 + */ + public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity te, ItemStack stack) + { + super.harvestBlock(worldIn, player, pos, state, te, stack); + worldIn.setBlockToAir(pos); + } + @Override public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) { @@ -271,11 +305,26 @@ public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, Ent } /** - * Spawns this Block's drops into the World as EntityItems. + * This gets a complete list of items dropped from this block. + * + * @param drops add all items this block drops to this drops list + * @param world The current world + * @param pos Block position in world + * @param state Current state + * @param fortune Breakers fortune level */ - @Override - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, IBlockState state, float chance, int fortune) + public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + TileEntity tileentity = world.getTileEntity(pos); + + if (tileentity instanceof TileEntityIronShulkerBox) + { + ItemStack itemstack = ((TileEntityIronShulkerBox) tileentity).getDrop(state, false); + if(!itemstack.isEmpty()) + { + drops.add(itemstack); + } + } } /** @@ -288,28 +337,10 @@ public void breakBlock(World worldIn, BlockPos pos, IBlockState state) if (tileentity instanceof TileEntityIronShulkerBox) { - TileEntityIronShulkerBox tileentityironshulkerbox = (TileEntityIronShulkerBox) tileentity; - - if (!tileentityironshulkerbox.isCleared() && tileentityironshulkerbox.shouldDrop()) + ItemStack itemstack = ((TileEntityIronShulkerBox) tileentity).getDrop(state, true); + if(!itemstack.isEmpty()) { - if (!tileentityironshulkerbox.beenUpgraded()) - { - ItemStack itemstack = new ItemStack(Item.getItemFromBlock(this), 1, state.getValue(VARIANT_PROP).ordinal()); - NBTTagCompound nbttagcompound = new NBTTagCompound(); - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - - nbttagcompound.setTag("BlockEntityTag", ((TileEntityIronShulkerBox) tileentity).saveToNbt(nbttagcompound1)); - itemstack.setTagCompound(nbttagcompound); - - if (tileentityironshulkerbox.hasCustomName()) - { - itemstack.setStackDisplayName(tileentityironshulkerbox.getName()); - - tileentityironshulkerbox.setCustomName(""); - } - - spawnAsEntity(worldIn, pos, itemstack); - } + spawnAsEntity(worldIn, pos, itemstack); } worldIn.updateComparatorOutputLevel(pos, state.getBlock()); diff --git a/src/main/java/cpw/mods/ironchest/common/tileentity/shulker/TileEntityIronShulkerBox.java b/src/main/java/cpw/mods/ironchest/common/tileentity/shulker/TileEntityIronShulkerBox.java index 9b523161..2d41ae17 100644 --- a/src/main/java/cpw/mods/ironchest/common/tileentity/shulker/TileEntityIronShulkerBox.java +++ b/src/main/java/cpw/mods/ironchest/common/tileentity/shulker/TileEntityIronShulkerBox.java @@ -34,6 +34,7 @@ import net.minecraft.inventory.ISidedInventory; 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.network.NetworkManager; @@ -777,9 +778,35 @@ public void setDestroyedByCreativePlayer(boolean destoryedByCreativeUser) this.destroyedByCreativePlayer = destoryedByCreativeUser; } - public boolean shouldDrop() + public boolean shouldDropInBreakBlock() { - return !this.isDestroyedByCreativePlayer() || !this.isEmpty() || this.hasCustomName() || this.lootTable != null; + return this.isDestroyedByCreativePlayer() && (!this.isEmpty() || this.hasCustomName() || this.lootTable != null); + } + + public ItemStack getDrop(IBlockState state, boolean inBreakBlock) { + BlockIronShulkerBox block = (BlockIronShulkerBox) state.getBlock(); + if (!isCleared() && (!inBreakBlock || shouldDropInBreakBlock())) + { + if (!beenUpgraded()) + { + ItemStack itemstack = new ItemStack(Item.getItemFromBlock(block), 1, state.getValue(BlockIronShulkerBox.VARIANT_PROP).ordinal()); + NBTTagCompound nbttagcompound = new NBTTagCompound(); + NBTTagCompound nbttagcompound1 = new NBTTagCompound(); + + nbttagcompound.setTag("BlockEntityTag", saveToNbt(nbttagcompound1)); + itemstack.setTagCompound(nbttagcompound); + + if (hasCustomName()) + { + itemstack.setStackDisplayName(getName()); + + setCustomName(""); + } + + return itemstack; + } + } + return ItemStack.EMPTY; } protected void sendTopStacksPacket() From 81c12fe22414c62c23b9a87b98c03462634945d0 Mon Sep 17 00:00:00 2001 From: alexbegt Date: Sat, 16 Jun 2018 23:22:57 -0400 Subject: [PATCH 008/111] 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 fb780093..36892d0a 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 52a07a35..e148569b 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.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 @@ } // 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 1d285025..f443a8ec 100755 --- a/src/main/java/cpw/mods/ironchest/IronChest.java +++ b/src/main/java/cpw/mods/ironchest/IronChest.java @@ -13,6 +13,7 @@ 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 void preInit(FMLPreInitializationEvent event) 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 void init(FMLInitializationEvent event) 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 e99988d9..13294cb5 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.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 int damageDropped(IBlockState state) * 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 boolean removedByPlayer(IBlockState state, World world, BlockPos pos, Ent * 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 void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, Ent * @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 void getDrops(NonNullList drops, IBlockAccess world, BlockPos 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 void breakBlock(World worldIn, BlockPos pos, IBlockState state) 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 00000000..df56e7ba --- /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 00000000..335a4bf4 --- /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 1d7f20fc..00000000 --- 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 7b5cea8d..de195dea 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 static void createVanillaShulkerBlockList() 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 bae53acd..c1dd9288 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 @@ public class MessageCrystalShulkerSync implements IMessage { int dimension; + BlockPos pos; + private NonNullList topStacks; public MessageCrystalShulkerSync(TileEntityIronShulkerBox tile, NonNullList stack) @@ -90,4 +92,4 @@ public IMessage onMessage(MessageCrystalShulkerSync message, MessageContext ctx) 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 ad3bb91c..b8dcdb23 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 @@ 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 static void getSubItems(NonNullList subItems) 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 static void getSubItems(NonNullList subItems) } } - 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 c8ba6c31..f3490041 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 6ee8455c..8c4e0ff8 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 61c3e23d..9c63437d 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 ac43d6f6..c1ce2249 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 cb8e0009..e2ab5d90 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 6495de38..3bc77fc7 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 a97687cf..b308150a 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 707ebb0a..3ab8d91c 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 49abf35f..eb4deb96 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 e415a150..999f65dc 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 ac1d6c8c..0c5b60ea 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 85415881..6edf1881 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 c60e1642..f61f0cd0 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 95a2ef85..0ae51e89 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 5a5de5ac..9107f581 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 668d836d..e9272037 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 0b6c17b5..2bff8bf5 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 4d1d1147..0adba813 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 56aff0a2..ff5c5096 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 fac94b1c..71052fcd 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 36bedea3..9fc4f4b0 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 bbb7b8c9..ca3f1a4e 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 494c4adc..be5d6c9d 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 d8c2b849..0bced7d8 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 94f41d26..afb94f47 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 b7ca1ef5..f8fcf677 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 8b7799ac..ecdf2b95 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 45f75c5f..c88cbb70 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 93154c3e..d1462665 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 afffa1fe..0071f834 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 c6c5de38..560160af 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 4399c169..d32872db 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 900a5afe..149b79a1 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 36069443..ffb51fd0 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 bfa00165..b9157a77 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 04f96aa3..92663a3b 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 e407be0b..7fd3d4f3 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 d4dafe5c..ba125fbe 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 2fd1d37b..99799f30 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 62f64195..a9b43c33 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 d4f8db85..b39a6b42 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 b721bc32..06213e35 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 0165c385..e7495b37 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 ccf6ad38..3a225b27 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 bbdf2d41..c1d6dc34 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 ad97fc47..3d06faaf 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 7fc4171f..dac96e25 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 5378c389..85e49763 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 8877489e..9d60a36f 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 ff70f0c7..7c94b61d 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 a43f48eb..a6292ab5 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 43d61b77..d2598957 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 71d76068..d1329980 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 48df6b05..b545c89a 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 0365793e..4b460f5d 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 e43a8c35..1ae7fbe4 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 9c5a7b15..41fd7c10 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 9792ad28..e53b6c93 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 41bd283d..7683b4ab 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 b2e94884..3319213e 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 0004fdc5..a68f112e 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 b9449f83..5870be45 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 5f632d8c..a1ce187d 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 17ab372e..4284c336 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 4eaa104f..73118a93 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 25e04103..33d5392f 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 40fdf1bf..6d7fc17c 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 010452c1..75aba53b 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 0c5fd5e3..a57b2a79 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 e421a6f0..2e086ec3 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 aa12654c..44d779a6 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 1d620e0e..cfa061f0 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 aa269251..5f7caf54 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 47b2da68..64186311 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 e7931a9b..1b7f5336 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 3ea1f467..cd84f066 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 f55e1082..fc3b8025 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 baf5b1de..c726629e 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 e5393095..aee69b65 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 bfee83e0..278458cc 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 d859e604..f935c9a4 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 4bdfb2f3..805b8842 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 02d1bf95..ef338128 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 fa96a26f..37248f0c 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 65ed5f0f..aee3c8ad 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 629d71b7..9a049f89 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 2ec75658..a89b2d1f 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 dbd37303..81ac38f4 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 37b85376..89296278 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 479e0f52..ff55a55a 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 2a19f0e8..bb508232 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 43f26ccd..da08ff84 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 30db6d3c..7d691e92 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 2508bbc3..60e4d875 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 4989ba7a..121c37a2 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 e82cb4bc..472586ad 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 5b4b4532..612b6a64 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 25cc874e..fe62455f 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 d4932de9..a3dc172a 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 9570c762..1c5d1ed5 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 58ae2d2f..d264b183 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 db98af00..47a2bf70 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 13bd5131..d51b631c 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 772f5a78..d0433f35 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 d5c3cba3..84a31102 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 354a66b7..46306292 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 58a846d7..38b8c30c 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 02422469..2f4292a5 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 09e10390..60325b6a 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 1a8e7bea..4baf32a7 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 50b50aa7..55958170 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 bcdc47cf..c25266c4 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 ff33cf30..4f96103f 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 5d7ad2fa..4c46fb50 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 ac571d0e..64e4bb51 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 c138beb7..706d0dc5 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 4e15104a..d4a332bf 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 6767ac5b..742a940a 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 34e35428..79299e95 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 92529e50..6a9a87fe 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 515eb831..e6c1e822 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 ddc1f75d..ebbcd673 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 265bb594..040563a6 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 43ed7390..2364bac0 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 e0f100d6..5dec6f68 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 afd68dc1..ffe1887c 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 71e18f0f..cf5421f3 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 fdd7049e..01fae8e7 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 f0064042..bc37f11c 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 1657c0ca..36d32c5c 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 acc4d27a..d2fd1070 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 481e19de..5c0834dd 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 2bf6a3a2..4302accd 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 18562896..36f1a01f 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 0f081ba3..95328fe9 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 cbba56a8..b844dc16 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 f00d240b..fb2b889c 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 dceb2688..55820c0c 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 95c79e35..7171f9c9 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 50655131..ee0c7f8e 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 cf93c41a..62e526b3 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 868b9bc7..b0e35ad7 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 59ebb074..2c8c66dd 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 6ca074a7..c60fe2d9 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 ebbf2524..d76563a9 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 6972698e..9eb58202 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 7473e1fa..3cdc5527 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 514237c1..9af243da 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 995d69b5..c2067756 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 d2d86bca..a432e5c0 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 3dc7c41e..fbec769b 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 43d61b77..d2598957 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 71d76068..d1329980 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 48df6b05..b545c89a 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 0365793e..4b460f5d 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 e43a8c35..1ae7fbe4 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 9c5a7b15..41fd7c10 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 9792ad28..e53b6c93 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 41bd283d..7683b4ab 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 b2e94884..3319213e 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 0004fdc5..a68f112e 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 b9449f83..5870be45 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 6f3f870d..d11db230 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 017ec805..64e37c2b 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 6ebfa03e..59dc3cdf 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 8898a585..b5bbaf10 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 2e06a206..21de8349 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 f0b38d0e..ada0f28e 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 a4a84f15..3fac7a68 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 601a5ca8..75f45e4b 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 5bd665a6..49ac0412 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 918282eb..712a07fe 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 660a4eff..8af3c31b 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 4bd3c98c..9d9b8728 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 d7eab1c5..4c286d11 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 5a1115df..c6dd7841 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 e898f54a..78a56f5d 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 7d343bb5..b624aec6 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 65801f81..7143462b 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 5479d104..d83cd592 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 4d7ca117..cb72e8c0 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 3ec9f82f..e8aa65e3 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 9c52f1a1..b688a131 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 23dfa7de..9dee8345 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 a2e8c739..0b8328e7 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 fde6fc66..cee67ef7 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 8d0b921a..48f96284 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 6d58cd56..e58d47ca 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 0cf62bac..26d8b194 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 f912e62d..c8791112 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 99585477..d2e9a830 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 4672c89c..7c67ccbc 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 a42cd1b2..42768c7a 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 fdc91933..187ce9ea 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 0f0579eb..f2f1bbb1 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 9c57d172..932bb061 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 746a5e0c..a2188f47 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", From ba7bb091288f04c51827aef912395778cd42e17f Mon Sep 17 00:00:00 2001 From: Zero Date: Mon, 30 Jul 2018 00:09:00 -0400 Subject: [PATCH 009/111] Updated Shulker Box colors (#125) Now as vibrant as the vanilla boxes. --- .../shulker/black/shulker_black_copper.png | Bin 19631 -> 4527 bytes .../shulker/black/shulker_black_crystal.png | Bin 19000 -> 3931 bytes .../shulker/black/shulker_black_diamond.png | Bin 19636 -> 4465 bytes .../shulker/black/shulker_black_gold.png | Bin 19619 -> 4397 bytes .../shulker/black/shulker_black_obsidian.png | Bin 20770 -> 4444 bytes .../shulker/black/shulker_black_silver.png | Bin 19640 -> 4478 bytes .../shulker/blue/shulker_blue_copper.png | Bin 20011 -> 4873 bytes .../shulker/blue/shulker_blue_crystal.png | Bin 19353 -> 4025 bytes .../shulker/blue/shulker_blue_diamond.png | Bin 20007 -> 4865 bytes .../model/shulker/blue/shulker_blue_gold.png | Bin 19941 -> 4805 bytes .../model/shulker/blue/shulker_blue_iron.png | Bin 19982 -> 4894 bytes .../shulker/blue/shulker_blue_obsidian.png | Bin 21529 -> 4830 bytes .../shulker/brown/shulker_brown_copper.png | Bin 19917 -> 4828 bytes .../shulker/brown/shulker_brown_crystal.png | Bin 19277 -> 4061 bytes .../shulker/brown/shulker_brown_diamond.png | Bin 19989 -> 4860 bytes .../shulker/brown/shulker_brown_gold.png | Bin 19914 -> 4771 bytes .../shulker/brown/shulker_brown_iron.png | Bin 19957 -> 4842 bytes .../shulker/brown/shulker_brown_obsidian.png | Bin 21436 -> 4795 bytes .../shulker/brown/shulker_brown_silver.png | Bin 19913 -> 4862 bytes .../shulker/cyan/shulker_cyan_copper.png | Bin 20019 -> 4774 bytes .../shulker/cyan/shulker_cyan_crystal.png | Bin 19199 -> 4007 bytes .../shulker/cyan/shulker_cyan_diamond.png | Bin 20014 -> 4763 bytes .../model/shulker/cyan/shulker_cyan_gold.png | Bin 19977 -> 4728 bytes .../model/shulker/cyan/shulker_cyan_iron.png | Bin 19981 -> 4755 bytes .../shulker/cyan/shulker_cyan_obsidian.png | Bin 21493 -> 4741 bytes .../shulker/cyan/shulker_cyan_silver.png | Bin 19966 -> 4767 bytes .../shulker/gray/shulker_gray_copper.png | Bin 19924 -> 4775 bytes .../shulker/gray/shulker_gray_crystal.png | Bin 19377 -> 3996 bytes .../shulker/gray/shulker_gray_diamond.png | Bin 19982 -> 4761 bytes .../model/shulker/gray/shulker_gray_gold.png | Bin 19882 -> 4698 bytes .../model/shulker/gray/shulker_gray_iron.png | Bin 19967 -> 4854 bytes .../shulker/gray/shulker_gray_obsidian.png | Bin 20736 -> 4699 bytes .../shulker/gray/shulker_gray_silver.png | Bin 19904 -> 4814 bytes .../shulker/green/shulker_green_copper.png | Bin 20016 -> 4782 bytes .../shulker/green/shulker_green_crystal.png | Bin 19335 -> 3935 bytes .../shulker/green/shulker_green_diamond.png | Bin 20068 -> 4769 bytes .../shulker/green/shulker_green_gold.png | Bin 20005 -> 4717 bytes .../shulker/green/shulker_green_iron.png | Bin 20036 -> 4822 bytes .../shulker/green/shulker_green_obsidian.png | Bin 21422 -> 4742 bytes .../shulker/green/shulker_green_silver.png | Bin 20037 -> 4823 bytes .../light_blue/shulker_light_blue_copper.png | Bin 19754 -> 4888 bytes .../light_blue/shulker_light_blue_crystal.png | Bin 19017 -> 4064 bytes .../light_blue/shulker_light_blue_diamond.png | Bin 19752 -> 4883 bytes .../light_blue/shulker_light_blue_gold.png | Bin 19700 -> 4820 bytes .../light_blue/shulker_light_blue_iron.png | Bin 19747 -> 4868 bytes .../shulker_light_blue_obsidian.png | Bin 21521 -> 4864 bytes .../shulker/lime/shulker_lime_copper.png | Bin 19783 -> 4992 bytes .../shulker/lime/shulker_lime_crystal.png | Bin 19038 -> 4064 bytes .../shulker/lime/shulker_lime_diamond.png | Bin 19823 -> 4927 bytes .../model/shulker/lime/shulker_lime_gold.png | Bin 19765 -> 4905 bytes .../model/shulker/lime/shulker_lime_iron.png | Bin 19811 -> 4993 bytes .../shulker/lime/shulker_lime_obsidian.png | Bin 21454 -> 4971 bytes .../shulker/lime/shulker_lime_silver.png | Bin 19788 -> 4986 bytes .../magenta/shulker_magenta_copper.png | Bin 19898 -> 4934 bytes .../magenta/shulker_magenta_crystal.png | Bin 19122 -> 4100 bytes .../magenta/shulker_magenta_diamond.png | Bin 19865 -> 4952 bytes .../shulker/magenta/shulker_magenta_gold.png | Bin 19840 -> 4898 bytes .../shulker/magenta/shulker_magenta_iron.png | Bin 19907 -> 4933 bytes .../magenta/shulker_magenta_obsidian.png | Bin 21568 -> 4917 bytes .../magenta/shulker_magenta_silver.png | Bin 19911 -> 4909 bytes .../shulker/orange/shulker_orange_copper.png | Bin 19881 -> 4983 bytes .../shulker/orange/shulker_orange_crystal.png | Bin 19109 -> 4050 bytes .../shulker/orange/shulker_orange_diamond.png | Bin 19859 -> 4941 bytes .../shulker/orange/shulker_orange_gold.png | Bin 19825 -> 4901 bytes .../shulker/orange/shulker_orange_iron.png | Bin 19856 -> 5002 bytes .../orange/shulker_orange_obsidian.png | Bin 21474 -> 4965 bytes .../shulker/orange/shulker_orange_silver.png | Bin 19833 -> 4992 bytes .../shulker/pink/shulker_pink_copper.png | Bin 19882 -> 5017 bytes .../shulker/pink/shulker_pink_crystal.png | Bin 19253 -> 4139 bytes .../shulker/pink/shulker_pink_diamond.png | Bin 19872 -> 5010 bytes .../model/shulker/pink/shulker_pink_gold.png | Bin 19846 -> 4984 bytes .../model/shulker/pink/shulker_pink_iron.png | Bin 19888 -> 5009 bytes .../shulker/pink/shulker_pink_obsidian.png | Bin 21575 -> 4971 bytes .../shulker/pink/shulker_pink_silver.png | Bin 19874 -> 5021 bytes .../shulker/purple/shulker_purple_copper.png | Bin 20290 -> 4979 bytes .../shulker/purple/shulker_purple_crystal.png | Bin 19408 -> 4234 bytes .../shulker/purple/shulker_purple_diamond.png | Bin 20300 -> 4949 bytes .../shulker/purple/shulker_purple_gold.png | Bin 20276 -> 4923 bytes .../shulker/purple/shulker_purple_iron.png | Bin 20341 -> 4959 bytes .../purple/shulker_purple_obsidian.png | Bin 21436 -> 4957 bytes .../shulker/purple/shulker_purple_silver.png | Bin 20318 -> 4919 bytes .../model/shulker/red/shulker_red_copper.png | Bin 19992 -> 4906 bytes .../model/shulker/red/shulker_red_crystal.png | Bin 19166 -> 4048 bytes .../model/shulker/red/shulker_red_diamond.png | Bin 19965 -> 4890 bytes .../model/shulker/red/shulker_red_gold.png | Bin 19955 -> 4798 bytes .../model/shulker/red/shulker_red_iron.png | Bin 19992 -> 4918 bytes .../shulker/red/shulker_red_obsidian.png | Bin 21459 -> 4853 bytes .../model/shulker/red/shulker_red_silver.png | Bin 19981 -> 4867 bytes .../shulker/silver/shulker_silver_copper.png | Bin 20119 -> 4873 bytes .../shulker/silver/shulker_silver_crystal.png | Bin 19292 -> 4378 bytes .../shulker/silver/shulker_silver_diamond.png | Bin 20087 -> 4876 bytes .../shulker/silver/shulker_silver_gold.png | Bin 20032 -> 4839 bytes .../shulker/silver/shulker_silver_iron.png | Bin 20065 -> 4869 bytes .../silver/shulker_silver_obsidian.png | Bin 21051 -> 4866 bytes .../shulker/silver/shulker_silver_silver.png | Bin 20035 -> 4849 bytes .../shulker/white/shulker_white_copper.png | Bin 19804 -> 4973 bytes .../shulker/white/shulker_white_crystal.png | Bin 19238 -> 4049 bytes .../shulker/white/shulker_white_diamond.png | Bin 19698 -> 4939 bytes .../shulker/white/shulker_white_gold.png | Bin 19659 -> 4913 bytes .../shulker/white/shulker_white_iron.png | Bin 19750 -> 4956 bytes .../shulker/white/shulker_white_obsidian.png | Bin 21306 -> 4908 bytes .../shulker/white/shulker_white_silver.png | Bin 19705 -> 5006 bytes .../shulker/yellow/shulker_yellow_copper.png | Bin 19724 -> 4931 bytes .../shulker/yellow/shulker_yellow_crystal.png | Bin 19128 -> 4039 bytes .../shulker/yellow/shulker_yellow_diamond.png | Bin 19681 -> 4900 bytes .../shulker/yellow/shulker_yellow_gold.png | Bin 19649 -> 4861 bytes .../shulker/yellow/shulker_yellow_iron.png | Bin 19666 -> 4964 bytes .../yellow/shulker_yellow_obsidian.png | Bin 21532 -> 4917 bytes .../shulker/yellow/shulker_yellow_silver.png | Bin 19699 -> 4918 bytes 109 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/ironchest/textures/model/shulker/black/shulker_black_copper.png b/src/main/resources/assets/ironchest/textures/model/shulker/black/shulker_black_copper.png index c06348112a6fe9b9d89db777864e5d04bf0604cb..646ad76faab4e1f748aed18e53dcbbbcd442b820 100644 GIT binary patch delta 1802 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 diff --git a/src/main/resources/assets/ironchest/textures/model/shulker/black/shulker_black_crystal.png b/src/main/resources/assets/ironchest/textures/model/shulker/black/shulker_black_crystal.png index bf1a0dfa177629b38f20e8fa576e30bef05a00ce..57339fcd4641f79c1239587910b62a767c8b1795 100644 GIT binary patch delta 1202 zcmV;j1Wo(6lmXiwu#*at)kG|R1cpgOK~#9!>{`EX+eQ@rjv^_Mf-EakY&IqgBZ-rx zOVajF=w4*%*d#5w)k~4p^4hIy(YW0Uq?ywpe?grNo~jmLQ5jHxI*y`P!vFw($dUvA=$a-5 zg8_=N?C3-US&|?f{(-vQLh0MP6Yafe{l~)Wt(B`3=lvi#I5+?R@JK=GdJEqQXf5U=q=#*DE1)S?|R9YMG_NWKD^@$zS(Rr08mwp08HouB1hj; zH7Y;)7#zpY$6_Th0Ug7Cm>9f!;6eJ!W`n7!Muur((ZVHdfGC+4&iV}}#im9;QI=s^ zw&V6uL{&91EgJ&Quf7K`mS7SHt51Mm445X(W`h;-B6|J)>JyO6eJ+3p$dVL025erW z7(hfA{>7j8q$|i$5YRPENclWo&JY9o@7`VV7?5x~o5of+wSB;U#^x5e*LinL@YB1N zwG=TRaSsZQU*KQ8g|$Z?K~*&(0G4Hgh@8M^S~lD{f@#@!^WE>j@exWtf4SNO)JIue zj^i-i+Y31!U~qIkmjh!AM%M(`==mrU^ty7~bU5)!y!-4m0YLxjPtfc2V062X3I&Lw zh znkHmPa_nRG*=r&q%<_+Kex+5%FMJia^vhsIKt@1D!1C+^G;N2-lcjofp68+KfBCM} zVfgXyG`t@MG3*E7gY5I(0?kQ758a4dzkZ9t3Oq^h0MM9!g1>R&cB*(T&HBVV>KkDx zG|eLhgw+5kAs!1LkgMx0u)U|GR8@-Fz?QZ{Z0{+JbAh<{YuC2l!&k3(BML=P!UO*3ju58D$ROE z7Zxvq204wK3*iAlgH3bhS0)!ImMU}}178^e(subQ8(gIraGtKe^aPx@>n}9{^O*V6 z2uOOz$2-`0&HPe&z&vMuX$aVQqR%|@#)F@hkAS#;>F_Y0e@^n@{kad`mjFdk$*Cy% z$mwY_bf%mmZ&y`vT!rzg1`YH1Z6~W!l*z&hfxy6=-)Z(0MWyk(k@{b&)$mHY>718c zxw08})>c|mrk=wk#w+u&|4O@wTCL`@6I}Got)yWvX8*a=JFsZ}VqUy*?gyNHetYV7 zzFygXAfC^`?)9Ml^7q8~d=z|n{VIu~0L!+0@zcKZ^~wf`f&kODX0pFt*&spSC+uhU z11@_u$ne8IgySO=4<8I&kTGzK!+-`L8oDIMx%AQV_7^`6TlnxUCh+6;2ZK;O5bw1= z)}!LR{q@@S^q(!mZOuhWc0V8^AR{0nAR{0pBOoInBOoInBj8eILX7?&0JfdU6n9e7 Q3jhEB07*qoM6N<$g30GuhyVZp literal 19000 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 D(Idj9 diff --git a/src/main/resources/assets/ironchest/textures/model/shulker/black/shulker_black_diamond.png b/src/main/resources/assets/ironchest/textures/model/shulker/black/shulker_black_diamond.png index a62e14206ff8407e1cc64449c382b4b44337665a..d14d9ff07b4ce991643c213338370747179c9c33 100644 GIT binary patch delta 1740 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 diff --git a/src/main/resources/assets/ironchest/textures/model/shulker/black/shulker_black_gold.png b/src/main/resources/assets/ironchest/textures/model/shulker/black/shulker_black_gold.png index 69fe3d18813b4ddf506460e24107970f9c55dc51..bb00e9076436c06302229b3fbd6b4fc09dac0fab 100644 GIT binary patch delta 1671 zcmV;226*|SnE|aLu#*at)kG|R23Sc%K~#9!>{{E7+cpqAL*2dEWD%!mfD{X4gSL

GX5;n=XAcnyA1n^g zi4Zd*%Q6!eFmvxrzxZ?5Je$=T&|GB5pr1| z3Rxa^(EF z$(DHBrn-8362}lkhWQvimj#k2G9h)|qt~C03vbik)*tu)n|Tt)h})c=+d_t&X9v!(f2#^LOEe{i7>}?|wiHHRtwQ^}bA-^PpnyV?cNjEzaP z#m`PiEahkdWDC-i%tGfLo>OZeA}9Y`7K2*Em_^xm-~O?xDsV4L?e~4(ckaO?iYD>; z+xPuW-q7do!e9pfZFrl%_H|ta#4*aM!k5ngLub#`fU8__^t~3!mlr?3CQ;1EhoKm@^B*z)6&6;-`GboaVyMoj)^o z<}XYv?}^z2f*{z$^4Gu%AqM!lnIRE5@t!AUTcGcG22cB+4epk#43nMaZ1LpuY`0?U z>U*1i3-B#C8=MqyUPehIM(XBd%4qD!LdENwPKWm`sGOdGNPt;&f~~F+hDQjGUOWY} z!g_Vb6)-H9a%&AdS~q7_x2Gm}n3^8DtIezif48q9bikD#dVKNIR{r2s;h)upE6)#0 z0mHWgJuC&>{;Kd#Hvb2!0C!;YKoszQto*@$e83^@_|Ty0BYJAOCc&7rE%jY~2nF0X5efwu}&zr)ARh85k zp0i4O$|PRHWOd8sbM6{GgFxnc8~^3m4>=nF8c=Iz5u)tw3Kgr|mo zzb(984W;JYC{c>RPyn|j{R#fUnU??^0SL6458`I>`pO*b623AzH;#6`fn?2J3qQqQ zY;(4n`L<)L{v>EKlj|v=#puuc7=ni6 zwYkAn)iuhhLRHtMCSTX8bKie}uNpjo8d|zfge;e%c%>M!EI0hXsB2~L3`UygP$T%N zt|7|;WmTb84L?19t<*k$VVjN?QrG7CeWesIa(L<*Ur*3;5HQaL5x|Y`E_xVx;oq!$ zyXuTCzdn8A16oZ`8;KDCf(Q*pfw1W-RzUl_Uzay{Js!wC*Q2|E<92Ia>z)=AYvJvrr0|2JH0x3UP R@6Z4M002ovPDHLkV1jc&OVj`W literal 19619 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 G?EeA8BmKYt diff --git a/src/main/resources/assets/ironchest/textures/model/shulker/black/shulker_black_obsidian.png b/src/main/resources/assets/ironchest/textures/model/shulker/black/shulker_black_obsidian.png index 79bc61f251697c906fdfb54a387ffff0a67349c2..fab113bb25ec6f3ad328d8139855440da68a37c5 100644 GIT binary patch delta 1719 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