Added ingot/block/nuggets for copper and aluminum, add tinkers as dep…

…endency, bump forge and mantle versions up (1.10.2)

build.gradle

@@ -103,6 +103,7 @@ dependencies {
     // you may put jars on which you depend on in ./libs
     // or you may define them like so..
     deobfCompile "slimeknights.mantle:Mantle:${config.minecraft_version}-${config.mantle_version}"
+    deobfCompile "slimeknights:TConstruct:${config.minecraft_version}-${config.tinkers_version}"
     deobfCompile "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}"
     deobfCompile "mcp.mobius.waila:Waila:${config.waila_version}_1.9.4"
     deployerJars 'org.apache.maven.wagon:wagon-ssh:2.2'

build.properties

@@ -1,7 +1,8 @@
 mod_version=2.0
-minecraft_version=1.10
-forge_version=12.18.0.2000-1.10.0
+minecraft_version=1.10.2
+forge_version=12.18.1.2011
 mappings=snapshot_20160705
-mantle_version=0.10.3.jenkins157
+mantle_version=0.10.3.jenkins161
+tinkers_version=2.3.3a.jenkins296
 jei_version=3.7.+
 waila_version=1.7.0-B3

resources/assets/tmechworks/blockstates/drawbridge.json

@@ -2,18 +2,11 @@
   "forge_marker": 1,
   "defaults": {
     "transform": "forge:default-block",
-    "model": "cube_all",
-    "textures": {
-      "all": "tmechworks:blocks/machines/drawbridge_side",
-      "particle": "#all"
-    }
+    "model": "tmechworks:drawbridge"
   },
   "variants": {
-    "inventory": {
-      "model": "tmechworks:drawbridge"
-    },
     "type=normal": {
-      "model": "tmechworks:drawbridge"
+      "model": "tmechworks:testcube"
     },
     "facing=north,type=normal": {
       "model": "tmechworks:drawbridge",
@@ -40,6 +33,9 @@
       "model": "tmechworks:drawbridge",
       "x": 180
     },
+    "type=advanced": {
+      "model": "tmechworks:drawbridge_advanced"
+    },
     "facing=north,type=advanced": {
       "model": "tmechworks:drawbridge_advanced",
       "x": -90
@@ -65,6 +61,9 @@
       "model": "tmechworks:drawbridge_advanced",
       "x": 180
     },
+    "type=extended": {
+      "model": "tmechworks:drawbridge_extended"
+    },
     "facing=north,type=extended": {
       "model": "tmechworks:drawbridge_extended",
       "x": -90

resources/assets/tmechworks/blockstates/firestarter.json

@@ -9,6 +9,9 @@
     }
   },
   "variants": {
+    "inventory": {
+      "model": "tmechworks:firestarter"
+    },
     "extinguish=false,facing=north": {
       "model": "tmechworks:firestarter",
       "x": 90

resources/assets/tmechworks/blockstates/ingots.json

@@ -0,0 +1,23 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "transform": "forge:default-item",
+    "model": "forge:item-layer"
+  },
+  "variants": {
+    "aluminum": [
+      {
+        "textures": {
+          "layer0": "tmechworks:items/materials/ingot_aluminum"
+        }
+      }
+    ],
+    "copper": [
+      {
+        "textures": {
+          "layer0": "tmechworks:items/materials/ingot_copper"
+        }
+      }
+    ]
+  }
+}

resources/assets/tmechworks/blockstates/metal.json

@@ -0,0 +1,21 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "transform": "forge:default-block",
+    "model": "cube_all"
+  },
+  "variants": {
+    "type": {
+      "aluminum": {
+        "textures": {
+          "all": "tmechworks:blocks/block_aluminum"
+        }
+      },
+      "copper": {
+        "textures": {
+          "all": "tmechworks:blocks/block_copper"
+        }
+      }
+    }
+  }
+}

resources/assets/tmechworks/blockstates/nuggets.json

@@ -0,0 +1,23 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "transform": "forge:default-item",
+    "model": "forge:item-layer"
+  },
+  "variants": {
+    "aluminum": [
+      {
+        "textures": {
+          "layer0": "tmechworks:items/materials/nugget_aluminum"
+        }
+      }
+    ],
+    "copper": [
+      {
+        "textures": {
+          "layer0": "tmechworks:items/materials/nugget_copper"
+        }
+      }
+    ]
+  }
+}

resources/assets/tmechworks/lang/en_US.lang

@@ -1,7 +1,23 @@
 # Blocks
+## Machines
 tile.tmechworks.drawbridge.normal.name=Drawbridge
 tile.tmechworks.drawbridge.advanced.name=Advanced Drawbridge
 tile.tmechworks.drawbridge.extended.name=Extended Drawbridge
+tile.tmechworks.firestarter.name=Firestarter
+
+## Compressed Blocks
+tile.tmechworks.metal.aluminum.name=Aluminum Block
+tile.tmechworks.metal.copper.name=Copper Block
+
+# Items
+## Ingots
+item.tmechworks.ingots.aluminum.name=Aluminum Ingot
+item.tmechworks.ingots.copper.name=Copper Ingot
+
+## Nuggets
+item.tmechworks.nuggets.aluminum.name=Aluminum Nugget
+item.tmechworks.nuggets.copper.name=Copper Nugget
+
 
 # Creative Tabs
 itemGroup.TabMechworks=Tinkers' Mechworks

resources/assets/tmechworks/models/block/machine_base.json

@@ -1,24 +1,5 @@
 {
   "parent": "block/cube",
-  "display": {
-    "firstperson_righthand": {
-      "rotation": [
-        0,
-        135,
-        0
-      ],
-      "translation": [
-        0,
-        0,
-        0
-      ],
-      "scale": [
-        0.4,
-        0.4,
-        0.4
-      ]
-    }
-  },
   "textures": {
     "particle": "#side",
     "down": "#back",

resources/assets/tmechworks/models/block/testcube.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "tmechworks:blocks/machines/drawbridge_face"
+  }
+}

src/main/java/slimeknights/tmechworks/TMechworks.java

@@ -35,13 +35,13 @@ public class TMechworks
         {
             new WailaIntegration();
         }
+
+        content = new MechworksContent();
     }
 
     @Mod.EventHandler public void init (FMLInitializationEvent event)
     {
         proxy.init();
-
-        content = new MechworksContent();
     }
 
     @Mod.EventHandler public void postInit (FMLInitializationEvent event)

src/main/java/slimeknights/tmechworks/blocks/Metal.java

@@ -0,0 +1,39 @@
+package slimeknights.tmechworks.blocks;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.util.IStringSerializable;
+import slimeknights.mantle.block.EnumBlock;
+import slimeknights.tmechworks.common.MechworksContent;
+
+import java.util.Locale;
+
+public class Metal extends EnumBlock<Metal.MetalTypes>
+{
+    public static final PropertyEnum<MetalTypes> TYPE = PropertyEnum.create("type", MetalTypes.class);
+
+    public Metal ()
+    {
+        super(Material.IRON, TYPE, MetalTypes.class);
+
+        setHardness(5F);
+        setResistance(10F);
+        setHarvestLevel("pickaxe", -1);
+        setCreativeTab(MechworksContent.tabMechworks);
+    }
+
+    public enum MetalTypes implements IStringSerializable, EnumBlock.IEnumMeta
+    {
+        ALUMINUM, COPPER;
+
+        @Override public String getName ()
+        {
+            return this.toString().toLowerCase(Locale.US);
+        }
+
+        @Override public int getMeta ()
+        {
+            return ordinal();
+        }
+    }
+}

src/main/java/slimeknights/tmechworks/client/ClientProxy.java

@@ -17,18 +17,22 @@ public void preInit ()
     public void init ()
     {
         super.init();
-        registerModels();
     }
 
     public void postInit ()
     {
         super.postInit();
+        registerModels();
     }
 
     protected void registerModels ()
     {
+        MechworksContent.ingots.registerItemModels();
+        ;
+        MechworksContent.nuggets.registerItemModels();
+
         registerItemBlockMeta(MechworksContent.drawbridge);
-        registerItemBlockMeta(MechworksContent.firestarter);
+        registerItemBlockMeta(MechworksContent.metals);
     }
 
     protected void registerItemBlockMeta (Block block)

src/main/java/slimeknights/tmechworks/common/MechRecipes.java

@@ -0,0 +1,83 @@
+package slimeknights.tmechworks.common;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.ShapedOreRecipe;
+import net.minecraftforge.oredict.ShapelessOreRecipe;
+
+public class MechRecipes
+{
+    protected static void register ()
+    {
+        registerMetalRecipes("Aluminum", MechworksContent.ingotAluminum, MechworksContent.nuggetAluminum, MechworksContent.blockAluminum);
+        registerMetalRecipes("Copper", MechworksContent.ingotCopper, MechworksContent.nuggetCopper, MechworksContent.blockCopper);
+    }
+
+    private static void registerMetalRecipes (String oreString, ItemStack ingot, ItemStack nugget, ItemStack block)
+    {
+        if (ingot == null)
+            return;
+
+        oredict(ingot, "ingot" + oreString);
+
+        if (nugget != null)
+        {
+            oredict(nugget, "nugget" + oreString);
+
+            registerCompressionRecipe(nugget, ingot, "nugget" + oreString, "ingot" + oreString);
+        }
+
+        if (block != null)
+        {
+            oredict(block, "block" + oreString);
+
+            registerCompressionRecipe(ingot, block, "ingot" + oreString, "block" + oreString);
+        }
+    }
+
+    private static void registerCompressionRecipe (ItemStack small, ItemStack big, String oreSmall, String oreBig)
+    {
+        // Small -> Big
+        GameRegistry.addRecipe(new ShapedOreRecipe(big, "###", "###", "###", '#', oreSmall));
+
+        small = small.copy();
+        small.stackSize = 9;
+
+        // Big -> Small
+        GameRegistry.addRecipe(new ShapelessOreRecipe(small, oreBig));
+    }
+
+    public static void oredict (Item item, String... name)
+    {
+        oredict(item, OreDictionary.WILDCARD_VALUE, name);
+    }
+
+    public static void oredict (Block block, String... name)
+    {
+        oredict(block, OreDictionary.WILDCARD_VALUE, name);
+    }
+
+    public static void oredict (Item item, int meta, String... name)
+    {
+        oredict(new ItemStack(item, 1, meta), name);
+    }
+
+    public static void oredict (Block block, int meta, String... name)
+    {
+        oredict(new ItemStack(block, 1, meta), name);
+    }
+
+    public static void oredict (ItemStack stack, String... names)
+    {
+        if (stack != null && stack.getItem() != null)
+        {
+            for (String name : names)
+            {
+                OreDictionary.registerOre(name, stack);
+            }
+        }
+    }
+}