$ Fixed RTG reflection.

$ Fixed issue where RTGs would revert back to HV after a restart/rejoin.
$ Fixed the Thermal Boiler Assembly.
% Migrated TAE to use slot 96+.
+ Added some extra logging to verify.
$ Made Shelves have textures.

5 files changed, 135 insertions, 87 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
index 658d458d6e..d435ad2b8b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
@@ -1,10 +1,11 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
 
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.*;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull_NonElectric;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import net.minecraft.entity.item.EntityItem;
@@ -12,15 +13,19 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-public class GT4Entity_Shelf extends MetaTileEntity {
+public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
 	public byte mType = 0;
 
-	public GT4Entity_Shelf(int aID, String aName, String aNameRegional) {
-		super(aID, aName, aNameRegional, 1);
+	public GT4Entity_Shelf(final int aID, final String aName, final String aNameRegional, final String aDescription) {
+		super(aID, aName, aNameRegional, 0, aDescription);
 	}
 
-	public GT4Entity_Shelf(String aName) {
-		super(aName, 1);
+	public GT4Entity_Shelf(final String aName, final String aDescription, final ITexture[][][] aTextures) {
+		super(aName, 0, aDescription, aTextures);
+	}
+
+	public GT4Entity_Shelf(final String aName, final String[] aDescription, final ITexture[][][] aTextures) {
+		super(aName, 0, aDescription, aTextures);
 	}
 
 	@Override
@@ -120,7 +125,7 @@ public class GT4Entity_Shelf extends MetaTileEntity {
 
 	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GT4Entity_Shelf(this.mName);
+		return new GT4Entity_Shelf(this.mName, this.mDescriptionArray, this.mTextures);
 	}
 
 	@Override
@@ -147,13 +152,6 @@ public class GT4Entity_Shelf extends MetaTileEntity {
 		return aSide != getBaseMetaTileEntity().getFrontFacing();
 	}
 
-	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
-		if (aSide == aFacing) {
-			return 208 + this.mType;
-		}
-		return 10;
-	}
-
 	@Override
 	public String[] getDescription() {
 		return new String[] { "Decorative Item Storage", CORE.GT_Tooltip };
@@ -175,8 +173,24 @@ public class GT4Entity_Shelf extends MetaTileEntity {
 	}
 
 	@Override
-	public ITexture[] getTexture(IGregTechTileEntity p0, byte p1, byte p2, byte p3, boolean p4, boolean p5) {
-		// TODO Auto-generated method stub
-		return null;
+	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aConnections, final byte aColorIndex, final boolean aConnected, final boolean aRedstone) {
+		return this.mTextures[Math.min(2, aSide)][aColorIndex + 1];
+	}
+
+	@Override
+	public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
+		final ITexture[][][] rTextures = new ITexture[3][17][];
+		for (byte i = -1; i < 16; ++i) {
+			final ITexture[] tmp0 = { new GT_RenderedTexture(Textures.BlockIcons.COVER_WOOD_PLATE,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[0][i + 1] = tmp0;
+			final ITexture[] tmp2 = { new GT_RenderedTexture(Textures.BlockIcons.COVER_WOOD_PLATE,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[1][i + 1] = tmp2;
+			final ITexture[] tmp3 = { new GT_RenderedTexture(Textures.BlockIcons.COVER_WOOD_PLATE,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[2][i + 1] = tmp3;
+		}
+		return rTextures;
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java
index 34c6e99358..be9bba7097 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java
@@ -2,8 +2,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -15,28 +19,17 @@ import net.minecraft.util.IIcon;
 public class GT4Entity_Shelf_Compartment extends GT4Entity_Shelf {
 	public static IIcon[] sIconList = new IIcon['?'];
 
-	public GT4Entity_Shelf_Compartment(int aID, String aName, String aNameRegional) {
-		super(aID, aName, aNameRegional);
+	public GT4Entity_Shelf_Compartment(final int aID, final String aName, final String aNameRegional, final String aDescription) {
+		super(aID, aName, aNameRegional, aDescription);
 	}
-
-	public GT4Entity_Shelf_Compartment(String mName) {
-		super(mName);
+	
+	public GT4Entity_Shelf_Compartment(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) {
+		super(mName, mDescriptionArray, mTextures);
 	}
 
 	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GT4Entity_Shelf_Compartment(this.mName);
-	}
-
-	@Override
-	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
-		if (aSide == 0) {
-			return 32;
-		}
-		if (aSide == 1) {
-			return 29;
-		}
-		return 40;
+		return new GT4Entity_Shelf_Compartment(this.mName, this.mDescriptionArray, this.mTextures);
 	}
 
 	@Override
@@ -100,4 +93,21 @@ public class GT4Entity_Shelf_Compartment extends GT4Entity_Shelf {
 	public boolean allowPullStack(int aIndex, byte aSide, ItemStack aStack) {
 		return aIndex == 0;
 	}
+
+	@Override
+	public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
+		final ITexture[][][] rTextures = new ITexture[3][17][];
+		for (byte i = -1; i < 16; ++i) {
+			final ITexture[] tmp0 = { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEEL_BOTTOM,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[0][i + 1] = tmp0;
+			final ITexture[] tmp2 = { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEEL_TOP,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[1][i + 1] = tmp2;
+			final ITexture[] tmp3 = { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEEL_SIDE,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[2][i + 1] = tmp3;
+		}
+		return rTextures;
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
index 4a5d6be813..b1edf6d0f3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
@@ -1,36 +1,27 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
 
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
 public class GT4Entity_Shelf_Desk extends GT4Entity_Shelf {
-	public GT4Entity_Shelf_Desk(int aID, String aName, String aNameRegional) {
-		super(aID, aName, aNameRegional);
-	}
 
-	public GT4Entity_Shelf_Desk(String mName) {
-		super(mName);
+	public GT4Entity_Shelf_Desk(final int aID, final String aName, final String aNameRegional, final String aDescription) {
+		super(aID, aName, aNameRegional, aDescription);
 	}
-
-	@Override
-	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GT4Entity_Shelf_Desk(this.mName);
+	
+	public GT4Entity_Shelf_Desk(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) {
+		super(mName, mDescriptionArray, mTextures);
 	}
 
 	@Override
-	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
-		if (aSide == aFacing) {
-			return 222;
-		}
-		if (aSide == 0) {
-			return 32;
-		}
-		if (aSide == 1) {
-			return 29;
-		}
-		return 40;
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GT4Entity_Shelf_Desk(this.mName, this.mDescriptionArray, this.mTextures);
 	}
 
 	@Override
@@ -48,4 +39,21 @@ public class GT4Entity_Shelf_Desk extends GT4Entity_Shelf {
 			getBaseMetaTileEntity().setInventorySlotContents(0, tStack);
 		}
 	}
+
+	@Override
+	public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
+		final ITexture[][][] rTextures = new ITexture[3][17][];
+		for (byte i = -1; i < 16; ++i) {
+			final ITexture[] tmp0 = { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEEL_BOTTOM,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[0][i + 1] = tmp0;
+			final ITexture[] tmp2 = { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEEL_TOP,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[1][i + 1] = tmp2;
+			final ITexture[] tmp3 = { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEEL_SIDE,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[2][i + 1] = tmp3;
+		}
+		return rTextures;
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java
index b934f615e5..0e29c0181b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java
@@ -1,33 +1,41 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
 
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
 
 public class GT4Entity_Shelf_FileCabinet extends GT4Entity_Shelf {
-	public GT4Entity_Shelf_FileCabinet(int aID, String aName, String aNameRegional) {
-		super(aID, aName, aNameRegional);
-	}
 
-	public GT4Entity_Shelf_FileCabinet(String mName) {
-		super(mName);
+	public GT4Entity_Shelf_FileCabinet(final int aID, final String aName, final String aNameRegional, final String aDescription) {
+		super(aID, aName, aNameRegional, aDescription);
+	}
+	
+	public GT4Entity_Shelf_FileCabinet(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) {
+		super(mName, mDescriptionArray, mTextures);
 	}
 
 	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GT4Entity_Shelf_FileCabinet(this.mName);
+		return new GT4Entity_Shelf_FileCabinet(this.mName, this.mDescriptionArray, this.mTextures);
 	}
 
 	@Override
-	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
-		if (aSide == aFacing) {
-			return 223;
-		}
-		if (aSide == 0) {
-			return 32;
-		}
-		if (aSide == 1) {
-			return 29;
+	public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
+		final ITexture[][][] rTextures = new ITexture[3][17][];
+		for (byte i = -1; i < 16; ++i) {
+			final ITexture[] tmp0 = { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEEL_BOTTOM,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[0][i + 1] = tmp0;
+			final ITexture[] tmp2 = { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEEL_TOP,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[1][i + 1] = tmp2;
+			final ITexture[] tmp3 = { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEEL_SIDE,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[2][i + 1] = tmp3;
 		}
-		return 40;
+		return rTextures;
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java
index e71b6de52c..a8a53aeb12 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java
@@ -1,33 +1,41 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
 
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
 
 public class GT4Entity_Shelf_Iron extends GT4Entity_Shelf {
-	public GT4Entity_Shelf_Iron(int aID, String aName, String aNameRegional) {
-		super(aID, aName, aNameRegional);
-	}
 
-	public GT4Entity_Shelf_Iron(String mName) {
-		super(mName);
+	public GT4Entity_Shelf_Iron(final int aID, final String aName, final String aNameRegional, final String aDescription) {
+		super(aID, aName, aNameRegional, aDescription);
+	}
+		
+	public GT4Entity_Shelf_Iron(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) {
+		super(mName, mDescriptionArray, mTextures);
 	}
 
 	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GT4Entity_Shelf_Iron(this.mName);
+		return new GT4Entity_Shelf_Iron(this.mName, this.mDescriptionArray, this.mTextures);
 	}
 
 	@Override
-	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
-		if (aSide == aFacing) {
-			return 216 + this.mType;
-		}
-		if (aSide == 0) {
-			return 32;
-		}
-		if (aSide == 1) {
-			return 29;
+	public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
+		final ITexture[][][] rTextures = new ITexture[3][17][];
+		for (byte i = -1; i < 16; ++i) {
+			final ITexture[] tmp0 = { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEEL_BOTTOM,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[0][i + 1] = tmp0;
+			final ITexture[] tmp2 = { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEEL_TOP,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[1][i + 1] = tmp2;
+			final ITexture[] tmp3 = { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEEL_SIDE,
+					Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
+			rTextures[2][i + 1] = tmp3;
 		}
-		return 40;
+		return rTextures;
 	}
 }