+ Added a dimension ID config option which it now will try use if available.

% More work on the Dimension again.
$ Fixed NPE caused by disabled material handler.
$ Fixed bad fluid used in world generation.
# Fixed spawn rate of mobs in custom dimension.

3 files changed, 6 insertions, 11 deletions

diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
index 9e24eb5a53..37e479efd2 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.xmod.forestry.bees.custom;
 
-import static gtPlusPlus.GTplusplus.mGregMatLoader;
-
 import java.lang.reflect.*;
 
 import org.apache.commons.lang3.reflect.FieldUtils;
@@ -76,7 +74,7 @@ public class GTPP_Bees {
     
     private void setCustomItems() {
     	dropForceGem = new BaseItemMisc("Force", new short[]{250, 250, 20}, 64, MiscTypes.GEM, null);
-    	mGregMatLoader.enableMaterial(Materials.Force);
+    	//mGregMatLoader.enableMaterial(Materials.Force);
     	//MaterialUtils.tryEnableMaterial(Materials.Force);
     	//MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Force);
     	//MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Force);
@@ -85,8 +83,8 @@ public class GTPP_Bees {
     	
     	//Nikolite may not exist, so lets make it.
     	dropNikoliteDust = ItemUtils.generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2];
-    	mGregMatLoader.enableMaterial(Materials.BlueAlloy);
-    	mGregMatLoader.enableMaterial(Materials.Nikolite);
+    	//mGregMatLoader.enableMaterial(Materials.BlueAlloy);
+    	//mGregMatLoader.enableMaterial(Materials.Nikolite);
     	//MaterialUtils.tryEnableMaterial(Materials.Nikolite);
     	//MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Nikolite);
     	//MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Nikolite);
diff --git a/src/Java/gtPlusPlus/xmod/forestry/trees/TreefarmManager.java b/src/Java/gtPlusPlus/xmod/forestry/trees/TreefarmManager.java
index 9aea37e0d4..155feae83c 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/trees/TreefarmManager.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/trees/TreefarmManager.java
@@ -100,10 +100,10 @@ public class TreefarmManager {
 	public static boolean isSapling(final Block log){
 		if (log != null){
 			if (OrePrefixes.sapling.contains(new ItemStack(log, 1))){
-				Logger.INFO(""+log.getLocalizedName());
+				Logger.WARNING(""+log.getLocalizedName());
 			}
 			if (log.getLocalizedName().toLowerCase().contains("sapling")){
-				Logger.INFO(""+log.getLocalizedName());
+				Logger.WARNING(""+log.getLocalizedName());
 				return true;
 			}
 		}
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java
index 0480641e32..fe9a82c6b5 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java
@@ -1,8 +1,5 @@
 package gtPlusPlus.xmod.thermalfoundation;
 
-import static gtPlusPlus.GTplusplus.mGregMatLoader;
-
-import gregtech.api.enums.Materials;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks;
@@ -19,7 +16,7 @@ public class HANDLER_TF{
 			TF_Blocks.preInit();
 			if (LoadedMods.Gregtech){
 				if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
-					mGregMatLoader.enableMaterial(Materials.Enderium);
+					//mGregMatLoader.enableMaterial(Materials.Enderium);
 				}
 			}
 		}