2 files changed, 20 insertions, 23 deletions
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);
 	}
 	
 	/**