From 4f435ae75b176a9d90c7afa6b1ff40e9ba9c286a Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 28 Feb 2019 20:06:01 +0000
Subject: + Added a new debug tool. + Added support for Crops++. + Added Custom
 Crops & framework to support more in future. + Added basic support for all
 GT++ Materials within Tinkers Construct. [WIP] + Moderately bad attempt at
 generating custom Plasma Cooling recipes in the Adv. Vacuum Freezer. [WIP
 #424] % Reworked logic for Material.java handling Durability, Tool Quality &
 Harvest Level. % Adjusted frequency of structural checks on the Cyclotron,
 Now 100x less frequent. % Cleaned up ReflectionUtils.java and made all
 getters cache their results, for much faster access. % Attempted to adjust
 logic of FFPP, but I probably broke it. [WIP] % Moved static array of Element
 Names from IonParticles.java -> ELEMENT.java. $ Greatly improved reflective
 performance across the mod.

---
 .../core/world/gen/ChunkProviderGalactic.java      | 46 +++++++++++++++-------
 1 file changed, 31 insertions(+), 15 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/galacticraft/system')

diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/world/gen/ChunkProviderGalactic.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/core/world/gen/ChunkProviderGalactic.java
index 3b9633b21d..aafa9ef9a1 100644
--- a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/world/gen/ChunkProviderGalactic.java
+++ b/src/Java/gtPlusPlus/xmod/galacticraft/system/core/world/gen/ChunkProviderGalactic.java
@@ -4,12 +4,11 @@ import java.util.List;
 
 import com.google.common.collect.Lists;
 
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
 import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace;
 import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta;
-import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper;
-import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSkeleton;
-import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSpider;
 import net.minecraft.block.Block;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
@@ -46,20 +45,37 @@ public abstract class ChunkProviderGalactic extends ChunkProviderGalaxyLakes {
 	}
 
 	protected SpawnListEntry[] getMonsters() {
-		SpawnListEntry skele = new SpawnListEntry(EntityEvolvedSkeleton.class, 100, 4, 4);
-		SpawnListEntry creeper = new SpawnListEntry(EntityEvolvedCreeper.class, 100, 4, 4);
-		SpawnListEntry spider = new SpawnListEntry(EntityEvolvedSpider.class, 100, 4, 4);
+
+		Class aSkele = ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSkeleton");
+		Class aCreeper = ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper");
+		Class aSpider = ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSpider");
+		Class aEnderman = ReflectionUtils.getClass("galaxyspace.SolarSystem.planets.pluto.entities.EntityEvolvedEnderman");
+
+		SpawnListEntry skele;
+		SpawnListEntry creeper;
+		SpawnListEntry spider;
+		SpawnListEntry enderman;
 		
-		Class<?> aEnderman;
-		try {
-			aEnderman = Class.forName("galaxyspace.SolarSystem.planets.pluto.entities.EntityEvolvedEnderman");
-			if (aEnderman != null) {
-				SpawnListEntry enderman = new SpawnListEntry(aEnderman, 100, 4, 4);	
-				return new SpawnListEntry[] { skele, creeper, spider, enderman };			
-			}
-		} catch (ClassNotFoundException e) {}
+		AutoMap<SpawnListEntry> aMobs = new AutoMap<SpawnListEntry>();
 		
-		return new SpawnListEntry[] { skele, creeper, spider };
+		if (aSkele != null) {
+			skele = new SpawnListEntry(aSkele, 100, 4, 4);
+			aMobs.put(skele);
+		}
+		if (aCreeper != null) {
+			creeper = new SpawnListEntry(aCreeper, 100, 4, 4);
+			aMobs.put(creeper);
+		}
+		if (aSpider != null) {
+			spider = new SpawnListEntry(aSpider, 100, 4, 4);
+			aMobs.put(spider);
+		}
+		if (aEnderman != null) {
+			enderman = new SpawnListEntry(aEnderman, 100, 4, 4);
+			aMobs.put(enderman);
+		}
+
+		return aMobs.toArray();
 	}
 
 	public void onPopulate(IChunkProvider arg0, int arg1, int arg2) {
-- 
cgit