Added new crop drops and processing recipes.

2 files changed, 32 insertions, 12 deletions

diff --git a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java b/src/main/java/gregtech/loaders/postload/GT_CropLoader.java
index c9dc600e4d..98285addf3 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_CropLoader.java
@@ -46,23 +46,23 @@ public class GT_CropLoader
             new GT_BaseCrop(150, "Lazulia", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lapis, 1L), null, null, 7, 4, 0, 2, 4, 2, 0, 5, 2, 6, new String[]{"Shiny", "Bad", "Crystal", "Lapis"}, Materials.Lapis);
             new GT_BaseCrop(151, "Glowheat", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glowstone, 1L), null, null, 10, 7, 0, 5, 7, 2, 0, 5, 2, 6, new String[]{"Light", "Shiny", "Crystal"});
             new GT_BaseCrop(153, "Fertilia", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1L), new ItemStack[]{ItemList.IC2_Fertilizer.get(1, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Apatite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1L)}, null, 3, 4, 0, 1, 4, 2, 0, 5, 2, 6, new String[]{"Growth", "Healing", "Flower"});
-            new GT_BaseCrop(154, "Bauxia", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Bauxite, 1L), null, null, 6, 3, 0, 2, 3, 2, 0, 5, 2, 6, new String[]{"Metal", "Aluminium", "Reed", "Aluminium"}, Materials.Aluminium);
-            new GT_BaseCrop(155, "Titania", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ilmenite, 1L), null, null, 9, 3, 0, 2, 3, 2, 0, 5, 2, 6, new String[]{"Metal", "Heavy", "Reed", "Titanium"}, Materials.Titanium);
-            new GT_BaseCrop(156, "Reactoria", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Pitchblende, 1L), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uraninite, 1L)}, null, 12, 4, 0, 2, 4, 2, 0, 5, 2, 6, new String[]{"Radioactive", "Metal", "Danger", "Uranium"}, Materials.Uranium);
-            new GT_BaseCrop(157, "God of Thunder", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Coal, 1L), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Thorium, 1L)}, null, 9, 4, 0, 2, 4, 2, 0, 5, 2, 6, new String[]{"Radioactive", "Metal", "Coal", "Throium"}, Materials.Thorium);
+            new GT_BaseCrop(154, "Bauxia", "unknown", ItemList.Crop_Drop_Bauxite.get(1, new Object[0]), null, null, 6, 3, 0, 2, 3, 2, 0, 5, 2, 6, new String[]{"Metal", "Aluminium", "Reed", "Aluminium"}, Materials.Aluminium);
+            new GT_BaseCrop(155, "Titania", "unknown", ItemList.Crop_Drop_Ilmenite.get(1, new Object[0]), null, null, 9, 3, 0, 2, 3, 2, 0, 5, 2, 6, new String[]{"Metal", "Heavy", "Reed", "Titanium"}, Materials.Titanium);
+            new GT_BaseCrop(156, "Reactoria", "unknown", ItemList.Crop_Drop_Pitchblende.get(1, new Object[0]), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uraninite, 1L)}, null, 12, 4, 0, 2, 4, 2, 0, 5, 2, 6, new String[]{"Radioactive", "Metal", "Danger", "Uranium"}, Materials.Uranium);
+            new GT_BaseCrop(157, "God of Thunder", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Coal, 1L), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), ItemList.Crop_Drop_Thorium.get(1, new Object[0])}, null, 9, 4, 0, 2, 4, 2, 0, 5, 2, 6, new String[]{"Radioactive", "Metal", "Coal", "Throium"}, Materials.Thorium);
             new GT_BaseCrop(158, "Transformium", "unknown", ItemList.Crop_Drop_UUABerry.get(1L, new Object[0]), new ItemStack[]{ItemList.Crop_Drop_UUABerry.get(1L, new Object[0]), ItemList.Crop_Drop_UUMBerry.get(1L, new Object[0])}, null, 12, 4, 2500, 1, 4, 2, 0, 5, 2, 6, new String[]{"Transform", "Coal", "Reed"});
             new GT_BaseCrop(159, "Starwart", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Coal, 1L), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), new ItemStack(Items.skull, 1), new ItemStack(Items.skull, 1, 1), new ItemStack(Items.skull, 1, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NetherStar, 1L)}, null, 12, 4, 4000, 1, 4, 2, 0, 5, 2, 6, new String[]{"Wither", "Nether", "Undead", "Netherstar"}, Materials.NetherStar);
             new GT_BaseCrop(160, "Zomplant", "unknown", new ItemStack(Items.rotten_flesh), null, null, 3, 4, 0, 1, 4, 2, 0, 5, 2, 6, new String[]{"Zombie", "Rotten", "Undead"});
-            new GT_BaseCrop(161, "Nickelback", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Nickel, 1L), null, null, 5, 3, 0, 2, 3, 2, 0, 5, 2, 6, new String[]{"Metal", "Fire", "Alloy"}, Materials.Nickel);
-            new GT_BaseCrop(162, "Galvania", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Zinc, 1L), null, null, 6, 3, 0, 2, 3, 2, 0, 5, 2, 6, new String[]{"Metal", "Alloy", "Bush"}, Materials.Zinc);
+            new GT_BaseCrop(161, "Nickelback", "unknown", ItemList.Crop_Drop_Nickel.get(1, new Object[0]), null, null, 5, 3, 0, 2, 3, 2, 0, 5, 2, 6, new String[]{"Metal", "Fire", "Alloy"}, Materials.Nickel);
+            new GT_BaseCrop(162, "Galvania", "unknown", ItemList.Crop_Drop_Zinc.get(1, new Object[0]), null, null, 6, 3, 0, 2, 3, 2, 0, 5, 2, 6, new String[]{"Metal", "Alloy", "Bush"}, Materials.Zinc);
             new GT_BaseCrop(163, "Evil Ore", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NetherQuartz, 1L), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.CertusQuartz, 1L),}, null, 8, 4, 0, 3, 4, 2, 0, 5, 2, 6, new String[]{"Crystal", "Fire", "Nether"});
             new GT_BaseCrop(164, "Olivia", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Olivine, 1L), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Olivine, 1L),}, null, 2, 4, 0, 3, 4, 2, 0, 5, 2, 6, new String[]{"Crystal", "Shiny", "Processing", "Olivine"}, Materials.Olivine);
             new GT_BaseCrop(165, "Sapphirum", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Sapphire, 1L), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Sapphire, 1L),}, null, 4, 4, 0, 3, 4, 2, 0, 5, 2, 6, new String[]{"Crystal", "Shiny", "Metal", "Sapphire"}, Materials.Sapphire);
-            new GT_BaseCrop(166, "Pyrolusium", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Manganese, 1L), null, null, 12, 3, 0, 2, 3, 2, 0, 5, 2, 6, new String[]{"Metal", "Clean", "Bush", "Manganese"}, Materials.Manganese);
-            new GT_BaseCrop(167, "Scheelinium", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Scheelite, 1L), null, null, 12, 3, 0, 2, 3, 2, 0, 5, 2, 6, new String[]{"Metal", "Hard", "Bush", "Tungsten"}, Materials.Tungsten);
-            new GT_BaseCrop(168, "Platina", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Platinum, 1L), null, null, 11, 4, 0, 1, 4, 2, 0, 5, 2, 6, new String[]{"Metal", "Shiny", "Reed", "Platinum"}, Materials.Platinum);
-            new GT_BaseCrop(169, "Quantaria", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iridium, 1L), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Osmium, 1L),}, null, 12, 4, 1000, 1, 4, 2, 0, 5, 2, 6, new String[]{"Metal", "Iridium", "Reed", "Iridium"}, Materials.Iridium);
-            new GT_BaseCrop(170, "Stargatium", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Endstone, 1L), new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadah, 16L),}, null, 12, 4, 1500, 1, 4, 2, 0, 5, 2, 6, new String[]{"Metal", "Heavy", "Alien", "Naquadah"}, Materials.Naquadah);
+            new GT_BaseCrop(166, "Pyrolusium", "unknown", ItemList.Crop_Drop_Manganese.get(1, new Object[0]), null, null, 12, 3, 0, 2, 3, 2, 0, 5, 2, 6, new String[]{"Metal", "Clean", "Bush", "Manganese"}, Materials.Manganese);
+            new GT_BaseCrop(167, "Scheelinium", "unknown", ItemList.Crop_Drop_Scheelite.get(1, new Object[0]), null, null, 12, 3, 0, 2, 3, 2, 0, 5, 2, 6, new String[]{"Metal", "Hard", "Bush", "Tungsten"}, Materials.Tungsten);
+            new GT_BaseCrop(168, "Platina", "unknown", ItemList.Crop_Drop_Platinum.get(1, new Object[0]), null, null, 11, 4, 0, 1, 4, 2, 0, 5, 2, 6, new String[]{"Metal", "Shiny", "Reed", "Platinum"}, Materials.Platinum);
+            new GT_BaseCrop(169, "Quantaria", "unknown", ItemList.Crop_Drop_Iridium.get(1, new Object[0]), new ItemStack[]{ItemList.Crop_Drop_Osmium.get(1, new Object[0])}, null, 12, 4, 1000, 1, 4, 2, 0, 5, 2, 6, new String[]{"Metal", "Iridium", "Reed", "Iridium"}, Materials.Iridium);
+            new GT_BaseCrop(170, "Stargatium", "unknown", GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Endstone, 1L), new ItemStack[]{ItemList.Crop_Drop_Naquadah.get(1, new Object[0])}, null, 12, 4, 1500, 1, 4, 2, 0, 5, 2, 6, new String[]{"Metal", "Heavy", "Alien", "Naquadah"}, Materials.Naquadah);
         } catch (Throwable e) {
             GT_Log.err.println("GT_Mod: Failed to register Crops to IC2.");
             e.printStackTrace(GT_Log.err);
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 9f6cb661c3..a89a29a6b3 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -94,7 +94,27 @@ public class GT_MachineRecipeLoader
         GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1L), null, null, null, Materials.Water.getFluid(125), FluidRegistry.getFluidStack("ic2coolant", 125), null, 256, 48);
         GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1L), null, null, null, GT_ModHandler.getDistilledWater(1000), FluidRegistry.getFluidStack("ic2coolant", 1000), null, 256, 48);
 
-        
+        ItemStack[] tItems = {ItemList.Crop_Drop_Bauxite.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Bauxite.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Ilmenite.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Pitchblende.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Uraninite.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Thorium.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Nickel.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Zinc.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Manganese.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Scheelite.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Platinum.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Iridium.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Osmium.get(1, new Object[0]),
+        		ItemList.Crop_Drop_Naquadah.get(1, new Object[0])};
+        Materials[] tMaterials ={Materials.Bauxite,Materials.Ilmenite,Materials.Pitchblende,Materials.Uraninite,Materials.Thorium,Materials.Nickel,Materials.Zinc,Materials.Manganese,Materials.Scheelite,Materials.Platinum,Materials.Iridium,Materials.Osmium,Materials.Naquadah};
+        for(int i = 0;i<tItems.length;i++){
+        GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tItems[i]), GT_OreDictUnificator.get(OrePrefixes.crushed, tMaterials[i], 1), Materials.Water.getFluid(1000),
+        		tMaterials[i].mOreByProducts.isEmpty() ? null : tMaterials[i].mOreByProducts.get(0).getMolten(144),
+				GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterials[i], 4), 96, 300);
+		GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tItems[i]), Materials.UUMatter.getFluid(1), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterials[i], 1), 1000, 1000, 24);
+        }
         
         GT_Values.RA.addExtruderRecipe(ItemList.FR_Wax.get(1L, new Object[0]), ItemList.Shape_Extruder_Cell.get(0L, new Object[0]), ItemList.FR_WaxCapsule.get(1L, new Object[0]), 64, 16);
         GT_Values.RA.addExtruderRecipe(ItemList.FR_RefractoryWax.get(1L, new Object[0]), ItemList.Shape_Extruder_Cell.get(0L, new Object[0]), ItemList.FR_RefractoryCapsule.get(1L, new Object[0]), 128, 16);