aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/forestry
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-12-21 15:48:47 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-12-21 15:48:47 +1000
commitecc60485f31011bf9cc6a02edb985fb683793bb7 (patch)
tree5211970e67d0773f91903054f27819c6938df141 /src/Java/gtPlusPlus/xmod/forestry
parent6a05213a156b3c5fe95f422234a8cb9a19ec00f1 (diff)
downloadGT5-Unofficial-ecc60485f31011bf9cc6a02edb985fb683793bb7.tar.gz
GT5-Unofficial-ecc60485f31011bf9cc6a02edb985fb683793bb7.tar.bz2
GT5-Unofficial-ecc60485f31011bf9cc6a02edb985fb683793bb7.zip
+ 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.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/forestry')
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/trees/TreefarmManager.java4
2 files changed, 5 insertions, 7 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;
}
}