From 14fc81e64b2806e07eca6509c41f9c1525a42bdc Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sat, 6 Oct 2018 14:21:45 -0400 Subject: [PATCH] update code, missing my CrucibleRecipes class... --- kfc/To-Dos.md | 7 +- .../nmd/primal/forgecraft/blocks/Chisel.java | 82 ++- .../nmd/primal/forgecraft/init/ModBlocks.java | 13 +- .../primal/forgecraft/init/ModCrafting.java | 541 +++++------------- .../primal/forgecraft/items/SledgeHammer.java | 3 + .../items/blocks/ItemNBTCrucible.java | 17 +- .../forgecraft/blockstates/bronzechisel.json | 28 + .../blockstates/cleanironchisel.json | 28 + .../forgecraft/blockstates/copperchisel.json | 28 + .../{chisel.json => ironchisel.json} | 0 .../forgecraft/blockstates/steelchisel.json | 28 + .../forgecraft/blockstates/wootzchisel.json | 28 + .../forgecraft/models/item/bronzechisel.json | 8 + .../models/item/bronzesledgehammer.json | 7 + .../models/item/cleanironchisel.json | 8 + .../models/item/cleanironsledgehammer.json | 7 + .../forgecraft/models/item/copperchisel.json | 8 + .../models/item/coppersledgehammer.json | 7 + .../assets/forgecraft/models/item/hoe2.json | 122 ---- .../{chisel_model.json => ironchisel.json} | 0 .../forgecraft/models/item/steelchisel.json | 8 + .../models/item/steelsledgehammer.json | 7 + .../forgecraft/models/item/wootzchisel.json | 8 + .../models/item/wootzsledgehammer.json | 7 + .../assets/forgecraft/textures/items/clay.png | Bin 692 -> 572 bytes 25 files changed, 450 insertions(+), 550 deletions(-) create mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/bronzechisel.json create mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/cleanironchisel.json create mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/copperchisel.json rename kfc/src/main/resources/assets/forgecraft/blockstates/{chisel.json => ironchisel.json} (100%) create mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/steelchisel.json create mode 100644 kfc/src/main/resources/assets/forgecraft/blockstates/wootzchisel.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/bronzechisel.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/bronzesledgehammer.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/cleanironchisel.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/cleanironsledgehammer.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/copperchisel.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/coppersledgehammer.json delete mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/hoe2.json rename kfc/src/main/resources/assets/forgecraft/models/item/{chisel_model.json => ironchisel.json} (100%) create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/steelchisel.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/steelsledgehammer.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/wootzchisel.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/wootzsledgehammer.json diff --git a/kfc/To-Dos.md b/kfc/To-Dos.md index 6a21b818..0929f5fc 100644 --- a/kfc/To-Dos.md +++ b/kfc/To-Dos.md @@ -4,12 +4,15 @@ - [x] Hot Crucible block form missing texture - [x] Soft Crucible drop from tongs - [x] Pickaxe upgrades printout -- [ ] Can't put a crucible straight from creative inventory into bloomery and pull with tongs +- [x] Can't put a crucible straight from creative inventory into bloomery and pull with tongs ## Current Feature - [x] SledgeHammer and Chisel item and blocks - [ ] Chisel Bounding Box changes -- [ ] SledgeHammer and Chisel crafting +- [ ] SledgeHammer Supid Damage Modifier +- [x] SledgeHammer and Chisel crafting +- [x] SledgeHammer and Chisel assets +- [ ] SoftCrucible Color Issues - [ ] Play a sound when bloomery or forge finishes - [ ] Hardness and Resistance calculation for durability damage - [ ] Craft Tweaker Support diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java index 89a601c9..0b672029 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Chisel.java @@ -9,6 +9,7 @@ import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; @@ -30,15 +31,71 @@ import java.util.concurrent.ThreadLocalRandom; public class Chisel extends CustomFacing { - public AxisAlignedBB boundBox = new AxisAlignedBB(0.4375D, 0.0D, 0.4375D, 0.5625D, 0.875D, 0.5625D); + private AxisAlignedBB boundBoxDown = new AxisAlignedBB( + 0.4375D, 0.0D, 0.4375D, + 0.5625D, 0.875D, 0.5625D); + private AxisAlignedBB boundBoxDownActive = new AxisAlignedBB( + 0.4375D, 0.0D, 0.4375D, + 0.5625D, 0.375D, 0.5625D); + private AxisAlignedBB boundBoxUp = new AxisAlignedBB( + 0.4375D, 0.125D, 0.4375D, + 0.5625D, 1.0, 0.5625D); + private AxisAlignedBB boundBoxUpActive = new AxisAlignedBB + (0.4375D, 0.625D, 0.4375D, + 0.5625D, 1.0D, 0.5625D); + private AxisAlignedBB boundBoxEast = new AxisAlignedBB( + 0.125D, 0.4375D, 0.4375D, + 1.0D, 0.5625D, 0.5625D); + private AxisAlignedBB boundBoxEastActive = new AxisAlignedBB( + 0.625D, 0.4375D, 0.4375D, + 1.0D, 0.5625D, 0.5625D); + private AxisAlignedBB boundBoxWest = new AxisAlignedBB( + 0.0D, 0.4375D, 0.0D, + 1.0D, 0.5625D, 1.0D); + private AxisAlignedBB boundBoxWestActive = new AxisAlignedBB( + 0.0D, 0.4375D, 0.0D, + 1.0D, 0.5625D, 1.0D); - public Chisel(Material material, String name) { + private Item.ToolMaterial realMaterial; + + public Chisel(Material material, String name, Item.ToolMaterial realMaterial) { super(material, name); this.setHardness(8.0f); this.setResistance(8.0f); + this.realMaterial = realMaterial; this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.DOWN).withProperty(PrimalAPI.States.ACTIVE, Boolean.valueOf(false))); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) + { + if(state.getValue(FACING)==EnumFacing.UP && !state.getValue(PrimalAPI.States.ACTIVE)){ + return boundBoxUp; + } + if(state.getValue(FACING)==EnumFacing.UP && state.getValue(PrimalAPI.States.ACTIVE)){ + return boundBoxUpActive; + } + if(state.getValue(FACING)==EnumFacing.DOWN && !state.getValue(PrimalAPI.States.ACTIVE)){ + return boundBoxDown; + } + if(state.getValue(FACING)==EnumFacing.DOWN && state.getValue(PrimalAPI.States.ACTIVE)){ + return boundBoxDownActive; + } + if(state.getValue(FACING)==EnumFacing.EAST && !state.getValue(PrimalAPI.States.ACTIVE)){ + return boundBoxEast; + } + if(state.getValue(FACING)==EnumFacing.EAST && state.getValue(PrimalAPI.States.ACTIVE)){ + return boundBoxEastActive; + } + if(state.getValue(FACING)==EnumFacing.WEST && !state.getValue(PrimalAPI.States.ACTIVE)){ + return boundBoxWest; + } + if(state.getValue(FACING)==EnumFacing.WEST && state.getValue(PrimalAPI.States.ACTIVE)){ + return boundBoxWestActive; + } + return boundBoxDown; + } + @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { @@ -51,13 +108,12 @@ public class Chisel extends CustomFacing { { return new BlockStateContainer(this, new IProperty[] {FACING, PrimalAPI.States.ACTIVE}); } - - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) - { - return boundBox; + public Item.ToolMaterial getRealMaterial() { + return realMaterial; } + + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz) { @@ -89,7 +145,7 @@ public class Chisel extends CustomFacing { for (int i = 0; i < 3; i++) { for (int a = 0; a < 3; a++) { BlockPos movePos = pos.add((a - 1), (1), (i - 1)); - if (world.getBlockState(movePos).getBlock() != ModBlocks.chisel) { + if (! (world.getBlockState(movePos).getBlock() instanceof Chisel)) { IBlockState breakState = world.getBlockState(movePos); doDamaging(world, movePos, breakState, player); } @@ -119,7 +175,7 @@ public class Chisel extends CustomFacing { for (int i = 0; i < 3; i++) { for (int a = 0; a < 3; a++) { BlockPos movePos = pos.add((a - 1), (-1), (i - 1)); - if (world.getBlockState(movePos).getBlock() != ModBlocks.chisel) { + if (! (world.getBlockState(movePos).getBlock() instanceof Chisel)) { IBlockState breakState = world.getBlockState(movePos); doDamaging(world, movePos, breakState, player); } @@ -148,7 +204,7 @@ public class Chisel extends CustomFacing { for (int i = 0; i < 3; i++) { for (int a = 0; a < 3; a++) { BlockPos movePos = pos.add((a - 1), (i - 1), (1)); - if (world.getBlockState(movePos).getBlock() != ModBlocks.chisel) { + if (! (world.getBlockState(movePos).getBlock() instanceof Chisel)) { IBlockState breakState = world.getBlockState(movePos); doDamaging(world, movePos, breakState, player); } @@ -177,7 +233,7 @@ public class Chisel extends CustomFacing { for (int i = 0; i < 3; i++) { for (int a = 0; a < 3; a++) { BlockPos movePos = pos.add((a - 1), (i - 1), (-1)); - if (world.getBlockState(movePos).getBlock() != ModBlocks.chisel) { + if (! (world.getBlockState(movePos).getBlock() instanceof Chisel)) { IBlockState breakState = world.getBlockState(movePos); doDamaging(world, movePos, breakState, player); } @@ -206,7 +262,7 @@ public class Chisel extends CustomFacing { for (int i = 0; i < 3; i++) { for (int a = 0; a < 3; a++) { BlockPos movePos = pos.add((1), (i - 1), (a - 1)); - if (world.getBlockState(movePos).getBlock() != ModBlocks.chisel) { + if (! (world.getBlockState(movePos).getBlock() instanceof Chisel)) { IBlockState breakState = world.getBlockState(movePos); doDamaging(world, movePos, breakState, player); } @@ -235,7 +291,7 @@ public class Chisel extends CustomFacing { for (int i = 0; i < 3; i++) { for (int a = 0; a < 3; a++) { BlockPos movePos = pos.add((-1), (i - 1), (a - 1)); - if (world.getBlockState(movePos).getBlock() != ModBlocks.chisel) { + if (! (world.getBlockState(movePos).getBlock() instanceof Chisel)) { IBlockState breakState = world.getBlockState(movePos); doDamaging(world, movePos, breakState, player); } 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 327b5104..4766923e 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -10,6 +10,7 @@ import net.minecraftforge.client.model.ModelLoader; 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.forgecraft.blocks.Anvil.AnvilIron; import nmd.primal.forgecraft.blocks.Anvil.AnvilStone; import nmd.primal.forgecraft.blocks.Chisel; @@ -59,12 +60,12 @@ public class ModBlocks { blockbreaker = new Breaker(Material.WOOD, "blockbreaker", 4.0f); castingform = new CastingForm(Material.WOOD, "castingform"); - copperchisel = new Chisel(Material.IRON, "copperchisel"); - ironchisel = new Chisel(Material.IRON, "ironchisel"); - bronzechisel = new Chisel(Material.IRON, "bronzechisel"); - cleanironchisel = new Chisel(Material.IRON, "cleanironchisel"); - steelchisel = new Chisel(Material.IRON, "steelchisel"); - wootzchisel = new Chisel(Material.IRON, "wootzchisel"); + copperchisel = new Chisel(Material.IRON, "copperchisel", PrimalAPI.ToolMaterials.TOOL_COPPER); + bronzechisel = new Chisel(Material.IRON, "bronzechisel", PrimalAPI.ToolMaterials.TOOL_BRONZE); + ironchisel = new Chisel(Material.IRON, "ironchisel", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON); + cleanironchisel = new Chisel(Material.IRON, "cleanironchisel", PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON); + steelchisel = new Chisel(Material.IRON, "steelchisel", PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL); + wootzchisel = new Chisel(Material.IRON, "wootzchisel", PrimalAPI.ToolMaterials.TOOL_WOOTZ_STEEL); pistonbellowsoak = new PistonBellows(Material.WOOD, "pistonbellowsoak"); pistonbellowsjungle = new PistonBellows(Material.WOOD, "pistonbellowsjungle"); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index 02f3ba8f..94a97fc0 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -264,407 +264,6 @@ public class ModCrafting{ hotwootzshovelhead = hotToolArray[14] ; hotwootzhoehead = hotToolArray[15]; - //RecipeHandler.addSmelting(ModItems.softcrucible, new ItemStack(ModBlocks.nbtCrucible, 1)); - - /***********************/ - /***CRUCIBLE CRAFTING***/ - /***********************/ -/* - CrucibleCrafting.addRecipe( - new OreIngredient("oreIron"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(Blocks.IRON_ORE, 1), - new ItemStack(ModItems.ironingotball, 1), - 1400, - 1200, - 800); - - CrucibleCrafting.addRecipe( - new OreIngredient("dustIron"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(Blocks.IRON_ORE, 1), - new ItemStack(ModItems.ironingotball, 1), - 1250, - 1100, - 800); - - CrucibleCrafting.addRecipe( - Ingredient.fromStacks(new ItemStack(ModItems.brokenwroughtirontool, 1)), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - new ItemStack(ModItems.ironingotball, 1), - 1250, - 1100, - 800); - - CrucibleCrafting.addRecipe( - new OreIngredient("dustIron"), - Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.IRON_DUST, 1), - new ItemStack(ModItems.ironcleaningotball, 1), - 1550, - 1200, - 800); - - CrucibleCrafting.addRecipe( - Ingredient.fromStacks(new ItemStack(ModItems.brokencleanirontool, 1)), - new OreIngredient("nuggetIron"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - new ItemStack(ModItems.ironcleaningotball, 1), - 1550, - 1200, - 800); - - CrucibleCrafting.addRecipe( - Ingredient.fromStacks(new ItemStack(ModItems.ironcleaningotball, 1)), - Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_HIGH, 1)), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(ModItems.ironcleaningotball, 1), - new ItemStack(ModItems.steelingotball, 1), - 2100, - 1500, - 1000); - - CrucibleCrafting.addRecipe( - Ingredient.fromStacks(new ItemStack(ModItems.brokensteeltool, 1)), - new OreIngredient("nuggetSteel"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - new ItemStack(ModItems.steelingotball, 1), - 2100, - 1500, - 1000); - - CrucibleCrafting.addRecipe( - new OreIngredient("dustMagnetite"), - Ingredient.fromStacks(new ItemStack(Blocks.LEAVES, 1, BlockPlanks.EnumType.JUNGLE.getMetadata())), - Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_PURE, 1)), - Ingredient.fromStacks(new ItemStack(Blocks.LEAVES, 1, BlockPlanks.EnumType.JUNGLE.getMetadata())), - Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_PURE, 1)), - new ItemStack(PrimalAPI.Blocks.ORE_MAGNETITE, 1), - new ItemStack(ModItems.wootzingotball, 1), - 2100, - 1800, - 1500); - - CrucibleCrafting.addRecipe( - new OreIngredient("magnetite"), - Ingredient.fromStacks(new ItemStack(Blocks.LEAVES, 1, BlockPlanks.EnumType.JUNGLE.getMetadata())), - Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_PURE, 1)), - Ingredient.fromStacks(new ItemStack(Blocks.LEAVES, 1, BlockPlanks.EnumType.JUNGLE.getMetadata())), - Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CHARCOAL_PURE, 1)), - new ItemStack(PrimalAPI.Blocks.ORE_MAGNETITE, 1), - new ItemStack(ModItems.wootzingotball, 1), - 2100, - 1800, - 1500); - - CrucibleCrafting.addRecipe( - Ingredient.fromStacks(new ItemStack(ModItems.brokenwootztool, 1)), - new OreIngredient("nuggetWootz"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - new ItemStack(ModItems.wootzingotball, 1), - 2100, - 1800, - 1500); -*/ - /***BRONZE***/ -/* - NBTTagCompound tagBronzeDefault = new NBTTagCompound(); - tagBronzeDefault.setString("upgrades", ""); - tagBronzeDefault.setBoolean("hot", false); - ItemStack defaultBronze = new ItemStack(ModItems.bronzeingotball, 1); - defaultBronze.setTagCompound(tagBronzeDefault.copy()); - - CrucibleCrafting.addRecipe( - new OreIngredient("dustCopper"), - new OreIngredient("dustCopper"), - new OreIngredient("dustCopper"), - new OreIngredient("dustTin"), - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - defaultBronze, - 1100, - 800, - 600); - - CrucibleCrafting.addRecipe( - new OreIngredient("ingotBronze"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - defaultBronze, - 1100, - 800, - 600); - - ItemStack redBronze = defaultBronze.copy(); - redBronze.getTagCompound().setString("upgrades", "redstone"); - CrucibleCrafting.addRecipe( - new OreIngredient("ingotBronze"), - new OreIngredient("dustRedstone"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - redBronze, - 1100, - 800, - 600); - - ItemStack diamondBronze = defaultBronze.copy(); - diamondBronze.getTagCompound().setString("upgrades", "diamond"); - CrucibleCrafting.addRecipe( - new OreIngredient("ingotBronze"), - new OreIngredient("flakeDiamond"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - diamondBronze, - 1100, - 800, - 600); - - ItemStack emeraldBronze = defaultBronze.copy(); - emeraldBronze.getTagCompound().setString("upgrades", "emerald"); - CrucibleCrafting.addRecipe( - new OreIngredient("ingotBronze"), - new OreIngredient("flakeEmerald"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - emeraldBronze, - 1100, - 800, - 600); - - ItemStack lapisBronze = defaultBronze.copy(); - lapisBronze.getTagCompound().setString("upgrades", "lapis"); - CrucibleCrafting.addRecipe( - new OreIngredient("ingotBronze"), - new OreIngredient("gemLapis"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - lapisBronze, - 1100, - 800, - 600); - - CrucibleCrafting.addRecipe( - new OreIngredient("dustCopper"), - new OreIngredient("dustCopper"), - new OreIngredient("dustCopper"), - new OreIngredient("dustTin"), - new OreIngredient("dustRedstone"), - new ItemStack(PrimalAPI.Items.SLAG, 1), - redBronze, - 1100, - 800, - 600); - - CrucibleCrafting.addRecipe( - new OreIngredient("dustCopper"), - new OreIngredient("dustCopper"), - new OreIngredient("dustCopper"), - new OreIngredient("dustTin"), - new OreIngredient("flakeDiamond"), - new ItemStack(PrimalAPI.Items.SLAG, 1), - diamondBronze, - 1100, - 800, - 600); - - CrucibleCrafting.addRecipe( - new OreIngredient("dustCopper"), - new OreIngredient("dustCopper"), - new OreIngredient("dustCopper"), - new OreIngredient("dustTin"), - new OreIngredient("flakeEmerald"), - new ItemStack(PrimalAPI.Items.SLAG, 1), - emeraldBronze, - 1100, - 800, - 600); - - CrucibleCrafting.addRecipe( - new OreIngredient("dustCopper"), - new OreIngredient("dustCopper"), - new OreIngredient("dustCopper"), - new OreIngredient("dustTin"), - new OreIngredient("gemLapis"), - new ItemStack(PrimalAPI.Items.SLAG, 1), - lapisBronze, - 1100, - 800, - 600); - -*/ - /***COPPER***/ - /* - NBTTagCompound tagCopperDefault = new NBTTagCompound(); - tagCopperDefault.setString("upgrades", ""); - tagCopperDefault.setBoolean("hot", false); - ItemStack defaultCopper = new ItemStack(PrimalAPI.Items.COPPER_INGOT, 1); - defaultCopper.setTagCompound(tagCopperDefault.copy()); - - CrucibleCrafting.addRecipe( - new OreIngredient("oreCopper"), - Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - defaultCopper, - 900, - 800, - 600); - - CrucibleCrafting.addRecipe( - new OreIngredient("ingotCopper"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - defaultCopper, - 900, - 750, - 550); - - ItemStack redCopper = defaultCopper.copy(); - redCopper.getTagCompound().setString("upgrades", "redstone"); - CrucibleCrafting.addRecipe( - new OreIngredient("ingotCopper"), - new OreIngredient("dustRedstone"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - redCopper, - 900, - 750, - 550); - - ItemStack diamondCopper = defaultCopper.copy(); - diamondCopper.getTagCompound().setString("upgrades", "diamond"); - CrucibleCrafting.addRecipe( - new OreIngredient("ingotCopper"), - new OreIngredient("flakeDiamond"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - diamondCopper, - 900, - 750, - 550); - - ItemStack emeraldCopper = defaultCopper.copy(); - emeraldCopper.getTagCompound().setString("upgrades", "emerald"); - CrucibleCrafting.addRecipe( - new OreIngredient("ingotCopper"), - new OreIngredient("flakeEmerald"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - emeraldCopper, - 900, - 750, - 550); - - ItemStack lapisCopper = defaultCopper.copy(); - lapisCopper.getTagCompound().setString("upgrades", "lapis"); - CrucibleCrafting.addRecipe( - new OreIngredient("ingotCopper"), - new OreIngredient("gemLapis"), - Ingredient.EMPTY, - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - lapisCopper, - 900, - 750, - 550); - - CrucibleCrafting.addRecipe( - new OreIngredient("oreCopper"), - Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), - new OreIngredient("dustRedstone"), - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - redCopper, - 900, - 750, - 550); - - CrucibleCrafting.addRecipe( - new OreIngredient("oreCopper"), - Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), - new OreIngredient("flakeDiamond"), - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - diamondCopper, - 900, - 750, - 550); - - CrucibleCrafting.addRecipe( - new OreIngredient("oreCopper"), - Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), - new OreIngredient("flakeEmerald"), - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - emeraldCopper, - 900, - 750, - 550); - - CrucibleCrafting.addRecipe( - new OreIngredient("oreCopper"), - Ingredient.fromStacks(new ItemStack(PrimalAPI.Items.CARBONATE_SLACK, 1)), - new OreIngredient("gemLapis"), - Ingredient.EMPTY, - Ingredient.EMPTY, - new ItemStack(PrimalAPI.Items.SLAG, 1), - lapisCopper, - 900, - 750, - 550); -*/ - - /***CASTING FORM***/ RecipeHandler.addShapedOreRecipe(new ItemStack(ModBlocks.castingform, 1), true, new Object[]{" S ", "S S", " S ", @@ -1095,11 +694,57 @@ public class ModCrafting{ new ItemStack(PrimalAPI.Items.COPPER_PLATE, 1) ); + /***CASTING SLEDGEHAMMER***/ + CastingCrafting.addRecipe( + new ItemStack(PrimalAPI.Items.COPPER_INGOT, 1), + new Item[]{ + empty, empty, empty, empty, empty, + muddd, empty, empty, empty, muddd, + muddd, muddd, empty, muddd, muddd, + muddd, muddd, empty, muddd, muddd, + muddd, muddd, empty, muddd, muddd}, + new ItemStack(ModItems.coppersledgehammer, 1) + ); + /***CASTING SLEDGEHAMMER***/ + CastingCrafting.addRecipe( + new ItemStack(PrimalAPI.Items.BRONZE_INGOT, 1), + new Item[]{ + empty, empty, empty, empty, empty, + muddd, empty, empty, empty, muddd, + muddd, muddd, empty, muddd, muddd, + muddd, muddd, empty, muddd, muddd, + muddd, muddd, empty, muddd, muddd}, + new ItemStack(ModItems.bronzesledgehammer, 1) + ); + + /***CASTING CHISEL***/ + CastingCrafting.addRecipe( + new ItemStack(PrimalAPI.Items.COPPER_INGOT, 1), + new Item[]{ + muddd, muddd, empty, muddd, muddd, + muddd, muddd, empty, muddd, muddd, + muddd, empty, empty, empty, muddd, + muddd, empty, empty, empty, muddd, + muddd, empty, empty, empty, muddd}, + new ItemStack(ModBlocks.copperchisel, 1) + ); + /***CASTING CHISEL***/ + CastingCrafting.addRecipe( + new ItemStack(PrimalAPI.Items.BRONZE_INGOT, 1), + new Item[]{ + muddd, muddd, empty, muddd, muddd, + muddd, muddd, empty, muddd, muddd, + muddd, empty, empty, empty, muddd, + muddd, empty, empty, empty, muddd, + muddd, empty, empty, empty, muddd}, + new ItemStack(ModBlocks.bronzechisel, 1) + ); /****************************************************************************** FORGING ******************************************************************************/ + //TODO allow oreDict checks against my Item Ingots //Makes a Hot Iron Ingot ForgeCrafting.addRecipe( ModItems.ironingotball, @@ -1366,7 +1011,101 @@ public class ModCrafting{ ANVILING ******************************************************************************/ + /*** SLEDGEHAMMER ***/ + AnvilCrafting.addRecipe( + new ItemStack [] { + hotChunk,hotChunk,hotIronIngot,hotChunk,hotChunk, + emptyAir,hotChunk,hotIronIngot,hotChunk,emptyAir, + emptyAir,emptyAir,hotChunk,emptyAir,emptyAir, + emptyAir,emptyAir,hotChunk,emptyAir,emptyAir, + emptyAir,emptyAir,hotChunk,emptyAir,emptyAir }, + new ItemStack(ModItems.ironsledgehammer, 1), + "null" + ); + /*** SLEDGEHAMMER ***/ + AnvilCrafting.addRecipe( + new ItemStack [] { + hotCleanChunk,hotCleanChunk,hotCleanIronIngot,hotCleanChunk,hotCleanChunk, + emptyAir,hotCleanChunk,hotCleanIronIngot,hotCleanChunk,emptyAir, + emptyAir,emptyAir,hotCleanChunk,emptyAir,emptyAir, + emptyAir,emptyAir,hotCleanChunk,emptyAir,emptyAir, + emptyAir,emptyAir,hotCleanChunk,emptyAir,emptyAir }, + new ItemStack(ModItems.cleanironsledgehammer, 1), + "null" + ); + + /*** SLEDGEHAMMER ***/ + AnvilCrafting.addRecipe( + new ItemStack [] { + hotSteelChunk,hotSteelChunk,hotSteelIngot,hotSteelChunk,hotSteelChunk, + emptyAir,hotSteelChunk,hotSteelIngot,hotSteelChunk,emptyAir, + emptyAir,emptyAir,hotSteelChunk,emptyAir,emptyAir, + emptyAir,emptyAir,hotSteelChunk,emptyAir,emptyAir, + emptyAir,emptyAir,hotSteelChunk,emptyAir,emptyAir }, + new ItemStack(ModItems.steelsledgehammer, 1), + "null" + ); + + /*** SLEDGEHAMMER ***/ + AnvilCrafting.addRecipe( + new ItemStack [] { + hotWootzChunk,hotWootzChunk,hotWootzIngot,hotWootzChunk,hotWootzChunk, + emptyAir,hotWootzChunk,hotWootzIngot,hotWootzChunk,emptyAir, + emptyAir,emptyAir,hotWootzChunk,emptyAir,emptyAir, + emptyAir,emptyAir,hotWootzChunk,emptyAir,emptyAir, + emptyAir,emptyAir,hotWootzChunk,emptyAir,emptyAir }, + new ItemStack(ModItems.wootzsledgehammer, 1), + "null" + ); + + /*** CHISEL ***/ + AnvilCrafting.addRecipe( + new ItemStack [] { + emptyAir,emptyAir,hotChunk,emptyAir,emptyAir, + emptyAir,hotChunk,hotChunk,hotChunk,emptyAir, + emptyAir,hotChunk,hotChunk,hotChunk,emptyAir, + emptyAir,emptyAir,hotIronIngot,emptyAir,emptyAir, + emptyAir,emptyAir,hotIronIngot,emptyAir,emptyAir }, + new ItemStack(ModBlocks.ironchisel, 1), + "null" + ); + + /*** CHISEL ***/ + AnvilCrafting.addRecipe( + new ItemStack [] { + emptyAir,emptyAir,hotCleanChunk,emptyAir,emptyAir, + emptyAir,hotCleanChunk,hotCleanChunk,hotCleanChunk,emptyAir, + emptyAir,hotCleanChunk,hotCleanChunk,hotCleanChunk,emptyAir, + emptyAir,emptyAir,hotCleanIronIngot,emptyAir,emptyAir, + emptyAir,emptyAir,hotCleanIronIngot,emptyAir,emptyAir }, + new ItemStack(ModBlocks.cleanironchisel, 1), + "null" + ); + + /*** CHISEL ***/ + AnvilCrafting.addRecipe( + new ItemStack [] { + emptyAir,emptyAir,hotSteelChunk,emptyAir,emptyAir, + emptyAir,hotSteelChunk,hotSteelChunk,hotSteelChunk,emptyAir, + emptyAir,hotSteelChunk,hotSteelChunk,hotSteelChunk,emptyAir, + emptyAir,emptyAir,hotSteelIngot,emptyAir,emptyAir, + emptyAir,emptyAir,hotSteelIngot,emptyAir,emptyAir }, + new ItemStack(ModBlocks.steelchisel, 1), + "null" + ); + + /*** CHISEL ***/ + AnvilCrafting.addRecipe( + new ItemStack [] { + emptyAir,emptyAir,hotWootzChunk,emptyAir,emptyAir, + emptyAir,hotWootzChunk,hotWootzChunk,hotWootzChunk,emptyAir, + emptyAir,hotWootzChunk,hotWootzChunk,hotWootzChunk,emptyAir, + emptyAir,emptyAir,hotWootzChunk,emptyAir,emptyAir, + emptyAir,emptyAir,hotWootzChunk,emptyAir,emptyAir }, + new ItemStack(ModBlocks.wootzchisel, 1), + "null" + ); /*** ForgeHammer ***/ AnvilCrafting.addRecipe( diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/SledgeHammer.java b/kfc/src/main/java/nmd/primal/forgecraft/items/SledgeHammer.java index cffdd8ef..d33ead34 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/SledgeHammer.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/SledgeHammer.java @@ -45,6 +45,9 @@ public class SledgeHammer extends BaseItem implements ToolMaterialMap { } } } + if(isSelected){ + entity.setSprinting(false); + } } @Override diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/blocks/ItemNBTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/items/blocks/ItemNBTCrucible.java index c3d2132b..d5078bfe 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/blocks/ItemNBTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/blocks/ItemNBTCrucible.java @@ -3,10 +3,12 @@ package nmd.primal.forgecraft.items.blocks; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -100,15 +102,18 @@ public class ItemNBTCrucible extends ItemBlock { @Override public void onUpdate(ItemStack item, World world, Entity player, int itemSlot, boolean isSelected) { if(!world.isRemote) { - //System.out.println("We doin it?"); - if (item.hasTagCompound()) { - //item.setTagCompound(new NBTTagCompound()); - NBTTagCompound tag = item.getSubCompound("BlockEntityTag"); - //item.getTagCompound().setTag("BlockEntityTag", tags); - //System.out.println(tag.getBoolean("hot")); + if (!item.hasTagCompound()) { + NonNullList list = NonNullList.withSize(5, ItemStack.EMPTY); + item.setTagCompound(new NBTTagCompound()); + NBTTagCompound tags = new NBTTagCompound(); + item.getTagCompound().setTag("BlockEntityTag", tags); + ItemStackHelper.saveAllItems(tags, list); + item.getSubCompound("BlockEntityTag").setInteger("heat", 0); + item.getSubCompound("BlockEntityTag").setInteger("hot", 0); + item.getSubCompound("BlockEntityTag").setBoolean("status", false); } } } diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/bronzechisel.json b/kfc/src/main/resources/assets/forgecraft/blockstates/bronzechisel.json new file mode 100644 index 00000000..83b59b01 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/blockstates/bronzechisel.json @@ -0,0 +1,28 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:items/bronze/0", + "texture": "forgecraft:items/bronze/0" + } + }, + "variants": { + "active=false,facing=down": { "model": "forgecraft:chisel_model" }, + "active=false,facing=up": { "model": "forgecraft:chisel_model", "x": 180 }, + "active=false,facing=east": { "model": "forgecraft:chisel_model", "x": 90, "y": -90 }, + "active=false,facing=west": { "model": "forgecraft:chisel_model", "x": -90, "y": -90}, + "active=false,facing=south": { "model": "forgecraft:chisel_model", "x": -90, "y": 180 }, + "active=false,facing=north": { "model": "forgecraft:chisel_model", "x": 90, "y": 180 }, + + "active=true,facing=down": { "model": "forgecraft:chisel_model_active" }, + "active=true,facing=up": { "model": "forgecraft:chisel_model_active", "x": 180 }, + "active=true,facing=east": { "model": "forgecraft:chisel_model_active", "x": 90, "y": -90 }, + "active=true,facing=west": { "model": "forgecraft:chisel_model_active", "x": -90, "y": -90}, + "active=true,facing=south": { "model": "forgecraft:chisel_model_active", "x": -90, "y": 180 }, + "active=true,facing=north": { "model": "forgecraft:chisel_model_active", "x": 90, "y": 180 } + } +} + + + + diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/cleanironchisel.json b/kfc/src/main/resources/assets/forgecraft/blockstates/cleanironchisel.json new file mode 100644 index 00000000..2601bc36 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/blockstates/cleanironchisel.json @@ -0,0 +1,28 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:items/clean_iron/0", + "texture": "forgecraft:items/clean_iron/0" + } + }, + "variants": { + "active=false,facing=down": { "model": "forgecraft:chisel_model" }, + "active=false,facing=up": { "model": "forgecraft:chisel_model", "x": 180 }, + "active=false,facing=east": { "model": "forgecraft:chisel_model", "x": 90, "y": -90 }, + "active=false,facing=west": { "model": "forgecraft:chisel_model", "x": -90, "y": -90}, + "active=false,facing=south": { "model": "forgecraft:chisel_model", "x": -90, "y": 180 }, + "active=false,facing=north": { "model": "forgecraft:chisel_model", "x": 90, "y": 180 }, + + "active=true,facing=down": { "model": "forgecraft:chisel_model_active" }, + "active=true,facing=up": { "model": "forgecraft:chisel_model_active", "x": 180 }, + "active=true,facing=east": { "model": "forgecraft:chisel_model_active", "x": 90, "y": -90 }, + "active=true,facing=west": { "model": "forgecraft:chisel_model_active", "x": -90, "y": -90}, + "active=true,facing=south": { "model": "forgecraft:chisel_model_active", "x": -90, "y": 180 }, + "active=true,facing=north": { "model": "forgecraft:chisel_model_active", "x": 90, "y": 180 } + } +} + + + + diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/copperchisel.json b/kfc/src/main/resources/assets/forgecraft/blockstates/copperchisel.json new file mode 100644 index 00000000..5a57dd78 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/blockstates/copperchisel.json @@ -0,0 +1,28 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:items/copper/0", + "texture": "forgecraft:items/copper/0" + } + }, + "variants": { + "active=false,facing=down": { "model": "forgecraft:chisel_model" }, + "active=false,facing=up": { "model": "forgecraft:chisel_model", "x": 180 }, + "active=false,facing=east": { "model": "forgecraft:chisel_model", "x": 90, "y": -90 }, + "active=false,facing=west": { "model": "forgecraft:chisel_model", "x": -90, "y": -90}, + "active=false,facing=south": { "model": "forgecraft:chisel_model", "x": -90, "y": 180 }, + "active=false,facing=north": { "model": "forgecraft:chisel_model", "x": 90, "y": 180 }, + + "active=true,facing=down": { "model": "forgecraft:chisel_model_active" }, + "active=true,facing=up": { "model": "forgecraft:chisel_model_active", "x": 180 }, + "active=true,facing=east": { "model": "forgecraft:chisel_model_active", "x": 90, "y": -90 }, + "active=true,facing=west": { "model": "forgecraft:chisel_model_active", "x": -90, "y": -90}, + "active=true,facing=south": { "model": "forgecraft:chisel_model_active", "x": -90, "y": 180 }, + "active=true,facing=north": { "model": "forgecraft:chisel_model_active", "x": 90, "y": 180 } + } +} + + + + diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/chisel.json b/kfc/src/main/resources/assets/forgecraft/blockstates/ironchisel.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/chisel.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/ironchisel.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/steelchisel.json b/kfc/src/main/resources/assets/forgecraft/blockstates/steelchisel.json new file mode 100644 index 00000000..43b802fd --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/blockstates/steelchisel.json @@ -0,0 +1,28 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:items/steel/0", + "texture": "forgecraft:items/steel/0" + } + }, + "variants": { + "active=false,facing=down": { "model": "forgecraft:chisel_model" }, + "active=false,facing=up": { "model": "forgecraft:chisel_model", "x": 180 }, + "active=false,facing=east": { "model": "forgecraft:chisel_model", "x": 90, "y": -90 }, + "active=false,facing=west": { "model": "forgecraft:chisel_model", "x": -90, "y": -90}, + "active=false,facing=south": { "model": "forgecraft:chisel_model", "x": -90, "y": 180 }, + "active=false,facing=north": { "model": "forgecraft:chisel_model", "x": 90, "y": 180 }, + + "active=true,facing=down": { "model": "forgecraft:chisel_model_active" }, + "active=true,facing=up": { "model": "forgecraft:chisel_model_active", "x": 180 }, + "active=true,facing=east": { "model": "forgecraft:chisel_model_active", "x": 90, "y": -90 }, + "active=true,facing=west": { "model": "forgecraft:chisel_model_active", "x": -90, "y": -90}, + "active=true,facing=south": { "model": "forgecraft:chisel_model_active", "x": -90, "y": 180 }, + "active=true,facing=north": { "model": "forgecraft:chisel_model_active", "x": 90, "y": 180 } + } +} + + + + diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/wootzchisel.json b/kfc/src/main/resources/assets/forgecraft/blockstates/wootzchisel.json new file mode 100644 index 00000000..bf6285a0 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/blockstates/wootzchisel.json @@ -0,0 +1,28 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:items/wootz/0", + "texture": "forgecraft:items/wootz/0" + } + }, + "variants": { + "active=false,facing=down": { "model": "forgecraft:chisel_model" }, + "active=false,facing=up": { "model": "forgecraft:chisel_model", "x": 180 }, + "active=false,facing=east": { "model": "forgecraft:chisel_model", "x": 90, "y": -90 }, + "active=false,facing=west": { "model": "forgecraft:chisel_model", "x": -90, "y": -90}, + "active=false,facing=south": { "model": "forgecraft:chisel_model", "x": -90, "y": 180 }, + "active=false,facing=north": { "model": "forgecraft:chisel_model", "x": 90, "y": 180 }, + + "active=true,facing=down": { "model": "forgecraft:chisel_model_active" }, + "active=true,facing=up": { "model": "forgecraft:chisel_model_active", "x": 180 }, + "active=true,facing=east": { "model": "forgecraft:chisel_model_active", "x": 90, "y": -90 }, + "active=true,facing=west": { "model": "forgecraft:chisel_model_active", "x": -90, "y": -90}, + "active=true,facing=south": { "model": "forgecraft:chisel_model_active", "x": -90, "y": 180 }, + "active=true,facing=north": { "model": "forgecraft:chisel_model_active", "x": 90, "y": 180 } + } +} + + + + diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/bronzechisel.json b/kfc/src/main/resources/assets/forgecraft/models/item/bronzechisel.json new file mode 100644 index 00000000..39521073 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/bronzechisel.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:items/bronze/0", + "texture": "forgecraft:items/bronze/0" + }, + "parent": "forgecraft:block/chisel_model" +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/bronzesledgehammer.json b/kfc/src/main/resources/assets/forgecraft/models/item/bronzesledgehammer.json new file mode 100644 index 00000000..a634802b --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/bronzesledgehammer.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/sledgehammer_model", + "textures": { + "particle": "forgecraft:items/bronze/0", + "texture": "forgecraft:items/bronze/0" + } +} diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/cleanironchisel.json b/kfc/src/main/resources/assets/forgecraft/models/item/cleanironchisel.json new file mode 100644 index 00000000..8df777f6 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/cleanironchisel.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:items/clean_iron/0", + "texture": "forgecraft:items/clean_iron/0" + }, + "parent": "forgecraft:block/chisel_model" +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/cleanironsledgehammer.json b/kfc/src/main/resources/assets/forgecraft/models/item/cleanironsledgehammer.json new file mode 100644 index 00000000..ec770d41 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/cleanironsledgehammer.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/sledgehammer_model", + "textures": { + "particle": "forgecraft:items/clean_iron/0", + "texture": "forgecraft:items/clean_iron/0" + } +} diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/copperchisel.json b/kfc/src/main/resources/assets/forgecraft/models/item/copperchisel.json new file mode 100644 index 00000000..7aeeb995 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/copperchisel.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:items/copper/0", + "texture": "forgecraft:items/copper/0" + }, + "parent": "forgecraft:block/chisel_model" +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/coppersledgehammer.json b/kfc/src/main/resources/assets/forgecraft/models/item/coppersledgehammer.json new file mode 100644 index 00000000..7aedb090 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/coppersledgehammer.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/sledgehammer_model", + "textures": { + "particle": "forgecraft:items/copper/0", + "texture": "forgecraft:items/copper/0" + } +} diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hoe2.json b/kfc/src/main/resources/assets/forgecraft/models/item/hoe2.json deleted file mode 100644 index 1af275bf..00000000 --- a/kfc/src/main/resources/assets/forgecraft/models/item/hoe2.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "items/iron_ingot", - "texture": "blocks/planks_oak", - "texture1": "items/iron_ingot", - "textur1e": "items/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": [ 6, 5, 3, 4 ], "texture": "#texture1", "rotation": 270 }, - "up": { "uv": [ 11, 3, 14, 4 ], "texture": "#texture1", "rotation": 90 }, - "north": { "uv": [ 2, 13, 3, 14 ], "texture": "#texture1", "rotation": 270 }, - "south": { "uv": [ 12, 9, 13, 10 ], "texture": "#texture1", "rotation": 90 }, - "west": { "uv": [ 6, 5, 7, 8 ], "texture": "#texture1", "rotation": 270 }, - "east": { "uv": [ 6, 11, 5, 8 ], "texture": "#texture1", "rotation": 90 } - } - }, - { - "__comment": "Cube4", - "from": [ 7, 13, 5.5 ], - "to": [ 9, 14, 7.5 ], - "faces": { - "down": { "uv": [ 13, 13, 11, 11 ], "texture": "#texture1", "rotation": 270 }, - "up": { "uv": [ 4, 5, 6, 7 ], "texture": "#texture1", "rotation": 90 }, - "north": { "uv": [ 10, 8, 11, 10 ], "texture": "#texture1", "rotation": 270 }, - "south": { "uv": [ 5, 8, 6, 10 ], "texture": "#texture1", "rotation": 90 }, - "west": { "uv": [ 7, 8, 9, 9 ], "texture": "#texture1" }, - "east": { "uv": [ 14, 3, 12, 2 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube4", - "from": [ 7, 13, 8.5 ], - "to": [ 9, 14, 9.5 ], - "faces": { - "down": { "uv": [ 6, 6, 5, 4 ], "texture": "#texture1", "rotation": 270 }, - "up": { "uv": [ 12, 4, 13, 6 ], "texture": "#texture1", "rotation": 90 }, - "north": { "uv": [ 4, 12, 5, 14 ], "texture": "#texture1", "rotation": 270 }, - "south": { "uv": [ 11, 11, 12, 13 ], "texture": "#texture1", "rotation": 90 }, - "west": { "uv": [ 8, 8, 9, 9 ], "texture": "#texture1" }, - "east": { "uv": [ 6, 6, 5, 5 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube6", - "from": [ 7, 13, 7.5 ], - "to": [ 7.5, 14, 8.5 ], - "faces": { - "down": { "uv": [ 8, 11, 7, 10.5 ], "texture": "#texture1", "rotation": 270 }, - "up": { "uv": [ 11, 11.5, 12, 12 ], "texture": "#texture1", "rotation": 90 }, - "north": { "uv": [ 4, 4.5, 5, 5 ], "texture": "#texture1", "rotation": 270 }, - "south": { "uv": [ 12, 3.5, 13, 4 ], "texture": "#texture1", "rotation": 90 }, - "west": { "uv": [ 9, 8, 10, 9 ], "texture": "#texture1" }, - "east": { "uv": [ 11, 9, 10, 8 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube6", - "from": [ 8.5, 13, 7.5 ], - "to": [ 9, 14, 8.5 ], - "faces": { - "down": { "uv": [ 5, 10, 4, 9.5 ], "texture": "#texture1", "rotation": 270 }, - "up": { "uv": [ 8, 6.5, 9, 7 ], "texture": "#texture1", "rotation": 90 }, - "north": { "uv": [ 10, 10.5, 11, 11 ], "texture": "#texture1", "rotation": 270 }, - "south": { "uv": [ 6, 10.5, 7, 11 ], "texture": "#texture1", "rotation": 90 }, - "west": { "uv": [ 8, 1, 9, 2 ], "texture": "#texture1" }, - "east": { "uv": [ 6, 9, 5, 8 ], "texture": "#texture1" } - } - }, - { - "__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": "#texture1" }, - "up": { "uv": [ 7, 4, 9, 4.5 ], "texture": "#texture1" }, - "north": { "uv": [ 12, 5, 10, 3 ], "texture": "#texture1", "rotation": 180 }, - "south": { "uv": [ 7, 12.5, 9, 14.5 ], "texture": "#texture1", "rotation": 180 }, - "west": { "uv": [ 12.5, 3.5, 14.5, 4 ], "texture": "#texture1", "rotation": 270 }, - "east": { "uv": [ 1.5, 4.5, 3.5, 5 ], "texture": "#texture1", "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/kfc/src/main/resources/assets/forgecraft/models/item/chisel_model.json b/kfc/src/main/resources/assets/forgecraft/models/item/ironchisel.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/chisel_model.json rename to kfc/src/main/resources/assets/forgecraft/models/item/ironchisel.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/steelchisel.json b/kfc/src/main/resources/assets/forgecraft/models/item/steelchisel.json new file mode 100644 index 00000000..2b1e5c0c --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/steelchisel.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:items/steel/0", + "texture": "forgecraft:items/steel/0" + }, + "parent": "forgecraft:block/chisel_model" +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/steelsledgehammer.json b/kfc/src/main/resources/assets/forgecraft/models/item/steelsledgehammer.json new file mode 100644 index 00000000..eae60e81 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/steelsledgehammer.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/sledgehammer_model", + "textures": { + "particle": "forgecraft:items/steel/0", + "texture": "forgecraft:items/steel/0" + } +} diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzchisel.json b/kfc/src/main/resources/assets/forgecraft/models/item/wootzchisel.json new file mode 100644 index 00000000..3ebf670b --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/wootzchisel.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:items/wootz/0", + "texture": "forgecraft:items/wootz/0" + }, + "parent": "forgecraft:block/chisel_model" +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzsledgehammer.json b/kfc/src/main/resources/assets/forgecraft/models/item/wootzsledgehammer.json new file mode 100644 index 00000000..6e4f2327 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/wootzsledgehammer.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/sledgehammer_model", + "textures": { + "particle": "forgecraft:items/wootz/0", + "texture": "forgecraft:items/wootz/0" + } +} diff --git a/kfc/src/main/resources/assets/forgecraft/textures/items/clay.png b/kfc/src/main/resources/assets/forgecraft/textures/items/clay.png index ff9f58d51ac1d899d6c958642d63df623ec207ec..03d07ed4d84f7e898ba7b0e18b022c45d9b46556 100644 GIT binary patch delta 462 zcmV;<0Wtox1-t~1Q3~P;1`r|+q_3X?ky|T&0ia1lK~y-)U6b2x+b|4) zpv7LRZ@9-BumbD4#3zZ|g)P+?F9rT2|AXYm+nXC(DNx)22qM&~ZzA&0Q!(6^1$U>o zBO=HSw!L{Rh4*p9%vj7CIP3$tbRET=Z1yk=;I^(zIn#$gHe*~@e%@|vNG$FI5rPPR zpUc9v?j%un*3cB-p8@&6y2Stu4BoWDQC_pwGC6wWHW}8DDDK{6eB}QxI2h!6sDYs zsyuaF;~7MVs*P_r^i|4MDfA&U`=Tm;b19AcTnc%&?i3^0tU2TEs2@U6fpzQ0JkzNX zRjGY*DfA%_Ra>x{h(~ol=Xnc?D!-?xi8iFvXetmzq&-%A9ex?Su@mA%m4rY07*qoM6N<$ Eg2v<9u>b%7 delta 583 zcmV-N0=WIW1hfT^Q3~M!7XUE}u>>wxail1nD%%=<7?a>3n!pdV(YsnE86 zTZ#w$`;A|}{~#h&Y0gecim7tF_8gA~+?}VVXFh*^q&sZM*-;f#p-D!!`$SaZs3pZ6 z+=Jt>s~|*pcz8fWi2$?Otg1xBS|TfhfPR=)&q2=4vN%C)E*_lE7a}T?>#*?h@`_01 zq@_5=uBEus_dO7(*6Hul!ZYZ8)9oS4N;_$~4_DRSt&^5K=NkpluSH zO(GCflwn**N!INI5$hT^n-&p8R8ciq6TYP16uwbMsQz?)Ef|BC;yzhY61$C0YFoeLrIwm?`Ji=Z`CY-0xZ< zgw!;MK(eG9_M3G;C0jh`x~6W%ozv;Wx^~Qj{jN3xBri@WPI1S~h*lu&J2mz&JhWDA`jz_F4g3H?*!#G!nX3FVwPfE%-4y0rp z_J>uXa5+B%!7XQ0D~G$gj@_m*trkiNKrl;u`SQsBp$gx=ennMi8bJU}_L0xo`3p^5 VH0xZ_i!lHI002ovPDHLkV1fo<7J2{x