Upload my Code Changes/Format/imports

This commit is contained in:
Alexander committed 2014-02-16 14:23:50 -05:00
1 parent 5bcdb7ca46
commit 5d4e38c0cb
264 files changed
+4014 -3972

No files matched your search

@@ -96,7 +96,7 @@ public class SmelteryBlock extends InventoryBlock
TileEntity logic = world.getTileEntity(x, y, z);
short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getRenderDirection() : 0;
int meta = world.getBlockMetadata(x, y, z);
if (meta == 0) //Smeltery
if (meta == 0) // Smeltery
{
if (side == direction)
{
@@ -114,7 +114,7 @@ public class SmelteryBlock extends InventoryBlock
return icons[0];
}
}
if (meta == 1) //Drain
if (meta == 1) // Drain
{
if (side == direction)
return icons[5];
@@ -136,11 +136,9 @@ public class SmelteryBlock extends InventoryBlock
}
/*@Override
public int getRenderBlockPass()
{
return 1;
}*/
/*
* @Override public int getRenderBlockPass() { return 1; }
*/
public int damageDropped (int meta)
{
@@ -155,7 +153,7 @@ public class SmelteryBlock extends InventoryBlock
@Override
public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer)
{
//return -1;
// return -1;
return TConstruct.proxy.smelteryGuiID;
}
@@ -221,7 +219,7 @@ public class SmelteryBlock extends InventoryBlock
}
else
{
//world.markBlockForUpdate(x, y, z);
// world.markBlockForUpdate(x, y, z);
player.openGui(getModInstance(), integer, world, x, y, z);
return true;
}
@@ -244,7 +242,7 @@ public class SmelteryBlock extends InventoryBlock
else
return new SmelteryDrainLogic();
case 3:
return null; //Furnace
return null; // Furnace
}
return new MultiServantLogic();
}
@@ -263,11 +261,11 @@ public class SmelteryBlock extends InventoryBlock
logic.checkValidPlacement();
}
/*@Override
public void breakBlock (World world, int x, int y, int z, int par5, int par6) //Don't drop inventory
{
world.removeBlockTileEntity(x, y, z);
}*/
/*
* @Override public void breakBlock (World world, int x, int y, int z, int
* par5, int par6) //Don't drop inventory { world.removeBlockTileEntity(x,
* y, z); }
*/
@Override
public void getSubBlocks (Item id, CreativeTabs tab, List list)
@@ -283,7 +281,7 @@ public class SmelteryBlock extends InventoryBlock
@Override
public void onNeighborBlockChange (World world, int x, int y, int z, Block nBlockID)
{
//System.out.println("Neighbor changed");
// System.out.println("Neighbor changed");
TileEntity logic = world.getTileEntity(x, y, z);
if (logic instanceof IServantLogic)
{