Merged 1.9 into 1.10

Team-IO · Oct 3, 2016 · f9551cc · f9551cc
2 parents a1fd768 + 7f8d542
commit f9551cc
Show file tree

Hide file tree

Showing 17 changed files with 967 additions and 598 deletions.
diff --git a/common/net/teamio/taam/Taam.java b/common/net/teamio/taam/Taam.java
@@ -387,6 +387,9 @@ public static enum ITEM_MATERIAL_META {
 		rubber_bar,
 		graphite,
 		iron_nugget,
+		aluminum_nugget,
+		copper_nugget,
+		tin_nugget,
 		silicon_wafer,
 		wooden_board,
 		aluminum_plate,

diff --git a/common/net/teamio/taam/TaamMain.java b/common/net/teamio/taam/TaamMain.java
@@ -551,6 +551,10 @@ public void readNBT(Capability<IAdvancedMachineGUI> capability, IAdvancedMachine
 			throw new RuntimeException("Registering a capability failed (Taam.CAPABILITY_ADVANCED_GUI - IAdvancedMachineGUI) - field was null after registry.");
 		}
 
+		/*
+		 * Sounds
+		 */
+
 		soundSipAh = new SoundEvent(Taam.SOUND_SIP_AH);
 		soundSipAh.setRegistryName(Taam.SOUND_SIP_AH);
 		GameRegistry.register(soundSipAh);
@@ -572,14 +576,23 @@ public void init(FMLInitializationEvent event) {
 		proxy.registerRenderStuff();
 		NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
 
-		/*
+		/*
 		 * Recipe Stuff
 		 */
-
+
+		// Register things with the ore dictionary
 		oreRegistration();
-		TaamRecipes.addRecipes();
-		TaamRecipes.addSmeltingRecipes();
-		TaamRecipes.addOreRecipes();
+
+		// Machine Recipes
+		TaamRecipesCrusher.registerRecipes();
+		TaamRecipesFluidDrier.registerRecipes();
+		TaamRecipesGrinder.registerRecipes();
+		TaamRecipesMixer.registerRecipes();
+		TaamRecipesSprayer.registerRecipes();
+
+		// Smelting & Crafting
+		TaamRecipes.registerSmeltingRecipes();
+		TaamRecipes.registerCraftingRecipes();
 
 	}
 
@@ -606,15 +619,21 @@ public static void oreRegistration() {
 		OreDictionary.registerOre("dustKaolinite", new ItemStack(itemDust, 1, Taam.BLOCK_ORE_META.kaolinite.ordinal()));
 		OreDictionary.registerOre("dustGold", new ItemStack(itemDust, 1, Taam.BLOCK_ORE_META.gold.ordinal()));
 		OreDictionary.registerOre("dustCoal", new ItemStack(itemDust, 1, Taam.BLOCK_ORE_META.coal.ordinal()));
+		OreDictionary.registerOre("dustStone", new ItemStack(itemDust, 1, Taam.BLOCK_ORE_META.stone.ordinal()));
 
 		OreDictionary.registerOre("nuggetIron", new ItemStack(itemMaterial, 1, Taam.ITEM_MATERIAL_META.iron_nugget.ordinal()));
+		OreDictionary.registerOre("nuggetCopper", new ItemStack(itemMaterial, 1, Taam.ITEM_MATERIAL_META.copper_nugget.ordinal()));
+		OreDictionary.registerOre("nuggetAluminum", new ItemStack(itemMaterial, 1, Taam.ITEM_MATERIAL_META.aluminum_nugget.ordinal()));
+		OreDictionary.registerOre("nuggetTin", new ItemStack(itemMaterial, 1, Taam.ITEM_MATERIAL_META.tin_nugget.ordinal()));
 
 		OreDictionary.registerOre("materialPlastic", new ItemStack(itemMaterial, 1, Taam.ITEM_MATERIAL_META.plastic_sheet.ordinal()));
 		OreDictionary.registerOre("materialRubber", new ItemStack(itemMaterial, 1, Taam.ITEM_MATERIAL_META.rubber_bar.ordinal()));
 		OreDictionary.registerOre("itemRubber", new ItemStack(itemMaterial, 1, Taam.ITEM_MATERIAL_META.rubber_bar.ordinal()));
 		OreDictionary.registerOre("materialGraphite", new ItemStack(itemMaterial, 1, Taam.ITEM_MATERIAL_META.graphite.ordinal()));
 		OreDictionary.registerOre("materialSiliconWafer", new ItemStack(itemMaterial, 1, Taam.ITEM_MATERIAL_META.silicon_wafer.ordinal()));
 		OreDictionary.registerOre("materialResin", new ItemStack(itemMaterial, 1, Taam.ITEM_MATERIAL_META.resin.ordinal()));
+		OreDictionary.registerOre("materialCement", new ItemStack(itemMaterial, 1, Taam.ITEM_MATERIAL_META.cement.ordinal()));
+		OreDictionary.registerOre("materialRoughCement", new ItemStack(itemMaterial, 1, Taam.ITEM_MATERIAL_META.cementRough.ordinal()));
 
 		OreDictionary.registerOre("partPhotocell", new ItemStack(itemPart, 1, Taam.ITEM_PART_META.photocell.ordinal()));
 		OreDictionary.registerOre("partMotor", new ItemStack(itemPart, 1, Taam.ITEM_PART_META.motor.ordinal()));