From 9017d6ac0f1255596e573aebc10e0a1303a3d060 Mon Sep 17 00:00:00 2001
From: Mohammad-Ali Minaie <mminaie@bstonetech.com>
Date: Mon, 13 Mar 2017 21:22:29 -0400
Subject: [PATCH] adding texture for pickaxehead

---
 1.11/To-Dos                                   |   5 +
 1.11/e_particle.png                           | Bin 159 -> 0 bytes
 1.11/e_texture.png                            | Bin 141 -> 0 bytes
 1.11/eula.txt                                 |   2 +-
 1.11/fireboxV3.json                           | 113 ------------------
 1.11/firebox_litV3.json                       | 113 ------------------
 1.11/gradle.properties                        |   2 +-
 .../nmd/primal/forgecraft/ForgeCraft.java     |   4 +-
 .../java/nmd/primal/forgecraft/ModInfo.java   |   4 +-
 .../items/toolparts/PickaxePart.java          |  25 +++-
 .../primal/forgecraft/tiles/TileForge.java    |   2 +-
 .../models/item/ironpickaxehead.json          |   7 +-
 .../models/item/ironpickaxehead_0.json        |   4 +-
 .../models/item/ironpickaxehead_1.json        |   4 +-
 .../models/item/ironpickaxehead_2.json        |   8 ++
 .../forgecraft/textures/blocks/iron_ingot.png | Bin 714 -> 741 bytes
 .../forgecraft/textures/items/iron_ingot.png  | Bin 0 -> 741 bytes
 .../textures/items/iron_ingot_emerald1.png    | Bin 0 -> 912 bytes
 .../textures/items/iron_ingot_hot.png         | Bin 0 -> 801 bytes
 1.11/src/main/resources/mcmod.info            |   2 +-
 20 files changed, 52 insertions(+), 243 deletions(-)
 delete mode 100644 1.11/e_particle.png
 delete mode 100644 1.11/e_texture.png
 delete mode 100644 1.11/fireboxV3.json
 delete mode 100644 1.11/firebox_litV3.json
 create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_2.json
 create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot.png
 create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1.png
 create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_hot.png

diff --git a/1.11/To-Dos b/1.11/To-Dos
index f6b26366..451b1c27 100644
--- a/1.11/To-Dos
+++ b/1.11/To-Dos
@@ -3,6 +3,11 @@ To-Dos
 *** Priority ***
 
 - [ ] Create all the textures for all the NBT types
+- [ ] Create the axe Model
+- [ ] Create the shovel model
+- [ ] Create the hoe model
+- [ ] Create the Sword Model
+
 - [ ] Create Crafting Block for Tools and Weapons
 - [ ] Create PickAxe Tool which ingests NBT
 
diff --git a/1.11/e_particle.png b/1.11/e_particle.png
deleted file mode 100644
index e557878f9b0081df0e6c571ed915f4780bf1a2fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|X`U{QAsV7vCj@daC~~-LPd)$i
z?$?xTj^-IIp9ACFK7V={aJAiXe!J@v0mIGT4Z3dBCY+nlAN}mLRowa~J3GYg{eRVX
zXUUaN&3PXSznt{pUt?*oMTj?KX|GSjMcIr5t;EiVqsx9UI;{|T9DHPlG0;W^Pgg&e
IbxsLQ03WwL?f?J)

diff --git a/1.11/e_texture.png b/1.11/e_texture.png
deleted file mode 100644
index 7291f2ea2b524eccecb6678f7bd40262c849bf2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|A)YRdAsV8|HWeQfm^B+%SKK&v
zuFpfaoliDNDM&L$@~vsZp9Y?WbuQ1CZf4l2-1K~5=5VI@Msu3kk+ey<5-m~}Y<WLQ
ohP}UZ`m%z0;xWA=WouLzQhNB+FUTyL12mt()78&qol`;+03Ek4C;$Ke

diff --git a/1.11/eula.txt b/1.11/eula.txt
index b5009575..346be43a 100644
--- a/1.11/eula.txt
+++ b/1.11/eula.txt
@@ -1,3 +1,3 @@
 #By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).
-#Sun Feb 19 22:59:02 EST 2017
+#Mon Mar 13 20:41:32 EDT 2017
 eula=false
diff --git a/1.11/fireboxV3.json b/1.11/fireboxV3.json
deleted file mode 100644
index 60951aea..00000000
--- a/1.11/fireboxV3.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-	"__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio",
-	"textures": {
-		"particle": "blocks/e_particle",
-		"texture": "primal:blocks/brick"
-	},
-	"elements": [
-		{
-			"__comment": "Cube1",
-			"from": [ 0, 0, 0 ],
-			"to": [ 16, 8, 16 ],
-			"faces": {
-				"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" },
-				"north": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture" },
-				"south": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture" },
-				"west": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture" },
-				"east": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube2",
-			"from": [ 0, 8, 14 ],
-			"to": [ 4, 12, 16 ],
-			"faces": {
-				"down": { "uv": [ 0, 0, 4, 2 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 14, 4, 16 ], "texture": "#texture" },
-				"north": { "uv": [ 12, 4, 16, 8 ], "texture": "#texture" },
-				"south": { "uv": [ 0, 4, 4, 8 ], "texture": "#texture" },
-				"west": { "uv": [ 14, 4, 16, 8 ], "texture": "#texture" },
-				"east": { "uv": [ 0, 4, 2, 8 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube2",
-			"from": [ 12, 8, 14 ],
-			"to": [ 16, 12, 16 ],
-			"faces": {
-				"down": { "uv": [ 0, 15, 4, 16 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 0, 4, 1 ], "texture": "#texture" },
-				"north": { "uv": [ 12, 4, 16, 8 ], "texture": "#texture" },
-				"south": { "uv": [ 0, 4, 4, 8 ], "texture": "#texture" },
-				"west": { "uv": [ 0, 4, 1, 8 ], "texture": "#texture" },
-				"east": { "uv": [ 15, 4, 16, 8 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube4",
-			"from": [ 0, 8, 0 ],
-			"to": [ 2, 16, 14 ],
-			"faces": {
-				"down": { "uv": [ 0, 0, 2, 14 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" },
-				"north": { "uv": [ 14, 0, 16, 8 ], "texture": "#texture" },
-				"south": { "uv": [ 0, 0, 2, 8 ], "texture": "#texture" },
-				"west": { "uv": [ 2, 0, 16, 8 ], "texture": "#texture" },
-				"east": { "uv": [ 2, 0, 16, 8 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube4",
-			"from": [ 14, 8, 0 ],
-			"to": [ 16, 16, 14 ],
-			"faces": {
-				"down": { "uv": [ 0, 14, 2, 15 ], "texture": "#texture" },
-				"up": { "uv": [ 2, 0.5, 16, 3 ], "texture": "#texture", "rotation": 90 },
-				"north": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture" },
-				"south": { "uv": [ 0, 4, 2, 8 ], "texture": "#texture" },
-				"west": { "uv": [ 2, 0, 16, 7 ], "texture": "#texture" },
-				"east": { "uv": [ 0, 0, 14, 8 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube6",
-			"from": [ 0, 12, 14 ],
-			"to": [ 16, 16, 16 ],
-			"faces": {
-				"down": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 0, 2, 16 ], "texture": "#texture", "rotation": 90 },
-				"north": { "uv": [ 0, 3, 16, 7 ], "texture": "#texture" },
-				"south": { "uv": [ 0, 0, 16, 4 ], "texture": "#texture" },
-				"west": { "uv": [ 0, 0, 2, 4 ], "texture": "#texture" },
-				"east": { "uv": [ 14, 0, 16, 4 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube7",
-			"from": [ 2, 8, 0 ],
-			"to": [ 14, 16, 2 ],
-			"faces": {
-				"down": { "uv": [ 2, 0, 14, 0 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 12, 14, 14.5 ], "texture": "#texture" },
-				"north": { "uv": [ 2, 0, 14, 8 ], "texture": "#texture" },
-				"south": { "uv": [ 2, 0, 14, 8 ], "texture": "#texture" },
-				"west": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture" },
-				"east": { "uv": [ 0, 0, 0, 8 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube8",
-			"from": [ -2, 0, -2 ],
-			"to": [ -1, 1, -1 ],
-			"faces": {
-				"down": { "uv": [ 0, 16, 0, 16 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 0, 0, 0 ], "texture": "#texture" },
-				"north": { "uv": [ 16, 15, 16, 16 ], "texture": "#texture" },
-				"south": { "uv": [ 0, 15, 0, 16 ], "texture": "#texture" },
-				"west": { "uv": [ 0, 15, 0, 16 ], "texture": "#texture" },
-				"east": { "uv": [ 16, 15, 16, 16 ], "texture": "#texture" }
-			}
-		}
-	]
-}
\ No newline at end of file
diff --git a/1.11/firebox_litV3.json b/1.11/firebox_litV3.json
deleted file mode 100644
index ee2de661..00000000
--- a/1.11/firebox_litV3.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-	"__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio",
-	"textures": {
-		"texture": "forgecraft:blocks/brick",
-		"texture1": "forgecraft:blocks/brick_lit"
-	},
-	"elements": [
-		{
-			"__comment": "Cube1",
-			"from": [ 0, 0, 0 ],
-			"to": [ 16, 8, 16 ],
-			"faces": {
-				"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" },
-				"north": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture" },
-				"south": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture" },
-				"west": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture" },
-				"east": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube2",
-			"from": [ 0, 8, 14 ],
-			"to": [ 4, 12, 16 ],
-			"faces": {
-				"down": { "uv": [ 0, 0, 4, 2 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 14, 4, 16 ], "texture": "#texture" },
-				"north": { "uv": [ 12, 4, 16, 8 ], "texture": "#texture1" },
-				"south": { "uv": [ 0, 4, 4, 8 ], "texture": "#texture" },
-				"west": { "uv": [ 14, 4, 16, 8 ], "texture": "#texture" },
-				"east": { "uv": [ 0, 4, 2, 8 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube2",
-			"from": [ 12, 8, 14 ],
-			"to": [ 16, 12, 16 ],
-			"faces": {
-				"down": { "uv": [ 0, 15, 4, 16 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 0, 4, 1 ], "texture": "#texture" },
-				"north": { "uv": [ 0, 4, 4, 8 ], "texture": "#texture1" },
-				"south": { "uv": [ 0, 4, 4, 8 ], "texture": "#texture" },
-				"west": { "uv": [ 0, 4, 1, 8 ], "texture": "#texture" },
-				"east": { "uv": [ 15, 4, 16, 8 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube4",
-			"from": [ 0, 8, 0 ],
-			"to": [ 2, 16, 14 ],
-			"faces": {
-				"down": { "uv": [ 0, 0, 2, 14 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" },
-				"north": { "uv": [ 14, 0, 16, 8 ], "texture": "#texture" },
-				"south": { "uv": [ 0, 0, 2, 8 ], "texture": "#texture" },
-				"west": { "uv": [ 2, 0, 16, 8 ], "texture": "#texture" },
-				"east": { "uv": [ 1, 4, 15, 12 ], "texture": "#texture1" }
-			}
-		},
-		{
-			"__comment": "Cube4",
-			"from": [ 14, 8, 0 ],
-			"to": [ 16, 16, 14 ],
-			"faces": {
-				"down": { "uv": [ 0, 14, 2, 15 ], "texture": "#texture" },
-				"up": { "uv": [ 1, 1, 15, 3 ], "texture": "#texture", "rotation": 90 },
-				"north": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture" },
-				"south": { "uv": [ 0, 4, 2, 8 ], "texture": "#texture" },
-				"west": { "uv": [ 1, 4, 15, 11 ], "texture": "#texture1" },
-				"east": { "uv": [ 0, 0, 14, 8 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube6",
-			"from": [ 0, 12, 14 ],
-			"to": [ 16, 16, 16 ],
-			"faces": {
-				"down": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 0, 2, 16 ], "texture": "#texture", "rotation": 90 },
-				"north": { "uv": [ 0, 2, 16, 6 ], "texture": "#texture1" },
-				"south": { "uv": [ 0, 0, 16, 4 ], "texture": "#texture" },
-				"west": { "uv": [ 0, 0, 2, 4 ], "texture": "#texture" },
-				"east": { "uv": [ 14, 0, 16, 4 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube7",
-			"from": [ 2, 8, 0 ],
-			"to": [ 14, 16, 2 ],
-			"faces": {
-				"down": { "uv": [ 2, 0, 14, 0 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 12, 14, 14.5 ], "texture": "#texture" },
-				"north": { "uv": [ 2, 0, 14, 8 ], "texture": "#texture" },
-				"south": { "uv": [ 2, 4, 14, 12 ], "texture": "#texture1" },
-				"west": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture" },
-				"east": { "uv": [ 0, 0, 0, 8 ], "texture": "#texture" }
-			}
-		},
-		{
-			"__comment": "Cube8",
-			"from": [ -2, 0, -2 ],
-			"to": [ -1, 1, -1 ],
-			"faces": {
-				"down": { "uv": [ 0, 16, 0, 16 ], "texture": "#texture" },
-				"up": { "uv": [ 0, 0, 0, 0 ], "texture": "#texture" },
-				"north": { "uv": [ 16, 15, 16, 16 ], "texture": "#texture" },
-				"south": { "uv": [ 0, 15, 0, 16 ], "texture": "#texture" },
-				"west": { "uv": [ 0, 15, 0, 16 ], "texture": "#texture" },
-				"east": { "uv": [ 16, 15, 16, 16 ], "texture": "#texture" }
-			}
-		}
-	]
-}
\ No newline at end of file
diff --git a/1.11/gradle.properties b/1.11/gradle.properties
index 58f6bd7b..f07da05d 100644
--- a/1.11/gradle.properties
+++ b/1.11/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx3G
 
 mod_group=nmd.primal.forgecraft
 mod_name=ForgeCraft
-mod_version=1.1.12
+mod_version=1.1.2
 forge_version=13.20.0.2226
 mcp_mappings=snapshot_20161220
 mc_version=1.11.2
diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java b/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java
index 89064aac..81460c56 100644
--- a/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java
+++ b/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java
@@ -22,8 +22,8 @@ import nmd.primal.forgecraft.proxy.CommonProxy;
 @Mod(   modid = ModInfo.MOD_ID,
         name = ModInfo.MOD_NAME,
         version = ModInfo.MOD_VERSION,
-        acceptedMinecraftVersions = ModInfo.MC_VERSIONS
-        //dependencies = ModInfo.DEPENDENCIES,
+        acceptedMinecraftVersions = ModInfo.MC_VERSIONS,
+        dependencies = ModInfo.DEPENDENCIES
         //guiFactory = ModInfo.GUI_FACTORY,
         //updateJSON = ModInfo.UPDATE_JSON
 )
diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java
index 8e003718..fa3ba403 100644
--- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java
+++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java
@@ -18,8 +18,10 @@ public class ModInfo {
     public static final String MOD_NAME = "Kitsu's ForgeCraft";
     //public static final String MOD_PREFIX = MOD_ID + ":";
     public static final String MOD_CHANNEL = MOD_ID;
-    public static final String MOD_VERSION = "1.1.12";
+    public static final String MOD_VERSION = "1.1.2";
     public static final String MC_VERSIONS = "[1.11.0, 1.12.0)";
+    public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2226,);"
+            + "after:primal;";
 
     /** Mod Structures **/
     public static final String SERVER_PROXY = "nmd.primal.forgecraft.proxy.ServerProxy";
diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/PickaxePart.java b/1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/PickaxePart.java
index 6935a450..00679b4d 100644
--- a/1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/PickaxePart.java
+++ b/1.11/src/main/java/nmd/primal/forgecraft/items/toolparts/PickaxePart.java
@@ -36,12 +36,31 @@ public class PickaxePart extends ToolPart {
             {
                 if (item.hasTagCompound()) {
                     if (item.getSubCompound("tags").getBoolean("hot") == true) {
-                        return 1.0F;
+                        if (item.getSubCompound("tags").getInteger("modifiers") >= 0) {
+                            if ( (item.getSubCompound("tags").getBoolean("emerald") == false) &&
+                                    (item.getSubCompound("tags").getInteger("diamond") >= 0) &&
+                                    (item.getSubCompound("tags").getInteger("redstone") >= 0) &&
+                                    (item.getSubCompound("tags").getInteger("lapis") >= 0)) {
+                                return 1.0F;
+                            }
+                            if ( item.getSubCompound("tags").getBoolean("emerald") == true &&
+                                    (item.getSubCompound("tags").getInteger("diamond") >= 0) &&
+                                    (item.getSubCompound("tags").getInteger("redstone") >= 0) &&
+                                    (item.getSubCompound("tags").getInteger("lapis") >= 0)) {
+                                return 1.0F;
+                            }
+                        }
                     }
 
                     if (item.getSubCompound("tags").getBoolean("hot") == false) {
-                        if (item.getSubCompound("tags").getInteger("modifiers") == 0) {
-                            return 0.0F;
+                        if (item.getSubCompound("tags").getInteger("modifiers") >= 0) {
+                            if ( (item.getSubCompound("tags").getBoolean("emerald") == false) ||
+                                    (item.getSubCompound("tags").getBoolean("emerald") == true) &&
+                                            (item.getSubCompound("tags").getInteger("diamond") >= 0) &&
+                                            (item.getSubCompound("tags").getInteger("redstone") >= 0) &&
+                                            (item.getSubCompound("tags").getInteger("lapis") >= 0)) {
+                                return 0.0F;
+                            }
                         }
                     }
 
diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java
index 08f6ba68..ef4757b5 100644
--- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java
+++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java
@@ -142,7 +142,7 @@ public class TileForge extends TileBaseSlot implements ITickable {
                     if (cookCounter4 >= recipe.getIdealTime()) {
                         if(this.getSlotStack(i).hasTagCompound()){
                             this.getSlotStack(i).getSubCompound("tags").setBoolean("hot", true);
-                            //System.out.println("its hot now");
+                            System.out.println("its hot now");
                         } else this.setSlotStack(i, recipe.getOutput());
                         cookCounter4 = 0;
                     }
diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead.json
index a6604456..1cc7c4ab 100644
--- a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead.json
+++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead.json
@@ -1,13 +1,14 @@
 {
   "parent": "forgecraft:item/pickaxehead",
   "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"
   },
   "overrides": [
     {"predicate": {"type": 0.0},"model": "forgecraft:item/ironpickaxehead_0"},
-    {"predicate": {"type": 1.0},"model": "forgecraft:item/ironpickaxehead_1"}
+    {"predicate": {"type": 1.0},"model": "forgecraft:item/ironpickaxehead_1"},
+    {"predicate": {"type": 0.1},"model": "forgecraft:item/ironpickaxehead_2"}
   ]
 }
 
diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_0.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_0.json
index 96a1fba6..e50ffec3 100644
--- a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_0.json
+++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_0.json
@@ -1,8 +1,8 @@
 {
   "parent": "forgecraft:item/pickaxehead",
   "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"
   }
 }
diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_1.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_1.json
index 210322ec..880353b2 100644
--- a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_1.json
+++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_1.json
@@ -1,8 +1,8 @@
 {
   "parent": "forgecraft:item/pickaxehead",
   "textures": {
-    "particle": "forgecraft:blocks/iron_ingot_hot",
+    "particle": "forgecraft:items/iron_ingot_hot",
     "texture": "blocks/planks_oak",
-    "texture1": "forgecraft:blocks/iron_ingot_hot"
+    "texture1": "forgecraft:items/iron_ingot_hot"
   }
 }
diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_2.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_2.json
new file mode 100644
index 00000000..57834056
--- /dev/null
+++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_2.json
@@ -0,0 +1,8 @@
+{
+  "parent": "forgecraft:item/pickaxehead",
+  "textures": {
+    "particle": "forgecraft:items/iron_ingot_emerald1",
+    "texture": "blocks/planks_oak",
+    "texture1": "forgecraft:items/iron_ingot_emerald1"
+  }
+}
diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/iron_ingot.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/iron_ingot.png
index b6739c167607c4c3c59fe15e6aa8a101cdbb1b01..e371011d9d833a1137de181f6bf63a67c5a68139 100644
GIT binary patch
delta 671
zcmV;Q0$}~h1?2^hQhx&u05$|T!a4{500MGJL_t(I%RQ4zPr^VHg}-U1owh0EQHll<
zW#Psj@1Jq25FxUVMv&Gr4AX}TL+|n?Hz((O=Zcq?m+tQFj`e!Y@9!_q&(8o<RYjVn
zSZmpAHr(IeBc;R`Ll6X5Ygw&U$T*IvstSNC%K$hYj|_)H0DoRzUwL|ZBF}RGhQlGp
z;}L5ukB^VYpPwJPuEY0zT-PPfbLzUr^E_6o6|>n4Aq1Z10dP8<7z_s7M%HzWQVQ2~
z>AH?E3;{SC4k)Eal7u|Z$+8S<EoE7fWf?&b0N_lgQ|h|L7z2PYhN37KkH?J1V-AM{
zaU4^YC6~(urGFIb^%{UANss`(?*pKeLTimu3MnP$^O+zBkWy0DH9`nRqY<v_vfJ(G
zx(>%$i|_k*p2vQ_#~6bU0<AS+7^0LS&-31zwYCrV^YarY%QB2HoK7cZvl*k&h`O$c
zqKK-hXqtxUbPCX06++OqEtAOv=X$*|o6S&4aXz0Z%YPEBHC@*MaJgLQx{k6eDT;!k
zD5$E6APD~LZMR!)IY=pq<Cr*(Y1<ah^Ln)?iU1f42E4t!@$m3~)*887E&=%Z`oi-(
zwAR#h-E+S6<3?vPnUJO_Qc6an5e`5UMKn#*A9<cfk|Y3Juh)Jb$8nEaYyDrOn{t|_
zY&IJfi+=?GZQCM*Ac`XP`#ouz;`=^A2*NNV3`5@E-*M*iIa+HzK0fHWj?HF+QVPd$
zkW!+x?kQMnF~$(bF{jgs`FxJNJ<@PE<n~zK-`^;uXxkR06aY=r;5ZIRlCazD7z_p!
zMe(1(tr$RGn47KZ^@<RJ<#Ne#xn#TD(liZ=#TWu(41f5QIPh_QSW*B0002ovPDHLk
FV1nuQJ9Yp7

delta 643
zcmV-}0(|}D1<D1GQhx#m03{iELveWk00LJ@L_t(I%T1HbPOLx>g};WT8^X`XfR094
zxbW3|B)1Nc$(RUn2#EamU6>)alUj5om8w(UDe?OHYHn|D$@83_pC4XcUI6I2jyR5)
z=b54?xVyW<wr$37L~G4F&m50Or0@H5T?astBmmTPO&Ep%ynnsD@%;QuRaF3lVMtxq
zOw+{E(-X3;Ym6~Cj)QI6R8_^YEJ!KI^PDtI5kerP1fXdeeBbB#<gzR%rLb)qV+^kA
z0&uxpP)ZSoAyrk8Bni_rQI;i1lAyH)z}oNk%=64J3;>MdNZYpTb~|>v9hb`m-}h<T
zmSGssT9fBF0DnOcU;!wlwz&SKluXlv)*9Qk0T4nEMG;{baz3AFng(l{CLG5>N=aFk
zjN^z9g1+x@T^FSkRaI@$=6NQHA^^_kGggu$jN?etG^A-t6h+MQjOTfDUB|L4?DzYv
zco+tR5Ex^)xw-k9AWc)0QvCk@(zY#q-(!pcU>F9BF@LmeyG7S^Xsyv&BTuIjz$U}@
zeU@cmT~{2(*}8e2w=M4d{hi0hNBX`;W?2Tn*Vh+PO8UNMp689TQVPqmHac+}6UQ;O
zZ4*V&9|h0zSe9igavW!K;y8|5-uL|tci;DaM!I&6<Cvl-czAdKU|m;)5O|(PS(e0c
zyh(Ch7kt-sIUbK#hr@xs@A>%nz!*bO6x-NWN&izA#}VK6X_|(^;efmzQWQm859|B;
z8>JNMx^CuL*A>gM2!epm&rgCNpl#c~9bAn8Y=&_hhd7RzrU@YgS(cGy8K={UWm&kt
dzh@W*{sFb6HNLOXvE~2(002ovPDHLkV1mS+HvRwr

diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ce063f039d83f3deec9d67706c18f3b2a5eb269
GIT binary patch
literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;R6l;HY5YA8o&Sm0&+=2
zK~y-)J(EjM!ax*-ziFqPwkhRNiUty8;l>~DpK+@YA+nH0kk&E`(}xQ~@A4)$C+B?U
zikFv{?(Xi6^?J?k?=R2K&j3_aMVh8qYuRiz+~40LrNkIR5Cm9jS*=#cIF6~R3V<xj
z05~3x42MGiUSD5%dU_(ya{z|JA;;qpYb}qDkI0{&AG)r?_kCQ~CC_u}y2kT7R;v}W
z*$g2Bp63B@I-M8{2HZy0b&XOA*LCT-jxY=XI2;ZrrAU&5JkQCp3~McAS(0TLK@b4o
zOs7-oy2cm-fH8)mC>W2&jK^aRhXZjOQ<f!{%LSzr>-8FdBuS6}zV8E|ltOEbQVJ<0
z=ku8$2#``z*EK>2Mxzm~>$2PJ=(-NaT8r=dc%H|8zsDGZ5CW|=VHl#6BG2>QnzgnM
z`1A7<C(AO7F`P~(X0sWi(TKXPiK2+As%V;q>2wOvTNOgkwk?y%1m}9aGMmj%N^w4)
zDa#VAHC@*MaJgLQx{k6eDT;!kD5$E6APD~LZMR!)IY=pq<Cr*(Y1<ah^Ln)?iU1f4
z2E4t!@$m3~)*887E&=%Z`oi-(wAR#h-E+S6<3?vPnUJO_Qc6an5e`5UMKn#*A9<cf
zk|Y3Juh)Jb$8nEaYyDrOn{t|_Y&IJfiv<8}+aiP@iX!&=J!zWa`#wSl!Z0KZL*C!t
zapv<mT5CQ&KIpoR&1QpA3deDfQlho)DOhVU#t_Fbr_+h~e2%<5(r`HB_E_KF-zcSM
z+ZLr108P{2I1WjYu-okz3<eZM@t?u17(ic`o2~2hiV%Y3a>;VJWV_wcG!2Wz0%Ht+
X_?0;Daer7+00000NkvXXu0mjf(*#Ib

literal 0
HcmV?d00001

diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1.png
new file mode 100644
index 0000000000000000000000000000000000000000..76c11db459f15ddf9b8e75fdac71d5406b024e9a
GIT binary patch
literal 912
zcmV;B18@9^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;R6l;EE((RtO@`C106|3
zK~y-)1;NWw8fgH4(Xao$(DaQKFDMSd0fnfEnW-@4CY5FKT9YT32boo>vdSt|W+!EZ
zsHjLqP*l7OAYgX`-7x1!pZ@tYGk!DZo%UEVmWb?#zzHbIMdnPGP()lcuehGO#_Cz*
z+#IoZj4%jkUNw<E|ND7{2H#rWh|6)_rQflCv5%uTj9-k2RWv4cNH^+INET@K+l(2L
zvvOFjh0^c$nJQEMjQ&7%HTJIeD4In~$>hFvPa>VbwrvLf076)qEpw?|p%@DF%Q_+)
zhbTfpTZ+LD-p;?J-D}eu_Rt&+d(NhOTE;eQbY17rKf($vl6sPz^&LcK+@W?^qw-Jz
z9Y%u@%WjJ6*foiGf`jS-uhw62&^n;(l~FVWRZ{s8{=gCz%5Z7OX5u9?6|||w;nN}N
zNM)zEL#0_^bM+;%DpRlu{CfPwc4~`3H01W`mVIX*Wn0~*ep_d3jY&l*)|@Pw5hL&d
zgd?bh=lI7yrL7WqInN{(l9(l+5AM`O%+JsBV(A3~e?Twj;W!DxVTfTE<j66RCpeZv
z?Y_q0;E=I5=45cfMq&fkO(2fXk6CaRcr*WofjnT?A98YcLglFf3W!HRK9k4uJi^D2
zpRJ#a{1L5Ai_`HLa%s2pw;ajHq0F+ijNuv#pNAmeM!i9nWrlY{q_~8HL}|T**YOBv
zA)Cof#QV~FGAkL*qB9zg4T2!Rk9@Lb7NcdLc^dg_o<IrkeIGTZGH1?FNEdK)2Za!t
z-6ln;h@RG&OeSbT!;aakEw9mNHz0)V_!g7QglfIYVr-G>WtG%o3i0stz+Lx_8~uiI
zt&FLfyxw??6v4%R7euQOd)+-0O(kv`tf$w}T^+F?(1eCat)$4rGjtjqX0sXJtKZQ=
zjau)VLb||cG9n$MVG5BSQF*FhX(m}IOKLHN;`Kf1{W>BoNCrt(7gy;%cgeXqM$riS
z*(Sf5=csdp=4tG1?$U0xx%F>}*)bFpu;VsqJxwcYp@%xbG@#LGAT+`6<{HvS;=|4d
m5b)*e7ZC9Aua7hzn*0w&Rb3Q9D2RUm0000<MNUMnLSTYva;Jm<

literal 0
HcmV?d00001

diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_hot.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_hot.png
new file mode 100644
index 0000000000000000000000000000000000000000..650f935dc1d2373cf505da3da0690c51e7c71c5f
GIT binary patch
literal 801
zcmV++1K#|JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Q|a66C2X|+2a5J0<K9!
zK~y-)MUz`^6IT$&f9JBh-nAXaS!3s(kO)OVeV|ca`qr=0uhcKnFHj)?570oNB7sN*
z5^||yVz2jd_MFp)4PjnJ8qH|te;IN5$L~H^e?<AuGwR8h<d@$7u(vmaE9<zbqWJd}
z(bgl-A->FzNe5q+<cH7DvNym^ZvY539s*EbpP~Ch0J6XSB!2QM=F15HYH5U-o#U&V
z=<(0!`r-`XEh3B&D!`ndKvm&%NdEc-!R9VrC}_2s%f=U|UWyB20JOITnZ%$%@D3Gs
zAqI2x1=&u}OGC`(kLdLse34UKT@$Q5L?vASWU#u0FG_qi1;ABv%;Z1xU==-BrT+RE
zwV2{2m-u3e>~zRqzi77i2S@;sv=K=g86^$QBt`}y-sFgO7jy^!LK37SbULIuenUOJ
zMEW8}gfUWwn6nSqc@9Ei^C>c3Kt>7m`A1~D0Dw0oYPbSGb^Hbyu5IJXjCy=Yu)0f-
zj&MbV>@H$wH~88RjJ6thMTN~Wgb?5zdU+k~%7S2Rm+JIAcK!{@3Rh%^I=vg3AzK~X
z%@uYsZis7zh;|p5bkN27!=@Ow5IREkQe<Ut&Nb5BZIj(aG@$wqC=Q<z?mfX~Q*`U`
z0RZOH5h93ivs=6=`5q!l5K`f)IraD&y|Rf~-a@E=ARRR-s7?=W&5xllMlUr^bmjcM
zuKP>(a@$#xwfS^})gi%y4a%dJggZYq-L3{HQArPT_5nTIL<BKjDpa?Nj2D<6K1W8|
zd)RzR{`Mu#K=JMsGEP8hgpP3e?Y#=VF7aiC>ZRE61=02%+J3uxq|pf38{lron6Iae
zsa%Z=8*_PQL2C5kfa>HevOlDrT;Fk!uH564oyIVt6%#CP;7oy+iq`%Ct^EVa<G=CN
f5bf;avnl@rk#;Ibu8O*Y00000NkvXXu0mjfz`bnB

literal 0
HcmV?d00001

diff --git a/1.11/src/main/resources/mcmod.info b/1.11/src/main/resources/mcmod.info
index 2f837b98..74ab18a8 100644
--- a/1.11/src/main/resources/mcmod.info
+++ b/1.11/src/main/resources/mcmod.info
@@ -2,7 +2,7 @@
   "modid": "forgecraft",
   "name": "Kitsu's Forgecraft",
   "description": "Forged with sweat and blood",
-  "version": "1.1.12",
+  "version": "1.1.2",
   "mcversion": "1.11.2",
   "url": "",
   "updateUrl": "",