upgrade textures all added, pickaxehead variants all added

1.11/To-Dos

@@ -1,5 +1,22 @@
 To-Dos
 
+
+
+
+
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_emerald1_diamond1"
+  }
+}
+
+
+ironpickaxehead_1
+
+
 *** Priority ***
 
 - [ ] Create all the textures for all the NBT types
@@ -13,7 +30,7 @@ To-Dos
 
 
 *** Backlog ***
-
+- [ ] Create a method which adds the types of NBT upgrades and creates a unique float instead of using magic numbers
 - [ ] Add forgehammer to oreDict
 - [ ] Finish Toolhead Recipes
 - [ ] WeaponHead recipes

1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/PickaxePart.java

@@ -22,7 +22,8 @@ public class PickaxePart extends ToolPart {
 
     /***
 
-     Hot . Emerald . Diamond . Redstone . lapis
+     hot . emerald . diamond . redstone . lapis
+      0  .    0    .    0    .     0    .   0
 
      ***/
 
@@ -35,15 +36,7 @@ public class PickaxePart extends ToolPart {
             public float apply(ItemStack item, @Nullable World worldIn, @Nullable EntityLivingBase entityIn)
             {
                 if (item.hasTagCompound()) {
-                    if (item.getSubCompound("tags").getBoolean("hot") == true) {
-                        return 1.0F;
-                    }
 
-                    if (item.getSubCompound("tags").getBoolean("hot") == false) {
-                        if (item.getSubCompound("tags").getInteger("modifiers") == 0) {
-                            return 0.0F;
-                        }
-                    }
 
                     if (item.getSubCompound("tags").getBoolean("hot") == false) {
                         if (item.getSubCompound("tags").getInteger("modifiers") != 0) {
@@ -105,6 +98,8 @@ public class PickaxePart extends ToolPart {
                                 return 0.03F;
                             }
 
+                            //=======
+
                             if ((item.getSubCompound("tags").getBoolean("emerald") == false) &&
                                     (item.getSubCompound("tags").getInteger("diamond") == 0) &&
                                     (item.getSubCompound("tags").getInteger("redstone") == 1) &&
@@ -126,6 +121,8 @@ public class PickaxePart extends ToolPart {
                                 return 0.003F;
                             }
 
+                            //=========
+
                             if ((item.getSubCompound("tags").getBoolean("emerald") == false) &&
                                     (item.getSubCompound("tags").getInteger("diamond") == 0) &&
                                     (item.getSubCompound("tags").getInteger("redstone") == 0) &&
@@ -147,6 +144,8 @@ public class PickaxePart extends ToolPart {
                                 return 0.0003F;
                             }
 
+                            //=======
+
                             if ((item.getSubCompound("tags").getBoolean("emerald") == false) &&
                                     (item.getSubCompound("tags").getInteger("diamond") == 1) &&
                                     (item.getSubCompound("tags").getInteger("redstone") == 1) &&
@@ -172,14 +171,14 @@ public class PickaxePart extends ToolPart {
                                     (item.getSubCompound("tags").getInteger("diamond") == 0) &&
                                     (item.getSubCompound("tags").getInteger("redstone") == 1) &&
                                     (item.getSubCompound("tags").getInteger("lapis") == 2)) {
-                                return 0.012F;
+                                return 0.0012F;
                             }
 
                             if ((item.getSubCompound("tags").getBoolean("emerald") == false) &&
                                     (item.getSubCompound("tags").getInteger("diamond") == 0) &&
-                                    (item.getSubCompound("tags").getInteger("redstone") == 1) &&
+                                    (item.getSubCompound("tags").getInteger("redstone") == 2) &&
-                                    (item.getSubCompound("tags").getInteger("lapis") == 2)) {
+                                    (item.getSubCompound("tags").getInteger("lapis") == 1)) {
-                                return 0.0012F;
+                                return 0.0021F;
                             }
 
                             if ((item.getSubCompound("tags").getBoolean("emerald") == false) &&
@@ -190,6 +189,15 @@ public class PickaxePart extends ToolPart {
                             }
                         }
                     }
+                    if (item.getSubCompound("tags").getBoolean("hot") == true) {
+                        return 1.0F;
+                    }
+
+                    if (item.getSubCompound("tags").getBoolean("hot") == false) {
+                        if (item.getSubCompound("tags").getInteger("modifiers") == 0) {
+                            return 0.0F;
+                        }
+                    }
                 }
                 return 0.0F;
             }

1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java

@@ -141,8 +141,12 @@ public class TileForge extends TileBaseSlot implements ITickable {
                     }
                     if (cookCounter4 >= recipe.getIdealTime()) {
                         if(this.getSlotStack(i).hasTagCompound()){
+                            if( this.getSlotStack(i).getSubCompound("tags").getBoolean("hot") == false) {
                                 this.getSlotStack(i).getSubCompound("tags").setBoolean("hot", true);
+                                System.out.println(this.getSlotStack(i).getSubCompound("tags"));
                                 System.out.println("its hot now");
+                                cookCounter4 = 0;
+                            }
                         } else this.setSlotStack(i, recipe.getOutput());
                         cookCounter4 = 0;
                     }

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead.json

@@ -7,8 +7,28 @@
   },
   "overrides": [
     {"predicate": {"type": 0.0},"model": "forgecraft:item/ironpickaxehead_0"},
-    {"predicate": {"type": 1.0},"model": "forgecraft:item/ironpickaxehead_1"},
+    {"predicate": {"type": 0.0001},"model": "forgecraft:item/ironpickaxehead_13"},
-    {"predicate": {"type": 0.1},"model": "forgecraft:item/ironpickaxehead_2"}
+    {"predicate": {"type": 0.0002},"model": "forgecraft:item/ironpickaxehead_14"},
+    {"predicate": {"type": 0.0003},"model": "forgecraft:item/ironpickaxehead_15"},
+    {"predicate": {"type": 0.001},"model": "forgecraft:item/ironpickaxehead_10"},
+    {"predicate": {"type": 0.0012},"model": "forgecraft:item/ironpickaxehead_19"},
+    {"predicate": {"type": 0.002},"model": "forgecraft:item/ironpickaxehead_11"},
+    {"predicate": {"type": 0.0021},"model": "forgecraft:item/ironpickaxehead_20"},
+    {"predicate": {"type": 0.003},"model": "forgecraft:item/ironpickaxehead_12"},
+    {"predicate": {"type": 0.01},"model": "forgecraft:item/ironpickaxehead_7"},
+    {"predicate": {"type": 0.0102},"model": "forgecraft:item/ironpickaxehead_21"},
+    {"predicate": {"type": 0.0111},"model": "forgecraft:item/ironpickaxehead_16"},
+    {"predicate": {"type": 0.012},"model": "forgecraft:item/ironpickaxehead_18"},
+    {"predicate": {"type": 0.02},"model": "forgecraft:item/ironpickaxehead_8"},
+    {"predicate": {"type": 0.021},"model": "forgecraft:item/ironpickaxehead_17"},
+    {"predicate": {"type": 0.03},"model": "forgecraft:item/ironpickaxehead_9"},
+    {"predicate": {"type": 0.1},"model": "forgecraft:item/ironpickaxehead_2"},
+    {"predicate": {"type": 0.102},"model": "forgecraft:item/ironpickaxehead_6"},
+    {"predicate": {"type": 0.11},"model": "forgecraft:item/ironpickaxehead_3"},
+    {"predicate": {"type": 0.111},"model": "forgecraft:item/ironpickaxehead_5"},
+    {"predicate": {"type": 0.12},"model": "forgecraft:item/ironpickaxehead_4"},
+    {"predicate": {"type": 1.0},"model": "forgecraft:item/ironpickaxehead_1"}
+
   ]
 }
 

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_10.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_redstone1"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_11.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_redstone2"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_12.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_redstone3"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_13.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_lapis1"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_14.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_lapis2"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_15.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_lapis3"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_16.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_diamond1_redstone1_lapis1"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_17.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_diamond2_redstone1"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_18.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_diamond1_redstone2"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_19.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_redstone1_lapis2"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_20.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_redstone2_lapis1"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_21.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_diamond1_lapis2"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_3.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_emerald1_diamond1"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_4.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_emerald1_diamond2"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_5.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_emerald1_diamond1_redstone1"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_6.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_emerald1_redstone2"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_7.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_diamond1"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_8.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_diamond2"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_9.json

@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_diamond3"
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead.json

@@ -1,9 +1,9 @@
 {
 	"__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio",
 	"textures": {
-		"particle": "forgecraft:blocks/iron_ingot",
+		"particle": "forgecraft:items/iron_ingot",
 		"texture": "blocks/planks_oak",
-		"texture1": "forgecraft:blocks/iron_ingot"
+		"texture1": "forgecraft:items/iron_ingot"
 	},
 	"elements": [
 		{