From 03e72a68aee10a871b3186d141b14c76770c72fb Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 1 Jul 2018 17:47:03 +1000
Subject: $ 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.

---
 .../plugin/villagers/block/BlockGenericSpawner.java           | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/Java/gtPlusPlus/plugin/villagers/block')

diff --git a/src/Java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java b/src/Java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java
index ef41ddbaf0..5f3e704818 100644
--- a/src/Java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java
+++ b/src/Java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java
@@ -4,8 +4,12 @@ import static gtPlusPlus.core.lib.CORE.RANDOM;
 
 import java.util.List;
 
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.plugin.villagers.Core_VillagerAdditions;
 import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
 import net.minecraft.block.BlockMobSpawner;
 import net.minecraft.creativetab.CreativeTabs;
@@ -21,8 +25,11 @@ public class BlockGenericSpawner extends BlockMobSpawner {
 		this.disableStats();
 		this.setHardness(5.0F);
 		this.setStepSound(soundTypeMetal);
-		this.setBlockName("mobSpawner");
+		this.setBlockName("blockMobSpawnerEx");
 		this.setBlockTextureName("mob_spawner");
+		this.setResistance(2000.0F);
+		GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockMobSpawnerEx");
+		Core_VillagerAdditions.mInstance.log("Registered Custom Spawner Block.");
 	}
 	
 	/**
@@ -45,7 +52,7 @@ public class BlockGenericSpawner extends BlockMobSpawner {
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_)
     {
-        for (int i = 0; i < TileEntityGenericSpawner.mSpawners.size(); ++i)
+        for (int i = 0; i < Math.max(1,TileEntityGenericSpawner.mSpawners.size()); ++i)
         {
             p_149666_3_.add(new ItemStack(p_149666_1_, 1, i));
         }
-- 
cgit