$ Fixed Custom Spawner Generation.

$ Fixed Custom Spawner Registration.
$ Fixed Spawner importing private static fields from the base TileEntity class via reflection.
$ Fixed Spawner writing type to NBT.

2 files changed, 15 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index c1ca513f01..be98bdf3f4 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -95,9 +95,7 @@ public final class ModBlocks {
 		blockWitherGuard = new BlockWitherProof();
 		blockXpConverter = new BlockTankXpConverter();
 		blockCompressedObsidian = new BlockCompressedObsidian();
-		blockNet = new BlockNet();
-		
-		blockCustomMobSpawner = new BlockGenericSpawner();
+		blockNet = new BlockNet();		
 
 		blockFakeMiningPipe = new Mining_Pipe_Fake();
 		blockFakeMiningHead = new Mining_Head_Fake();
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index c142843642..7f9aa7098b 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -15,7 +15,8 @@ import javax.xml.bind.DatatypeConverter;
 import org.apache.commons.lang3.EnumUtils;
 
 import cpw.mods.fml.common.FMLCommonHandler;
-
+import cpw.mods.fml.common.registry.EntityRegistry;
+import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
@@ -833,12 +834,21 @@ public class Utils {
 		Class<Entity> c;		
 		if (aEntity instanceof Entity) {
 			c = (Class<Entity>) aEntity.getClass();
-			TileEntityGenericSpawner.registerNewMobSpawner(aID, c);
+			createNewMobSpawner(aID, c);
 		}
 	}
 	
-	public static void createNewMobSpawner(int aID, Class aEntity) {		
-		TileEntityGenericSpawner.registerNewMobSpawner(aID, aEntity);
+	public static void createNewMobSpawner(int aID, Class aEntity) {	
+		Logger.INFO("[Spawn] Generating new spawner for entity with class ("+aEntity.getCanonicalName()+").");
+		if (TileEntityGenericSpawner.registerNewMobSpawner(aID, aEntity)) {
+			EntityRegistration x = EntityRegistry.instance().lookupModSpawn(aEntity, false);
+			if (x != null) {
+				Logger.INFO("[Spawn] Registration for "+x.getEntityName()+" successful");
+			}
+		}
+		else {
+			Logger.INFO("[Spawn] Registration for "+aEntity.getName()+" failed");			
+		}
 	}
 
 }