aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java102
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java56
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java95
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java13
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java13
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.pngbin0 -> 364 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.pngbin0 -> 822 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.pngbin0 -> 822 bytes
37 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;
}
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png
new file mode 100644
index 0000000000..ff1a809196
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png
new file mode 100644
index 0000000000..4af5b49f1f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png
new file mode 100644
index 0000000000..0ea134fb93
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png
new file mode 100644
index 0000000000..52c1a02d54
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png
new file mode 100644
index 0000000000..0c791d1d7c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png
new file mode 100644
index 0000000000..51cefde2a7
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png
new file mode 100644
index 0000000000..6150873b54
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png
new file mode 100644
index 0000000000..4483072085
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png
new file mode 100644
index 0000000000..137b4231c6
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png
new file mode 100644
index 0000000000..0dd1f2ae5f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png
new file mode 100644
index 0000000000..fd7adea957
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png
new file mode 100644
index 0000000000..a0b7d1544e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png
new file mode 100644
index 0000000000..1f395cc891
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png
new file mode 100644
index 0000000000..5f36f9e7b5
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png
new file mode 100644
index 0000000000..191dd4f5ba
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png
new file mode 100644
index 0000000000..7df2cbec19
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png
new file mode 100644
index 0000000000..7185cd1be1
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png
new file mode 100644
index 0000000000..09ee5cd360
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png
new file mode 100644
index 0000000000..3e88422126
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png
new file mode 100644
index 0000000000..3d84925c61
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png
new file mode 100644
index 0000000000..6c4c1fb228
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png
new file mode 100644
index 0000000000..f113ac0ab5
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png
new file mode 100644
index 0000000000..d896829cfb
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png
new file mode 100644
index 0000000000..f1bfc1063d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png
new file mode 100644
index 0000000000..bbc35cf318
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png
new file mode 100644
index 0000000000..e7f0363217
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png
new file mode 100644
index 0000000000..2ec68c00ff
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png
new file mode 100644
index 0000000000..2ffeb029fb
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png
new file mode 100644
index 0000000000..f2c5b72b0c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png
new file mode 100644
index 0000000000..63cbcf0851
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png
new file mode 100644
index 0000000000..69efbeb6de
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png
new file mode 100644
index 0000000000..acd54acf07
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png
Binary files differ