Streamline the code here and make the blacklist and whitelist for dimensions code actually work

Author: dshadowwolf

src/main/java/com/mcmoddev/orespawn/EventHandlers.java

@@ -46,7 +46,7 @@ public class EventHandlers {
 
     private List<EventType> vanillaEvents = Arrays.asList(EventType.ANDESITE, EventType.COAL, EventType.DIAMOND, EventType.DIORITE, EventType.DIRT,
     		EventType.EMERALD, EventType.GOLD, EventType.GRANITE, EventType.GRAVEL, EventType.IRON, EventType.LAPIS, EventType.REDSTONE, 
-    		EventType.QUARTZ, EventType.SILVERFISH);
+    		EventType.QUARTZ, EventType.SILVERFISH );
 
     @SubscribeEvent(priority = EventPriority.HIGHEST, receiveCanceled = true)
     public void onGenerateMinable(OreGenEvent.GenerateMinable event) {

src/main/java/com/mcmoddev/orespawn/json/OS3Reader.java

@@ -156,9 +156,10 @@ private static void finallyParse(JsonObject parseJson, String filename) {
 					spawn.enabled( nw.get(ConfigNames.V2.ENABLED).getAsBoolean());
 					spawn.retrogen( nw.get(ConfigNames.V2.RETROGEN).getAsBoolean());
 
-					if( nw.has( ConfigNames.DIMENSION) )
-						spawn.create( biomes, gen, replacements, nw.getAsJsonObject( ConfigNames.DIMENSION ), blocks.toArray( new OreBuilder[0]) );
-					else
+					if( nw.has( ConfigNames.DIMENSION) ) {
+						OreSpawn.LOGGER.fatal( "Entry has %s tag with contents: %s", ConfigNames.DIMENSION, nw.getAsJsonObject( ConfigNames.DIMENSION ) );
+						spawn.create( biomes, gen, replacements, nw.getAsJsonObject( ConfigNames.DIMENSION ), blocks.toArray( new OreBuilder[0] ) );
+					} else
 						spawn.create(biomes, gen, replacements, blocks.toArray( new OreBuilder[0] ) );
 
 					builder.create(spawn);

src/main/java/com/mcmoddev/orespawn/worldgen/OreSpawnWorldGen.java

@@ -49,17 +49,17 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG
 
 		int thisDim = world.provider.getDimension();
 		List<SpawnBuilder> entries = new ArrayList<> ( this.dimensions.getOrDefault ( thisDim, new ArrayList<> () ) );
-		
-		if( entries.isEmpty() && (thisDim == -1 || thisDim == 1)) return;
 
-		if( (thisDim != -1 && thisDim != 1) && !(this.dimensions.getOrDefault(OreSpawn.API.dimensionWildcard(), new ArrayList<>()).isEmpty()) ) {
-			entries.addAll(this.dimensions.get(OreSpawn.API.dimensionWildcard()));
+		if( !this.dimensions.getOrDefault( OreSpawn.API.dimensionWildcard(), new ArrayList<>() ).isEmpty() ) {
+			entries.addAll(this.dimensions.get( OreSpawn.API.dimensionWildcard() ).stream()
+				                .filter( ent -> (!ent.hasExtendedDimensions() && thisDim > 0 && thisDim != 1) ||
+					                                 ent.extendedDimensionsMatch( thisDim ) )
+				                .collect( Collectors.toList()) );
 		}
 
 		entries.stream()
 		.filter( SpawnBuilder::enabled )
 		.filter( sb -> !Config.getBoolean ( Constants.RETROGEN_KEY ) || (sb.retrogen () || Config.getBoolean ( Constants.FORCE_RETROGEN_KEY )) )
-		.filter( ent -> ent.hasExtendedDimensions() || ent.extendedDimensionsMatch(thisDim) )
 		.forEach( sE -> {
 			IFeature currentFeatureGen = sE.getFeatureGen().getGenerator();
 			List<IBlockState> replacement = sE.getReplacementBlocks();