Config for blocks below crops

4 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 996a16bfe6..35ed3d58e8 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -259,6 +259,7 @@ public class GT_Mod implements IGT_Mod {
         gregtechproxy.mLowGravProcessing = Loader.isModLoaded(GT_Values.MOD_ID_GC_CORE) && tMainConfig.get("general", "LowGravProcessing", true).getBoolean(true);

         LocalDate tDate = new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();

         gregtechproxy.mAprilFool = GregTech_API.sSpecialFile.get(ConfigCategories.general, "AprilFool", tDate.getMonthValue()==4 && tDate.getDayOfMonth() == 1);

+        gregtechproxy.mCropNeedBlock = tMainConfig.get("general", "CropNeedBlockBelow", true).getBoolean(true);

         

         GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", true);

         GregTech_API.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false);

diff --git a/src/main/java/gregtech/api/util/GT_BaseCrop.java b/src/main/java/gregtech/api/util/GT_BaseCrop.java
index 6cdd6ab02b..4742afe9fa 100644
--- a/src/main/java/gregtech/api/util/GT_BaseCrop.java
+++ b/src/main/java/gregtech/api/util/GT_BaseCrop.java
@@ -1,6 +1,7 @@
 package gregtech.api.util;
 
 import cpw.mods.fml.common.Loader;
+import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.Materials;
@@ -135,7 +136,7 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo {
 
     @Override
     public final boolean canGrow(ICropTile aCrop) {
-        if (mBlock != null && aCrop.getSize() == mMaxSize - 1) {
+        if (GT_Mod.gregtechproxy.mCropNeedBlock && mBlock != null && aCrop.getSize() == mMaxSize - 1) {
             return isBlockBelow(aCrop);
         }
         return aCrop.getSize() < maxSize();
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 4153c779d0..91033a1f34 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -195,6 +195,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
     public boolean mAddGTRecipesToIC2Machines = true;
     public boolean mLowGravProcessing = false;
     public boolean mAprilFool = false;
+    public boolean mCropNeedBlock = true;
     
     public GT_Proxy() {
         GameRegistry.registerFuelHandler(this);
diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java
index 6ce733cf85..96594a8b50 100644
--- a/src/main/java/gregtech/common/GT_Worldgenerator.java
+++ b/src/main/java/gregtech/common/GT_Worldgenerator.java
@@ -116,8 +116,10 @@ public class GT_Worldgenerator
             int tDimensionType = this.mWorld.provider.dimensionId;

             String tDimensionName = this.mWorld.provider.getDimensionName();

             Random aRandom = new Random();

+            System.out.println("try asteroid gen");

             if (((tDimensionType == 1) && endAsteroids && ((mEndAsteroidProbability <= 1) || (aRandom.nextInt(mEndAsteroidProbability) == 0))) || ((tDimensionName.equals("Asteroids")) && gcAsteroids && ((mGCAsteroidProbability <= 1) || (aRandom.nextInt(mGCAsteroidProbability) == 0)))) {

-                short primaryMeta = 0;

+                System.out.println("do asteroid gen: "+this.mX+" "+this.mZ);

+            	short primaryMeta = 0;

                 short secondaryMeta = 0;

                 short betweenMeta = 0;

                 short sporadicMeta = 0;