From 27e670e53777df95261d28eafdf98b67fe594f23 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 25 Jun 2017 03:42:41 -0400 Subject: [PATCH] all the assets, casting recipes, bloomery recipes and tweaks, upgrades done --- 1.11/To-Dos.md | 13 +- .../forgecraft/blocks/CastingBlock.java | 456 +++++++++++++++++- .../nmd/primal/forgecraft/init/ModBlocks.java | 64 +++ .../primal/forgecraft/init/ModCrafting.java | 148 +++++- .../nmd/primal/forgecraft/init/ModItems.java | 61 ++- .../forgecraft/items/ItemStoneTongs.java | 190 ++++++++ .../items/parts/BronzeToolPart.java | 154 ++++++ .../primal/forgecraft/tiles/TileBloomery.java | 8 +- .../primal/forgecraft/tiles/TileForge.java | 8 +- .../hotbronzecrucible_diamond.json | 13 + .../hotbronzecrucible_emerald.json | 13 + .../blockstates/hotbronzecrucible_lapis.json | 13 + .../hotbronzecrucible_redstone.json | 13 + .../hotcookedbronzecrucible_diamond.json | 13 + .../hotcookedbronzecrucible_emerald.json | 13 + .../hotcookedbronzecrucible_lapis.json | 13 + .../hotcookedbronzecrucible_redstone.json | 13 + .../rawbronzecrucible_diamond.json | 13 + .../rawbronzecrucible_emerald.json | 13 + .../blockstates/rawbronzecrucible_lapis.json | 13 + .../rawbronzecrucible_redstone.json | 13 + .../item/axehead/bronze/bronzeaxehead_0.json | 8 + .../item/axehead/bronze/bronzeaxehead_1.json | 8 + .../item/axehead/bronze/bronzeaxehead_2.json | 8 + .../item/axehead/bronze/bronzeaxehead_3.json | 8 + .../item/axehead/bronze/bronzeaxehead_4.json | 8 + .../forgecraft/models/item/bronzeaxehead.json | 20 + .../forgecraft/models/item/bronzegladius.json | 293 +++++++++++ .../forgecraft/models/item/bronzehoehead.json | 20 + .../models/item/bronzepickaxehead.json | 16 + .../models/item/bronzeshovelhead.json | 16 + .../item/hoehead/bronze/bronzehoehead_0.json | 8 + .../item/hoehead/bronze/bronzehoehead_1.json | 8 + .../item/hoehead/bronze/bronzehoehead_2.json | 8 + .../item/hoehead/bronze/bronzehoehead_3.json | 8 + .../item/hoehead/bronze/bronzehoehead_4.json | 8 + .../item/hotbronzecrucible_diamond.json | 9 + .../item/hotbronzecrucible_emerald.json | 9 + .../models/item/hotbronzecrucible_lapis.json | 9 + .../item/hotbronzecrucible_redstone.json | 9 + .../item/hotcookedbronzecrucible_diamond.json | 9 + .../item/hotcookedbronzecrucible_emerald.json | 9 + .../item/hotcookedbronzecrucible_lapis.json | 9 + .../hotcookedbronzecrucible_redstone.json | 9 + .../bronze/bronzepickaxehead_0.json | 8 + .../bronze/bronzepickaxehead_1.json | 8 + .../bronze/bronzepickaxehead_2.json | 8 + .../bronze/bronzepickaxehead_3.json | 8 + .../bronze/bronzepickaxehead_4.json | 8 + .../models/item/rawbronzecrucible.json | 4 +- .../item/rawbronzecrucible_diamond.json | 9 + .../item/rawbronzecrucible_emerald.json | 9 + .../models/item/rawbronzecrucible_lapis.json | 9 + .../item/rawbronzecrucible_redstone.json | 9 + .../shovelhead/bronze/bronzeshovelhead_0.json | 8 + .../shovelhead/bronze/bronzeshovelhead_1.json | 8 + .../shovelhead/bronze/bronzeshovelhead_2.json | 8 + .../shovelhead/bronze/bronzeshovelhead_3.json | 8 + .../shovelhead/bronze/bronzeshovelhead_4.json | 8 + .../item/stonetongs_hotbronze_diamond.json | 11 + .../item/stonetongs_hotbronze_emerald.json | 11 + .../item/stonetongs_hotbronze_lapis.json | 11 + .../item/stonetongs_hotbronze_redstone.json | 11 + .../stonetongs_hotbronzecooked_diamond.json | 11 + .../stonetongs_hotbronzecooked_emerald.json | 11 + .../stonetongs_hotbronzecooked_lapis.json | 11 + .../stonetongs_hotbronzecooked_redstone.json | 11 + .../forgecraft/textures/blocks/castingmud.png | Bin 921 -> 794 bytes .../textures/items/bronze_block.png | Bin 0 -> 1510 bytes .../textures/items/finished_bronze.png | Bin 0 -> 3264 bytes .../items/finished_bronze_diamond.png | Bin 0 -> 3479 bytes .../items/finished_bronze_emerald.png | Bin 0 -> 3500 bytes .../textures/items/finished_bronze_lapis.png | Bin 0 -> 3458 bytes .../items/finished_bronze_redstone.png | Bin 0 -> 3474 bytes 74 files changed, 1957 insertions(+), 26 deletions(-) create mode 100644 1.11/src/main/java/nmd/primal/forgecraft/items/parts/BronzeToolPart.java create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_diamond.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_emerald.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_lapis.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_redstone.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_diamond.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_emerald.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_lapis.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_redstone.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_diamond.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_emerald.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_lapis.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_redstone.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_0.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_1.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_2.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_3.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_4.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/bronzeaxehead.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/bronzegladius.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/bronzehoehead.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/bronzepickaxehead.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/bronzeshovelhead.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_0.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_1.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_2.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_3.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_4.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_diamond.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_emerald.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_lapis.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_redstone.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_diamond.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_emerald.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_lapis.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_redstone.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_0.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_1.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_2.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_3.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_4.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_diamond.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_emerald.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_lapis.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_redstone.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_0.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_1.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_2.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_3.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_4.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_diamond.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_emerald.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_lapis.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_redstone.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_diamond.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_emerald.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_lapis.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_redstone.json create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/items/bronze_block.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/items/finished_bronze.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/items/finished_bronze_diamond.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/items/finished_bronze_emerald.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/items/finished_bronze_lapis.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/items/finished_bronze_redstone.png diff --git a/1.11/To-Dos.md b/1.11/To-Dos.md index 4b7d0267..1d3546d6 100644 --- a/1.11/To-Dos.md +++ b/1.11/To-Dos.md @@ -4,7 +4,9 @@ To-Dos *** Current Feature *** - +- [ ] BlockBreaker Support for copper dust and tin dust +- [x] picking up raw bronze crucible returns some other shit +- [ ] Tool breaking should return tool head```` *** Feature Musket *** - [ ] Create powder charge item (copper, charcoal, gunpowder) @@ -26,10 +28,7 @@ To-Dos - [ ] Create a method which adds the types of NBT upgrades and creates a unique float instead of using magic numbers - [ ] Add forgehammer to oreDict - [ ] WeaponHead recipes -- [ ] Casting Table - - [ ] Block - - [ ] Gui - - [ ] Crafting recipes + *** Tid-Bits *** sed -i -- 's/iron/steel/g' * @@ -37,6 +36,10 @@ rm *.json-- rename s/iron/steel/ iron* *** Completed *** +- [x] Casting Table + - [x] Block + - [x] Gui + - [x] Crafting recipes - [x] StoneTongs for all tool heads - [x] ItemNBT - [x] ItemRender diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java index e625f5d1..010b8f92 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/CastingBlock.java @@ -8,6 +8,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; @@ -21,6 +22,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.casting.CastingPart; import nmd.primal.forgecraft.tiles.TileCastingBlock; import nmd.primal.forgecraft.tiles.TileCastingForm; @@ -58,13 +60,453 @@ public class CastingBlock extends CustomContainerFacing { } if(pItem.getItem() instanceof CastingPart){ - if(tile.getSlotStack(0).isEmpty()){ - ItemStack copyStack = pItem.copy(); - copyStack.setCount(1); - pItem.shrink(1); - tile.setSlotStack(0, copyStack); - tile.updateBlock(); - return true; + if(!player.isSneaking()) { + if (tile.getSlotStack(0).isEmpty()) { + ItemStack copyStack = pItem.copy(); + copyStack.setCount(1); + pItem.shrink(1); + tile.setSlotStack(0, copyStack); + tile.updateBlock(); + return true; + } + } + } + + if(pItem.getItem() == ModItems.stonetongs ){ + if(pItem.getTagCompound().getInteger("type") == 40){ + if(tile.getSlotStack(0).getItem() == ModItems.cast_hoe){ + ItemStack dropStack = new ItemStack(ModItems.bronzehoehead); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if(tile.getSlotStack(0).getItem() == ModItems.cast_pickaxe){ + ItemStack dropStack = new ItemStack(ModItems.bronzepickaxehead); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if(tile.getSlotStack(0).getItem() == ModItems.cast_axe){ + ItemStack dropStack = new ItemStack(ModItems.bronzeaxehead); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if(tile.getSlotStack(0).getItem() == ModItems.cast_shovel){ + ItemStack dropStack = new ItemStack(ModItems.bronzeshovelhead); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if(tile.getSlotStack(0).getItem() == ModItems.cast_gladius){ + ItemStack dropStack = new ItemStack(ModItems.bronzegladius); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + } + /*************************** + * Bronze * + * + 46 | Hot Cooked Bronze Crucible Emerald + 48 | Hot Cooked Bronze Crucible Diamond + 50 | Hot Cooked Bronze Crucible Redstone + 52 | Hot Cooked Bronze Crucible Lapis + ***************************/ + if(pItem.getTagCompound().getInteger("type") == 46){ + if(tile.getSlotStack(0).getItem() == ModItems.cast_hoe){ + ItemStack dropStack = new ItemStack(ModItems.bronzehoehead); + dropStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = new NBTTagCompound(); + + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + + dropStack.getSubCompound("tags").setBoolean("emerald", true); + dropStack.getSubCompound("tags").setInteger("diamond", 0); + dropStack.getSubCompound("tags").setInteger("redstone", 0); + dropStack.getSubCompound("tags").setInteger("lapis", 0); + + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if(tile.getSlotStack(0).getItem() == ModItems.cast_pickaxe){ + ItemStack dropStack = new ItemStack(ModItems.bronzepickaxehead); + dropStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = new NBTTagCompound(); + + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + + dropStack.getSubCompound("tags").setBoolean("emerald", true); + dropStack.getSubCompound("tags").setInteger("diamond", 0); + dropStack.getSubCompound("tags").setInteger("redstone", 0); + dropStack.getSubCompound("tags").setInteger("lapis", 0); + + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if(tile.getSlotStack(0).getItem() == ModItems.cast_axe){ + ItemStack dropStack = new ItemStack(ModItems.bronzeaxehead); + dropStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = new NBTTagCompound(); + + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + + dropStack.getSubCompound("tags").setBoolean("emerald", true); + dropStack.getSubCompound("tags").setInteger("diamond", 0); + dropStack.getSubCompound("tags").setInteger("redstone", 0); + dropStack.getSubCompound("tags").setInteger("lapis", 0); + + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if(tile.getSlotStack(0).getItem() == ModItems.cast_shovel){ + ItemStack dropStack = new ItemStack(ModItems.bronzeshovelhead); + dropStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = new NBTTagCompound(); + + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + + dropStack.getSubCompound("tags").setBoolean("emerald", true); + dropStack.getSubCompound("tags").setInteger("diamond", 0); + dropStack.getSubCompound("tags").setInteger("redstone", 0); + dropStack.getSubCompound("tags").setInteger("lapis", 0); + + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if(tile.getSlotStack(0).getItem() == ModItems.cast_gladius){ + ItemStack dropStack = new ItemStack(ModItems.bronzegladius); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + } + if(pItem.getTagCompound().getInteger("type") == 48) { + if (tile.getSlotStack(0).getItem() == ModItems.cast_hoe) { + ItemStack dropStack = new ItemStack(ModItems.bronzehoehead); + dropStack.setTagCompound(new NBTTagCompound()); + + NBTTagCompound tags = new NBTTagCompound(); + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + dropStack.getSubCompound("tags").setBoolean("emerald", false); + dropStack.getSubCompound("tags").setInteger("diamond", 1); + dropStack.getSubCompound("tags").setInteger("redstone", 0); + dropStack.getSubCompound("tags").setInteger("lapis", 0); + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if (CommonUtils.randomCheck(2)) { + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if (tile.getSlotStack(0).getItem() == ModItems.cast_pickaxe) { + ItemStack dropStack = new ItemStack(ModItems.bronzepickaxehead); + dropStack.setTagCompound(new NBTTagCompound()); + + NBTTagCompound tags = new NBTTagCompound(); + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + dropStack.getSubCompound("tags").setBoolean("emerald", false); + dropStack.getSubCompound("tags").setInteger("diamond", 1); + dropStack.getSubCompound("tags").setInteger("redstone", 0); + dropStack.getSubCompound("tags").setInteger("lapis", 0); + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if (CommonUtils.randomCheck(2)) { + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if (tile.getSlotStack(0).getItem() == ModItems.cast_axe) { + ItemStack dropStack = new ItemStack(ModItems.bronzeaxehead); + dropStack.setTagCompound(new NBTTagCompound()); + + + NBTTagCompound tags = new NBTTagCompound(); + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + dropStack.getSubCompound("tags").setBoolean("emerald", false); + dropStack.getSubCompound("tags").setInteger("diamond", 1); + dropStack.getSubCompound("tags").setInteger("redstone", 0); + dropStack.getSubCompound("tags").setInteger("lapis", 0); + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + + + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if (CommonUtils.randomCheck(2)) { + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if (tile.getSlotStack(0).getItem() == ModItems.cast_shovel) { + ItemStack dropStack = new ItemStack(ModItems.bronzeshovelhead); + dropStack.setTagCompound(new NBTTagCompound()); + + + NBTTagCompound tags = new NBTTagCompound(); + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + dropStack.getSubCompound("tags").setBoolean("emerald", false); + dropStack.getSubCompound("tags").setInteger("diamond", 1); + dropStack.getSubCompound("tags").setInteger("redstone", 0); + dropStack.getSubCompound("tags").setInteger("lapis", 0); + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + + + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if (CommonUtils.randomCheck(2)) { + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if (tile.getSlotStack(0).getItem() == ModItems.cast_gladius) { + ItemStack dropStack = new ItemStack(ModItems.bronzegladius); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if (CommonUtils.randomCheck(2)) { + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + } + if(pItem.getTagCompound().getInteger("type") == 50) { + if (tile.getSlotStack(0).getItem() == ModItems.cast_hoe) { + ItemStack dropStack = new ItemStack(ModItems.bronzehoehead); + dropStack.setTagCompound(new NBTTagCompound()); + + NBTTagCompound tags = new NBTTagCompound(); + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + dropStack.getSubCompound("tags").setBoolean("emerald", false); + dropStack.getSubCompound("tags").setInteger("diamond", 0); + dropStack.getSubCompound("tags").setInteger("redstone", 1); + dropStack.getSubCompound("tags").setInteger("lapis", 0); + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if (tile.getSlotStack(0).getItem() == ModItems.cast_pickaxe) { + ItemStack dropStack = new ItemStack(ModItems.bronzepickaxehead); + dropStack.setTagCompound(new NBTTagCompound()); + + NBTTagCompound tags = new NBTTagCompound(); + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + dropStack.getSubCompound("tags").setBoolean("emerald", false); + dropStack.getSubCompound("tags").setInteger("diamond", 0); + dropStack.getSubCompound("tags").setInteger("redstone", 1); + dropStack.getSubCompound("tags").setInteger("lapis", 0); + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if (tile.getSlotStack(0).getItem() == ModItems.cast_axe) { + ItemStack dropStack = new ItemStack(ModItems.bronzeaxehead); + dropStack.setTagCompound(new NBTTagCompound()); + + + NBTTagCompound tags = new NBTTagCompound(); + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + dropStack.getSubCompound("tags").setBoolean("emerald", false); + dropStack.getSubCompound("tags").setInteger("diamond", 0); + dropStack.getSubCompound("tags").setInteger("redstone", 1); + dropStack.getSubCompound("tags").setInteger("lapis", 0); + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + + + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if (tile.getSlotStack(0).getItem() == ModItems.cast_shovel) { + ItemStack dropStack = new ItemStack(ModItems.bronzeshovelhead); + dropStack.setTagCompound(new NBTTagCompound()); + + + NBTTagCompound tags = new NBTTagCompound(); + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + dropStack.getSubCompound("tags").setBoolean("emerald", false); + dropStack.getSubCompound("tags").setInteger("diamond", 0); + dropStack.getSubCompound("tags").setInteger("redstone", 1); + dropStack.getSubCompound("tags").setInteger("lapis", 0); + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + + + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if (tile.getSlotStack(0).getItem() == ModItems.cast_gladius) { + ItemStack dropStack = new ItemStack(ModItems.bronzegladius); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + } + if(pItem.getTagCompound().getInteger("type") == 52) { + if (tile.getSlotStack(0).getItem() == ModItems.cast_hoe) { + ItemStack dropStack = new ItemStack(ModItems.bronzehoehead); + dropStack.setTagCompound(new NBTTagCompound()); + + NBTTagCompound tags = new NBTTagCompound(); + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + dropStack.getSubCompound("tags").setBoolean("emerald", false); + dropStack.getSubCompound("tags").setInteger("diamond", 0); + dropStack.getSubCompound("tags").setInteger("redstone", 0); + dropStack.getSubCompound("tags").setInteger("lapis", 1); + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if (tile.getSlotStack(0).getItem() == ModItems.cast_pickaxe) { + ItemStack dropStack = new ItemStack(ModItems.bronzepickaxehead); + dropStack.setTagCompound(new NBTTagCompound()); + + NBTTagCompound tags = new NBTTagCompound(); + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + dropStack.getSubCompound("tags").setBoolean("emerald", false); + dropStack.getSubCompound("tags").setInteger("diamond", 0); + dropStack.getSubCompound("tags").setInteger("redstone", 0); + dropStack.getSubCompound("tags").setInteger("lapis", 1); + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if (tile.getSlotStack(0).getItem() == ModItems.cast_axe) { + ItemStack dropStack = new ItemStack(ModItems.bronzeaxehead); + dropStack.setTagCompound(new NBTTagCompound()); + + + NBTTagCompound tags = new NBTTagCompound(); + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + dropStack.getSubCompound("tags").setBoolean("emerald", false); + dropStack.getSubCompound("tags").setInteger("diamond", 0); + dropStack.getSubCompound("tags").setInteger("redstone", 0); + dropStack.getSubCompound("tags").setInteger("lapis", 1); + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + + + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if (tile.getSlotStack(0).getItem() == ModItems.cast_shovel) { + ItemStack dropStack = new ItemStack(ModItems.bronzeshovelhead); + dropStack.setTagCompound(new NBTTagCompound()); + + + NBTTagCompound tags = new NBTTagCompound(); + dropStack.getTagCompound().setTag("tags", tags); + dropStack.getSubCompound("tags").setBoolean("hot", false); + dropStack.getSubCompound("tags").setBoolean("emerald", false); + dropStack.getSubCompound("tags").setInteger("diamond", 0); + dropStack.getSubCompound("tags").setInteger("redstone", 0); + dropStack.getSubCompound("tags").setInteger("lapis", 1); + dropStack.getSubCompound("tags").setInteger("modifiers", 1); + + + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } + if (tile.getSlotStack(0).getItem() == ModItems.cast_gladius) { + ItemStack dropStack = new ItemStack(ModItems.bronzegladius); + PlayerHelper.spawnItemOnGround(world, pos, dropStack); + pItem.getTagCompound().setInteger("type", 0); + if(CommonUtils.randomCheck(2)){ + tile.setSlotStack(0, ItemStack.EMPTY); + } + return true; + } } } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index 215d21cd..65518e92 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -57,6 +57,22 @@ public class ModBlocks { public static Block hotbronzecrucible; public static Block hotcookedbronzecrucible; + public static Block rawbronzecrucible_redstone; + public static Block hotbronzecrucible_redstone; + public static Block hotcookedbronzecrucible_redstone; + + public static Block rawbronzecrucible_lapis; + public static Block hotbronzecrucible_lapis; + public static Block hotcookedbronzecrucible_lapis; + + public static Block rawbronzecrucible_diamond; + public static Block hotbronzecrucible_diamond; + public static Block hotcookedbronzecrucible_diamond; + + public static Block rawbronzecrucible_emerald; + public static Block hotbronzecrucible_emerald; + public static Block hotcookedbronzecrucible_emerald; + public static Block rawironcrucible; public static Block hotironcrucible; public static Block hotcookedironcrucible; @@ -124,6 +140,22 @@ public class ModBlocks { hotbronzecrucible = new CrucibleHot(Material.ROCK, "hotbronzecrucible"); hotcookedbronzecrucible = new CrucibleHot(Material.ROCK, "hotcookedbronzecrucible"); + rawbronzecrucible_redstone = new Crucible(Material.ROCK, "rawbronzecrucible_redstone"); + hotbronzecrucible_redstone = new CrucibleHot(Material.ROCK, "hotbronzecrucible_redstone"); + hotcookedbronzecrucible_redstone = new CrucibleHot(Material.ROCK, "hotcookedbronzecrucible_redstone"); + + rawbronzecrucible_diamond = new Crucible(Material.ROCK, "rawbronzecrucible_diamond"); + hotbronzecrucible_diamond = new CrucibleHot(Material.ROCK, "hotbronzecrucible_diamond"); + hotcookedbronzecrucible_diamond = new CrucibleHot(Material.ROCK, "hotcookedbronzecrucible_diamond"); + + rawbronzecrucible_lapis = new Crucible(Material.ROCK, "rawbronzecrucible_lapis"); + hotbronzecrucible_lapis = new CrucibleHot(Material.ROCK, "hotbronzecrucible_lapis"); + hotcookedbronzecrucible_lapis = new CrucibleHot(Material.ROCK, "hotcookedbronzecrucible_lapis"); + + rawbronzecrucible_emerald = new Crucible(Material.ROCK, "rawbronzecrucible_emerald"); + hotbronzecrucible_emerald = new CrucibleHot(Material.ROCK, "hotbronzecrucible_emerald"); + hotcookedbronzecrucible_emerald = new CrucibleHot(Material.ROCK, "hotcookedbronzecrucible_emerald"); + rawironcrucible = new Crucible(Material.ROCK, "rawironcrucible"); hotironcrucible = new CrucibleHot(Material.ROCK, "hotironcrucible"); hotcookedironcrucible = new CrucibleHot(Material.ROCK, "hotcookedironcrucible"); @@ -408,6 +440,22 @@ public class ModBlocks { registerBlock(hotbronzecrucible); registerBlock(hotcookedbronzecrucible); + registerBlock(rawbronzecrucible_diamond); + registerBlock(hotbronzecrucible_diamond); + registerBlock(hotcookedbronzecrucible_diamond); + + registerBlock(rawbronzecrucible_emerald); + registerBlock(hotbronzecrucible_emerald); + registerBlock(hotcookedbronzecrucible_emerald); + + registerBlock(rawbronzecrucible_redstone); + registerBlock(hotbronzecrucible_redstone); + registerBlock(hotcookedbronzecrucible_redstone); + + registerBlock(rawbronzecrucible_lapis); + registerBlock(hotbronzecrucible_lapis); + registerBlock(hotcookedbronzecrucible_lapis); + registerBlock(rawironcrucible); registerBlock(hotironcrucible); registerBlock(hotcookedironcrucible); @@ -481,6 +529,22 @@ public class ModBlocks { registerRender(hotbronzecrucible); registerRender(hotcookedbronzecrucible); + registerRender(rawbronzecrucible_diamond); + registerRender(hotbronzecrucible_diamond); + registerRender(hotcookedbronzecrucible_diamond); + + registerRender(rawbronzecrucible_emerald); + registerRender(hotbronzecrucible_emerald); + registerRender(hotcookedbronzecrucible_emerald); + + registerRender(rawbronzecrucible_redstone); + registerRender(hotbronzecrucible_redstone); + registerRender(hotcookedbronzecrucible_redstone); + + registerRender(rawbronzecrucible_lapis); + registerRender(hotbronzecrucible_lapis); + registerRender(hotcookedbronzecrucible_lapis); + registerRender(rawironcrucible); registerRender(hotironcrucible); registerRender(hotcookedironcrucible); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index b55678e2..315a4d7b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -90,9 +90,50 @@ public class ModCrafting { ('Y'), ModBlocks.emptycrucible)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), "XCX"," X "," Y ", - ('X'), "nuggetCopper", - ('C'), "nuggetTin", + ('X'), "dustCopper", + ('C'), "dustTin", ('Y'), ModBlocks.emptycrucible)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + "XXX"," X "," Y ", + ('X'), "nuggetBronze", + ('Y'), ModBlocks.emptycrucible)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + "X","Y", + ('X'), new ItemStack(ModItems.bronzepickaxehead, 1, OreDictionary.WILDCARD_VALUE), + ('Y'), ModBlocks.emptycrucible)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + "X","Y", + ('X'), new ItemStack(ModItems.bronzeaxehead, 1, OreDictionary.WILDCARD_VALUE), + ('Y'), ModBlocks.emptycrucible)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + "X","Y", + ('X'), new ItemStack(ModItems.bronzeshovelhead, 1, OreDictionary.WILDCARD_VALUE), + ('Y'), ModBlocks.emptycrucible)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + "X","Y", + ('X'), new ItemStack(ModItems.bronzehoehead, 1, OreDictionary.WILDCARD_VALUE), + ('Y'), ModBlocks.emptycrucible)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible), + "X","Y", + ('X'), new ItemStack(ModItems.bronzegladius, 1, OreDictionary.WILDCARD_VALUE), + ('Y'), ModBlocks.emptycrucible)); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible_redstone), + "R","Y", + ('R'), Items.REDSTONE, + ('Y'), ModBlocks.rawbronzecrucible)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible_diamond), + "D","Y", + ('D'), PrimalItems.DIAMOND_KNAPP, + ('Y'), ModBlocks.rawbronzecrucible)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible_lapis), + "L","Y", + ('L'), new ItemStack(Items.DYE, 1, 4), + ('Y'), ModBlocks.rawbronzecrucible)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.rawbronzecrucible_emerald), + "E","Y", + ('E'), PrimalItems.EMERALD_KNAPP, + ('Y'), ModBlocks.rawbronzecrucible)); @@ -335,7 +376,7 @@ public class ModCrafting { 0.0f ); -//Makes the Finished Hot Steel Crucible +//Makes the Finished Hot Bronze Crucible BloomeryCrafting.addRecipe( new ItemStack(ModBlocks.hotbronzecrucible, 1), new ItemStack(ModBlocks.hotcookedbronzecrucible, 1), @@ -348,6 +389,107 @@ public class ModCrafting { 0.5f ); + //Makes the Hot Bronze Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.rawbronzecrucible_diamond, 1), + new ItemStack(ModBlocks.hotbronzecrucible_diamond, 1), + new ItemStack(ModBlocks.hotbronzecrucible_diamond, 1), + new ItemStack(ModBlocks.rawbronzecrucible_diamond, 1), + 800, + 20, + 500, + 0.5f, + 0.0f + ); + +//Makes the Finished Hot Bronze Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.hotbronzecrucible_diamond, 1), + new ItemStack(ModBlocks.hotcookedbronzecrucible_diamond, 1), + new ItemStack(ModBlocks.hotcookedbronzecrucible_diamond, 1), + new ItemStack(ModBlocks.rawbronzecrucible_diamond, 1), + 1100, + 1100, + 600, + 0.5f, + 0.5f + ); + //Makes the Hot Bronze Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.rawbronzecrucible_redstone, 1), + new ItemStack(ModBlocks.hotbronzecrucible_redstone, 1), + new ItemStack(ModBlocks.hotbronzecrucible_redstone, 1), + new ItemStack(ModBlocks.rawbronzecrucible_redstone, 1), + 800, + 20, + 500, + 0.5f, + 0.0f + ); + +//Makes the Finished Hot Bronze Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.hotbronzecrucible_redstone, 1), + new ItemStack(ModBlocks.hotcookedbronzecrucible_redstone, 1), + new ItemStack(ModBlocks.hotcookedbronzecrucible_redstone, 1), + new ItemStack(ModBlocks.rawbronzecrucible_redstone, 1), + 1100, + 1100, + 600, + 0.5f, + 0.5f + ); +//Makes the Hot Bronze Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.rawbronzecrucible_emerald, 1), + new ItemStack(ModBlocks.hotbronzecrucible_emerald, 1), + new ItemStack(ModBlocks.hotbronzecrucible_emerald, 1), + new ItemStack(ModBlocks.rawbronzecrucible_emerald, 1), + 800, + 20, + 500, + 0.5f, + 0.0f + ); + +//Makes the Finished Hot Bronze Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.hotbronzecrucible_emerald, 1), + new ItemStack(ModBlocks.hotcookedbronzecrucible_emerald, 1), + new ItemStack(ModBlocks.hotcookedbronzecrucible_emerald, 1), + new ItemStack(ModBlocks.rawbronzecrucible_emerald, 1), + 1100, + 1100, + 600, + 0.5f, + 0.5f + ); + //Makes the Hot Bronze Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.rawbronzecrucible_lapis, 1), + new ItemStack(ModBlocks.hotbronzecrucible_lapis, 1), + new ItemStack(ModBlocks.hotbronzecrucible_lapis, 1), + new ItemStack(ModBlocks.rawbronzecrucible_lapis, 1), + 800, + 20, + 500, + 0.5f, + 0.0f + ); + +//Makes the Finished Hot Bronze Crucible + BloomeryCrafting.addRecipe( + new ItemStack(ModBlocks.hotbronzecrucible_lapis, 1), + new ItemStack(ModBlocks.hotcookedbronzecrucible_lapis, 1), + new ItemStack(ModBlocks.hotcookedbronzecrucible_lapis, 1), + new ItemStack(ModBlocks.rawbronzecrucible_lapis, 1), + 1100, + 1100, + 600, + 0.5f, + 0.5f + ); + //TODO PLACE HOLDER FOR WOOTZ /****************************************************************************** diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 03b91548..6d8f0d21 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -16,6 +16,7 @@ import nmd.primal.core.api.PrimalMaterials; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.items.*; import nmd.primal.forgecraft.items.casting.CastingPart; +import nmd.primal.forgecraft.items.parts.BronzeToolPart; import nmd.primal.forgecraft.items.parts.ToolPart; import nmd.primal.forgecraft.items.tools.CustomAxe; import nmd.primal.forgecraft.items.tools.CustomHoe; @@ -74,6 +75,11 @@ public class ModItems { public static Item wootzhoehead; + public static Item bronzepickaxehead; + public static Item bronzeaxehead; + public static Item bronzeshovelhead; + public static Item bronzehoehead; + public static Item ironpickaxe; public static Item ironaxe; public static Item ironshovel; @@ -94,6 +100,7 @@ public class ModItems { public static Item wootzshovel; public static Item wootzhoe; + public static Item bronzegladius; public static Item ironsword; public static Item cleanironsword; public static Item steelsword; @@ -130,6 +137,12 @@ public class ModItems { /********** TOOL PARTS **********/ + + bronzepickaxehead = new BronzeToolPart("bronzepickaxehead", PrimalMaterials.TOOL_BRONZE, 41); + bronzeaxehead = new BronzeToolPart("bronzeaxehead", PrimalMaterials.TOOL_BRONZE, 42); + bronzeshovelhead = new BronzeToolPart("bronzeshovelhead", PrimalMaterials.TOOL_BRONZE, 43); + bronzehoehead = new BronzeToolPart("bronzehoehead", PrimalMaterials.TOOL_BRONZE, 44); + pickaxehead = new ToolPart("ironpickaxehead", PrimalMaterials.TOOL_WROUGHT_IRON, 8); ironaxehead = new ToolPart("ironaxehead", PrimalMaterials.TOOL_WROUGHT_IRON, 9); ironshovelhead = new ToolPart("ironshovelhead", PrimalMaterials.TOOL_WROUGHT_IRON, 10); @@ -175,11 +188,13 @@ public class ModItems { /********** WEAPONS **********/ + bronzegladius = new CustomSword("bronzegladius", PrimalMaterials.TOOL_BRONZE); ironsword = new CustomSword("ironsword", PrimalMaterials.TOOL_WROUGHT_IRON); cleanironsword = new CustomSword("ironsword", PrimalMaterials.TOOL_CLEAN_IRON); steelsword = new CustomSword("ironsword", PrimalMaterials.TOOL_BASIC_STEEL); wootzsword = new CustomSword("ironsword", PrimalMaterials.TOOL_WOOTZ_STEEL); + wroughtironshield = new CustomShield("wroughtironshield", PrimalMaterials.TOOL_WROUGHT_IRON); /********** @@ -226,6 +241,11 @@ public class ModItems { /********** TOOL PARTS **********/ + GameRegistry.register(bronzepickaxehead); + GameRegistry.register(bronzeaxehead); + GameRegistry.register(bronzeshovelhead); + GameRegistry.register(bronzehoehead); + GameRegistry.register(pickaxehead); GameRegistry.register(ironaxehead); GameRegistry.register(ironshovelhead); @@ -273,6 +293,7 @@ public class ModItems { WEAPONS **********/ GameRegistry.register(ironsword); + GameRegistry.register(bronzegladius); GameRegistry.register(wroughtironshield); //GameRegistry.register(matchlockmusket); @@ -305,6 +326,12 @@ public class ModItems { /********** TOOL PARTS **********/ + registerRender(bronzepickaxehead); + registerRender(bronzeaxehead); + registerRender(bronzeshovelhead); + registerRender(bronzehoehead); + registerRender(bronzegladius); + registerRender(pickaxehead); registerRender(ironaxehead); registerRender(ironshovelhead); @@ -395,7 +422,15 @@ public class ModItems { new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_shovel_hot"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_hoe_hot"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronze"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronzecooked") + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronzecooked"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronze_lapis"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronzecooked_lapis"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronze_redstone"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronzecooked_redstone"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronze_emerald"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronzecooked_emerald"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronze_diamond"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronzecooked_diamond") ); ModelLoader.setCustomMeshDefinition(ModItems.stonetongs, new ItemMeshDefinition() { @@ -498,6 +533,30 @@ public class ModItems { else if (stack.getTagCompound().getInteger("type") == 40 ) { return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronzecooked", "inventory"); } + else if (stack.getTagCompound().getInteger("type") == 45 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronze_emerald", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 46 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronzecooked_emerald", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 47 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronze_diamond", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 48 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronzecooked_diamond", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 49 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronze_redstone", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 50 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronzecooked_redstone", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 51 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronze_lapis", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 52 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronzecooked_lapis", "inventory"); + } else return new ModelResourceLocation(stack.getItem().getRegistryName(), "inventory"); } return new ModelResourceLocation(stack.getItem().getRegistryName(), "inventory"); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java index 82bb7b32..34f46601 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java @@ -129,6 +129,18 @@ public class ItemStoneTongs extends Item { 39 | Hot Bronze Crucible 40 | Hot Cooked Bronze Crucible + 41 | Bronze Pickaxe Head + 42 | Bronze Axe Head + 43 | Bronze Shovel Head + 44 | Bronze Hoe Head + 45 | Hot Bronze Crucible Emerald + 46 | Hot Cooked Bronze Crucible Emerald + 47 | Hot Bronze Crucible Diamond + 48 | Hot Cooked Bronze Crucible Diamond + 49 | Hot Bronze Crucible Redstone + 50 | Hot Cooked Bronze Crucible Redstone + 51 | Hot Bronze Crucible Lapis + 52 | Hot Cooked Bronze Crucible Lapis */ @@ -269,6 +281,15 @@ public class ItemStoneTongs extends Item { /*************************** * Bronze * + * + 45 | Hot Bronze Crucible Emerald + 46 | Hot Cooked Bronze Crucible Emerald + 47 | Hot Bronze Crucible Diamond + 48 | Hot Cooked Bronze Crucible Diamond + 49 | Hot Bronze Crucible Redstone + 50 | Hot Cooked Bronze Crucible Redstone + 51 | Hot Bronze Crucible Lapis + 52 | Hot Cooked Bronze Crucible Lapis ***************************/ if (world.getBlockState(pos).getBlock() == ModBlocks.hotbronzecrucible) { itemstack.getTagCompound().setInteger("type", 39); @@ -282,6 +303,54 @@ public class ItemStoneTongs extends Item { world.setBlockToAir(pos); return EnumActionResult.SUCCESS; } + if (world.getBlockState(pos).getBlock() == ModBlocks.hotbronzecrucible_emerald) { + itemstack.getTagCompound().setInteger("type", 45); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + if (world.getBlockState(pos).getBlock() == ModBlocks.hotcookedbronzecrucible_emerald) { + itemstack.getTagCompound().setInteger("type", 46); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + if (world.getBlockState(pos).getBlock() == ModBlocks.hotbronzecrucible_diamond) { + itemstack.getTagCompound().setInteger("type", 47); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + if (world.getBlockState(pos).getBlock() == ModBlocks.hotcookedbronzecrucible_diamond) { + itemstack.getTagCompound().setInteger("type", 48); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + if (world.getBlockState(pos).getBlock() == ModBlocks.hotbronzecrucible_redstone) { + itemstack.getTagCompound().setInteger("type", 49); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + if (world.getBlockState(pos).getBlock() == ModBlocks.hotcookedbronzecrucible_redstone) { + itemstack.getTagCompound().setInteger("type", 50); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + if (world.getBlockState(pos).getBlock() == ModBlocks.hotbronzecrucible_lapis) { + itemstack.getTagCompound().setInteger("type", 51); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } + if (world.getBlockState(pos).getBlock() == ModBlocks.hotcookedbronzecrucible_lapis) { + itemstack.getTagCompound().setInteger("type", 52); + itemstack.getTagCompound().setInteger("cooldown", tileCrucible.countdown); + world.setBlockToAir(pos); + return EnumActionResult.SUCCESS; + } } /***** @@ -430,6 +499,74 @@ public class ItemStoneTongs extends Item { itemstack.getTagCompound().setInteger("cooldown", 0); itemstack.getTagCompound().setInteger("type", 0); return EnumActionResult.SUCCESS; + /*************************** + * Bronze * + * + 45 | Hot Bronze Crucible Emerald + 46 | Hot Cooked Bronze Crucible Emerald + 47 | Hot Bronze Crucible Diamond + 48 | Hot Cooked Bronze Crucible Diamond + 49 | Hot Bronze Crucible Redstone + 50 | Hot Cooked Bronze Crucible Redstone + 51 | Hot Bronze Crucible Lapis + 52 | Hot Cooked Bronze Crucible Lapis + ***************************/ + case 45: + world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_emerald.getDefaultState(), 3); + TileBaseCrucible tileCrucible45 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible45.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; + case 46: + world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_emerald.getDefaultState(), 3); + TileBaseCrucible tileCrucible46 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible46.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; + case 47: + world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_diamond.getDefaultState(), 3); + TileBaseCrucible tileCrucible47 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible47.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; + case 48: + world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_diamond.getDefaultState(), 3); + TileBaseCrucible tileCrucible48 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible48.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; + case 49: + world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_redstone.getDefaultState(), 3); + TileBaseCrucible tileCrucible49 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible49.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; + case 50: + world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_redstone.getDefaultState(), 3); + TileBaseCrucible tileCrucible50 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible50.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; + case 51: + world.setBlockState(tempPos, ModBlocks.hotbronzecrucible_lapis.getDefaultState(), 3); + TileBaseCrucible tileCrucible51 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible51.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; + case 52: + world.setBlockState(tempPos, ModBlocks.hotcookedbronzecrucible_lapis.getDefaultState(), 3); + TileBaseCrucible tileCrucible52 = (TileBaseCrucible) world.getTileEntity(tempPos); + tileCrucible52.countdown = itemstack.getTagCompound().getInteger("cooldown"); + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 0); + return EnumActionResult.SUCCESS; } } } @@ -505,7 +642,60 @@ public class ItemStoneTongs extends Item { itemstack.getTagCompound().setInteger("type", 40); tile.setSlotStack(1, ItemStack.EMPTY); return EnumActionResult.SUCCESS; + /*************************** + * Bronze * + * + 45 | Hot Bronze Crucible Emerald + 46 | Hot Cooked Bronze Crucible Emerald + 47 | Hot Bronze Crucible Diamond + 48 | Hot Cooked Bronze Crucible Diamond + 49 | Hot Bronze Crucible Redstone + 50 | Hot Cooked Bronze Crucible Redstone + 51 | Hot Bronze Crucible Lapis + 52 | Hot Cooked Bronze Crucible Lapis + ***************************/ + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.hotbronzecrucible_emerald))) { + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 45); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.hotcookedbronzecrucible_emerald))) { + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 46); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.hotbronzecrucible_diamond))) { + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 47); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.hotcookedbronzecrucible_diamond))) { + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 48); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.hotbronzecrucible_redstone))) { + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 49); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.hotcookedbronzecrucible_redstone))) { + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 50); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.hotbronzecrucible_lapis))) { + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 51); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } else if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.hotcookedbronzecrucible_lapis))) { + itemstack.getTagCompound().setInteger("cooldown", 0); + itemstack.getTagCompound().setInteger("type", 52); + tile.setSlotStack(1, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; } + } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/parts/BronzeToolPart.java b/1.11/src/main/java/nmd/primal/forgecraft/items/parts/BronzeToolPart.java new file mode 100644 index 00000000..c07e43ca --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/parts/BronzeToolPart.java @@ -0,0 +1,154 @@ +package nmd.primal.forgecraft.items.parts; + +import com.mojang.realmsclient.gui.ChatFormatting; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.IItemPropertyGetter; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.forgecraft.util.ToolNBT; + +import javax.annotation.Nullable; +import java.util.List; + +/** + * Created by mminaie on 3/9/17. + */ +public class BronzeToolPart extends Item implements ToolNBT{ + + private int ID; + + public BronzeToolPart(String name, ToolMaterial material, Integer ID) { + this.setMaxDamage(material.getMaxUses()); + this.setUnlocalizedName(name); + this.setRegistryName(name); + //this.setCreativeTab(ModInfo.TAB_FORGECRAFT); + this.setMaxStackSize(1); + this.setNoRepair(); + + this.ID = ID; + + this.addPropertyOverride(new ResourceLocation("type"), new IItemPropertyGetter() + { + + /*** + + hot . emerald . diamond . redstone . lapis + 0 . 0 . 0 . 0 . 0 + + ***/ + + @SideOnly(Side.CLIENT) + public float apply(ItemStack item, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) + { + if (item.hasTagCompound()) { + + + if (getModifiers(item) != 0) { + if (getEmerald(item)) { + return 0.1F; + } + + if (getDiamondLevel(item) == 1) { + return 0.2F; + } + + if ( getRedstoneLevel(item) == 1) { + return 0.3F; + } + + if (getLapisLevel(item) == 1) { + return 0.4F; + } + } + if (getModifiers(item) == 0) { + return 0.0F; + } + } + return 0.0F; + } + }); + + } + + public static boolean isHidden() + { + return false; + } + + public int getID() { + return ID; + } + + @Override + public void onCreated(ItemStack item, World worldIn, EntityPlayer playerIn) { + + if (!item.hasTagCompound()) { + item.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = new NBTTagCompound(); + + item.getTagCompound().setTag("tags", tags); + + setHot(item, false); + setEmerald(item, false); + setDiamondLevel(item, 0); + setRedstoneLevel(item, 0); + setLapisLevel(item, 0); + setModifiers(item, 0); + } + + } + + @Override + public void onUpdate(ItemStack item, World world, Entity player, int itemSlot, boolean isSelected) { + if (!item.hasTagCompound()) { + item.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = new NBTTagCompound(); + + item.getTagCompound().setTag("tags", tags); + + setHot(item, false); + setEmerald(item, false); + setDiamondLevel(item, 0); + setRedstoneLevel(item, 0); + setLapisLevel(item, 0); + setModifiers(item, 0); + } + + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) + { + if(player.getEntityWorld().isRemote) { + + if(item.hasTagCompound()) { + + tooltip.add(ChatFormatting.GRAY + "Upgrades"); + if (getEmerald(item) == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); + } + if (getDiamondLevel(item) > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (getRedstoneLevel(item) > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item)); + } + if (getLapisLevel(item) > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item)); + } + } + } + } + + + + +} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java index 5fb382c0..a92d9a6a 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -51,9 +51,9 @@ public class TileBloomery extends TileBaseSlot implements ITickable { world.notifyBlockUpdate(pos, state, state, 2); } this.heatManager(this.getHeat(), state, this.getSlotStack(0), world, pos); - slotZeroManager(world); - } + } + slotZeroManager(world); slotOneManager(); } } @@ -103,7 +103,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { private void slotZeroManager(World world){ if(this.getSlotStack(0) != ItemStack.EMPTY) { - Integer decrInt = (int) Math.floor(getVanillaItemBurnTime(this.getSlotStack(0)) / 20); + Integer decrInt = (int) Math.floor(getVanillaItemBurnTime(this.getSlotStack(0)) / 100); if(decrInt == 0) { decrInt = 1; } @@ -117,7 +117,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { this.markDirty(); this.updateBlock(); } - if(CommonUtils.randomCheck(20)) { + if(CommonUtils.randomCheck(200)) { makeSmoke(world, pos); } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java index 4490a76e..ecebf265 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java @@ -51,11 +51,11 @@ public class TileForge extends TileBaseSlot implements ITickable { this.markDirty(); world.notifyBlockUpdate(pos, state, state, 2); } - slotZeroManager(world); + this.heatManager(this.getHeat(), state, this.getSlotStack(0), world, pos); } - + slotZeroManager(world); craftingManager(); } } @@ -63,7 +63,7 @@ public class TileForge extends TileBaseSlot implements ITickable { private void slotZeroManager(World world){ if(this.getSlotStack(0) != ItemStack.EMPTY) { - Integer decrInt = (int) Math.floor(getVanillaItemBurnTime(this.getSlotStack(0)) / 20); + Integer decrInt = (int) Math.floor(getVanillaItemBurnTime(this.getSlotStack(0)) / 100); if(decrInt == 0) { decrInt = 1; } @@ -77,7 +77,7 @@ public class TileForge extends TileBaseSlot implements ITickable { this.markDirty(); this.updateBlock(); } - if(CommonUtils.randomCheck(20)) { + if(CommonUtils.randomCheck(200)) { makeSmoke(world, pos); } } diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_diamond.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_diamond.json new file mode 100644 index 00000000..f88abe9a --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_diamond.json @@ -0,0 +1,13 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_emerald.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_emerald.json new file mode 100644 index 00000000..f88abe9a --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_emerald.json @@ -0,0 +1,13 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_lapis.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_lapis.json new file mode 100644 index 00000000..f88abe9a --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_lapis.json @@ -0,0 +1,13 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_redstone.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_redstone.json new file mode 100644 index 00000000..37c949b3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_redstone.json @@ -0,0 +1,13 @@ +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/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_diamond.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_diamond.json new file mode 100644 index 00000000..d549eddf --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_diamond.json @@ -0,0 +1,13 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_emerald.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_emerald.json new file mode 100644 index 00000000..d549eddf --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_emerald.json @@ -0,0 +1,13 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_lapis.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_lapis.json new file mode 100644 index 00000000..d549eddf --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_lapis.json @@ -0,0 +1,13 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_redstone.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_redstone.json new file mode 100644 index 00000000..d549eddf --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_redstone.json @@ -0,0 +1,13 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_diamond.json b/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_diamond.json new file mode 100644 index 00000000..9fddd6fe --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_diamond.json @@ -0,0 +1,13 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_emerald.json b/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_emerald.json new file mode 100644 index 00000000..9fddd6fe --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_emerald.json @@ -0,0 +1,13 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_lapis.json b/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_lapis.json new file mode 100644 index 00000000..9fddd6fe --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_lapis.json @@ -0,0 +1,13 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_redstone.json b/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_redstone.json new file mode 100644 index 00000000..9fddd6fe --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_redstone.json @@ -0,0 +1,13 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_0.json b/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_0.json new file mode 100644 index 00000000..c23b9ccd --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_0.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_1.json b/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_1.json new file mode 100644 index 00000000..71750357 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_1.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_emerald" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_2.json b/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_2.json new file mode 100644 index 00000000..703fcd93 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_2.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_diamond" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_3.json b/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_3.json new file mode 100644 index 00000000..4b27dfb4 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_3.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_redstone" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_4.json b/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_4.json new file mode 100644 index 00000000..d954808d --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/axehead/bronze/bronzeaxehead_4.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_lapis" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/bronzeaxehead.json b/1.11/src/main/resources/assets/forgecraft/models/item/bronzeaxehead.json new file mode 100644 index 00000000..aa500686 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/bronzeaxehead.json @@ -0,0 +1,20 @@ +{ + "parent": "forgecraft:item/axehead", + "textures": { + "particle": "forgecraft:items/finished_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze" + }, + "overrides": [ + {"predicate": {"type": 0.0},"model": "forgecraft:item/axehead/bronze/bronzeaxehead_0"}, + {"predicate": {"type": 0.1},"model": "forgecraft:item/axehead/bronze/bronzeaxehead_1"}, + {"predicate": {"type": 0.2},"model": "forgecraft:item/axehead/bronze/bronzeaxehead_2"}, + {"predicate": {"type": 0.3},"model": "forgecraft:item/axehead/bronze/bronzeaxehead_3"}, + {"predicate": {"type": 0.4},"model": "forgecraft:item/axehead/bronze/bronzeaxehead_4"} + + ] +} + + + + diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/bronzegladius.json b/1.11/src/main/resources/assets/forgecraft/models/item/bronzegladius.json new file mode 100644 index 00000000..c1146828 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/bronzegladius.json @@ -0,0 +1,293 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "forgecraft:items/finished_bronze", + "texture": "forgecraft:items/finished_bronze", + "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/1.11/src/main/resources/assets/forgecraft/models/item/bronzehoehead.json b/1.11/src/main/resources/assets/forgecraft/models/item/bronzehoehead.json new file mode 100644 index 00000000..c04af984 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/bronzehoehead.json @@ -0,0 +1,20 @@ +{ + "parent": "forgecraft:item/hoehead", + "textures": { + "particle": "forgecraft:items/finished_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze" + }, + "overrides": [ + {"predicate": {"type": 0.0},"model": "forgecraft:item/hoehead/bronze/bronzehoehead_0"}, + {"predicate": {"type": 0.1},"model": "forgecraft:item/hoehead/bronze/bronzehoehead_1"}, + {"predicate": {"type": 0.2},"model": "forgecraft:item/hoehead/bronze/bronzehoehead_2"}, + {"predicate": {"type": 0.3},"model": "forgecraft:item/hoehead/bronze/bronzehoehead_3"}, + {"predicate": {"type": 0.4},"model": "forgecraft:item/hoehead/bronze/bronzehoehead_4"} + + ] +} + + + + diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/bronzepickaxehead.json b/1.11/src/main/resources/assets/forgecraft/models/item/bronzepickaxehead.json new file mode 100644 index 00000000..a027151c --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/bronzepickaxehead.json @@ -0,0 +1,16 @@ +{ + "parent": "forgecraft:item/pickaxehead", + "textures": { + "particle": "forgecraft:items/finished_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze" + }, + "overrides": [ + {"predicate": {"type": 0.0},"model": "forgecraft:item/pickaxehead/bronze/bronzepickaxehead_0"}, + {"predicate": {"type": 0.1},"model": "forgecraft:item/pickaxehead/bronze/bronzepickaxehead_1"}, + {"predicate": {"type": 0.2},"model": "forgecraft:item/pickaxehead/bronze/bronzepickaxehead_2"}, + {"predicate": {"type": 0.3},"model": "forgecraft:item/pickaxehead/bronze/bronzepickaxehead_3"}, + {"predicate": {"type": 0.4},"model": "forgecraft:item/pickaxehead/bronze/bronzepickaxehead_4"} + + ] +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/bronzeshovelhead.json b/1.11/src/main/resources/assets/forgecraft/models/item/bronzeshovelhead.json new file mode 100644 index 00000000..a27abef0 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/bronzeshovelhead.json @@ -0,0 +1,16 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/finished_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze" + }, + "overrides": [ + {"predicate": {"type": 0.0},"model": "forgecraft:item/shovelhead/bronze/bronzeshovelhead_0"}, + {"predicate": {"type": 0.1},"model": "forgecraft:item/shovelhead/bronze/bronzeshovelhead_1"}, + {"predicate": {"type": 0.2},"model": "forgecraft:item/shovelhead/bronze/bronzeshovelhead_2"}, + {"predicate": {"type": 0.3},"model": "forgecraft:item/shovelhead/bronze/bronzeshovelhead_3"}, + {"predicate": {"type": 0.4},"model": "forgecraft:item/shovelhead/bronze/bronzeshovelhead_4"} + + ] +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_0.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_0.json new file mode 100644 index 00000000..73cbf0f7 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_0.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/hoehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_1.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_1.json new file mode 100644 index 00000000..35e18b8f --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_1.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/hoehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_emerald" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_2.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_2.json new file mode 100644 index 00000000..c67cd8bd --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_2.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/hoehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_diamond" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_3.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_3.json new file mode 100644 index 00000000..170cbc37 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_3.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/hoehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_redstone" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_4.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_4.json new file mode 100644 index 00000000..0ceba4bf --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead/bronze/bronzehoehead_4.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/hoehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_lapis" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_diamond.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_diamond.json new file mode 100644 index 00000000..e420a34e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_diamond.json @@ -0,0 +1,9 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_emerald.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_emerald.json new file mode 100644 index 00000000..e420a34e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_emerald.json @@ -0,0 +1,9 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_lapis.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_lapis.json new file mode 100644 index 00000000..e420a34e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_lapis.json @@ -0,0 +1,9 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_redstone.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_redstone.json new file mode 100644 index 00000000..e420a34e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_redstone.json @@ -0,0 +1,9 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_diamond.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_diamond.json new file mode 100644 index 00000000..0b015ebe --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_diamond.json @@ -0,0 +1,9 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_emerald.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_emerald.json new file mode 100644 index 00000000..0b015ebe --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_emerald.json @@ -0,0 +1,9 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_lapis.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_lapis.json new file mode 100644 index 00000000..0b015ebe --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_lapis.json @@ -0,0 +1,9 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_redstone.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_redstone.json new file mode 100644 index 00000000..0b015ebe --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_redstone.json @@ -0,0 +1,9 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_0.json b/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_0.json new file mode 100644 index 00000000..866b29f3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_0.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_1.json b/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_1.json new file mode 100644 index 00000000..adcf5f84 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_1.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_emerald" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_2.json b/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_2.json new file mode 100644 index 00000000..e4163af3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_2.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_diamond" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_3.json b/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_3.json new file mode 100644 index 00000000..60201c63 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_3.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_redstone" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_4.json b/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_4.json new file mode 100644 index 00000000..0e917790 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead/bronze/bronzepickaxehead_4.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxehead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_lapis" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible.json index c183bd72..55ccfcf9 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible.json @@ -1,8 +1,8 @@ { "forge_marker":1, "textures": { - "particle": "forgecraft:blocks/stone_slab_hot", - "texture": "forgecraft:blocks/stone_slab_hot", + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab", "texture1": "forgecraft:items/raw_bronze" }, "parent": "forgecraft:block/castingcrucible" diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_diamond.json b/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_diamond.json new file mode 100644 index 00000000..55ccfcf9 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_diamond.json @@ -0,0 +1,9 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_emerald.json b/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_emerald.json new file mode 100644 index 00000000..55ccfcf9 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_emerald.json @@ -0,0 +1,9 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_lapis.json b/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_lapis.json new file mode 100644 index 00000000..55ccfcf9 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_lapis.json @@ -0,0 +1,9 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_redstone.json b/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_redstone.json new file mode 100644 index 00000000..55ccfcf9 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_redstone.json @@ -0,0 +1,9 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_0.json b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_0.json new file mode 100644 index 00000000..687fcce1 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_0.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_1.json b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_1.json new file mode 100644 index 00000000..5154febd --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_1.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_emerald" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_2.json b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_2.json new file mode 100644 index 00000000..675c2d68 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_2.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_diamond" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_3.json b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_3.json new file mode 100644 index 00000000..d521f22a --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_3.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_redstone" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_4.json b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_4.json new file mode 100644 index 00000000..854a60d4 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead/bronze/bronzeshovelhead_4.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/raw_bronze", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/finished_bronze_lapis" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_diamond.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_diamond.json new file mode 100644 index 00000000..32f3524e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_diamond.json @@ -0,0 +1,11 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_emerald.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_emerald.json new file mode 100644 index 00000000..32f3524e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_emerald.json @@ -0,0 +1,11 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_lapis.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_lapis.json new file mode 100644 index 00000000..32f3524e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_lapis.json @@ -0,0 +1,11 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_redstone.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_redstone.json new file mode 100644 index 00000000..32f3524e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_redstone.json @@ -0,0 +1,11 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_diamond.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_diamond.json new file mode 100644 index 00000000..741fbde3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_diamond.json @@ -0,0 +1,11 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_emerald.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_emerald.json new file mode 100644 index 00000000..741fbde3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_emerald.json @@ -0,0 +1,11 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_lapis.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_lapis.json new file mode 100644 index 00000000..741fbde3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_lapis.json @@ -0,0 +1,11 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_redstone.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_redstone.json new file mode 100644 index 00000000..741fbde3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_redstone.json @@ -0,0 +1,11 @@ +{ + "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/1.11/src/main/resources/assets/forgecraft/textures/blocks/castingmud.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/castingmud.png index 05117cd21dad079dfc76cd40a2d74770840eebc7..e594ac221397249f56a9f2c59f5b2213c294da85 100644 GIT binary patch delta 683 zcmV;c0#yB(2bu^cWdB%}jEPsAUL_t(I%O%iDk{d-7K+&5oKb57A)lw53 zgu%cBuaQMCVs*v?8yH|a+-gaM>YG{bG4Kvf9QViXzuDg(Ur<%d4DTT(kN1x4);Jzp z&d-&;SLWGp4!n1WHyjSRUPj*hd}O=X5PU#_ARfens^@&J81U=cE#4cjf>TlyQh#HF z+ij-rXHp8J>`_zJwc;F1Gw2$r)p+-AA#VaX2XaMlCDtCgAYc8kk07 z9s}zN7?^=~@OWxC95%c>2V#V<-*2g1gjP5q$eWdD&A^h;8Bg7O5LD}viwSWo4 zCeX$PHRJNUFwG00S&0Hx9jcM0shrP_a5^QNICA!!&jY1I@>b9lsPOuy9oK8Y2$&i7 ziy*#GD%@^@eENK+ER}IwY1=@~0`@J=3H6rbd{?nL&-)Z6YPlVZX~EHK?@!hAtTl#%TsX9Kvq9 z&h@0D6-R9F7`aA&v|KK%KWd4MK+ zQu3@7>JpJ!D$V{A0Ehh^p9UUI9Vxy7%dEwr=0JpgSeVNT&Y!8vBN)MF{s-?hkzUK96?wi+77}uH8mTiOO;S9H)c^oO`juJAW4! z_~5-&{%^$f@77tmJdf)*RLi3nrbOk6ELZ$~d!I|ow*a{MrxB`L`j0ma)i{VjXxkhI0isBPB0CF5xc}QXF34f`q@Ub4?AdR9Cjj>uABg% z=9Q6Ba2OmNF830I&;a=OlM^g1o`2%EUu}c{ZTYneMRRWtO-M$Z5>rpQ{J9p;ixZYE z&$IIV#v@sbp&PW?A+^eok0ud2%_g;al{8I}Qs>@wi}vA=`0cejTzGR9%QETr2PA1q z-76Et322fJKPu2C$H&;&ZDJbw-qJ37L`3n42%Nc=_}?WO0=7J07FrC{!~M{w65 zQ3{nQ0NjybuueC^c5DDtrhnKC_Lx38fe-@nexEm%=Ga(G5JD2{wJ=PBsM{q@6T+y2 z?bxU^B~+UvNrvZ^QE7^H=H%0bWttQec&H#o4`wsy3HfDGb1lX2EFHQllOp~bB z8@{qT;@~&xJTWsxbHBy?hXI$~Kf=u$lAAXque{|m;rlFKIZgo-K!4bc&~+WVWFl(y zDz;^^8|>px<%FGKVN;in&wBr1z~)xM+$on#WtfJ^vDqC|K0v$p>dVE!L5ProG<`(0 zEC#tk^#>Tb!GDpxN(F$h+hgYVHtTCOgi14<>J|W#<6~6(Z59^W_c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0 zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij|wWxtpP( zxru?fk%5_op`nG5k)wsHtEr)jiIJO;s|(BwYTLjm%wL z4BT8TObnb1%}ii=J@bl767!N%VfJPM?S<+!$E(-MxhOTUB)=#mKR*YS0s=DfOY(~| z@(UE4gUu8)d=ry1^FRWcpa_Ea*Cn+mvn(~mttdZN0UW|snOI!lWOWQv}Q$CqJK0W?*0v@pN$vskr46bi3<{gTUJ8 z=SDMcCWb{g7Kq2Y{9&>`djFfRpuE_}#MYZTQ;c7h>{`91$4(-{BeZpPzdRGG`SDf)TliRi8G_3v)$`aWAD^07yAgk$Xb zOWMos*M^=bn^5ntEOE=Z5~q-}y3_QRYl$jvytit_75~N)dD}e`5+BO{lsZ#&)co!d zp8RNDr|BO2s~28>mHH^hgH19gAkgVmRLYTto9h@%BYRmZe&%Z^-dI2V>*Wh~wp8kz z7VzSHxhs}Mt>Ltf>`UKRwWSs@Rca>-1#FsCx=!ox=y`Es8 z#rNRZp@2L3JfRaAe9F8Yt`D0Y^G9}xsNuBZ#k`!~1od45xw?O+uX^>o<;uf79Y>vu zo?kUi92OpoVbZ|$J!-c4xgP)3O;+pnKf@I?~Axtwr_eIe48sh z^1c`y@x7SMr+dWkVYR3HtP+cBznyKLeE7T}D^U8Y!>7M#F(wwG?%$vPe)(|SjeF7G x=h~@Dmv+{k+Vn)zQtI$lX0BDI&)PHbFdV&Vac)*?y}vd$@?2>>J2FYEvS literal 0 HcmV?d00001 diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/finished_bronze.png b/1.11/src/main/resources/assets/forgecraft/textures/items/finished_bronze.png new file mode 100644 index 0000000000000000000000000000000000000000..36082d606e29417a70d619dc7a81897c7857d569 GIT binary patch literal 3264 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 FV1hdNpV$BZ literal 0 HcmV?d00001 diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/finished_bronze_emerald.png b/1.11/src/main/resources/assets/forgecraft/textures/items/finished_bronze_emerald.png new file mode 100644 index 0000000000000000000000000000000000000000..76751525e430d0ba4fb06fe8f13ffa13866bc771 GIT binary patch literal 3500 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