Update to Java 8

+ Fixed Crash with BWOres

2 files changed, 33 insertions, 8 deletions

diff --git a/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_Layer_Space.java b/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_Layer_Space.java
index e359def408..134661b8c5 100644
--- a/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_Layer_Space.java
+++ b/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_Layer_Space.java
@@ -20,14 +20,16 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 
+import java.util.Map;
 import java.util.Random;
+import java.util.stream.Collectors;
 
 import static bloodasp.galacticgreg.GalacticGreg.oreVeinWorldgenList;
 
 public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer {
 
     private ModDimensionDef pDimensionDef;
-
+    private String name;
     private DynamicOreMixWorldConfig _mDynWorldConfig;
 
     /**
@@ -67,6 +69,11 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer {
         }
         _mDynWorldConfig = new DynamicOreMixWorldConfig(mWorldGenName,true);
         _mDynWorldConfig.InitDynamicConfig();
+
+        StringBuilder ret = new StringBuilder();
+        for (Map.Entry<String,Boolean> key : _mDynWorldConfig.get_mDynWorldConfigMap().entrySet().stream().filter(Map.Entry::getValue).collect(Collectors.toSet()))
+            ret.append(key.getKey().split("_")[1]).append("; ");
+        name = ret.substring(0, ret.length() - 1);
     }
 
     /**
@@ -100,12 +107,16 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer {
         mBetweenMeta = ((short) GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "OreSporadiclyInbetween", pBetween));
         mSporadicMeta = ((short) GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "OreSporaticlyAround", pSporadic));
         bwOres = ((byte) GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "BWGTlogic", bwOres));
+        _mDynWorldConfig = new DynamicOreMixWorldConfig(mWorldGenName,true);
+        _mDynWorldConfig.InitDynamicConfig();
+        StringBuilder ret = new StringBuilder();
+        for (Map.Entry<String,Boolean> key : _mDynWorldConfig.get_mDynWorldConfigMap().entrySet().stream().filter(Map.Entry::getValue).collect(Collectors.toSet()))
+            ret.append(key.getKey().split("_")[1]).append("; ");
+        name = ret.length() == 0 ? "" : ret.substring(0, ret.length() - 1);
         if (mEnabled) {
             sWeight += this.mWeight;
             oreVeinWorldgenList.add(this);
         }
-        _mDynWorldConfig = new DynamicOreMixWorldConfig(mWorldGenName,true);
-        _mDynWorldConfig.InitDynamicConfig();
     }
 
     /**
@@ -118,8 +129,7 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer {
         this(aName,enabled,0,0,0,0,0,0,0,0,0,true,true,true,true);
     }
 
-    public boolean isEnabledForDim(ModDimensionDef pDimensionDef)
-    {
+    public boolean isEnabledForDim(ModDimensionDef pDimensionDef) {
         return _mDynWorldConfig.isEnabledInDim(pDimensionDef);
     }
 
@@ -163,7 +173,7 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer {
 
     @Override
     public String getDimName() {
-        return pDimensionDef.getDimensionName();
+       return name;
     }
 
 
diff --git a/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_SmallOre_Space.java b/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_SmallOre_Space.java
index 449f60f57a..af9af323d7 100644
--- a/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_SmallOre_Space.java
+++ b/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_SmallOre_Space.java
@@ -20,7 +20,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 
+import java.util.Map;
 import java.util.Random;
+import java.util.stream.Collectors;
 
 import static bloodasp.galacticgreg.GalacticGreg.smallOreWorldgenList;
 
@@ -28,6 +30,8 @@ public class BW_Worldgen_Ore_SmallOre_Space extends BW_OreLayer {
 
     private ModDimensionDef pDimensionDef;
     private DynamicOreMixWorldConfig _mDynWorldConfig;
+    private String name;
+
     public BW_Worldgen_Ore_SmallOre_Space(String aName, boolean pDefault, int pMinY, int pMaxY, int pDensity, int pPrimary, ISubTagContainer primaryBW) {
         super(aName, pDefault, 0, 0, 0, 0, 0, primaryBW, Materials._NULL, Materials._NULL, Materials._NULL);
         mMinY = ((short) GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "MinHeight", pMinY));
@@ -37,11 +41,22 @@ public class BW_Worldgen_Ore_SmallOre_Space extends BW_OreLayer {
         bwOres = ((byte) GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "BWGTlogic", bwOres));
         _mDynWorldConfig = new DynamicOreMixWorldConfig(mWorldGenName,true);
         _mDynWorldConfig.InitDynamicConfig();
+        StringBuilder ret = new StringBuilder();
+        for (Map.Entry<String,Boolean> key : _mDynWorldConfig.get_mDynWorldConfigMap().entrySet().stream().filter(Map.Entry::getValue).collect(Collectors.toSet()))
+            ret.append(key.getKey().split("_")[1]).append("; ");
+        name = ret.length() == 0 ? "" :  ret.substring(0, ret.length() - 1);
         if (mEnabled) {
             smallOreWorldgenList.add(this);
         }
+
     }
 
+    /**
+     * Script Friendly Constructor,
+     * WONT WORK WITH NEI
+     * @param aName
+     * @param enabled
+     */
     public BW_Worldgen_Ore_SmallOre_Space(String aName, boolean enabled){
         this(aName,enabled,0,0,0,0,enabled ? Werkstoff.default_null_Werkstoff : Materials._NULL);
     }
@@ -91,11 +106,11 @@ public class BW_Worldgen_Ore_SmallOre_Space extends BW_OreLayer {
 
     @Override
     public int[] getDefaultDamageToReplace() {
-        return new int[0];
+        return null;
     }
 
     @Override
     public String getDimName() {
-        return null;
+        return name;
     }
 }