diff --git a/1.11/To-Dos b/1.11/To-Dos index ae794504..880f1f7f 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -2,7 +2,7 @@ To-Dos *** Priority *** - [ ] Create the hoe Item -- [ ] Create the axe Item +- [x] Create the axe Item - [ ] Create the shovel Item - [ ] Create the Sword Model diff --git a/1.11/src/main/java/nmd/primal/forgecraft/CommonEvents.java b/1.11/src/main/java/nmd/primal/forgecraft/CommonEvents.java index 55abc586..297e40b8 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/CommonEvents.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/CommonEvents.java @@ -51,9 +51,26 @@ public class CommonEvents implements ToolNBT{ tempTag = a.getSubCompound("tags").copy(); event.crafting.getTagCompound().setTag("tags", tempTag); event.crafting.getItem().updateItemStackNBT(event.crafting.getTagCompound()); - if( getDiamondLevel(event.crafting) > 0 ){ - event.crafting.getItem().setHarvestLevel("Iron", 3); - } + //if( getDiamondLevel(event.crafting) > 0 ){ + // event.crafting.getItem().setHarvestLevel("pickaxe", 3); + //} + } + } + } + } + if (event.crafting.getItem() == ModItems.ironaxe) { + NBTTagCompound tempTag = new NBTTagCompound(); + for (int i = 0; i < event.craftMatrix.getSizeInventory(); i++) { // Checks all the slots + + if (event.craftMatrix.getStackInSlot(i) != null) { // If there is an item + ItemStack a = event.craftMatrix.getStackInSlot(i); // Gets the item + if (a.getItem() instanceof ToolPart) { + tempTag = a.getSubCompound("tags").copy(); + event.crafting.getTagCompound().setTag("tags", tempTag); + event.crafting.getItem().updateItemStackNBT(event.crafting.getTagCompound()); + //if( getDiamondLevel(event.crafting) > 0 ){ + // event.crafting.getItem().setHarvestLevel("pickaxe", 3); + //} } } } 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 5cb66c00..fa4560d9 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 @@ -211,7 +211,217 @@ public class Anvil extends CustomContainerFacing { if (hitz >= this.getNormalMin(z) && hitz <= this.getNormalMax(z)) { if (pItem.getItem().equals(ModItems.stonetongs)) { + //System.out.println("Level 1"); if ((pItem.getTagCompound().getInteger("type") == 6) || (pItem.getTagCompound().getInteger("type") == 7) || + (pItem.getTagCompound().getInteger("type") == 8) || + (pItem.getTagCompound().getInteger("type") == 9) || + (pItem.getTagCompound().getInteger("type") == 10) || + (pItem.getTagCompound().getInteger("type") == 0)) { + + if (!tile.getSlotStack(counter).isEmpty()) { + if (pItem.getTagCompound().getInteger("type") == 0) { + if (tile.getSlotStack(counter).getItem().equals(ModItems.ironingotballhot)) { + pItem.getTagCompound().setInteger("type", 6); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + if (tile.getSlotStack(counter).getItem().equals(ModItems.ironchunkhot)) { + pItem.getTagCompound().setInteger("type", 7); + tile.setSlotStack(counter, ItemStack.EMPTY); + //System.out.println(counter); + return true; + } + + } + } + + if (tile.getSlotStack(counter).isEmpty()) { + //System.out.println("Activating"); + if (pItem.getTagCompound().getInteger("type") == 6) { + tile.setSlotStack((counter), new ItemStack(ModItems.ironingotballhot, 1)); + pItem.getTagCompound().setInteger("type", 0); + return true; + } + if (pItem.getTagCompound().getInteger("type") == 7) { + tile.setSlotStack((counter), new ItemStack(ModItems.ironchunkhot, 1)); + pItem.getTagCompound().setInteger("type", 0); + //System.out.println(counter); + return true; + } + if (pItem.getTagCompound().getInteger("type") == 8) { + ItemStack tempStack = new ItemStack (ModItems.pickaxehead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + 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); + return true; + } + if (pItem.getTagCompound().getInteger("type") == 9) { + ItemStack tempStack = new ItemStack (ModItems.ironaxehead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + 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); + return true; + } + if (pItem.getTagCompound().getInteger("type") == 10) { + ItemStack tempStack = new ItemStack (ModItems.ironshovelhead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + 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); + return true; + } + } + } + } + //System.out.println("1" + pItem); + + if (pItem.getItem().equals(Items.AIR) && player.isSneaking()) { + + if (tile.getSlotStack(counter).getItem().equals(Items.DIAMOND)) { + CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + if (tile.getSlotStack(counter).getItem().equals(PrimalItems.DIAMOND_KNAPP)) { + CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + if (tile.getSlotStack(counter).getItem().equals(Items.EMERALD)) { + CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + if (tile.getSlotStack(counter).getItem().equals(PrimalItems.EMERALD_KNAPP)) { + CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + if (tile.getSlotStack(counter).getItem().equals(Items.REDSTONE)) { + CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + + if (tile.getSlotStack(counter).getItem().equals(Items.DYE) && tile.getSlotStack(counter).getItemDamage() == EnumDyeColor.BLUE.getDyeDamage()) { + CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + + + if (tile.getSlotStack(counter).getItem().equals(ModItems.pickaxehead)) { + if(tile.getSlotStack(counter).getSubCompound("tags").getBoolean("hot") == false){ + CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + } + if (tile.getSlotStack(counter).getItem().equals(ModItems.ironaxehead)) { + if(tile.getSlotStack(counter).getSubCompound("tags").getBoolean("hot") == false){ + CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + } + if (tile.getSlotStack(counter).getItem().equals(ModItems.ironshovelhead)) { + if(tile.getSlotStack(counter).getSubCompound("tags").getBoolean("hot") == false){ + CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + } + } + + if (pItem.getItem().equals(Items.DIAMOND)) { + if (tile.getSlotStack(counter).isEmpty()) { + tile.setSlotStack(counter, new ItemStack(pItem.getItem(), 1)); + pItem.shrink(1); + return true; + } + } + + if (pItem.getItem().equals(Items.EMERALD)) { + if (tile.getSlotStack(counter).isEmpty()) { + tile.setSlotStack(counter, new ItemStack(pItem.getItem(), 1)); + pItem.shrink(1); + return true; + } + } + + if (pItem.getItem().equals(PrimalItems.EMERALD_KNAPP)) { + if (tile.getSlotStack(counter).isEmpty()) { + tile.setSlotStack(counter, new ItemStack(pItem.getItem(), 1)); + pItem.shrink(1); + return true; + } + } + + if (pItem.getItem().equals(PrimalItems.DIAMOND_KNAPP)) { + if (tile.getSlotStack(counter).isEmpty()) { + tile.setSlotStack(counter, new ItemStack(pItem.getItem(), 1)); + pItem.shrink(1); + return true; + } + } + + if (pItem.getItem().equals(Items.REDSTONE)) { + if (tile.getSlotStack(counter).isEmpty()) { + tile.setSlotStack(counter, new ItemStack(pItem.getItem(), 1)); + pItem.shrink(1); + return true; + } + } + + if (pItem.getItem().equals(Items.DYE) && pItem.getItemDamage() == EnumDyeColor.BLUE.getDyeDamage()) { + if (tile.getSlotStack(counter).isEmpty()) { + tile.setSlotStack(counter, new ItemStack(pItem.getItem(), 1, pItem.getItemDamage())); + pItem.shrink(1); + return true; + } + } + } + } + counter++; + } + } + } + if (state.getValue(FACING) == EnumFacing.SOUTH) { + int counter = 0; + for (int z = 0; z < 5; z++) { + for (int x = 0; x < 5; x++) { + if (hitx >= this.getReverseMin(x) && hitx <= this.getReverseMax(x)) { + if (hitz >= this.getReverseMin(z) && hitz <= this.getReverseMax(z)) { + + if (pItem.getItem().equals(ModItems.stonetongs)) { + if ((pItem.getTagCompound().getInteger("type") == 6) || + (pItem.getTagCompound().getInteger("type") == 7) || (pItem.getTagCompound().getInteger("type") == 8) || (pItem.getTagCompound().getInteger("type") == 9) || (pItem.getTagCompound().getInteger("type") == 0)) { @@ -324,157 +534,7 @@ public class Anvil extends CustomContainerFacing { return true; } } - } - - if (pItem.getItem().equals(Items.DIAMOND)) { - if (tile.getSlotStack(counter).isEmpty()) { - tile.setSlotStack(counter, new ItemStack(pItem.getItem(), 1)); - pItem.shrink(1); - return true; - } - } - - if (pItem.getItem().equals(Items.EMERALD)) { - if (tile.getSlotStack(counter).isEmpty()) { - tile.setSlotStack(counter, new ItemStack(pItem.getItem(), 1)); - pItem.shrink(1); - return true; - } - } - - if (pItem.getItem().equals(PrimalItems.EMERALD_KNAPP)) { - if (tile.getSlotStack(counter).isEmpty()) { - tile.setSlotStack(counter, new ItemStack(pItem.getItem(), 1)); - pItem.shrink(1); - return true; - } - } - - if (pItem.getItem().equals(PrimalItems.DIAMOND_KNAPP)) { - if (tile.getSlotStack(counter).isEmpty()) { - tile.setSlotStack(counter, new ItemStack(pItem.getItem(), 1)); - pItem.shrink(1); - return true; - } - } - - if (pItem.getItem().equals(Items.REDSTONE)) { - if (tile.getSlotStack(counter).isEmpty()) { - tile.setSlotStack(counter, new ItemStack(pItem.getItem(), 1)); - pItem.shrink(1); - return true; - } - } - - if (pItem.getItem().equals(Items.DYE) && pItem.getItemDamage() == EnumDyeColor.BLUE.getDyeDamage()) { - if (tile.getSlotStack(counter).isEmpty()) { - tile.setSlotStack(counter, new ItemStack(pItem.getItem(), 1, pItem.getItemDamage())); - pItem.shrink(1); - return true; - } - } - } - } - counter++; - } - } - } - if (state.getValue(FACING) == EnumFacing.SOUTH) { - int counter = 0; - for (int z = 0; z < 5; z++) { - for (int x = 0; x < 5; x++) { - if (hitx >= this.getReverseMin(x) && hitx <= this.getReverseMax(x)) { - if (hitz >= this.getReverseMin(z) && hitz <= this.getReverseMax(z)) { - - if (pItem.getItem().equals(ModItems.stonetongs)) { - if ((pItem.getTagCompound().getInteger("type") == 6) || (pItem.getTagCompound().getInteger("type") == 7) || (pItem.getTagCompound().getInteger("type") == 8)|| (pItem.getTagCompound().getInteger("type") == 0)) { - - if (!tile.getSlotStack(counter).isEmpty()) { - if (pItem.getTagCompound().getInteger("type") == 0) { - if (tile.getSlotStack(counter).getItem().equals(ModItems.ironingotballhot)) { - pItem.getTagCompound().setInteger("type", 6); - tile.setSlotStack(counter, ItemStack.EMPTY); - return true; - } - if (tile.getSlotStack(counter).getItem().equals(ModItems.ironchunkhot)) { - pItem.getTagCompound().setInteger("type", 7); - tile.setSlotStack(counter, ItemStack.EMPTY); - //System.out.println(counter); - return true; - } - - } - } - - if (tile.getSlotStack(counter).isEmpty()) { - if (pItem.getTagCompound().getInteger("type") == 6) { - tile.setSlotStack((counter), new ItemStack(ModItems.ironingotballhot, 1)); - pItem.getTagCompound().setInteger("type", 0); - return true; - } - if (pItem.getTagCompound().getInteger("type") == 7) { - tile.setSlotStack((counter), new ItemStack(ModItems.ironchunkhot, 1)); - pItem.getTagCompound().setInteger("type", 0); - //System.out.println(counter); - return true; - } - if (pItem.getTagCompound().getInteger("type") == 8) { - ItemStack tempStack = new ItemStack (ModItems.pickaxehead, 1); - tempStack.setTagCompound(new NBTTagCompound()); - NBTTagCompound tags = pItem.getSubCompound("tags").copy(); - tempStack.getTagCompound().setTag("tags", tags); - 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); - return true; - } - } - } - } - //System.out.println("1" + pItem); - - if (pItem.getItem().equals(Items.AIR) && player.isSneaking()) { - - if (tile.getSlotStack(counter).getItem().equals(Items.DIAMOND)) { - CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); - tile.setSlotStack(counter, ItemStack.EMPTY); - return true; - } - if (tile.getSlotStack(counter).getItem().equals(PrimalItems.DIAMOND_KNAPP)) { - CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); - tile.setSlotStack(counter, ItemStack.EMPTY); - return true; - } - if (tile.getSlotStack(counter).getItem().equals(Items.EMERALD)) { - CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); - tile.setSlotStack(counter, ItemStack.EMPTY); - return true; - } - if (tile.getSlotStack(counter).getItem().equals(PrimalItems.EMERALD_KNAPP)) { - CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); - tile.setSlotStack(counter, ItemStack.EMPTY); - return true; - } - if (tile.getSlotStack(counter).getItem().equals(Items.REDSTONE)) { - CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); - tile.setSlotStack(counter, ItemStack.EMPTY); - return true; - } - - if (tile.getSlotStack(counter).getItem().equals(Items.DYE) && tile.getSlotStack(counter).getItemDamage() == EnumDyeColor.BLUE.getDyeDamage()) { - CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); - tile.setSlotStack(counter, ItemStack.EMPTY); - return true; - } - - - if (tile.getSlotStack(counter).getItem().equals(ModItems.pickaxehead)) { + if (tile.getSlotStack(counter).getItem().equals(ModItems.ironaxehead)) { if(tile.getSlotStack(counter).getSubCompound("tags").getBoolean("hot") == false){ CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); tile.setSlotStack(counter, ItemStack.EMPTY); @@ -545,7 +605,11 @@ public class Anvil extends CustomContainerFacing { if (hitz >= this.getReverseMin(z) && hitz <= this.getReverseMax(z)) { if (pItem.getItem().equals(ModItems.stonetongs)) { - if ((pItem.getTagCompound().getInteger("type") == 6) || (pItem.getTagCompound().getInteger("type") == 7) || (pItem.getTagCompound().getInteger("type") == 8)|| (pItem.getTagCompound().getInteger("type") == 0)) { + if ((pItem.getTagCompound().getInteger("type") == 6) || + (pItem.getTagCompound().getInteger("type") == 7) || + (pItem.getTagCompound().getInteger("type") == 8) || + (pItem.getTagCompound().getInteger("type") == 9) || + (pItem.getTagCompound().getInteger("type") == 0)) { if (!tile.getSlotStack(counter).isEmpty()) { if (pItem.getTagCompound().getInteger("type") == 0) { @@ -583,6 +647,22 @@ public class Anvil extends CustomContainerFacing { tempStack.getTagCompound().setTag("tags", tags); 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); + return true; + } + if (pItem.getTagCompound().getInteger("type") == 9) { + ItemStack tempStack = new ItemStack (ModItems.ironaxehead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + tile.setSlotStack((counter), tempStack); + pItem.getTagCompound().setInteger("type", 0); pItem.getSubCompound("tags").setBoolean("hot", false); pItem.getSubCompound("tags").setBoolean("emerald", false); @@ -639,6 +719,13 @@ public class Anvil extends CustomContainerFacing { return true; } } + if (tile.getSlotStack(counter).getItem().equals(ModItems.ironaxehead)) { + if(tile.getSlotStack(counter).getSubCompound("tags").getBoolean("hot") == false){ + CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + } } if (pItem.getItem().equals(Items.DIAMOND)) { @@ -703,7 +790,11 @@ public class Anvil extends CustomContainerFacing { if (hitz >= this.getNormalMin(z) && hitz <= this.getNormalMax(z)) { if (pItem.getItem().equals(ModItems.stonetongs)) { - if ((pItem.getTagCompound().getInteger("type") == 6) || (pItem.getTagCompound().getInteger("type") == 7) || (pItem.getTagCompound().getInteger("type") == 8)|| (pItem.getTagCompound().getInteger("type") == 0)) { + if ((pItem.getTagCompound().getInteger("type") == 6) || + (pItem.getTagCompound().getInteger("type") == 7) || + (pItem.getTagCompound().getInteger("type") == 8) || + (pItem.getTagCompound().getInteger("type") == 9) || + (pItem.getTagCompound().getInteger("type") == 0)) { if (!tile.getSlotStack(counter).isEmpty()) { if (pItem.getTagCompound().getInteger("type") == 0) { @@ -741,6 +832,22 @@ public class Anvil extends CustomContainerFacing { tempStack.getTagCompound().setTag("tags", tags); 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); + return true; + } + if (pItem.getTagCompound().getInteger("type") == 9) { + ItemStack tempStack = new ItemStack (ModItems.ironaxehead, 1); + tempStack.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = pItem.getSubCompound("tags").copy(); + tempStack.getTagCompound().setTag("tags", tags); + tile.setSlotStack((counter), tempStack); + pItem.getTagCompound().setInteger("type", 0); pItem.getSubCompound("tags").setBoolean("hot", false); pItem.getSubCompound("tags").setBoolean("emerald", false); @@ -797,6 +904,13 @@ public class Anvil extends CustomContainerFacing { return true; } } + if (tile.getSlotStack(counter).getItem().equals(ModItems.ironaxehead)) { + if(tile.getSlotStack(counter).getSubCompound("tags").getBoolean("hot") == false){ + CommonUtils.spawnItemEntityFromWorld(world, pos, tile.getSlotStack(counter)); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; + } + } } if (pItem.getItem().equals(Items.DIAMOND)) { diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java index ebfde6e9..c70ea1e0 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java @@ -373,30 +373,31 @@ public class Bloomery extends CustomContainerFacing implements ITileEntityProvid if(state.getValue(Forge.ACTIVE) == true) { double d0 = (double)pos.getX() + 0.5D; - double d1 = (double)pos.getY() + 0.96D; + double d1 = (double)pos.getY() + 0.2D; double d2 = (double)pos.getZ() + 0.5D; double d3 = 0.52D; - double d4 = rand.nextDouble() * 0.6D - 0.3D; + double d4 = ThreadLocalRandom.current().nextDouble(0.075, 0.35); + double ySpeed = ThreadLocalRandom.current().nextDouble(0.0, 0.075); if (rand.nextDouble() < 0.1D) { world.playSound((double)pos.getX() + 0.5D, (double)pos.getY(), (double)pos.getZ() + 0.5D, SoundEvents.BLOCK_FURNACE_FIRE_CRACKLE, SoundCategory.BLOCKS, 1.0F, 1.0F, false); } if(rand.nextInt(4) == 1){ - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); } if(rand.nextInt(4) == 2){ - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); } if(rand.nextInt(4) == 3){ - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); } if(rand.nextInt(4) == 4){ - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); } } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java index 73900091..08e889f7 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java @@ -37,7 +37,7 @@ import nmd.primal.forgecraft.tiles.TileForge; import javax.annotation.Nullable; import java.util.Random; - +import java.util.concurrent.ThreadLocalRandom; /** @@ -485,27 +485,28 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ double d1 = (double)pos.getY() + 0.96D; double d2 = (double)pos.getZ() + 0.5D; double d3 = 0.52D; - double d4 = rand.nextDouble() * 0.6D - 0.3D; + double d4 = ThreadLocalRandom.current().nextDouble(0.075, 0.35); + double ySpeed = ThreadLocalRandom.current().nextDouble(0.0, 0.075); if (rand.nextDouble() < 0.1D) { world.playSound((double)pos.getX() + 0.5D, (double)pos.getY(), (double)pos.getZ() + 0.5D, SoundEvents.BLOCK_FURNACE_FIRE_CRACKLE, SoundCategory.BLOCKS, 1.0F, 1.0F, false); } if(rand.nextInt(4) == 1){ - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); } if(rand.nextInt(4) == 2){ - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); } if(rand.nextInt(4) == 3){ - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); } if(rand.nextInt(4) == 4){ - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); } } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java index 51c62b9e..38498d51 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java @@ -452,11 +452,11 @@ public class PistonBellows extends CustomContainerFacing { } private void makeEmbers(World world, BlockPos pos, Random rand){ double d0 = (double)pos.getX() + 0.5D; - double d1 = (double)pos.getY() + 0.96D; + double d1 = (double)pos.getY() + 0.2D; double d2 = (double)pos.getZ() + 0.5D; double d3 = 0.52D; - double d4 = ThreadLocalRandom.current().nextDouble(0.175, 0.35); - double ySpeed = (double) (((rand.nextInt(1) + 1)/10)/2); + double d4 = ThreadLocalRandom.current().nextDouble(0.075, 0.25); + double ySpeed = ThreadLocalRandom.current().nextDouble(0.05, 0.20); if(rand.nextInt(3) == 0){ world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); 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 e662d2b8..5ed3085f 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 @@ -74,6 +74,10 @@ public class ModCrafting { GameRegistry.addShapedRecipe(new ItemStack(ModItems.ironpickaxe, 1), " X ", " Y ", 'X', ModItems.pickaxehead, 'Y', Items.STICK); + /***Axe Crafting***/ + GameRegistry.addShapedRecipe(new ItemStack(ModItems.ironaxe, 1), + " X ", " Y ", 'X', ModItems.ironaxehead, 'Y', Items.STICK); + /***Bloomery Crafting***/ //Makes the Empty Crucible @@ -186,6 +190,16 @@ public class ModCrafting { 1.0f, 1.0f ); + //Makes a Hot ShovelHead + ForgeCrafting.addRecipe( + ModItems.ironshovelhead, + new ItemStack(ModItems.ironshovelhead, 1 ), + 800, + 160, + 400, + 1.0f, + 1.0f + ); /****************************************************************************** @@ -204,6 +218,7 @@ public class ModCrafting { String pickaxehead = ModItems.pickaxehead.getRegistryName().toString(); String ironaxehead = ModItems.ironaxehead.getRegistryName().toString(); + String ironshovelhead = ModItems.ironshovelhead.getRegistryName().toString(); /* Empty = 0 @@ -367,5 +382,66 @@ public class ModCrafting { "lapis" ); + /*** Shovel Head ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,empty,empty,empty, + empty,empty,hotChunk,empty,empty, + empty,hotChunk,hotChunk,hotChunk,empty, + empty,hotChunk,hotChunk,hotChunk,empty, + empty,hotChunk,empty,hotChunk,empty }, + new ItemStack(ModItems.ironshovelhead, 1), + "null" + ); + + /*** Emerald Upgrade to Shovel Head ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,empty,empty,empty, + empty,empty,emeraldShard,empty,empty, + empty,empty,ironshovelhead,empty,empty, + empty,empty,empty,empty,empty, + empty,empty,empty,empty,empty }, + new ItemStack(ModItems.ironshovelhead, 1), + "emerald" + ); + + /*** Diamond Upgrade to Shovel Head ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,empty,empty,empty, + empty,empty,diamondShard,empty,empty, + empty,empty,ironshovelhead,empty,empty, + empty,empty,empty,empty,empty, + empty,empty,empty,empty,empty }, + new ItemStack(ModItems.ironshovelhead, 1), + "diamond" + ); + + /*** Redstone Upgrade to Shovel Head ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,empty,empty,empty, + empty,empty,redstone,empty,empty, + empty,empty,ironshovelhead,empty,empty, + empty,empty,empty,empty,empty, + empty,empty,empty,empty,empty }, + new ItemStack(ModItems.ironshovelhead, 1), + "redstone" + ); + + /*** Lapis Upgrade to Shovel Head ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,empty,empty,empty, + empty,empty,lapis,empty,empty, + empty,empty,ironshovelhead,empty,empty, + empty,empty,empty,empty,empty, + empty,empty,empty,empty,empty }, + new ItemStack(ModItems.ironshovelhead, 1), + "lapis" + ); + + } } 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 a3016631..47f6c455 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 @@ -17,16 +17,14 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.blocks.IngotBall; import nmd.primal.forgecraft.items.*; -import nmd.primal.forgecraft.items.blocks.ItemBlockIngotBall; -import nmd.primal.forgecraft.items.toolparts.PickaxePart; import nmd.primal.forgecraft.items.toolparts.ToolPart; +import nmd.primal.forgecraft.items.tools.CustomAxe; import nmd.primal.forgecraft.items.tools.CustomPickaxe; /** @@ -44,8 +42,10 @@ public class ModItems { public static Item pickaxehead; public static Item ironaxehead; + public static Item ironshovelhead; public static Item ironpickaxe; + public static Item ironaxe; //public static Item forgingmanual; @@ -57,9 +57,10 @@ public class ModItems { pickaxehead = new ToolPart("ironpickaxehead"); ironaxehead = new ToolPart("ironaxehead"); + ironshovelhead = new ToolPart("ironshovelhead"); ironpickaxe = new CustomPickaxe("ironpickaxe", Item.ToolMaterial.IRON); - + ironaxe = new CustomAxe("ironaxe", Item.ToolMaterial.IRON); //ironingotballcool = new BaseMultiItem("ironingotcool") {}; @@ -112,9 +113,11 @@ public class ModItems { GameRegistry.register(pickaxehead); GameRegistry.register(ironaxehead); + GameRegistry.register(ironshovelhead); GameRegistry.register(ironpickaxe); + GameRegistry.register(ironaxe); //GameRegistry.register(forgingmanual); } @@ -129,8 +132,10 @@ public class ModItems { //registerRender(test); registerRender(pickaxehead); registerRender(ironaxehead); + registerRender(ironshovelhead); registerRender(ironpickaxe); + registerRender(ironaxe); //registerRender(forgingmanual); } @@ -147,7 +152,8 @@ public class ModItems { new ResourceLocation(ModInfo.MOD_ID, "stonetongs_ingot"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_chunk"), new ResourceLocation(ModInfo.MOD_ID, "stonetongs_pickaxe_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_axe_hot") + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_axe_hot"), + new ResourceLocation(ModInfo.MOD_ID, "stonetongs_shovel_hot") ); ModelLoader.setCustomMeshDefinition(ModItems.stonetongs, new ItemMeshDefinition() { @@ -184,6 +190,9 @@ public class ModItems { else if (stack.getTagCompound().getInteger("type") == 9 ) { return new ModelResourceLocation(stack.getItem().getRegistryName() + "_axe_hot", "inventory"); } + else if (stack.getTagCompound().getInteger("type") == 10 ) { + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_shovel_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 3f947a8b..82fa38a8 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 @@ -282,6 +282,16 @@ public class ItemStoneTongs extends Item { return EnumActionResult.SUCCESS; } } + if (tile.getSlotStack(i).getItem().equals(ModItems.ironshovelhead)) { + if(tile.getSlotStack(i).getSubCompound("tags").getBoolean("hot") == true) { + itemstack.getTagCompound().setInteger("type", 10); + NBTTagCompound tags = tile.getSlotStack(i).getSubCompound("tags").copy(); + itemstack.getTagCompound().setTag("tags", tags); + //itemstack.getSubCompound("tags").setBoolean("hot", true); + tile.setSlotStack(i, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } + } } } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/PickaxePart.java b/1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/PickaxePart.java deleted file mode 100644 index 63a3c4a1..00000000 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/PickaxePart.java +++ /dev/null @@ -1,29 +0,0 @@ -package nmd.primal.forgecraft.items.toolparts; - -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.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 javax.annotation.Nullable; -import java.util.List; - -/** - * Created by mminaie on 3/11/17. - */ -public class PickaxePart extends ToolPart { - - public PickaxePart(String name) { - super(name); - - } - - -} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java new file mode 100644 index 00000000..d32cd5b3 --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java @@ -0,0 +1,353 @@ +package nmd.primal.forgecraft.items.tools; + +import com.mojang.realmsclient.gui.ChatFormatting; +import net.minecraft.block.state.IBlockState; +import net.minecraft.enchantment.Enchantment; +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.ItemAxe; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.ToolNBT; + +import javax.annotation.Nullable; +import java.util.List; + +/** + * Created by mminaie on 3/20/17. + */ +public class CustomAxe extends ItemAxe implements ToolNBT { + + public CustomAxe(String name, Item.ToolMaterial material) { + super(material); + this.setUnlocalizedName(name); + this.setRegistryName(name); + this.setCreativeTab(ModInfo.TAB_FORGECRAFT); + this.setMaxStackSize(1); + this.setNoRepair(); + + 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 (getHot(item) == false) { + if (getModifiers(item) != 0) { + if ( (getEmerald(item) == true) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { + return 0.1F; + } + + if ( (getEmerald(item) == true) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { + return 0.11F; + } + + if ( (getEmerald(item) == true) && + (getDiamondLevel(item) == 2) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { + return 0.12F; + } + + if ( (getEmerald(item) == true) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 0)) { + return 0.111F; + } + + if ( (getEmerald(item) == true) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 2) && + (getLapisLevel(item) == 0)) { + return 0.102F; + } + + // ============ + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { + return 0.01F; + } + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 2) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { + return 0.02F; + } + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 3) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { + return 0.03F; + } + + //======= + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 0)) { + return 0.001F; + } + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 2) && + (getLapisLevel(item) == 0)) { + return 0.002F; + } + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 3) && + (getLapisLevel(item) == 0)) { + return 0.003F; + } + + //========= + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 1)) { + return 0.0001F; + } + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 2)) { + return 0.0002F; + } + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 3)) { + return 0.0003F; + } + + //======= + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 1)) { + return 0.0111F; + } + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 2) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 0)) { + return 0.021F; + } + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 2) && + (getLapisLevel(item) == 0)) { + return 0.012F; + } + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 2)) { + return 0.0012F; + } + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 2) && + (getLapisLevel(item) == 1)) { + return 0.0021F; + } + + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 2) ) { + return 0.0102F; + } + } + } + if (getHot(item) == true) { + return 1.0F; + } + + if (getHot(item) == false) { + if (item.getSubCompound("tags").getInteger("modifiers") == 0) { + return 0.0F; + } + } + } + return 0.0F; + } + }); + } + + public static boolean isHidden() + { + return false; + } + + @Override + public void onCreated(ItemStack item, World world, EntityPlayer playerIn) { + + if(!world.isRemote) { + if (!item.hasTagCompound()) { + item.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = new NBTTagCompound(); + + item.getTagCompound().setTag("tags", tags); + + /*setHot(item, false); + + 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(!world.isRemote) { + 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); + + } + } + } + + //public void onItemTooltip(ItemTooltipEvent event){ + + @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 Left: " + (3 - getModifiers(item)) ); + if (item.getSubCompound("tags").getBoolean("emerald") == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); + } + if (item.getSubCompound("tags").getInteger("diamond") > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (item.getSubCompound("tags").getInteger("redstone") > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); + } + if (item.getSubCompound("tags").getInteger("lapis") > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); + } + } + } + + + } + + @Override + public boolean onBlockStartBreak(ItemStack itemstack, BlockPos pos, EntityPlayer player) + { + if(!player.world.isRemote){ + World world = player.getEntityWorld(); + System.out.println(world.getBlockState(pos).getBlock()); + if(itemstack.getItem() instanceof CustomPickaxe){ + if( getEmerald(itemstack)){ + itemstack.addEnchantment(Enchantment.getEnchantmentByID(33), 1); + } + if( getDiamondLevel(itemstack) > 0 ){ + itemstack.addEnchantment(Enchantment.getEnchantmentByID(34), getDiamondLevel(itemstack)); + itemstack.getItem().setHarvestLevel("axe", 3); + } + if( getRedstoneLevel(itemstack) > 0 ){ + itemstack.addEnchantment(Enchantment.getEnchantmentByID(32), getRedstoneLevel(itemstack)); + } + if ( getLapisLevel(itemstack) > 0) { + itemstack.addEnchantment(Enchantment.getEnchantmentByID(35), getLapisLevel(itemstack)); + } + } + } + + return false; + } + + @Override + public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState state, BlockPos pos, EntityLivingBase entityLiving) + { + if (!worldIn.isRemote && (double)state.getBlockHardness(worldIn, pos) != 0.0D) + { + + stack.getTagCompound().removeTag("ench"); + //System.out.println(stack.getTagCompound()); + + stack.damageItem(1, entityLiving); + } + + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public boolean hasEffect(ItemStack stack) + { + return false; + } + + @Override + public boolean isRepairable() + { + return false; + } + + public int getItemEnchantability(ItemStack stack) + { + return 0; + } + +} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java index 9bed5746..f53ddcb7 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java @@ -310,7 +310,7 @@ public class CustomPickaxe extends ItemPickaxe implements ToolNBT{ } if( getDiamondLevel(itemstack) > 0 ){ itemstack.addEnchantment(Enchantment.getEnchantmentByID(34), getDiamondLevel(itemstack)); - //itemstack.getItem().setHarvestLevel("pickaxe", 3); + itemstack.getItem().setHarvestLevel("pickaxe", 3); } if( getRedstoneLevel(itemstack) > 0 ){ itemstack.addEnchantment(Enchantment.getEnchantmentByID(32), getRedstoneLevel(itemstack)); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/TileAnvilRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/TileAnvilRender.java index 9c8df9d5..757b14d0 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/TileAnvilRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/TileAnvilRender.java @@ -120,6 +120,15 @@ public class TileAnvilRender extends TileEntitySpecialRenderer renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } + if(tile.getSlotStack(counter).getItem().equals(ModItems.ironshovelhead)){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } if(tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot ){ GL11.glPushMatrix(); double scale = 1.0D; @@ -172,7 +181,8 @@ public class TileAnvilRender extends TileEntitySpecialRenderer GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); - GL11.glTranslated(tile.getReverseX(a), -0.435D, tile.getReverseZ(i) ); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } @@ -180,7 +190,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); - GL11.glTranslated(tile.getReverseX(a), -0.44D, tile.getReverseZ(i) ); + GL11.glTranslated(tile.getNormalX(a), -0.44D, tile.getNormalZ(i)); renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } @@ -188,7 +198,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); - GL11.glTranslated(tile.getReverseX(a), -0.455D, tile.getReverseZ(i) ); + GL11.glTranslated(tile.getNormalX(a), -0.455D, tile.getNormalZ(i)); renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } @@ -230,7 +240,8 @@ public class TileAnvilRender extends TileEntitySpecialRenderer GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getNormalX(a) , -0.435D, tile.getReverseZ(i) ); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } @@ -238,7 +249,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getNormalX(a) , -0.44D, tile.getReverseZ(i) ); + GL11.glTranslated(tile.getNormalX(a), -0.44D, tile.getNormalZ(i)); renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } @@ -246,7 +257,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getNormalX(a) , -0.455D, tile.getReverseZ(i) ); + GL11.glTranslated(tile.getNormalX(a), -0.455D, tile.getNormalZ(i)); renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } @@ -290,7 +301,8 @@ public class TileAnvilRender extends TileEntitySpecialRenderer GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a) , -0.435D, tile.getNormalZ(i) ); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } @@ -298,7 +310,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a) , -0.44D, tile.getNormalZ(i) ); + GL11.glTranslated(tile.getNormalX(a), -0.44D, tile.getNormalZ(i)); renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } @@ -306,7 +318,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); - GL11.glTranslated( tile.getReverseX(a) , -0.455D, tile.getNormalZ(i) ); + GL11.glTranslated(tile.getNormalX(a), -0.455D, tile.getNormalZ(i)); renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/TileForgeRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/TileForgeRender.java index b53b34a6..5af4a6d6 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/TileForgeRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/TileForgeRender.java @@ -78,6 +78,9 @@ public class TileForgeRender extends TileEntitySpecialRenderer if(tile.getSlotStack(i).getItem() == ModItems.ironaxehead) { GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); } + if(tile.getSlotStack(i).getItem() == ModItems.ironshovelhead) { + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + } } if(i == 5){ diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/axe.json b/1.11/src/main/resources/assets/forgecraft/models/item/axe.json index 91f6897b..c79e657e 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/axe.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/axe.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "items/iron_ingot", - "texture1": "blocks/e_texture" + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot" }, "elements": [ { @@ -24,12 +24,12 @@ "from": [ 6.5, 11, 7.5 ], "to": [ 7, 14, 8 ], "faces": { - "down": { "uv": [ 7, 15, 7.5, 15.5 ], "texture": "#texture" }, - "up": { "uv": [ 9, 15.5, 8.5, 15 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 9.5, 7, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 7, 6.5, 7.5, 9.5 ], "texture": "#texture" }, - "west": { "uv": [ 6.5, 15, 9.5, 15.5 ], "texture": "#texture", "rotation": 90 }, - "east": { "uv": [ 6.5, 15, 9.5, 15.5 ], "texture": "#texture", "rotation": 270 } + "down": { "uv": [ 7, 15, 7.5, 15.5 ], "texture": "#texture1" }, + "up": { "uv": [ 9, 15.5, 8.5, 15 ], "texture": "#texture1" }, + "north": { "uv": [ 7.5, 9.5, 7, 6.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 6.5, 7.5, 9.5 ], "texture": "#texture1" }, + "west": { "uv": [ 6.5, 15, 9.5, 15.5 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 6.5, 15, 9.5, 15.5 ], "texture": "#texture1", "rotation": 270 } } }, { @@ -37,12 +37,12 @@ "from": [ 7, 11.5, 7.5 ], "to": [ 7.5, 14, 8 ], "faces": { - "down": { "uv": [ 7.5, 15, 8, 15.5 ], "texture": "#texture" }, - "up": { "uv": [ 8.5, 15.5, 8, 15 ], "texture": "#texture" }, - "north": { "uv": [ 8, 9.5, 7.5, 7 ], "texture": "#texture" }, - "south": { "uv": [ 7.5, 6.5, 8, 9 ], "texture": "#texture" }, - "west": { "uv": [ 6.5, 15, 9, 15.5 ], "texture": "#texture", "rotation": 90 }, - "east": { "uv": [ 7, 15, 9.5, 15.5 ], "texture": "#texture", "rotation": 270 } + "down": { "uv": [ 7.5, 15, 8, 15.5 ], "texture": "#texture1" }, + "up": { "uv": [ 8.5, 15.5, 8, 15 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 9.5, 7.5, 7 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 6.5, 8, 9 ], "texture": "#texture1" }, + "west": { "uv": [ 6.5, 15, 9, 15.5 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 7, 15, 9.5, 15.5 ], "texture": "#texture1", "rotation": 270 } } }, { @@ -50,12 +50,12 @@ "from": [ 6, 10.5, 7.5 ], "to": [ 6.5, 14.5, 8 ], "faces": { - "down": { "uv": [ 6.5, 15, 7, 15.5 ], "texture": "#texture" }, - "up": { "uv": [ 9.5, 15.5, 9, 15 ], "texture": "#texture" }, - "north": { "uv": [ 7, 10, 6.5, 6 ], "texture": "#texture" }, - "south": { "uv": [ 6.5, 6, 7, 10 ], "texture": "#texture" }, - "west": { "uv": [ 6, 15, 10, 15.5 ], "texture": "#texture", "rotation": 90 }, - "east": { "uv": [ 6, 15, 10, 15.5 ], "texture": "#texture", "rotation": 270 } + "down": { "uv": [ 6.5, 15, 7, 15.5 ], "texture": "#texture1" }, + "up": { "uv": [ 9.5, 15.5, 9, 15 ], "texture": "#texture1" }, + "north": { "uv": [ 7, 10, 6.5, 6 ], "texture": "#texture1" }, + "south": { "uv": [ 6.5, 6, 7, 10 ], "texture": "#texture1" }, + "west": { "uv": [ 6, 15, 10, 15.5 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 6, 15, 10, 15.5 ], "texture": "#texture1", "rotation": 270 } } }, { @@ -63,12 +63,12 @@ "from": [ 7.5, 12, 7 ], "to": [ 9.5, 14, 8.5 ], "faces": { - "down": { "uv": [ 7.5, 7.5, 9.5, 9 ], "texture": "#texture" }, - "up": { "uv": [ 7.5, 7, 9.5, 8.5 ], "texture": "#texture" }, - "north": { "uv": [ 6.5, 2, 8.5, 4 ], "texture": "#texture" }, - "south": { "uv": [ 7.5, 2, 9.5, 4 ], "texture": "#texture" }, - "west": { "uv": [ 7, 2, 8.5, 4 ], "texture": "#texture" }, - "east": { "uv": [ 7.5, 2, 9, 4 ], "texture": "#texture" } + "down": { "uv": [ 7.5, 7.5, 9.5, 9 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 7, 9.5, 8.5 ], "texture": "#texture1" }, + "north": { "uv": [ 6.5, 2, 8.5, 4 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 2, 9.5, 4 ], "texture": "#texture1" }, + "west": { "uv": [ 7, 2, 8.5, 4 ], "texture": "#texture1" }, + "east": { "uv": [ 7.5, 2, 9, 4 ], "texture": "#texture1" } } } ], diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe.json new file mode 100644 index 00000000..dabbf310 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe.json @@ -0,0 +1,33 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot" + }, + "overrides": [ + {"predicate": {"type": 0.0},"model": "forgecraft:item/ironaxe"}, + {"predicate": {"type": 0.0001},"model": "forgecraft:item/ironaxe_13"}, + {"predicate": {"type": 0.0002},"model": "forgecraft:item/ironaxe_14"}, + {"predicate": {"type": 0.0003},"model": "forgecraft:item/ironaxe_15"}, + {"predicate": {"type": 0.001},"model": "forgecraft:item/ironaxe_10"}, + {"predicate": {"type": 0.0012},"model": "forgecraft:item/ironaxe_19"}, + {"predicate": {"type": 0.002},"model": "forgecraft:item/ironaxe_11"}, + {"predicate": {"type": 0.0021},"model": "forgecraft:item/ironaxe_20"}, + {"predicate": {"type": 0.003},"model": "forgecraft:item/ironaxe_12"}, + {"predicate": {"type": 0.01},"model": "forgecraft:item/ironaxe_7"}, + {"predicate": {"type": 0.0102},"model": "forgecraft:item/ironaxe_21"}, + {"predicate": {"type": 0.0111},"model": "forgecraft:item/ironaxe_16"}, + {"predicate": {"type": 0.012},"model": "forgecraft:item/ironaxe_18"}, + {"predicate": {"type": 0.02},"model": "forgecraft:item/ironaxe_8"}, + {"predicate": {"type": 0.021},"model": "forgecraft:item/ironaxe_17"}, + {"predicate": {"type": 0.03},"model": "forgecraft:item/ironaxe_9"}, + {"predicate": {"type": 0.1},"model": "forgecraft:item/ironaxe_2"}, + {"predicate": {"type": 0.102},"model": "forgecraft:item/ironaxe_6"}, + {"predicate": {"type": 0.11},"model": "forgecraft:item/ironaxe_3"}, + {"predicate": {"type": 0.111},"model": "forgecraft:item/ironaxe_5"}, + {"predicate": {"type": 0.12},"model": "forgecraft:item/ironaxe_4"}, + {"predicate": {"type": 1.0},"model": "forgecraft:item/ironaxe_1"} + + ] +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/axesTemp/ironaxehead_0.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_0.json similarity index 78% rename from 1.11/src/main/resources/assets/forgecraft/models/item/axesTemp/ironaxehead_0.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_0.json index e50ffec3..862a8402 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/axesTemp/ironaxehead_0.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_0.json @@ -1,5 +1,5 @@ { - "parent": "forgecraft:item/pickaxehead", + "parent": "forgecraft:item/axe", "textures": { "particle": "forgecraft:items/iron_ingot", "texture": "blocks/planks_oak", diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/axesTemp/ironaxehead_1.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_1.json similarity index 78% rename from 1.11/src/main/resources/assets/forgecraft/models/item/axesTemp/ironaxehead_1.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_1.json index 880353b2..c62e88dc 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/axesTemp/ironaxehead_1.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_1.json @@ -1,5 +1,5 @@ { - "parent": "forgecraft:item/pickaxehead", + "parent": "forgecraft:item/axe", "textures": { "particle": "forgecraft:items/iron_ingot_hot", "texture": "blocks/planks_oak", diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_10.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_10.json new file mode 100644 index 00000000..29918765 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_10.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_redstone1" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_11.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_11.json new file mode 100644 index 00000000..395f4f7b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_11.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_redstone2" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_12.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_12.json new file mode 100644 index 00000000..1f6b2455 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_12.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_redstone3" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_13.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_13.json new file mode 100644 index 00000000..5006e599 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_13.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_lapis1" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_14.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_14.json new file mode 100644 index 00000000..0f551341 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_14.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_lapis2" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_15.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_15.json new file mode 100644 index 00000000..c476f5bf --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_15.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_lapis3" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_16.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_16.json new file mode 100644 index 00000000..87f213e7 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_16.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond1_redstone1_lapis1" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_17.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_17.json new file mode 100644 index 00000000..dd4e8881 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_17.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond2_redstone1" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_18.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_18.json new file mode 100644 index 00000000..e832166c --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_18.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond1_redstone2" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_19.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_19.json new file mode 100644 index 00000000..6a4d4297 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_19.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_redstone1_lapis2" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_2.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_2.json new file mode 100644 index 00000000..faabf431 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_2.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot_emerald1", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_emerald1" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_20.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_20.json new file mode 100644 index 00000000..ee16cb1f --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_20.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_redstone2_lapis1" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_21.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_21.json new file mode 100644 index 00000000..ca1e93bc --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_21.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond1_lapis2" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_3.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_3.json new file mode 100644 index 00000000..7ec13091 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_3.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_emerald1_diamond1" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_4.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_4.json new file mode 100644 index 00000000..39f4ac7c --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_4.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_emerald1_diamond2" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_5.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_5.json new file mode 100644 index 00000000..9a29000e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_5.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_emerald1_diamond1_redstone1" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_6.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_6.json new file mode 100644 index 00000000..516cebaa --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_6.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_emerald1_redstone2" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_7.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_7.json new file mode 100644 index 00000000..bfe1a2ee --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_7.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond1" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_8.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_8.json new file mode 100644 index 00000000..ec145204 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_8.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond2" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_9.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_9.json new file mode 100644 index 00000000..a36802d4 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxe_9.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axe", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond3" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead.json new file mode 100644 index 00000000..b581aaa1 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead.json @@ -0,0 +1,37 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot" + }, + "overrides": [ + {"predicate": {"type": 0.0},"model": "forgecraft:item/ironshovelhead_0"}, + {"predicate": {"type": 0.0001},"model": "forgecraft:item/ironshovelhead_13"}, + {"predicate": {"type": 0.0002},"model": "forgecraft:item/ironshovelhead_14"}, + {"predicate": {"type": 0.0003},"model": "forgecraft:item/ironshovelhead_15"}, + {"predicate": {"type": 0.001},"model": "forgecraft:item/ironshovelhead_10"}, + {"predicate": {"type": 0.0012},"model": "forgecraft:item/ironshovelhead_19"}, + {"predicate": {"type": 0.002},"model": "forgecraft:item/ironshovelhead_11"}, + {"predicate": {"type": 0.0021},"model": "forgecraft:item/ironshovelhead_20"}, + {"predicate": {"type": 0.003},"model": "forgecraft:item/ironshovelhead_12"}, + {"predicate": {"type": 0.01},"model": "forgecraft:item/ironshovelhead_7"}, + {"predicate": {"type": 0.0102},"model": "forgecraft:item/ironshovelhead_21"}, + {"predicate": {"type": 0.0111},"model": "forgecraft:item/ironshovelhead_16"}, + {"predicate": {"type": 0.012},"model": "forgecraft:item/ironshovelhead_18"}, + {"predicate": {"type": 0.02},"model": "forgecraft:item/ironshovelhead_8"}, + {"predicate": {"type": 0.021},"model": "forgecraft:item/ironshovelhead_17"}, + {"predicate": {"type": 0.03},"model": "forgecraft:item/ironshovelhead_9"}, + {"predicate": {"type": 0.1},"model": "forgecraft:item/ironshovelhead_2"}, + {"predicate": {"type": 0.102},"model": "forgecraft:item/ironshovelhead_6"}, + {"predicate": {"type": 0.11},"model": "forgecraft:item/ironshovelhead_3"}, + {"predicate": {"type": 0.111},"model": "forgecraft:item/ironshovelhead_5"}, + {"predicate": {"type": 0.12},"model": "forgecraft:item/ironshovelhead_4"}, + {"predicate": {"type": 1.0},"model": "forgecraft:item/ironshovelhead_1"} + + ] +} + + + + diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_0.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_0.json new file mode 100644 index 00000000..1a21af08 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_0.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_1.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_1.json new file mode 100644 index 00000000..9e3809d4 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_1.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot_hot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_hot" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_10.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_10.json new file mode 100644 index 00000000..d9573628 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_10.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_redstone1" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_11.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_11.json new file mode 100644 index 00000000..6acdc603 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_11.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_redstone2" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_12.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_12.json new file mode 100644 index 00000000..bfa415fe --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_12.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_redstone3" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_13.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_13.json new file mode 100644 index 00000000..a58ab5c6 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_13.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_lapis1" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_14.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_14.json new file mode 100644 index 00000000..0231f10e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_14.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_lapis2" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_15.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_15.json new file mode 100644 index 00000000..7019d20e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_15.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_lapis3" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_16.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_16.json new file mode 100644 index 00000000..da4c7a4e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_16.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond1_redstone1_lapis1" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_17.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_17.json new file mode 100644 index 00000000..6f346f6c --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_17.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond2_redstone1" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_18.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_18.json new file mode 100644 index 00000000..428dcc66 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_18.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond1_redstone2" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_19.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_19.json new file mode 100644 index 00000000..e5301b95 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_19.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_redstone1_lapis2" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_2.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_2.json new file mode 100644 index 00000000..5fd1fa0c --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_2.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot_emerald1", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_emerald1" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_20.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_20.json new file mode 100644 index 00000000..76898cc1 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_20.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_redstone2_lapis1" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_21.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_21.json new file mode 100644 index 00000000..d406b358 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_21.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond1_lapis2" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_3.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_3.json new file mode 100644 index 00000000..264743b8 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_3.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_emerald1_diamond1" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_4.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_4.json new file mode 100644 index 00000000..e59f6632 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_4.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_emerald1_diamond2" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_5.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_5.json new file mode 100644 index 00000000..c345f790 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_5.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_emerald1_diamond1_redstone1" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_6.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_6.json new file mode 100644 index 00000000..36838ea4 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_6.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_emerald1_redstone2" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_7.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_7.json new file mode 100644 index 00000000..b08ea79e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_7.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond1" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_8.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_8.json new file mode 100644 index 00000000..8b8a6ad4 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_8.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond2" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_9.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_9.json new file mode 100644 index 00000000..97ef3a43 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironshovelhead_9.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/shovelhead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot_diamond3" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead.json b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead.json index 7ff317ba..bf8617d9 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "items/iron_ingot", - "texture1": "blocks/e_texture" + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot" }, "elements": [ { @@ -11,12 +11,12 @@ "from": [ 7, -0.5, 5 ], "to": [ 7.5, 0, 8.5 ], "faces": { - "down": { "uv": [ 7, 7.5, 7.5, 11 ], "texture": "#texture" }, - "up": { "uv": [ 7, 5, 7.5, 8.5 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 0, 9, 0.5 ], "texture": "#texture" }, - "south": { "uv": [ 7, 0, 7.5, 0.5 ], "texture": "#texture" }, - "west": { "uv": [ 5, 0, 8.5, 0.5 ], "texture": "#texture" }, - "east": { "uv": [ 7.5, 0, 11, 0.5 ], "texture": "#texture" } + "down": { "uv": [ 7, 7.5, 7.5, 11 ], "texture": "#texture1" }, + "up": { "uv": [ 7, 5, 7.5, 8.5 ], "texture": "#texture1" }, + "north": { "uv": [ 8.5, 0, 9, 0.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 0, 7.5, 0.5 ], "texture": "#texture1" }, + "west": { "uv": [ 5, 0, 8.5, 0.5 ], "texture": "#texture1" }, + "east": { "uv": [ 7.5, 0, 11, 0.5 ], "texture": "#texture1" } } }, { @@ -25,12 +25,12 @@ "to": [ 7, 0, 9.5 ], "rotation": { "origin": [ 7, -0.5, 9.5 ], "axis": "z", "angle": -22.5 }, "faces": { - "down": { "uv": [ 6, 10.5, 7, 14.5 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 6, 1.5, 7, 5.5 ], "texture": "#texture", "rotation": 180 }, - "north": { "uv": [ 6, 15.5, 7, 16 ], "texture": "#texture" }, - "south": { "uv": [ 9, 15.5, 10, 16 ], "texture": "#texture" }, - "west": { "uv": [ 10.5, 14, 14.5, 14.5 ], "texture": "#texture" }, - "east": { "uv": [ 1.5, 14, 5.5, 14.5 ], "texture": "#texture" } + "down": { "uv": [ 6, 10.5, 7, 14.5 ], "texture": "#texture1", "rotation": 180 }, + "up": { "uv": [ 6, 1.5, 7, 5.5 ], "texture": "#texture1", "rotation": 180 }, + "north": { "uv": [ 6, 15.5, 7, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 9, 15.5, 10, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 10.5, 14, 14.5, 14.5 ], "texture": "#texture1" }, + "east": { "uv": [ 1.5, 14, 5.5, 14.5 ], "texture": "#texture1" } } }, { @@ -38,12 +38,12 @@ "from": [ 6.5, -0.5, 8.5 ], "to": [ 7.5, 0.5, 10 ], "faces": { - "down": { "uv": [ 6.5, 10, 7.5, 11.5 ], "texture": "#texture" }, - "up": { "uv": [ 6.5, 4.5, 7.5, 6 ], "texture": "#texture" }, - "north": { "uv": [ 9, 14, 10, 15 ], "texture": "#texture" }, - "south": { "uv": [ 7, 14, 8, 15 ], "texture": "#texture" }, - "west": { "uv": [ 4.5, 14, 6, 15 ], "texture": "#texture" }, - "east": { "uv": [ 10, 14, 11.5, 15 ], "texture": "#texture" } + "down": { "uv": [ 6.5, 10, 7.5, 11.5 ], "texture": "#texture1" }, + "up": { "uv": [ 6.5, 4.5, 7.5, 6 ], "texture": "#texture1" }, + "north": { "uv": [ 9, 14, 10, 15 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 14, 8, 15 ], "texture": "#texture1" }, + "west": { "uv": [ 4.5, 14, 6, 15 ], "texture": "#texture1" }, + "east": { "uv": [ 10, 14, 11.5, 15 ], "texture": "#texture1" } } }, { @@ -51,12 +51,12 @@ "from": [ 8.5, -0.5, 8.5 ], "to": [ 9.5, 0.5, 10 ], "faces": { - "down": { "uv": [ 6.5, 10, 7.5, 11.5 ], "texture": "#texture" }, - "up": { "uv": [ 6.5, 4.5, 7.5, 6 ], "texture": "#texture" }, - "north": { "uv": [ 9, 14, 10, 15 ], "texture": "#texture" }, - "south": { "uv": [ 7, 14, 8, 15 ], "texture": "#texture" }, - "west": { "uv": [ 4.5, 14, 6, 15 ], "texture": "#texture" }, - "east": { "uv": [ 10, 14, 11.5, 15 ], "texture": "#texture" } + "down": { "uv": [ 6.5, 10, 7.5, 11.5 ], "texture": "#texture1" }, + "up": { "uv": [ 6.5, 4.5, 7.5, 6 ], "texture": "#texture1" }, + "north": { "uv": [ 9, 14, 10, 15 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 14, 8, 15 ], "texture": "#texture1" }, + "west": { "uv": [ 4.5, 14, 6, 15 ], "texture": "#texture1" }, + "east": { "uv": [ 10, 14, 11.5, 15 ], "texture": "#texture1" } } }, { @@ -64,12 +64,12 @@ "from": [ 7, -1, 8 ], "to": [ 9, -0.5, 9.5 ], "faces": { - "down": { "uv": [ 7, 6.5, 9, 8 ], "texture": "#texture" }, - "up": { "uv": [ 7, 8, 9, 9.5 ], "texture": "#texture" }, - "north": { "uv": [ 7, 0.5, 9, 1 ], "texture": "#texture" }, - "south": { "uv": [ 7, 0.5, 9, 1 ], "texture": "#texture" }, - "west": { "uv": [ 8, 0.5, 9.5, 1 ], "texture": "#texture" }, - "east": { "uv": [ 6.5, 0.5, 8, 1 ], "texture": "#texture" } + "down": { "uv": [ 7, 6.5, 9, 8 ], "texture": "#texture1" }, + "up": { "uv": [ 7, 8, 9, 9.5 ], "texture": "#texture1" }, + "north": { "uv": [ 7, 0.5, 9, 1 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 0.5, 9, 1 ], "texture": "#texture1" }, + "west": { "uv": [ 8, 0.5, 9.5, 1 ], "texture": "#texture1" }, + "east": { "uv": [ 6.5, 0.5, 8, 1 ], "texture": "#texture1" } } }, { @@ -77,12 +77,12 @@ "from": [ 7, 0.5, 9 ], "to": [ 9, 1, 10.5 ], "faces": { - "down": { "uv": [ 7, 10.5, 9, 12.5 ], "texture": "#texture" }, - "up": { "uv": [ 7, 3.5, 9, 5.5 ], "texture": "#texture" }, - "north": { "uv": [ 7, 0, 9, 0.5 ], "texture": "#texture" }, - "south": { "uv": [ 7, 0, 9, 0.5 ], "texture": "#texture" }, - "west": { "uv": [ 3.5, 0, 5.5, 0.5 ], "texture": "#texture" }, - "east": { "uv": [ 10.5, 0, 12.5, 0.5 ], "texture": "#texture" } + "down": { "uv": [ 7, 10.5, 9, 12.5 ], "texture": "#texture1" }, + "up": { "uv": [ 7, 3.5, 9, 5.5 ], "texture": "#texture1" }, + "north": { "uv": [ 7, 0, 9, 0.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 0, 9, 0.5 ], "texture": "#texture1" }, + "west": { "uv": [ 3.5, 0, 5.5, 0.5 ], "texture": "#texture1" }, + "east": { "uv": [ 10.5, 0, 12.5, 0.5 ], "texture": "#texture1" } } }, { @@ -90,12 +90,12 @@ "from": [ 8.5, -0.5, 5 ], "to": [ 9, 0, 8.5 ], "faces": { - "down": { "uv": [ 7, 12, 7.5, 15 ], "texture": "#texture" }, - "up": { "uv": [ 7, 1, 7.5, 4 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 15.5, 9, 16 ], "texture": "#texture" }, - "south": { "uv": [ 7, 15.5, 7.5, 16 ], "texture": "#texture" }, - "west": { "uv": [ 1, 15.5, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 12, 15.5, 15, 16 ], "texture": "#texture" } + "down": { "uv": [ 7, 12, 7.5, 15 ], "texture": "#texture1" }, + "up": { "uv": [ 7, 1, 7.5, 4 ], "texture": "#texture1" }, + "north": { "uv": [ 8.5, 15.5, 9, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 15.5, 7.5, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 1, 15.5, 4, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 12, 15.5, 15, 16 ], "texture": "#texture1" } } }, { @@ -103,12 +103,12 @@ "from": [ 7.5, -0.5, 5 ], "to": [ 8.5, 0, 8.5 ], "faces": { - "down": { "uv": [ 7.5, 7.5, 8.5, 11 ], "texture": "#texture" }, - "up": { "uv": [ 7.5, 5, 8.5, 8.5 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture" }, - "south": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture" }, - "west": { "uv": [ 5, 0, 8.5, 0.5 ], "texture": "#texture" }, - "east": { "uv": [ 7.5, 0, 11, 0.5 ], "texture": "#texture" } + "down": { "uv": [ 7.5, 7.5, 8.5, 11 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 5, 8.5, 8.5 ], "texture": "#texture1" }, + "north": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture1" }, + "west": { "uv": [ 5, 0, 8.5, 0.5 ], "texture": "#texture1" }, + "east": { "uv": [ 7.5, 0, 11, 0.5 ], "texture": "#texture1" } } }, { @@ -117,13 +117,42 @@ "to": [ 10, 0, 9.5 ], "rotation": { "origin": [ 9, -0.5, 5.5 ], "axis": "z", "angle": 22.5 }, "faces": { - "down": { "uv": [ 6, 10.5, 7, 14.5 ], "texture": "#texture", "rotation": 180 }, - "up": { "uv": [ 6, 1.5, 7, 5.5 ], "texture": "#texture", "rotation": 180 }, - "north": { "uv": [ 6, 15.5, 7, 16 ], "texture": "#texture" }, - "south": { "uv": [ 9, 15.5, 10, 16 ], "texture": "#texture" }, - "west": { "uv": [ 10.5, 14, 14.5, 14.5 ], "texture": "#texture" }, - "east": { "uv": [ 1.5, 14, 5.5, 14.5 ], "texture": "#texture" } + "down": { "uv": [ 6, 10.5, 7, 14.5 ], "texture": "#texture1", "rotation": 180 }, + "up": { "uv": [ 6, 1.5, 7, 5.5 ], "texture": "#texture1", "rotation": 180 }, + "north": { "uv": [ 6, 15.5, 7, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 9, 15.5, 10, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 10.5, 14, 14.5, 14.5 ], "texture": "#texture1" }, + "east": { "uv": [ 1.5, 14, 5.5, 14.5 ], "texture": "#texture1" } } } - ] + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 90, 0, 90 ], + "translation": [ -7.25, -1.25, -0.75 ] + }, + "thirdperson_lefthand": { + "rotation": [ 90, 0, 90 ], + "translation": [ -7.25, -1.25, -0.75 ] + }, + "firstperson_righthand": { + "rotation": [ 90, 0, 90 ], + "translation": [ -7.25, -1.25, -0.75 ] + }, + "firstperson_lefthand": { + "rotation": [ 90, 0, 90 ], + "translation": [ -7.25, -1.25, -0.75 ] + }, + "gui": { + "rotation": [ 90, 0, 0 ], + "translation": [ -0.25, 0, 8 ] + }, + "ground": { + "translation": [ 0, 4, 0 ] + }, + "fixed": { + "rotation": [ 90, 0, -180 ], + "translation": [ 0, 0, -7.25 ] + } + } } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_shovel_default.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_shovel_default.json new file mode 100644 index 00000000..74f4e37d --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_shovel_default.json @@ -0,0 +1,239 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/e_particle", + "texture": "items/iron_ingot", + "texture1": "blocks/e_texture", + "texture2": "blocks/iron_ingot_hot" + }, + "elements": [ + { + "__comment": "Cube1", + "from": [ 5.5, 0, 1 ], + "to": [ 6.5, 1, 4 ], + "faces": { + "down": { "uv": [ 4, 12, 5, 15 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 1, 5, 4 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 13, 12, 14 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 13, 5, 14 ], "texture": "#texture1" }, + "west": { "uv": [ 1, 14, 4, 15 ], "texture": "#texture1" }, + "east": { "uv": [ 12, 14, 15, 15 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube2", + "from": [ 9.5, 0, 1 ], + "to": [ 10.5, 1, 4 ], + "faces": { + "down": { "uv": [ 4, 12, 5, 15 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 1, 5, 4 ], "texture": "#texture1" }, + "north": { "uv": [ 11, 13, 12, 14 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 13, 5, 14 ], "texture": "#texture1" }, + "west": { "uv": [ 1, 14, 4, 15 ], "texture": "#texture1" }, + "east": { "uv": [ 12, 14, 15, 15 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube3", + "from": [ 5.5, 0, 4 ], + "to": [ 6.5, 1, 10 ], + "rotation": { "origin": [ 5.5, 0, 4 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 7, 0, 8, 7 ], "texture": "#texture" }, + "up": { "uv": [ 4, 3, 5, 10 ], "texture": "#texture" }, + "north": { "uv": [ 11, 15, 12, 16 ], "texture": "#texture" }, + "south": { "uv": [ 4, 15, 5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 3, 15, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 15, 14, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube5", + "from": [ 5.5, 0, 7.5 ], + "to": [ 6.5, 1, 16 ], + "faces": { + "down": { "uv": [ 6, 0, 7, 9 ], "texture": "#texture" }, + "up": { "uv": [ 6, 0, 7, 9 ], "texture": "#texture" }, + "north": { "uv": [ 9, 15, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 15, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7, 15, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 15, 9, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube6", + "from": [ 9.5, 0, 7.5 ], + "to": [ 10.5, 1, 16 ], + "faces": { + "down": { "uv": [ 6, 0, 7, 9 ], "texture": "#texture" }, + "up": { "uv": [ 6, 7, 7, 16 ], "texture": "#texture" }, + "north": { "uv": [ 9, 15, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 15, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7, 15, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 15, 9, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube3", + "from": [ 4.5, 0, 3 ], + "to": [ 10.5, 1, 4 ], + "rotation": { "origin": [ 10.5, 1, 4 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 4, 3, 5, 10 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 4, 2, 5, 9 ], "texture": "#texture", "rotation": 270 }, + "north": { "uv": [ 7, 15, 14, 16 ], "texture": "#texture", "rotation": 180 }, + "south": { "uv": [ 3, 15, 10, 16 ], "texture": "#texture", "rotation": 180 }, + "west": { "uv": [ 5, 16, 4, 15 ], "texture": "#texture" }, + "east": { "uv": [ 12, 16, 11, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube1", + "from": [ 7, 0.5, -1.5 ], + "to": [ 7.5, 1, 2 ], + "faces": { + "down": { "uv": [ 7, 7.5, 7.5, 11 ], "texture": "#texture2" }, + "up": { "uv": [ 7, 5, 7.5, 8.5 ], "texture": "#texture2" }, + "north": { "uv": [ 8.5, 0, 9, 0.5 ], "texture": "#texture2" }, + "south": { "uv": [ 7, 0, 7.5, 0.5 ], "texture": "#texture2" }, + "west": { "uv": [ 5, 0, 8.5, 0.5 ], "texture": "#texture2" }, + "east": { "uv": [ 7.5, 0, 11, 0.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube2", + "from": [ 6, 0.5, -1 ], + "to": [ 7, 1, 3 ], + "rotation": { "origin": [ 7, 0.5, 3 ], "axis": "z", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 6, 10.5, 7, 14.5 ], "texture": "#texture2", "rotation": 180 }, + "up": { "uv": [ 6, 1.5, 7, 5.5 ], "texture": "#texture2", "rotation": 180 }, + "north": { "uv": [ 6, 15.5, 7, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 9, 15.5, 10, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 10.5, 14, 14.5, 14.5 ], "texture": "#texture2" }, + "east": { "uv": [ 1.5, 14, 5.5, 14.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube5", + "from": [ 6.5, 0.5, 2 ], + "to": [ 7.5, 1.5, 3.5 ], + "faces": { + "down": { "uv": [ 6.5, 10, 7.5, 11.5 ], "texture": "#texture2" }, + "up": { "uv": [ 6.5, 4.5, 7.5, 6 ], "texture": "#texture2" }, + "north": { "uv": [ 9, 14, 10, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 7, 14, 8, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 4.5, 14, 6, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 10, 14, 11.5, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube5", + "from": [ 8.5, 0.5, 2 ], + "to": [ 9.5, 1.5, 3.5 ], + "faces": { + "down": { "uv": [ 6.5, 10, 7.5, 11.5 ], "texture": "#texture2" }, + "up": { "uv": [ 6.5, 4.5, 7.5, 6 ], "texture": "#texture2" }, + "north": { "uv": [ 9, 14, 10, 15 ], "texture": "#texture2" }, + "south": { "uv": [ 7, 14, 8, 15 ], "texture": "#texture2" }, + "west": { "uv": [ 4.5, 14, 6, 15 ], "texture": "#texture2" }, + "east": { "uv": [ 10, 14, 11.5, 15 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube9", + "from": [ 7, 0, 1.5 ], + "to": [ 9, 0.5, 3 ], + "faces": { + "down": { "uv": [ 7, 6.5, 9, 8 ], "texture": "#texture2" }, + "up": { "uv": [ 7, 8, 9, 9.5 ], "texture": "#texture2" }, + "north": { "uv": [ 7, 0.5, 9, 1 ], "texture": "#texture2" }, + "south": { "uv": [ 7, 0.5, 9, 1 ], "texture": "#texture2" }, + "west": { "uv": [ 8, 0.5, 9.5, 1 ], "texture": "#texture2" }, + "east": { "uv": [ 6.5, 0.5, 8, 1 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube9", + "from": [ 7, 1.5, 2.5 ], + "to": [ 9, 2, 4 ], + "faces": { + "down": { "uv": [ 7, 10.5, 9, 12.5 ], "texture": "#texture2" }, + "up": { "uv": [ 7, 3.5, 9, 5.5 ], "texture": "#texture2" }, + "north": { "uv": [ 7, 0, 9, 0.5 ], "texture": "#texture2" }, + "south": { "uv": [ 7, 0, 9, 0.5 ], "texture": "#texture2" }, + "west": { "uv": [ 3.5, 0, 5.5, 0.5 ], "texture": "#texture2" }, + "east": { "uv": [ 10.5, 0, 12.5, 0.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube1", + "from": [ 8.5, 0.5, -1.5 ], + "to": [ 9, 1, 2 ], + "faces": { + "down": { "uv": [ 7, 12, 7.5, 15 ], "texture": "#texture2" }, + "up": { "uv": [ 7, 1, 7.5, 4 ], "texture": "#texture2" }, + "north": { "uv": [ 8.5, 15.5, 9, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 7, 15.5, 7.5, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 1, 15.5, 4, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 12, 15.5, 15, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube12", + "from": [ 7.5, 0.5, -1.5 ], + "to": [ 8.5, 1, 2 ], + "faces": { + "down": { "uv": [ 7.5, 7.5, 8.5, 11 ], "texture": "#texture2" }, + "up": { "uv": [ 7.5, 5, 8.5, 8.5 ], "texture": "#texture2" }, + "north": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture2" }, + "south": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture2" }, + "west": { "uv": [ 5, 0, 8.5, 0.5 ], "texture": "#texture2" }, + "east": { "uv": [ 7.5, 0, 11, 0.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "Cube2", + "from": [ 9, 0.5, -1 ], + "to": [ 10, 1, 3 ], + "rotation": { "origin": [ 9, 0.5, -1 ], "axis": "z", "angle": 22.5 }, + "faces": { + "down": { "uv": [ 6, 10.5, 7, 14.5 ], "texture": "#texture2", "rotation": 180 }, + "up": { "uv": [ 6, 1.5, 7, 5.5 ], "texture": "#texture2", "rotation": 180 }, + "north": { "uv": [ 6, 15.5, 7, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 9, 15.5, 10, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 10.5, 14, 14.5, 14.5 ], "texture": "#texture2" }, + "east": { "uv": [ 1.5, 14, 5.5, 14.5 ], "texture": "#texture2" } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 60, 0, 0 ], + "translation": [ -0.25, 8.33, 3.5 ] + }, + "thirdperson_lefthand": { + "rotation": [ 90, 0, 90 ], + "translation": [ -7.25, -1.25, -0.75 ] + }, + "firstperson_righthand": { + "rotation": [ 20, 0, 0 ], + "translation": [ 0, 8, -2 ] + }, + "firstperson_lefthand": { + "rotation": [ 90, 0, 90 ], + "translation": [ -7.25, -1.25, -0.75 ] + }, + "gui": { + "rotation": [ 90, -45, 0 ], + "translation": [ -0.25, 0, 8 ] + }, + "ground": { + "translation": [ 0, 4, 0 ] + }, + "fixed": { + "rotation": [ 90, 0, -180 ], + "translation": [ 0, 0, -7.25 ] + } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_shovel_hot.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_shovel_hot.json new file mode 100644 index 00000000..49c0018c --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_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/iron_ingot_hot" + }, + "parent": "forgecraft:item/stonetongs_shovel_default" +} \ No newline at end of file