From b6c42230fe46a1b6bb53c86a7110d68660942d3e Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sat, 22 Sep 2018 22:08:37 -0400 Subject: [PATCH] tongs are functional but rendering is jacked --- .../java/nmd/primal/forgecraft/blocks/machine/Forge.java | 4 ++-- .../main/java/nmd/primal/forgecraft/util/AnvilHandler.java | 4 ++-- .../main/java/nmd/primal/forgecraft/util/ForgeHandler.java | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/Forge.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/Forge.java index 9a75a622..77bc958c 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/Forge.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/Forge.java @@ -99,7 +99,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider, if (tile != null) { if (hand.equals(player.getActiveHand())) { - ItemStack pItem = player.inventory.getCurrentItem().copy(); + ItemStack pItem = player.inventory.getCurrentItem(); ItemStack fuelItem = tile.getSlotStack(0); /*********************** @@ -160,9 +160,9 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider, } } - if (facing == EnumFacing.UP) { doForgeInventoryManager(pItem, world, tile, pos, hitX, hitY, hitZ, state, player); + return true; } } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java index 4d1d54e3..3d919805 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java @@ -236,7 +236,7 @@ public interface AnvilHandler { static boolean doWork(ItemStack pItem, Integer counter, TileAnvil tile, World world, BlockPos pos, EntityPlayer player) { - if (!world.isRemote) { + if (pItem.getItem().equals(ModItems.slottedtongs)) { IItemHandler inventory = pItem.getCapability(ITEM_HANDLER, null); @@ -357,7 +357,7 @@ public interface AnvilHandler { return true; } } - } + return false; } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/util/ForgeHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/util/ForgeHandler.java index e0853048..d6805701 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/util/ForgeHandler.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/util/ForgeHandler.java @@ -111,22 +111,23 @@ public interface ForgeHandler { } static boolean doWork(ItemStack pItem, Integer counter, TileForge tile, World world, BlockPos pos, EntityPlayer player) { + if (pItem.getItem().equals(ModItems.slottedtongs)) { - IItemHandler inventory = (IItemHandlerModifiable) pItem.getCapability(ITEM_HANDLER, null); + IItemHandler inventory = pItem.getCapability(ITEM_HANDLER, null); ItemStack tongsStack = inventory.getStackInSlot(0).copy(); if (tongsStack.isEmpty()) { if (!tile.getSlotStack(counter).isEmpty()) { ItemStack tempStack = tile.getSlotStack(counter).copy(); - tile.setSlotStack(counter, ItemStack.EMPTY); inventory.insertItem(0, tempStack, false); + tile.setSlotStack(counter, ItemStack.EMPTY); return true; } } if (!tongsStack.isEmpty()) { if (tile.getSlotStack(counter).isEmpty()) { - ItemStack tempStack = tongsStack; + ItemStack tempStack = tongsStack.copy(); tile.setSlotStack(counter, tempStack); inventory.extractItem(0, 1, false); return true;