From 8fda4b25c4de7381240e5281b643bf9b669de293 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Fri, 26 Oct 2018 23:26:33 -0400 Subject: [PATCH] update to crucible, should be fixed now --- kfc/gradle.properties | 2 +- .../java/nmd/primal/forgecraft/ModInfo.java | 2 +- .../primal/forgecraft/blocks/NBTCrucible.java | 38 +++++++------------ kfc/src/main/resources/mcmod.info | 2 +- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/kfc/gradle.properties b/kfc/gradle.properties index 4b1b9c15..801dd48e 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.32 +mod_version=1.6.33 forge_version=14.23.4.2765 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 4283dc56..105c952d 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -22,7 +22,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.32"; + public static final String MOD_VERSION = "1.6.33"; 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/NBTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/NBTCrucible.java index 267cfec4..53f4cdc3 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/NBTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/NBTCrucible.java @@ -57,20 +57,16 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing face, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hands, EnumFacing face, float hitX, float hitY, float hitZ) { if (!world.isRemote) { - TileNBTCrucible tile = (TileNBTCrucible) world.getTileEntity(pos); - - if(hand.equals(MAIN_HAND)) { - - ItemStack pItem = player.inventory.getCurrentItem().copy(); - pItem.setCount(1); + if(player.getActiveHand().equals(EnumHand.MAIN_HAND)) { + ItemStack playerStackStart = player.getHeldItemMainhand().copy(); /**PICKS UP THE CRUCIBLE**/ - if (player.isSneaking() == false) { - if (pItem.isEmpty()) { + if (playerStackStart.isEmpty()) { + if (!player.isSneaking()) { CrucibleCrafting recipe = CrucibleCrafting.getRecipe(tile.ingList.get(0), tile.ingList.get(1), tile.ingList.get(2), tile.ingList.get(3), tile.ingList.get(4)); if (recipe != null) { tile.setDrops(recipe.getDropsRaw()); @@ -81,13 +77,11 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { return true; } } - } - /**SET INGREDIENT ARRAY FOR THE CRUCIBLE NOW**/ - if(hand.equals(MAIN_HAND)) { - ItemStack pItem = player.inventory.getCurrentItem().copy(); - pItem.setCount(1); + /**SET INGREDIENT ARRAY FOR THE CRUCIBLE NOW**/ if (!player.isSneaking()) { + ItemStack pItem = player.inventory.getCurrentItem().copy(); + pItem.setCount(1); if (!pItem.isEmpty()) { if (!tile.getStatus() || tile.getHot() == 15 || tile.getHot() == 6) { if (pItem.getItem() instanceof SlottedTongs) { @@ -110,9 +104,7 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { } } } - } - /**CLEARS THE INVENTORY**/ - if(hand.equals(MAIN_HAND)) { + /**CLEARS THE INVENTORY**/ if (player.isSneaking()) { ItemStack pItem = player.inventory.getCurrentItem().copy(); if (pItem.isEmpty()) { @@ -134,10 +126,9 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { } } } - } - /**REMOVE COOKED ITEM**/ - if (player.isSneaking() == true) { - if (hand.equals(MAIN_HAND)) { + + /**REMOVE COOKED ITEM**/ + if (player.isSneaking() == true) { ItemStack pItem = player.inventory.getCurrentItem().copy(); if (pItem.isEmpty()) { if (tile.getStatus() && tile.getHot() == 6) { @@ -147,8 +138,6 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { tile.setStatus(false); tile.setDrops(ItemStack.EMPTY); tile.ingList.clear(); - //PlayerHelper.spawnItemOnPlayer(world, player, dropStack); - //PlayerHelper.spawnItemOnGround(world, player.getPosition(), dropStack); EntityItem entityitem = new EntityItem(world, player.posX, player.posY, player.posZ, dropStack); // ? player.posY - 1.0D world.spawnEntity(entityitem); tile.update(); @@ -157,9 +146,10 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { } } } + //return false; } } - return false; + return true; } private IBlockState getReplacementBlock(World world, BlockPos pos, IBlockState state) diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index 566808b1..cdb6b515 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.32", + "version": "1.6.33", "mcversion": "1.12.2", "url": "", "updateUrl": "",