diff --git a/1.11/To-Dos b/1.11/To-Dos index 8a96837f..19f8dc6e 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -134,3 +134,45 @@ rename s/iron/steel/ iron* - [x] Crafting Recipes + 0 | Default StoneTongs + 1 | Empty Crucible Hot + 2 | Empty Crucible Cracked Hot + + ================================ + + 3 | Hot Iron Crucible + 4 | Hot Cooked Iron Crucible + 5 | Hot Failed Iron Crucible + 6 | Hot Iron Ingot + 7 | Hot Iron Chunk + -------------------------------- + 8 | Hot Iron Pickaxe Head + 9 | Hot Iron Axe Head + 10 | Hot Iron Shovel Head + 11 | Hot Iron Hoe Head + + ================================ + + 12 | Hot Clean Iron Crucible + 13 | Hot Cooked Clean Iron Crucible + 14 | Hot Failed Clean Iron Crucible + 15 | Hot Clean Iron Ball + 16 | Hot Clean Iron Chunk + -------------------------------- + 17 | Hot Clean Iron Pickaxe Head + 18 | Hot Clean Iron Axe Head + 19 | Hot Clean Iron Shovel Head + 20 | Hot Clean Iron Hoe Head + + ================================ + + 21 | Hot Steel Crucible + 22 | Hot Cooked Steel Crucible + 23 | Hot Failed Steel Crucible + 24 | Hot Steel Ingot + 25 | Hot Steel Chunk + -------------------------------- + 26 | Hot Steel Pickaxe Head + 27 | Hot Steel Axe Head + 28 | Hot Steel Shovel Head + 29 | Hot Steel Hoe Head \ No newline at end of file diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil.java index 21a5ac59..419719c7 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Anvil.java @@ -324,6 +324,18 @@ public class Anvil extends CustomContainerFacing { (pItem.getTagCompound().getInteger("type") == 9) || (pItem.getTagCompound().getInteger("type") == 10) || (pItem.getTagCompound().getInteger("type") == 11) || + (pItem.getTagCompound().getInteger("type") == 15) || + (pItem.getTagCompound().getInteger("type") == 16) || + (pItem.getTagCompound().getInteger("type") == 17) || + (pItem.getTagCompound().getInteger("type") == 18) || + (pItem.getTagCompound().getInteger("type") == 19) || + (pItem.getTagCompound().getInteger("type") == 20) || + (pItem.getTagCompound().getInteger("type") == 24) || + (pItem.getTagCompound().getInteger("type") == 25) || + (pItem.getTagCompound().getInteger("type") == 26) || + (pItem.getTagCompound().getInteger("type") == 27) || + (pItem.getTagCompound().getInteger("type") == 28) || + (pItem.getTagCompound().getInteger("type") == 29) || (pItem.getTagCompound().getInteger("type") == 0)) { //System.out.println("Level 1"); @@ -337,8 +349,28 @@ public class Anvil extends CustomContainerFacing { if (tile.getSlotStack(counter).getItem().equals(ModItems.ironchunkhot)) { pItem.getTagCompound().setInteger("type", 7); tile.setSlotStack(counter, ItemStack.EMPTY); - //System.out.println(counter); - //System.out.println(counter); + return true; + } + + if (tile.getSlotStack(counter).getItem().equals(ModItems.ironcleaningotballhot)) { + pItem.getTagCompound().setInteger("type", 15); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + if (tile.getSlotStack(counter).getItem().equals(ModItems.ironcleanchunkhot)) { + pItem.getTagCompound().setInteger("type", 16); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + + if (tile.getSlotStack(counter).getItem().equals(ModItems.steelingotballhot)) { + pItem.getTagCompound().setInteger("type", 24); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + if (tile.getSlotStack(counter).getItem().equals(ModItems.steelchunkhot)) { + pItem.getTagCompound().setInteger("type", 25); + tile.setSlotStack(counter, ItemStack.EMPTY); return true; } @@ -433,6 +465,187 @@ public class Anvil extends CustomContainerFacing { pItem.getTagCompound().setInteger("tempDamage", 0); return true; } + + /********************************* + * Clean Iron * + *********************************/ + if (pItem.getTagCompound().getInteger("type") == 15) { + //System.out.println("Tongs meta = 6"); + tile.setSlotStack((counter), new ItemStack(ModItems.ironcleaningotballhot, 1)); + pItem.getTagCompound().setInteger("type", 0); + //return true; + } + if (pItem.getTagCompound().getInteger("type") == 16) { + //System.out.println("Tongs meta = 7"); + tile.setSlotStack((counter), new ItemStack(ModItems.ironcleanchunkhot, 1)); + pItem.getTagCompound().setInteger("type", 0); + ///System.out.println(counter); + //System.out.println(tile.getSlotStack(counter)); + //return true; + } + if (pItem.getTagCompound().getInteger("type") == 17) { + ItemStack tempStack = new ItemStack(ModItems.cleanironpickaxehead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + tempStack.setItemDamage(pItem.getTagCompound().getInteger("tempDamage")); + tile.setSlotStack((counter), tempStack); + + pItem.getTagCompound().setInteger("type", 0); + pItem.getSubCompound("tags").setBoolean("hot", false); + pItem.getSubCompound("tags").setBoolean("emerald", false); + pItem.getSubCompound("tags").setInteger("diamond", 0); + pItem.getSubCompound("tags").setInteger("redstone", 0); + pItem.getSubCompound("tags").setInteger("lapis", 0); + pItem.getSubCompound("tags").setInteger("modifiers", 0); + pItem.getTagCompound().setInteger("tempDamage", 0); + return true; + } + if (pItem.getTagCompound().getInteger("type") == 18) { + ItemStack tempStack = new ItemStack(ModItems.cleanironaxehead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + tempStack.setItemDamage(pItem.getTagCompound().getInteger("tempDamage")); + tile.setSlotStack((counter), tempStack); + + pItem.getTagCompound().setInteger("type", 0); + pItem.getSubCompound("tags").setBoolean("hot", false); + pItem.getSubCompound("tags").setBoolean("emerald", false); + pItem.getSubCompound("tags").setInteger("diamond", 0); + pItem.getSubCompound("tags").setInteger("redstone", 0); + pItem.getSubCompound("tags").setInteger("lapis", 0); + pItem.getSubCompound("tags").setInteger("modifiers", 0); + pItem.getTagCompound().setInteger("tempDamage", 0); + return true; + } + if (pItem.getTagCompound().getInteger("type") == 19) { + ItemStack tempStack = new ItemStack(ModItems.cleanironshovelhead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + tempStack.setItemDamage(pItem.getTagCompound().getInteger("tempDamage")); + tile.setSlotStack((counter), tempStack); + + pItem.getTagCompound().setInteger("type", 0); + pItem.getSubCompound("tags").setBoolean("hot", false); + pItem.getSubCompound("tags").setBoolean("emerald", false); + pItem.getSubCompound("tags").setInteger("diamond", 0); + pItem.getSubCompound("tags").setInteger("redstone", 0); + pItem.getSubCompound("tags").setInteger("lapis", 0); + pItem.getSubCompound("tags").setInteger("modifiers", 0); + pItem.getTagCompound().setInteger("tempDamage", 0); + return true; + } + if (pItem.getTagCompound().getInteger("type") == 20) { + ItemStack tempStack = new ItemStack(ModItems.cleanironhoehead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + tempStack.setItemDamage(pItem.getTagCompound().getInteger("tempDamage")); + tile.setSlotStack((counter), tempStack); + + pItem.getTagCompound().setInteger("type", 0); + pItem.getSubCompound("tags").setBoolean("hot", false); + pItem.getSubCompound("tags").setBoolean("emerald", false); + pItem.getSubCompound("tags").setInteger("diamond", 0); + pItem.getSubCompound("tags").setInteger("redstone", 0); + pItem.getSubCompound("tags").setInteger("lapis", 0); + pItem.getSubCompound("tags").setInteger("modifiers", 0); + pItem.getTagCompound().setInteger("tempDamage", 0); + return true; + } + + /********************************* + * Steel * + *********************************/ + if (pItem.getTagCompound().getInteger("type") == 24) { + //System.out.println("Tongs meta = 6"); + tile.setSlotStack((counter), new ItemStack(ModItems.steelingotballhot, 1)); + pItem.getTagCompound().setInteger("type", 0); + //return true; + } + if (pItem.getTagCompound().getInteger("type") == 25) { + //System.out.println("Tongs meta = 7"); + tile.setSlotStack((counter), new ItemStack(ModItems.steelchunkhot, 1)); + pItem.getTagCompound().setInteger("type", 0); + ///System.out.println(counter); + //System.out.println(tile.getSlotStack(counter)); + //return true; + } + if (pItem.getTagCompound().getInteger("type") == 26) { + ItemStack tempStack = new ItemStack(ModItems.steelpickaxehead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + tempStack.setItemDamage(pItem.getTagCompound().getInteger("tempDamage")); + tile.setSlotStack((counter), tempStack); + + pItem.getTagCompound().setInteger("type", 0); + pItem.getSubCompound("tags").setBoolean("hot", false); + pItem.getSubCompound("tags").setBoolean("emerald", false); + pItem.getSubCompound("tags").setInteger("diamond", 0); + pItem.getSubCompound("tags").setInteger("redstone", 0); + pItem.getSubCompound("tags").setInteger("lapis", 0); + pItem.getSubCompound("tags").setInteger("modifiers", 0); + pItem.getTagCompound().setInteger("tempDamage", 0); + return true; + } + if (pItem.getTagCompound().getInteger("type") == 27) { + ItemStack tempStack = new ItemStack(ModItems.steelaxehead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + tempStack.setItemDamage(pItem.getTagCompound().getInteger("tempDamage")); + tile.setSlotStack((counter), tempStack); + + pItem.getTagCompound().setInteger("type", 0); + pItem.getSubCompound("tags").setBoolean("hot", false); + pItem.getSubCompound("tags").setBoolean("emerald", false); + pItem.getSubCompound("tags").setInteger("diamond", 0); + pItem.getSubCompound("tags").setInteger("redstone", 0); + pItem.getSubCompound("tags").setInteger("lapis", 0); + pItem.getSubCompound("tags").setInteger("modifiers", 0); + pItem.getTagCompound().setInteger("tempDamage", 0); + return true; + } + if (pItem.getTagCompound().getInteger("type") == 28) { + ItemStack tempStack = new ItemStack(ModItems.steelshovelhead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + tempStack.setItemDamage(pItem.getTagCompound().getInteger("tempDamage")); + tile.setSlotStack((counter), tempStack); + + pItem.getTagCompound().setInteger("type", 0); + pItem.getSubCompound("tags").setBoolean("hot", false); + pItem.getSubCompound("tags").setBoolean("emerald", false); + pItem.getSubCompound("tags").setInteger("diamond", 0); + pItem.getSubCompound("tags").setInteger("redstone", 0); + pItem.getSubCompound("tags").setInteger("lapis", 0); + pItem.getSubCompound("tags").setInteger("modifiers", 0); + pItem.getTagCompound().setInteger("tempDamage", 0); + return true; + } + if (pItem.getTagCompound().getInteger("type") == 29) { + ItemStack tempStack = new ItemStack(ModItems.steelhoehead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + tempStack.setItemDamage(pItem.getTagCompound().getInteger("tempDamage")); + tile.setSlotStack((counter), tempStack); + + pItem.getTagCompound().setInteger("type", 0); + pItem.getSubCompound("tags").setBoolean("hot", false); + pItem.getSubCompound("tags").setBoolean("emerald", false); + pItem.getSubCompound("tags").setInteger("diamond", 0); + pItem.getSubCompound("tags").setInteger("redstone", 0); + pItem.getSubCompound("tags").setInteger("lapis", 0); + pItem.getSubCompound("tags").setInteger("modifiers", 0); + pItem.getTagCompound().setInteger("tempDamage", 0); + 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 401f9c7a..3c4f78b2 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 @@ -200,16 +200,17 @@ public class ModBlocks { @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz) { + //System.out.println("Level 0"); if(!world.isRemote){ Item pItem = player.getHeldItem(hand).getItem(); BlockPos belowPos = pos.down(); - //System.out.println("Activating"); + //System.out.println("Activating1"); if (pItem instanceof ForgeHammer && world.getBlockState(belowPos).getBlock().equals(Blocks.IRON_BLOCK)) { player.swingArm(hand); world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); world.setBlockState(belowPos, ModBlocks.ironanvil.getDefaultState().withProperty(Anvil.FACING, player.getHorizontalFacing()), 2); world.playEvent(1031, pos, 0); - //CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.stoneanvil, 1)); + //System.out.println("Activating"); return true; } if (pItem instanceof WorkMallet || pItem.equals(ModItems.forgehammer)) { 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 16fbd432..69e3a043 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 @@ -251,6 +251,10 @@ public class ModItems { registerRender(forgehammer); registerRender(ironingotballhot); registerRender(ironchunkhot); + registerRender(ironcleaningotballhot); + registerRender(ironcleanchunkhot); + registerRender(steelingotballhot); + registerRender(steelchunkhot); //registerRender(test); /********** @@ -314,6 +318,7 @@ public class ModItems { new ResourceLocation(ModInfo.MOD_ID, "stonetongs_default"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_emptyhot"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_emptyhotcracked"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotiron"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotironcooked"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotironfailed"), @@ -322,7 +327,27 @@ public class ModItems { new ResourceLocation(ModInfo.MOD_ID, "stonetongs_pickaxe_hot"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_axe_hot"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_shovel_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hoe_hot") + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hoe_hot"), + + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotcleaniron"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotcleanironcooked"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotcleanironfailed"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_cleanironingot"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_cleanironchunk"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_cleaniron_pickaxe_hot"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_cleaniron_axe_hot"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_cleaniron_shovel_hot"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_cleaniron_hoe_hot"), + + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotsteel"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotsteelcooked"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotsteelfailed"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steelingot"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steelchunk"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_pickaxe_hot"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_axe_hot"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_shovel_hot"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_hoe_hot") ); ModelLoader.setCustomMeshDefinition(ModItems.stonetongs, new ItemMeshDefinition() { @@ -365,6 +390,60 @@ public class ModItems { else if (stack.getTagCompound().getInteger("type") == 11 ) { return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hoe_hot", "inventory"); } + else if (stack.getTagCompound().getInteger("type") == 12 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotcleaniron", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 13 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotcleanironcooked", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 14 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotcleanironfailed", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 15 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_cleanironingot", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 16 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_cleanironchunk", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 17 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_cleaniron_pickaxe_hot", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 18 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_cleaniron_axe_hot", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 19 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_cleaniron_shovel_hot", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 20 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_cleaniron_hoe_hot", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 21 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotsteel", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 22 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotsteelcooked", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 23 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotsteelfailed", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 24 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steelingot", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 25 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steelchunk", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 26 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steel_pickaxe_hot", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 27 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steel_axe_hot", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 28 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steel_shovel_hot", "inventory"); + } + else if (stack.getTagCompound().getInteger("type") == 29 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steel_hoe_hot", "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 b341f2e1..c32c297f 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 @@ -249,7 +249,10 @@ public class ItemStoneTongs extends Item { *****/ if ((world.getBlockState(pos).getBlock() instanceof Crucible) || (world.getBlockState(pos).getBlock() instanceof CrucibleHot)) { return EnumActionResult.FAIL; - } else if (world.getBlockState(pos).getMaterial() == Material.ROCK || world.getBlockState(pos).getMaterial() == Material.SAND) + } else if (world.getBlockState(pos).getMaterial() == Material.ROCK || + world.getBlockState(pos).getMaterial() == Material.SAND || + world.getBlockState(pos).getMaterial() == Material.IRON || + world.getBlockState(pos).getMaterial() == Material.ANVIL ) { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ()); if (world.getBlockState(tempPos).getBlock() == Blocks.AIR) { @@ -496,17 +499,17 @@ public class ItemStoneTongs extends Item { if (tile.getSlotStack(i).getItem().equals(ModItems.ironcleanchunkhot)) { tile.setSlotStack(i, ItemStack.EMPTY); - itemstack.getTagCompound().setInteger("type", 7); + itemstack.getTagCompound().setInteger("type", 16); return EnumActionResult.SUCCESS; } if (tile.getSlotStack(i).getItem().equals(ModItems.ironcleaningotballhot)) { tile.setSlotStack(i, ItemStack.EMPTY); - itemstack.getTagCompound().setInteger("type", 6); + itemstack.getTagCompound().setInteger("type", 15); return EnumActionResult.SUCCESS; } if (tile.getSlotStack(i).getItem().equals(ModItems.cleanironpickaxehead)) { if(tile.getSlotStack(i).getSubCompound("tags").getBoolean("hot") == true) { - itemstack.getTagCompound().setInteger("type", 8); + itemstack.getTagCompound().setInteger("type", 17); NBTTagCompound tags = tile.getSlotStack(i).getSubCompound("tags").copy(); itemstack.getTagCompound().setTag("tags", tags); itemstack.getTagCompound().setInteger("tempDamage", tile.getSlotStack(i).getItemDamage()); @@ -517,7 +520,7 @@ public class ItemStoneTongs extends Item { } if (tile.getSlotStack(i).getItem().equals(ModItems.cleanironaxehead)) { if(tile.getSlotStack(i).getSubCompound("tags").getBoolean("hot") == true) { - itemstack.getTagCompound().setInteger("type", 9); + itemstack.getTagCompound().setInteger("type", 18); NBTTagCompound tags = tile.getSlotStack(i).getSubCompound("tags").copy(); itemstack.getTagCompound().setTag("tags", tags); itemstack.getTagCompound().setInteger("tempDamage", tile.getSlotStack(i).getItemDamage()); @@ -528,7 +531,7 @@ public class ItemStoneTongs extends Item { } if (tile.getSlotStack(i).getItem().equals(ModItems.cleanironshovelhead)) { if(tile.getSlotStack(i).getSubCompound("tags").getBoolean("hot") == true) { - itemstack.getTagCompound().setInteger("type", 10); + itemstack.getTagCompound().setInteger("type", 19); NBTTagCompound tags = tile.getSlotStack(i).getSubCompound("tags").copy(); itemstack.getTagCompound().setTag("tags", tags); itemstack.getTagCompound().setInteger("tempDamage", tile.getSlotStack(i).getItemDamage()); @@ -539,7 +542,7 @@ public class ItemStoneTongs extends Item { } if (tile.getSlotStack(i).getItem().equals(ModItems.cleanironhoehead)) { if(tile.getSlotStack(i).getSubCompound("tags").getBoolean("hot") == true) { - itemstack.getTagCompound().setInteger("type", 11); + itemstack.getTagCompound().setInteger("type", 20); NBTTagCompound tags = tile.getSlotStack(i).getSubCompound("tags").copy(); itemstack.getTagCompound().setTag("tags", tags); itemstack.getTagCompound().setInteger("tempDamage", tile.getSlotStack(i).getItemDamage()); @@ -551,17 +554,17 @@ public class ItemStoneTongs extends Item { if (tile.getSlotStack(i).getItem().equals(ModItems.steelchunkhot)) { tile.setSlotStack(i, ItemStack.EMPTY); - itemstack.getTagCompound().setInteger("type", 7); + itemstack.getTagCompound().setInteger("type", 25); return EnumActionResult.SUCCESS; } if (tile.getSlotStack(i).getItem().equals(ModItems.steelingotballhot)) { tile.setSlotStack(i, ItemStack.EMPTY); - itemstack.getTagCompound().setInteger("type", 6); + itemstack.getTagCompound().setInteger("type", 24); return EnumActionResult.SUCCESS; } if (tile.getSlotStack(i).getItem().equals(ModItems.steelpickaxehead)) { if(tile.getSlotStack(i).getSubCompound("tags").getBoolean("hot") == true) { - itemstack.getTagCompound().setInteger("type", 8); + itemstack.getTagCompound().setInteger("type", 26); NBTTagCompound tags = tile.getSlotStack(i).getSubCompound("tags").copy(); itemstack.getTagCompound().setTag("tags", tags); itemstack.getTagCompound().setInteger("tempDamage", tile.getSlotStack(i).getItemDamage()); @@ -572,7 +575,7 @@ public class ItemStoneTongs extends Item { } if (tile.getSlotStack(i).getItem().equals(ModItems.steelaxehead)) { if(tile.getSlotStack(i).getSubCompound("tags").getBoolean("hot") == true) { - itemstack.getTagCompound().setInteger("type", 9); + itemstack.getTagCompound().setInteger("type", 27); NBTTagCompound tags = tile.getSlotStack(i).getSubCompound("tags").copy(); itemstack.getTagCompound().setTag("tags", tags); itemstack.getTagCompound().setInteger("tempDamage", tile.getSlotStack(i).getItemDamage()); @@ -583,7 +586,7 @@ public class ItemStoneTongs extends Item { } if (tile.getSlotStack(i).getItem().equals(ModItems.steelshovelhead)) { if(tile.getSlotStack(i).getSubCompound("tags").getBoolean("hot") == true) { - itemstack.getTagCompound().setInteger("type", 10); + itemstack.getTagCompound().setInteger("type", 28); NBTTagCompound tags = tile.getSlotStack(i).getSubCompound("tags").copy(); itemstack.getTagCompound().setTag("tags", tags); itemstack.getTagCompound().setInteger("tempDamage", tile.getSlotStack(i).getItemDamage()); @@ -594,7 +597,7 @@ public class ItemStoneTongs extends Item { } if (tile.getSlotStack(i).getItem().equals(ModItems.steelhoehead)) { if(tile.getSlotStack(i).getSubCompound("tags").getBoolean("hot") == true) { - itemstack.getTagCompound().setInteger("type", 11); + itemstack.getTagCompound().setInteger("type", 29); NBTTagCompound tags = tile.getSlotStack(i).getSubCompound("tags").copy(); itemstack.getTagCompound().setTag("tags", tags); itemstack.getTagCompound().setInteger("tempDamage", tile.getSlotStack(i).getItemDamage()); diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironcleanballhot.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironcleaningotballhot.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/ironcleanballhot.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/ironcleaningotballhot.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/steelballhot.json b/1.11/src/main/resources/assets/forgecraft/models/item/steelingotballhot.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/item/steelballhot.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/steelingotballhot.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_axe_hot.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_axe_hot.json new file mode 100644 index 00000000..f9a6abe5 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_axe_hot.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/clean_iron_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_axe_default" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_hoe_hot.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_hoe_hot.json new file mode 100644 index 00000000..cfe63b65 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_hoe_hot.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/clean_iron_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_hoe_default" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_pickaxe_hot.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_pickaxe_hot.json new file mode 100644 index 00000000..c4b47d73 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_pickaxe_hot.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/clean_iron_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_pickaxe_default" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_shovel_hot.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_shovel_hot.json new file mode 100644 index 00000000..527a076d --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_shovel_hot.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/clean_iron_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_shovel_default" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleanironchunk.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleanironchunk.json new file mode 100644 index 00000000..8bab051a --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleanironchunk.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/clean_iron_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_chunk_default" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleanironingot.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleanironingot.json new file mode 100644 index 00000000..d8092027 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_cleanironingot.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/clean_iron_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_ingot_default" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleaniron.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleaniron.json new file mode 100644 index 00000000..11e7c5d4 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleaniron.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:item/stonetongs_hotiron" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleanironcooked.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleanironcooked.json new file mode 100644 index 00000000..70458ffb --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleanironcooked.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:item/stonetongs_hotiron" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleanironfailed.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleanironfailed.json new file mode 100644 index 00000000..d5e4a58b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleanironfailed.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab_hot_burnt" + }, + "parent": "forgecraft:item/stonetongs_hotiron" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteel.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteel.json new file mode 100644 index 00000000..11e7c5d4 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteel.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:item/stonetongs_hotiron" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteelcooked.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteelcooked.json new file mode 100644 index 00000000..70458ffb --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteelcooked.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:item/stonetongs_hotiron" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteelfailed.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteelfailed.json new file mode 100644 index 00000000..d5e4a58b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteelfailed.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab_hot_burnt" + }, + "parent": "forgecraft:item/stonetongs_hotiron" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_axe_hot.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_axe_hot.json new file mode 100644 index 00000000..d697ec71 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_axe_hot.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/steel_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_axe_default" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_hoe_hot.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_hoe_hot.json new file mode 100644 index 00000000..b000bf47 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_hoe_hot.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/steel_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_hoe_default" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_pickaxe_hot.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_pickaxe_hot.json new file mode 100644 index 00000000..243ffc4b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_pickaxe_hot.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/steel_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_pickaxe_default" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_shovel_hot.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_shovel_hot.json new file mode 100644 index 00000000..0942d453 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_shovel_hot.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/steel_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_shovel_default" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steelchunk.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steelchunk.json new file mode 100644 index 00000000..90d04907 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steelchunk.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/iron_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_chunk_default" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steelingot.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steelingot.json new file mode 100644 index 00000000..d5759a5c --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_steelingot.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/steel_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_ingot_default" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/steel_ingot_hot.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/steel_ingot_hot.png new file mode 100644 index 00000000..e8e4defc Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/blocks/steel_ingot_hot.png differ