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

@@ -64,8 +64,8 @@ public class Landmine extends MantleBlock
}
/**
* Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been
* cleared to be reused)
* Returns a bounding box from the pool of bounding boxes (this means this
* box can change after the pool has been cleared to be reused)
*/
public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int par2, int par3, int par4)
{
@@ -73,8 +73,9 @@ public class Landmine extends MantleBlock
}
/**
* Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two
* adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
* Is this block (a) opaque and (b) a full 1m cube? This determines whether
* or not to render the shared face of two adjacent blocks and also whether
* the player can attach torches, redstone wire, etc to this block.
*/
public boolean isOpaqueCube ()
{
@@ -82,7 +83,8 @@ public class Landmine extends MantleBlock
}
/**
* If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
* If this block doesn't render as an ordinary block it will return False
* (examples: signs, buttons, stairs, etc)
*/
public boolean renderAsNormalBlock ()
{
@@ -95,7 +97,8 @@ public class Landmine extends MantleBlock
}
/**
* Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z
* Checks to see if its valid to put this block at the specified
* coordinates. Args: world, x, y, z
*/
public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4)
{
@@ -103,8 +106,9 @@ public class Landmine extends MantleBlock
}
/**
* Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
* their own) Args: x, y, z, neighbor blockID
* Lets the block know when one of its neighbor changes. Doesn't know which
* neighbor changed (coordinates passed are their own) Args: x, y, z,
* neighbor blockID
*/
public void onNeighborBlockChange (World par1World, int par2, int par3, int par4, int par5)
{
@@ -118,7 +122,7 @@ public class Landmine extends MantleBlock
if (var6)
{
this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0);
//par1World.setBlock(par2, par3, par4, 0);
// par1World.setBlock(par2, par3, par4, 0);
}
}
@@ -137,7 +141,8 @@ public class Landmine extends MantleBlock
}
/**
* Triggered whenever an entity collides with this block (enters into the block). Args: world, x, y, z, entity
* Triggered whenever an entity collides with this block (enters into the
* block). Args: world, x, y, z, entity
*/
public void onEntityCollidedWithBlock (World par1World, int par2, int par3, int par4, Entity par5Entity)
{
@@ -151,7 +156,8 @@ public class Landmine extends MantleBlock
}
/**
* Checks if there are mobs on the plate. If a mob is on the plate and it is off, it turns it on, and vice versa.
* Checks if there are mobs on the plate. If a mob is on the plate and it is
* off, it turns it on, and vice versa.
*/
private void setStateIfMobInteractsWithPlate (World world, int posX, int posY, int posZ)
{
@@ -176,13 +182,14 @@ public class Landmine extends MantleBlock
(double) ((float) (posZ + 1) - var7)));
}
/*if (this.triggerMobType == EnumCreatureType.players)
{
var8 = world.getEntitiesWithinAABB(
EntityPlayer.class,
AxisAlignedBB.getAABBPool().getAABB((double) ((float) posX + var7), (double) posY, (double) ((float) posZ + var7), (double) ((float) (posX + 1) - var7), (double) posY + 0.25D,
(double) ((float) (posZ + 1) - var7)));
}*/
/*
* if (this.triggerMobType == EnumCreatureType.players) { var8 =
* world.getEntitiesWithinAABB( EntityPlayer.class,
* AxisAlignedBB.getAABBPool().getAABB((double) ((float) posX + var7),
* (double) posY, (double) ((float) posZ + var7), (double) ((float)
* (posX + 1) - var7), (double) posY + 0.25D, (double) ((float) (posZ +
* 1) - var7))); }
*/
if (!var8.isEmpty())
{
@@ -204,30 +211,35 @@ public class Landmine extends MantleBlock
{
WorldHelper.setBlockToAir(world, posX, posY, posZ);
world.createExplosion((Entity) null, posX, posY, posZ, 2.0F, true);
/*par1World.setBlockMetadataWithNotify(posX, posY, posZ, 1);
par1World.notifyBlocksOfNeighborChange(posX, posY, posZ, this.blockID);
par1World.notifyBlocksOfNeighborChange(posX, posY - 1, posZ, this.blockID);
par1World.markBlockRangeForRenderUpdate(posX, posY, posZ, posX, posY, posZ);
par1World.playSoundEffect((double)posX + 0.5D, (double)posY + 0.1D, (double)posZ + 0.5D, "random.click", 0.3F, 0.6F);*/
/*
* par1World.setBlockMetadataWithNotify(posX, posY, posZ, 1);
* par1World.notifyBlocksOfNeighborChange(posX, posY, posZ,
* this.blockID); par1World.notifyBlocksOfNeighborChange(posX, posY
* - 1, posZ, this.blockID);
* par1World.markBlockRangeForRenderUpdate(posX, posY, posZ, posX,
* posY, posZ); par1World.playSoundEffect((double)posX + 0.5D,
* (double)posY + 0.1D, (double)posZ + 0.5D, "random.click", 0.3F,
* 0.6F);
*/
}
/*if (!var6 && var5)
{
par1World.setBlockMetadataWithNotify(posX, posY, posZ, 0);
par1World.notifyBlocksOfNeighborChange(posX, posY, posZ, this.blockID);
par1World.notifyBlocksOfNeighborChange(posX, posY - 1, posZ, this.blockID);
par1World.markBlockRangeForRenderUpdate(posX, posY, posZ, posX, posY, posZ);
par1World.playSoundEffect((double)posX + 0.5D, (double)posY + 0.1D, (double)posZ + 0.5D, "random.click", 0.3F, 0.5F);
}
if (var6)
{
par1World.scheduleBlockUpdate(posX, posY, posZ, this.blockID, this.tickRate());
}*/
/*
* if (!var6 && var5) { par1World.setBlockMetadataWithNotify(posX, posY,
* posZ, 0); par1World.notifyBlocksOfNeighborChange(posX, posY, posZ,
* this.blockID); par1World.notifyBlocksOfNeighborChange(posX, posY - 1,
* posZ, this.blockID); par1World.markBlockRangeForRenderUpdate(posX,
* posY, posZ, posX, posY, posZ); par1World.playSoundEffect((double)posX
* + 0.5D, (double)posY + 0.1D, (double)posZ + 0.5D, "random.click",
* 0.3F, 0.5F); }
*
* if (var6) { par1World.scheduleBlockUpdate(posX, posY, posZ,
* this.blockID, this.tickRate()); }
*/
}
/**
* ejects contained items into the world, and notifies neighbours of an update, as appropriate
* ejects contained items into the world, and notifies neighbours of an
* update, as appropriate
*/
public void breakBlock (World par1World, int par2, int par3, int par4, Block par5, int par6)
{
@@ -241,7 +253,8 @@ public class Landmine extends MantleBlock
}
/**
* Updates the blocks bounds based on its current state. Args: world, x, y, z
* Updates the blocks bounds based on its current state. Args: world, x, y,
* z
*/
public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
{
@@ -270,8 +283,8 @@ public class Landmine extends MantleBlock
}
/**
* Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility
* and stop pistons
* Returns the mobility information of the block, 0 = free, 1 = can't push
* but can move over, 2 = total immobility and stop pistons
*/
public int getMobilityFlag ()
{