added option to stop barley/cotton from dropping from bonemealing grass

closes #153
progwml6 · Aug 11, 2014 · eb1efd3 · eb1efd3
1 parent 81dd827
commit eb1efd3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/src/main/java/mods/natura/common/NContent.java b/src/main/java/mods/natura/common/NContent.java
@@ -138,7 +138,6 @@
 import cpw.mods.fml.common.IFuelHandler;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
 
 public class NContent implements IFuelHandler
 {
@@ -151,7 +150,7 @@ public void preInit ()
         plantItem = new PlantItem().setUnlocalizedName("barleyFood");
         GameRegistry.registerItem(plantItem, "barleyFood");
         crops = new CropBlock();
-        GameRegistry.registerBlock(crops, "N Crops");
+        GameRegistry.registerBlock(crops, "N Crops");//TODO 1.8 this MUST be renamed to get rid of the space
         seeds = new NaturaSeeds(crops, Blocks.farmland).setUnlocalizedName("barley.seed");
         GameRegistry.registerItem(seeds, "barley.seed");
         GameRegistry.registerCustomItemStack("seedBarley", new ItemStack(seeds, 1, 0));
@@ -229,9 +228,10 @@ public void preInit ()
         ghostDoor = new NDoor(Material.wood, 4, "ghostwood").setBlockName("door.ghostwood");
         bloodDoor = new NDoor(Material.wood, 5, "bloodwood").setBlockName("door.bloodwood");
         redwoodBarkDoor = new NDoor(Material.wood, 6, "redwoodbark").setBlockName("door.redwoodbark");
-
-        MinecraftForge.addGrassSeed(new ItemStack(seeds, 1, 0), 3);
-        MinecraftForge.addGrassSeed(new ItemStack(seeds, 1, 1), 3);
+        if(PHNatura.dropBarley)
+            MinecraftForge.addGrassSeed(new ItemStack(seeds, 1, 0), 3);
+        if(PHNatura.dropCotton)
+            MinecraftForge.addGrassSeed(new ItemStack(seeds, 1, 1), 3);
 
         //floraBoat = new NBoat(PHNatura.boatItemID).setIconCoord(0, 3).setBlockName("floraBoat");
 
@@ -1213,18 +1213,9 @@ public void modIntegration ()
     public static BerryBush berryBush;
     public static NetherBerryBush netherBerryBush;
 
-    public static Block baseHerb;
-    public static Block bloodyHerb;
-    public static Block manaHerb;
-    public static Block whiteHerb;
-    public static Block poisonHerb;
-    public static Block leafyHerb;
-    public static Block orangeHerb;
 
     //Others
     public static Block cloud;
-    public static Block ivy;
-    public static Block flower;
 
     //Trees    
     public static Block tree;
@@ -1272,8 +1263,6 @@ public void modIntegration ()
     public static Block respawnObelisk;
     public static NetherGlass netherGlass;
     public static BlazeHopper netherHopper;
-    public static Block netherDropper;
-    public static Block netherDispenser;
     public static Block netherPressurePlate;
     public static Block netherButton;
     public static Block netherLever;
@@ -1350,13 +1339,10 @@ public void modIntegration ()
     //Golem type things
     public static Block grassBlock;
     public static Block grassSlab;
-    public static Block miniDoor;
 
     public static Block plankSlab1;
     public static Block plankSlab2;
 
-    public static Block logSlab;
-
     public static Block stairEucalyptus;
     public static Block stairSakura;
     public static Block stairGhostwood;

diff --git a/src/main/java/mods/natura/common/PHNatura.java b/src/main/java/mods/natura/common/PHNatura.java
@@ -68,7 +68,8 @@ public static void initProps (File confFile)
         generateDuskberries = config.get("Disabler", "Generate Duskberry Bushes", true).getBoolean(true);
         generateSkyberries = config.get("Disabler", "Generate Skyberry Bushes", true).getBoolean(true);
         generateStingberries = config.get("Disabler", "Generate Stingberry Bushes", true).getBoolean(true);
-
+        dropBarley = config.get("Disabler", "Drop cotton seeds from grass", true).getBoolean(true);
+        dropCotton = config.get("Disabler", "Drop barley seeds from grass", true).getBoolean(true);
         try
         {
             Class.forName("chococraft.common.ModChocoCraft");
@@ -221,6 +222,8 @@ public static void initProps (File confFile)
     public static boolean generateAshClouds;
     public static boolean generateDarkClouds;
     public static boolean enableWheatRecipe;
+    public static boolean dropBarley;
+    public static boolean dropCotton;
 
     public static boolean overrideNether;
     public static boolean canRespawnInNether;