Merge pull request #10 from GTNewHorizons/bartworksIntegration

Update to Java 8

22 files changed, 208 insertions, 244 deletions

diff --git a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java
index 32b7c7c7e5..745f72cb60 100644
--- a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java
+++ b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java
@@ -1,24 +1,18 @@
 package bloodasp.galacticgreg;
 
+import bloodasp.galacticgreg.api.ModDimensionDef;
+import bloodasp.galacticgreg.auxiliary.GTOreGroup;
 import bloodasp.galacticgreg.bartworks.BW_Worldgen_Ore_Layer_Space;
-import bloodasp.galacticgreg.bartworks.BW_Worldgen_Ore_SmallOre_Space;
+import bloodasp.galacticgreg.dynconfig.DynamicOreMixWorldConfig;
+import bloodasp.galacticgreg.registry.GalacticGregRegistry;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_Log;
 import gregtech.api.world.GT_Worldgen;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
-import bloodasp.galacticgreg.api.ModDimensionDef;
-import bloodasp.galacticgreg.auxiliary.GTOreGroup;
-import bloodasp.galacticgreg.dynconfig.DynamicOreMixWorldConfig;
-import bloodasp.galacticgreg.registry.GalacticGregRegistry;
+
+import java.util.*;
 
 public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen {
 	public static int sWeight = 0;
@@ -35,7 +29,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen {
 	private long mProfilingStart;
 	private long mProfilingEnd;
 
-	private DynamicOreMixWorldConfig _mDynWorldConfig = null;
+	private DynamicOreMixWorldConfig _mDynWorldConfig;
 
 	public GT_Worldgen_GT_Ore_Layer_Space(String pName, boolean pDefault, int pMinY, int pMaxY, int pWeight, int pDensity, int pSize, Materials pPrimary, Materials pSecondary, Materials pBetween, Materials pSporadic)
 	{
@@ -92,7 +86,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen {
 		return _mDynWorldConfig.isEnabledInDim(pDimensionDef);
 	}
 
-	private static Map<String, Integer> _mBufferedVeinCountList = new HashMap<String, Integer>(); 
+	private static Map<String, Integer> _mBufferedVeinCountList = new HashMap<>();
 	
 	/**
 	 * Get the number of enabled OreMixes for given Dimension.
@@ -118,7 +112,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen {
 	}
 	
 	
-	private static Map<String, List<String>> _mBufferedVeinList = new HashMap<String, List<String>>();
+	private static Map<String, List<String>> _mBufferedVeinList = new HashMap<>();
 	/**
 	 * Get a List of all Veins which are enabled for given Dim. Query is buffered
 	 * @param pDimensionDef
@@ -126,13 +120,13 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen {
 	 */
 	private static List<String> getOreMixIDsForDim(ModDimensionDef pDimensionDef)
 	{
-		List<String> tReturn = null;
+		List<String> tReturn;
 		
 		if (_mBufferedVeinList.containsKey(pDimensionDef.getDimIdentifier()))
 			tReturn = _mBufferedVeinList.get(pDimensionDef.getDimIdentifier());
 		else
 		{
-			tReturn = new ArrayList<String>();
+			tReturn = new ArrayList<>();
 			for (GT_Worldgen tWorldGen : GalacticGreg.oreVeinWorldgenList)
 				if (tWorldGen instanceof GT_Worldgen_GT_Ore_Layer_Space && ((GT_Worldgen_GT_Ore_Layer_Space) tWorldGen).isEnabledForDim(pDimensionDef))
 					tReturn.add(tWorldGen.mWorldGenName);
@@ -268,31 +262,28 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen {
 			int cZ = pChunkZ - pRandom.nextInt(this.mSize);
 			int eZ = pChunkZ + 16 + pRandom.nextInt(this.mSize);
 			for (int tZ = cZ; tZ <= eZ; tZ++) {
+				final int maxx = Math.max(Math.abs(cX - tX), Math.abs(eX - tX));
+				final int maxz = Math.max(Math.abs(cZ - tZ), Math.abs(eZ - tZ));
 				if (this.mSecondaryMeta > 0) {
 					for (int i = tMinY - 1; i < tMinY + 2; i++) {
-						if ((pRandom.nextInt(Math.max(1, Math.max(Math.abs(cZ - tZ), Math.abs(eZ - tZ)) / this.mDensity)) == 0)
-								|| (pRandom.nextInt(Math.max(1, Math.max(Math.abs(cX - tX), Math.abs(eX - tX)) / this.mDensity)) == 0)) {
+						if ((pRandom.nextInt(Math.max(1, maxz / this.mDensity)) == 0) || (pRandom.nextInt(Math.max(1, maxx / this.mDensity)) == 0)) {
 							GT_TileEntity_Ores_Space.setOuterSpaceOreBlock(tMDD, pWorld, tX, i, tZ, this.mSecondaryMeta);
 						}
 					}
 				}
 				if ((this.mBetweenMeta > 0)
-						&& ((pRandom.nextInt(Math.max(1, Math.max(Math.abs(cZ - tZ), Math.abs(eZ - tZ)) / this.mDensity)) == 0) || (pRandom.nextInt(Math.max(1,
-								Math.max(Math.abs(cX - tX), Math.abs(eX - tX)) / this.mDensity)) == 0))) {
+						&& ((pRandom.nextInt(Math.max(1, maxz / this.mDensity)) == 0) || (pRandom.nextInt(Math.max(1, maxx / this.mDensity)) == 0))) {
 					GT_TileEntity_Ores_Space.setOuterSpaceOreBlock(tMDD, pWorld, tX, tMinY + 2 + pRandom.nextInt(2), tZ, this.mBetweenMeta);
 				}
 				if (this.mPrimaryMeta > 0) {
 					for (int i = tMinY + 3; i < tMinY + 6; i++) {
-						if ((pRandom.nextInt(Math.max(1, Math.max(Math.abs(cZ - tZ), Math.abs(eZ - tZ)) / this.mDensity)) == 0)
-								|| (pRandom.nextInt(Math.max(1, Math.max(Math.abs(cX - tX), Math.abs(eX - tX)) / this.mDensity)) == 0)) {
-
+						if ((pRandom.nextInt(Math.max(1, maxz / this.mDensity)) == 0) || (pRandom.nextInt(Math.max(1, maxx / this.mDensity)) == 0)) {
 							GT_TileEntity_Ores_Space.setOuterSpaceOreBlock(tMDD, pWorld, tX, i, tZ, this.mPrimaryMeta);
 						}
 					}
 				}
 				if ((this.mSporadicMeta > 0)
-						&& ((pRandom.nextInt(Math.max(1, Math.max(Math.abs(cZ - tZ), Math.abs(eZ - tZ)) / this.mDensity)) == 0) || (pRandom.nextInt(Math.max(1,
-								Math.max(Math.abs(cX - tX), Math.abs(eX - tX)) / this.mDensity)) == 0))) {
+						&& ((pRandom.nextInt(Math.max(1, maxz / this.mDensity)) == 0) || (pRandom.nextInt(Math.max(1, maxx / this.mDensity)) == 0))) {
 					GT_TileEntity_Ores_Space.setOuterSpaceOreBlock(tMDD, pWorld, tX, tMinY - 1 + pRandom.nextInt(7), tZ, this.mSporadicMeta);
 				}
 			}
@@ -305,10 +296,9 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen {
 				long tTotalTime = mProfilingEnd - mProfilingStart;
 				GalacticGreg.Profiler.AddTimeToList(tMDD, tTotalTime);
 				GalacticGreg.Logger.debug("Done with OreLayer-Worldgen in DimensionType %s. Generation took %d ms", tMDD.getDimensionName(), tTotalTime);
-			} catch (Exception e) { } // Silently ignore errors
+			} catch (Exception ignored) { } // Silently ignore errors
 		}
 
-
 		GalacticGreg.Logger.trace("Leaving executeWorldgen");
 		return true;
 	}
diff --git a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_SmallPieces_Space.java b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_SmallPieces_Space.java
index cb46d2351b..da307cdbb6 100644
--- a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_SmallPieces_Space.java
+++ b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_SmallPieces_Space.java
@@ -1,16 +1,15 @@
 package bloodasp.galacticgreg;
 
+import bloodasp.galacticgreg.api.ModDimensionDef;
+import bloodasp.galacticgreg.dynconfig.DynamicOreMixWorldConfig;
+import bloodasp.galacticgreg.registry.GalacticGregRegistry;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.world.GT_Worldgen;
-
-import java.util.Random;
-
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
-import bloodasp.galacticgreg.api.ModDimensionDef;
-import bloodasp.galacticgreg.dynconfig.DynamicOreMixWorldConfig;
-import bloodasp.galacticgreg.registry.GalacticGregRegistry;
+
+import java.util.Random;
 
 public class GT_Worldgen_GT_Ore_SmallPieces_Space extends GT_Worldgen {
 	public final short mMinY;
@@ -20,7 +19,7 @@ public class GT_Worldgen_GT_Ore_SmallPieces_Space extends GT_Worldgen {
 	
 	private long mProfilingStart;
 	private long mProfilingEnd;
-	private DynamicOreMixWorldConfig _mDynWorldConfig = null;
+	private DynamicOreMixWorldConfig _mDynWorldConfig;
 	
 	public GT_Worldgen_GT_Ore_SmallPieces_Space(String pName, boolean pDefault, int pMinY, int pMaxY, int pAmount, Materials pPrimary)
 	{
@@ -97,7 +96,7 @@ public class GT_Worldgen_GT_Ore_SmallPieces_Space extends GT_Worldgen {
 				long tTotalTime = mProfilingEnd - mProfilingStart;
 				GalacticGreg.Profiler.AddTimeToList(tMDD, tTotalTime);
 				GalacticGreg.Logger.debug("Done with SmallOre-Worldgen in DimensionType %s. Generation took %d ms", tMDD.getDimensionName(), tTotalTime);
-			} catch (Exception e) {  } // Silently ignore errors
+			} catch (Exception ignored) {  } // Silently ignore errors
 		}
 		
 		GalacticGreg.Logger.trace("Leaving executeWorldgen");
diff --git a/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java b/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java
index c76cd1e425..9efcaf0d4f 100644
--- a/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java
+++ b/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java
@@ -1,19 +1,22 @@
 package bloodasp.galacticgreg;
 
+import bloodasp.galacticgreg.api.*;
+import bloodasp.galacticgreg.api.Enums.DimensionType;
+import bloodasp.galacticgreg.api.Enums.SpaceObjectType;
+import bloodasp.galacticgreg.api.Enums.TargetBlockPosition;
+import bloodasp.galacticgreg.auxiliary.GTOreGroup;
 import bloodasp.galacticgreg.bartworks.BW_Worldgen_Ore_Layer_Space;
 import bloodasp.galacticgreg.bartworks.BW_Worldgen_Ore_SmallOre_Space;
-import com.github.bartimaeusnek.bartworks.system.material.BW_MetaGeneratedOreTE;
-import com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_SmallOres;
+import bloodasp.galacticgreg.dynconfig.DynamicDimensionConfig;
+import bloodasp.galacticgreg.dynconfig.DynamicDimensionConfig.AsteroidConfig;
+import bloodasp.galacticgreg.registry.GalacticGregRegistry;
+import cpw.mods.fml.common.IWorldGenerator;
+import cpw.mods.fml.common.eventhandler.EventBus;
+import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.util.GT_Log;
-
-import java.util.Random;
-
 import gregtech.api.world.GT_Worldgen;
 import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
 import net.minecraft.inventory.IInventory;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.util.Vec3;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.World;
@@ -21,23 +24,8 @@ import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraftforge.common.ChestGenHooks;
-import bloodasp.galacticgreg.api.AsteroidBlockComb;
-import bloodasp.galacticgreg.api.BlockMetaComb;
-import bloodasp.galacticgreg.api.Enums.DimensionType;
-import bloodasp.galacticgreg.api.Enums.SpaceObjectType;
-import bloodasp.galacticgreg.api.Enums.TargetBlockPosition;
-import bloodasp.galacticgreg.api.GTOreTypes;
-import bloodasp.galacticgreg.api.ISpaceObjectGenerator;
-import bloodasp.galacticgreg.api.ModDimensionDef;
-import bloodasp.galacticgreg.api.SpecialBlockComb;
-import bloodasp.galacticgreg.api.StructureInformation;
-import bloodasp.galacticgreg.auxiliary.GTOreGroup;
-import bloodasp.galacticgreg.dynconfig.DynamicDimensionConfig;
-import bloodasp.galacticgreg.dynconfig.DynamicDimensionConfig.AsteroidConfig;
-import bloodasp.galacticgreg.registry.GalacticGregRegistry;
-import cpw.mods.fml.common.IWorldGenerator;
-import cpw.mods.fml.common.eventhandler.EventBus;
-import cpw.mods.fml.common.registry.GameRegistry;
+
+import java.util.Random;
 
 public class GT_Worldgenerator_Space implements IWorldGenerator {
 	public static boolean sAsteroids = true;
@@ -87,14 +75,14 @@ public class GT_Worldgenerator_Space implements IWorldGenerator {
 			tBiome = BiomeGenBase.plains.biomeName;
 		}*/
 		
-		if (tDimDef.getDimensionType() == DimensionType.Asteroid || tDimDef.getDimensionType() == DimensionType.AsteroidAndPlanet)
+		if (tDimDef.getDimensionType() != DimensionType.Planet)
 		{
 			if (tDimDef.getRandomAsteroidMaterial() == null)
 				GalacticGreg.Logger.error("Dimension [%s] is set to Asteroids, but no asteroid material is specified! Nothing will generate", tDimDef.getDimensionName());
 			else
 				Generate_Asteroids(tDimDef, pRandom, pWorld, pX, pZ);
 		}
-		else if (tDimDef.getDimensionType() == DimensionType.Planet || tDimDef.getDimensionType() == DimensionType.AsteroidAndPlanet)
+		else if (tDimDef.getDimensionType() != DimensionType.Asteroid)
 		{
 			Generate_OreVeins(tDimDef, pRandom, pWorld, pX, pZ, "", pChunkGenerator, pChunkProvider);
 		}
@@ -323,10 +311,8 @@ public class GT_Worldgenerator_Space implements IWorldGenerator {
 						// If no ore-block has been placed yet...
 						if (!tPlacedOreBlock)
 						{
-							boolean tFlag = true;
-
 							// try to spawn special blocks
-							tFlag = doGenerateSpecialBlocks(pDimensionDef, pRandom, pWorld, tAConf, si.getX(), si.getY(), si.getZ(), si.getBlockPosition());
+							boolean tFlag = doGenerateSpecialBlocks(pDimensionDef, pRandom, pWorld, tAConf, si.getX(), si.getY(), si.getZ(), si.getBlockPosition());
 		
 							// No special block placed? Try smallores
 							if (tFlag)
@@ -350,7 +336,7 @@ public class GT_Worldgenerator_Space implements IWorldGenerator {
 				long tTotalTime = mProfilingEnd - mProfilingStart;
 				GalacticGreg.Profiler.AddTimeToList(pDimensionDef, tTotalTime);
 				GalacticGreg.Logger.debug("Done with Asteroid-Worldgen in DimensionType %s. Generation took %d ms", pDimensionDef.getDimensionName(), tTotalTime);
-				} catch (Exception e) { } // Silently ignore errors
+				} catch (Exception ignored) { } // Silently ignore errors
 			}
 			// ---------------------------
 		}
diff --git a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java
index 82a41fd17c..074eaef829 100644
--- a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java
+++ b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java
@@ -1,9 +1,5 @@
 package bloodasp.galacticgreg;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
 import bloodasp.galacticgreg.auxiliary.GalacticGregConfig;
 import bloodasp.galacticgreg.auxiliary.LogHelper;
 import bloodasp.galacticgreg.auxiliary.ProfilingStorage;
@@ -16,17 +12,20 @@ import bloodasp.galacticgreg.schematics.SpaceSchematicHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import gregtech.api.GregTech_API;
 import gregtech.api.world.GT_Worldgen;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 @Mod(modid = GalacticGreg.MODID, version = GalacticGreg.VERSION, dependencies = "required-after:GalacticraftCore; required-after:gregtech@5.09.32.30;", acceptableRemoteVersions="*")
 public class GalacticGreg {
-	public static final List<GT_Worldgen> smallOreWorldgenList = new ArrayList();
-	public static final List<GT_Worldgen> oreVeinWorldgenList = new ArrayList();
+	public static final List<GT_Worldgen> smallOreWorldgenList = new ArrayList<>();
+	public static final List<GT_Worldgen> oreVeinWorldgenList = new ArrayList<>();
 
 	public static final String NICE_MODID = "GalacticGreg";
 	public static final String MODID = "galacticgreg";
@@ -64,7 +63,7 @@ public class GalacticGreg {
 //		GalacticGregRegistry.registerModContainer(ModRegisterer.Setup_GalactiCraftCore());
 //	}
 
-	public static final ArrayList<Runnable> ADDITIONALVEINREGISTER = new ArrayList<Runnable>();
+	public static final ArrayList<Runnable> ADDITIONALVEINREGISTER = new ArrayList<>();
 
 	/**
 	 * Postload phase. Mods can add their custom definition to our api in their own PreLoad or Init-phase
diff --git a/src/main/java/bloodasp/galacticgreg/ModRegisterer.java b/src/main/java/bloodasp/galacticgreg/ModRegisterer.java
index afc0df4eec..51bd268b25 100644
--- a/src/main/java/bloodasp/galacticgreg/ModRegisterer.java
+++ b/src/main/java/bloodasp/galacticgreg/ModRegisterer.java
@@ -1,17 +1,14 @@
 package bloodasp.galacticgreg;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.world.gen.ChunkProviderEnd;
-import micdoodle8.mods.galacticraft.core.blocks.GCBlocks;
-import micdoodle8.mods.galacticraft.core.world.gen.ChunkProviderMoon;
 import bloodasp.galacticgreg.api.*;
 import bloodasp.galacticgreg.api.Enums.AllowedBlockPosition;
 import bloodasp.galacticgreg.api.Enums.DimensionType;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.gen.ChunkProviderEnd;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * In this class, you'll find everything you need in order to tell GGreg what to do and where.
@@ -27,7 +24,7 @@ public class ModRegisterer
 	 */
 	private static List<ModDBMDef> singleToList(ModDBMDef pDef)
 	{
-		List<ModDBMDef> tLst = new ArrayList<ModDBMDef>();
+		List<ModDBMDef> tLst = new ArrayList<>();
 		tLst.add(pDef);
 		return tLst;
 	}
diff --git a/src/main/java/bloodasp/galacticgreg/api/GTOreTypes.java b/src/main/java/bloodasp/galacticgreg/api/GTOreTypes.java
index 0106cd0e6e..8a3920b116 100644
--- a/src/main/java/bloodasp/galacticgreg/api/GTOreTypes.java
+++ b/src/main/java/bloodasp/galacticgreg/api/GTOreTypes.java
@@ -40,7 +40,7 @@ public enum GTOreTypes {
 	private int _mBlockMeta;
 	private int _mUpdateMode;
 	
-	private GTOreTypes(int pOffset, Block pBlock, int pMeta, int pUpdateMode)
+	GTOreTypes(int pOffset, Block pBlock, int pMeta, int pUpdateMode)
 	{
 		_mOffset = pOffset;
 		_mStoneBlock = pBlock;
diff --git a/src/main/java/bloodasp/galacticgreg/api/ModContainer.java b/src/main/java/bloodasp/galacticgreg/api/ModContainer.java
index 9cea43b754..fc6e09d37d 100644
--- a/src/main/java/bloodasp/galacticgreg/api/ModContainer.java
+++ b/src/main/java/bloodasp/galacticgreg/api/ModContainer.java
@@ -44,7 +44,7 @@ public class ModContainer {
 	public ModContainer(String pModName)
 	{
 		_mModName = pModName;
-		_mDimensionLookup = new ArrayList<ModDimensionDef>();
+		_mDimensionLookup = new ArrayList<>();
 	}
 	
 	
diff --git a/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java b/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java
index 74796c384c..450841b922 100644
--- a/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java
+++ b/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java
@@ -1,16 +1,17 @@
 package bloodasp.galacticgreg.api;
 
+import bloodasp.galacticgreg.api.Enums.AirReplaceRule;
+import bloodasp.galacticgreg.api.Enums.DimensionType;
+import bloodasp.galacticgreg.api.Enums.ReplaceState;
+import bloodasp.galacticgreg.api.Enums.SpaceObjectType;
+import net.minecraft.block.Block;
+import net.minecraft.world.chunk.IChunkProvider;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import net.minecraft.block.Block;
-import net.minecraft.world.chunk.IChunkProvider;
 //import bloodasp.galacticgreg.GalacticGreg;
-import bloodasp.galacticgreg.api.Enums.AirReplaceRule;
-import bloodasp.galacticgreg.api.Enums.DimensionType;
-import bloodasp.galacticgreg.api.Enums.ReplaceState;
-import bloodasp.galacticgreg.api.Enums.SpaceObjectType;
 
 /**
  * Class to define a Dimension. Supposed to be added to a ModContainer
@@ -222,7 +223,7 @@ public class ModDimensionDef {
 	 * 
 	 * For example, on GalactiCraft Mars, this value is set to GTOreTypes.RedGranite, because it matches the
 	 * color better. If you don't set anything here, it will generate regular stone-ores.
-	 * @param pOffset
+	 * @param pStoneType
 	 */
 	public void setStoneType(GTOreTypes pStoneType)
 	{
@@ -325,14 +326,14 @@ public class ModDimensionDef {
 		_mChunkProvider = pChunkProviderName;
 		_mDimensionType = pDimType;
 		
-		_mReplaceableBlocks = new ArrayList<ModDBMDef>();
+		_mReplaceableBlocks = new ArrayList<>();
 		if (pBlockDefinitions != null)
 			_mReplaceableBlocks.addAll(pBlockDefinitions);
 		
-		_mValidAsteroidMaterials = new ArrayList<AsteroidBlockComb>();
-		_mSpecialBlocksForAsteroids = new ArrayList<SpecialBlockComb>();
-		_mSpaceObjectsGenerators = new ArrayList<ISpaceObjectGenerator>();
-		_mSpaceStructureGenerators = new ArrayList<ISpaceObjectGenerator>();
+		_mValidAsteroidMaterials = new ArrayList<>();
+		_mSpecialBlocksForAsteroids = new ArrayList<>();
+		_mSpaceObjectsGenerators = new ArrayList<>();
+		_mSpaceStructureGenerators = new ArrayList<>();
 	}
 
 	/**Internal function
@@ -342,13 +343,13 @@ public class ModDimensionDef {
 	 */
 	protected void setParentModName(String pModName)
 	{
-		if (!_mInternalDimIdentifier.equals(STR_NOTDEFINED))
-			return; // Don't update, we're already set
-		else
-		{
+		if (_mInternalDimIdentifier.equals(STR_NOTDEFINED)) {
 			_mInternalDimIdentifier = String.format("%s_%s", pModName, _mDimensionName);
 			//GalacticGreg.Logger.debug("Set Internal Identifier for Dimension %s to %s", _mDimensionName, _mInternalDimIdentifier);
 		}
+
+		// Else Don't update, we're already set
+
 	}
 	
 	/**Internal function
@@ -431,13 +432,12 @@ public class ModDimensionDef {
 	
 	/**
 	 * Define the material the asteroid shall be made of, more advanced option to specify your own blocks
-	 * @param pMaterial
+	 * @param pBlockComb
 	 */
 	public void addAsteroidMaterial(AsteroidBlockComb pBlockComb) {
-		if (_mValidAsteroidMaterials.contains(pBlockComb))
-			return;
-		else
+		if (!_mValidAsteroidMaterials.contains(pBlockComb)) {
 			_mValidAsteroidMaterials.add(pBlockComb);
+		}
 	}
 	
 	/**
@@ -448,10 +448,9 @@ public class ModDimensionDef {
 	 * @param pBlock Block-Meta Combination that shall be used
 	 */
 	public void addSpecialAsteroidBlock(SpecialBlockComb pBlock) {
-		if (_mSpecialBlocksForAsteroids.contains(pBlock))
-			return;
-		else
+		if (!_mSpecialBlocksForAsteroids.contains(pBlock)) {
 			_mSpecialBlocksForAsteroids.add(pBlock);
+		}
 	}
 	
 	/**Internal function
@@ -470,7 +469,6 @@ public class ModDimensionDef {
 			catch(Exception e)
 			{
 				//GalacticGreg.Logger.error("Unable to finalize replaceable block with modname for block %s. Dimension %s will probably have problems generating ores", rpb.getBlockName(), _mDimensionName);
-				continue;
 			}
 		}
 	}
diff --git a/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java b/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java
index 4f6166e3eb..eb3db77060 100644
--- a/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java
+++ b/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java
@@ -1,17 +1,16 @@
 package bloodasp.galacticgreg.auxiliary;
 
-import java.util.ArrayList;
-
+import cpw.mods.fml.common.FMLLog;
 import org.apache.logging.log4j.Level;
 
-import cpw.mods.fml.common.FMLLog;
+import java.util.ArrayList;
 
 /**
  * Generic LogHelper to print stuff to the console
  * @author Namikon
  */
 public final class LogHelper {
-	private ArrayList<String> _mReportedCategories = new ArrayList<String>();
+	private ArrayList<String> _mReportedCategories = new ArrayList<>();
 	private boolean doDebugLogs = false;
 	private boolean doTraceLogs = false;
 	private boolean quietMode = false;
@@ -56,7 +55,7 @@ public final class LogHelper {
 	 */
 	public void ResetCategories()
 	{
-		_mReportedCategories = new ArrayList<String>();
+		_mReportedCategories = new ArrayList<>();
 	}
 	
 	/**
diff --git a/src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java b/src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java
index 192fb07262..dafa1e628e 100644
--- a/src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java
+++ b/src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java
@@ -1,13 +1,12 @@
 package bloodasp.galacticgreg.auxiliary;
 
+import bloodasp.galacticgreg.api.ModDimensionDef;
+
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import bloodasp.galacticgreg.api.ModDimensionDef;
-
 /**
  * A simple FIFO-storage for Long-values
  * Will keep 50 values for each dimension in memory
@@ -18,13 +17,13 @@ public class ProfilingStorage {
 	
 	public ProfilingStorage()
 	{
-		mProfilingMap = new HashMap<String, List<Long>>();
+		mProfilingMap = new HashMap<>();
 	}
 	
 	/**
 	 * Add a new time to the list of pDimension. Will be ignored it tTotalTime == 0
 	 * @param pDimension
-	 * @param tTotalTime
+	 * @param pTotalTime
 	 */
 	public void AddTimeToList(ModDimensionDef pDimension, long pTotalTime)
 	{
@@ -34,7 +33,7 @@ public class ProfilingStorage {
 				return;
 			
 			if(!mProfilingMap.containsKey(pDimension.getDimIdentifier()))
-				mProfilingMap.put(pDimension.getDimIdentifier(), new LinkedList<Long>());
+				mProfilingMap.put(pDimension.getDimIdentifier(), new LinkedList<>());
 	
 			LinkedList<Long> ll = (LinkedList<Long>) mProfilingMap.get(pDimension.getDimIdentifier());
 			
@@ -64,14 +63,12 @@ public class ProfilingStorage {
 			long tAverage = 0;
 			long tReturnVal = 0;
 			
-			LinkedList ll = (LinkedList) mProfilingMap.get(pDimension.getDimIdentifier());
+			LinkedList<Long> ll = (LinkedList<Long>) mProfilingMap.get(pDimension.getDimIdentifier());
 			
 			if(ll != null)
 			{
-				Iterator<Long> qItr = ll.iterator();
-				while(qItr.hasNext())
-				{
-					tAverage += qItr.next();
+				for (Long aLong : ll) {
+					tAverage += aLong;
 					tTotalVal++;
 				}
 				
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;
     }
 }
diff --git a/src/main/java/bloodasp/galacticgreg/command/AEStorageCommand.java b/src/main/java/bloodasp/galacticgreg/command/AEStorageCommand.java
index 930b0d307c..e165c2ab40 100644
--- a/src/main/java/bloodasp/galacticgreg/command/AEStorageCommand.java
+++ b/src/main/java/bloodasp/galacticgreg/command/AEStorageCommand.java
@@ -1,13 +1,11 @@
 package bloodasp.galacticgreg.command;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
+import appeng.api.util.WorldCoord;
+import appeng.items.storage.ItemSpatialStorageCell;
+import bloodasp.galacticgreg.GalacticGreg;
+import bloodasp.galacticgreg.auxiliary.PlayerChatHelper;
+import bloodasp.galacticgreg.schematics.SpaceSchematic;
+import bloodasp.galacticgreg.schematics.SpaceSchematicFactory;
 import net.minecraft.block.Block;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
@@ -15,27 +13,22 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import appeng.api.util.WorldCoord;
-import appeng.items.storage.ItemSpatialStorageCell;
-import bloodasp.galacticgreg.GalacticGreg;
-import bloodasp.galacticgreg.auxiliary.PlayerChatHelper;
-import bloodasp.galacticgreg.schematics.SpaceSchematic;
-import bloodasp.galacticgreg.schematics.SpaceSchematicFactory;
-import bloodasp.galacticgreg.schematics.SpaceSchematicHandler;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * This command allows to export any structure that has been stored inside a spatial storage cell
  * to a xml file that can later be enabled for spawning in dimensions.
  */
 public class AEStorageCommand implements ICommand {
-	private List aliases;
+	private List<String> aliases;
 	public AEStorageCommand()
 	{
-		this.aliases = new ArrayList();
+		this.aliases = new ArrayList<>();
 		this.aliases.add("exportae");
 	}
 	
@@ -52,7 +45,7 @@ public class AEStorageCommand implements ICommand {
 	}
 	
 	  @Override
-	  public List getCommandAliases()
+	  public List<String> getCommandAliases()
 	  {
 	    return this.aliases;
 	  }
@@ -67,7 +60,7 @@ public class AEStorageCommand implements ICommand {
 				  if (pArgs.length < 1)
 					  return;
 				  
-				  String tName = pArgs[0].toString();
+				  String tName = pArgs[0];
 				  
 				  EntityPlayer tEP = (EntityPlayer) pCommandSender;
 				  // Check if item in hand is a spatial storage cell
@@ -176,6 +169,7 @@ public class AEStorageCommand implements ICommand {
 		return 0;
 	}
 
+	@SuppressWarnings("rawtypes")
 	@Override
 	public List addTabCompletionOptions(ICommandSender p_71516_1_,
 			String[] p_71516_2_) {
diff --git a/src/main/java/bloodasp/galacticgreg/command/ProfilingCommand.java b/src/main/java/bloodasp/galacticgreg/command/ProfilingCommand.java
index 2626348da7..76b770a271 100644
--- a/src/main/java/bloodasp/galacticgreg/command/ProfilingCommand.java
+++ b/src/main/java/bloodasp/galacticgreg/command/ProfilingCommand.java
@@ -1,19 +1,19 @@
 package bloodasp.galacticgreg.command;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.ChatComponentText;
 import bloodasp.galacticgreg.GalacticGreg;
 import bloodasp.galacticgreg.api.ModContainer;
 import bloodasp.galacticgreg.api.ModDimensionDef;
 import bloodasp.galacticgreg.registry.GalacticGregRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
+import net.minecraft.command.ICommand;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ChatComponentText;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Ingame command to get the average oregen time(s) for the active dimensions
@@ -21,10 +21,10 @@ import cpw.mods.fml.relauncher.Side;
  *
  */
 public class ProfilingCommand implements ICommand {
-	private List aliases;
+	private List<String> aliases;
 	public ProfilingCommand()
 	{
-		this.aliases = new ArrayList();
+		this.aliases = new ArrayList<>();
 		this.aliases.add("ggregprofiler");
 	}
 	
@@ -41,7 +41,7 @@ public class ProfilingCommand implements ICommand {
 	}
 	
 	  @Override
-	  public List getCommandAliases()
+	  public List<String> getCommandAliases()
 	  {
 	    return this.aliases;
 	  }
@@ -87,6 +87,7 @@ public class ProfilingCommand implements ICommand {
 		return 0;
 	}
 
+	@SuppressWarnings("rawtypes")
 	@Override
 	public List addTabCompletionOptions(ICommandSender p_71516_1_,
 			String[] p_71516_2_) {
diff --git a/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicDimensionConfig.java b/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicDimensionConfig.java
index 73f4a462b0..143174d481 100644
--- a/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicDimensionConfig.java
+++ b/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicDimensionConfig.java
@@ -1,16 +1,15 @@
 package bloodasp.galacticgreg.dynconfig;
 
-import gregtech.api.GregTech_API;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import net.minecraftforge.common.ChestGenHooks;
 import bloodasp.galacticgreg.GalacticGreg;
 import bloodasp.galacticgreg.api.Enums.DimensionType;
 import bloodasp.galacticgreg.api.ModContainer;
 import bloodasp.galacticgreg.api.ModDimensionDef;
 import bloodasp.galacticgreg.registry.GalacticGregRegistry;
+import gregtech.api.GregTech_API;
+import net.minecraftforge.common.ChestGenHooks;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * This dynamic config is different to the OreMix one. This is used/bound to the ModDimensionDef,
@@ -37,7 +36,7 @@ public class DynamicDimensionConfig {
 		public boolean RandomizeNumLootItems;
 	}
 	
-	private static Map<String, AsteroidConfig> _mDynamicAsteroidMap = new HashMap<String, AsteroidConfig>();
+	private static Map<String, AsteroidConfig> _mDynamicAsteroidMap = new HashMap<>();
 
 	private static String getConfigKeyName(ModContainer pMC, ModDimensionDef pMDD)
 	{
@@ -51,10 +50,7 @@ public class DynamicDimensionConfig {
 	
 	public static AsteroidConfig getAsteroidConfig(ModDimensionDef pDimDef)
 	{
-		if (!_mDynamicAsteroidMap.containsKey(pDimDef.getDimIdentifier()))
-			return null;
-		else
-			return _mDynamicAsteroidMap.get(pDimDef.getDimIdentifier());
+		return _mDynamicAsteroidMap.getOrDefault(pDimDef.getDimIdentifier(), null);
 	}
 	
 	public static boolean InitDynamicConfig()
diff --git a/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicOreMixWorldConfig.java b/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicOreMixWorldConfig.java
index ff6336cf1e..6571cd12a8 100644
--- a/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicOreMixWorldConfig.java
+++ b/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicOreMixWorldConfig.java
@@ -1,14 +1,13 @@
 package bloodasp.galacticgreg.dynconfig;
 
-import gregtech.api.GregTech_API;
-
-import java.util.HashMap;
-import java.util.Map;
-
 import bloodasp.galacticgreg.GalacticGreg;
 import bloodasp.galacticgreg.api.ModContainer;
 import bloodasp.galacticgreg.api.ModDimensionDef;
 import bloodasp.galacticgreg.registry.GalacticGregRegistry;
+import gregtech.api.GregTech_API;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * This is the dynamic config class for every ore-vein that will generate config values according to the dimension and
@@ -16,7 +15,12 @@ import bloodasp.galacticgreg.registry.GalacticGregRegistry;
  */
 public class DynamicOreMixWorldConfig {
 	private String _mWorldGenName;
-	private Map<String, Boolean> _mDynWorldConfigMap = null;
+
+	public Map<String, Boolean> get_mDynWorldConfigMap() {
+		return new HashMap<>(_mDynWorldConfigMap != null ? _mDynWorldConfigMap : new HashMap<>());
+	}
+
+	private Map<String, Boolean> _mDynWorldConfigMap;
 	private final String _mConfigName;
 	
 	private String getConfigKeyName(ModContainer pMC, ModDimensionDef pMDD)
@@ -40,13 +44,13 @@ public class DynamicOreMixWorldConfig {
 	public DynamicOreMixWorldConfig(String pWorldGenName)
 	{
 		_mWorldGenName = pWorldGenName;
-		_mDynWorldConfigMap = new HashMap<String, Boolean>();
+		_mDynWorldConfigMap = new HashMap<>();
 		_mConfigName = String.format("worldgen.%s", _mWorldGenName);
 	}
 
 	public DynamicOreMixWorldConfig(String pWorldGenName, boolean bw){
 		_mWorldGenName = pWorldGenName;
-		_mDynWorldConfigMap = new HashMap<String, Boolean>();
+		_mDynWorldConfigMap = new HashMap<>();
 		_mConfigName = String.format("worldgen.gagregbartworks.%s", _mWorldGenName);
 	}
 
@@ -58,10 +62,7 @@ public class DynamicOreMixWorldConfig {
 	public boolean isEnabledInDim(ModDimensionDef pMDD)
 	{
 		String tDimIdentifier = pMDD.getDimIdentifier();
-		if (_mDynWorldConfigMap.containsKey(tDimIdentifier))
-			return _mDynWorldConfigMap.get(tDimIdentifier);
-		else
-			return false;
+		return _mDynWorldConfigMap.getOrDefault(tDimIdentifier, false);
 	}
 	
 	/**
diff --git a/src/main/java/bloodasp/galacticgreg/generators/GenEllipsoid.java b/src/main/java/bloodasp/galacticgreg/generators/GenEllipsoid.java
index e4beaf1a7a..621d237221 100644
--- a/src/main/java/bloodasp/galacticgreg/generators/GenEllipsoid.java
+++ b/src/main/java/bloodasp/galacticgreg/generators/GenEllipsoid.java
@@ -1,18 +1,15 @@
 package bloodasp.galacticgreg.generators;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import bloodasp.galacticgreg.GalacticGreg;
 import bloodasp.galacticgreg.api.Enums.SpaceObjectType;
 import bloodasp.galacticgreg.api.Enums.TargetBlockPosition;
 import bloodasp.galacticgreg.api.ISpaceObjectGenerator;
 import bloodasp.galacticgreg.api.StructureInformation;
-import net.minecraft.init.Blocks;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
-import net.minecraft.world.World;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
 
 /**
  * Simple ellipsoid-generator. Based on the formular created by Chrysator.
@@ -130,7 +127,7 @@ public class GenEllipsoid implements ISpaceObjectGenerator {
 
 	@Override
 	public void reset() {
-		_mStructure = new ArrayList<StructureInformation>();
+		_mStructure = new ArrayList<>();
 		_mEllipsoidCenter = Vec3.createVectorHelper(0, 0, 0);
 	}
 }
diff --git a/src/main/java/bloodasp/galacticgreg/registry/GalacticGregRegistry.java b/src/main/java/bloodasp/galacticgreg/registry/GalacticGregRegistry.java
index 3a4d57a118..243a008e1b 100644
--- a/src/main/java/bloodasp/galacticgreg/registry/GalacticGregRegistry.java
+++ b/src/main/java/bloodasp/galacticgreg/registry/GalacticGregRegistry.java
@@ -1,10 +1,5 @@
 package bloodasp.galacticgreg.registry;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import net.minecraft.world.chunk.IChunkProvider;
 import bloodasp.galacticgreg.GalacticGreg;
 import bloodasp.galacticgreg.api.Enums.DimensionType;
 import bloodasp.galacticgreg.api.ModContainer;
@@ -12,13 +7,18 @@ import bloodasp.galacticgreg.api.ModDimensionDef;
 import bloodasp.galacticgreg.dynconfig.DynamicDimensionConfig;
 import bloodasp.galacticgreg.generators.GenEllipsoid;
 import cpw.mods.fml.common.Loader;
+import net.minecraft.world.chunk.IChunkProvider;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * GalacticGregs registry
  *
  */
 public class GalacticGregRegistry {
-	private static final Map<String, ModContainer> _mModContainers = new HashMap<String, ModContainer>();
+	private static final Map<String, ModContainer> _mModContainers = new HashMap<>();
 	public static final String DIM_UNKNOWN = "GGREG_DIMENSION_UNKNOWN";
 	private static boolean _mInitializationDone = false;
 	
diff --git a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java
index 606f2318ad..2173bd9067 100644
--- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java
+++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java
@@ -1,18 +1,11 @@
 package bloodasp.galacticgreg.schematics;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
+import bloodasp.galacticgreg.api.StructureInformation;
 import net.minecraft.block.Block;
 import net.minecraft.util.Vec3;
-import bloodasp.galacticgreg.api.StructureInformation;
+
+import javax.xml.bind.annotation.*;
+import java.util.ArrayList;
 
 /**
  * Class for XML Structure files. You only should edit/use this file/class if you want to add/fix stuff with 
@@ -65,7 +58,7 @@ public class SpaceSchematic {
 	public ArrayList<BaseStructureInfo> coordInfo()
 	{
 		if (mStructureInfoList == null)
-			mStructureInfoList = new ArrayList<BaseStructureInfo>();
+			mStructureInfoList = new ArrayList<>();
 		
 		return mStructureInfoList;
 	}
@@ -73,7 +66,7 @@ public class SpaceSchematic {
 	public void addStructureInfo(StructureInformation pStrucInfo)
 	{
 		if (mStructureInfoList == null)
-			mStructureInfoList = new ArrayList<BaseStructureInfo>();
+			mStructureInfoList = new ArrayList<>();
 		mStructureInfoList.add(new BaseStructureInfo(pStrucInfo));
 	}
 	
diff --git a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicFactory.java b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicFactory.java
index d2fdf7716e..4aea25129f 100644
--- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicFactory.java
+++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicFactory.java
@@ -1,13 +1,11 @@
 package bloodasp.galacticgreg.schematics;
 
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.Vec3;
 import bloodasp.galacticgreg.api.Enums.AllowedBlockPosition;
 import bloodasp.galacticgreg.api.Enums.TargetBlockPosition;
 import bloodasp.galacticgreg.api.SpecialBlockComb;
 import bloodasp.galacticgreg.api.StructureInformation;
-import bloodasp.galacticgreg.schematics.SpaceSchematic.BaseStructureInfo;
+import net.minecraft.block.Block;
+import net.minecraft.util.Vec3;
 
 /**
  * Class for XML Structure files. You only should edit/use this file/class if you want to add/fix stuff with 
@@ -28,7 +26,6 @@ public class SpaceSchematicFactory {
 
 	public static StructureInformation createStructureInfo(int pX, int pY, int pZ, Block pBlock, int pMeta)
 	{
-		StructureInformation si = new StructureInformation(Vec3.createVectorHelper(pX, pY, pZ), TargetBlockPosition.Invalid, new SpecialBlockComb(pBlock, pMeta, AllowedBlockPosition.AsteroidCoreAndShell));
-		return si;
+		return new StructureInformation(Vec3.createVectorHelper(pX, pY, pZ), TargetBlockPosition.Invalid, new SpecialBlockComb(pBlock, pMeta, AllowedBlockPosition.AsteroidCoreAndShell));
 	}
 }
diff --git a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicHandler.java b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicHandler.java
index f44aaa4b88..50b5bb53aa 100644
--- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicHandler.java
+++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicHandler.java
@@ -1,22 +1,17 @@
 package bloodasp.galacticgreg.schematics;
 
+import bloodasp.galacticgreg.GalacticGreg;
+import org.apache.commons.io.FileUtils;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-
-import org.apache.commons.io.FileUtils;
-
-import net.minecraft.util.Vec3;
-import bloodasp.galacticgreg.GalacticGreg;
-import bloodasp.galacticgreg.api.Enums.SpaceObjectType;
-import bloodasp.galacticgreg.api.StructureInformation;
-
 /**
  * Class for XML Structure files. You only should edit/use this file/class if you want to add/fix stuff with 
  * GalacticGreg itself, and never if you're a mod developer and want to add support for GGreg to your mod.
@@ -28,12 +23,13 @@ public class SpaceSchematicHandler {
 	File _mSchematicsFolderName;
 	private List<SpaceSchematic> _mSpaceSchematics;
 	
+	@SuppressWarnings("ResultOfMethodCallIgnored")
 	public SpaceSchematicHandler(File pConfigFolder)
 	{
 		_mConfigFolderName = new File(String.format("%s/%s", pConfigFolder.toString(), GalacticGreg.NICE_MODID));
 		_mSchematicsFolderName = new File(String.format("%s/schematics", _mConfigFolderName));
 
-		_mSpaceSchematics = new ArrayList<SpaceSchematic>();
+		_mSpaceSchematics = new ArrayList<>();
 		
 		if (!_mSchematicsFolderName.exists())
 			_mSchematicsFolderName.mkdirs();
@@ -45,7 +41,7 @@ public class SpaceSchematicHandler {
 	public SpaceSchematic getRandomSpaceSchematic()
 	{
 		int tRandomChance = GalacticGreg.GalacticRandom.nextInt(100);
-		List<Integer> tRandomIDs = new ArrayList<Integer>();
+		List<Integer> tRandomIDs = new ArrayList<>();
 		SpaceSchematic tChoosenSchematic = null;
 		
 		if (_mSpaceSchematics == null)
@@ -88,7 +84,7 @@ public class SpaceSchematicHandler {
 		try
 		{
 			Collection<File> structureFiles = FileUtils.listFiles(_mSchematicsFolderName, new String[] {"xml"}, false);
-			List<SpaceSchematic> tNewSpaceSchematics = new ArrayList<SpaceSchematic>();
+			List<SpaceSchematic> tNewSpaceSchematics = new ArrayList<>();
 			int tErrorsFound = 0;
 			
 			if (structureFiles.isEmpty())
@@ -111,7 +107,6 @@ public class SpaceSchematicHandler {
 				{
 					GalacticGreg.Logger.error("Error while loading Schematic %s", tSchematic);
 					e.printStackTrace();
-					continue;
 				}
 				
 			}
diff --git a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicWrapper.java b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicWrapper.java
index d0fc1d68a3..948a4e52a5 100644
--- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicWrapper.java
+++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicWrapper.java
@@ -1,11 +1,5 @@
 package bloodasp.galacticgreg.schematics;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.block.Block;
-import net.minecraft.util.Vec3;
 import bloodasp.galacticgreg.GalacticGreg;
 import bloodasp.galacticgreg.api.BlockMetaComb;
 import bloodasp.galacticgreg.api.Enums.SpaceObjectType;
@@ -13,6 +7,12 @@ import bloodasp.galacticgreg.api.Enums.TargetBlockPosition;
 import bloodasp.galacticgreg.api.ISpaceObjectGenerator;
 import bloodasp.galacticgreg.api.StructureInformation;
 import bloodasp.galacticgreg.schematics.SpaceSchematic.BaseStructureInfo;
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.util.Vec3;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Class for XML Structure files. You only should edit/use this file/class if you want to add/fix stuff with 
@@ -40,7 +40,7 @@ public class SpaceSchematicWrapper implements ISpaceObjectGenerator {
 	 */
 	private void RecalculatePosition()
 	{
-		_mFinalizedStructure = new ArrayList<StructureInformation>();
+		_mFinalizedStructure = new ArrayList<>();
 		
 		for (BaseStructureInfo bsi: _mSchematic.coordInfo())
 		{