+ Added compartment textures.

% Cleaned up shelving code.

5 files changed, 109 insertions, 170 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 9960b0e4e8..658d458d6e 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
@@ -12,101 +12,84 @@ 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 MetaTileEntity {
 	public byte mType = 0;
 
-	public GT4Entity_Shelf(int aID, String aName, String aNameRegional)
-	{
+	public GT4Entity_Shelf(int aID, String aName, String aNameRegional) {
 		super(aID, aName, aNameRegional, 1);
 	}
 
-	public GT4Entity_Shelf(String aName)
-	{
+	public GT4Entity_Shelf(String aName) {
 		super(aName, 1);
 	}
 
 	@Override
-	public boolean isSimpleMachine()
-	{
+	public boolean isSimpleMachine() {
 		return true;
 	}
 
-	public int getInvSize()
-	{
+	public int getInvSize() {
 		return 1;
 	}
 
 	@Override
-	public boolean isFacingValid(byte aFacing)
-	{
+	public boolean isFacingValid(byte aFacing) {
 		return aFacing > 1;
 	}
 
 	@Override
-	public boolean isAccessAllowed(EntityPlayer aPlayer)
-	{
+	public boolean isAccessAllowed(EntityPlayer aPlayer) {
 		return true;
 	}
 
 	@Override
-	public boolean ownerControl()
-	{
+	public boolean ownerControl() {
 		return false;
 	}
 
 	@Override
-	public boolean isEnetOutput()
-	{
+	public boolean isEnetOutput() {
 		return false;
 	}
 
 	@Override
-	public boolean isEnetInput()
-	{
+	public boolean isEnetInput() {
 		return false;
 	}
 
 	@Override
-	public boolean isOutputFacing(byte aSide)
-	{
+	public boolean isOutputFacing(byte aSide) {
 		return false;
 	}
 
 	@Override
-	public boolean isInputFacing(byte aSide)
-	{
+	public boolean isInputFacing(byte aSide) {
 		return false;
 	}
 
-	public void onRightclick(EntityPlayer aPlayer)
-	{
+	public void onRightclick(EntityPlayer aPlayer) {
 		ItemStack tStack = aPlayer.inventory.getStackInSlot(aPlayer.inventory.currentItem);
-		if (tStack == null)
-		{
-			if ((this.mInventory[0] != null) && (this.mInventory[0].stackSize > 0))
-			{
+		if (tStack == null) {
+			if ((this.mInventory[0] != null) && (this.mInventory[0].stackSize > 0)) {
 				aPlayer.inventory.setInventorySlotContents(aPlayer.inventory.currentItem, this.mInventory[0]);
 				getBaseMetaTileEntity().setInventorySlotContents(0, null);
 				this.mType = 0;
 			}
 		}
 		else if (this.mInventory[0] == null) {
-			if (OrePrefixes.paper.contains(tStack))
-			{
+			if (OrePrefixes.paper.contains(tStack)) {
 				aPlayer.inventory.setInventorySlotContents(aPlayer.inventory.currentItem, null);
 				getBaseMetaTileEntity().setInventorySlotContents(0, tStack);
 				this.mType = 1;
 			}
-			else if (OrePrefixes.book.contains(tStack))
-			{
+			else if (OrePrefixes.book.contains(tStack)) {
 				aPlayer.inventory.setInventorySlotContents(aPlayer.inventory.currentItem, null);
 				getBaseMetaTileEntity().setInventorySlotContents(0, tStack);
 				this.mType = 2;
 			}
-			else if ((ItemList.IC2_Food_Can_Filled.isStackEqual(tStack, true, true)) || (ItemList.IC2_Food_Can_Spoiled.isStackEqual(tStack, true, true)) || (ItemList.IC2_Food_Can_Empty.isStackEqual(tStack, false, true)))
-			{
+			else if ((ItemList.IC2_Food_Can_Filled.isStackEqual(tStack, true, true))
+					|| (ItemList.IC2_Food_Can_Spoiled.isStackEqual(tStack, true, true))
+					|| (ItemList.IC2_Food_Can_Empty.isStackEqual(tStack, false, true))) {
 				aPlayer.inventory.setInventorySlotContents(aPlayer.inventory.currentItem, null);
 				getBaseMetaTileEntity().setInventorySlotContents(0, tStack);
 				this.mType = 3;
@@ -114,16 +97,17 @@ extends MetaTileEntity
 		}
 	}
 
-	public void onLeftclick(EntityPlayer aPlayer)
-	{
-		if ((this.mInventory[0] != null) && (this.mInventory[0].stackSize > 0))
-		{
+	public void onLeftclick(EntityPlayer aPlayer) {
+		if ((this.mInventory[0] != null) && (this.mInventory[0].stackSize > 0)) {
 			ItemStack tOutput = GT_Utility.copy(new Object[] { this.mInventory[0] });
 			if (!aPlayer.isSneaking()) {
 				tOutput.stackSize = 1;
 			}
 			getBaseMetaTileEntity().decrStackSize(0, tOutput.stackSize);
-			EntityItem tEntity = new EntityItem(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1) + 0.5D, getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1) + 0.5D, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1) + 0.5D, tOutput);
+			EntityItem tEntity = new EntityItem(getBaseMetaTileEntity().getWorld(),
+					getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1) + 0.5D,
+					getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1) + 0.5D,
+					getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1) + 0.5D, tOutput);
 			tEntity.motionX = 0.0D;
 			tEntity.motionY = 0.0D;
 			tEntity.motionZ = 0.0D;
@@ -135,42 +119,35 @@ extends MetaTileEntity
 	}
 
 	@Override
-	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
-	{
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
 		return new GT4Entity_Shelf(this.mName);
 	}
 
 	@Override
-	public void saveNBTData(NBTTagCompound aNBT)
-	{
+	public void saveNBTData(NBTTagCompound aNBT) {
 		aNBT.setInteger("mType", this.mType);
 	}
 
 	@Override
-	public void loadNBTData(NBTTagCompound aNBT)
-	{
-		this.mType = ((byte)aNBT.getInteger("mType"));
+	public void loadNBTData(NBTTagCompound aNBT) {
+		this.mType = ((byte) aNBT.getInteger("mType"));
 	}
 
 	@Override
-	public void onValueUpdate(byte aValue)
-	{
+	public void onValueUpdate(byte aValue) {
 		this.mType = aValue;
 	}
 
 	@Override
-	public byte getUpdateData()
-	{
+	public byte getUpdateData() {
 		return this.mType;
 	}
 
-	public boolean allowCoverOnSide(byte aSide, int aCoverID)
-	{
+	public boolean allowCoverOnSide(byte aSide, int aCoverID) {
 		return aSide != getBaseMetaTileEntity().getFrontFacing();
 	}
 
-	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone)
-	{
+	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
 		if (aSide == aFacing) {
 			return 208 + this.mType;
 		}
@@ -178,19 +155,12 @@ extends MetaTileEntity
 	}
 
 	@Override
-	public String[] getDescription()
-	{
-		return new String[]{
-				"Decorative Item Storage",
-				CORE.GT_Tooltip
-		};
+	public String[] getDescription() {
+		return new String[] { "Decorative Item Storage", CORE.GT_Tooltip };
 	}
 
-
-
 	@Override
 	public byte getTileEntityBaseType() {
-		// TODO Auto-generated method stub
 		return 0;
 	}
 
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 91300a2d22..34c6e99358 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
@@ -5,19 +5,17 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-public class GT4Entity_Shelf_Compartment
-extends GT4Entity_Shelf
-{
+public class GT4Entity_Shelf_Compartment extends GT4Entity_Shelf {
 	public static IIcon[] sIconList = new IIcon['?'];
 
-	public GT4Entity_Shelf_Compartment(int aID, String aName, String aNameRegional)
-	{
+	public GT4Entity_Shelf_Compartment(int aID, String aName, String aNameRegional) {
 		super(aID, aName, aNameRegional);
 	}
 
@@ -26,14 +24,12 @@ extends GT4Entity_Shelf
 	}
 
 	@Override
-	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
-	{
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
 		return new GT4Entity_Shelf_Compartment(this.mName);
 	}
 
 	@Override
-	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone)
-	{
+	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
 		if (aSide == 0) {
 			return 32;
 		}
@@ -44,44 +40,41 @@ extends GT4Entity_Shelf
 	}
 
 	@Override
-	public boolean allowCoverOnSide(byte aSide, int aCoverID)
-	{
+	public boolean allowCoverOnSide(byte aSide, int aCoverID) {
 		return aSide != getBaseMetaTileEntity().getFrontFacing();
 	}
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ)
-	{
+	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
 		if (aSide == getBaseMetaTileEntity().getFrontFacing()) {
-			this.mType = ((byte)((this.mType + 1) % 16));
+			this.mType = ((byte) ((this.mType + 1) % 16));
 		}
 	}
 
-	public IIcon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone)
-	{
+	public IIcon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
 		return aSide == aFacing ? sIconList[this.mType] : null;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister aBlockIconRegister)
-	{
+	public void registerIcons(IIconRegister aBlockIconRegister) {
 		for (int i = 0; i < 32; i++) {
-			sIconList[i] = aBlockIconRegister.registerIcon("gregtech_addon:tile.Compartment/" + i);
+			sIconList[i] = aBlockIconRegister.registerIcon(CORE.MODID + ":" + "TileEntities/Compartment/" + i);
 		}
 	}
 
 	@Override
-	public void onLeftclick(EntityPlayer aPlayer)
-	{
-		if ((this.mInventory[0] != null) && (this.mInventory[0].stackSize > 0))
-		{
+	public void onLeftclick(EntityPlayer aPlayer) {
+		if ((this.mInventory[0] != null) && (this.mInventory[0].stackSize > 0)) {
 			ItemStack tOutput = GT_Utility.copy(new Object[] { this.mInventory[0] });
 			if (!aPlayer.isSneaking()) {
 				tOutput.stackSize = 1;
 			}
 			getBaseMetaTileEntity().decrStackSize(0, tOutput.stackSize);
-			EntityItem tEntity = new EntityItem(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1) + 0.5D, getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1) + 0.5D, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1) + 0.5D, tOutput);
+			EntityItem tEntity = new EntityItem(getBaseMetaTileEntity().getWorld(),
+					getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1) + 0.5D,
+					getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1) + 0.5D,
+					getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1) + 0.5D, tOutput);
 			tEntity.motionX = 0.0D;
 			tEntity.motionY = 0.0D;
 			tEntity.motionZ = 0.0D;
@@ -90,26 +83,21 @@ extends GT4Entity_Shelf
 	}
 
 	@Override
-	public void onRightclick(EntityPlayer aPlayer)
-	{
+	public void onRightclick(EntityPlayer aPlayer) {
 		ItemStack tStack = aPlayer.inventory.getStackInSlot(aPlayer.inventory.currentItem);
-		if (tStack == null)
-		{
-			if ((this.mInventory[0] != null) && (this.mInventory[0].stackSize > 0))
-			{
+		if (tStack == null) {
+			if ((this.mInventory[0] != null) && (this.mInventory[0].stackSize > 0)) {
 				aPlayer.inventory.setInventorySlotContents(aPlayer.inventory.currentItem, this.mInventory[0]);
 				getBaseMetaTileEntity().setInventorySlotContents(0, null);
 			}
 		}
-		else if (this.mInventory[0] == null)
-		{
+		else if (this.mInventory[0] == null) {
 			aPlayer.inventory.setInventorySlotContents(aPlayer.inventory.currentItem, null);
 			getBaseMetaTileEntity().setInventorySlotContents(0, tStack);
 		}
 	}
 
-	public boolean allowPullStack(int aIndex, byte aSide, ItemStack aStack)
-	{
+	public boolean allowPullStack(int aIndex, byte aSide, ItemStack aStack) {
 		return aIndex == 0;
 	}
 }
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 034b48e3f2..4a5d6be813 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
@@ -5,56 +5,47 @@ import gregtech.api.metatileentity.MetaTileEntity;
 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);
-  }
-  
-  @Override
-public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
-  {
-    return new GT4Entity_Shelf_Desk(this.mName);
-  }
-  
-  @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;
-  }
-  
-  @Override
-public void onRightclick(EntityPlayer aPlayer)
-  {
-    ItemStack tStack = aPlayer.inventory.getStackInSlot(aPlayer.inventory.currentItem);
-    if (tStack == null)
-    {
-      if ((this.mInventory[0] != null) && (this.mInventory[0].stackSize > 0))
-      {
-        aPlayer.inventory.setInventorySlotContents(aPlayer.inventory.currentItem, this.mInventory[0]);
-        getBaseMetaTileEntity().setInventorySlotContents(0, null);
-        this.mType = 0;
-      }
-    }
-    else if (this.mInventory[0] == null)
-    {
-      aPlayer.inventory.setInventorySlotContents(aPlayer.inventory.currentItem, null);
-      getBaseMetaTileEntity().setInventorySlotContents(0, tStack);
-    }
-  }
+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);
+	}
+
+	@Override
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GT4Entity_Shelf_Desk(this.mName);
+	}
+
+	@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;
+	}
+
+	@Override
+	public void onRightclick(EntityPlayer aPlayer) {
+		ItemStack tStack = aPlayer.inventory.getStackInSlot(aPlayer.inventory.currentItem);
+		if (tStack == null) {
+			if ((this.mInventory[0] != null) && (this.mInventory[0].stackSize > 0)) {
+				aPlayer.inventory.setInventorySlotContents(aPlayer.inventory.currentItem, this.mInventory[0]);
+				getBaseMetaTileEntity().setInventorySlotContents(0, null);
+				this.mType = 0;
+			}
+		}
+		else if (this.mInventory[0] == null) {
+			aPlayer.inventory.setInventorySlotContents(aPlayer.inventory.currentItem, null);
+			getBaseMetaTileEntity().setInventorySlotContents(0, tStack);
+		}
+	}
 }
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 048b318e7a..b934f615e5 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
@@ -3,11 +3,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT4Entity_Shelf_FileCabinet
-extends GT4Entity_Shelf
-{
-	public GT4Entity_Shelf_FileCabinet(int aID, String aName, String aNameRegional)
-	{
+public class GT4Entity_Shelf_FileCabinet extends GT4Entity_Shelf {
+	public GT4Entity_Shelf_FileCabinet(int aID, String aName, String aNameRegional) {
 		super(aID, aName, aNameRegional);
 	}
 
@@ -16,14 +13,12 @@ extends GT4Entity_Shelf
 	}
 
 	@Override
-	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
-	{
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
 		return new GT4Entity_Shelf_FileCabinet(this.mName);
 	}
 
 	@Override
-	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone)
-	{
+	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
 		if (aSide == aFacing) {
 			return 223;
 		}
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 8b54128af4..e71b6de52c 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
@@ -3,11 +3,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-public class GT4Entity_Shelf_Iron
-extends GT4Entity_Shelf
-{
-	public GT4Entity_Shelf_Iron(int aID, String aName, String aNameRegional)
-	{
+public class GT4Entity_Shelf_Iron extends GT4Entity_Shelf {
+	public GT4Entity_Shelf_Iron(int aID, String aName, String aNameRegional) {
 		super(aID, aName, aNameRegional);
 	}
 
@@ -16,14 +13,12 @@ extends GT4Entity_Shelf
 	}
 
 	@Override
-	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
-	{
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
 		return new GT4Entity_Shelf_Iron(this.mName);
 	}
 
 	@Override
-	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone)
-	{
+	public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) {
 		if (aSide == aFacing) {
 			return 216 + this.mType;
 		}