From 7ca22d291caf386a88336610c604ac25daa99d0d Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 19 Mar 2017 16:48:47 -0400 Subject: [PATCH] stuck on getting the axehead to render in game --- 1.11/To-Dos | 19 +- .../nmd/primal/forgecraft/CommonEvents.java | 63 ++--- .../nmd/primal/forgecraft/CommonUtils.java | 4 + .../nmd/primal/forgecraft/ForgeCraft.java | 2 +- .../java/nmd/primal/forgecraft/ToolNBT.java | 59 ++++ .../primal/forgecraft/blocks/Bloomery.java | 23 +- .../nmd/primal/forgecraft/blocks/Forge.java | 16 +- .../forgecraft/blocks/PistonBellows.java | 30 +- .../nmd/primal/forgecraft/init/ModBlocks.java | 2 +- .../primal/forgecraft/init/ModCrafting.java | 81 +++++- .../nmd/primal/forgecraft/init/ModItems.java | 7 +- .../forgecraft/items/toolparts/ToolPart.java | 81 ++---- .../forgecraft/items/tools/CustomPickaxe.java | 266 +++++++++--------- .../forgecraft/renders/TileAnvilRender.java | 96 +++++++ .../primal/forgecraft/tiles/TileBloomery.java | 4 +- .../assets/forgecraft/models/item/axe.json | 101 +++++++ .../forgecraft/models/item/axehead.json | 91 ++++++ .../models/item/axesTemp/ironaxehead_0.json | 8 + .../models/item/axesTemp/ironaxehead_1.json | 8 + .../assets/forgecraft/models/item/hoe.json | 121 ++++++++ .../forgecraft/models/item/hoehead.json | 90 ++++++ .../forgecraft/models/item/ironaxehead.json | 37 +++ .../forgecraft/models/item/ironaxehead_0.json | 8 + .../forgecraft/models/item/ironaxehead_1.json | 8 + .../models/item/ironaxehead_10.json | 8 + .../models/item/ironaxehead_11.json | 8 + .../models/item/ironaxehead_12.json | 8 + .../models/item/ironaxehead_13.json | 8 + .../models/item/ironaxehead_14.json | 8 + .../models/item/ironaxehead_15.json | 8 + .../models/item/ironaxehead_16.json | 8 + .../models/item/ironaxehead_17.json | 8 + .../models/item/ironaxehead_18.json | 8 + .../models/item/ironaxehead_19.json | 8 + .../forgecraft/models/item/ironaxehead_2.json | 8 + .../models/item/ironaxehead_20.json | 8 + .../models/item/ironaxehead_21.json | 8 + .../forgecraft/models/item/ironaxehead_3.json | 8 + .../forgecraft/models/item/ironaxehead_4.json | 8 + .../forgecraft/models/item/ironaxehead_5.json | 8 + .../forgecraft/models/item/ironaxehead_6.json | 8 + .../forgecraft/models/item/ironaxehead_7.json | 8 + .../forgecraft/models/item/ironaxehead_8.json | 8 + .../forgecraft/models/item/ironaxehead_9.json | 8 + .../forgecraft/models/item/ironpickaxe.json | 42 +-- .../forgecraft/models/item/ironpickaxe_1.json | 8 + .../models/item/ironpickaxe_10.json | 8 + .../models/item/ironpickaxe_11.json | 8 + .../models/item/ironpickaxe_12.json | 8 + .../models/item/ironpickaxe_13.json | 8 + .../models/item/ironpickaxe_14.json | 8 + .../models/item/ironpickaxe_15.json | 8 + .../models/item/ironpickaxe_16.json | 8 + .../models/item/ironpickaxe_17.json | 8 + .../models/item/ironpickaxe_18.json | 8 + .../models/item/ironpickaxe_19.json | 8 + .../forgecraft/models/item/ironpickaxe_2.json | 8 + .../models/item/ironpickaxe_20.json | 8 + .../models/item/ironpickaxe_21.json | 8 + .../forgecraft/models/item/ironpickaxe_3.json | 8 + .../forgecraft/models/item/ironpickaxe_4.json | 8 + .../forgecraft/models/item/ironpickaxe_5.json | 8 + .../forgecraft/models/item/ironpickaxe_6.json | 8 + .../forgecraft/models/item/ironpickaxe_7.json | 8 + .../forgecraft/models/item/ironpickaxe_8.json | 8 + .../forgecraft/models/item/ironpickaxe_9.json | 8 + .../assets/forgecraft/models/item/shovel.json | 160 +++++++++++ .../forgecraft/models/item/shovelhead.json | 129 +++++++++ 68 files changed, 1573 insertions(+), 311 deletions(-) create mode 100644 1.11/src/main/java/nmd/primal/forgecraft/ToolNBT.java create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/axe.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/axehead.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/axesTemp/ironaxehead_0.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/axesTemp/ironaxehead_1.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hoe.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/hoehead.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_0.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_1.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_10.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_11.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_12.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_13.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_14.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_15.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_16.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_17.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_18.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_19.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_2.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_20.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_21.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_3.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_4.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_5.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_6.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_7.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_8.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_9.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_1.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_10.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_11.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_12.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_13.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_14.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_15.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_16.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_17.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_18.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_19.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_2.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_20.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_21.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_3.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_4.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_5.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_6.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_7.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_8.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_9.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/shovel.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/shovelhead.json diff --git a/1.11/To-Dos b/1.11/To-Dos index 0b021520..ae794504 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -1,17 +1,11 @@ To-Dos *** Priority *** -- [ ] Create a Harvest Drops event - -- [ ] Create the axe Model -- [ ] Create the shovel model -- [ ] Create the hoe model +- [ ] Create the hoe Item +- [ ] Create the axe Item +- [ ] Create the shovel Item - [ ] Create the Sword Model -- [ ] Create Crafting Block for Tools and Weapons -- [ ] Create PickAxe Tool which ingests NBT -- [ ] Copy Heat Handler for Forge to Bloomery - *** Backlog *** - [ ] Create a method which adds the types of NBT upgrades and creates a unique float instead of using magic numbers - [ ] Add forgehammer to oreDict @@ -27,10 +21,15 @@ To-Dos - [ ] Bellows Sounds - [ ] Bloomery Sound? - [ ] Forge Sound? -- [ ] Fix Flame creator from Forge and Bloomery + *** Completed *** +- [x] Create the axe Model +- [x] Create the shovel model +- [x] Create the hoe model +- [x] Fix Flame creator from Forge and Bloomery +- [x] Copy Heat Handler for Forge to Bloomery - [x] Create getter and setter for itemNBT - [x] Create all the textures for all the NBT types - [x] Check for if the pickaxe head is hot before removing from forge 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 0bdcbf1a..55abc586 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/CommonEvents.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/CommonEvents.java @@ -8,69 +8,56 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; import nmd.primal.core.api.PrimalBlocks; import nmd.primal.core.api.PrimalItems; import nmd.primal.core.api.PrimalRegistries; import nmd.primal.core.common.init.ModConfig; +import nmd.primal.forgecraft.init.ModItems; +import nmd.primal.forgecraft.items.toolparts.ToolPart; import nmd.primal.forgecraft.items.tools.CustomPickaxe; +import javax.annotation.Nonnull; + /** * Created by mminaie on 3/15/17. */ -public class CommonEvents { +public class CommonEvents implements ToolNBT{ - /******************************************************************************* - * Block Harvesting - * leaf stick drops, plant fiber drops, extra flint and rock drops, stone harvesting - */ @SubscribeEvent(priority= EventPriority.LOWEST, receiveCanceled=true) - public void onBlockHarvest(BlockEvent.HarvestDropsEvent event) - { - World world = event.getWorld(); - EntityPlayer player = event.getHarvester(); + public void onItemCrafted(PlayerEvent.ItemCraftedEvent event) { - if (!world.isRemote && player!=null) //&& !event.isSilkTouching() - { - BlockPos pos = event.getPos(); - IBlockState state = event.getState(); - Block block = state.getBlock(); - Material material = state.getBlock().getMaterial(state); + if(!event.player.getEntityWorld().isRemote) { - ItemStack event_stack = new ItemStack(block, 1, block.getMetaFromState(state)); - ItemStack held_stack = player.getHeldItemMainhand(); - - //System.out.println(event.getDrops()); - System.out.println(event.getFortuneLevel()); - - if(held_stack.getItem() instanceof CustomPickaxe){ - if(((CustomPickaxe) held_stack.getItem()).getLapisLevel(held_stack) > 0){ - //held_stack.addEnchantment(Enchantment.getEnchantmentByID(35), ((CustomPickaxe) held_stack.getItem()).getLapisLevel(held_stack)); - } - if( ((CustomPickaxe) held_stack.getItem()).getEmerald(held_stack) == true) { + if (event.crafting.getItem() == ModItems.ironpickaxe) { + 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("Iron", 3); + } + } + } } } - - - - - if (!event.isSilkTouching()) { - // ***************************************************************************** // - // Extra Rock/Flint Drop - // ***************************************************************************** // - - - } - } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java b/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java index 68f911b6..713f41e4 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java @@ -10,6 +10,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; @@ -65,4 +66,7 @@ public class CommonUtils { world.spawnEntity(entityitem); } + + + } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java b/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java index c365a7af..8eb8c8ef 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java @@ -52,7 +52,7 @@ public class ForgeCraft ModTiles.registerTileEntities(); ModEvents.registerCommonEvents(); - ModEvents.registerClientEvents(); + //ModEvents.registerClientEvents(); // ModItems.registerRenders(); proxy.preInit(); } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ToolNBT.java b/1.11/src/main/java/nmd/primal/forgecraft/ToolNBT.java new file mode 100644 index 00000000..44d91c84 --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/ToolNBT.java @@ -0,0 +1,59 @@ +package nmd.primal.forgecraft; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +/** + * Created by mminaie on 3/17/17. + */ +public interface ToolNBT { + + default boolean getHot(ItemStack stack){ + return stack.getSubCompound("tags").getBoolean("hot"); + } + default void setHot(ItemStack stack, Boolean bool){ + stack.getSubCompound("tags").setBoolean("hot", bool); + } + + default int getModifiers(ItemStack stack) { + return stack.getSubCompound("tags").getInteger("modifiers"); + } + default void setModifiers(ItemStack stack, Integer mods){ + stack.getSubCompound("tags").setInteger("modifiers", mods); + } + + default boolean getEmerald(ItemStack stack){ + return stack.getSubCompound("tags").getBoolean("emerald"); + } + default void setEmerald(ItemStack stack, Boolean bool){ + stack.getSubCompound("tags").setBoolean("emerald", bool); + } + + default int getDiamondLevel(ItemStack stack) { + return stack.getSubCompound("tags").getInteger("diamond"); + } + + default void setDiamondLevel(ItemStack stack, Integer level){ + stack.getSubCompound("tags").setInteger("diamond", level); + } + + + default int getRedstoneLevel(ItemStack stack) { + return stack.getSubCompound("tags").getInteger("redstone"); + } + default void setRedstoneLevel(ItemStack stack, Integer level){ + stack.getSubCompound("tags").setInteger("redstone", level); + } + + default int getLapisLevel(ItemStack stack) { + return stack.getSubCompound("tags").getInteger("lapis"); + } + default void setLapisLevel(ItemStack stack, Integer level){ + stack.getSubCompound("tags").setInteger("lapis", level); + } + + default NBTTagCompound getTags(ItemStack stack){ + return stack.getSubCompound("tags"); + } + +} 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 5e944b21..ebfde6e9 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 @@ -370,34 +370,33 @@ public class Bloomery extends CustomContainerFacing implements ITileEntityProvid @SuppressWarnings("incomplete-switch") public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { - if(state.getValue(Bloomery.ACTIVE) == true) + if(state.getValue(Forge.ACTIVE) == true) { double d0 = (double)pos.getX() + 0.5D; - double d1 = (double)pos.getY() + 0.2D; + 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.15, 0.35); + double d4 = rand.nextDouble() * 0.6D - 0.3D; 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, 0.001D, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, 0.001D, 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, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); } if(rand.nextInt(4) == 2){ - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, 0.001D, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, 0.001D, 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, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); } if(rand.nextInt(4) == 3){ - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, 0.001D, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, 0.001D, 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, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); } if(rand.nextInt(4) == 4){ - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, 0.001D, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, 0.001D, 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, (double) (rand.nextInt(2) + 1)/1000, 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 93aa53b8..73900091 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 @@ -492,20 +492,20 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ 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, 0.001D, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, 0.001D, 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, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); } if(rand.nextInt(4) == 2){ - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, 0.001D, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, 0.001D, 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, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); } if(rand.nextInt(4) == 3){ - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, 0.001D, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, 0.001D, 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, (double) (rand.nextInt(2) + 1)/1000, 0.0D, new int[0]); } if(rand.nextInt(4) == 4){ - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, 0.001D, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, 0.001D, 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, (double) (rand.nextInt(2) + 1)/1000, 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 8cf67eca..51c62b9e 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 @@ -456,19 +456,19 @@ public class PistonBellows extends CustomContainerFacing { double d2 = (double)pos.getZ() + 0.5D; double d3 = 0.52D; double d4 = ThreadLocalRandom.current().nextDouble(0.175, 0.35); - double ySpeed = 0.1D; + double ySpeed = (double) (((rand.nextInt(1) + 1)/10)/2); if(rand.nextInt(3) == 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]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); } if(rand.nextInt(3) == 1){ 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]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); } if(rand.nextInt(3) == 2){ 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]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); } if(rand.nextInt(3) == 3){ world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); @@ -477,4 +477,24 @@ public class PistonBellows extends CustomContainerFacing { } -} \ No newline at end of file +} + + +/* + 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]); + } + 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]); + } + 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]); + } + 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]); + } + */ \ No newline at end of file diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index b41a90d4..0d1a7129 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -91,7 +91,7 @@ public class ModBlocks { if(!world.isRemote){ Item pItem = player.getHeldItem(hand).getItem(); BlockPos belowPos = new BlockPos(pos.getX(), pos.getY() - 1, pos.getZ()); - + //System.out.println("Activating"); if (pItem.equals(PrimalItems.STONE_GALLAGHER) && world.getBlockState(belowPos).getBlock().equals(Blocks.STONE)) { player.swingArm(hand); world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); 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 014f15d6..67277241 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 @@ -70,7 +70,9 @@ public class ModCrafting { //Iron Ore speed +1 - + /***Pickaxe Crafting***/ + GameRegistry.addShapedRecipe(new ItemStack(ModItems.ironpickaxe, 1), + " X ", " Y ", 'X', ModItems.pickaxehead, 'Y', Items.STICK); /***Bloomery Crafting***/ @@ -190,6 +192,7 @@ public class ModCrafting { String lapis = Items.DYE.getRegistryName().toString(); String pickaxehead = ModItems.pickaxehead.getRegistryName().toString(); + String ironaxehead = ModItems.ironaxehead.getRegistryName().toString(); /* Empty = 0 @@ -197,7 +200,7 @@ public class ModCrafting { diamond = 2 */ - //Makes a ForgeHammer + /*** ForgeHammer ***/ AnvilCrafting.addRecipe( new String [] { empty,hotChunk,hotChunk,hotChunk,empty, @@ -209,7 +212,7 @@ public class ModCrafting { "null" ); - //Makes flaked diamond + /*** Flaked diamond ***/ AnvilCrafting.addRecipe( new String[] { empty,empty,empty,empty,empty, @@ -221,7 +224,7 @@ public class ModCrafting { "null" ); - //Makes flaked emerald + /*** Flaked emerald ***/ AnvilCrafting.addRecipe( new String[] { empty,empty,empty,empty,empty, @@ -233,7 +236,7 @@ public class ModCrafting { "null" ); - //Makes a Pickaxe Head + /***Pickaxe Head***/ AnvilCrafting.addRecipe( new String[] { empty,empty,empty,empty,empty, @@ -245,7 +248,7 @@ public class ModCrafting { "null" ); - //Makes a emerald Upgrade to Pickaxe Head + /*** Emerald Upgrade to Pickaxe Head ***/ AnvilCrafting.addRecipe( new String[] { empty,empty,empty,empty,empty, @@ -257,7 +260,7 @@ public class ModCrafting { "emerald" ); - //Makes a diamond Upgrade to Pickaxe Head + /*** Diamond Upgrade to Pickaxe Head ***/ AnvilCrafting.addRecipe( new String[] { empty,empty,empty,empty,empty, @@ -269,7 +272,7 @@ public class ModCrafting { "diamond" ); - //Makes a Redstone Upgrade to Pickaxe Head + /*** Redstone Upgrade to Pickaxe Head ***/ AnvilCrafting.addRecipe( new String[] { empty,empty,empty,empty,empty, @@ -281,7 +284,7 @@ public class ModCrafting { "redstone" ); - //Makes a lapis Upgrade to Pickaxe Head + /*** Lapis Upgrade to Pickaxe Head ***/ AnvilCrafting.addRecipe( new String[] { empty,empty,empty,empty,empty, @@ -293,5 +296,65 @@ public class ModCrafting { "lapis" ); + /*** Axe Head ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,hotChunk,hotChunk,empty,empty, + empty,hotChunk,hotChunk,hotChunk,empty, + empty,hotChunk,hotChunk,hotChunk,empty, + empty,hotChunk,empty,empty,empty, + empty,empty,empty,empty,empty }, + new ItemStack(ModItems.ironaxehead, 1), + "null" + ); + + /*** Emerald Upgrade to Axe Head ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,empty,empty,empty, + empty,empty,emeraldShard,empty,empty, + empty,empty,ironaxehead,empty,empty, + empty,empty,empty,empty,empty, + empty,empty,empty,empty,empty }, + new ItemStack(ModItems.ironaxehead, 1), + "emerald" + ); + + /*** Diamond Upgrade to Axe Head ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,empty,empty,empty, + empty,empty,diamondShard,empty,empty, + empty,empty,ironaxehead,empty,empty, + empty,empty,empty,empty,empty, + empty,empty,empty,empty,empty }, + new ItemStack(ModItems.ironaxehead, 1), + "diamond" + ); + + /*** Redstone Upgrade to Axe Head ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,empty,empty,empty, + empty,empty,redstone,empty,empty, + empty,empty,ironaxehead,empty,empty, + empty,empty,empty,empty,empty, + empty,empty,empty,empty,empty }, + new ItemStack(ModItems.ironaxehead, 1), + "redstone" + ); + + /*** Lapis Upgrade to Axe Head ***/ + AnvilCrafting.addRecipe( + new String[] { + empty,empty,empty,empty,empty, + empty,empty,lapis,empty,empty, + empty,empty,ironaxehead,empty,empty, + empty,empty,empty,empty,empty, + empty,empty,empty,empty,empty }, + new ItemStack(ModItems.ironaxehead, 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 53003995..983d7699 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 @@ -43,7 +43,7 @@ public class ModItems { public static Item ironchunkhot; public static Item pickaxehead; - + public static Item ironaxehead; public static Item ironpickaxe; @@ -55,7 +55,7 @@ public class ModItems { softcrucible = new ItemSoftCrucible(); stonetongs = new ItemStoneTongs("stonetongs"); pickaxehead = new ToolPart("ironpickaxehead"); - + ironaxehead = new ToolPart("ironaxehead"); ironpickaxe = new CustomPickaxe("ironpickaxe", Item.ToolMaterial.IRON); @@ -108,7 +108,10 @@ public class ModItems { GameRegistry.register(ironingotballhot); GameRegistry.register(ironchunkhot); //GameRegistry.register(test); + GameRegistry.register(pickaxehead); + GameRegistry.register(ironaxehead); + GameRegistry.register(ironpickaxe); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/ToolPart.java b/1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/ToolPart.java index cc4fa73a..f5589b45 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/ToolPart.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/ToolPart.java @@ -14,14 +14,17 @@ 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; +import static nmd.primal.forgecraft.ToolNBT.*; + /** * Created by mminaie on 3/9/17. */ -public class ToolPart extends Item { +public class ToolPart extends Item implements ToolNBT{ public ToolPart(String name) { this.setUnlocalizedName(name); @@ -211,54 +214,6 @@ public class ToolPart extends Item { } - public boolean getHot(ItemStack stack){ - return stack.getSubCompound("tags").getBoolean("hot"); - } - public void setHot(ItemStack stack, Boolean bool){ - stack.getSubCompound("tags").setBoolean("hot", bool); - } - - public int getModifiers(ItemStack stack) { - return stack.getSubCompound("tags").getInteger("modifiers"); - } - public void setModifiers(ItemStack stack, Integer mods){ - stack.getSubCompound("tags").setInteger("modifiers", mods); - } - - public boolean getEmerald(ItemStack stack){ - return stack.getSubCompound("tags").getBoolean("emerald"); - } - public void setEmerald(ItemStack stack, Boolean bool){ - stack.getSubCompound("keys").setBoolean("emerald", bool); - } - - public int getDiamondLevel(ItemStack stack) { - return stack.getSubCompound("tags").getInteger("diamond"); - } - - public void setDiamondLevel(ItemStack stack, Integer level){ - stack.getSubCompound("tags").setInteger("diamond", level); - } - - - public int getRedstoneLevel(ItemStack stack) { - return stack.getSubCompound("tags").getInteger("redstone"); - } - public void setRedstoneLevel(ItemStack stack, Integer level){ - stack.getSubCompound("tags").setInteger("redstone", level); - } - - public int getLapisLevel(ItemStack stack) { - return stack.getSubCompound("tags").getInteger("lapis"); - } - public void setLapisLevel(ItemStack stack, Integer level){ - stack.getSubCompound("tags").setInteger("lapis", level); - } - - public NBTTagCompound getTags(ItemStack stack){ - return stack.getSubCompound("tags"); - } - public static boolean isHidden() { @@ -274,14 +229,12 @@ public class ToolPart extends Item { item.getTagCompound().setTag("tags", tags); - item.getSubCompound("tags").setBoolean("hot", false); - - item.getSubCompound("tags").setBoolean("emerald", false); - item.getSubCompound("tags").setInteger("diamond", 0); - item.getSubCompound("tags").setInteger("redstone", 0); - item.getSubCompound("tags").setInteger("lapis", 0); - - item.getSubCompound("tags").setInteger("modifiers", 0); + setHot(item, false); + setEmerald(item, false); + setDiamondLevel(item, 0); + setRedstoneLevel(item, 0); + setLapisLevel(item, 0); + setModifiers(item, 0); } } @@ -294,14 +247,12 @@ public class ToolPart extends Item { item.getTagCompound().setTag("tags", tags); - item.getSubCompound("tags").setBoolean("hot", false); - - item.getSubCompound("tags").setBoolean("emerald", false); - item.getSubCompound("tags").setInteger("diamond", 0); - item.getSubCompound("tags").setInteger("redstone", 0); - item.getSubCompound("tags").setInteger("lapis", 0); - - item.getSubCompound("tags").setInteger("modifiers", 0); + setHot(item, false); + setEmerald(item, false); + setDiamondLevel(item, 0); + setRedstoneLevel(item, 0); + setLapisLevel(item, 0); + setModifiers(item, 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 77157e2e..9bed5746 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 @@ -24,15 +24,15 @@ 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; -import java.util.Set; /** * Created by mminaie on 3/14/17. */ -public class CustomPickaxe extends ItemPickaxe{ +public class CustomPickaxe extends ItemPickaxe implements ToolNBT{ public CustomPickaxe(String name, Item.ToolMaterial material) { super(material); @@ -55,234 +55,216 @@ public class CustomPickaxe extends ItemPickaxe{ public float apply(ItemStack item, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { if (item.hasTagCompound()) { - - /*if (item.getSubCompound("tags").getBoolean("hot") == false) { - if (item.getSubCompound("tags").getInteger("modifiers") != 0) { - if ((item.getSubCompound("tags").getBoolean("emerald") == true) && - (item.getSubCompound("tags").getInteger("diamond") == 0) && - (item.getSubCompound("tags").getInteger("redstone") == 0) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + 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 ((item.getSubCompound("tags").getBoolean("emerald") == true) && - (item.getSubCompound("tags").getInteger("diamond") == 1) && - (item.getSubCompound("tags").getInteger("redstone") == 0) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + if ( (getEmerald(item) == true) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { return 0.11F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == true) && - (item.getSubCompound("tags").getInteger("diamond") == 2) && - (item.getSubCompound("tags").getInteger("redstone") == 0) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + if ( (getEmerald(item) == true) && + (getDiamondLevel(item) == 2) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { return 0.12F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == true) && - (item.getSubCompound("tags").getInteger("diamond") == 1) && - (item.getSubCompound("tags").getInteger("redstone") == 1) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + if ( (getEmerald(item) == true) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 0)) { return 0.111F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == true) && - (item.getSubCompound("tags").getInteger("diamond") == 0) && - (item.getSubCompound("tags").getInteger("redstone") == 2) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + if ( (getEmerald(item) == true) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 2) && + (getLapisLevel(item) == 0)) { return 0.102F; } // ============ - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 1) && - (item.getSubCompound("tags").getInteger("redstone") == 0) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { return 0.01F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 2) && - (item.getSubCompound("tags").getInteger("redstone") == 0) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 2) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { return 0.02F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 3) && - (item.getSubCompound("tags").getInteger("redstone") == 0) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 3) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { return 0.03F; } //======= - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 0) && - (item.getSubCompound("tags").getInteger("redstone") == 1) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 0)) { return 0.001F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 0) && - (item.getSubCompound("tags").getInteger("redstone") == 2) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 2) && + (getLapisLevel(item) == 0)) { return 0.002F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 0) && - (item.getSubCompound("tags").getInteger("redstone") == 3) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 3) && + (getLapisLevel(item) == 0)) { return 0.003F; } //========= - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 0) && - (item.getSubCompound("tags").getInteger("redstone") == 0) && - (item.getSubCompound("tags").getInteger("lapis") == 1)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 1)) { return 0.0001F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 0) && - (item.getSubCompound("tags").getInteger("redstone") == 0) && - (item.getSubCompound("tags").getInteger("lapis") == 2)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 2)) { return 0.0002F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 0) && - (item.getSubCompound("tags").getInteger("redstone") == 0) && - (item.getSubCompound("tags").getInteger("lapis") == 3)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 3)) { return 0.0003F; } //======= - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 1) && - (item.getSubCompound("tags").getInteger("redstone") == 1) && - (item.getSubCompound("tags").getInteger("lapis") == 1)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 1)) { return 0.0111F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 2) && - (item.getSubCompound("tags").getInteger("redstone") == 1) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 2) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 0)) { return 0.021F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 1) && - (item.getSubCompound("tags").getInteger("redstone") == 2) && - (item.getSubCompound("tags").getInteger("lapis") == 0)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 2) && + (getLapisLevel(item) == 0)) { return 0.012F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 0) && - (item.getSubCompound("tags").getInteger("redstone") == 1) && - (item.getSubCompound("tags").getInteger("lapis") == 2)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 2)) { return 0.0012F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 0) && - (item.getSubCompound("tags").getInteger("redstone") == 2) && - (item.getSubCompound("tags").getInteger("lapis") == 1)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 2) && + (getLapisLevel(item) == 1)) { return 0.0021F; } - if ((item.getSubCompound("tags").getBoolean("emerald") == false) && - (item.getSubCompound("tags").getInteger("diamond") == 1) && - (item.getSubCompound("tags").getInteger("redstone") == 0) && - (item.getSubCompound("tags").getInteger("lapis") == 2)) { + if ( (getEmerald(item) == false) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 2) ) { return 0.0102F; } } } - if (item.getSubCompound("tags").getBoolean("hot") == true) { + if (getHot(item) == true) { return 1.0F; } - if (item.getSubCompound("tags").getBoolean("hot") == false) { + if (getHot(item) == false) { if (item.getSubCompound("tags").getInteger("modifiers") == 0) { return 0.0F; } - }*/ + } } return 0.0F; } }); } - - - public boolean getHot(ItemStack stack){ - return stack.getSubCompound("tags").getBoolean("hot"); - } - public boolean getEmerald(ItemStack stack){ - return stack.getSubCompound("tags").getBoolean("emerald"); - } - public int getDiamondLevel(ItemStack stack) { - return stack.getSubCompound("tags").getInteger("diamond"); - } - public int getRedstoneLevel(ItemStack stack) { - return stack.getSubCompound("tags").getInteger("redstone"); - } - public int getLapisLevel(ItemStack stack) { - return stack.getSubCompound("tags").getInteger("lapis"); - } - public static boolean isHidden() { return false; } @Override - public void onCreated(ItemStack item, World worldIn, EntityPlayer playerIn) { + public void onCreated(ItemStack item, World world, EntityPlayer playerIn) { - if (!item.hasTagCompound()) { - item.setTagCompound(new NBTTagCompound()); - NBTTagCompound tags = new NBTTagCompound(); + if(!world.isRemote) { + if (!item.hasTagCompound()) { + item.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = new NBTTagCompound(); - item.getTagCompound().setTag("tags", tags); + item.getTagCompound().setTag("tags", tags); - item.getSubCompound("tags").setBoolean("hot", false); + /*setHot(item, false); - item.getSubCompound("tags").setBoolean("emerald", false); - item.getSubCompound("tags").setInteger("diamond", 0); - item.getSubCompound("tags").setInteger("redstone", 0); - item.getSubCompound("tags").setInteger("lapis", 0); - - item.getSubCompound("tags").setInteger("modifiers", 0); + setHot(item, false); + setEmerald(item, false); + setDiamondLevel(item, 0); + setRedstoneLevel(item, 0); + setLapisLevel(item, 0); + setModifiers(item, 0);*/ + } } + } @Override public void onUpdate(ItemStack item, World world, Entity player, int itemSlot, boolean isSelected) { - if (!item.hasTagCompound()) { - item.setTagCompound(new NBTTagCompound()); - NBTTagCompound tags = new NBTTagCompound(); + if(!world.isRemote) { + if (!item.hasTagCompound()) { + item.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = new NBTTagCompound(); - item.getTagCompound().setTag("tags", tags); + item.getTagCompound().setTag("tags", tags); - item.getSubCompound("tags").setBoolean("hot", false); + setHot(item, false); + setEmerald(item, false); + setDiamondLevel(item, 0); + setRedstoneLevel(item, 0); + setLapisLevel(item, 0); + setModifiers(item, 0); - item.getSubCompound("tags").setBoolean("emerald", false); - item.getSubCompound("tags").setInteger("diamond", 0); - item.getSubCompound("tags").setInteger("redstone", 0); - item.getSubCompound("tags").setInteger("lapis", 3); - - item.getSubCompound("tags").setInteger("modifiers", 0); - if(!world.isRemote){ - //item.addEnchantment(Enchantment.getEnchantmentByID(35), 3); } } } @@ -297,18 +279,18 @@ public class CustomPickaxe extends ItemPickaxe{ if(item.hasTagCompound()) { - tooltip.add(ChatFormatting.GRAY + "Upgrades"); + 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: " + item.getSubCompound("tags").getInteger("diamond")); + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); } if (item.getSubCompound("tags").getInteger("redstone") > 0) { - tooltip.add(ChatFormatting.RED + "Redstone Level: " + item.getSubCompound("tags").getInteger("redstone")); + tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); } if (item.getSubCompound("tags").getInteger("lapis") > 0) { - tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + item.getSubCompound("tags").getInteger("lapis")); + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); } } } @@ -323,8 +305,18 @@ public class CustomPickaxe extends ItemPickaxe{ World world = player.getEntityWorld(); System.out.println(world.getBlockState(pos).getBlock()); if(itemstack.getItem() instanceof CustomPickaxe){ - if ( ((CustomPickaxe) itemstack.getItem()).getLapisLevel(itemstack) > 0) { - itemstack.addEnchantment(Enchantment.getEnchantmentByID(35), ((CustomPickaxe) itemstack.getItem()).getLapisLevel(itemstack)); + if( getEmerald(itemstack)){ + itemstack.addEnchantment(Enchantment.getEnchantmentByID(33), 1); + } + if( getDiamondLevel(itemstack) > 0 ){ + itemstack.addEnchantment(Enchantment.getEnchantmentByID(34), getDiamondLevel(itemstack)); + //itemstack.getItem().setHarvestLevel("pickaxe", 3); + } + if( getRedstoneLevel(itemstack) > 0 ){ + itemstack.addEnchantment(Enchantment.getEnchantmentByID(32), getRedstoneLevel(itemstack)); + } + if ( getLapisLevel(itemstack) > 0) { + itemstack.addEnchantment(Enchantment.getEnchantmentByID(35), getLapisLevel(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 d5cafac5..c1fe1919 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 @@ -111,6 +111,30 @@ public class TileAnvilRender extends TileEntitySpecialRenderer renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } + if(tile.getSlotStack(counter).getItem().equals(ModItems.ironaxehead)){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.435D, tile.getNormalZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if(tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot ){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.44D, tile.getNormalZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getNormalX(a), -0.455D, tile.getNormalZ(i)); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } } counter++; @@ -143,6 +167,30 @@ public class TileAnvilRender extends TileEntitySpecialRenderer renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } + if(tile.getSlotStack(counter).getItem().equals(ModItems.ironaxehead)){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.435D, tile.getReverseZ(i) ); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if(tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot ){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.44D, tile.getReverseZ(i) ); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(tile.getReverseX(a), -0.455D, tile.getReverseZ(i) ); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } } counter++; @@ -177,6 +225,30 @@ public class TileAnvilRender extends TileEntitySpecialRenderer renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } + if(tile.getSlotStack(counter).getItem().equals(ModItems.ironaxehead)){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated( tile.getNormalX(a) , -0.435D, tile.getReverseZ(i) ); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if(tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot ){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated( tile.getNormalX(a) , -0.44D, tile.getReverseZ(i) ); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated( tile.getNormalX(a) , -0.455D, tile.getReverseZ(i) ); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } } counter++; @@ -213,6 +285,30 @@ public class TileAnvilRender extends TileEntitySpecialRenderer renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } + if(tile.getSlotStack(counter).getItem().equals(ModItems.ironaxehead)){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated( tile.getReverseX(a) , -0.435D, tile.getNormalZ(i) ); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if(tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot ){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated( tile.getReverseX(a) , -0.44D, tile.getNormalZ(i) ); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } + if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot){ + GL11.glPushMatrix(); + double scale = 1.0D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated( tile.getReverseX(a) , -0.455D, tile.getNormalZ(i) ); + renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); + GL11.glPopMatrix(); + } } counter++; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java index 385f9b3a..ef3c6f31 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -136,11 +136,11 @@ public class TileBloomery extends TileBaseSlot implements ITickable { this.setHeat(h - 25); } if(h < 10 ){ - world.setBlockState(pos, state.withProperty(Bloomery.ACTIVE, false), 2); + world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); } } if(stack.isEmpty()){ - world.setBlockState(pos, state.withProperty(Bloomery.ACTIVE, false), 2); + world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); } } if(state.getValue(Bloomery.ACTIVE) == false){ 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 new file mode 100644 index 00000000..91f6897b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/axe.json @@ -0,0 +1,101 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/e_particle", + "texture": "items/iron_ingot", + "texture1": "blocks/e_texture" + }, + "elements": [ + { + "__comment": "Cube1", + "from": [ 8, 0, 7.5 ], + "to": [ 9, 12, 8 ], + "faces": { + "down": { "uv": [ 8, 8, 9, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 8, 7.5, 9, 8 ], "texture": "#texture" }, + "north": { "uv": [ 7, 4, 8, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8, 4, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 4, 8, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 4, 8.5, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube7", + "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 } + } + }, + { + "__comment": "Cube8", + "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 } + } + }, + { + "__comment": "Cube9", + "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 } + } + }, + { + "__comment": "Cube6", + "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" } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 0, -90, 0 ], + "translation": [ 0, 7, 0.25 ] + }, + "thirdperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 7, 0.25 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 0 ], + "translation": [ 0, 7, 0.25 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 7, 0.25 ] + }, + "gui": { + "rotation": [ 0, 0, -45 ], + "translation": [ -0.75, 0, 8 ] + }, + "ground": { + "rotation": [ 90, 0, 0 ], + "translation": [ 0, -3.5, 0 ] + } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/axehead.json b/1.11/src/main/resources/assets/forgecraft/models/item/axehead.json new file mode 100644 index 00000000..2bc65bf6 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/axehead.json @@ -0,0 +1,91 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot" + }, + "elements": [ + { + "__comment": "Cube6", + "from": [ 8, 0, 6.5 ], + "to": [ 9, 1.5, 8.5 ], + "faces": { + "down": { "uv": [ 8, 7.5, 9, 9.5 ], "texture": "#texture1" }, + "up": { "uv": [ 8, 6.5, 9, 8.5 ], "texture": "#texture1" }, + "north": { "uv": [ 7, 14.5, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 8, 14.5, 9, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 6.5, 14.5, 8.5, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 7.5, 14.5, 9.5, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube7", + "from": [ 7, 0.5, 6.5 ], + "to": [ 7.5, 1, 9.5 ], + "faces": { + "down": { "uv": [ 7, 6.5, 7.5, 9.5 ], "texture": "#texture1" }, + "up": { "uv": [ 7, 6.5, 7.5, 9.5 ], "texture": "#texture1" }, + "north": { "uv": [ 8.5, 15, 9, 15.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 15, 7.5, 15.5 ], "texture": "#texture1" }, + "west": { "uv": [ 6.5, 15, 9.5, 15.5 ], "texture": "#texture1" }, + "east": { "uv": [ 6.5, 15, 9.5, 15.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube8", + "from": [ 7.5, 0.5, 6.5 ], + "to": [ 8, 1, 9 ], + "faces": { + "down": { "uv": [ 7.5, 7, 8, 9.5 ], "texture": "#texture1" }, + "up": { "uv": [ 7.5, 6.5, 8, 9 ], "texture": "#texture1" }, + "north": { "uv": [ 8, 15, 8.5, 15.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 15, 8, 15.5 ], "texture": "#texture1" }, + "west": { "uv": [ 6.5, 15, 9, 15.5 ], "texture": "#texture1" }, + "east": { "uv": [ 7, 15, 9.5, 15.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "Cube9", + "from": [ 6.5, 0.5, 6 ], + "to": [ 7, 1, 10 ], + "faces": { + "down": { "uv": [ 6.5, 6, 7, 10 ], "texture": "#texture1" }, + "up": { "uv": [ 6.5, 6, 7, 10 ], "texture": "#texture1" }, + "north": { "uv": [ 9, 15, 9.5, 15.5 ], "texture": "#texture1" }, + "south": { "uv": [ 6.5, 15, 7, 15.5 ], "texture": "#texture1" }, + "west": { "uv": [ 6, 15, 10, 15.5 ], "texture": "#texture1" }, + "east": { "uv": [ 6, 15, 10, 15.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/axesTemp/ironaxehead_0.json b/1.11/src/main/resources/assets/forgecraft/models/item/axesTemp/ironaxehead_0.json new file mode 100644 index 00000000..e50ffec3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/axesTemp/ironaxehead_0.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxehead", + "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/axesTemp/ironaxehead_1.json b/1.11/src/main/resources/assets/forgecraft/models/item/axesTemp/ironaxehead_1.json new file mode 100644 index 00000000..880353b2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/axesTemp/ironaxehead_1.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxehead", + "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/hoe.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoe.json new file mode 100644 index 00000000..d6f3561a --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hoe.json @@ -0,0 +1,121 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/e_particle", + "texture": "blocks/e_texture", + "texture1": "blocks/e_texture" + }, + "elements": [ + { + "__comment": "Cube2", + "from": [ 7, 13, 3 ], + "to": [ 9, 14, 6 ], + "rotation": { "origin": [ 7, 13, 6 ], "axis": "x", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 11, 16, 8, 15 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 5, 15, 8, 16 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 5, 15, 6, 16 ], "texture": "#texture", "rotation": 270 }, + "south": { "uv": [ 10, 15, 11, 16 ], "texture": "#texture", "rotation": 90 }, + "west": { "uv": [ 5, 5, 6, 8 ], "texture": "#texture", "rotation": 270 }, + "east": { "uv": [ 6, 11, 5, 8 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "Cube4", + "from": [ 7, 13, 5.5 ], + "to": [ 9, 14, 7.5 ], + "faces": { + "down": { "uv": [ 8.5, 16, 6.5, 14 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 7.5, 14, 9.5, 16 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 7.5, 14, 8.5, 16 ], "texture": "#texture", "rotation": 270 }, + "south": { "uv": [ 7.5, 14, 8.5, 16 ], "texture": "#texture", "rotation": 90 }, + "west": { "uv": [ 7.5, 7.5, 9.5, 8.5 ], "texture": "#texture" }, + "east": { "uv": [ 9.5, 8.5, 7.5, 7.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube4", + "from": [ 7, 13, 8.5 ], + "to": [ 9, 14, 9.5 ], + "faces": { + "down": { "uv": [ 8.5, 16, 7.5, 14 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 7.5, 14, 8.5, 16 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 7.5, 14, 8.5, 16 ], "texture": "#texture", "rotation": 270 }, + "south": { "uv": [ 7.5, 14, 8.5, 16 ], "texture": "#texture", "rotation": 90 }, + "west": { "uv": [ 7.5, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "east": { "uv": [ 8.5, 8.5, 7.5, 7.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube6", + "from": [ 7, 13, 7.5 ], + "to": [ 7.5, 14, 8.5 ], + "faces": { + "down": { "uv": [ 6.5, 16, 5.5, 15.5 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 9.5, 15.5, 10.5, 16 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 7.5, 15.5, 8.5, 16 ], "texture": "#texture", "rotation": 270 }, + "south": { "uv": [ 7.5, 15.5, 8.5, 16 ], "texture": "#texture", "rotation": 90 }, + "west": { "uv": [ 9.5, 7.5, 10.5, 8.5 ], "texture": "#texture" }, + "east": { "uv": [ 10.5, 8.5, 9.5, 7.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube6", + "from": [ 8.5, 13, 7.5 ], + "to": [ 9, 14, 8.5 ], + "faces": { + "down": { "uv": [ 7.5, 16, 6.5, 15.5 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 8.5, 15.5, 9.5, 16 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 14, 15.5, 15, 16 ], "texture": "#texture", "rotation": 270 }, + "south": { "uv": [ 1, 15.5, 2, 16 ], "texture": "#texture", "rotation": 90 }, + "west": { "uv": [ 8.5, 1, 9.5, 2 ], "texture": "#texture" }, + "east": { "uv": [ 9.5, 15, 8.5, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube9", + "from": [ 7, 10, 3 ], + "to": [ 9, 12, 3.5 ], + "rotation": { "origin": [ 9, 12, 3.5 ], "axis": "x", "angle": 45 }, + "faces": { + "down": { "uv": [ 9, 4, 7, 3.5 ], "texture": "#texture" }, + "up": { "uv": [ 7, 3.5, 9, 4 ], "texture": "#texture" }, + "north": { "uv": [ 9, 3.5, 7, 1.5 ], "texture": "#texture", "rotation": 180 }, + "south": { "uv": [ 7, 12.5, 9, 14.5 ], "texture": "#texture", "rotation": 180 }, + "west": { "uv": [ 12.5, 3.5, 14.5, 4 ], "texture": "#texture", "rotation": 270 }, + "east": { "uv": [ 1.5, 3.5, 3.5, 4 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "Cube10", + "from": [ 7.5, 0, 7.5 ], + "to": [ 8.5, 14.5, 8.5 ], + "faces": { + "down": { "uv": [ 7.5, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 1.5, 8.5, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 1.5, 8.5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 1.5, 8.5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 1.5, 8.5, 16 ], "texture": "#texture" } + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [ 0, 5, 1 ] + }, + "firstperson_righthand": { + "translation": [ 0, 5, 1 ] + }, + "gui": { + "rotation": [ 90, 45, -90 ] + }, + "ground": { + "rotation": [ 90, 90, 0 ], + "translation": [ 0, -3, 0 ] + }, + "fixed": { + "rotation": [ -90, -135, -90 ] + } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hoehead.json b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead.json new file mode 100644 index 00000000..d8cc779b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hoehead.json @@ -0,0 +1,90 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/e_particle", + "texture": "blocks/e_texture", + "texture1": "blocks/e_texture" + }, + "elements": [ + { + "__comment": "Cube2", + "from": [ 5.5, 0, 7 ], + "to": [ 8.5, 2, 8 ], + "rotation": { "origin": [ 8.5, 0, 7 ], "axis": "y", "angle": 22.5 }, + "faces": { + "down": { "uv": [ 5, 5, 6, 8 ], "texture": "#texture", "rotation": 270 }, + "up": { "uv": [ 5, 8, 6, 11 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 8, 15, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 15, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 15, 6, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 15, 11, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube3", + "from": [ 6, 0, 8.5 ], + "to": [ 6.5, 2, 10.5 ], + "rotation": { "origin": [ 6, 0, 8.5 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 5.5, 5, 6, 7 ], "texture": "#texture" }, + "up": { "uv": [ 5.5, 9, 6, 11 ], "texture": "#texture" }, + "north": { "uv": [ 10, 15, 10.5, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5.5, 15, 6, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 15, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 15, 7, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube4", + "from": [ 8, 0, 7 ], + "to": [ 10, 2, 8 ], + "faces": { + "down": { "uv": [ 7.5, 7.5, 9.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 7.5, 9.5, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 6.5, 14, 8.5, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 14, 9.5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 14, 8.5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 14, 8.5, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube4", + "from": [ 11, 0, 7 ], + "to": [ 12, 2, 8 ], + "faces": { + "down": { "uv": [ 7.5, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 14, 8.5, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 14, 8.5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 14, 8.5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 14, 8.5, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube6", + "from": [ 10, 0, 7 ], + "to": [ 11, 0.5, 8 ], + "faces": { + "down": { "uv": [ 9.5, 7.5, 10.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 9.5, 7.5, 10.5, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 5.5, 15.5, 6.5, 16 ], "texture": "#texture" }, + "south": { "uv": [ 9.5, 15.5, 10.5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 15.5, 8.5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 15.5, 8.5, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube6", + "from": [ 10, 1.5, 7 ], + "to": [ 11, 2, 8 ], + "faces": { + "down": { "uv": [ 8.5, 1, 9.5, 2 ], "texture": "#texture" }, + "up": { "uv": [ 8.5, 14, 9.5, 15 ], "texture": "#texture" }, + "north": { "uv": [ 6.5, 15.5, 7.5, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8.5, 15.5, 9.5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 14, 15.5, 15, 16 ], "texture": "#texture" }, + "east": { "uv": [ 1, 15.5, 2, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead.json new file mode 100644 index 00000000..18b7a722 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead.json @@ -0,0 +1,37 @@ +{ + "parent": "forgecraft:item/axehead", + "textures": { + "particle": "forgecraft:items/iron_ingot", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:items/iron_ingot" + }, + "overrides": [ + {"predicate": {"type": 0.0},"model": "forgecraft:item/ironaxehead_0"}, + {"predicate": {"type": 0.0001},"model": "forgecraft:item/ironaxehead_13"}, + {"predicate": {"type": 0.0002},"model": "forgecraft:item/ironaxehead_14"}, + {"predicate": {"type": 0.0003},"model": "forgecraft:item/ironaxehead_15"}, + {"predicate": {"type": 0.001},"model": "forgecraft:item/ironaxehead_10"}, + {"predicate": {"type": 0.0012},"model": "forgecraft:item/ironaxehead_19"}, + {"predicate": {"type": 0.002},"model": "forgecraft:item/ironaxehead_11"}, + {"predicate": {"type": 0.0021},"model": "forgecraft:item/ironaxehead_20"}, + {"predicate": {"type": 0.003},"model": "forgecraft:item/ironaxehead_12"}, + {"predicate": {"type": 0.01},"model": "forgecraft:item/ironaxehead_7"}, + {"predicate": {"type": 0.0102},"model": "forgecraft:item/ironaxehead_21"}, + {"predicate": {"type": 0.0111},"model": "forgecraft:item/ironaxehead_16"}, + {"predicate": {"type": 0.012},"model": "forgecraft:item/ironaxehead_18"}, + {"predicate": {"type": 0.02},"model": "forgecraft:item/ironaxehead_8"}, + {"predicate": {"type": 0.021},"model": "forgecraft:item/ironaxehead_17"}, + {"predicate": {"type": 0.03},"model": "forgecraft:item/ironaxehead_9"}, + {"predicate": {"type": 0.1},"model": "forgecraft:item/ironaxehead_2"}, + {"predicate": {"type": 0.102},"model": "forgecraft:item/ironaxehead_6"}, + {"predicate": {"type": 0.11},"model": "forgecraft:item/ironaxehead_3"}, + {"predicate": {"type": 0.111},"model": "forgecraft:item/ironaxehead_5"}, + {"predicate": {"type": 0.12},"model": "forgecraft:item/ironaxehead_4"}, + {"predicate": {"type": 1.0},"model": "forgecraft:item/ironaxehead_1"} + + ] +} + + + + diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_0.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_0.json new file mode 100644 index 00000000..cb59d3c5 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_0.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_1.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_1.json new file mode 100644 index 00000000..155c3cef --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_1.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_10.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_10.json new file mode 100644 index 00000000..97323efa --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_10.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_11.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_11.json new file mode 100644 index 00000000..77184873 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_11.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_12.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_12.json new file mode 100644 index 00000000..149c52f2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_12.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_13.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_13.json new file mode 100644 index 00000000..4391f10b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_13.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_14.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_14.json new file mode 100644 index 00000000..24c192b7 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_14.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_15.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_15.json new file mode 100644 index 00000000..2adc41f8 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_15.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_16.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_16.json new file mode 100644 index 00000000..c3bbf5a5 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_16.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_17.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_17.json new file mode 100644 index 00000000..d40c802d --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_17.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_18.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_18.json new file mode 100644 index 00000000..f8a8d708 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_18.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_19.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_19.json new file mode 100644 index 00000000..5aae666d --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_19.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_2.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_2.json new file mode 100644 index 00000000..1576d120 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_2.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_20.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_20.json new file mode 100644 index 00000000..67dc2346 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_20.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_21.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_21.json new file mode 100644 index 00000000..3c660032 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_21.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_3.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_3.json new file mode 100644 index 00000000..43d30606 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_3.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_4.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_4.json new file mode 100644 index 00000000..86d11185 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_4.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_5.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_5.json new file mode 100644 index 00000000..f506a8f1 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_5.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_6.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_6.json new file mode 100644 index 00000000..b5b7a666 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_6.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_7.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_7.json new file mode 100644 index 00000000..7cb88ca7 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_7.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_8.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_8.json new file mode 100644 index 00000000..18f92149 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_8.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironaxehead_9.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_9.json new file mode 100644 index 00000000..ec435168 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironaxehead_9.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/axehead", + "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/ironpickaxe.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe.json index 9d406b05..d9ffa714 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe.json @@ -7,27 +7,27 @@ }, "overrides": [ {"predicate": {"type": 0.0},"model": "forgecraft:item/ironpickaxe_0"}, - {"predicate": {"type": 0.0001},"model": "forgecraft:item/ironpickaxehead_13"}, - {"predicate": {"type": 0.0002},"model": "forgecraft:item/ironpickaxehead_14"}, - {"predicate": {"type": 0.0003},"model": "forgecraft:item/ironpickaxehead_15"}, - {"predicate": {"type": 0.001},"model": "forgecraft:item/ironpickaxehead_10"}, - {"predicate": {"type": 0.0012},"model": "forgecraft:item/ironpickaxehead_19"}, - {"predicate": {"type": 0.002},"model": "forgecraft:item/ironpickaxehead_11"}, - {"predicate": {"type": 0.0021},"model": "forgecraft:item/ironpickaxehead_20"}, - {"predicate": {"type": 0.003},"model": "forgecraft:item/ironpickaxehead_12"}, - {"predicate": {"type": 0.01},"model": "forgecraft:item/ironpickaxehead_7"}, - {"predicate": {"type": 0.0102},"model": "forgecraft:item/ironpickaxehead_21"}, - {"predicate": {"type": 0.0111},"model": "forgecraft:item/ironpickaxehead_16"}, - {"predicate": {"type": 0.012},"model": "forgecraft:item/ironpickaxehead_18"}, - {"predicate": {"type": 0.02},"model": "forgecraft:item/ironpickaxehead_8"}, - {"predicate": {"type": 0.021},"model": "forgecraft:item/ironpickaxehead_17"}, - {"predicate": {"type": 0.03},"model": "forgecraft:item/ironpickaxehead_9"}, - {"predicate": {"type": 0.1},"model": "forgecraft:item/ironpickaxehead_2"}, - {"predicate": {"type": 0.102},"model": "forgecraft:item/ironpickaxehead_6"}, - {"predicate": {"type": 0.11},"model": "forgecraft:item/ironpickaxehead_3"}, - {"predicate": {"type": 0.111},"model": "forgecraft:item/ironpickaxehead_5"}, - {"predicate": {"type": 0.12},"model": "forgecraft:item/ironpickaxehead_4"}, - {"predicate": {"type": 1.0},"model": "forgecraft:item/ironpickaxehead_1"} + {"predicate": {"type": 0.0001},"model": "forgecraft:item/ironpickaxe_13"}, + {"predicate": {"type": 0.0002},"model": "forgecraft:item/ironpickaxe_14"}, + {"predicate": {"type": 0.0003},"model": "forgecraft:item/ironpickaxe_15"}, + {"predicate": {"type": 0.001},"model": "forgecraft:item/ironpickaxe_10"}, + {"predicate": {"type": 0.0012},"model": "forgecraft:item/ironpickaxe_19"}, + {"predicate": {"type": 0.002},"model": "forgecraft:item/ironpickaxe_11"}, + {"predicate": {"type": 0.0021},"model": "forgecraft:item/ironpickaxe_20"}, + {"predicate": {"type": 0.003},"model": "forgecraft:item/ironpickaxe_12"}, + {"predicate": {"type": 0.01},"model": "forgecraft:item/ironpickaxe_7"}, + {"predicate": {"type": 0.0102},"model": "forgecraft:item/ironpickaxe_21"}, + {"predicate": {"type": 0.0111},"model": "forgecraft:item/ironpickaxe_16"}, + {"predicate": {"type": 0.012},"model": "forgecraft:item/ironpickaxe_18"}, + {"predicate": {"type": 0.02},"model": "forgecraft:item/ironpickaxe_8"}, + {"predicate": {"type": 0.021},"model": "forgecraft:item/ironpickaxe_17"}, + {"predicate": {"type": 0.03},"model": "forgecraft:item/ironpickaxe_9"}, + {"predicate": {"type": 0.1},"model": "forgecraft:item/ironpickaxe_2"}, + {"predicate": {"type": 0.102},"model": "forgecraft:item/ironpickaxe_6"}, + {"predicate": {"type": 0.11},"model": "forgecraft:item/ironpickaxe_3"}, + {"predicate": {"type": 0.111},"model": "forgecraft:item/ironpickaxe_5"}, + {"predicate": {"type": 0.12},"model": "forgecraft:item/ironpickaxe_4"}, + {"predicate": {"type": 1.0},"model": "forgecraft:item/ironpickaxe_1"} ] } diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_1.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_1.json new file mode 100644 index 00000000..6051c5f2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_1.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_10.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_10.json new file mode 100644 index 00000000..ee0b3904 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_10.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_11.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_11.json new file mode 100644 index 00000000..318c943f --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_11.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_12.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_12.json new file mode 100644 index 00000000..025406a3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_12.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_13.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_13.json new file mode 100644 index 00000000..1b68983e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_13.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_14.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_14.json new file mode 100644 index 00000000..a375e5e4 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_14.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_15.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_15.json new file mode 100644 index 00000000..217ccd14 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_15.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_16.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_16.json new file mode 100644 index 00000000..496930f2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_16.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_17.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_17.json new file mode 100644 index 00000000..14188e56 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_17.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_18.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_18.json new file mode 100644 index 00000000..c0ea392e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_18.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_19.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_19.json new file mode 100644 index 00000000..280c6d3d --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_19.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_2.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_2.json new file mode 100644 index 00000000..a93cc84e --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_2.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_20.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_20.json new file mode 100644 index 00000000..04cdf0e4 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_20.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_21.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_21.json new file mode 100644 index 00000000..af437c81 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_21.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_3.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_3.json new file mode 100644 index 00000000..1acee522 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_3.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_4.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_4.json new file mode 100644 index 00000000..47d8de31 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_4.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_5.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_5.json new file mode 100644 index 00000000..c04767c8 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_5.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_6.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_6.json new file mode 100644 index 00000000..4c9e825b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_6.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_7.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_7.json new file mode 100644 index 00000000..ff497536 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_7.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_8.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_8.json new file mode 100644 index 00000000..ab7f5b4b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_8.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/ironpickaxe_9.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_9.json new file mode 100644 index 00000000..342262b1 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxe_9.json @@ -0,0 +1,8 @@ +{ + "parent": "forgecraft:item/pickaxe", + "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/shovel.json b/1.11/src/main/resources/assets/forgecraft/models/item/shovel.json new file mode 100644 index 00000000..c965a65d --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/shovel.json @@ -0,0 +1,160 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/e_particle", + "texture": "items/iron_ingot", + "texture1": "blocks/e_texture" + }, + "elements": [ + { + "__comment": "Cube1", + "from": [ 7, 12.5, 7.5 ], + "to": [ 7.5, 16, 8 ], + "faces": { + "down": { "uv": [ 7, 0, 7.5, 0.5 ], "texture": "#texture1" }, + "up": { "uv": [ 9, 0.5, 8.5, 0 ], "texture": "#texture1" }, + "north": { "uv": [ 7.5, 11, 7, 7.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 5, 7.5, 8.5 ], "texture": "#texture1" }, + "west": { "uv": [ 5, 0, 8.5, 0.5 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 7.5, 0, 11, 0.5 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "Cube2", + "from": [ 6, 11.5, 7.5 ], + "to": [ 7, 15.5, 8 ], + "rotation": { "origin": [ 7, 11.5, 7.5 ], "axis": "y", "angle": 22.5 }, + "faces": { + "down": { "uv": [ 9, 15.5, 10, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 7, 16, 6, 15.5 ], "texture": "#texture1" }, + "north": { "uv": [ 7, 14.5, 6, 10.5 ], "texture": "#texture1", "rotation": 180 }, + "south": { "uv": [ 6, 1.5, 7, 5.5 ], "texture": "#texture1", "rotation": 180 }, + "west": { "uv": [ 10.5, 14, 14.5, 14.5 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 1.5, 14, 5.5, 14.5 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "Cube5", + "from": [ 6.5, 11, 7.5 ], + "to": [ 7.5, 12.5, 8.5 ], + "faces": { + "down": { "uv": [ 7, 14, 8, 15 ], "texture": "#texture1" }, + "up": { "uv": [ 10, 15, 9, 14 ], "texture": "#texture1" }, + "north": { "uv": [ 7.5, 11.5, 6.5, 10 ], "texture": "#texture1" }, + "south": { "uv": [ 6.5, 4.5, 7.5, 6 ], "texture": "#texture1" }, + "west": { "uv": [ 4.5, 14, 6, 15 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 10, 14, 11.5, 15 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "Cube5", + "from": [ 8.5, 11, 7.5 ], + "to": [ 9.5, 12.5, 8.5 ], + "faces": { + "down": { "uv": [ 7, 14, 8, 15 ], "texture": "#texture1" }, + "up": { "uv": [ 10, 15, 9, 14 ], "texture": "#texture1" }, + "north": { "uv": [ 7.5, 11.5, 6.5, 10 ], "texture": "#texture1" }, + "south": { "uv": [ 6.5, 4.5, 7.5, 6 ], "texture": "#texture1" }, + "west": { "uv": [ 4.5, 14, 6, 15 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 10, 14, 11.5, 15 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "Cube9", + "from": [ 7, 11.5, 7 ], + "to": [ 9, 13, 7.5 ], + "faces": { + "down": { "uv": [ 7, 0.5, 9, 1 ], "texture": "#texture1" }, + "up": { "uv": [ 9, 1, 7, 0.5 ], "texture": "#texture1" }, + "north": { "uv": [ 9, 8, 7, 6.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 8, 9, 9.5 ], "texture": "#texture1" }, + "west": { "uv": [ 8, 0.5, 9.5, 1 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 6.5, 0.5, 8, 1 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "Cube9", + "from": [ 7, 10.5, 8.5 ], + "to": [ 9, 12, 9 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 0.5 ], "texture": "#texture1" }, + "up": { "uv": [ 9, 0.5, 7, 0 ], "texture": "#texture1" }, + "north": { "uv": [ 9, 12.5, 7, 10.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 3.5, 9, 5.5 ], "texture": "#texture1" }, + "west": { "uv": [ 3.5, 0, 5.5, 0.5 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 10.5, 0, 12.5, 0.5 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "Cube1", + "from": [ 8.5, 12.5, 7.5 ], + "to": [ 9, 16, 8 ], + "faces": { + "down": { "uv": [ 7, 15.5, 7.5, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 9, 16, 8.5, 15.5 ], "texture": "#texture1" }, + "north": { "uv": [ 7.5, 15, 7, 12 ], "texture": "#texture1" }, + "south": { "uv": [ 7, 1, 7.5, 4 ], "texture": "#texture1" }, + "west": { "uv": [ 1, 15.5, 4, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 12, 15.5, 15, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "Cube12", + "from": [ 7.5, 12.5, 7.5 ], + "to": [ 8.5, 16, 8 ], + "faces": { + "down": { "uv": [ 7.5, 0, 8.5, 0.5 ], "texture": "#texture1" }, + "up": { "uv": [ 8.5, 0.5, 7.5, 0 ], "texture": "#texture1" }, + "north": { "uv": [ 8.5, 11, 7.5, 7.5 ], "texture": "#texture1" }, + "south": { "uv": [ 7.5, 5, 8.5, 8.5 ], "texture": "#texture1" }, + "west": { "uv": [ 5, 0, 8.5, 0.5 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 7.5, 0, 11, 0.5 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "Cube2", + "from": [ 9, 11.5, 7.5 ], + "to": [ 10, 15.5, 8 ], + "rotation": { "origin": [ 9, 15.5, 7.5 ], "axis": "y", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 7, 16, 6, 15.5 ], "texture": "#texture1", "rotation": 180 }, + "up": { "uv": [ 9, 15.5, 10, 16 ], "texture": "#texture1", "rotation": 180 }, + "north": { "uv": [ 6, 10.5, 7, 14.5 ], "texture": "#texture1", "rotation": 180 }, + "south": { "uv": [ 7, 5.5, 6, 1.5 ], "texture": "#texture1", "rotation": 180 }, + "west": { "uv": [ 1.5, 14, 5.5, 14.5 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 10.5, 14, 14.5, 14.5 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "Cube11", + "from": [ 7.5, 0, 7.5 ], + "to": [ 8.5, 12.5, 8.5 ], + "faces": { + "down": { "uv": [ 7.5, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 7.5, 7.5, 8.5, 8.5 ], "texture": "#texture" }, + "north": { "uv": [ 7.5, 3.5, 8.5, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7.5, 3.5, 8.5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7.5, 3.5, 8.5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7.5, 3.5, 8.5, 16 ], "texture": "#texture" } + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [ 0, 5, 1 ] + }, + "firstperson_righthand": { + "translation": [ 0, 5, 1 ] + }, + "gui": { + "rotation": [ 0, 0, -45 ] + }, + "ground": { + "rotation": [ 90, 180, 0 ], + "translation": [ 0, -2, 0 ] + }, + "fixed": { + "rotation": [ 0, 0, 45 ] + } + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..7ff317ba --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/shovelhead.json @@ -0,0 +1,129 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/e_particle", + "texture": "items/iron_ingot", + "texture1": "blocks/e_texture" + }, + "elements": [ + { + "__comment": "Cube1", + "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" } + } + }, + { + "__comment": "Cube2", + "from": [ 6, -0.5, 5.5 ], + "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" } + } + }, + { + "__comment": "Cube5", + "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" } + } + }, + { + "__comment": "Cube5", + "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" } + } + }, + { + "__comment": "Cube9", + "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" } + } + }, + { + "__comment": "Cube9", + "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" } + } + }, + { + "__comment": "Cube1", + "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" } + } + }, + { + "__comment": "Cube12", + "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" } + } + }, + { + "__comment": "Cube2", + "from": [ 9, -0.5, 5.5 ], + "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" } + } + } + ] +} \ No newline at end of file