update with merge conflict resolved

kfc/To-Dos.md

@@ -2,6 +2,10 @@
 
 ## Bugs
 - [ ] Placement bug for crucible from tongs
+- [ ] Wootz shovel not rendering (NORTH)
+- [ ] Damascus Rendering in tongs
+- [ ] bug for recipe with damascus shovel
+- [ ] redstone 1 is ok redstone 2 is not ok
 
 ## Current Feature
 - [ ] weapon upgrades

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

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,);";
 

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()) {
                     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();
@@ -159,7 +148,7 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider {
                 }
             }
         }
-        return false;
+        return true;
     }
 
     private IBlockState getReplacementBlock(World world, BlockPos pos, IBlockState state)

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": "",