adding texture for pickaxehead

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
 

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

1.11/fireboxV3.json

@@ -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" }
-			}
-		}
-	]
-}

1.11/firebox_litV3.json

@@ -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" }
-			}
-		}
-	]
-}

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

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
+        acceptedMinecraftVersions = ModInfo.MC_VERSIONS,
-        //dependencies = ModInfo.DEPENDENCIES,
+        dependencies = ModInfo.DEPENDENCIES
         //guiFactory = ModInfo.GUI_FACTORY,
         //updateJSON = ModInfo.UPDATE_JSON
 )

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

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) {
+                        if (item.getSubCompound("tags").getInteger("modifiers") >= 0) {
-                            return 0.0F;
+                            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;
+                            }
                         }
                     }
 

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;
                     }

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"}
   ]
 }
 

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"
   }
 }

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"
   }
 }

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"
+  }
+}

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