From ad02317dcd8077d3928750844c619e5a209b5eb0 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Thu, 4 Oct 2018 17:01:20 -0400 Subject: [PATCH] hammer and chisel working like i want, chisel needs directional, and hitting sounds, need rock crumbling sounds, --- kfc/To-Dos.md | 3 + .../nmd/primal/forgecraft/blocks/Chisel.java | 59 +++ .../nmd/primal/forgecraft/init/ModBlocks.java | 394 +----------------- .../nmd/primal/forgecraft/init/ModItems.java | 8 + .../primal/forgecraft/items/SledgeHammer.java | 48 +++ .../assets/forgecraft/blockstates/chisel.json | 13 + .../forgecraft/models/block/chisel_model.json | 216 ++++++++++ .../forgecraft/models/item/chisel_model.json | 230 +--------- .../models/item/ironsledgehammer.json | 7 + .../models/item/sledgehammer_model.json | 4 +- 10 files changed, 371 insertions(+), 611 deletions(-) create mode 100644 kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java create mode 100644 kfc/src/main/java/nmd/primal/forgecraft/items/SledgeHammer.java create mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/chisel.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/block/chisel_model.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/ironsledgehammer.json diff --git a/kfc/To-Dos.md b/kfc/To-Dos.md index 33c1fe7b..89fc34a1 100644 --- a/kfc/To-Dos.md +++ b/kfc/To-Dos.md @@ -2,8 +2,11 @@ ## Bugs - [ ] Can't put a crucible straight from creative inventory into bloomery and pull with tongs +- [ ] Hot Crucible block form missing texture ## Current Feature +- [ ] SledgeHammer and Chisel +- [ ] Play a sound when bloomery or forge finishes - [ ] Hardness and Resistance calculation for durability damage - [ ] Craft Tweaker Support - [ ] Config to map only wrought iron to vanilla iron or wrought iron to another iron diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java new file mode 100644 index 00000000..c4d7a9f9 --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java @@ -0,0 +1,59 @@ +package nmd.primal.forgecraft.blocks; + +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import nmd.primal.core.common.helper.PlayerHelper; +import nmd.primal.forgecraft.items.SledgeHammer; + +public class Chisel extends BlockCustomBase { + + + + public Chisel(Material material, String registryName, Float hardness) { + super(material, registryName, hardness); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz) { + + if(!world.isRemote){ + ItemStack playerStack = player.inventory.getCurrentItem(); + if (hand.equals(hand.MAIN_HAND)) { + if(!player.isSwingInProgress) { + if (playerStack.getItem() instanceof SledgeHammer) { + for (int i = 0; i < 3; i++) { + for (int a = 0; a < 3; a++) { + if (facing == EnumFacing.UP) { + IBlockState breakState = world.getBlockState(pos.add((a - 1), (-1), (i - 1))); + BlockPos breakPos = pos.add((a - 1), (-1), (i - 1)); + //System.out.println(i + ":" + a + ":" + breakState.getBlock()); + if (!(breakState.getBlock().equals(Blocks.AIR))) { + NonNullList tempDrops = NonNullList.create(); + world.getBlockState(breakPos).getBlock().getDrops(tempDrops, world, breakPos, breakState, 0); + PlayerHelper.spawnItemOnPlayer(world, player, tempDrops); + //System.out.println(tempDrops); + world.setBlockToAir(breakPos); + } + } + } + } + world.setBlockState(pos.down(), state); + world.setBlockToAir(pos); + //player.swingArm(hand); + return true; + } + } + } + } + + return false; + } +} diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index 0864301f..49e48bfd 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -12,6 +12,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.forgecraft.blocks.Anvil.AnvilIron; import nmd.primal.forgecraft.blocks.Anvil.AnvilStone; +import nmd.primal.forgecraft.blocks.Chisel; import nmd.primal.forgecraft.blocks.Crucibles.NBTCrucible; import nmd.primal.forgecraft.blocks.YewStave; import nmd.primal.forgecraft.blocks.machine.*; @@ -29,6 +30,8 @@ public class ModBlocks { public static Block blockbreaker; public static Block castingform; + public static Block chisel; + public static Block pistonbellowsoak; public static Block pistonbellowsjungle; public static Block pistonbellowsbirch; @@ -36,50 +39,13 @@ public class ModBlocks { public static Block pistonbellowsdarkoak; public static Block pistonbellowsacacia; - /** - public static Block emptycrucible; - public static Block emptycruciblehot; - public static Block emptycruciblecracked; - public static Block emptycruciblecrackedhot; - - public static Block rawbronzecrucible; - public static Block hotbronzecrucible; - public static Block hotcookedbronzecrucible; - - public static Block rawbronzecrucible_redstone; - public static Block hotbronzecrucible_redstone; - public static Block hotcookedbronzecrucible_redstone; - - public static Block rawbronzecrucible_lapis; - public static Block hotbronzecrucible_lapis; - public static Block hotcookedbronzecrucible_lapis; - - public static Block rawbronzecrucible_diamond; - public static Block hotbronzecrucible_diamond; - public static Block hotcookedbronzecrucible_diamond; - - public static Block rawbronzecrucible_emerald; - public static Block hotbronzecrucible_emerald; - public static Block hotcookedbronzecrucible_emerald; - **/ - - //public static Block ironball; - //public static Block ironchunk; - //public static Block ironcleanball; - //public static Block ironcleanchunk; - //public static Block steelball; - //public static Block steelchunk; - //public static Block wootzball; - //public static Block wootzchunk; - public static Block stoneanvil; public static Block ironanvil; public static Block yewstave; - public static void init() { - //FISH_TRAP = RegistryHelper.addBlock("fish_trap", new FishTrap(), ItemFishTraps::new, "fishtrap"); + nbtCrucible = new NBTCrucible(Material.ROCK, "nbtcrucible"); forge_brick = new Forge(Material.ROCK, "forge_brick", 5000); forge_adobe = new Forge(Material.ROCK, "forge_adobe", 5000); @@ -88,6 +54,8 @@ public class ModBlocks { blockbreaker = new Breaker(Material.WOOD, "blockbreaker", 4.0f); castingform = new CastingForm(Material.WOOD, "castingform"); + chisel = new Chisel(Material.IRON, "chisel", 5.0f); + pistonbellowsoak = new PistonBellows(Material.WOOD, "pistonbellowsoak"); pistonbellowsjungle = new PistonBellows(Material.WOOD, "pistonbellowsjungle"); pistonbellowsbirch = new PistonBellows(Material.WOOD, "pistonbellowsbirch"); @@ -95,274 +63,9 @@ public class ModBlocks { pistonbellowsdarkoak = new PistonBellows(Material.WOOD, "pistonbellowsdarkoak"); pistonbellowsacacia = new PistonBellows(Material.WOOD, "pistonbellowsacacia"); - /*emptycrucible = new Crucible(Material.ROCK, "emptycrucible"); - emptycruciblehot = new CrucibleHot(Material.ROCK, "emptycruciblehot"); - emptycruciblecracked = new Crucible(Material.ROCK, "emptycruciblecracked"); - emptycruciblecrackedhot = new CrucibleHot(Material.ROCK, "emptycruciblecrackedhot"); - - rawbronzecrucible = new Crucible(Material.ROCK, "rawbronzecrucible"); - hotbronzecrucible = new CrucibleHot(Material.ROCK, "hotbronzecrucible"); - hotcookedbronzecrucible = new CrucibleHot(Material.ROCK, "hotcookedbronzecrucible"); - - rawbronzecrucible_redstone = new Crucible(Material.ROCK, "rawbronzecrucible_redstone"); - hotbronzecrucible_redstone = new CrucibleHot(Material.ROCK, "hotbronzecrucible_redstone"); - hotcookedbronzecrucible_redstone = new CrucibleHot(Material.ROCK, "hotcookedbronzecrucible_redstone"); - - rawbronzecrucible_diamond = new Crucible(Material.ROCK, "rawbronzecrucible_diamond"); - hotbronzecrucible_diamond = new CrucibleHot(Material.ROCK, "hotbronzecrucible_diamond"); - hotcookedbronzecrucible_diamond = new CrucibleHot(Material.ROCK, "hotcookedbronzecrucible_diamond"); - - rawbronzecrucible_lapis = new Crucible(Material.ROCK, "rawbronzecrucible_lapis"); - hotbronzecrucible_lapis = new CrucibleHot(Material.ROCK, "hotbronzecrucible_lapis"); - hotcookedbronzecrucible_lapis = new CrucibleHot(Material.ROCK, "hotcookedbronzecrucible_lapis"); - - rawbronzecrucible_emerald = new Crucible(Material.ROCK, "rawbronzecrucible_emerald"); - hotbronzecrucible_emerald = new CrucibleHot(Material.ROCK, "hotbronzecrucible_emerald"); - hotcookedbronzecrucible_emerald = new CrucibleHot(Material.ROCK, "hotcookedbronzecrucible_emerald"); - */ - - /* - ironball = new IngotBall(Material.IRON, "ironball", 5.0F, "big") { - @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz) - { - if(!world.isRemote){ - Item pItem = player.getHeldItem(hand).getItem(); - ItemStack pstack = player.getHeldItemMainhand(); - BlockPos belowPos = pos.down(); - //System.out.println("Activating"); - if (pItem instanceof Gallagher && world.getBlockState(belowPos).getBlock().equals(Blocks.STONE)) { - player.swingArm(hand); - world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); - world.setBlockState(belowPos, ModBlocks.stoneanvil.getDefaultState().withProperty(AnvilStone.FACING, player.getHorizontalFacing()), 2); - world.playEvent(1031, pos, 0); - //CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.stoneanvil, 1)); - return true; - } - if (pstack.isEmpty()) { - System.out.println(state); - PlayerHelper.playerTakeItem(world, pos, EnumFacing.DOWN, player, player.getActiveHand(), this.getItem(world, pos, state)); - world.setBlockState(pos, Blocks.AIR.getDefaultState(), 3); - return true; - } - if (pItem instanceof Gallagher || pItem.equals(ModItems.forgehammer)) { - if(world.getBlockState(belowPos).getBlock() instanceof AnvilBase) { - - TileAnvil tile = (TileAnvil) world.getTileEntity(belowPos); - - if (tile.getSlotStack(6).isEmpty() && - tile.getSlotStack(7).isEmpty() && - tile.getSlotStack(8).isEmpty() && - tile.getSlotStack(11).isEmpty() && - tile.getSlotStack(12).isEmpty() && - tile.getSlotStack(13).isEmpty() && - tile.getSlotStack(16).isEmpty() && - tile.getSlotStack(17).isEmpty() && - tile.getSlotStack(18).isEmpty() - ) { - player.swingArm(hand); - world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); - - Block tempBlock = ModBlocks.ironchunk; - tempBlock.getDefaultState().withProperty(PrimalAPI.States.ACTIVE, true); - - tile.setSlotStack(6, new ItemStack(tempBlock, 1)); - tile.setSlotStack(7, new ItemStack(tempBlock, 1)); - tile.setSlotStack(8, new ItemStack(tempBlock, 1)); - tile.setSlotStack(11, new ItemStack(tempBlock, 1)); - tile.setSlotStack(12, new ItemStack(tempBlock, 1)); - tile.setSlotStack(13, new ItemStack(tempBlock, 1)); - tile.setSlotStack(16, new ItemStack(tempBlock, 1)); - tile.setSlotStack(17, new ItemStack(tempBlock, 1)); - tile.setSlotStack(18, new ItemStack(tempBlock, 1)); - world.playEvent(1031, pos, 0); - return true; - } - } - } - } - return false; - } - }; - ironcleanball = new IngotBall(Material.IRON, "ironcleanball", 5.0f,"big") { - @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz) - { - //System.out.println("Level 0"); - if(!world.isRemote){ - Item pItem = player.getHeldItem(hand).getItem(); - BlockPos belowPos = pos.down(); - //System.out.println("Activating1"); - if (pItem instanceof ForgeHammer && world.getBlockState(belowPos).getBlock().equals(Blocks.IRON_BLOCK)) { - player.swingArm(hand); - world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); - world.setBlockState(belowPos, ModBlocks.ironanvil.getDefaultState().withProperty(AnvilStone.FACING, player.getHorizontalFacing()), 2); - world.playEvent(1031, pos, 0); - //System.out.println("Activating"); - return true; - } - if (pItem instanceof Gallagher || pItem.equals(ModItems.forgehammer)) { - if(world.getBlockState(belowPos).getBlock() instanceof AnvilBase) { - - TileAnvil tile = (TileAnvil) world.getTileEntity(belowPos); - - if (tile.getSlotStack(6).isEmpty() && - tile.getSlotStack(7).isEmpty() && - tile.getSlotStack(8).isEmpty() && - tile.getSlotStack(11).isEmpty() && - tile.getSlotStack(12).isEmpty() && - tile.getSlotStack(13).isEmpty() && - tile.getSlotStack(16).isEmpty() && - tile.getSlotStack(17).isEmpty() && - tile.getSlotStack(18).isEmpty() - ) { - player.swingArm(hand); - world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); - - Block tempBlock = ModBlocks.ironcleanchunk; - tempBlock.getDefaultState().withProperty(PrimalAPI.States.ACTIVE, true); - tile.setSlotStack(6, new ItemStack(tempBlock, 1)); - tile.setSlotStack(7, new ItemStack(tempBlock, 1)); - tile.setSlotStack(8, new ItemStack(tempBlock, 1)); - tile.setSlotStack(11, new ItemStack(tempBlock, 1)); - tile.setSlotStack(12, new ItemStack(tempBlock, 1)); - tile.setSlotStack(13, new ItemStack(tempBlock, 1)); - tile.setSlotStack(16, new ItemStack(tempBlock, 1)); - tile.setSlotStack(17, new ItemStack(tempBlock, 1)); - tile.setSlotStack(18, new ItemStack(tempBlock, 1)); - world.playEvent(1031, pos, 0); - return true; - } - } - } - - } - return false; - } - }; - steelball = new IngotBall(Material.IRON, "steelball", 6.0f,"big"){ - @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz) - { - if(!world.isRemote){ - Item pItem = player.getHeldItem(hand).getItem(); - BlockPos belowPos = pos.down(); - //System.out.println("Activating"); - if (pItem instanceof ForgeHammer && world.getBlockState(belowPos).getBlock().equals(Blocks.IRON_BLOCK)) { - player.swingArm(hand); - world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); - world.setBlockState(belowPos, ModBlocks.ironanvil.getDefaultState().withProperty(AnvilStone.FACING, player.getHorizontalFacing()), 2); - world.playEvent(1031, pos, 0); - //CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.stoneanvil, 1)); - return true; - } - if (pItem instanceof Gallagher || pItem.equals(ModItems.forgehammer)) { - if(world.getBlockState(belowPos).getBlock() instanceof AnvilBase) { - - TileAnvil tile = (TileAnvil) world.getTileEntity(belowPos); - - if (tile.getSlotStack(6).isEmpty() && - tile.getSlotStack(7).isEmpty() && - tile.getSlotStack(8).isEmpty() && - tile.getSlotStack(11).isEmpty() && - tile.getSlotStack(12).isEmpty() && - tile.getSlotStack(13).isEmpty() && - tile.getSlotStack(16).isEmpty() && - tile.getSlotStack(17).isEmpty() && - tile.getSlotStack(18).isEmpty() - ) { - player.swingArm(hand); - - Block tempBlock = ModBlocks.steelchunk; - tempBlock.getDefaultState().withProperty(PrimalAPI.States.ACTIVE, true); - - world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); - tile.setSlotStack(6, new ItemStack(tempBlock, 1)); - tile.setSlotStack(7, new ItemStack(tempBlock, 1)); - tile.setSlotStack(8, new ItemStack(tempBlock, 1)); - tile.setSlotStack(11, new ItemStack(tempBlock, 1)); - tile.setSlotStack(12, new ItemStack(tempBlock, 1)); - tile.setSlotStack(13, new ItemStack(tempBlock, 1)); - tile.setSlotStack(16, new ItemStack(tempBlock, 1)); - tile.setSlotStack(17, new ItemStack(tempBlock, 1)); - tile.setSlotStack(18, new ItemStack(tempBlock, 1)); - world.playEvent(1031, pos, 0); - return true; - } - } - } - - } - return false; - } - }; - wootzball = new IngotBall(Material.IRON, "wootzball", 6.0f,"big") { - @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz) - { - if(!world.isRemote){ - Item pItem = player.getHeldItem(hand).getItem(); - BlockPos belowPos = pos.down(); - //System.out.println("Activating"); - if (pItem instanceof ForgeHammer && world.getBlockState(belowPos).getBlock().equals(Blocks.IRON_BLOCK)) { - player.swingArm(hand); - world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); - world.setBlockState(belowPos, ModBlocks.ironanvil.getDefaultState().withProperty(AnvilStone.FACING, player.getHorizontalFacing()), 2); - world.playEvent(1031, pos, 0); - //CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.stoneanvil, 1)); - return true; - } - if (pItem instanceof Gallagher || pItem.equals(ModItems.forgehammer)) { - if(world.getBlockState(belowPos).getBlock() instanceof AnvilBase) { - - TileAnvil tile = (TileAnvil) world.getTileEntity(belowPos); - - if (tile.getSlotStack(6).isEmpty() && - tile.getSlotStack(7).isEmpty() && - tile.getSlotStack(8).isEmpty() && - tile.getSlotStack(11).isEmpty() && - tile.getSlotStack(12).isEmpty() && - tile.getSlotStack(13).isEmpty() && - tile.getSlotStack(16).isEmpty() && - tile.getSlotStack(17).isEmpty() && - tile.getSlotStack(18).isEmpty() - ) { - player.swingArm(hand); - world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); - - Block tempBlock = ModBlocks.wootzchunk; - tempBlock.getDefaultState().withProperty(PrimalAPI.States.ACTIVE, true); - - tile.setSlotStack(6, new ItemStack(tempBlock, 1)); - tile.setSlotStack(7, new ItemStack(tempBlock, 1)); - tile.setSlotStack(8, new ItemStack(tempBlock, 1)); - tile.setSlotStack(11, new ItemStack(tempBlock, 1)); - tile.setSlotStack(12, new ItemStack(tempBlock, 1)); - tile.setSlotStack(13, new ItemStack(tempBlock, 1)); - tile.setSlotStack(16, new ItemStack(tempBlock, 1)); - tile.setSlotStack(17, new ItemStack(tempBlock, 1)); - tile.setSlotStack(18, new ItemStack(tempBlock, 1)); - world.playEvent(1031, pos, 0); - return true; - } - } - } - - } - return false; - } - }; - - ironchunk = new IngotBall(Material.IRON, "ironchunk", 5.0F, "small"); - ironcleanchunk = new IngotBall(Material.IRON, "ironcleanchunk", 5.0F, "small"); - steelchunk = new IngotBall(Material.IRON, "steelchunk", 6.0f,"small"); - wootzchunk = new IngotBall(Material.IRON, "wootzchunk", 6.0f,"small"); -*/ - stoneanvil = new AnvilStone(Material.ANVIL, "stoneanvil", 5.0f, true); ironanvil = new AnvilIron(Material.ANVIL, "ironanvil", 6.0f, true); - //ironballitemcool = new ItemBlockIngotBall(ironball); - //ironballitemhot = new ItemBlockIngotBall(ironball); + yewstave = new YewStave(Material.WOOD, "yewstave", 3.0F); } @@ -377,6 +80,8 @@ public class ModBlocks { registerBlockWithItem(blockbreaker); registerBlockWithItem(castingform); + registerBlockWithItem(chisel); + registerBlockWithItem(pistonbellowsoak); registerBlockWithItem(pistonbellowsjungle); registerBlockWithItem(pistonbellowsbirch); @@ -384,45 +89,6 @@ public class ModBlocks { registerBlockWithItem(pistonbellowsdarkoak); registerBlockWithItem(pistonbellowsacacia); - /*registerBlockWithItem(emptycrucible); - registerBlockWithItem(emptycruciblehot); - registerBlockWithItem(emptycruciblecracked); - registerBlockWithItem(emptycruciblecrackedhot); - - registerBlockWithItem(rawbronzecrucible); - registerBlockWithItem(hotbronzecrucible); - registerBlockWithItem(hotcookedbronzecrucible); - - registerBlockWithItem(rawbronzecrucible_diamond); - registerBlockWithItem(hotbronzecrucible_diamond); - registerBlockWithItem(hotcookedbronzecrucible_diamond); - - registerBlockWithItem(rawbronzecrucible_emerald); - registerBlockWithItem(hotbronzecrucible_emerald); - registerBlockWithItem(hotcookedbronzecrucible_emerald); - - registerBlockWithItem(rawbronzecrucible_redstone); - registerBlockWithItem(hotbronzecrucible_redstone); - registerBlockWithItem(hotcookedbronzecrucible_redstone); - - registerBlockWithItem(rawbronzecrucible_lapis); - registerBlockWithItem(hotbronzecrucible_lapis); - registerBlockWithItem(hotcookedbronzecrucible_lapis); -*/ - //registerBlockWithItem(ironball); - //registerBlockWithItem(ironchunk); - - //registerBlockWithItem(ironcleanball); - //registerBlockWithItem(ironcleanchunk); - - //registerBlockWithItem(steelball); - //registerBlockWithItem(steelchunk); - - //registerBlockWithItem(wootzball); - //registerBlockWithItem(wootzchunk); - //registerBlockWithItemSubType(ironball, ironballitemcool, "ironcool"); - //registerBlockWithItemSubType(ironball, ironballitemhot, "ironhot"); - registerBlockWithItem(stoneanvil); registerBlockWithItem(ironanvil); @@ -436,6 +102,8 @@ public class ModBlocks { registerRender(forge_adobe); registerRender(castingform); + registerRender(chisel); + registerRender(blockbreaker); registerRender(pistonbellowsoak); registerRender(pistonbellowsjungle); @@ -446,46 +114,6 @@ public class ModBlocks { registerRender(bloomery_brick); registerRender(bloomery_adobe); - /* - registerRender(emptycrucible); - registerRender(emptycruciblehot); - registerRender(emptycruciblecracked); - registerRender(emptycruciblecrackedhot); - - registerRender(rawbronzecrucible); - registerRender(hotbronzecrucible); - registerRender(hotcookedbronzecrucible); - - registerRender(rawbronzecrucible_diamond); - registerRender(hotbronzecrucible_diamond); - registerRender(hotcookedbronzecrucible_diamond); - - registerRender(rawbronzecrucible_emerald); - registerRender(hotbronzecrucible_emerald); - registerRender(hotcookedbronzecrucible_emerald); - - registerRender(rawbronzecrucible_redstone); - registerRender(hotbronzecrucible_redstone); - registerRender(hotcookedbronzecrucible_redstone); - - registerRender(rawbronzecrucible_lapis); - registerRender(hotbronzecrucible_lapis); - registerRender(hotcookedbronzecrucible_lapis); - */ - //registerRender(ironball); - //registerRender(ironchunk); - - //registerRender(ironcleanball); - //registerRender(ironcleanchunk); - - //registerRender(steelball); - //registerRender(steelchunk); - - //registerRender(wootzball); - //registerRender(wootzchunk); - - //registerRenderCustom(ironballitemcool, 0, new ModelResourceLocation(ironballitemcool.getUnlocalizedName())); - //registerRenderCustom(ironballitemhot, 1, new ModelResourceLocation(ironballitemhot.getUnlocalizedName())); registerRender(stoneanvil); registerRender(ironanvil); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 0c50f2f6..40600852 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -9,6 +9,9 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; +import nmd.primal.core.common.compat.ModDictionary; +import nmd.primal.core.common.items.tools.Gallagher; +import nmd.primal.core.common.recipes.irecipe.ToolCraftingRecipe; import nmd.primal.forgecraft.items.*; import nmd.primal.forgecraft.items.armor.CustomHelmet; import nmd.primal.forgecraft.items.blocks.ItemNBTCrucible; @@ -50,6 +53,8 @@ public class ModItems { public static Item wootzingotball; public static Item wootzchunk; + public static Item IRON_SLEDGE_HAMMER; + public static Item copperpickaxehead; public static Item copperaxehead; public static Item coppershovelhead; @@ -218,6 +223,7 @@ public class ModItems { ironaxe = new CustomAxe("ironaxe", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON, ironaxehead, 5, -3.6f); ironshovel = new CustomShovel("ironshovel", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON, ironshovelhead); ironhoe = new CustomHoe("ironhoe", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON, ironhoehead); + IRON_SLEDGE_HAMMER = new SledgeHammer("ironsledgehammer", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON); cleanironpickaxe = new CustomPickaxe("cleanironpickaxe", PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON, cleanironpickaxehead); cleanironaxe = new CustomAxe("cleanironaxe", PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON, cleanironaxehead, 6, -3.2f); @@ -337,6 +343,7 @@ public class ModItems { ForgeRegistries.ITEMS.register(ironaxehead); ForgeRegistries.ITEMS.register(ironshovelhead); ForgeRegistries.ITEMS.register(ironhoehead); + ForgeRegistries.ITEMS.register(IRON_SLEDGE_HAMMER); ForgeRegistries.ITEMS.register(cleanironpickaxehead); ForgeRegistries.ITEMS.register(cleanironaxehead); @@ -498,6 +505,7 @@ public class ModItems { registerRender(ironaxe); registerRender(ironshovel); registerRender(ironhoe); + registerRender(IRON_SLEDGE_HAMMER); registerRender(cleanironpickaxe); registerRender(cleanironaxe); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/SledgeHammer.java b/kfc/src/main/java/nmd/primal/forgecraft/items/SledgeHammer.java new file mode 100644 index 00000000..0a3c501a --- /dev/null +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/SledgeHammer.java @@ -0,0 +1,48 @@ +package nmd.primal.forgecraft.items; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.world.World; + +public class SledgeHammer extends BaseItem { + + public SledgeHammer(String registryName, Item.ToolMaterial material) { + super(registryName); + this.setMaxDamage(material.getMaxUses()*3); + this.setHarvestLevel("pickaxe", material.getHarvestLevel()); + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { + if(!world.isRemote){ + EntityPlayer player = (EntityPlayer) entity; + if(player.inventory.getCurrentItem().getItem().equals(stack.getItem())) { + if(player.isPotionActive(MobEffects.MINING_FATIGUE)) { + if (!player.isSwingInProgress) { + player.removeActivePotionEffect(MobEffects.MINING_FATIGUE); + } + } + } + } + } + + @Override + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) + { + if(!world.isRemote) { + if (!player.isSwingInProgress) { + player.addPotionEffect(new PotionEffect(MobEffects.MINING_FATIGUE, 150, 100)); + player.swingArm(hand); + return new ActionResult(EnumActionResult.PASS, player.getHeldItem(hand)); + } + } + return new ActionResult(EnumActionResult.FAIL, player.getHeldItem(hand)); + } +} diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/chisel.json b/kfc/src/main/resources/assets/forgecraft/blockstates/chisel.json new file mode 100644 index 00000000..bc422625 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/blockstates/chisel.json @@ -0,0 +1,13 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:items/iron/0", + "texture": "forgecraft:items/iron/0" + } + }, + "variants": { + "normal": { "model": "forgecraft:chisel_model" }, + "inventory": { "model": "forgecraft:chisel_model" } + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/block/chisel_model.json b/kfc/src/main/resources/assets/forgecraft/models/block/chisel_model.json new file mode 100644 index 00000000..bf1452e6 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/block/chisel_model.json @@ -0,0 +1,216 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "forgecraft:items/iron/0", + "texture": "forgecraft:items/iron/0" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 7, 1.5, 7 ], + "to": [ 8.72, 13.11, 8.935 ], + "faces": { + "down": { "uv": [ 7, 7.065, 8.72, 9 ], "texture": "#texture" }, + "up": { "uv": [ 7, 7, 8.72, 8.934999 ], "texture": "#texture" }, + "north": { "uv": [ 7.28, 2.889999, 9, 14.5 ], "texture": "#texture" }, + "south": { "uv": [ 7, 2.889999, 8.72, 14.5 ], "texture": "#texture" }, + "west": { "uv": [ 7, 2.889999, 8.935, 14.5 ], "texture": "#texture" }, + "east": { "uv": [ 7.065, 2.889999, 9, 14.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box4", + "from": [ 7, 0.64, 7.215 ], + "to": [ 8.72, 1.5, 8.719999 ], + "faces": { + "down": { "uv": [ 6, 6, 10, 9.5 ], "texture": "#texture" }, + "up": { "uv": [ 6, 6.5, 10, 10 ], "texture": "#texture" }, + "north": { "uv": [ 6, 2, 10, 4 ], "texture": "#texture" }, + "south": { "uv": [ 6, 2, 10, 4 ], "texture": "#texture" }, + "west": { "uv": [ 6.5, 2, 10, 4 ], "texture": "#texture" }, + "east": { "uv": [ 6, 2, 9.5, 4 ], "texture": "#texture" } + } + }, + { + "__comment": "Box4", + "from": [ 7, -0.22, 7.43 ], + "to": [ 8.72, 0.64, 8.505 ], + "faces": { + "down": { "uv": [ 6, 6.5, 10, 9.5 ], "texture": "#texture" }, + "up": { "uv": [ 6, 6.5, 10, 9.5 ], "texture": "#texture" }, + "north": { "uv": [ 6, 11, 10, 11.5 ], "texture": "#texture" }, + "south": { "uv": [ 6, 11, 10, 11.5 ], "texture": "#texture" }, + "west": { "uv": [ 6.5, 11, 9.5, 11.5 ], "texture": "#texture" }, + "east": { "uv": [ 6.5, 11, 9.5, 11.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box4", + "from": [ 7, -1.08, 7.645 ], + "to": [ 8.72, -0.2199999, 8.29 ], + "faces": { + "down": { "uv": [ 6, 6.5, 10, 9.5 ], "texture": "#texture" }, + "up": { "uv": [ 6, 6.5, 10, 9.5 ], "texture": "#texture" }, + "north": { "uv": [ 6, 11, 10, 11.5 ], "texture": "#texture" }, + "south": { "uv": [ 6, 11, 10, 11.5 ], "texture": "#texture" }, + "west": { "uv": [ 6.5, 11, 9.5, 11.5 ], "texture": "#texture" }, + "east": { "uv": [ 6.5, 11, 9.5, 11.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box4", + "from": [ 7, -1.94, 7.86 ], + "to": [ 8.72, -1.08, 8.075 ], + "faces": { + "down": { "uv": [ 6, 6.5, 10, 9.5 ], "texture": "#texture" }, + "up": { "uv": [ 6, 6.5, 10, 9.5 ], "texture": "#texture" }, + "north": { "uv": [ 6, 11, 10, 11.5 ], "texture": "#texture" }, + "south": { "uv": [ 6, 11, 10, 11.5 ], "texture": "#texture" }, + "west": { "uv": [ 6.5, 11, 9.5, 11.5 ], "texture": "#texture" }, + "east": { "uv": [ 6.5, 11, 9.5, 11.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box8", + "from": [ 6.785, 13.11, 6.785 ], + "to": [ 8.934999, 13.325, 9.15 ], + "faces": { + "down": { "uv": [ 5.5, 5, 10.5, 10.5 ], "texture": "#texture" }, + "up": { "uv": [ 5.5, 5.5, 10.5, 11 ], "texture": "#texture" }, + "north": { "uv": [ 5.5, 6.5, 10.5, 7 ], "texture": "#texture" }, + "south": { "uv": [ 5.5, 6.5, 10.5, 7 ], "texture": "#texture" }, + "west": { "uv": [ 5.5, 6.5, 11, 7 ], "texture": "#texture" }, + "east": { "uv": [ 5, 6.5, 10.5, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "Box9", + "from": [ 7, 13.325, 7 ], + "to": [ 8.72, 13.54, 8.935 ], + "faces": { + "down": { "uv": [ 6, 5.5, 10, 10 ], "texture": "#texture" }, + "up": { "uv": [ 6, 6, 10, 10.5 ], "texture": "#texture" }, + "north": { "uv": [ 6, 6, 10, 6.5 ], "texture": "#texture" }, + "south": { "uv": [ 6, 6, 10, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 6, 6, 10.5, 6.5 ], "texture": "#texture" }, + "east": { "uv": [ 5.5, 6, 10, 6.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box16", + "from": [ 6.785, 13.325, 7.215 ], + "to": [ 7, 13.54, 8.719999 ], + "faces": { + "down": { "uv": [ 5.5, 6, 6, 9.5 ], "texture": "#texture" }, + "up": { "uv": [ 5.5, 6.5, 6, 10 ], "texture": "#texture" }, + "north": { "uv": [ 10, 6, 10.5, 6.5 ], "texture": "#texture" }, + "south": { "uv": [ 5.5, 6, 6, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 6.5, 6, 10, 6.5 ], "texture": "#texture" }, + "east": { "uv": [ 6, 6, 9.5, 6.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box16", + "from": [ 8.719999, 13.325, 7.215 ], + "to": [ 8.934999, 13.54, 8.719999 ], + "faces": { + "down": { "uv": [ 5.5, 6, 6, 9.5 ], "texture": "#texture" }, + "up": { "uv": [ 5.5, 6.5, 6, 10 ], "texture": "#texture" }, + "north": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" }, + "south": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, + "west": { "uv": [ 6.5, 8, 10, 8.5 ], "texture": "#texture" }, + "east": { "uv": [ 6, 8, 9.5, 8.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box18", + "from": [ 7.215, 13.325, 6.785 ], + "to": [ 8.504999, 13.54, 7 ], + "faces": { + "down": { "uv": [ 6.5, 10, 9.5, 10.5 ], "texture": "#texture" }, + "up": { "uv": [ 6.5, 5.5, 9.5, 6 ], "texture": "#texture" }, + "north": { "uv": [ 6.5, 6, 9.5, 6.5 ], "texture": "#texture" }, + "south": { "uv": [ 6.5, 6, 9.5, 6.5 ], "texture": "#texture" }, + "west": { "uv": [ 5.5, 6, 6, 6.5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 6, 10.5, 6.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box18", + "from": [ 7.215, 13.325, 8.934999 ], + "to": [ 8.504999, 13.54, 9.15 ], + "faces": { + "down": { "uv": [ 6.5, 10, 9.5, 10.5 ], "texture": "#texture" }, + "up": { "uv": [ 6.5, 5.5, 9.5, 6 ], "texture": "#texture" }, + "north": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, + "south": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, + "west": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box16", + "from": [ 6.57, 13.11, 7 ], + "to": [ 6.785, 13.325, 8.935 ], + "faces": { + "down": { "uv": [ 5.5, 6, 6, 9.5 ], "texture": "#texture" }, + "up": { "uv": [ 5.5, 6.5, 6, 10 ], "texture": "#texture" }, + "north": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" }, + "south": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, + "west": { "uv": [ 6.5, 8, 10, 8.5 ], "texture": "#texture" }, + "east": { "uv": [ 6, 8, 9.5, 8.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box16", + "from": [ 8.934999, 13.11, 7 ], + "to": [ 9.15, 13.325, 8.935 ], + "faces": { + "down": { "uv": [ 5.5, 6, 6, 9.5 ], "texture": "#texture" }, + "up": { "uv": [ 5.5, 6.5, 6, 10 ], "texture": "#texture" }, + "north": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" }, + "south": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, + "west": { "uv": [ 6.5, 8, 10, 8.5 ], "texture": "#texture" }, + "east": { "uv": [ 6, 8, 9.5, 8.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box18", + "from": [ 7, 13.11, 9.15 ], + "to": [ 8.72, 13.325, 9.365 ], + "faces": { + "down": { "uv": [ 6.5, 10, 9.5, 10.5 ], "texture": "#texture" }, + "up": { "uv": [ 6.5, 5.5, 9.5, 6 ], "texture": "#texture" }, + "north": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, + "south": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, + "west": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" } + } + }, + { + "__comment": "Box18", + "from": [ 7, 13.11, 6.57 ], + "to": [ 8.72, 13.325, 6.785 ], + "faces": { + "down": { "uv": [ 6.5, 10, 9.5, 10.5 ], "texture": "#texture" }, + "up": { "uv": [ 6.5, 5.5, 9.5, 6 ], "texture": "#texture" }, + "north": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, + "south": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, + "west": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" } + } + } + ], + "display": { + "gui": { + "rotation": [ -90, 135, 90 ] + }, + "ground": { + "rotation": [ 90, 0, 0 ], + "scale": [ 0.6, 0.6, 0.6 ] + }, + "fixed": { + "rotation": [ 90, -45, 90 ] + } + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/chisel_model.json b/kfc/src/main/resources/assets/forgecraft/models/item/chisel_model.json index 2222db70..15bc0c62 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/chisel_model.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/chisel_model.json @@ -1,230 +1,8 @@ { - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "forge_marker":1, "textures": { - "particle": "blocks/e_particle", - "texture": "items/iron/0" + "particle": "forgecraft:items/iron/0", + "texture": "forgecraft:items/iron/0" }, - "elements": [ - { - "__comment": "Box1", - "from": [ 6, -2, 6 ], - "to": [ 10, 25, 10.5 ], - "faces": { - "down": { "uv": [ 6, 5.5, 10, 10 ], "texture": "#texture" }, - "up": { "uv": [ 6, 6, 10, 10.5 ], "texture": "#texture" }, - "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, - "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, - "west": { "uv": [ 6, 0, 10.5, 16 ], "texture": "#texture" }, - "east": { "uv": [ 5.5, 0, 10, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box4", - "from": [ 6, -4, 6.5 ], - "to": [ 10, -2, 10 ], - "faces": { - "down": { "uv": [ 6, 6, 10, 9.5 ], "texture": "#texture" }, - "up": { "uv": [ 6, 6.5, 10, 10 ], "texture": "#texture" }, - "north": { "uv": [ 6, 4, 10, 6 ], "texture": "#texture" }, - "south": { "uv": [ 6, 4, 10, 6 ], "texture": "#texture" }, - "west": { "uv": [ 6.5, 4, 10, 6 ], "texture": "#texture" }, - "east": { "uv": [ 6, 4, 9.5, 6 ], "texture": "#texture" } - } - }, - { - "__comment": "Box4", - "from": [ 6, -6, 7 ], - "to": [ 10, -4, 9.5 ], - "faces": { - "down": { "uv": [ 6, 6.5, 10, 9.5 ], "texture": "#texture" }, - "up": { "uv": [ 6, 6.5, 10, 9.5 ], "texture": "#texture" }, - "north": { "uv": [ 6, 11, 10, 11.5 ], "texture": "#texture" }, - "south": { "uv": [ 6, 11, 10, 11.5 ], "texture": "#texture" }, - "west": { "uv": [ 6.5, 11, 9.5, 11.5 ], "texture": "#texture" }, - "east": { "uv": [ 6.5, 11, 9.5, 11.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Box4", - "from": [ 6, -8, 7.5 ], - "to": [ 10, -6, 9 ], - "faces": { - "down": { "uv": [ 6, 6.5, 10, 9.5 ], "texture": "#texture" }, - "up": { "uv": [ 6, 6.5, 10, 9.5 ], "texture": "#texture" }, - "north": { "uv": [ 6, 11, 10, 11.5 ], "texture": "#texture" }, - "south": { "uv": [ 6, 11, 10, 11.5 ], "texture": "#texture" }, - "west": { "uv": [ 6.5, 11, 9.5, 11.5 ], "texture": "#texture" }, - "east": { "uv": [ 6.5, 11, 9.5, 11.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Box4", - "from": [ 6, -10, 8 ], - "to": [ 10, -8, 8.5 ], - "faces": { - "down": { "uv": [ 6, 6.5, 10, 9.5 ], "texture": "#texture" }, - "up": { "uv": [ 6, 6.5, 10, 9.5 ], "texture": "#texture" }, - "north": { "uv": [ 6, 11, 10, 11.5 ], "texture": "#texture" }, - "south": { "uv": [ 6, 11, 10, 11.5 ], "texture": "#texture" }, - "west": { "uv": [ 6.5, 11, 9.5, 11.5 ], "texture": "#texture" }, - "east": { "uv": [ 6.5, 11, 9.5, 11.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Box8", - "from": [ 5.5, 25, 5.5 ], - "to": [ 10.5, 25.5, 11 ], - "faces": { - "down": { "uv": [ 5.5, 5, 10.5, 10.5 ], "texture": "#texture" }, - "up": { "uv": [ 5.5, 5.5, 10.5, 11 ], "texture": "#texture" }, - "north": { "uv": [ 5.5, 8.5, 10.5, 9 ], "texture": "#texture" }, - "south": { "uv": [ 5.5, 8.5, 10.5, 9 ], "texture": "#texture" }, - "west": { "uv": [ 5.5, 8.5, 11, 9 ], "texture": "#texture" }, - "east": { "uv": [ 5, 8.5, 10.5, 9 ], "texture": "#texture" } - } - }, - { - "__comment": "Box9", - "from": [ 6, 25.5, 6 ], - "to": [ 10, 26, 10.5 ], - "faces": { - "down": { "uv": [ 6, 5.5, 10, 10 ], "texture": "#texture" }, - "up": { "uv": [ 6, 6, 10, 10.5 ], "texture": "#texture" }, - "north": { "uv": [ 6, 8, 10, 8.5 ], "texture": "#texture" }, - "south": { "uv": [ 6, 8, 10, 8.5 ], "texture": "#texture" }, - "west": { "uv": [ 6, 8, 10.5, 8.5 ], "texture": "#texture" }, - "east": { "uv": [ 5.5, 8, 10, 8.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Box16", - "from": [ 5.5, 25.5, 6.5 ], - "to": [ 6, 26, 10 ], - "faces": { - "down": { "uv": [ 5.5, 6, 6, 9.5 ], "texture": "#texture" }, - "up": { "uv": [ 5.5, 6.5, 6, 10 ], "texture": "#texture" }, - "north": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" }, - "south": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, - "west": { "uv": [ 6.5, 8, 10, 8.5 ], "texture": "#texture" }, - "east": { "uv": [ 6, 8, 9.5, 8.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Box16", - "from": [ 10, 25.5, 6.5 ], - "to": [ 10.5, 26, 10 ], - "faces": { - "down": { "uv": [ 5.5, 6, 6, 9.5 ], "texture": "#texture" }, - "up": { "uv": [ 5.5, 6.5, 6, 10 ], "texture": "#texture" }, - "north": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" }, - "south": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, - "west": { "uv": [ 6.5, 8, 10, 8.5 ], "texture": "#texture" }, - "east": { "uv": [ 6, 8, 9.5, 8.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Box18", - "from": [ 6.5, 25.5, 5.5 ], - "to": [ 9.5, 26, 6 ], - "faces": { - "down": { "uv": [ 6.5, 10, 9.5, 10.5 ], "texture": "#texture" }, - "up": { "uv": [ 6.5, 5.5, 9.5, 6 ], "texture": "#texture" }, - "north": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, - "south": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, - "west": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Box18", - "from": [ 6.5, 25.5, 10.5 ], - "to": [ 9.5, 26, 11 ], - "faces": { - "down": { "uv": [ 6.5, 10, 9.5, 10.5 ], "texture": "#texture" }, - "up": { "uv": [ 6.5, 5.5, 9.5, 6 ], "texture": "#texture" }, - "north": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, - "south": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, - "west": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Box16", - "from": [ 5, 25, 6 ], - "to": [ 5.5, 25.5, 10.5 ], - "faces": { - "down": { "uv": [ 5.5, 6, 6, 9.5 ], "texture": "#texture" }, - "up": { "uv": [ 5.5, 6.5, 6, 10 ], "texture": "#texture" }, - "north": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" }, - "south": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, - "west": { "uv": [ 6.5, 8, 10, 8.5 ], "texture": "#texture" }, - "east": { "uv": [ 6, 8, 9.5, 8.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Box16", - "from": [ 10.5, 25, 6 ], - "to": [ 11, 25.5, 10.5 ], - "faces": { - "down": { "uv": [ 5.5, 6, 6, 9.5 ], "texture": "#texture" }, - "up": { "uv": [ 5.5, 6.5, 6, 10 ], "texture": "#texture" }, - "north": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" }, - "south": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, - "west": { "uv": [ 6.5, 8, 10, 8.5 ], "texture": "#texture" }, - "east": { "uv": [ 6, 8, 9.5, 8.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Box18", - "from": [ 6, 25, 11 ], - "to": [ 10, 25.5, 11.5 ], - "faces": { - "down": { "uv": [ 6.5, 10, 9.5, 10.5 ], "texture": "#texture" }, - "up": { "uv": [ 6.5, 5.5, 9.5, 6 ], "texture": "#texture" }, - "north": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, - "south": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, - "west": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Box18", - "from": [ 6, 25, 5 ], - "to": [ 10, 25.5, 5.5 ], - "faces": { - "down": { "uv": [ 6.5, 10, 9.5, 10.5 ], "texture": "#texture" }, - "up": { "uv": [ 6.5, 5.5, 9.5, 6 ], "texture": "#texture" }, - "north": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, - "south": { "uv": [ 6.5, 8, 9.5, 8.5 ], "texture": "#texture" }, - "west": { "uv": [ 5.5, 8, 6, 8.5 ], "texture": "#texture" }, - "east": { "uv": [ 10, 8, 10.5, 8.5 ], "texture": "#texture" } - } - } - ], - "display": { - "thirdperson_righthand": { - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_lefthand": { - "scale": [ 0.4, 0.4, 0.4 ] - }, - "firstperson_righthand": { - "scale": [ 0.4, 0.4, 0.4 ] - }, - "firstperson_lefthand": { - "scale": [ 0.4, 0.4, 0.4 ] - }, - "gui": { - "rotation": [ -90, 135, 90 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "ground": { - "rotation": [ 90, 0, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "fixed": { - "rotation": [ 90, -45, 90 ], - "scale": [ 0.4, 0.4, 0.4 ] - } - } + "parent": "forgecraft:block/chisel_model" } \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ironsledgehammer.json b/kfc/src/main/resources/assets/forgecraft/models/item/ironsledgehammer.json new file mode 100644 index 00000000..d8d5c30e --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/ironsledgehammer.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/sledgehammer_model", + "textures": { + "particle": "forgecraft:items/iron/0", + "texture": "forgecraft:items/iron/0" + } +} diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/sledgehammer_model.json b/kfc/src/main/resources/assets/forgecraft/models/item/sledgehammer_model.json index 979107ec..eff7d29f 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/sledgehammer_model.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/sledgehammer_model.json @@ -1,8 +1,8 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/e_texture" + "particle": "forgecraft:items/iron/0", + "texture": "forgecraft:items/iron/0" }, "elements": [ {