Merge pull request #171 from GTNewHorizons/bmf

Changed Crops

3 files changed, 12 insertions, 11 deletions

diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
index 8ade4a89ae..684506f2a0 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
@@ -354,20 +354,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
         GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Plumbilia.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1L));

         GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Argentia.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1L));

         GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Indigo.get(1L, new Object[0]), ItemList.Dye_Indigo.get(1L, new Object[0]));

-        GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_MilkWart.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Milk, 1L));

+        GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_MilkWart.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L));

         GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Coppon.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1L));

         GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Tine.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L));

 

         GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Coppon.get(4L, new Object[0]), new ItemStack(Blocks.wool, 1, 1));

-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Plumbilia.get(8L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Argentia.get(8L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Indigo.get(8L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Ferru.get(8L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Aurelia.get(8L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_OilBerry.get(8L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_BobsYerUncleRanks.get(8L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

+        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Plumbilia.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

+        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Argentia.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

+        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Indigo.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

+        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Ferru.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

+        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Aurelia.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

+        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_OilBerry.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

+        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_BobsYerUncleRanks.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

         GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Tine.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

-        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Rape.get(8L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

+        GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Rape.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

         GT_ModHandler.addCompressionRecipe(new ItemStack(Blocks.red_flower, 8, 32767), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

         GT_ModHandler.addCompressionRecipe(new ItemStack(Blocks.yellow_flower, 8, 32767), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));

 

diff --git a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java b/src/main/java/gregtech/loaders/postload/GT_CropLoader.java
index c6e492a15d..8a585a00bd 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_CropLoader.java
@@ -67,7 +67,7 @@ public class GT_CropLoader
             new GT_BaseCrop(168, "Platina", "unknown", 				 			 null, 11, 4,    0, 1, 4, 3, 0, 0, 3, 0, 	new String[]{"Metal", "Shiny", "Reed", "Platinum"},                                    			Materials.Platinum, 	ItemList.Crop_Drop_Platinum.get(1, new Object[0]), null);
             new GT_BaseCrop(169, "Quantaria", "unknown", 			 			 null, 12, 4, 1000, 1, 4, 4, 0, 0, 1, 0, 	new String[]{"Metal", "Iridium", "Reed"},                                              			Materials.Iridium, 	ItemList.Crop_Drop_Iridium.get(1, new Object[0]), new ItemStack[]{ItemList.Crop_Drop_Osmium.get(1, new Object[0])});
             new GT_BaseCrop(170, "Stargatium", "unknown", 			 			 null, 12, 4, 1500, 1, 4, 4, 0, 0, 2, 0, 	new String[]{"Metal", "Heavy", "Alien", "Naquadah"},                                   			Materials.Naquadah, 	GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Endstone, 1L), new ItemStack[]{ItemList.Crop_Drop_Naquadah.get(1, new Object[0])});
-            new GT_BaseCrop(171, "Lemon", "unknown",	 			 			 null,  4, 4,    0, 1, 4, 1, 1, 0, 2, 0, 	new String[]{"Food", "Tree", "Sour"}, 							 								ItemList.Crop_Drop_Lemon.get(1, new Object[0]), null);
+            new GT_BaseCrop(171, "Lemon", "unknown",	 			 			 null,  4, 4,    0, 1, 4, 1, 1, 0, 2, 0, 	new String[]{"Food", "Yellow", "Sour"}, 							 								ItemList.Crop_Drop_Lemon.get(1, new Object[0]), null);
             new GT_BaseCrop(172, "Chilly", "unknown",		                 	                 null,  4, 4,    0, 1, 4, 1, 1, 0, 2, 0, 	new String[]{"Food", "Red", "Spicy"}, 							 								ItemList.Crop_Drop_Chilly.get(1, new Object[0]), null);
             new GT_BaseCrop(173, "Tomato", "unknown",	 			 			 null,  4, 4,    0, 1, 4, 1, 1, 0, 2, 0, 	new String[]{"Food", "Red"}, 							 										ItemList.Crop_Drop_Tomato.get(1, new Object[0]), new ItemStack[]{ItemList.Crop_Drop_MTomato.get(1, new Object[0])});
             new GT_BaseCrop(174, "Grape", "unknown",	 			 			 null,  4, 4,    0, 1, 4, 1, 1, 0, 2, 0, 	new String[]{"Food", "Purple"}, 							 									ItemList.Crop_Drop_Grapes.get(1, new Object[0]), null);
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index e864137ef3..259a17951c 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -67,7 +67,8 @@ public class GT_MachineRecipeLoader implements Runnable {
         GT_Values.RA.addFluidExtractionRecipe(new ItemStack(Items.wheat_seeds, 1, 32767), GT_Values.NI, Materials.SeedOil.getFluid(10), 10000, 32, 2);
         GT_Values.RA.addFluidExtractionRecipe(new ItemStack(Items.melon_seeds, 1, 32767), GT_Values.NI, Materials.SeedOil.getFluid(10), 10000, 32, 2);
         GT_Values.RA.addFluidExtractionRecipe(new ItemStack(Items.pumpkin_seeds, 1, 32767), GT_Values.NI, Materials.SeedOil.getFluid(10), 10000, 32, 2);
-        GT_Values.RA.addFluidExtractionRecipe(ItemList.Crop_Drop_Rape.get(1, new Object[0]), null, Materials.SeedOil.getFluid(50), 10000, 32, 2);
+        GT_Values.RA.addFluidExtractionRecipe(ItemList.Crop_Drop_Rape.get(1, new Object[0]), null, Materials.SeedOil.getFluid(125), 10000, 32, 2);
+
         try {
             GT_DummyWorld tWorld = (GT_DummyWorld) GT_Values.DW;
             while (tWorld.mRandom.mIterationStep > 0) {