diff --git a/1.11/To-Dos b/1.11/To-Dos index 451b1c27..4758b2a2 100644 --- a/1.11/To-Dos +++ b/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 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..d577f41e 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 @@ -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("lapis") == 2)) { - return 0.0012F; + (item.getSubCompound("tags").getInteger("redstone") == 2) && + (item.getSubCompound("tags").getInteger("lapis") == 1)) { + 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; } 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 ef4757b5..7a2ce8eb 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 @@ -141,8 +141,12 @@ 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"); + 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; } 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 1cc7c4ab..599cfddb 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 @@ -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.1},"model": "forgecraft:item/ironpickaxehead_2"} + {"predicate": {"type": 0.0001},"model": "forgecraft:item/ironpickaxehead_13"}, + {"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"} + ] } diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_10.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_10.json new file mode 100644 index 00000000..557fc7f6 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_11.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_11.json new file mode 100644 index 00000000..1be654dd --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_12.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_12.json new file mode 100644 index 00000000..b7dadbc9 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_13.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_13.json new file mode 100644 index 00000000..d1fc932a --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_14.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_14.json new file mode 100644 index 00000000..82a4f211 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_15.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_15.json new file mode 100644 index 00000000..101a0483 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_16.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_16.json new file mode 100644 index 00000000..ade51451 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_17.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_17.json new file mode 100644 index 00000000..b936072d --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_18.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_18.json new file mode 100644 index 00000000..904a4216 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_19.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_19.json new file mode 100644 index 00000000..4b756d83 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_20.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_20.json new file mode 100644 index 00000000..e2457de2 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_21.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_21.json new file mode 100644 index 00000000..c13ba507 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_3.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_3.json new file mode 100644 index 00000000..5eed50fc --- /dev/null +++ b/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" + } +} diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_4.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_4.json new file mode 100644 index 00000000..1bd75c9c --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_5.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_5.json new file mode 100644 index 00000000..b0550d69 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_6.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_6.json new file mode 100644 index 00000000..afc90606 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_7.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_7.json new file mode 100644 index 00000000..2e119ae9 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_8.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_8.json new file mode 100644 index 00000000..735d8bd0 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_9.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironpickaxehead_9.json new file mode 100644 index 00000000..d070bee2 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead.json b/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead.json index edd1c1db..30ca9de9 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/pickaxehead.json +++ b/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": [ { diff --git a/1.11/src/main/resources/assets/forgecraft/textures/diamondLayer1.png b/1.11/src/main/resources/assets/forgecraft/textures/diamondLayer1.png new file mode 100644 index 00000000..b9466818 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/diamondLayer1.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/diamondLayer2.png b/1.11/src/main/resources/assets/forgecraft/textures/diamondLayer2.png new file mode 100644 index 00000000..95abb41d Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/diamondLayer2.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/diamondLayer3.png b/1.11/src/main/resources/assets/forgecraft/textures/diamondLayer3.png new file mode 100644 index 00000000..c4abd9e5 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/diamondLayer3.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1.png new file mode 100644 index 00000000..b59f7b1f Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1_lapis2.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1_lapis2.png new file mode 100644 index 00000000..64763335 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1_lapis2.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1_redstone1_lapis1.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1_redstone1_lapis1.png new file mode 100644 index 00000000..f43503eb Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1_redstone1_lapis1.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1_redstone2.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1_redstone2.png new file mode 100644 index 00000000..d1dc300c Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond1_redstone2.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond2.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond2.png new file mode 100644 index 00000000..61217b9a Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond2.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond2_redstone1.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond2_redstone1.png new file mode 100644 index 00000000..debf93de Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond2_redstone1.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond3.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond3.png new file mode 100644 index 00000000..7d3d520e Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_diamond3.png differ 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 index 76c11db4..1a132cb1 100644 Binary files a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1.png and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_diamond1.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_diamond1.png new file mode 100644 index 00000000..f45367a8 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_diamond1.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_diamond1_redstone1.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_diamond1_redstone1.png new file mode 100644 index 00000000..a9aa28b3 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_diamond1_redstone1.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_diamond2.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_diamond2.png new file mode 100644 index 00000000..15137582 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_diamond2.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_redstone2.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_redstone2.png new file mode 100644 index 00000000..4d92cb5d Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_emerald1_redstone2.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_lapis1.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_lapis1.png new file mode 100644 index 00000000..eaf3decd Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_lapis1.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_lapis2.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_lapis2.png new file mode 100644 index 00000000..35780684 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_lapis2.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_lapis3.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_lapis3.png new file mode 100644 index 00000000..e2c9b607 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_lapis3.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone1.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone1.png new file mode 100644 index 00000000..84acb28f Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone1.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone1_lapis2.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone1_lapis2.png new file mode 100644 index 00000000..629a0688 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone1_lapis2.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone2.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone2.png new file mode 100644 index 00000000..41454718 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone2.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone2_lapis1.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone2_lapis1.png new file mode 100644 index 00000000..e69adab0 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone2_lapis1.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone3.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone3.png new file mode 100644 index 00000000..cc5389da Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot_redstone3.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/lapisLayer1.png b/1.11/src/main/resources/assets/forgecraft/textures/lapisLayer1.png new file mode 100644 index 00000000..85256e59 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/lapisLayer1.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/lapisLayer2.png b/1.11/src/main/resources/assets/forgecraft/textures/lapisLayer2.png new file mode 100644 index 00000000..353e295e Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/lapisLayer2.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/lapisLayer3.png b/1.11/src/main/resources/assets/forgecraft/textures/lapisLayer3.png new file mode 100644 index 00000000..e78373da Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/lapisLayer3.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/redstoneLayer1.png b/1.11/src/main/resources/assets/forgecraft/textures/redstoneLayer1.png new file mode 100644 index 00000000..7ca9ab28 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/redstoneLayer1.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/redstoneLayer2.png b/1.11/src/main/resources/assets/forgecraft/textures/redstoneLayer2.png new file mode 100644 index 00000000..22cea903 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/redstoneLayer2.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/redstoneLayer3.png b/1.11/src/main/resources/assets/forgecraft/textures/redstoneLayer3.png new file mode 100644 index 00000000..dc1a14b3 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/redstoneLayer3.png differ