push fixes and version updates

kfc/To-Dos.md

@@ -3,10 +3,11 @@
 ## Bugs
 
 ## Current Feature
+- [ ] Craft Tweaker Support
 - [ ] Config to map only wrought iron to vanilla iron or wrought iron to another iron
 - [ ] Copper Gladius
-- [ ] Craft Tweaker Support
 - [ ] oreDict support for Forge Recipes
+- [ ] drop a tool handle when crafting
 
 ## Feature Musket
 - [ ] Create powder charge item (copper, charcoal, gunpowder)

kfc/gradle.properties

@@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx3G
 mod_group=nmd.primal.forgecraft
 mod_name=ForgeCraft
 
-mod_version=1.6.15
+mod_version=1.6.17
 forge_version=14.23.4.2744
 mcp_mappings=snapshot_20171003
 mc_version=1.12.2

kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java

@@ -18,7 +18,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.15";
+    public static final String MOD_VERSION = "1.6.17";
     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/compat/JEI/anvil/AnvilRecipeCategory.java

@@ -13,6 +13,7 @@ import nmd.primal.core.common.helper.CommonUtils;
 import nmd.primal.forgecraft.ModInfo;
 import nmd.primal.forgecraft.compat.JEI.AbstractCategory;
 import nmd.primal.forgecraft.init.ModItems;
+import nmd.primal.forgecraft.items.parts.ToolPart;
 
 import javax.annotation.Nonnull;
 
@@ -98,7 +99,11 @@ public class AnvilRecipeCategory extends AbstractCategory<AnvilRecipeWrapper>
         //items.set(0, recipe.getIngredient(0));
 
         for(int i =0; i < 25; i++){
-            items.set(i, recipe.getIngredient(i));
+            if(recipe.getIngredient(i).getItem() instanceof ToolPart) {
+                items.set(i, new ItemStack(recipe.getIngredient(i).getItem(), 1));
+            } else {
+                items.set(i, recipe.getIngredient(i));
+            }
         }
 
         /***OUTPUTS***/

kfc/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java

@@ -101,6 +101,11 @@ public interface AnvilHandler extends ToolMaterialMap {
 
                         if (recipe.getUpgrade() == "repair") {
                             CommonUtils.spawnItemEntityFromWorld(world, pos, outputStack);
+                            for (int i = 0; i < tile.getSlotListSize(); i++) {
+                                if (!tile.getSlotStack(i).isEmpty()) {
+                                    tile.setSlotStack(i, ItemStack.EMPTY);
+                                }
+                            }
                             return true;
                         }
 

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.15",
+  "version": "1.6.17",
   "mcversion": "1.12.2",
   "url": "",
   "updateUrl": "",