From d17f020fc5b675487dd236d92c290b534764af9d Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Thu, 20 Sep 2018 12:59:34 -0400 Subject: [PATCH] fixed a lot of things getting ready to push overwrite master-1.12 --- kfc/gradle.properties | 2 +- kfc/nbtCrucible-To-Dos.md | 8 +- .../java/nmd/primal/forgecraft/ModInfo.java | 2 +- .../primal/forgecraft/blocks/CastingForm.java | 51 ++- .../blocks/Crucibles/NBTCrucible.java | 30 +- .../primal/forgecraft/compat/JEI/ModJEI.java | 27 +- .../compat/JEI/anvil/AnvilRecipeCategory.java | 1 - .../JEI/casting/CastingRecipeCategory.java | 117 ++++++ .../JEI/casting/CastingRecipeChecker.java | 21 ++ .../JEI/casting/CastingRecipeHandler.java | 18 + .../JEI/casting/CastingRecipeWrapper.java | 56 +++ .../JEI/crucible/CrucibleRecipeCategory.java | 3 +- .../JEI/crucible/CrucibleRecipeWrapper.java | 2 +- .../compat/JEI/forge/ForgeRecipeCategory.java | 85 +++++ .../compat/JEI/forge/ForgeRecipeChecker.java | 21 ++ .../compat/JEI/forge/ForgeRecipeHandler.java | 19 + .../compat/JEI/forge/ForgeRecipeWrapper.java | 58 +++ .../forgecraft/crafting/CastingCrafting.java | 21 +- .../forgecraft/crafting/ForgeCrafting.java | 6 +- .../primal/forgecraft/init/ModCrafting.java | 335 +++++++++++++----- .../nmd/primal/forgecraft/init/ModItems.java | 10 +- .../forgecraft/items/BaseMultiItem.java | 8 +- .../primal/forgecraft/tiles/TileForge.java | 53 +-- .../forgecraft/tiles/TileNBTCrucible.java | 18 +- .../forgecraft/util/CastingFormHandler.java | 4 +- .../trash/coolcleanironcrucible.json | 12 - .../blockstates/trash/coolironcrucible.json | 12 - .../blockstates/trash/coolsteelcrucible.json | 12 - .../blockstates/trash/coolwootzcrucible.json | 12 - .../trash/failedcleanironcrucible.json | 12 - .../trash/failedcleanironcruciblehot.json | 12 - .../blockstates/trash/failedironcrucible.json | 12 - .../trash/failedironcruciblehot.json | 12 - .../trash/failedsteelcrucible.json | 12 - .../trash/failedsteelcruciblehot.json | 12 - .../trash/failedwootzcrucible.json | 12 - .../trash/failedwootzcruciblehot.json | 12 - .../blockstates/trash/hotbronzecrucible.json | 13 - .../trash/hotbronzecrucible_diamond.json | 13 - .../trash/hotbronzecrucible_emerald.json | 13 - .../trash/hotbronzecrucible_lapis.json | 13 - .../trash/hotbronzecrucible_redstone.json | 13 - .../trash/hotcleanironcrucible.json | 12 - .../trash/hotcookedbronzecrucible.json | 13 - .../hotcookedbronzecrucible_diamond.json | 13 - .../hotcookedbronzecrucible_emerald.json | 13 - .../trash/hotcookedbronzecrucible_lapis.json | 13 - .../hotcookedbronzecrucible_redstone.json | 13 - .../trash/hotcookedcleanironcrucible.json | 12 - .../trash/hotcookedironcrucible.json | 12 - .../trash/hotcookedsteelcrucible.json | 12 - .../trash/hotcookedwootzcrucible.json | 12 - .../blockstates/trash/hotironcrucible.json | 12 - .../blockstates/trash/hotsteelcrucible.json | 12 - .../blockstates/trash/hotwootzcrucible.json | 12 - .../blockstates/trash/ironball.json | 26 -- .../blockstates/trash/ironchunk.json | 26 -- .../blockstates/trash/ironcleanball.json | 26 -- .../blockstates/trash/ironcleanchunk.json | 26 -- .../blockstates/trash/rawbronzecrucible.json | 13 - .../trash/rawbronzecrucible_diamond.json | 13 - .../trash/rawbronzecrucible_emerald.json | 13 - .../trash/rawbronzecrucible_lapis.json | 13 - .../trash/rawbronzecrucible_redstone.json | 13 - .../trash/rawcleanironcrucible.json | 12 - .../blockstates/trash/rawironcrucible.json | 12 - .../blockstates/trash/rawsteelcrucible.json | 12 - .../blockstates/trash/rawwootzcrucible.json | 12 - .../blockstates/trash/steelball.json | 26 -- .../blockstates/trash/steelchunk.json | 26 -- .../blockstates/trash/wootzball.json | 26 -- .../blockstates/trash/wootzchunk.json | 26 -- .../assets/forgecraft/lang/en_us.lang | 13 +- .../forgecraft/models/item/bronzechunk.json | 8 +- .../models/item/bronzeingotball.json | 4 +- .../models/item/trash/castingmud2.json | 53 --- .../item/trash/coolcleanironcrucible.json | 8 - .../models/item/trash/coolironcrucible.json | 8 - .../models/item/trash/coolsteelcrucible.json | 8 - .../models/item/trash/coolwootzcrucible.json | 8 - .../models/item/trash/emptycrucible.json | 8 - .../item/trash/emptycruciblecracked.json | 8 - .../item/trash/emptycruciblecrackedhot.json | 8 - .../models/item/trash/emptycruciblehot.json | 8 - .../item/trash/failedcleanironcrucible.json | 8 - .../trash/failedcleanironcruciblehot.json | 8 - .../models/item/trash/failedironcrucible.json | 8 - .../item/trash/failedironcruciblehot.json | 8 - .../item/trash/failedsteelcrucible.json | 8 - .../item/trash/failedsteelcruciblehot.json | 8 - .../item/trash/failedwootzcrucible.json | 8 - .../item/trash/failedwootzcruciblehot.json | 8 - .../models/item/trash/hotbronzecrucible.json | 9 - .../item/trash/hotbronzecrucible_diamond.json | 9 - .../item/trash/hotbronzecrucible_emerald.json | 9 - .../item/trash/hotbronzecrucible_lapis.json | 9 - .../trash/hotbronzecrucible_redstone.json | 9 - .../item/trash/hotcleanironcrucible.json | 8 - .../item/trash/hotcookedbronzecrucible.json | 9 - .../hotcookedbronzecrucible_diamond.json | 9 - .../hotcookedbronzecrucible_emerald.json | 9 - .../trash/hotcookedbronzecrucible_lapis.json | 9 - .../hotcookedbronzecrucible_redstone.json | 9 - .../trash/hotcookedcleanironcrucible.json | 8 - .../item/trash/hotcookedironcrucible.json | 8 - .../item/trash/hotcookedsteelcrucible.json | 8 - .../item/trash/hotcookedwootzcrucible.json | 8 - .../models/item/trash/hotironcrucible.json | 8 - .../models/item/trash/hotsteelcrucible.json | 8 - .../models/item/trash/hotwootzcrucible.json | 8 - .../models/item/trash/ironchunkhot.json | 8 - .../models/item/trash/ironcleanball.json | 8 - .../models/item/trash/ironcleanchunk.json | 8 - .../models/item/trash/ironcleanchunkhot.json | 8 - .../models/item/trash/ironcleaningotball.json | 11 - .../item/trash/ironcleaningotballhot.json | 8 - .../models/item/trash/rawbronzecrucible.json | 9 - .../item/trash/rawbronzecrucible_diamond.json | 9 - .../item/trash/rawbronzecrucible_emerald.json | 9 - .../item/trash/rawbronzecrucible_lapis.json | 9 - .../trash/rawbronzecrucible_redstone.json | 9 - .../item/trash/rawcleanironcrucible.json | 8 - .../models/item/trash/rawironcrucible.json | 8 - .../models/item/trash/rawsteelcrucible.json | 8 - .../models/item/trash/rawwootzcrucible.json | 8 - .../models/item/trash/steelball.json | 8 - .../models/item/trash/steelchunk.json | 8 - .../models/item/trash/steelchunkhot.json | 8 - .../models/item/trash/steelingotballhot.json | 8 - .../models/item/trash/stonetongs_axe_hot.json | 10 - .../models/item/trash/stonetongs_chunk.json | 10 - .../trash/stonetongs_cleaniron_axe_hot.json | 10 - .../trash/stonetongs_cleaniron_hoe_hot.json | 10 - .../stonetongs_cleaniron_pickaxe_hot.json | 10 - .../stonetongs_cleaniron_shovel_hot.json | 10 - .../item/trash/stonetongs_cleanironchunk.json | 10 - .../item/trash/stonetongs_cleanironingot.json | 10 - .../models/item/trash/stonetongs_hoe_hot.json | 10 - .../trash/stonetongs_hotbronze_diamond.json | 11 - .../trash/stonetongs_hotbronze_emerald.json | 11 - .../trash/stonetongs_hotbronze_lapis.json | 11 - .../trash/stonetongs_hotbronze_redstone.json | 11 - .../trash/stonetongs_hotbronzecooked.json | 11 - .../stonetongs_hotbronzecooked_diamond.json | 11 - .../stonetongs_hotbronzecooked_emerald.json | 11 - .../stonetongs_hotbronzecooked_lapis.json | 11 - .../stonetongs_hotbronzecooked_redstone.json | 11 - .../item/trash/stonetongs_hotcleaniron.json | 10 - .../trash/stonetongs_hotcleanironcooked.json | 10 - .../trash/stonetongs_hotcleanironfailed.json | 10 - .../models/item/trash/stonetongs_hotiron.json | 257 -------------- .../item/trash/stonetongs_hotironcooked.json | 10 - .../item/trash/stonetongs_hotironfailed.json | 10 - .../item/trash/stonetongs_hotsteel.json | 10 - .../item/trash/stonetongs_hotsteelcooked.json | 10 - .../item/trash/stonetongs_hotsteelfailed.json | 10 - .../item/trash/stonetongs_pickaxe_hot.json | 10 - .../item/trash/stonetongs_shovel_hot.json | 10 - .../item/trash/stonetongs_steel_axe_hot.json | 10 - .../item/trash/stonetongs_steel_hoe_hot.json | 10 - .../trash/stonetongs_steel_pickaxe_hot.json | 10 - .../trash/stonetongs_steel_shovel_hot.json | 10 - .../item/trash/stonetongs_steelchunk.json | 10 - .../item/trash/stonetongs_steelingot.json | 10 - .../models/item/trash/testnbtcrucible.json | 3 - .../models/item/trash/wootzball_delete.json | 8 - .../item/trash/wootzballhot_delete.json | 8 - .../models/item/trash/wootzchunk_delete.json | 8 - .../item/trash/wootzchunkhot_delete.json | 8 - .../forgecraft/models/item/wootzgladius.json | 293 +++++++++++++++ .../models/item/wootzlongsword.json | 10 + .../forgecraft/models/item/wootzslayer.json | 10 + .../assets/forgecraft/textures/Thumbs.db | Bin 4096 -> 0 bytes .../{items => blocks}/bronze_block.png | Bin .../forgecraft/textures/blocks/clay.png | Bin 692 -> 705 bytes .../textures/blocks/wootz_ingot_dark.png | Bin 0 -> 789 bytes .../textures/blocks/wootz_ingot_light.png | Bin 0 -> 859 bytes .../forgecraft/textures/gui/jei/casting.png | Bin 0 -> 781 bytes .../forgecraft/textures/gui/jei/crucible.png | Bin 1055 -> 1026 bytes .../forgecraft/textures/gui/jei/forging.png | Bin 0 -> 908 bytes kfc/src/main/resources/mcmod.info | 2 +- 181 files changed, 1121 insertions(+), 2022 deletions(-) create mode 100644 kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeCategory.java create mode 100644 kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeChecker.java create mode 100644 kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeHandler.java create mode 100644 kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeWrapper.java create mode 100644 kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeCategory.java create mode 100644 kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeChecker.java create mode 100644 kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeHandler.java create mode 100644 kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeWrapper.java delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolcleanironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolsteelcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolwootzcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedcleanironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedcleanironcruciblehot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedironcruciblehot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedsteelcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedsteelcruciblehot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedwootzcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedwootzcruciblehot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_diamond.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_emerald.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_lapis.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_redstone.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcleanironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_diamond.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_emerald.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_lapis.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_redstone.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedcleanironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedsteelcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedwootzcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotsteelcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotwootzcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironball.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironchunk.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironcleanball.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironcleanchunk.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_diamond.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_emerald.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_lapis.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_redstone.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawcleanironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawsteelcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawwootzcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/steelball.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/steelchunk.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/wootzball.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/trash/wootzchunk.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/castingmud2.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/coolcleanironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/coolironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/coolsteelcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/coolwootzcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblecracked.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblecrackedhot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblehot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/failedcleanironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/failedcleanironcruciblehot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/failedironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/failedironcruciblehot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/failedsteelcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/failedsteelcruciblehot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/failedwootzcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/failedwootzcruciblehot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_diamond.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_emerald.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_lapis.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_redstone.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcleanironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_diamond.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_emerald.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_lapis.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_redstone.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedcleanironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedsteelcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedwootzcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotsteelcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/hotwootzcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/ironchunkhot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanball.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunk.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunkhot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotball.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotballhot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_diamond.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_emerald.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_lapis.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_redstone.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/rawcleanironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/rawironcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/rawsteelcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/rawwootzcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/steelball.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunk.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunkhot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/steelingotballhot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_axe_hot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_chunk.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_axe_hot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_hoe_hot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_pickaxe_hot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_shovel_hot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleanironchunk.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleanironingot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hoe_hot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_diamond.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_emerald.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_lapis.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_redstone.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_diamond.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_emerald.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_lapis.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_redstone.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleaniron.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleanironcooked.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleanironfailed.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotiron.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotironcooked.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotironfailed.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteel.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteelcooked.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteelfailed.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_pickaxe_hot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_shovel_hot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_axe_hot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_hoe_hot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_pickaxe_hot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_shovel_hot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steelchunk.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steelingot.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/testnbtcrucible.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzball_delete.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzballhot_delete.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzchunk_delete.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzchunkhot_delete.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/wootzgladius.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/wootzlongsword.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/wootzslayer.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/textures/Thumbs.db rename kfc/src/main/resources/assets/forgecraft/textures/{items => blocks}/bronze_block.png (100%) create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/blocks/wootz_ingot_dark.png create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/blocks/wootz_ingot_light.png create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/gui/jei/casting.png create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/gui/jei/forging.png diff --git a/kfc/gradle.properties b/kfc/gradle.properties index 759f2fb7..c685ec98 100644 --- a/kfc/gradle.properties +++ b/kfc/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.5.2 +mod_version=1.6.02 forge_version=14.23.4.2744 mcp_mappings=snapshot_20171003 mc_version=1.12.2 diff --git a/kfc/nbtCrucible-To-Dos.md b/kfc/nbtCrucible-To-Dos.md index a0efadb6..54d2579c 100644 --- a/kfc/nbtCrucible-To-Dos.md +++ b/kfc/nbtCrucible-To-Dos.md @@ -13,11 +13,13 @@ you'll need to update the annotation @GameRegistry.ObjectHolder(ModInfo.MOD_ID) - [ ] Leather Helmet Inventory Model - [ ] Config Usage -- [ ] Bronze Plate Cast - [ ] Craft Tweaker Support -- [ ] JEI Support - [ ] Apply Forge turn off logic to Bloomery -- [ ] Update SoftCrucible Model +- [ ] Copper Tools +- [ ] Config for lowering fortune multiplier +- [x] Bronze Plate Cast +- [x] JEI Support +- [x] Update SoftCrucible Model - [x] Crucibles were returning input ingredients even after cooked - [x] Hot Crucible doesn't have hot molten layer - [x] Can't add upgrades to the anvil diff --git a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java index ab438e00..2ce4bd0f 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -21,7 +21,7 @@ public class ModInfo { //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.5.2"; + public static final String MOD_VERSION = "1.6.02"; public static final String MC_VERSIONS = "[1.12.0, 1.13.0)"; public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.6.69,);"; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java index 57c3240c..196acf60 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java @@ -11,6 +11,7 @@ import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; @@ -34,6 +35,7 @@ import nmd.primal.forgecraft.items.parts.BronzeToolPart; import nmd.primal.forgecraft.items.parts.ToolPart; import nmd.primal.forgecraft.tiles.TileCastingForm; import nmd.primal.forgecraft.util.CastingFormHandler; +import nmd.primal.forgecraft.util.ToolNBT; import java.util.Random; @@ -42,7 +44,7 @@ import static nmd.primal.core.api.PrimalAPI.randomCheck; /** * Created by mminaie on 6/19/17. */ -public class CastingForm extends CustomContainerFacing implements CastingFormHandler{ +public class CastingForm extends CustomContainerFacing implements CastingFormHandler, ToolNBT { protected static AxisAlignedBB bound = new AxisAlignedBB(0/16D, 0.0D, 0/16D, 16/16D, 3/16D, 16/16D); @@ -67,12 +69,13 @@ public class CastingForm extends CustomContainerFacing implements CastingFormHan SlottedTongs tongs = (SlottedTongs) pItem.getItem(); if(tongs.getSlotList().get(0).getItem().equals(Item.getItemFromBlock(ModBlocks.nbtCrucible))) { ItemStack tongsStack = tongs.getSlotList().get(0).copy(); + NBTTagCompound tag = tongsStack.getTagCompound().copy(); if(tag != null){ NonNullList ingList = NonNullList.withSize(5, ItemStack.EMPTY); NonNullList ingListEmpty = NonNullList.withSize(5, ItemStack.EMPTY); ItemStackHelper.loadAllItems(tag.getCompoundTag("BlockEntityTag"), ingList); - //getSubCompound("BlockEntityTag") + CrucibleCrafting recipe = CrucibleCrafting.getRecipe(ingList.get(0), ingList.get(1), ingList.get(2), ingList.get(3), ingList.get(4)); if(recipe != null){ if(tag.getCompoundTag("BlockEntityTag").getBoolean("status") && tag.getCompoundTag("BlockEntityTag").getInteger("hot") == 15){ @@ -80,14 +83,44 @@ public class CastingForm extends CustomContainerFacing implements CastingFormHan for(int i=0; i<25; i++){ tempArray[i] = tile.getSlotStack(i).getItem(); } - CastingCrafting casting = CastingCrafting.getRecipe(tempArray); + CastingCrafting casting = CastingCrafting.getRecipe(tongsStack, tempArray); if(casting != null){ - CommonUtils.spawnItemEntityFromWorld(world, pos, casting.getOutput()); - tag.getCompoundTag("BlockEntityTag").setBoolean("status", false); - tag.getCompoundTag("BlockEntityTag").setInteger("hot", 0); - ItemStackHelper.loadAllItems(tag, ingListEmpty); - tongs.getSlotList().get(0).setTagCompound(tag); - return true; + NBTTagCompound tagOutput = recipe.getDropsCooked().getTagCompound().copy(); + if(tagOutput != null) { + ItemStack dropStack = casting.getOutput(); + dropStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = new NBTTagCompound(); + + dropStack.getTagCompound().setTag("tags", tags); + setHot(dropStack, false); + if (tagOutput.getString("upgrades") == "emerald") { + setEmerald(dropStack, true); + } else { + setEmerald(dropStack, false); + } + if (tagOutput.getString("upgrades") == "diamond") { + setDiamondLevel(dropStack, 1); + } else { + setDiamondLevel(dropStack, 0); + } + if (tagOutput.getString("upgrades") == "redstone") { + setRedstoneLevel(dropStack, 1); + } else { + setRedstoneLevel(dropStack, 0); + } + if (tagOutput.getString("upgrades") == "lapis") { + setLapisLevel(dropStack, 1); + } else { + setLapisLevel(dropStack, 0); + } + setModifiers(dropStack, 1); + CommonUtils.spawnItemEntityFromWorld(world, pos, dropStack); + tag.getCompoundTag("BlockEntityTag").setBoolean("status", false); + tag.getCompoundTag("BlockEntityTag").setInteger("hot", 0); + ItemStackHelper.saveAllItems(tag.getCompoundTag("BlockEntityTag"), ingListEmpty); + tongs.getSlotList().get(0).setTagCompound(tag); + return true; + } } } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java index 4d7c4620..db2d8f44 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java @@ -7,6 +7,7 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -108,7 +109,6 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { world.setBlockState(pos, state.withProperty(PrimalAPI.States.LAYERS, 0), 2); tile.setHot(0); tile.setStatus(false); - //tile.setDrops(ItemStack.EMPTY); tile.update(); tile.markDirty(); return true; @@ -119,12 +119,17 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { /**REMOVE COOKED ITEM**/ if (player.isSneaking() == true) { if (pItem.isEmpty()) { - if (tile.getStatus()) { - PlayerHelper.spawnItemOnPlayer(world, player, tile.getDrops()); + if (tile.getStatus() && tile.getHot()==6) { + ItemStack dropStack = tile.getDrops().copy(); world.setBlockState(pos, state.withProperty(PrimalAPI.States.LAYERS, 0), 2); tile.setHot(0); tile.setStatus(false); - //tile.setDrops(ItemStack.EMPTY); + tile.setDrops(ItemStack.EMPTY); + tile.ingList.clear(); + //PlayerHelper.spawnItemOnPlayer(world, player, dropStack); + //PlayerHelper.spawnItemOnGround(world, player.getPosition(), dropStack); + EntityItem entityitem = new EntityItem(world, player.posX, player.posY, player.posZ, dropStack); // ? player.posY - 1.0D + world.spawnEntity(entityitem); tile.update(); tile.markDirty(); return true; @@ -160,7 +165,8 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileNBTCrucible) { PlayerHelper.playerTakeItem(world, pos, EnumFacing.DOWN, player, player.getActiveHand(), this.getCrucibleItem(world, pos, state, player)); - return world.setBlockState(pos, this.getReplacementBlock(world, pos, state)); + world.setBlockState(pos, this.getReplacementBlock(world, pos, state)); + return true; } } return false; @@ -173,8 +179,18 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { TileNBTCrucible tile = (TileNBTCrucible) world.getTileEntity(pos); ItemStack pItem = player.inventory.getCurrentItem(); CrucibleCrafting recipe = CrucibleCrafting.getRecipe(tile.ingList.get(0), tile.ingList.get(1), tile.ingList.get(2), tile.ingList.get(3), tile.ingList.get(4)); - if(recipe != null && tile.getStatus() && tile.getHot() != 15){ - PlayerHelper.spawnItemOnPlayer(world, player, tile.getDrops()); + if(recipe != null && tile.getStatus() && tile.getHot() == 6){ + if(tile.getDrops() != null) { + PlayerHelper.spawnItemOnPlayer(world, player, tile.getDrops()); + } else { + PlayerHelper.spawnItemOnPlayer(world, player, recipe.getDropsCooked()); + } + } + if(recipe != null && tile.getStatus() && tile.getHot() == 15){ + PlayerHelper.spawnItemOnPlayer(world, player, recipe.getDropsRaw()); + } + if(recipe != null && tile.getStatus() && tile.getHot() != 15 && tile.getHot() != 6){ + PlayerHelper.spawnItemOnPlayer(world, player, tile.ingList); } } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/ModJEI.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/ModJEI.java index 841bca7b..e3307239 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/ModJEI.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/ModJEI.java @@ -5,15 +5,22 @@ import mezz.jei.api.gui.ICraftingGridHelper; import mezz.jei.api.recipe.IRecipeCategoryRegistration; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.OreIngredient; import nmd.primal.forgecraft.compat.JEI.anvil.AnvilRecipeCategory; import nmd.primal.forgecraft.compat.JEI.anvil.AnvilRecipeChecker; import nmd.primal.forgecraft.compat.JEI.anvil.AnvilRecipeHandler; +import nmd.primal.forgecraft.compat.JEI.casting.CastingRecipeCategory; +import nmd.primal.forgecraft.compat.JEI.casting.CastingRecipeChecker; +import nmd.primal.forgecraft.compat.JEI.casting.CastingRecipeHandler; import nmd.primal.forgecraft.compat.JEI.crucible.CrucibleRecipeCategory; import nmd.primal.forgecraft.compat.JEI.crucible.CrucibleRecipeChecker; import nmd.primal.forgecraft.compat.JEI.crucible.CrucibleRecipeHandler; +import nmd.primal.forgecraft.compat.JEI.forge.ForgeRecipeCategory; +import nmd.primal.forgecraft.compat.JEI.forge.ForgeRecipeChecker; +import nmd.primal.forgecraft.compat.JEI.forge.ForgeRecipeHandler; import nmd.primal.forgecraft.crafting.AnvilCrafting; +import nmd.primal.forgecraft.crafting.CastingCrafting; import nmd.primal.forgecraft.crafting.CrucibleCrafting; +import nmd.primal.forgecraft.crafting.ForgeCrafting; import nmd.primal.forgecraft.init.ModBlocks; import javax.annotation.Nonnull; @@ -40,8 +47,11 @@ public class ModJEI implements IModPlugin // // Recipe Categories // + registry.addRecipeCategories(new ForgeRecipeCategory(guiHelper)); registry.addRecipeCategories(new CrucibleRecipeCategory(guiHelper)); registry.addRecipeCategories(new AnvilRecipeCategory(guiHelper)); + registry.addRecipeCategories(new CastingRecipeCategory(guiHelper)); + } @Override @@ -54,6 +64,12 @@ public class ModJEI implements IModPlugin // Recipes // ***************************************************************************** // // + // Forging + // + registry.handleRecipes(ForgeCrafting.class, new ForgeRecipeHandler(), ForgeRecipeCategory.CATEGORY); + registry.addRecipes(ForgeRecipeChecker.getRecipes(), ForgeRecipeCategory.CATEGORY); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.forge_brick), ForgeRecipeCategory.CATEGORY); + // // Crucible // registry.handleRecipes(CrucibleCrafting.class, new CrucibleRecipeHandler(), CrucibleRecipeCategory.CATEGORY); @@ -65,6 +81,13 @@ public class ModJEI implements IModPlugin registry.handleRecipes(AnvilCrafting.class, new AnvilRecipeHandler(), AnvilRecipeCategory.CATEGORY); registry.addRecipes(AnvilRecipeChecker.getRecipes(), AnvilRecipeCategory.CATEGORY); registry.addRecipeCatalyst(new ItemStack(ModBlocks.stoneanvil), AnvilRecipeCategory.CATEGORY); + // + // Casting + // + registry.handleRecipes(CastingCrafting.class, new CastingRecipeHandler(), CastingRecipeCategory.CATEGORY); + registry.addRecipes(CastingRecipeChecker.getRecipes(), CastingRecipeCategory.CATEGORY); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.castingform), CastingRecipeCategory.CATEGORY); + @@ -75,7 +98,7 @@ public class ModJEI implements IModPlugin //registry.addIngredientInfo(ItemStack.EMPTY, ItemStack.class, "jei.info.forgecraft.crucible"); registry.addIngredientInfo(new ItemStack(ModBlocks.nbtCrucible, 1, OreDictionary.WILDCARD_VALUE), ItemStack.class, "jei.info.forgecraft.crucible"); //registry.addIngredientInfo(new OreIngredient("oreIron"), OreIngredient.class, "jei.info.forgecraft.oreiron"); - + registry.addIngredientInfo(new ItemStack(ModBlocks.castingform, 1, OreDictionary.WILDCARD_VALUE), ItemStack.class, "jei.info.forgecraft.casting"); registry.addIngredientInfo(new ItemStack(ModBlocks.stoneanvil, 1, OreDictionary.WILDCARD_VALUE), ItemStack.class, "jei.info.forgecraft.anvil"); } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java index c820093c..9bf0c8ba 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java @@ -12,7 +12,6 @@ import net.minecraft.util.ResourceLocation; import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.compat.JEI.AbstractCategory; -import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; import javax.annotation.Nonnull; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeCategory.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeCategory.java new file mode 100644 index 00000000..0d39de00 --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeCategory.java @@ -0,0 +1,117 @@ +package nmd.primal.forgecraft.compat.JEI.casting; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import nmd.primal.core.common.helper.CommonUtils; +import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.compat.JEI.AbstractCategory; +import nmd.primal.forgecraft.init.ModItems; + +import javax.annotation.Nonnull; + +/** + * Created by mminaie on 9/16/18. + */ +public class CastingRecipeCategory extends AbstractCategory +{ + public static String CATEGORY = CommonUtils.prefix("casting"); + + private static ResourceLocation gui_background = new ResourceLocation(ModInfo.MOD_ID,"textures/gui/jei/casting.png"); + private final IDrawable background; + + public CastingRecipeCategory(IGuiHelper guiHelper) + { + //background = guiHelper.createDrawable(gui_background, 0, 0, 134, 144, 0, 0, 0, 0); + background = guiHelper.createDrawable(gui_background, 0,0,256,96); + } + + @Nonnull + @Override + public String getUid() + { + return CATEGORY; + } + + @Nonnull + @Override + public String getTitle() + { + return I18n.format("jei.category.forgecraft.casting"); + } + + @Nonnull + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void drawExtras(@Nonnull Minecraft minecraft) + { + //progress.draw(minecraft, 67, 18); + } + + @Override + public void setRecipe(IRecipeLayout layout, CastingRecipeWrapper recipe, IIngredients ingredients) + { + IGuiItemStackGroup items = layout.getItemStacks(); + + /***INPUTS***/ + items.init(0, true, 1, 1); + items.init(1, true, 20, 1); + items.init(2, true, 39, 1); + items.init(3, true, 58, 1); + items.init(4, true, 77, 1); + + items.init(5, true, 1, 20); + items.init(6, true, 20, 20); + items.init(7, true, 39, 20); + items.init(8, true, 58, 20); + items.init(9, true, 77, 20); + + items.init(10, true, 1, 39); + items.init(11, true, 20, 39); + items.init(12, true, 39, 39); + items.init(13, true, 58, 39); + items.init(14, true, 77, 39); + + items.init(15, true, 1, 58); + items.init(16, true, 20, 58); + items.init(17, true, 39, 58); + items.init(18, true, 58, 58); + items.init(19, true, 77, 58); + + items.init(20, true, 1, 77); + items.init(21, true, 20, 77); + items.init(22, true, 39, 77); + items.init(23, true, 58, 77); + items.init(24, true, 77, 77); + + //items.set(0, recipe.getIngredient(0)); + + for(int i =0; i < 25; i++){ + items.set(i, recipe.getIngredient(i)); + } + + /***OUTPUTS***/ + items.init(26, false, 133, 77); + items.set(26, recipe.output); + + /***EXTRAS***/ + //items.init(26, false, 105, 28); + //ItemStack hammerStack = new ItemStack(ModItems.forgehammer, 1); + //items.set(26, hammerStack); + + //items.init(7, false, 58, 96); + //ItemStack bloomeryStack = new ItemStack(ModBlocks.bloomery_brick, 1, 0); + //items.set(7, bloomeryStack); + } +} \ No newline at end of file diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeChecker.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeChecker.java new file mode 100644 index 00000000..7fc94059 --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeChecker.java @@ -0,0 +1,21 @@ +package nmd.primal.forgecraft.compat.JEI.casting; + +import nmd.primal.forgecraft.crafting.AnvilCrafting; +import nmd.primal.forgecraft.crafting.CastingCrafting; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by mminaie on 9/16/18. + */ +public class CastingRecipeChecker { + + public static List getRecipes() { + List recipes = new ArrayList<>(); + for (CastingCrafting recipe : CastingCrafting.getCastingRecipes()) { + recipes.add(recipe); + } + return recipes; + } +} diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeHandler.java new file mode 100644 index 00000000..e32769de --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeHandler.java @@ -0,0 +1,18 @@ +package nmd.primal.forgecraft.compat.JEI.casting; + +import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.recipe.IRecipeWrapperFactory; +import nmd.primal.forgecraft.crafting.CastingCrafting; + +import javax.annotation.Nonnull; + +/** + * Created by mminaie on 9/17/18. + */ +public class CastingRecipeHandler implements IRecipeWrapperFactory { + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull CastingCrafting recipe) { + return new CastingRecipeWrapper(recipe); + } +} \ No newline at end of file diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeWrapper.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeWrapper.java new file mode 100644 index 00000000..28666191 --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeWrapper.java @@ -0,0 +1,56 @@ +package nmd.primal.forgecraft.compat.JEI.casting; + +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import nmd.primal.forgecraft.crafting.AnvilCrafting; +import nmd.primal.forgecraft.crafting.CastingCrafting; + +import javax.annotation.Nonnull; +import java.awt.*; + +/** + * Created by mminaie on 9/16/18. + */ +public class CastingRecipeWrapper implements IRecipeWrapper { + + protected final CastingCrafting recipe; + + protected Item[] input; + protected ItemStack source; + protected ItemStack output; + + public CastingRecipeWrapper(CastingCrafting recipe) { + + this.recipe = recipe; + this.input = recipe.getInput(); + this.output = recipe.getOutput(); + this.source =recipe.getSource(); + } + + + @Override + public void getIngredients(IIngredients ingredients) { + + for(int i =0; i < 25; i++){ + //if(this.input[i] != new ItemStack(Items.AIR, 1) { + ingredients.setInput(ItemStack.class, this.input[i]); + //} + } + ingredients.setOutput(ItemStack.class, this.output); + } + + public ItemStack getIngredient(int a){ + return new ItemStack(input[a], 1); + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) + { + String tempString = new String("To an empty crucible add: " + recipe.getSource().getDisplayName() + ". For details reference the appropriate crucible recipe. Pick up the hot crucible with Stonetongs and right click your casting block."); + minecraft.fontRenderer.drawSplitString(tempString, 97, 0, 150, Color.black.getRGB()); + } + +} diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeCategory.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeCategory.java index 1c936617..9de58792 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeCategory.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeCategory.java @@ -7,9 +7,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import nmd.primal.core.common.compat.jei.AbstractCategory; + import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.compat.JEI.AbstractCategory; import nmd.primal.forgecraft.init.ModBlocks; import javax.annotation.Nonnull; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeWrapper.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeWrapper.java index 0b1aceac..08a25e1f 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeWrapper.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeWrapper.java @@ -82,7 +82,7 @@ public class CrucibleRecipeWrapper implements IRecipeWrapper @Override public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { - minecraft.fontRenderer.drawString(String.valueOf(cookTemp), 58, 120, Color.red.getRGB()); + minecraft.fontRenderer.drawString(String.valueOf(cookTemp) + "\u00b0", 58, 120, Color.red.getRGB()); minecraft.fontRenderer.drawString(String.valueOf(cookTime + " ticks"), 58, 86, Color.blue.getRGB()); minecraft.fontRenderer.drawString(recipe.getDropsCooked().getDisplayName() + " Recipe", 20, 5, Color.black.getRGB()); } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeCategory.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeCategory.java new file mode 100644 index 00000000..382dd9c4 --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeCategory.java @@ -0,0 +1,85 @@ +package nmd.primal.forgecraft.compat.JEI.forge; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import nmd.primal.core.common.helper.CommonUtils; +import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.compat.JEI.AbstractCategory; +import nmd.primal.forgecraft.init.ModBlocks; + +import javax.annotation.Nonnull; + +/** + * Created by mminaie on 9/16/18. + */ +public class ForgeRecipeCategory extends AbstractCategory +{ + public static String CATEGORY = CommonUtils.prefix("forging"); + + private static ResourceLocation gui_background = new ResourceLocation(ModInfo.MOD_ID,"textures/gui/jei/forging.png"); + private final IDrawable background; + + public ForgeRecipeCategory(IGuiHelper guiHelper) + { + //background = guiHelper.createDrawable(gui_background, 0, 0, 134, 144, 0, 0, 0, 0); + background = guiHelper.createDrawable(gui_background, 0,0,77,58); + } + + @Nonnull + @Override + public String getUid() + { + return CATEGORY; + } + + @Nonnull + @Override + public String getTitle() + { + return I18n.format("jei.category.forgecraft.forging"); + } + + @Nonnull + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void drawExtras(@Nonnull Minecraft minecraft) + { + //progress.draw(minecraft, 67, 18); + } + + @Override + public void setRecipe(IRecipeLayout layout, ForgeRecipeWrapper recipe, IIngredients ingredients) + { + IGuiItemStackGroup items = layout.getItemStacks(); + + /***INPUTS***/ + items.init(0, true, 1, 1); + items.set(0, new ItemStack(recipe.input, 1)); + + /***OUTPUTS***/ + items.init(1, false, 58, 20); + items.set(1, recipe.output); + + /***EXTRAS***/ + items.init(3, false, 1, 20); + ItemStack forgeStack = new ItemStack(Item.getItemFromBlock(ModBlocks.forge_brick), 1); + items.set(3, forgeStack); + + //items.init(7, false, 58, 96); + //ItemStack bloomeryStack = new ItemStack(ModBlocks.bloomery_brick, 1, 0); + //items.set(7, bloomeryStack); + } +} \ No newline at end of file diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeChecker.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeChecker.java new file mode 100644 index 00000000..a6d63eaa --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeChecker.java @@ -0,0 +1,21 @@ +package nmd.primal.forgecraft.compat.JEI.forge; + +import nmd.primal.forgecraft.crafting.CastingCrafting; +import nmd.primal.forgecraft.crafting.ForgeCrafting; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by mminaie on 9/16/18. + */ +public class ForgeRecipeChecker { + + public static List getRecipes() { + List recipes = new ArrayList<>(); + for (ForgeCrafting recipe : ForgeCrafting.getForgeRecipes()) { + recipes.add(recipe); + } + return recipes; + } +} diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeHandler.java new file mode 100644 index 00000000..41ab3bc1 --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeHandler.java @@ -0,0 +1,19 @@ +package nmd.primal.forgecraft.compat.JEI.forge; + +import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.recipe.IRecipeWrapperFactory; +import nmd.primal.forgecraft.crafting.CastingCrafting; +import nmd.primal.forgecraft.crafting.ForgeCrafting; + +import javax.annotation.Nonnull; + +/** + * Created by mminaie on 9/17/18. + */ +public class ForgeRecipeHandler implements IRecipeWrapperFactory { + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ForgeCrafting recipe) { + return new ForgeRecipeWrapper(recipe); + } +} \ No newline at end of file diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeWrapper.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeWrapper.java new file mode 100644 index 00000000..d5ddc274 --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeWrapper.java @@ -0,0 +1,58 @@ +package nmd.primal.forgecraft.compat.JEI.forge; + +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import nmd.primal.forgecraft.crafting.CastingCrafting; +import nmd.primal.forgecraft.crafting.ForgeCrafting; + +import javax.annotation.Nonnull; +import java.awt.*; + +/** + * Created by mminaie on 9/16/18. + */ +public class ForgeRecipeWrapper implements IRecipeWrapper { + + protected final ForgeCrafting recipe; + + protected Item input; + protected ItemStack output; + protected int heat_threshold; + protected int ideal_time; + protected int cooldown; + + public ForgeRecipeWrapper(ForgeCrafting recipe) { + + this.recipe = recipe; + this.input = recipe.getInput(); + this.output = recipe.getOutput(); + this.heat_threshold = recipe.getHeatThreshold(); + this.ideal_time = recipe.getIdealTime(); + this.cooldown = recipe.getCooldown(); + } + + + @Override + public void getIngredients(IIngredients ingredients) { + + ingredients.setInput(ItemStack.class, this.input); + ingredients.setOutput(ItemStack.class, this.output); + } + + public ItemStack getIngredient(){ + return new ItemStack(this.input, 1); + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) + { + //String tempString = new String("To an empty crucible add: " + recipe.getSource().getDisplayName() + ". For details reference the appropriate crucible recipe. Pick up the hot crucible with Stonetongs and right click your casting block."); + //minecraft.fontRenderer.drawSplitString(tempString, 97, 0, 150, Color.black.getRGB()); + minecraft.fontRenderer.drawString(String.valueOf(recipe.getHeatThreshold() + "\u00b0"), 24, 36, Color.red.getRGB()); + minecraft.fontRenderer.drawString(String.valueOf(recipe.getIdealTime()), 26, 13, Color.green.getRGB()); + } + +} diff --git a/kfc/src/main/java/nmd/primal/forgecraft/crafting/CastingCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/crafting/CastingCrafting.java index 5ad46f1f..a41a0906 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/crafting/CastingCrafting.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/crafting/CastingCrafting.java @@ -19,20 +19,27 @@ public class CastingCrafting { private Item[] input = new Item[25]; private ItemStack output; + public ItemStack getSource() { + return source; + } - public CastingCrafting(Item[] input, ItemStack output){ + private ItemStack source; + + + public CastingCrafting(ItemStack source, Item[] input, ItemStack output){ this.input = input; this.output = output; + this.source = source; } // ***************************************************************************** // // Recipe Methods // ***************************************************************************** // - public static void addRecipe(Item[] input, ItemStack output) + public static void addRecipe(ItemStack source, Item[] input, ItemStack output) { - castingRecipes.add(new CastingCrafting(input, output)); + castingRecipes.add(new CastingCrafting(source, input, output)); } public static ArrayList getCastingRecipes() { @@ -49,11 +56,13 @@ public class CastingCrafting { return false; } - public static CastingCrafting getRecipe(Item[] array) + public static CastingCrafting getRecipe(ItemStack source, Item[] array) { for(CastingCrafting recipe : castingRecipes) { - if (Arrays.equals(array, recipe.input)) - return recipe; + if (source.isItemEqualIgnoreDurability(source)) { + if (Arrays.equals(array, recipe.input)) + return recipe; + } } return null; } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/crafting/ForgeCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/crafting/ForgeCrafting.java index 21a8e14d..91948551 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/crafting/ForgeCrafting.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/crafting/ForgeCrafting.java @@ -10,7 +10,11 @@ import java.util.ArrayList; */ public class ForgeCrafting { - // ***************************************************************************** // + public static ArrayList getForgeRecipes() { + return forgeRecipes; + } + + // ***************************************************************************** // // Recipe Handler ForgeCrafting // ***************************************************************************** // private static ArrayList forgeRecipes = new ArrayList<>(); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index fffa9e33..a9f8d5cb 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -26,6 +26,95 @@ public class ModCrafting{ public static void register() { Random rand = new Random(); + ItemStack emptyAir = ItemStack.EMPTY; + + NBTTagCompound setHot = new NBTTagCompound(); + setHot.setBoolean("hot", true); + + ItemStack hotIronIngot = new ItemStack(ModItems.ironingotball, 1); + hotIronIngot.setTagCompound(setHot); + ItemStack hotCleanIronIngot = new ItemStack(ModItems.ironcleaningotball, 1); + hotCleanIronIngot.setTagCompound(setHot); + ItemStack hotSteelIngot = new ItemStack(ModItems.steelingotball, 1); + hotSteelIngot.setTagCompound(setHot); + ItemStack hotWootzIngot = new ItemStack(ModItems.wootzingotball, 1); + hotWootzIngot.setTagCompound(setHot); + + ItemStack hotChunk = new ItemStack( ModItems.wroughtironchunk, 1); + hotChunk.setTagCompound(setHot); + + ItemStack hotCleanChunk = new ItemStack(ModItems.ironcleanchunk, 1); + hotCleanChunk.setTagCompound(setHot); + + ItemStack hotSteelChunk = new ItemStack(ModItems.steelchunk, 1); + hotSteelChunk.setTagCompound(setHot); + + ItemStack hotWootzChunk = new ItemStack(ModItems.wootzchunk, 1); + hotWootzChunk.setTagCompound(setHot); + + ItemStack diamond = new ItemStack(Items.DIAMOND, 1); + ItemStack emerald = new ItemStack(Items.EMERALD, 1); + + ItemStack emeraldShard = new ItemStack(PrimalAPI.Items.EMERALD_KNAPP, 1); + ItemStack diamondShard = new ItemStack(PrimalAPI.Items.DIAMOND_KNAPP, 1); + ItemStack redstone = new ItemStack(Items.REDSTONE, 1); + ItemStack lapis = new ItemStack(Items.DYE, 1, 4); + + ItemStack pickaxehead = new ItemStack(ModItems.pickaxehead, 1); + ItemStack ironaxehead = new ItemStack(ModItems.ironaxehead, 1); + ItemStack ironshovelhead = new ItemStack(ModItems.ironshovelhead, 1); + ItemStack ironhoehead = new ItemStack(ModItems.ironhoehead, 1); + + ItemStack cleanpickaxehead = new ItemStack(ModItems.cleanironpickaxehead, 1); + ItemStack cleanaxehead = new ItemStack(ModItems.cleanironaxehead, 1); + ItemStack cleanshovelhead = new ItemStack(ModItems.cleanironshovelhead, 1); + ItemStack cleanhoehead = new ItemStack(ModItems.cleanironhoehead, 1); + + ItemStack steelpickaxehead = new ItemStack(ModItems.steelpickaxehead, 1); + ItemStack steelaxehead = new ItemStack(ModItems.steelaxehead, 1); + ItemStack steelshovelhead = new ItemStack(ModItems.steelshovelhead, 1); + ItemStack steelhoehead = new ItemStack(ModItems.steelhoehead, 1); + + ItemStack wootzpickaxehead = new ItemStack(ModItems.wootzpickaxehead, 1); + ItemStack wootzaxehead = new ItemStack(ModItems.wootzaxehead, 1); + ItemStack wootzshovelhead = new ItemStack(ModItems.wootzshovelhead, 1); + ItemStack wootzhoehead = new ItemStack(ModItems.wootzhoehead, 1); + + ItemStack hotpickaxehead = new ItemStack(ModItems.pickaxehead, 1); + hotpickaxehead.setTagCompound(setHot); + ItemStack hotironaxehead = new ItemStack(ModItems.ironaxehead, 1); + hotironaxehead.setTagCompound(setHot); + ItemStack hotironshovelhead = new ItemStack(ModItems.ironshovelhead, 1); + hotironshovelhead.setTagCompound(setHot); + ItemStack hotironhoehead = new ItemStack(ModItems.ironhoehead, 1); + hotironhoehead.setTagCompound(setHot); + + ItemStack hotcleanpickaxehead = new ItemStack(ModItems.cleanironpickaxehead, 1); + hotcleanpickaxehead.setTagCompound(setHot); + ItemStack hotcleanaxehead = new ItemStack(ModItems.cleanironaxehead, 1); + hotcleanaxehead.setTagCompound(setHot); + ItemStack hotcleanshovelhead = new ItemStack(ModItems.cleanironshovelhead, 1); + hotcleanshovelhead.setTagCompound(setHot); + ItemStack hotcleanhoehead = new ItemStack(ModItems.cleanironhoehead, 1); + hotcleanhoehead.setTagCompound(setHot); + + ItemStack hotsteelpickaxehead = new ItemStack(ModItems.steelpickaxehead, 1); + hotsteelpickaxehead.setTagCompound(setHot); + ItemStack hotsteelaxehead = new ItemStack(ModItems.steelaxehead, 1); + hotsteelaxehead.setTagCompound(setHot); + ItemStack hotsteelshovelhead = new ItemStack(ModItems.steelshovelhead, 1); + hotsteelshovelhead.setTagCompound(setHot); + ItemStack hotsteelhoehead = new ItemStack(ModItems.steelhoehead, 1); + hotsteelhoehead.setTagCompound(setHot); + + ItemStack hotwootzpickaxehead = new ItemStack(ModItems.wootzpickaxehead, 1); + hotwootzpickaxehead.setTagCompound(setHot); + ItemStack hotwootzaxehead = new ItemStack(ModItems.wootzaxehead, 1); + hotwootzaxehead.setTagCompound(setHot); + ItemStack hotwootzshovelhead = new ItemStack(ModItems.wootzshovelhead, 1); + hotwootzshovelhead.setTagCompound(setHot); + ItemStack hotwootzhoehead = new ItemStack(ModItems.wootzhoehead, 1); + hotwootzhoehead.setTagCompound(setHot); //RecipeHandler.addSmelting(ModItems.softcrucible, new ItemStack(ModBlocks.nbtCrucible, 1)); @@ -122,6 +211,18 @@ public class ModCrafting{ 100, 1000); + CrucibleCrafting.addRecipe( + new OreIngredient("ingotBronze"), + Ingredient.EMPTY, + Ingredient.EMPTY, + Ingredient.EMPTY, + Ingredient.EMPTY, + new ItemStack(PrimalAPI.Items.SLAG, 1), + defaultBronze, + 100, + 100, + 1000); + NBTTagCompound tag = new NBTTagCompound(); tag.setString("upgrades", "redstone"); ItemStack redBronze = new ItemStack(ModItems.bronzeingotball, 1); @@ -165,7 +266,7 @@ public class ModCrafting{ Ingredient.EMPTY, Ingredient.EMPTY, new ItemStack(PrimalAPI.Items.SLAG, 1), - diamondBronze, + emeraldBronze, 100, 100, 100); @@ -175,8 +276,8 @@ public class ModCrafting{ ItemStack lapisBronze = new ItemStack(ModItems.bronzeingotball, 1); lapisBronze.setTagCompound(tagBronzeLapis.copy()); CrucibleCrafting.addRecipe( - new OreIngredient("oreBronze"), - Ingredient.EMPTY, + new OreIngredient("ingotBronze"), + new OreIngredient("dustLapis"), Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, @@ -186,6 +287,54 @@ public class ModCrafting{ 100, 1000); + CrucibleCrafting.addRecipe( + new OreIngredient("dustCopper"), + new OreIngredient("dustCopper"), + new OreIngredient("dustCopper"), + new OreIngredient("dustTin"), + new OreIngredient("dustRedstone"), + new ItemStack(PrimalAPI.Items.SLAG, 1), + redBronze, + 100, + 100, + 1000); + + CrucibleCrafting.addRecipe( + new OreIngredient("dustCopper"), + new OreIngredient("dustCopper"), + new OreIngredient("dustCopper"), + new OreIngredient("dustTin"), + new OreIngredient("dustDiamond"), + new ItemStack(PrimalAPI.Items.SLAG, 1), + diamondBronze, + 100, + 100, + 1000); + + CrucibleCrafting.addRecipe( + new OreIngredient("dustCopper"), + new OreIngredient("dustCopper"), + new OreIngredient("dustCopper"), + new OreIngredient("dustTin"), + new OreIngredient("dustEmerald"), + new ItemStack(PrimalAPI.Items.SLAG, 1), + emeraldBronze, + 100, + 100, + 1000); + + CrucibleCrafting.addRecipe( + new OreIngredient("dustCopper"), + new OreIngredient("dustCopper"), + new OreIngredient("dustCopper"), + new OreIngredient("dustTin"), + new OreIngredient("dustLapis"), + new ItemStack(PrimalAPI.Items.SLAG, 1), + lapisBronze, + 100, + 100, + 1000); + /* RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.rawcleanironcrucible), "XL","Y ", @@ -726,6 +875,7 @@ public class ModCrafting{ //Casting Pickaxe CastingCrafting.addRecipe( + new ItemStack(ModItems.bronzeingotball, 1), new Item[] { muddd,muddd,muddd,muddd,muddd, muddd,empty,empty,empty,muddd, @@ -737,6 +887,7 @@ public class ModCrafting{ //Casting Shovel CastingCrafting.addRecipe( + new ItemStack(ModItems.bronzeingotball, 1), new Item[] { muddd,muddd,muddd,muddd,muddd, muddd,muddd,empty,muddd,muddd, @@ -748,6 +899,7 @@ public class ModCrafting{ //Casting Axe CastingCrafting.addRecipe( + new ItemStack(ModItems.bronzeingotball, 1), new Item[] { muddd,empty,empty,muddd,muddd, muddd,empty,empty,empty,muddd, @@ -759,6 +911,7 @@ public class ModCrafting{ //Casting Hoe CastingCrafting.addRecipe( + new ItemStack(ModItems.bronzeingotball, 1), new Item[] { muddd,muddd,muddd,empty,empty, muddd,muddd,empty,muddd,muddd, @@ -770,6 +923,7 @@ public class ModCrafting{ //Casting Gladius CastingCrafting.addRecipe( + new ItemStack(ModItems.bronzeingotball, 1), new Item[] { muddd,muddd,muddd,muddd,muddd, muddd,muddd,empty,muddd,muddd, @@ -779,6 +933,18 @@ public class ModCrafting{ new ItemStack(ModItems.bronzegladius, 1) ); + //Casting Bronze Plate + CastingCrafting.addRecipe( + new ItemStack(ModItems.bronzeingotball, 1), + new Item[] { + muddd,muddd,muddd,muddd,muddd, + muddd,muddd,muddd,muddd,muddd, + muddd,empty,empty,muddd,muddd, + muddd,empty,empty,muddd,muddd, + muddd,muddd,muddd,muddd,muddd }, + new ItemStack(PrimalAPI.Items.BRONZE_PLATE, 1) + ); + /****************************************************************************** FORGING ******************************************************************************/ @@ -787,7 +953,7 @@ public class ModCrafting{ ForgeCrafting.addRecipe( ModItems.ironingotball, //800, 200 - new ItemStack(ModItems.ironingotball, 1), + hotIronIngot, 100, 100, 500, @@ -797,7 +963,7 @@ public class ModCrafting{ //Makes a Hot Clean Iron Ingot ForgeCrafting.addRecipe( ModItems.ironcleaningotball, - new ItemStack(ModItems.ironcleaningotball, 1), + hotCleanIronIngot, 900, 250, 500, @@ -807,7 +973,7 @@ public class ModCrafting{ //Makes a Hot Steel Ingot ForgeCrafting.addRecipe( ModItems.steelingotball, - new ItemStack(ModItems.steelingotball, 1), + hotSteelIngot, 1000, 300, 500, @@ -817,7 +983,7 @@ public class ModCrafting{ //Makes a Hot Wootz Ingot ForgeCrafting.addRecipe( ModItems.wootzingotball, - new ItemStack(ModItems.wootzingotball, 1), + hotWootzIngot, 1000, 300, 500, @@ -828,7 +994,7 @@ public class ModCrafting{ // Converts a Vanilla Ingot into ForgeCraft Ingot Ball ForgeCrafting.addRecipe( Items.IRON_INGOT, - new ItemStack(ModItems.ironingotball, 1), + hotIronIngot, 800, 200, 500, @@ -839,7 +1005,7 @@ public class ModCrafting{ //Makes a Hot Iron Chunk ForgeCrafting.addRecipe( ModItems.wroughtironchunk, - new ItemStack(ModItems.wroughtironchunk,1), + hotChunk, 800, 160, 400, @@ -849,7 +1015,7 @@ public class ModCrafting{ //Makes a Hot Clean Iron Chunk ForgeCrafting.addRecipe( ModItems.ironcleanchunk, - new ItemStack(ModItems.ironcleanchunk,1), + hotCleanChunk, 900, 250, 500, @@ -859,7 +1025,7 @@ public class ModCrafting{ //Makes a Hot Steel Chunk ForgeCrafting.addRecipe( ModItems.steelchunk, - new ItemStack(ModItems.steelchunk,1), + hotSteelChunk, 1000, 300, 500, @@ -870,7 +1036,7 @@ public class ModCrafting{ //Makes a Hot Wootz Chunk ForgeCrafting.addRecipe( ModItems.wootzchunk, - new ItemStack(ModItems.wootzchunk,1), + hotWootzChunk, 1000, 300, 500, @@ -881,7 +1047,7 @@ public class ModCrafting{ /***Makes a Hot Iron PickaxeHead***/ ForgeCrafting.addRecipe( ModItems.pickaxehead, - new ItemStack(ModItems.pickaxehead, 1), + hotpickaxehead, 800, 160, 400, @@ -892,9 +1058,9 @@ public class ModCrafting{ /***Makes a Hot Clean Iron PickaxeHead***/ ForgeCrafting.addRecipe( ModItems.cleanironpickaxehead, - new ItemStack(ModItems.cleanironpickaxehead, 1), + hotcleanpickaxehead, 800, - 160, + 170, 400, 1.0f, 1.0f @@ -903,9 +1069,20 @@ public class ModCrafting{ /***Makes a Hot Steel PickaxeHead***/ ForgeCrafting.addRecipe( ModItems.steelpickaxehead, - new ItemStack(ModItems.steelpickaxehead, 1), + hotsteelpickaxehead, 1000, - 160, + 180, + 400, + 1.0f, + 1.0f + ); + + /***Makes a Hot Wootz PickaxeHead***/ + ForgeCrafting.addRecipe( + ModItems.wootzpickaxehead, + hotwootzpickaxehead, + 1000, + 190, 400, 1.0f, 1.0f @@ -914,7 +1091,7 @@ public class ModCrafting{ /***Makes a Hot Iron AxeHead***/ ForgeCrafting.addRecipe( ModItems.ironaxehead, - new ItemStack(ModItems.ironaxehead, 1), + hotironaxehead, 800, 160, 400, @@ -924,9 +1101,9 @@ public class ModCrafting{ /***Makes a Hot Clean Iron AxeHead***/ ForgeCrafting.addRecipe( ModItems.cleanironaxehead, - new ItemStack(ModItems.cleanironaxehead, 1), + hotcleanaxehead, 800, - 160, + 170, 400, 1.0f, 1.0f @@ -934,19 +1111,28 @@ public class ModCrafting{ /***Makes a Hot Steel AxeHead***/ ForgeCrafting.addRecipe( ModItems.steelaxehead, - new ItemStack(ModItems.steelaxehead, 1), - 800, - 160, + hotsteelaxehead, + 1000, + 180, + 400, + 1.0f, + 1.0f + ); + /***Makes a Hot Wootz AxeHead***/ + ForgeCrafting.addRecipe( + ModItems.wootzaxehead, + hotwootzaxehead, + 1000, + 190, 400, 1.0f, 1.0f ); - //TODO Wootz /***Makes a Hot Iron ShovelHead***/ ForgeCrafting.addRecipe( ModItems.ironshovelhead, - new ItemStack(ModItems.ironshovelhead, 1), + hotironshovelhead, 800, 160, 400, @@ -956,9 +1142,9 @@ public class ModCrafting{ /***Makes a Hot Clean Iron ShovelHead***/ ForgeCrafting.addRecipe( ModItems.cleanironshovelhead, - new ItemStack(ModItems.cleanironshovelhead, 1), + hotcleanshovelhead, 800, - 160, + 170, 400, 1.0f, 1.0f @@ -966,19 +1152,28 @@ public class ModCrafting{ /***Makes a Hot Steel ShovelHead***/ ForgeCrafting.addRecipe( ModItems.steelshovelhead, - new ItemStack(ModItems.steelshovelhead, 1), - 800, - 160, + hotsteelshovelhead, + 1000, + 180, + 400, + 1.0f, + 1.0f + ); + /***Makes a Hot Wootz ShovelHead***/ + ForgeCrafting.addRecipe( + ModItems.wootzshovelhead, + hotwootzshovelhead, + 1000, + 190, 400, 1.0f, 1.0f ); - //TODO Wootz /***Makes a Hot Iron HoeHead***/ ForgeCrafting.addRecipe( ModItems.ironhoehead, - new ItemStack(ModItems.ironhoehead, 1), + hotironhoehead, 800, 160, 400, @@ -988,9 +1183,9 @@ public class ModCrafting{ /***Makes a Hot Clean Iron HoeHead***/ ForgeCrafting.addRecipe( ModItems.cleanironhoehead, - new ItemStack(ModItems.cleanironhoehead, 1), + hotcleanhoehead, 800, - 160, + 170, 400, 1.0f, 1.0f @@ -998,63 +1193,29 @@ public class ModCrafting{ /***Makes a Hot Steel HoeHead***/ ForgeCrafting.addRecipe( ModItems.steelhoehead, - new ItemStack(ModItems.steelhoehead, 1), - 800, - 160, + hotsteelhoehead, + 1000, + 180, + 400, + 1.0f, + 1.0f + ); + /***Makes a Hot Wootz HoeHead***/ + ForgeCrafting.addRecipe( + ModItems.wootzhoehead, + hotwootzhoehead, + 1000, + 190, 400, 1.0f, 1.0f ); - //TODO Wootz /****************************************************************************** ANVILING ******************************************************************************/ - ItemStack emptyAir = ItemStack.EMPTY; - NBTTagCompound setHot = new NBTTagCompound(); - setHot.setBoolean("hot", true); - - ItemStack hotChunk = new ItemStack( ModItems.wroughtironchunk, 1); - hotChunk.setTagCompound(setHot); - - ItemStack hotCleanChunk = new ItemStack(ModItems.ironcleanchunk, 1); - hotCleanChunk.setTagCompound(setHot); - - ItemStack hotSteelChunk = new ItemStack(ModItems.steelchunk, 1); - hotSteelChunk.setTagCompound(setHot); - - ItemStack hotWootzChunk = new ItemStack(ModItems.wootzchunk, 1); - hotWootzChunk.setTagCompound(setHot); - - ItemStack diamond = new ItemStack(Items.DIAMOND, 1); - ItemStack emerald = new ItemStack(Items.EMERALD, 1); - - ItemStack emeraldShard = new ItemStack(PrimalAPI.Items.EMERALD_KNAPP, 1); - ItemStack diamondShard = new ItemStack(PrimalAPI.Items.DIAMOND_KNAPP, 1); - ItemStack redstone = new ItemStack(Items.REDSTONE, 1); - ItemStack lapis = new ItemStack(Items.DYE, 1, 4); - - ItemStack pickaxehead = new ItemStack(ModItems.pickaxehead, 1); - ItemStack ironaxehead = new ItemStack(ModItems.ironaxehead, 1); - ItemStack ironshovelhead = new ItemStack(ModItems.ironshovelhead, 1); - ItemStack ironhoehead = new ItemStack(ModItems.ironhoehead, 1); - - ItemStack cleanpickaxehead = new ItemStack(ModItems.cleanironpickaxehead, 1); - ItemStack cleanaxehead = new ItemStack(ModItems.cleanironaxehead, 1); - ItemStack cleanshovelhead = new ItemStack(ModItems.cleanironshovelhead, 1); - ItemStack cleanhoehead = new ItemStack(ModItems.cleanironhoehead, 1); - - ItemStack steelpickaxehead = new ItemStack(ModItems.steelpickaxehead, 1); - ItemStack steelaxehead = new ItemStack(ModItems.steelaxehead, 1); - ItemStack steelshovelhead = new ItemStack(ModItems.steelshovelhead, 1); - ItemStack steelhoehead = new ItemStack(ModItems.steelhoehead, 1); - - ItemStack wootzpickaxehead = new ItemStack(ModItems.wootzpickaxehead, 1); - ItemStack wootzaxehead = new ItemStack(ModItems.wootzaxehead, 1); - ItemStack wootzshovelhead = new ItemStack(ModItems.wootzshovelhead, 1); - ItemStack wootzhoehead = new ItemStack(ModItems.wootzhoehead, 1); /*** ForgeHammer ***/ AnvilCrafting.addRecipe( @@ -1104,18 +1265,6 @@ public class ModCrafting{ "null" ); - /*** Iron Bars ***/ - AnvilCrafting.addRecipe( - new ItemStack [] { - hotChunk,emptyAir,hotChunk,emptyAir,hotChunk, - hotChunk,hotChunk,hotChunk,hotChunk,hotChunk, - hotChunk,emptyAir,hotChunk,emptyAir,hotChunk, - hotChunk,hotChunk,hotChunk,hotChunk,hotChunk, - hotChunk,emptyAir,hotChunk,emptyAir,hotChunk, }, - new ItemStack(PrimalAPI.Items.IRON_PLATE, 1), - "null" - ); - /*** Flaked diamond ***/ AnvilCrafting.addRecipe( new ItemStack [] { diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 4d3fd7d7..06d7cc29 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -240,7 +240,7 @@ public class ModItems { wroughtironslayer = new SlayerSword("wroughtironslayer", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON, 11.5D, -3.7D); cleanironslayer = new SlayerSword("cleanironslayer", PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON, 10D, -3.5D); steelslayer = new SlayerSword("steelslayer", PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL,11D, -3.3D); - wootzslayer = new SlayerSword("steelslayer", PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL,11D, -3.1D); + wootzslayer = new SlayerSword("wootzslayer", PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL,11D, -3.1D); wroughtironshield = new CustomShield("wroughtironshield", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON); @@ -287,6 +287,8 @@ public class ModItems { //ForgeRegistries.ITEMS.register(stonetongs); ForgeRegistries.ITEMS.register(forgehammer); + ForgeRegistries.ITEMS.register(bronzeingotball); + ForgeRegistries.ITEMS.register(bronzechunk); ForgeRegistries.ITEMS.register(ironingotball); ForgeRegistries.ITEMS.register(wroughtironchunk); ForgeRegistries.ITEMS.register(ironcleaningotball); @@ -370,13 +372,16 @@ public class ModItems { ForgeRegistries.ITEMS.register(bronzegladius); ForgeRegistries.ITEMS.register(cleanirongladius); ForgeRegistries.ITEMS.register(steelgladius); + ForgeRegistries.ITEMS.register(wootzgladius); ForgeRegistries.ITEMS.register(cleanironlongsword); ForgeRegistries.ITEMS.register(steellongsword); + ForgeRegistries.ITEMS.register(wootzlongsword); ForgeRegistries.ITEMS.register(wroughtironslayer); ForgeRegistries.ITEMS.register(cleanironslayer); ForgeRegistries.ITEMS.register(steelslayer); + ForgeRegistries.ITEMS.register(wootzslayer); ForgeRegistries.ITEMS.register(rawlongbow); ForgeRegistries.ITEMS.register(unstrunglongbow); @@ -497,13 +502,16 @@ public class ModItems { registerRender(wroughtirongladius); registerRender(cleanirongladius); registerRender(steelgladius); + registerRender(wootzgladius); registerRender(cleanironlongsword); registerRender(steellongsword); + registerRender(wootzlongsword); registerRender(wroughtironslayer); registerRender(cleanironslayer); registerRender(steelslayer); + registerRender(wootzslayer); registerRender(rawlongbow); registerRender(unstrunglongbow); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java b/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java index b0f47429..50a11eed 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java @@ -177,10 +177,10 @@ public class BaseMultiItem extends BaseItem { @Override public void onUpdate(ItemStack stack, World world, Entity player, int itemSlot, boolean isSelected) { //System.out.println(item.getTagCompound()); - if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); - stack.getTagCompound().setBoolean("hot", false); - } + //if (!stack.hasTagCompound()) { + // stack.setTagCompound(new NBTTagCompound()); + // stack.getTagCompound().setBoolean("hot", false); + //} } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java index 95eb2f65..6a1a20c6 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java @@ -191,17 +191,8 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{ cookCounter2--; } if (cookCounter2 >= recipe.getIdealTime()) { - ItemStack outputStack = recipe.getOutput(); + ItemStack outputStack = recipe.getOutput().copy(); outputStack.setItemDamage(stack.getItemDamage()); - if(outputStack.getItem() instanceof ToolPart) { - outputStack.setTagCompound(stackCompound); - outputStack.getSubCompound("tags").setBoolean("hot", true); - } - if(outputStack.getItem() instanceof BaseMultiItem) { - //System.out.println(stack.getTagCompound()); - stackCompound.setBoolean("hot", true); - outputStack.setTagCompound(stackCompound); - } this.setSlotStack(i, outputStack); cookCounter2 = 0; } @@ -214,16 +205,9 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{ cookCounter3--; } if (cookCounter3 >= recipe.getIdealTime()) { - ItemStack outputStack = recipe.getOutput(); + ItemStack outputStack = recipe.getOutput().copy(); outputStack.setItemDamage(stack.getItemDamage()); - if(outputStack.getItem() instanceof ToolPart) { - outputStack.setTagCompound(stackCompound); - outputStack.getSubCompound("tags").setBoolean("hot", true); - } - if(outputStack.getItem() instanceof BaseMultiItem) { - stackCompound.setBoolean("hot", true); - outputStack.setTagCompound(stackCompound); - } + this.setSlotStack(i, outputStack); cookCounter3 = 0; @@ -237,17 +221,8 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{ cookCounter4--; } if (cookCounter4 >= recipe.getIdealTime()) { - ItemStack outputStack = recipe.getOutput(); + ItemStack outputStack = recipe.getOutput().copy(); outputStack.setItemDamage(stack.getItemDamage()); - //System.out.println(stackCompound.getCompoundTag("tags")); - if(outputStack.getItem() instanceof ToolPart) { - outputStack.setTagCompound(stackCompound); - outputStack.getSubCompound("tags").setBoolean("hot", true); - } - if(outputStack.getItem() instanceof BaseMultiItem) { - stackCompound.setBoolean("hot", true); - outputStack.setTagCompound(stackCompound); - } this.setSlotStack(i, outputStack); cookCounter4 = 0; } @@ -260,16 +235,8 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{ cookCounter5--; } if (cookCounter5 >= recipe.getIdealTime()) { - ItemStack outputStack = recipe.getOutput(); + ItemStack outputStack = recipe.getOutput().copy(); outputStack.setItemDamage(stack.getItemDamage()); - if(outputStack.getItem() instanceof ToolPart) { - outputStack.setTagCompound(stackCompound); - outputStack.getSubCompound("tags").setBoolean("hot", true); - } - if(outputStack.getItem() instanceof BaseMultiItem) { - stackCompound.setBoolean("hot", true); - outputStack.setTagCompound(stackCompound); - } this.setSlotStack(i, outputStack); cookCounter5 = 0; } @@ -282,16 +249,8 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{ cookCounter6--; } if (cookCounter6 >= recipe.getIdealTime()) { - ItemStack outputStack = recipe.getOutput(); + ItemStack outputStack = recipe.getOutput().copy(); outputStack.setItemDamage(stack.getItemDamage()); - if(outputStack.getItem() instanceof ToolPart) { - outputStack.setTagCompound(stackCompound); - outputStack.getSubCompound("tags").setBoolean("hot", true); - } - if(outputStack.getItem() instanceof BaseMultiItem) { - outputStack.setTagCompound(stackCompound); - outputStack.getTagCompound().setBoolean("hot", true); - } this.setSlotStack(i, outputStack); cookCounter6 = 0; } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java index aa6a17da..2fdf4fb9 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileNBTCrucible.java @@ -73,23 +73,33 @@ public class TileNBTCrucible extends BaseTile implements ITickable { if (!world.isRemote) { World world = this.getWorld(); IBlockState state = world.getBlockState(this.pos); - + dropsManager(); coolManager(this.pos, world, state); } } + private void dropsManager(){ + CrucibleCrafting recipe = CrucibleCrafting.getRecipe(this.ingList.get(0), this.ingList.get(1), this.ingList.get(2), this.ingList.get(3), this.ingList.get(4)); + if(recipe!=null){ + if( (this.getHot() == 15) && (this.getStatus()) ){ + this.setDrops(recipe.getDropsCooked()); + } else if ((this.getHot() == 15) && (!this.getStatus())){ + this.setDrops(recipe.getDropsRaw()); + } + } + } + private void coolManager(BlockPos pos, World world, IBlockState state) { //System.out.println(this.getHeat() + " " + this.getHot() + " " + this.getDrops()); if(this.getHot() == 15){ - //System.out.println("Still Hot"); if(this.getHeat() > 0){ this.setHeat( this.getHeat() - 1); world.setBlockState(pos, state.withProperty(PrimalAPI.States.LAYERS, 15), 2); } if(this.getHeat() == 0){ this.setHot(6); - CrucibleCrafting recipe = CrucibleCrafting.getRecipe(ingList.get(0), ingList.get(1), ingList.get(2), ingList.get(3), ingList.get(4)); - this.setDrops(recipe.getDropsCooked()); + //CrucibleCrafting recipe = CrucibleCrafting.getRecipe(ingList.get(0), ingList.get(1), ingList.get(2), ingList.get(3), ingList.get(4)); + //this.setDrops(recipe.getDropsCooked()); this.setStatus(true); System.out.println("Ready to harvest: " + this.getDrops()); world.setBlockState(pos, state.withProperty(PrimalAPI.States.LAYERS, 6), 2); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/util/CastingFormHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/util/CastingFormHandler.java index 317d8c0b..ba3ef6d4 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/util/CastingFormHandler.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/util/CastingFormHandler.java @@ -189,8 +189,8 @@ public interface CastingFormHandler { return false; } - default void doCastingCrafting(Item[] tempArray, World world, TileCastingForm tile, BlockPos pos){ - CastingCrafting recipe = CastingCrafting.getRecipe(tempArray); + default void doCastingCrafting(ItemStack source, Item[] tempArray, World world, TileCastingForm tile, BlockPos pos){ + CastingCrafting recipe = CastingCrafting.getRecipe(source, tempArray); if (recipe != null) { CommonUtils.spawnItemEntityFromWorld(world, pos, recipe.getOutput()); } diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolcleanironcrucible.json deleted file mode 100644 index 73d7acf3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolcleanironcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolironcrucible.json deleted file mode 100644 index 73d7acf3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolironcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolsteelcrucible.json deleted file mode 100644 index 73d7acf3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolsteelcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolwootzcrucible.json deleted file mode 100644 index 73d7acf3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolwootzcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedcleanironcrucible.json deleted file mode 100644 index 168baa06..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedcleanironcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_burnt", - "texture": "forgecraft:blocks/stone_slab_burnt" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedcleanironcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedcleanironcruciblehot.json deleted file mode 100644 index 62b92916..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedcleanironcruciblehot.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot_burnt", - "texture": "forgecraft:blocks/stone_slab_hot_burnt" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedironcrucible.json deleted file mode 100644 index 168baa06..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedironcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_burnt", - "texture": "forgecraft:blocks/stone_slab_burnt" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedironcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedironcruciblehot.json deleted file mode 100644 index 62b92916..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedironcruciblehot.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot_burnt", - "texture": "forgecraft:blocks/stone_slab_hot_burnt" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedsteelcrucible.json deleted file mode 100644 index 168baa06..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedsteelcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_burnt", - "texture": "forgecraft:blocks/stone_slab_burnt" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedsteelcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedsteelcruciblehot.json deleted file mode 100644 index 62b92916..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedsteelcruciblehot.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot_burnt", - "texture": "forgecraft:blocks/stone_slab_hot_burnt" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedwootzcrucible.json deleted file mode 100644 index 168baa06..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedwootzcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_burnt", - "texture": "forgecraft:blocks/stone_slab_burnt" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedwootzcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedwootzcruciblehot.json deleted file mode 100644 index 62b92916..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedwootzcruciblehot.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot_burnt", - "texture": "forgecraft:blocks/stone_slab_hot_burnt" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible.json deleted file mode 100644 index f88abe9a..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/hot_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_diamond.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_diamond.json deleted file mode 100644 index f88abe9a..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_diamond.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/hot_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_emerald.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_emerald.json deleted file mode 100644 index f88abe9a..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_emerald.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/hot_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_lapis.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_lapis.json deleted file mode 100644 index f88abe9a..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_lapis.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/hot_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_redstone.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_redstone.json deleted file mode 100644 index 37c949b3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_redstone.json +++ /dev/null @@ -1,13 +0,0 @@ -hotbronzecrucible.json{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/hot_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcleanironcrucible.json deleted file mode 100644 index 11a526c7..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcleanironcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible.json deleted file mode 100644 index d549eddf..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/molten_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_diamond.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_diamond.json deleted file mode 100644 index d549eddf..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_diamond.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/molten_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_emerald.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_emerald.json deleted file mode 100644 index d549eddf..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_emerald.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/molten_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_lapis.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_lapis.json deleted file mode 100644 index d549eddf..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_lapis.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/molten_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_redstone.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_redstone.json deleted file mode 100644 index d549eddf..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_redstone.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/molten_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedcleanironcrucible.json deleted file mode 100644 index 11a526c7..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedcleanironcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedironcrucible.json deleted file mode 100644 index 11a526c7..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedironcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedsteelcrucible.json deleted file mode 100644 index 11a526c7..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedsteelcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedwootzcrucible.json deleted file mode 100644 index 11a526c7..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedwootzcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotironcrucible.json deleted file mode 100644 index 11a526c7..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotironcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotsteelcrucible.json deleted file mode 100644 index 11a526c7..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotsteelcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotwootzcrucible.json deleted file mode 100644 index 11a526c7..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotwootzcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironball.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironball.json deleted file mode 100644 index 7428d1b9..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironball.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/iron_ingot", - "texture": "forgecraft:blocks/iron_ingot" - }, - "parent": "forgecraft:ironball" - }, - "variants": { - "active=false": { - "model": "forgecraft:ironball", - "textures": { - "particle": "forgecraft:blocks/iron_ingot", - "texture": "forgecraft:blocks/iron_ingot" - } - }, - "active=true": { - "model": "forgecraft:ironball", - "textures": { - "particle": "forgecraft:blocks/iron_ingot_hot", - "texture": "forgecraft:blocks/iron_ingot_hot" - } - } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironchunk.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironchunk.json deleted file mode 100644 index 9b73dae5..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironchunk.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/iron_ingot", - "texture": "forgecraft:blocks/iron_ingot" - }, - "parent": "forgecraft:ironchunk" - }, - "variants": { - "active=false": { - "model": "forgecraft:ironchunk", - "textures": { - "particle": "forgecraft:blocks/iron_ingot", - "texture": "forgecraft:blocks/iron_ingot" - } - }, - "active=true": { - "model": "forgecraft:ironchunk", - "textures": { - "particle": "forgecraft:blocks/iron_ingot_hot", - "texture": "forgecraft:blocks/iron_ingot_hot" - } - } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironcleanball.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironcleanball.json deleted file mode 100644 index 713163d6..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironcleanball.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/clean_iron_ingot", - "texture": "forgecraft:blocks/clean_iron_ingot" - }, - "parent": "forgecraft:ironball" - }, - "variants": { - "active=false": { - "model": "forgecraft:ironball", - "textures": { - "particle": "forgecraft:blocks/clean_iron_ingot", - "texture": "forgecraft:blocks/clean_iron_ingot" - } - }, - "active=true": { - "model": "forgecraft:ironball", - "textures": { - "particle": "forgecraft:blocks/clean_iron_ingot_hot", - "texture": "forgecraft:blocks/clean_iron_ingot_hot" - } - } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironcleanchunk.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironcleanchunk.json deleted file mode 100644 index 6e440a4f..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironcleanchunk.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/clean_iron_ingot", - "texture": "forgecraft:blocks/clean_iron_ingot" - }, - "parent": "forgecraft:ironchunk" - }, - "variants": { - "active=false": { - "model": "forgecraft:ironchunk", - "textures": { - "particle": "forgecraft:blocks/clean_iron_ingot", - "texture": "forgecraft:blocks/clean_iron_ingot" - } - }, - "active=true": { - "model": "forgecraft:ironchunk", - "textures": { - "particle": "forgecraft:blocks/clean_iron_ingot_hot", - "texture": "forgecraft:blocks/clean_iron_ingot_hot" - } - } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible.json deleted file mode 100644 index 9fddd6fe..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", - "texture1": "forgecraft:items/raw_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_diamond.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_diamond.json deleted file mode 100644 index 9fddd6fe..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_diamond.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", - "texture1": "forgecraft:items/raw_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_emerald.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_emerald.json deleted file mode 100644 index 9fddd6fe..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_emerald.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", - "texture1": "forgecraft:items/raw_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_lapis.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_lapis.json deleted file mode 100644 index 9fddd6fe..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_lapis.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", - "texture1": "forgecraft:items/raw_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_redstone.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_redstone.json deleted file mode 100644 index 9fddd6fe..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_redstone.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", - "texture1": "forgecraft:items/raw_bronze" - } - }, - "variants": { - "normal": { "model": "forgecraft:castingcrucible" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawcleanironcrucible.json deleted file mode 100644 index 73d7acf3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawcleanironcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawironcrucible.json deleted file mode 100644 index 73d7acf3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawironcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawsteelcrucible.json deleted file mode 100644 index 73d7acf3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawsteelcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawwootzcrucible.json deleted file mode 100644 index 73d7acf3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawwootzcrucible.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - } - }, - "variants": { - "normal": { "model": "forgecraft:crucibleshut" } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/steelball.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/steelball.json deleted file mode 100644 index a9bf0c47..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/steelball.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/steel_ingot", - "texture": "forgecraft:blocks/steel_ingot" - }, - "parent": "forgecraft:ironball" - }, - "variants": { - "active=false": { - "model": "forgecraft:ironball", - "textures": { - "particle": "forgecraft:blocks/steel_ingot", - "texture": "forgecraft:blocks/steel_ingot" - } - }, - "active=true": { - "model": "forgecraft:ironball", - "textures": { - "particle": "forgecraft:blocks/steel_ingot_hot", - "texture": "forgecraft:blocks/steel_ingot_hot" - } - } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/steelchunk.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/steelchunk.json deleted file mode 100644 index f4f72ef9..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/steelchunk.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/steel_ingot", - "texture": "forgecraft:blocks/steel_ingot" - }, - "parent": "forgecraft:ironchunk" - }, - "variants": { - "active=false": { - "model": "forgecraft:ironchunk", - "textures": { - "particle": "forgecraft:blocks/steel_ingot", - "texture": "forgecraft:blocks/steel_ingot" - } - }, - "active=true": { - "model": "forgecraft:ironchunk", - "textures": { - "particle": "forgecraft:blocks/steel_ingot_hot", - "texture": "forgecraft:blocks/steel_ingot_hot" - } - } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/wootzball.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/wootzball.json deleted file mode 100644 index 06be95ba..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/wootzball.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/wootz_ingot", - "texture": "forgecraft:blocks/wootz_ingot" - }, - "parent": "forgecraft:ironball" - }, - "variants": { - "active=false": { - "model": "forgecraft:ironball", - "textures": { - "particle": "forgecraft:blocks/wootz_ingot", - "texture": "forgecraft:blocks/wootz_ingot" - } - }, - "active=true": { - "model": "forgecraft:ironball", - "textures": { - "particle": "forgecraft:blocks/wootz_ingot_hot", - "texture": "forgecraft:blocks/wootz_ingot_hot" - } - } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/wootzchunk.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/wootzchunk.json deleted file mode 100644 index cac77fc7..00000000 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/trash/wootzchunk.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker":1, - "defaults": { - "textures": { - "particle": "forgecraft:blocks/wootz_ingot", - "texture": "forgecraft:blocks/wootz_ingot" - }, - "parent": "forgecraft:ironchunk" - }, - "variants": { - "active=false": { - "model": "forgecraft:ironchunk", - "textures": { - "particle": "forgecraft:blocks/wootz_ingot", - "texture": "forgecraft:blocks/wootz_ingot" - } - }, - "active=true": { - "model": "forgecraft:ironchunk", - "textures": { - "particle": "forgecraft:blocks/wootz_ingot_hot", - "texture": "forgecraft:blocks/wootz_ingot_hot" - } - } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang b/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang index 307f6d17..cb1cf2b2 100644 --- a/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang +++ b/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang @@ -26,7 +26,8 @@ tile.emptycruciblehit.name=Hot Empty Crucible tile.emptycruciblecracked.name= Cracked Empty Crucible tile.emptycruciblecrackedhot.name=Cracked Hot Empty Crucible - +item.bronzeingotball.name=Bronze Ingot +item.bronzechunk.name=Bronze Chunk item.ironingotball.name=Wrought Iron Ingot item.wroughtironchunk.name=Wrought Iron Chunk item.ironcleaningotball.name=Clean Iron Ingot @@ -48,7 +49,7 @@ item.rawlongbow.name=Raw Longbow item.bellowshandle.name=Bellows Handle item.softcrucible.name=Soft Crucible -item.stonetongs.name=Stone Tongs +item.slottedtongs.name=Stone Tongs item.forgehammer.name=Forge Hammer item.cast_axe.name=Axe Cast @@ -117,7 +118,9 @@ item.wootzpickaxe.name=Damascus Steel Pickaxe item.wootzaxe.name=Damascus Steel Axe item.wootzshovel.name=Damascus Steel Shovel item.wootzhoe.name=Damascus Steel Hoe -#item.wootzsword.name=Damascus Steel Sword +item.wootzgladius.name=Damascus Gladius +item.wootzlongsword.name=Damascus Longsword +item.wootzslayer.name=Damascus Slayer item.leatherhelmet.name=Hardened Leather Helmet @@ -128,4 +131,6 @@ forgecraft.compatibility=Compatibility forgecraft.compatibility.tooltip=Compatibility Features jei.category.forgecraft.crucible=Crucible Crafting -jei.category.forgecraft.anvil=Anvil Crafting \ No newline at end of file +jei.category.forgecraft.anvil=Anvil Crafting +jei.category.forgecraft.casting=Casting +jei.category.forgecraft.forging=Forging \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/bronzechunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/bronzechunk.json index 41530023..b2566e25 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/bronzechunk.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/bronzechunk.json @@ -1,11 +1,11 @@ { "parent": "forgecraft:item/ironchunk", "textures": { - "particle": "forgecraft:blocks/bronze_ingot", - "texture": "forgecraft:blocks/bronze_ingot" + "particle": "forgecraft:blocks/bronze_block", + "texture": "forgecraft:blocks/bronze_block" }, "overrides": [ - {"predicate": {"type": 0.12},"model": "forgecraft:item/chunks/bronze/chunk_04"}, - {"predicate": {"type": 0.13},"model": "forgecraft:item/chunks/bronze/chunk_05"} + {"predicate": {"type": 0.12},"model": "forgecraft:item/chunks/bronze/chunk_02"}, + {"predicate": {"type": 0.13},"model": "forgecraft:item/chunks/bronze/chunk_03"} ] } diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/bronzeingotball.json b/kfc/src/main/resources/assets/forgecraft/models/item/bronzeingotball.json index ae469ff7..a8084bb1 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/bronzeingotball.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/bronzeingotball.json @@ -1,8 +1,8 @@ { "parent": "forgecraft:item/ironball", "textures": { - "particle": "forgecraft:blocks/bronze_ingot", - "texture": "forgecraft:blocks/bronze_ingot" + "particle": "forgecraft:blocks/bronze_block", + "texture": "forgecraft:blocks/bronze_block" }, "overrides": [ {"predicate": {"type": 0.02},"model": "forgecraft:item/ingots/bronze/ingot_02"}, diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/castingmud2.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/castingmud2.json deleted file mode 100644 index 18304714..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/castingmud2.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "items/parts/adobebrick_mix", - "texture": "items/parts/adobebrick_mix" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 7, 0, 7 ], - "to": [ 9, 2, 9 ], - "faces": { - "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "north": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "south": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "west": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, - "east": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ 0, -90, 55 ], - "translation": [ 0, 4, -5 ], - "scale": [ 0.85, 0.85, 0.85 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, -90, 55 ], - "translation": [ 0, 4, -5 ], - "scale": [ 0.85, 0.85, 0.85 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 0, 4, -5 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 0, 4, -5 ] - }, - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 5, 0 ], - "scale": [ 1.5, 1.5, 1.5 ] - }, - "ground": { - "translation": [ 0, 4, 0 ] - }, - "fixed": { - "translation": [ 0, 6, 0 ] - } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolcleanironcrucible.json deleted file mode 100644 index 0b7be2fb..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolcleanironcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolironcrucible.json deleted file mode 100644 index 0b7be2fb..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolironcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolsteelcrucible.json deleted file mode 100644 index 0b7be2fb..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolsteelcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolwootzcrucible.json deleted file mode 100644 index 0b7be2fb..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolwootzcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycrucible.json deleted file mode 100644 index 8d090e7a..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - }, - "parent": "forgecraft:block/emptycrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblecracked.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblecracked.json deleted file mode 100644 index 8d419578..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblecracked.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_cracked", - "texture": "forgecraft:blocks/stone_slab_cracked" - }, - "parent": "forgecraft:block/emptycrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblecrackedhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblecrackedhot.json deleted file mode 100644 index b8f9a6f2..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblecrackedhot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_cracked_hot", - "texture": "forgecraft:blocks/stone_slab_cracked_hot" - }, - "parent": "forgecraft:block/emptycrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblehot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblehot.json deleted file mode 100644 index ca445aaf..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblehot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:block/emptycrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedcleanironcrucible.json deleted file mode 100644 index 39ac95e5..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedcleanironcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_burnt", - "texture": "forgecraft:blocks/stone_slab_burnt" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedcleanironcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedcleanironcruciblehot.json deleted file mode 100644 index 18b1af63..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedcleanironcruciblehot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot_burnt", - "texture": "forgecraft:blocks/stone_slab_hot_burnt" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedironcrucible.json deleted file mode 100644 index 39ac95e5..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedironcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_burnt", - "texture": "forgecraft:blocks/stone_slab_burnt" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedironcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedironcruciblehot.json deleted file mode 100644 index 18b1af63..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedironcruciblehot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot_burnt", - "texture": "forgecraft:blocks/stone_slab_hot_burnt" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedsteelcrucible.json deleted file mode 100644 index 39ac95e5..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedsteelcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_burnt", - "texture": "forgecraft:blocks/stone_slab_burnt" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedsteelcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedsteelcruciblehot.json deleted file mode 100644 index 18b1af63..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedsteelcruciblehot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot_burnt", - "texture": "forgecraft:blocks/stone_slab_hot_burnt" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedwootzcrucible.json deleted file mode 100644 index 39ac95e5..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedwootzcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_burnt", - "texture": "forgecraft:blocks/stone_slab_burnt" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedwootzcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedwootzcruciblehot.json deleted file mode 100644 index 18b1af63..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedwootzcruciblehot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot_burnt", - "texture": "forgecraft:blocks/stone_slab_hot_burnt" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible.json deleted file mode 100644 index e420a34e..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/hot_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_diamond.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_diamond.json deleted file mode 100644 index e420a34e..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_diamond.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/hot_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_emerald.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_emerald.json deleted file mode 100644 index e420a34e..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_emerald.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/hot_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_lapis.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_lapis.json deleted file mode 100644 index e420a34e..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_lapis.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/hot_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_redstone.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_redstone.json deleted file mode 100644 index e420a34e..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_redstone.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/hot_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcleanironcrucible.json deleted file mode 100644 index 70bc79c2..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcleanironcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible.json deleted file mode 100644 index 0b015ebe..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/molten_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_diamond.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_diamond.json deleted file mode 100644 index 0b015ebe..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_diamond.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/molten_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_emerald.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_emerald.json deleted file mode 100644 index 0b015ebe..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_emerald.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/molten_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_lapis.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_lapis.json deleted file mode 100644 index 0b015ebe..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_lapis.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/molten_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_redstone.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_redstone.json deleted file mode 100644 index 0b015ebe..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_redstone.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/molten_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedcleanironcrucible.json deleted file mode 100644 index 70bc79c2..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedcleanironcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedironcrucible.json deleted file mode 100644 index 70bc79c2..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedironcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedsteelcrucible.json deleted file mode 100644 index 70bc79c2..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedsteelcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedwootzcrucible.json deleted file mode 100644 index 70bc79c2..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedwootzcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotironcrucible.json deleted file mode 100644 index 70bc79c2..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotironcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotsteelcrucible.json deleted file mode 100644 index 70bc79c2..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotsteelcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotwootzcrucible.json deleted file mode 100644 index 70bc79c2..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotwootzcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironchunkhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironchunkhot.json deleted file mode 100644 index 280e6038..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironchunkhot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/iron_ingot_hot", - "texture": "forgecraft:blocks/iron_ingot_hot" - }, - "parent": "forgecraft:block/ironchunk" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanball.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanball.json deleted file mode 100644 index 9a1c123b..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanball.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/clean_iron_ingot", - "texture": "forgecraft:blocks/clean_iron_ingot" - }, - "parent": "forgecraft:block/ironball" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunk.json deleted file mode 100644 index f0ff101e..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunk.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/clean_iron_ingot", - "texture": "forgecraft:blocks/clean_iron_ingot" - }, - "parent": "forgecraft:block/ironchunk" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunkhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunkhot.json deleted file mode 100644 index a675b2a1..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunkhot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/clean_iron_ingot_hot", - "texture": "forgecraft:blocks/clean_iron_ingot_hot" - }, - "parent": "forgecraft:block/ironchunk" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotball.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotball.json deleted file mode 100644 index f45c98e6..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotball.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "forgecraft:item/ironball", - "textures": { - "particle": "forgecraft:blocks/iron_ingot", - "texture": "forgecraft:blocks/iron_ingot" - }, - "overrides": [ - {"predicate": {"type": 0.04},"model": "forgecraft:item/ingots/cleaniron/ingot_04"}, - {"predicate": {"type": 0.05},"model": "forgecraft:item/ingots/cleaniron/ingot_05"} - ] -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotballhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotballhot.json deleted file mode 100644 index 171ad17c..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotballhot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/clean_iron_ingot_hot", - "texture": "forgecraft:blocks/clean_iron_ingot_hot" - }, - "parent": "forgecraft:item/ironball" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible.json deleted file mode 100644 index 55ccfcf9..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", - "texture1": "forgecraft:items/raw_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_diamond.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_diamond.json deleted file mode 100644 index 55ccfcf9..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_diamond.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", - "texture1": "forgecraft:items/raw_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_emerald.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_emerald.json deleted file mode 100644 index 55ccfcf9..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_emerald.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", - "texture1": "forgecraft:items/raw_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_lapis.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_lapis.json deleted file mode 100644 index 55ccfcf9..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_lapis.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", - "texture1": "forgecraft:items/raw_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_redstone.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_redstone.json deleted file mode 100644 index 55ccfcf9..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_redstone.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab", - "texture1": "forgecraft:items/raw_bronze" - }, - "parent": "forgecraft:block/castingcrucible" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawcleanironcrucible.json deleted file mode 100644 index 0b7be2fb..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawcleanironcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawironcrucible.json deleted file mode 100644 index 0b7be2fb..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawironcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawsteelcrucible.json deleted file mode 100644 index 0b7be2fb..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawsteelcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawwootzcrucible.json deleted file mode 100644 index 0b7be2fb..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawwootzcrucible.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/stone_slab", - "texture": "forgecraft:blocks/stone_slab" - }, - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelball.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelball.json deleted file mode 100644 index f73b315e..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelball.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/steel_ingot", - "texture": "forgecraft:blocks/steel_ingot" - }, - "parent": "forgecraft:block/ironball" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunk.json deleted file mode 100644 index db2b459f..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunk.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/steel_ingot", - "texture": "forgecraft:blocks/steel_ingot" - }, - "parent": "forgecraft:block/ironchunk" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunkhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunkhot.json deleted file mode 100644 index b8c1fad4..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunkhot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/steel_ingot_hot", - "texture": "forgecraft:blocks/steel_ingot_hot" - }, - "parent": "forgecraft:block/ironchunk" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelingotballhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelingotballhot.json deleted file mode 100644 index e44d8059..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelingotballhot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/steel_ingot_hot", - "texture": "forgecraft:blocks/steel_ingot_hot" - }, - "parent": "forgecraft:block/ironball" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_axe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_axe_hot.json deleted file mode 100644 index cb5c8583..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_axe_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/iron_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_axe_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_chunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_chunk.json deleted file mode 100644 index 90d04907..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_chunk.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/iron_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_chunk_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_axe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_axe_hot.json deleted file mode 100644 index f9a6abe5..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_axe_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/clean_iron_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_axe_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_hoe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_hoe_hot.json deleted file mode 100644 index cfe63b65..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_hoe_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/clean_iron_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_hoe_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_pickaxe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_pickaxe_hot.json deleted file mode 100644 index c4b47d73..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_pickaxe_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/clean_iron_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_pickaxe_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_shovel_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_shovel_hot.json deleted file mode 100644 index 527a076d..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_shovel_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/clean_iron_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_shovel_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleanironchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleanironchunk.json deleted file mode 100644 index 8bab051a..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleanironchunk.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/clean_iron_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_chunk_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleanironingot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleanironingot.json deleted file mode 100644 index d8092027..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleanironingot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/clean_iron_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_ingot_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hoe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hoe_hot.json deleted file mode 100644 index dafc86af..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hoe_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/iron_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_hoe_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_diamond.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_diamond.json deleted file mode 100644 index 32f3524e..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_diamond.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot", - "texture3": "forgecraft:items/hot_bronze" - }, - "parent": "forgecraft:item/stonetongs_hotbronze" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_emerald.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_emerald.json deleted file mode 100644 index 32f3524e..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_emerald.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot", - "texture3": "forgecraft:items/hot_bronze" - }, - "parent": "forgecraft:item/stonetongs_hotbronze" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_lapis.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_lapis.json deleted file mode 100644 index 32f3524e..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_lapis.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot", - "texture3": "forgecraft:items/hot_bronze" - }, - "parent": "forgecraft:item/stonetongs_hotbronze" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_redstone.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_redstone.json deleted file mode 100644 index 32f3524e..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_redstone.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot", - "texture3": "forgecraft:items/hot_bronze" - }, - "parent": "forgecraft:item/stonetongs_hotbronze" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked.json deleted file mode 100644 index 7719f1a2..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot", - "texture3": "forgecraft:items/molten_bronze" - }, - "parent": "forgecraft:item/stonetongs_hotbronze" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_diamond.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_diamond.json deleted file mode 100644 index 741fbde3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_diamond.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot", - "texture3": "forgecraft:items/molten_bronze" - }, - "parent": "forgecraft:item/stonetongs_hotbronze" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_emerald.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_emerald.json deleted file mode 100644 index 741fbde3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_emerald.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot", - "texture3": "forgecraft:items/molten_bronze" - }, - "parent": "forgecraft:item/stonetongs_hotbronze" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_lapis.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_lapis.json deleted file mode 100644 index 741fbde3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_lapis.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot", - "texture3": "forgecraft:items/molten_bronze" - }, - "parent": "forgecraft:item/stonetongs_hotbronze" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_redstone.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_redstone.json deleted file mode 100644 index 741fbde3..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_redstone.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot", - "texture3": "forgecraft:items/molten_bronze" - }, - "parent": "forgecraft:item/stonetongs_hotbronze" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleaniron.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleaniron.json deleted file mode 100644 index 11e7c5d4..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleaniron.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:item/stonetongs_hotiron" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleanironcooked.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleanironcooked.json deleted file mode 100644 index 70458ffb..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleanironcooked.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:item/stonetongs_hotiron" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleanironfailed.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleanironfailed.json deleted file mode 100644 index d5e4a58b..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleanironfailed.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot_burnt" - }, - "parent": "forgecraft:item/stonetongs_hotiron" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotiron.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotiron.json deleted file mode 100644 index db7e2463..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotiron.json +++ /dev/null @@ -1,257 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 4, 0, 0 ], - "to": [ 5, 1, 3 ], - "shade": false, - "faces": { - "down": { "uv": [ 4, 12, 5, 15 ], "texture": "#texture1" }, - "up": { "uv": [ 4, 1, 5, 4 ], "texture": "#texture1" }, - "north": { "uv": [ 11, 13, 12, 14 ], "texture": "#texture1" }, - "south": { "uv": [ 4, 13, 5, 14 ], "texture": "#texture1" }, - "west": { "uv": [ 1, 14, 4, 15 ], "texture": "#texture1" }, - "east": { "uv": [ 12, 14, 15, 15 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube2", - "from": [ 11, 0, 0 ], - "to": [ 12, 1, 3 ], - "shade": false, - "faces": { - "down": { "uv": [ 4, 12, 5, 15 ], "texture": "#texture1" }, - "up": { "uv": [ 4, 1, 5, 4 ], "texture": "#texture1" }, - "north": { "uv": [ 11, 13, 12, 14 ], "texture": "#texture1" }, - "south": { "uv": [ 4, 13, 5, 14 ], "texture": "#texture1" }, - "west": { "uv": [ 1, 14, 4, 15 ], "texture": "#texture1" }, - "east": { "uv": [ 12, 14, 15, 15 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube3", - "from": [ 4, 0, 3 ], - "to": [ 5, 1, 10 ], - "rotation": { "origin": [ 4, 0, 3 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "down": { "uv": [ 4, 2, 5, 9 ], "texture": "#texture" }, - "up": { "uv": [ 4, 3, 5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 11, 15, 12, 16 ], "texture": "#texture" }, - "south": { "uv": [ 4, 15, 5, 16 ], "texture": "#texture" }, - "west": { "uv": [ 3, 15, 10, 16 ], "texture": "#texture" }, - "east": { "uv": [ 7, 15, 14, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube4", - "from": [ 11, 0, 3 ], - "to": [ 12, 1, 10 ], - "rotation": { "origin": [ 12, 1, 3 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "down": { "uv": [ 4, 2, 5, 9 ], "texture": "#texture" }, - "up": { "uv": [ 4, 3, 5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 11, 15, 12, 16 ], "texture": "#texture" }, - "south": { "uv": [ 4, 15, 5, 16 ], "texture": "#texture" }, - "west": { "uv": [ 3, 15, 10, 16 ], "texture": "#texture" }, - "east": { "uv": [ 7, 15, 14, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube5", - "from": [ 6.5, 0, 7.5 ], - "to": [ 7.5, 1, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 6.5, 0, 7.5, 8.5 ], "texture": "#texture" }, - "up": { "uv": [ 6.5, 7.5, 7.5, 16 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 15, 9.5, 16 ], "texture": "#texture" }, - "south": { "uv": [ 6.5, 15, 7.5, 16 ], "texture": "#texture" }, - "west": { "uv": [ 7.5, 15, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 15, 8.5, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube6", - "from": [ 8.5, 0, 7.5 ], - "to": [ 9.5, 1, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 8.5, 0, 9.5, 8.5 ], "texture": "#texture" }, - "up": { "uv": [ 8.5, 7.5, 9.5, 16 ], "texture": "#texture" }, - "north": { "uv": [ 6.5, 15, 7.5, 16 ], "texture": "#texture" }, - "south": { "uv": [ 8.5, 15, 9.5, 16 ], "texture": "#texture" }, - "west": { "uv": [ 7.5, 15, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 15, 8.5, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube16", - "from": [ 5, -3, 2 ], - "to": [ 11, 3, 3 ], - "shade": false, - "faces": { - "down": { "uv": [ 5, 13, 11, 14 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 2, 11, 3 ], "texture": "#texture2" }, - "north": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, - "west": { "uv": [ 2, 10, 3, 16 ], "texture": "#texture2" }, - "east": { "uv": [ 13, 10, 14, 16 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube17", - "from": [ 5, -3, -3 ], - "to": [ 11, 3, -2 ], - "shade": false, - "faces": { - "down": { "uv": [ 5, 13, 11, 14 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 2, 11, 3 ], "texture": "#texture2" }, - "north": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, - "west": { "uv": [ 2, 10, 3, 16 ], "texture": "#texture2" }, - "east": { "uv": [ 13, 10, 14, 16 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube18", - "from": [ 5, -3, -2 ], - "to": [ 6, 3, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 5, 12, 6, 16 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 0, 6, 4 ], "texture": "#texture2" }, - "north": { "uv": [ 10, 10, 11, 16 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 10, 6, 16 ], "texture": "#texture2" }, - "west": { "uv": [ 0, 10, 4, 16 ], "texture": "#texture2" }, - "east": { "uv": [ 12, 10, 16, 16 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube19", - "from": [ 10, -3, -2 ], - "to": [ 11, 3, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 5, 12, 6, 16 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 0, 6, 4 ], "texture": "#texture2" }, - "north": { "uv": [ 10, 10, 11, 16 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 10, 6, 16 ], "texture": "#texture2" }, - "west": { "uv": [ 0, 10, 4, 16 ], "texture": "#texture2" }, - "east": { "uv": [ 12, 10, 16, 16 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube20", - "from": [ 5, -4, -3 ], - "to": [ 11, -3, 3 ], - "shade": false, - "faces": { - "down": { "uv": [ 5, 10, 11, 16 ], "texture": "#texture2" }, - "up": { "uv": [ 5, 0, 11, 6 ], "texture": "#texture2" }, - "north": { "uv": [ 5, 3, 11, 4 ], "texture": "#texture2" }, - "south": { "uv": [ 5, 3, 11, 4 ], "texture": "#texture2" }, - "west": { "uv": [ 0, 3, 6, 4 ], "texture": "#texture2" }, - "east": { "uv": [ 10, 3, 16, 4 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube21", - "from": [ 4, 1, -2 ], - "to": [ 5, 2, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2" }, - "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2" }, - "north": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, - "south": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, - "east": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube22", - "from": [ 11, 1, -2 ], - "to": [ 12, 2, 2 ], - "shade": false, - "faces": { - "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2", "rotation": 90 }, - "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2", "rotation": 270 }, - "north": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" }, - "south": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, - "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube23", - "from": [ 6, 1, -4 ], - "to": [ 10, 2, -3 ], - "shade": false, - "faces": { - "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2", "rotation": 90 }, - "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2", "rotation": 270 }, - "north": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" }, - "south": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, - "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube24", - "from": [ 6, 1, 3 ], - "to": [ 10, 2, 4 ], - "shade": false, - "faces": { - "down": { "uv": [ 4, 12, 5, 16 ], "texture": "#texture2", "rotation": 90 }, - "up": { "uv": [ 4, 0, 5, 4 ], "texture": "#texture2", "rotation": 270 }, - "north": { "uv": [ 12, 14, 16, 15 ], "texture": "#texture2" }, - "south": { "uv": [ 0, 14, 4, 15 ], "texture": "#texture2" }, - "west": { "uv": [ 11, 14, 12, 15 ], "texture": "#texture2" }, - "east": { "uv": [ 4, 14, 5, 15 ], "texture": "#texture2" } - } - }, - { - "__comment": "Cube25", - "from": [ 5.5, 3, -2.5 ], - "to": [ 10.5, 4, 2.5 ], - "shade": false, - "faces": { - "down": { "uv": [ 5.5, 9.5, 10.5, 14.5 ], "texture": "#texture2" }, - "up": { "uv": [ 5.5, 0.5, 10.5, 5.5 ], "texture": "#texture2" }, - "north": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture2" }, - "south": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture2" }, - "west": { "uv": [ 0.5, 12, 5.5, 13 ], "texture": "#texture2" }, - "east": { "uv": [ 10.5, 12, 15.5, 13 ], "texture": "#texture2" } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ 60, 0, 0 ], - "translation": [ 0, 8.9, 3.7 ] - }, - "firstperson_righthand": { - "translation": [ 0, 5.5, -7 ] - }, - "gui": { - "rotation": [ 90, 0, 0 ], - "scale": [ 0.95, 0.95, 0.95 ] - }, - "ground": { - "translation": [ 0, 4, 0 ] - }, - "fixed": { - "rotation": [ 90, 0, 0 ], - "translation": [ 0, 0, 8 ] - } - } -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotironcooked.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotironcooked.json deleted file mode 100644 index 70458ffb..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotironcooked.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:item/stonetongs_hotiron" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotironfailed.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotironfailed.json deleted file mode 100644 index d5e4a58b..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotironfailed.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot_burnt" - }, - "parent": "forgecraft:item/stonetongs_hotiron" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteel.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteel.json deleted file mode 100644 index 11e7c5d4..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:item/stonetongs_hotiron" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteelcooked.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteelcooked.json deleted file mode 100644 index 70458ffb..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteelcooked.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot" - }, - "parent": "forgecraft:item/stonetongs_hotiron" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteelfailed.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteelfailed.json deleted file mode 100644 index d5e4a58b..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteelfailed.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot_burnt" - }, - "parent": "forgecraft:item/stonetongs_hotiron" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_pickaxe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_pickaxe_hot.json deleted file mode 100644 index 68a6512d..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_pickaxe_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/iron_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_pickaxe_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_shovel_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_shovel_hot.json deleted file mode 100644 index 49c0018c..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_shovel_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/iron_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_shovel_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_axe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_axe_hot.json deleted file mode 100644 index d697ec71..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_axe_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/steel_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_axe_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_hoe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_hoe_hot.json deleted file mode 100644 index b000bf47..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_hoe_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/steel_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_hoe_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_pickaxe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_pickaxe_hot.json deleted file mode 100644 index 243ffc4b..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_pickaxe_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/steel_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_pickaxe_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_shovel_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_shovel_hot.json deleted file mode 100644 index 0942d453..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_shovel_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/steel_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_shovel_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steelchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steelchunk.json deleted file mode 100644 index 90d04907..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steelchunk.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/iron_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_chunk_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steelingot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steelingot.json deleted file mode 100644 index d5759a5c..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steelingot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "blocks/planks_oak", - "texture": "blocks/planks_oak", - "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/steel_ingot_hot" - }, - "parent": "forgecraft:item/stonetongs_ingot_default" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/testnbtcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/testnbtcrucible.json deleted file mode 100644 index 214c15e5..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/testnbtcrucible.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forgecraft:block/crucibleshut" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzball_delete.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzball_delete.json deleted file mode 100644 index 4e6f7bfa..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzball_delete.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/wootz_ingot", - "texture": "forgecraft:blocks/wootz_ingot" - }, - "parent": "forgecraft:block/ironball" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzballhot_delete.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzballhot_delete.json deleted file mode 100644 index 2efcfc50..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzballhot_delete.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/wootz_ingot_hot", - "texture": "forgecraft:blocks/wootz_ingot_hot" - }, - "parent": "forgecraft:block/ironball" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzchunk_delete.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzchunk_delete.json deleted file mode 100644 index b1172b30..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzchunk_delete.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/wootz_ingot", - "texture": "forgecraft:blocks/wootz_ingot" - }, - "parent": "forgecraft:block/ironchunk" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzchunkhot_delete.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzchunkhot_delete.json deleted file mode 100644 index d51a49e4..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzchunkhot_delete.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "forge_marker":1, - "textures": { - "particle": "forgecraft:blocks/wootz_ingot_hot", - "texture": "forgecraft:blocks/wootz_ingot_hot" - }, - "parent": "forgecraft:block/ironchunk" -} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzgladius.json b/kfc/src/main/resources/assets/forgecraft/models/item/wootzgladius.json new file mode 100644 index 00000000..aa2d12f7 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/wootzgladius.json @@ -0,0 +1,293 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "forgecraft:blocks/wootz_ingot", + "texture": "forgecraft:blocks/wootz_ingot", + "texture1": "blocks/planks_oak" + }, + "elements": [ + { + "__comment": "Cube23", + "from": [ 7.25, -5.5, 7.25 ], + "to": [ 9.25, 0, 8.75 ], + "faces": { + "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7, 9, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 9, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 9, 8.5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 9, 8.5, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube24", + "from": [ 7, -8, 7 ], + "to": [ 9.5, -5.5, 9 ], + "faces": { + "down": { "uv": [ 6.5, 7, 9.5, 9 ], "texture": "#texture1" }, + "up": { "uv": [ 6.5, 7, 9.5, 9 ], "texture": "#texture1" }, + "north": { "uv": [ 6.5, 0, 9.5, 1 ], "texture": "#texture1" }, + "south": { "uv": [ 6.5, 0, 9.5, 1 ], "texture": "#texture1" }, + "west": { "uv": [ 7, 0, 9, 1 ], "texture": "#texture1" }, + "east": { "uv": [ 7, 0, 9, 1 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube25", + "from": [ 6.5, 0, 7.25 ], + "to": [ 10, 0.5, 8.75 ], + "faces": { + "down": { "uv": [ 5.5, 6.5, 10.5, 9.5 ], "texture": "#texture1" }, + "up": { "uv": [ 5.5, 6.5, 10.5, 9.5 ], "texture": "#texture1" }, + "north": { "uv": [ 5.5, 0, 10.5, 1 ], "texture": "#texture1" }, + "south": { "uv": [ 5.5, 0, 10.5, 1 ], "texture": "#texture1" }, + "west": { "uv": [ 6.5, 0, 9.5, 1 ], "texture": "#texture1" }, + "east": { "uv": [ 6.5, 0, 9.5, 1 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube23", + "from": [ 6.5, 1, 7.5 ], + "to": [ 10, 6, 8.5 ], + "faces": { + "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7, 9, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 9, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 9, 8.5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 9, 8.5, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube28", + "from": [ 8, 1, 8.5 ], + "to": [ 8.5, 24, 8.501 ], + "faces": { + "down": { "uv": [ 7.5, 7, 8.5, 7.5 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 8.5, 8.5, 9 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 0, 8.5, 15 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 0, 8.5, 15 ], "texture": "#texture" }, + "west": { "uv": [ 8.5, 0, 9, 15 ], "texture": "#texture" }, + "east": { "uv": [ 7, 0, 7.5, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube32", + "from": [ 6.75, 21.5, 7.5 ], + "to": [ 9.75, 23, 8.5 ], + "faces": { + "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7, 7, 9, 9.5 ], "texture": "#texture" }, + "south": { "uv": [ 7, 7, 9, 9.5 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 7, 8.5, 9.5 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 7, 8.5, 9.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube32", + "from": [ 7.25, 24.5, 7.5 ], + "to": [ 9.25, 26, 8.5 ], + "faces": { + "down": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7.5, 9, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7, 7, 9, 8 ], "texture": "#texture" }, + "south": { "uv": [ 7, 7, 9, 8 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 7, 8.5, 8 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 7, 8.5, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube9", + "from": [ 7.75, 27, 7.5 ], + "to": [ 8.75, 28, 8.5 ], + "faces": { + "down": { "uv": [ 8, 7.5, 8.5, 8 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 8, 8, 8.5, 8.5 ], "texture": "#texture", "rotation": 180 }, + "north": { "uv": [ 8, 4.5, 8.5, 5.5 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 4.5, 8, 5.5 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 4.5, 8, 5.5 ], "texture": "#texture" }, + "east": { "uv": [ 8, 4.5, 8.5, 5.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube28", + "from": [ 8, 1, 7.499 ], + "to": [ 8.5, 24, 7.5 ], + "faces": { + "down": { "uv": [ 7.5, 7, 8.5, 7.5 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 7.5, 8.5, 8.5, 9 ], "texture": "#texture", "rotation": 180 }, + "north": { "uv": [ 7.5, 0, 8.5, 15 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 0, 8.5, 15 ], "texture": "#texture" }, + "west": { "uv": [ 7, 0, 7.5, 15 ], "texture": "#texture" }, + "east": { "uv": [ 8.5, 0, 9, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube14", + "from": [ 6, 0.5, 7.25 ], + "to": [ 10.5, 2.5, 8.75 ], + "faces": { + "down": { "uv": [ 6, 7.25, 10.5, 8.75 ], "texture": "#texture1" }, + "up": { "uv": [ 6, 7.25, 10.5, 8.75 ], "texture": "#texture1" }, + "north": { "uv": [ 5.5, 13.5, 10, 15.5 ], "texture": "#texture1" }, + "south": { "uv": [ 6, 13.5, 10.5, 15.5 ], "texture": "#texture1" }, + "west": { "uv": [ 7.25, 13.5, 8.75, 15.5 ], "texture": "#texture1" }, + "east": { "uv": [ 7.25, 13.5, 8.75, 15.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube11", + "from": [ 6.25, 0.5, 6.75 ], + "to": [ 10.25, 2.5, 9.25 ], + "faces": { + "down": { "uv": [ 6.25, 6.75, 10.25, 9.25 ], "texture": "#texture1" }, + "up": { "uv": [ 6.25, 6.75, 10.25, 9.25 ], "texture": "#texture1" }, + "north": { "uv": [ 5.75, 13.5, 9.75, 15.5 ], "texture": "#texture1" }, + "south": { "uv": [ 6.25, 13.5, 10.25, 15.5 ], "texture": "#texture1" }, + "west": { "uv": [ 6.75, 13.5, 9.25, 15.5 ], "texture": "#texture1" }, + "east": { "uv": [ 6.75, 13.5, 9.25, 15.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube13", + "from": [ 7, 23, 7.5 ], + "to": [ 9.5, 24.5, 8.5 ], + "faces": { + "down": { "uv": [ 7, 7.5, 9.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7.5, 9.5, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 6.5, 7.5, 9, 9 ], "texture": "#texture" }, + "south": { "uv": [ 7, 7.5, 9.5, 9 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 7.5, 8.5, 9 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 7.5, 8.5, 9 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube14", + "from": [ 7.5, 26, 7.5 ], + "to": [ 9, 27, 8.5 ], + "faces": { + "down": { "uv": [ 7.5, 7.5, 9, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 7.5, 9, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7, 5, 8.5, 6 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 5, 9, 6 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 5, 8.5, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube15", + "from": [ 7, -7.5, 6.5 ], + "to": [ 9.5, -6, 9.5 ], + "faces": { + "down": { "uv": [ 7, 6.5, 9.5, 9.5 ], "texture": "#texture1" }, + "up": { "uv": [ 7, 6.5, 9.5, 9.5 ], "texture": "#texture1" }, + "north": { "uv": [ 6.5, 6, 9, 7.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 6, 9.5, 7.5 ], "texture": "#texture1" }, + "west": { "uv": [ 6.5, 6, 9.5, 7.5 ], "texture": "#texture1" }, + "east": { "uv": [ 6.5, 6, 9.5, 7.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube16", + "from": [ 6.5, -7.5, 7 ], + "to": [ 10, -6, 9 ], + "faces": { + "down": { "uv": [ 6.5, 7, 10, 9 ], "texture": "#texture1" }, + "up": { "uv": [ 6.5, 7, 10, 9 ], "texture": "#texture1" }, + "north": { "uv": [ 6, 6, 9.5, 7.5 ], "texture": "#texture1" }, + "south": { "uv": [ 6.5, 6, 10, 7.5 ], "texture": "#texture1" }, + "west": { "uv": [ 7, 6, 9, 7.5 ], "texture": "#texture1" }, + "east": { "uv": [ 7, 6, 9, 7.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube17", + "from": [ 8, -8.5, 7.75 ], + "to": [ 8.5, -8, 8.25 ], + "faces": { + "down": { "uv": [ 8, 7.75, 8.5, 8.25 ], "texture": "#texture" }, + "up": { "uv": [ 8, 7.75, 8.5, 8.25 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 8, 8, 8.5 ], "texture": "#texture" }, + "south": { "uv": [ 8, 8, 8.5, 8.5 ], "texture": "#texture" }, + "west": { "uv": [ 7.75, 8, 8.25, 8.5 ], "texture": "#texture" }, + "east": { "uv": [ 7.75, 8, 8.25, 8.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube24", + "from": [ 6.75, 6, 7.5 ], + "to": [ 9.75, 15.5, 8.5 ], + "faces": { + "down": { "uv": [ 6.75, 7.5, 9.75, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 6.75, 7.5, 9.75, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 6.25, 0.5, 9.25, 10 ], "texture": "#texture" }, + "south": { "uv": [ 6.75, 0.5, 9.75, 10 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 0.5, 8.5, 10 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 0.5, 8.5, 10 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube19", + "from": [ 6.5, 15.5, 7.5 ], + "to": [ 10, 21.5, 8.5 ], + "faces": { + "down": { "uv": [ 6.5, 7.5, 10, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 6.5, 7.5, 10, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 6, 0, 9.5, 0.5 ], "texture": "#texture" }, + "south": { "uv": [ 6.5, 0, 10, 0.5 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube20", + "from": [ 8, 27.75, 7.5 ], + "to": [ 8.5, 28.75, 8.5 ], + "faces": { + "down": { "uv": [ 8, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 8, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 3.25, 8, 4.25 ], "texture": "#texture" }, + "south": { "uv": [ 8, 3.25, 8.5, 4.25 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 3.25, 8.5, 4.25 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 3.25, 8.5, 4.25 ], "texture": "#texture" } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 5.9, 1.33 ], + "scale": [ 0.75, 0.75, 0.75 ] + }, + "thirdperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 5.9, 1.33 ], + "scale": [ 0.75, 0.75, 0.75 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 6.6, 1 ], + "scale": [ 0.75, 0.75, 0.75 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 6.6, 1 ], + "scale": [ 0.75, 0.75, 0.75 ] + }, + "gui": { + "rotation": [ 0, 0, -45 ], + "translation": [ -0.4, -0.4, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "ground": { + "rotation": [ 90, 0, 0 ], + "scale": [ 0.75, 0.75, 0.75 ] + }, + "fixed": { + "rotation": [ 0, 0, 45 ], + "translation": [ 0.7, -0.7, 0 ], + "scale": [ 0.66, 0.66, 0.66 ] + } + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzlongsword.json b/kfc/src/main/resources/assets/forgecraft/models/item/wootzlongsword.json new file mode 100644 index 00000000..3abe1cd9 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/wootzlongsword.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/steel_ingot", + "texture": "forgecraft:blocks/steel_ingot", + "light": "forgecraft:blocks/wootz_ingot_light", + "dark": "forgecraft:blocks/wootz_ingot_dark" + }, + "parent": "forgecraft:item/longsword" +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzslayer.json b/kfc/src/main/resources/assets/forgecraft/models/item/wootzslayer.json new file mode 100644 index 00000000..6dd13967 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/wootzslayer.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/wootz_ingot", + "texture": "forgecraft:blocks/wootz_ingot", + "light": "forgecraft:blocks/wootz_ingot_light", + "dark": "forgecraft:blocks/wootz_ingot_dark" + }, + "parent": "forgecraft:item/slayer" +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/textures/Thumbs.db b/kfc/src/main/resources/assets/forgecraft/textures/Thumbs.db deleted file mode 100644 index e1b47e865e3fa4c2763177db24570c055a341c04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmeHIc~I1K6o0?{{g!26U07HSAtf$F$}uhhO_m$k#uy+n$)-3Bnj-K()@%nwFhr0P zks3#d!+^>GZ^t4oE5;%v4zU>yMFg7?kYfS)^}f46zzh!dS2Vnx&+onWz21A@_kC}F ztrNB7mKwFgEOG%F##uh7O&h0BCQy<#00#x4kFzYR8U#RbkrvPmJV9Sc{s!XG~pFIss@;Wj`DuQMQ9n zL?n6>iFTdP6KAFDG-K~{#TvUHu{%lA=jM{NaKdQ9{#IgnU1EGl!AeJD62+|+$F91Xc9fU4IjL<{qBMcCRh@}W4gfU{Vr%cb(e?ulY zBDv3>c#oG?SIE{EE$d{P**4IYdi#0V$ww$wZ4=GwkncgH4zA!zQ)a*sQM8C+tHA`H zGZ(#`au{_E&2ZIt>U<4NTyQ}fy9G^i7@Esv@U>HWaUK{ESI5-GO-D?Syf$g{f8fas=ZbJTSH@0^X-=Qj=T3d?{_`u?&^ZaG^`jQaZy04!kUU~ zR$L;Ci^Gt-khmyLJPBOHa7}I0blm)TA+fqHBQ`ZITEV%wcm?>4WCfH--R;FvUN$odL`yHiP<$aQ_mg42ROJv&&UKvJPfvZ!~ zyFBG}ih;bd(OQ1}skX7H{ptPeZ7f@5k0qsx?^sE0`72X8cRAc&2=%KC+Kct8>`M#2 zeurH&6ON0+z54Ulhk6*>)s`iv9b@dh!osZ$-#;R4E9^+BS>CJ{(HCL-QNHBc48aX) z%*H`QqO>&hx$}EEynktwTU7q6>F#vLx(z7P#22^Z9Qv^8UQp1cudY~>tXdP7kk!)D zCapc1tzqt&<~v%mx6I3!oBZ;!9=*4igQce{vok(E)!29`>*QnEdxb1S`>Co!RTGQf Hxo_ZaOO^Ve diff --git a/kfc/src/main/resources/assets/forgecraft/textures/items/bronze_block.png b/kfc/src/main/resources/assets/forgecraft/textures/blocks/bronze_block.png similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/textures/items/bronze_block.png rename to kfc/src/main/resources/assets/forgecraft/textures/blocks/bronze_block.png diff --git a/kfc/src/main/resources/assets/forgecraft/textures/blocks/clay.png b/kfc/src/main/resources/assets/forgecraft/textures/blocks/clay.png index ff9f58d51ac1d899d6c958642d63df623ec207ec..c9af862eba02e71a1c8ae588e7adf0fcf861f530 100644 GIT binary patch delta 595 zcmV-Z0<8VC1;GW7Q3~P-6afV!1%=2nky|W(B}qgtf(snn_~XyN62{~b*iz!Th8cmmcO^m>T5#UdE8bBO z_xozYkUW=gsG(p7z(cu?wQ_#CBhe!Ik`-$9U{}TC0q9@T$9Xnxn7O=Fo|jP z_xWNJ0!2?BhNfqlr^#MAMwrl+)iSSt4&#$4Q%LsB;dIn84QL-q_`0liwRjx{Q?iwC zf?CwdH;lrEdG)lbUOHDvhH}Bnt{D~QD4wI3w{(pV5w7dzv~{Nlx82T{&Oi6N+tRHl z?>#k-V`AyPqwR`Q^6!0BYcbX8nq9-EwR_v|4K3VJK4YF1PnlH4!ie*<>XEX4gz0hy zTX5brYlgX2zXvUA*vHO$re4Zpj$|CFQ8i~eoQ{r2%!RVAj|f`n>8YnJySWrYPg{gq z!Z9BX6K3@Ffql>LRA@q(Gkv>V+mX@AIUU;!lO delta 582 zcmV-M0=fOc1+)c_Q3~M!7XUE}u$&tLt0pcbt z+W+rEKcSzLwn^+*iWbk1eHb+;fq5A&xc89q{m0J;fB+H5*#SsN`4^=WMC9ZBs{v4e zYrhZy?x3dF+FbvfQ5967Nk+H(L{#IbCB+@w zgX6KQAVhe0ctAvn0JGYxszk(EA}fP{ewbI!LC(&yI6-YL9-Pk?A}W*Xu<-Koib&<8 zr8vi~rMT1gJrJnY>F?9RI4*R@BgLJ62xq@-IGyfSMxbWOG~F;&4u=j9QZhuKZ4#SJ zA`n!RVO&T_*6jol>l!zk77;~MQ8jLhqavsZ^ODK83?l5e8*&b=*PeOKbwDXqiU>?o z0bsW?JcPIFLfaTk(-2;B^HSLE_B4$mvMT6@36CHpS^W!rKVur0Dd*Sck1O1N?^+^+ z)HH}dvZNgLn{_}XTRiBxrf$Za)9J*zcFctRt~LWCFHR{=amUPvSpAzq2w_I873O83 zX$(RT1rtRhg3INM7iSvl8IRKl0i|Sy_nG33N31M@%i9~nI9G^f%IS1ZO3FA6q+}fS zhgG6*IX?rzEoW3Khr7Fu-KMQE7D@>~FiU*-^2q<83g5ndMOA1TK>$tmks-={F#rGn07*qoM6N<$f(n2ZegFUf diff --git a/kfc/src/main/resources/assets/forgecraft/textures/blocks/wootz_ingot_dark.png b/kfc/src/main/resources/assets/forgecraft/textures/blocks/wootz_ingot_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..95a03587e20821b032200a5b744b0b691e5bb5bc GIT binary patch literal 789 zcmV+w1M2*VP)8GER8Yoo++!G%-TlUW$fwR585QLsVnji@I}h2Nlau;@I`vT2 zj~{=UvMd1z!wG@!lN}EHzS*FSK?sYcxloiP;dH`yJRwa}!YIVTLe}*OF!;X5^Yb&> z7~VD;s?!OrHBX+0=leXe49gPy7p*mNv;J+3{WEtM6vyL%-F8bDMg)ORUDqT@LYk(?VHg;X$MlZ}kG>~)dqXQt zc`9j|2HUoISuB{xF~{S9An*Y`C9=EUSuS7LZFjuBzLFo0RHq7QO90~eoIKAlz@zU0 zXqtu~2)JIa$S@2k%L>OCF$@FM>BQGRzT&zrm&=9yeovAlSe8Ye=cH-+nQz-R(s3N5 zF`Vm~y594aB;4cBAWh zwAT2(kMH}GWy#2K@P10atX9a==|tPMOs7+hhXYs^78b7S;`tuky+bLDHj1aGC(5EA ziXx;OQB)=J*Hyw6OuZ>W2$a%{Mv@>1Fvg&iqONPM?Ug|(in3%jo8d?Y>3JS;90SmG z9e;g%@PB;I=jCNV+qT$3Fq=gbWko!nBb8G0eUD{X?Dl(>%O$pLGdu>0qCf}>V+`-_ z@2uBry1wV!T$s;hlvRb8Oebh#_}FfljK_5MI~ap8nmC@b`m!R5LcV?f&N0tfEEd>8 za6X?INr|{#TmHUW0PsAIFpTK?9;Fn$>~{8A@q+ T(qf6200000NkvXXu0mjfbBAkF literal 0 HcmV?d00001 diff --git a/kfc/src/main/resources/assets/forgecraft/textures/blocks/wootz_ingot_light.png b/kfc/src/main/resources/assets/forgecraft/textures/blocks/wootz_ingot_light.png new file mode 100644 index 0000000000000000000000000000000000000000..3f78632fb34febc1fae893c4185d5e2a429e18ad GIT binary patch literal 859 zcmV-h1Elq)noVU9O`9R67!KI zuw6`od9nT4Jw#nqeeN?Fjb^mBZ-2=rlL?UHy057?4uemh_@UP$%X4&HXR%lij7HSm z8rA9^o_9;V;i79gVm5mKGHl!C=;#QQWnA}qJbZp2O*3}OyOeF4?RJZ%Y5bQ|DMZ04 z5JeHEr){!4XSG^!HypB!W5{!a5S*W%bI@!OZ6uY-i`W!`RAuP4T_#NubX`YE$zU)* zm?rgloq}bNWjTYvfST)~(v11h9SLPk1z~btyVleJ+WR# zD5Y>J4o<~k6pXP77Pei+^KSXR(?R?3r=RmM3~_5Uq?Dj(=$ekELD?=7ts~M@p|X@b z%XxlY(`YnE)08wz5&y2r5C*kc4Z|=6_sk0Jj+OugxTyfUzbagG+{Iz(QG!c z3KqgH?{e5`0T4wIfB8QD$FUtwPL5eFLxf?_Y&IE<#~ij=h$K}=DbX~I5B)x;?KXxG zBymg-jL;38EX(-w{d+DiFNii99_Moo4w{T76SQA{|07>Nuj%*u?C6HKg002ovPDHLkV1n!HhX?=w literal 0 HcmV?d00001 diff --git a/kfc/src/main/resources/assets/forgecraft/textures/gui/jei/casting.png b/kfc/src/main/resources/assets/forgecraft/textures/gui/jei/casting.png new file mode 100644 index 0000000000000000000000000000000000000000..58fef10c1c9d971214fe355414899a4c6e15c2f7 GIT binary patch literal 781 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6|H(?D8gCb z5n0T@z%2~Ij105pNB{-dOFVsD*&lHViz$dLls^I#Vw&aY;uunK>+KywKc+yDwu{|~ ztR}&e12#7#N?+c{HR&biZ0TP&Cy1%3m1!OOf6{vSrd^LFe7CGTdROQ4rzioVzQ@Oc zPuvU(jn$jp&hC3TWclTjYx2)ERWPhtRkr)CbMv#xb-(}SUE@!4Jk{;az{J48puo@o zv=%Gl!m8Y>zl*vm=hde!i2P8WvxY_aq}K+vdkkwno;nLMbInJub4?=C8}OI`mO8sh zNXLeI5>WrCL8Cuw>eh5w)&-}e)<0Pj=6m_em-^)QF-%Rsuy82P+djKpfuRG)oZglw z(CC+I+qCchZ@$AHG?}iyzB*lrL4_}odwz1{G^yhkfxJJhhaU#~{%iN`_w~}hKYmu& zSp8u-5N|dA{KxYf)~!B#Uvqkc#UCbz^D=de2OheE(h3VhMP67_Yx>qxw>H~FaJo&I fn!qr)LHuVnHx=c;s%7hyKo0eE^>bP0l+XkKQ0v|1 literal 0 HcmV?d00001 diff --git a/kfc/src/main/resources/assets/forgecraft/textures/gui/jei/crucible.png b/kfc/src/main/resources/assets/forgecraft/textures/gui/jei/crucible.png index 574b94df417e032bbae3f2c9091379bc9bddb79d..bf6507a19e17d12b177e7aa3fb0a6121eaaa399e 100644 GIT binary patch delta 613 zcmbQw(Zn$!xL$<8fMd!!oF!Z|@rVy><|2c*uE5Hpbm+?!A+ym!67D zyyL!e&fVWm3mx3vi+ZpKm%aVDuZt^__w#0n%o|^7|8r<8$-UjXJm8#}(xa-q=l;1o z|7_{Ee6l*1H}?UP1H~n=;)e|?7Hv?-mt*8$P+(|aU|?bZGA7G1im0vKCMds~Vb{9P zCJHlqrzT8EQH@|VXV5;VP{^>1ao%Asg9tf&M#sq)ndRkHrK(D(q^U}{MskK7hd@3z&gYLhK1r4=mTPG(Y_)Brw?# zsAfS_Sd(K?SX1DXsR^QY7=Tho7-z6m@M#}RsNBQCGWj60eEo`PQxhi4n3^Dx3Ux#2IhA|Gx3|+b-D*nd9gC`P&bBvnd0O zYLMR`0dR zJYbjr!{b@_j$P zat#(4Z}<4qiZ?$?*}2H7ENV{ZeY^MM&wVF7cZ8qM?+IWRCVGO#dAUdAM$&fvAx=Vh|E z!)22^=BCI9PB*`>CeaTp391q-dpFj0(~)~@$*lc-}+H4#!3uqE-V5KuR}vke=~L# zxaGaS|DS8Z@7bGHt;%OEvYI=|_|ROY4_~FXw9KEBdwbd2ve!KY{S0fazupqHc9ZOi z_rK5go6kP$%cgutQn10^Qiks)f7sRUe|_130-cG|^cj_T+8(+y)CnXS@YpjY`~cYw z48tF~zZuewWSOr^Rh5X0|H(?D8gCb z5n0T@z%2~Ij105pNB{-dOFVsD*&lI=Fz6e<`2YGf0|T?9r;B4q#jUq@4D;qVh%`Lh zE~vg>q1&Qo3Ti0YT}<}<=o@@|H#*-f6Arz4_3>$ z74)oo&GXR3)#ZqZufDzskMoz>`A09D>5gVqP+FvOdb-%G=a$=YPp1_;J1YCfh)ICK z0pxlX2JDQ6)mlpT_?FLje$!-LO5B~JhbJc7pFLYp21tunFr7F!@p#440+kub=UE<1 z>wmZYM@3IKpL>(6rT)5;?F|YH4Geb<>{=HW`dR6@I>YQ+drnv|gofU{^6aQE-~aH2 z&E`R&q4UkYZqm6|n{T48C)dzF`xV#w9L=St|ECLoeq_d&F-z^$F1xo)-)igs@5;S> zIzR36qcBE^;~&3t-}?S{|IIVcj?T>cskq>5PF#u%!|a=TPM9#5ZLXa7Q5y4_`1LhoE1Gi;K_Y zFQ1$a8@Sy6e(l$zsPL(WO+T442nwb~?%Q&~=KRLo*<1H*ycWuPxZrp87j3XJCd@32 z<#l8bU}R~~2@O?cnyJ;J@V@;1s#SKb36Wy@T?_@sd@EY#D=!s^yy29>CN%h(W{iKa9I24tM;u>;+~L1_n=8KbLh*2~7Zq C+ajg_ literal 0 HcmV?d00001 diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index 09842133..3ce8467b 100644 --- a/kfc/src/main/resources/mcmod.info +++ b/kfc/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", - "version": "1.5.2", + "version": "1.6.02", "mcversion": "1.12.2", "url": "", "updateUrl": "",