Dead code removal

This commit is contained in:
Justin Aquadro committed 2014-09-13 18:43:50 -04:00
1 parent 159ede2b92
commit 66de84a37b
2 files changed
-173

No files matched your search

@@ -20,92 +20,7 @@ import java.util.UUID;
public class TileEntityDrawers extends TileEntityDrawersBase implements IStorageProvider, ISidedInventory
{
/*private class DrawerData {
private Item item;
public int meta;
public int count;
public NBTTagCompound attrs;
private ItemStack protoStack;
public DrawerData () {
reset();
}
public Item getItem () {
return item;
}
public void setItem (Item item) {
this.item = item;
protoStack = new ItemStack(item);
}
public void writeToNBT (NBTTagCompound tag) {
if (item != null) {
tag.setShort("Item", (short) Item.getIdFromItem(item));
tag.setShort("Meta", (short) meta);
tag.setInteger("Count", count);
if (attrs != null)
tag.setTag("Tags", attrs);
}
}
public void readFromNBT (NBTTagCompound tag) {
if (tag.hasKey("Item")) {
item = Item.getItemById(tag.getShort("Item"));
meta = tag.getShort("Meta");
count = tag.getInteger("Count");
if (tag.hasKey("Tags"))
attrs = tag.getCompoundTag("Tags");
protoStack = new ItemStack(item);
}
}
public void reset () {
item = null;
meta = 0;
count = 0;
attrs = null;
}
public int maxCapacity () {
if (item == null)
return 0;
protoStack.setItemDamage(meta);
protoStack.setTagCompound(attrs);
return item.getItemStackLimit(protoStack) * stackCapacity();
}
public int stackSize () {
if (item == null)
return 0;
return item.getItemStackLimit(protoStack);
}
public int remainingCapacity () {
if (item == null)
return 0;
return maxCapacity() - count;
}
public int stackCapacity () {
ConfigManager config = StorageDrawers.config;
return config.getStorageUpgradeMultiplier(level) * drawerCapacity;
}
}*/
//private int direction;
private int drawerCount = 2;
//private int drawerCapacity = 1;
//private int level = 1;
private DrawerData[] data;
private ItemStack[] snapshotItems;
@@ -120,15 +35,6 @@ public class TileEntityDrawers extends TileEntityDrawersBase implements IStorage
setDrawerCount(2);
}
/*public int getDirection () {
return direction;
}
public void setDirection (int direction) {
this.direction = direction % 6;
autoSides = new int[] { 0, 1, ForgeDirection.OPPOSITES[direction] };
}*/
public int getDrawerCount () {
return drawerCount;
}
@@ -144,18 +50,6 @@ public class TileEntityDrawers extends TileEntityDrawersBase implements IStorage
snapshotCounts = new int[count];
}
/*public int getLevel () {
return level;
}
public void setLevel (int level) {
this.level = MathHelper.clamp_int(level, 1, 6);
}
public void setDrawerCapacity (int stackCount) {
drawerCapacity = stackCount;
}*/
public int getItemCount (int slot) {
return data[slot].count;
}
@@ -87,36 +87,15 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler
}
boxRenderer.setUnit(0);
//for (int i = 0; i < 6; i++)
// boxRenderer.setIcon(block.getIcon(world, x, y, z, i), i);
boxRenderer.setInteriorIcon(block.getIcon(world, x, y, z, side), ForgeDirection.OPPOSITES[side]);
renderInterior(block, x, y, z, side, renderer);
boxRenderer.setIcon(block.getIndicatorIcon(false));
/*if (block.drawerCount == 2)
boxRenderer.renderExterior(renderer, block, x, y, z, unit * 14, unit * 1, unit * 15, unit * 15, unit * 15, unit * 15.5, 0,
ModularBoxRenderer.CUT_YNEG | ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_ZNEG);
else
boxRenderer.renderExterior(renderer, block, x, y, z, unit * 7, unit * 1, unit * 15, unit * 9, unit * 15, unit * 15.5, 0,
ModularBoxRenderer.CUT_YNEG | ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_ZNEG);*/
/*if (block.drawerCount == 2) {
boxRenderer.renderExterior(renderer, block, x, y, z, unit * 6, unit * 14, unit * 15, unit * 10, unit * 15, unit * 15.05, 0,
ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_YNEG | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_XNEG | ModularBoxRenderer.CUT_ZNEG);
boxRenderer.renderExterior(renderer, block, x, y, z, unit * 6, unit * 6, unit * 15, unit * 10, unit * 7, unit * 15.05, 0,
ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_YNEG | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_XNEG | ModularBoxRenderer.CUT_ZNEG);
}*/
if (StorageDrawers.config.cache.enableIndicatorUpgrades)
renderHandleIndicator(block, x, y, z, side, renderer, tile.getStatusLevel());
/*boxRenderer.renderExterior(renderer, block, x, y, z, unit * 14, unit * 14, unit * 15, unit * 15, unit * 15, unit * 16, 0,
ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_XPOS | ModularBoxRenderer.CUT_ZNEG);
if (block.drawerCount == 4)
boxRenderer.renderExterior(renderer, block, x, y, z, unit * 1, unit * 14, unit * 15, unit * 2, unit * 15, unit * 16, 0,
ModularBoxRenderer.CUT_YPOS | ModularBoxRenderer.CUT_XNEG | ModularBoxRenderer.CUT_ZNEG);*/
return true;
}
@@ -217,29 +196,6 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler
}
boxRenderer.renderExterior(renderer, block, x, y, z, xMin, 0, zMin, xMax, 1, zMax, 0, ModularBoxRenderer.sideCut[side]);
/*if (block.drawerCount == 2) {
boxRenderer.renderExterior(renderer, block, x, y, z, xMin, 0, zMin, xMax, .5, zMax, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderExterior(renderer, block, x, y, z, xMin, .5, zMin, xMax, 1, zMax, 0, ModularBoxRenderer.sideCut[side]);
}
else if (block.drawerCount == 4) {
switch (side) {
case 2:
case 3:
boxRenderer.renderExterior(renderer, block, x, y, z, 0, 0, zMin, .5, .5, zMax, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderExterior(renderer, block, x, y, z, 0, .5, zMin, .5, 1, zMax, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderExterior(renderer, block, x, y, z, .5, 0, zMin, 1, .5, zMax, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderExterior(renderer, block, x, y, z, .5, .5, zMin, 1, 1, zMax, 0, ModularBoxRenderer.sideCut[side]);
break;
case 4:
case 5:
boxRenderer.renderExterior(renderer, block, x, y, z, xMin, 0, 0, xMax, .5, .5, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderExterior(renderer, block, x, y, z, xMin, .5, 0, xMax, 1, .5, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderExterior(renderer, block, x, y, z, xMin, 0, .5, xMax, .5, 1, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderExterior(renderer, block, x, y, z, xMin, .5, .5, xMax, 1, 1, 0, ModularBoxRenderer.sideCut[side]);
break;
}
}*/
}
private void renderInterior (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) {
@@ -267,29 +223,6 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler
}
boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit, zMin, xMax, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]);
/*if (block.drawerCount == 2) {
boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit, zMin, xMax, unit * 7, zMax, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit * 9, zMin, xMax, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]);
}
else if (block.drawerCount == 4) {
switch (side) {
case 2:
case 3:
boxRenderer.renderInterior(renderer, block, x, y, z, unit, unit, zMin, .5 - unit, unit * 7, zMax, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderInterior(renderer, block, x, y, z, unit, unit * 9, zMin, .5 - unit, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderInterior(renderer, block, x, y, z, .5 + unit, unit, zMin, 1 - unit, unit * 7, zMax, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderInterior(renderer, block, x, y, z, .5 + unit, unit * 9, zMin, 1 - unit, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]);
break;
case 4:
case 5:
boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit, unit, xMax, unit * 7, .5 - unit, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit * 9, unit, xMax, 1 - unit, .5 - unit, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit, .5 + unit, xMax, unit * 7, 1 - unit, 0, ModularBoxRenderer.sideCut[side]);
boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit * 9, .5 + unit, xMax, 1 - unit, 1 - unit, 0, ModularBoxRenderer.sideCut[side]);
break;
}
}*/
}
@Override