From a45d502cc69ab98c37335150c0bcaa4cda43938f Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Fri, 21 Sep 2018 23:19:19 -0400 Subject: [PATCH 1/2] fixed render desnyc for tongs --- kfc/gradle.properties | 2 +- .../java/nmd/primal/forgecraft/ModInfo.java | 2 +- .../forgecraft/blocks/Anvil/AnvilStone.java | 23 ++++++++++--------- kfc/src/main/resources/mcmod.info | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/kfc/gradle.properties b/kfc/gradle.properties index f6598fe5..5faf7f6c 100644 --- a/kfc/gradle.properties +++ b/kfc/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.6.05 +mod_version=1.6.06 forge_version=14.23.4.2744 mcp_mappings=snapshot_20171003 mc_version=1.12.2 diff --git a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java index f6c9225a..aa904333 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -21,7 +21,7 @@ public class ModInfo { //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.6.05"; + public static final String MOD_VERSION = "1.6.06"; public static final String MC_VERSIONS = "[1.12.0, 1.13.0)"; public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.6.69,);"; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java index 46e8e9f2..ac775bce 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java @@ -26,14 +26,15 @@ public class AnvilStone extends AnvilBase { @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz) { - /****************************************************************************** - Crafting AnvilStone Recipes - *****************************************************************************/ - if (!world.isRemote) { - ItemStack pItem = player.inventory.getCurrentItem(); - TileAnvil tile = (TileAnvil) world.getTileEntity(pos); - ItemStack stack12 = tile.getSlotStack(12).copy(); - if (hand.equals(hand.MAIN_HAND)) { + /****************************************************************************** + Crafting AnvilStone Recipes + *****************************************************************************/ + + ItemStack pItem = player.inventory.getCurrentItem(); + TileAnvil tile = (TileAnvil) world.getTileEntity(pos); + ItemStack stack12 = tile.getSlotStack(12).copy(); + if (hand.equals(hand.MAIN_HAND)) { + if (!world.isRemote) { if (!stack12.isEmpty()) { if (tile != null) { if ((pItem.getItem() instanceof Gallagher) || (pItem.getItem() == ModItems.forgehammer)) { @@ -116,10 +117,10 @@ public class AnvilStone extends AnvilBase { doAnvilRecipe(pItem, tempArray, world, tile, pos, player); return true; } - doAnvilInventoryManager(pItem, world, tile, pos, hitx, hity, hitz, state, player); - return true; } - return false; + + doAnvilInventoryManager(pItem, world, tile, pos, hitx, hity, hitz, state, player); + return true; } return false; } diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index 0a22d714..3599d88c 100644 --- a/kfc/src/main/resources/mcmod.info +++ b/kfc/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", - "version": "1.6.05", + "version": "1.6.06", "mcversion": "1.12.2", "url": "", "updateUrl": "", From 6f5dd58fc5b16b7cca1b67dfca403d1aa007f631 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Fri, 21 Sep 2018 23:25:16 -0400 Subject: [PATCH 2/2] fixed slot tongs rendering --- .../primal/forgecraft/items/SlottedTongs.java | 6 +-- .../primal/forgecraft/util/AnvilHandler.java | 39 ++++++++++--------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java b/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java index 528f95b8..da3ca8db 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java @@ -283,7 +283,7 @@ public class SlottedTongs extends Item implements IPickup, AnvilHandler{ @Override public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing face, float hitx, float hity, float hitz) { - if(!world.isRemote){ + //if(!world.isRemote){ //if (hand.equals(player.swingingHand)) { IBlockState state = world.getBlockState(pos); Block block = world.getBlockState(pos).getBlock(); @@ -430,8 +430,8 @@ public class SlottedTongs extends Item implements IPickup, AnvilHandler{ } } return EnumActionResult.FAIL; - } - return EnumActionResult.FAIL; + //} + //return EnumActionResult.FAIL; } public ItemStack getItem(World world, BlockPos pos, IBlockState state, Block block) 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 29d60dba..9693d55b 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java @@ -233,31 +233,32 @@ 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)) { - SlottedTongs tongs = (SlottedTongs) pItem.getItem(); - ItemStack tongStack = tongs.getSlotList().get(0).copy(); + if (pItem.getItem().equals(ModItems.slottedtongs)) { - if (tongStack.isEmpty()) { - if (!tile.getSlotStack(counter).isEmpty()) { - ItemStack tempStack = tile.getSlotStack(counter).copy(); - tongs.setSlotList(tempStack); - tile.setSlotStack(counter, ItemStack.EMPTY); - return true; - } - } + SlottedTongs tongs = (SlottedTongs) pItem.getItem(); + ItemStack tongStack = tongs.getSlotList().get(0).copy(); - if (!tongStack.isEmpty()) { - if (tile.getSlotStack(counter).isEmpty()) { - ItemStack tempStack = tongs.getSlotList().get(0).copy(); - tile.setSlotStack(counter, tempStack); - tongs.setSlotList(ItemStack.EMPTY); - return true; - } + if (tongStack.isEmpty()) { + if (!tile.getSlotStack(counter).isEmpty()) { + ItemStack tempStack = tile.getSlotStack(counter).copy(); + tongs.setSlotList(tempStack); + tile.setSlotStack(counter, ItemStack.EMPTY); + return true; } } + if (!tongStack.isEmpty()) { + if (tile.getSlotStack(counter).isEmpty()) { + ItemStack tempStack = tongs.getSlotList().get(0).copy(); + tile.setSlotStack(counter, tempStack); + tongs.setSlotList(ItemStack.EMPTY); + return true; + } + } + } + if (!world.isRemote) { + if (pItem.getItem().equals(Items.AIR) && player.isSneaking()) { if (tile.getSlotStack(counter).getItem().equals(Items.DIAMOND)) {