$ Fixed LFTR tooltip not mentioning which casings to use.

% More messing around with entity rendering and some custom mobs.

8 files changed, 308 insertions, 26 deletions

diff --git a/src/Java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/Java/gtPlusPlus/core/client/model/ModelSickBlaze.java
new file mode 100644
index 0000000000..43930fb9fb
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/client/model/ModelSickBlaze.java
@@ -0,0 +1,92 @@
+package gtPlusPlus.core.client.model;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.model.ModelBlaze;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
+
+@SideOnly(Side.CLIENT)
+public class ModelSickBlaze extends ModelBlaze
+{
+    /** The sticks that fly around the Blaze. */
+    private ModelRenderer[] blazeSticks = new ModelRenderer[24];
+    private ModelRenderer blazeHead;
+
+    public ModelSickBlaze()
+    {
+        for (int i = 0; i < this.blazeSticks.length; ++i)
+        {
+            this.blazeSticks[i] = new ModelRenderer(this, 0, 16);
+            this.blazeSticks[i].addBox(0.0F, 0.0F, 0.0F, 2, 8, 2);
+        }
+
+        this.blazeHead = new ModelRenderer(this, 0, 0);
+        this.blazeHead.addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8);
+    }
+
+    @Override
+	public int func_78104_a()
+    {
+        return 8;
+    }
+
+    /**
+     * Sets the models various rotation angles then renders the model.
+     */
+    @Override
+	public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
+    {
+        this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
+        this.blazeHead.render(p_78088_7_);
+
+        for (int i = 0; i < this.blazeSticks.length; ++i)
+        {
+            this.blazeSticks[i].render(p_78088_7_);
+        }
+    }
+
+    /**
+     * Sets the model's various rotation angles. For bipeds, par1 and par2 are used for animating the movement of arms
+     * and legs, where par1 represents the time(so that arms and legs swing back and forth) and par2 represents how
+     * "far" arms and legs can swing at most.
+     */
+    @Override
+	public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
+    {
+        float f6 = p_78087_3_ * (float)Math.PI * -0.1F;
+        int i;
+
+        for (i = 0; i < 4; ++i)
+        {
+            this.blazeSticks[i].rotationPointY = -2.0F + MathHelper.cos((i * 2 + p_78087_3_) * 0.25F);
+            this.blazeSticks[i].rotationPointX = MathHelper.cos(f6) * 9.0F;
+            this.blazeSticks[i].rotationPointZ = MathHelper.sin(f6) * 9.0F;
+            ++f6;
+        }
+
+        f6 = ((float)Math.PI / 4F) + p_78087_3_ * (float)Math.PI * 0.03F;
+
+        for (i = 4; i < 8; ++i)
+        {
+            this.blazeSticks[i].rotationPointY = 2.0F + MathHelper.cos((i * 2 + p_78087_3_) * 0.25F);
+            this.blazeSticks[i].rotationPointX = MathHelper.cos(f6) * 7.0F;
+            this.blazeSticks[i].rotationPointZ = MathHelper.sin(f6) * 7.0F;
+            ++f6;
+        }
+
+        f6 = 0.47123894F + p_78087_3_ * (float)Math.PI * -0.05F;
+
+        for (i = 8; i < 12; ++i)
+        {
+            this.blazeSticks[i].rotationPointY = 11.0F + MathHelper.cos((i * 1.5F + p_78087_3_) * 0.5F);
+            this.blazeSticks[i].rotationPointX = MathHelper.cos(f6) * 5.0F;
+            this.blazeSticks[i].rotationPointZ = MathHelper.sin(f6) * 5.0F;
+            ++f6;
+        }
+
+        this.blazeHead.rotateAngleY = p_78087_4_ / (180F / (float)Math.PI);
+        this.blazeHead.rotateAngleX = p_78087_5_ / (180F / (float)Math.PI);
+    }
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java b/src/Java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java
new file mode 100644
index 0000000000..7ed95bd541
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java
@@ -0,0 +1,94 @@
+package gtPlusPlus.core.client.renderer;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.client.model.ModelSickBlaze;
+import gtPlusPlus.core.entity.monster.EntitySickBlaze;
+import net.minecraft.client.renderer.entity.RenderLiving;
+import net.minecraft.entity.*;
+import net.minecraft.util.ResourceLocation;
+
+@SideOnly(Side.CLIENT)
+public class RenderSickBlaze extends RenderLiving
+{
+    private static final ResourceLocation blazeTextures = new ResourceLocation("textures/entity/slime.png");
+    private int field_77068_a;
+
+    public RenderSickBlaze()
+    {
+        super(new ModelSickBlaze(), 0.5F);
+        this.field_77068_a = ((ModelSickBlaze)this.mainModel).func_78104_a();
+    }
+
+    /**
+     * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+     * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+     * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+     * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
+     */
+    public void doRender(EntitySickBlaze p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+    {
+        int i = ((ModelSickBlaze)this.mainModel).func_78104_a();
+
+        if (i != this.field_77068_a)
+        {
+            this.field_77068_a = i;
+            this.mainModel = new ModelSickBlaze();
+        }
+
+        super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+    }
+
+    /**
+     * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
+     */
+    protected ResourceLocation getEntityTexture(EntitySickBlaze p_110775_1_)
+    {
+        return blazeTextures;
+    }
+
+    /**
+     * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+     * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+     * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+     * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
+     */
+    @Override
+	public void doRender(EntityLiving p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+    {
+        this.doRender((EntitySickBlaze)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+    }
+
+    /**
+     * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+     * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+     * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+     * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
+     */
+    @Override
+	public void doRender(EntityLivingBase p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+    {
+        this.doRender((EntitySickBlaze)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+    }
+
+    /**
+     * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
+     */
+    @Override
+	protected ResourceLocation getEntityTexture(Entity p_110775_1_)
+    {
+        return this.getEntityTexture((EntitySickBlaze)p_110775_1_);
+    }
+
+    /**
+     * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+     * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+     * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+     * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
+     */
+    @Override
+	public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+    {
+        this.doRender((EntitySickBlaze)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+    }
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderToxinball.java b/src/Java/gtPlusPlus/core/client/renderer/RenderToxinball.java
new file mode 100644
index 0000000000..774e506146
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/client/renderer/RenderToxinball.java
@@ -0,0 +1,91 @@
+package gtPlusPlus.core.client.renderer;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.entity.projectile.EntityToxinball;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Items;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+
+@SideOnly(Side.CLIENT)
+public class RenderToxinball extends Render
+{
+    private float mSize;
+
+    public RenderToxinball(float scale)
+    {
+        this.mSize = scale;
+    }
+
+    /**
+     * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+     * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+     * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+     * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
+     */
+    public void doRender(EntityToxinball entity, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+    {
+        GL11.glPushMatrix();
+        this.bindEntityTexture(entity);
+        GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_);
+        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+        float f2 = this.mSize;
+        GL11.glScalef(f2 / 1.0F, f2 / 1.0F, f2 / 1.0F);
+        IIcon iicon = Items.slime_ball.getIconFromDamage(0);
+        Tessellator tessellator = Tessellator.instance;
+        float f3 = iicon.getMinU();
+        float f4 = iicon.getMaxU();
+        float f5 = iicon.getMinV();
+        float f6 = iicon.getMaxV();
+        float f7 = 1.0F;
+        float f8 = 0.5F;
+        float f9 = 0.25F;
+        GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
+        GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
+        tessellator.startDrawingQuads();
+        tessellator.setNormal(0.0F, 1.0F, 0.0F);
+        tessellator.addVertexWithUV(0.0F - f8, 0.0F - f9, 0.0D, f3, f6);
+        tessellator.addVertexWithUV(f7 - f8, 0.0F - f9, 0.0D, f4, f6);
+        tessellator.addVertexWithUV(f7 - f8, 1.0F - f9, 0.0D, f4, f5);
+        tessellator.addVertexWithUV(0.0F - f8, 1.0F - f9, 0.0D, f3, f5);
+        tessellator.draw();
+        GL11.glDisable(GL12.GL_RESCALE_NORMAL);
+        GL11.glPopMatrix();
+    }
+
+    /**
+     * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
+     */
+    protected ResourceLocation getEntityTexture(EntityToxinball entity)
+    {
+        return TextureMap.locationItemsTexture;
+    }
+
+    /**
+     * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
+     */
+    @Override
+	protected ResourceLocation getEntityTexture(Entity entity)
+    {
+        return this.getEntityTexture((EntityToxinball)entity);
+    }
+
+    /**
+     * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
+     * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
+     * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
+     * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
+     */
+    @Override
+	public void doRender(Entity entity, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
+    {
+        this.doRender((EntityToxinball)entity, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+    }
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java b/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java
index 4d46c0a5ca..0c650ed3f2 100644
--- a/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java
+++ b/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java
@@ -19,6 +19,7 @@ public class EntitySickBlaze extends EntityBlaze {
 	/** ticks until heightOffset is randomized */
 	private int heightOffsetUpdateTime;
 	private int field_70846_g;
+	private final int mDataWatcherID = 30;
 
 	public EntitySickBlaze(World p_i1731_1_) {
 		super(p_i1731_1_);
@@ -35,7 +36,7 @@ public class EntitySickBlaze extends EntityBlaze {
 	@Override
 	protected void entityInit() {
 		super.entityInit();
-		this.dataWatcher.addObject(16, new Byte((byte) 0));
+		this.dataWatcher.addObject(mDataWatcherID, new Byte((byte) 0));
 	}
 
 	/**
@@ -209,12 +210,12 @@ public class EntitySickBlaze extends EntityBlaze {
 
 	@Override
 	public boolean func_70845_n() {
-		return (this.dataWatcher.getWatchableObjectByte(16) & 1) != 0;
+		return (this.dataWatcher.getWatchableObjectByte(mDataWatcherID) & 1) != 0;
 	}
 
 	@Override
 	public void func_70844_e(boolean p_70844_1_) {
-		byte b0 = this.dataWatcher.getWatchableObjectByte(16);
+		byte b0 = this.dataWatcher.getWatchableObjectByte(mDataWatcherID);
 
 		if (p_70844_1_) {
 			b0 = (byte) (b0 | 1);
@@ -223,7 +224,7 @@ public class EntitySickBlaze extends EntityBlaze {
 			b0 &= -2;
 		}
 
-		this.dataWatcher.updateObject(16, Byte.valueOf(b0));
+		this.dataWatcher.updateObject(mDataWatcherID, Byte.valueOf(b0));
 	}
 
 	/**
diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyWarrior.java b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
index b6829f6985..0006cae8af 100644
--- a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyWarrior.java
+++ b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
@@ -17,14 +17,14 @@ import net.minecraft.util.*;
 import net.minecraft.village.Village;
 import net.minecraft.world.World;
 
-public class EntityStaballoyWarrior extends EntityGolem {
+public class EntityStaballoyConstruct extends EntityGolem {
 	/** deincrements, and a distance-to-home check is done at 0 */
 	private int homeCheckTimer;
 	Village villageObj;
 	private int attackTimer;
 	private int holdRoseTick;
 
-	public EntityStaballoyWarrior(World world) {
+	public EntityStaballoyConstruct(World world) {
 		super(world);
 		this.setSize(1.4F, 2.9F);
 		this.getNavigator().setAvoidsWater(true);
@@ -274,10 +274,6 @@ public class EntityStaballoyWarrior extends EntityGolem {
 	 */
 	@Override
 	public void onDeath(DamageSource p_70645_1_) {
-		if (!this.isPlayerCreated() && this.attackingPlayer != null && this.villageObj != null) {
-			this.villageObj.setReputationForPlayer(this.attackingPlayer.getCommandSenderName(), -5);
-		}
-
 		super.onDeath(p_70645_1_);
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
index cce4aedbd7..d13e7f347b 100644
--- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -7,10 +7,13 @@ import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
-import gtPlusPlus.core.client.renderer.RenderMiningExplosivesPrimed;
+import gtPlusPlus.core.client.renderer.*;
 import gtPlusPlus.core.common.CommonProxy;
 import gtPlusPlus.core.common.compat.COMPAT_PlayerAPI;
 import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
+import gtPlusPlus.core.entity.monster.EntitySickBlaze;
+import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
+import gtPlusPlus.core.entity.projectile.EntityToxinballSmall;
 import gtPlusPlus.core.handler.render.FirepitRender;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.tileentities.general.TileEntityFirepit;
@@ -18,6 +21,7 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.particles.EntityParticleFXMysterious;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.EntityFX;
+import net.minecraft.client.renderer.entity.RenderIronGolem;
 import net.minecraft.entity.Entity;
 
 public class ClientProxy extends CommonProxy{
@@ -66,6 +70,9 @@ public class ClientProxy extends CommonProxy{
 		//RenderingRegistry.registerEntityRenderingHandler(EntityGrenade.class, new RenderSnowball(ModItems.tutGrenade));		
 		Utils.LOG_INFO("Registering Custom Renderer for Mining Explosives.");
 	    RenderingRegistry.registerEntityRenderingHandler(EntityPrimedMiningExplosive.class, new RenderMiningExplosivesPrimed());
+	    RenderingRegistry.registerEntityRenderingHandler(EntitySickBlaze.class, new RenderSickBlaze());
+	    RenderingRegistry.registerEntityRenderingHandler(EntityStaballoyConstruct.class, new RenderIronGolem());
+	    RenderingRegistry.registerEntityRenderingHandler(EntityToxinballSmall.class, new RenderToxinball(1F));
 
 		//ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBloodSteelChest.class, new BloodSteelChestRenderer());
 		//MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.tutChest), new ItemRenderBloodSteelChest());
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
index ed8b3f38b7..e13ce29872 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
@@ -6,10 +6,13 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.entity.monster.EntitySickBlaze;
+import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
-import net.minecraft.entity.monster.*;
+import net.minecraft.entity.monster.EntityGhast;
+import net.minecraft.entity.monster.EntityGiantZombie;
 import net.minecraft.entity.passive.*;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
@@ -77,7 +80,12 @@ public class Biome_DarkWorld {
 			//Enemies
 			this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 5, 1, 5));
 			this.spawnableMonsterList.add(new SpawnListEntry(EntityGiantZombie.class, 20, 1, 1));
-			addToMonsterSpawnLists(EntityBlaze.class, 5, 1, 5);
+			
+
+			addToMonsterSpawnLists(EntitySickBlaze.class, 5, 1, 5);
+			addToMonsterSpawnLists(EntityStaballoyConstruct.class, 5, 1, 5);
+			
+			/**addToMonsterSpawnLists(EntityBlaze.class, 5, 1, 5);
 			addToMonsterSpawnLists(EntityCaveSpider.class, 5, 1, 5);
 			addToMonsterSpawnLists(EntityCreeper.class, 4, 1, 2);
 			addToMonsterSpawnLists(EntityEnderman.class, 5, 1, 5);
@@ -85,7 +93,7 @@ public class Biome_DarkWorld {
 			addToMonsterSpawnLists(EntityPigZombie.class, 5, 1, 5);
 			addToMonsterSpawnLists(EntitySkeleton.class, 5, 1, 5);
 			addToMonsterSpawnLists(EntitySpider.class, 5, 1, 5);
-			addToMonsterSpawnLists(EntityZombie.class, 5, 1, 5);
+			addToMonsterSpawnLists(EntityZombie.class, 5, 1, 5);**/
 
 			//Passive
 			this.spawnableCreatureList.add(new SpawnListEntry(EntityCow.class, 5, 5, 10));
@@ -116,7 +124,7 @@ public class Biome_DarkWorld {
 		@SuppressWarnings("unchecked")
 		private boolean addToMonsterSpawnLists(Class<?> EntityClass, int a, int b, int c){
 			this.spawnableMonsterList.add(new SpawnListEntry(EntityClass, a, b, c));
-			this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c));
+			//this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c));
 			return true;
 		}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
index 11ac10db69..5021c4159a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
@@ -3,21 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.TAE;
-import gregtech.api.enums.Textures;
+import gregtech.api.enums.*;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.metatileentity.implementations.*;
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
@@ -65,6 +56,8 @@ public class GregtechMTE_NuclearReactor extends GT_MetaTileEntity_MultiBlockBase
 				"Controller Block for the Liquid Fluoride Thorium Reactor.",
 				"Produces Heat & Energy from Radioactive Beta Decay.",
 				"Size(WxHxD): 7x4x7, Controller (Bottom, Center)",
+				"Bottom and Top layer are Hastelloy-N Reactor Casing",
+				"Middle two layers are Zeron-100 Reactor Shielding",
 				"--Hatches go in the top or bottom layer edges--",
 				"10x IV+ Output Hatches",
 				"4x IV+ Input Hatches",