tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fix up bounds

Browse source
This commit is contained in:
Aidan C. Brady 2013-10-22 11:20:04 -04:00
parent 89eda12200
commit 8cc6d3222a
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/mekanism/common/TransporterStack.java
View file

@ -14,7 +14,6 @@ public class TransporterStack
{ {
public ItemStack itemStack; public ItemStack itemStack;
/** out of 100 */
public int progress; public int progress;
public boolean initiatedPath = false; public boolean initiatedPath = false;

45
common/mekanism/common/block/BlockTransmitter.java
View file

@ -49,12 +49,15 @@ import cpw.mods.fml.relauncher.SideOnly;
*/ */
public class BlockTransmitter extends Block public class BlockTransmitter extends Block
{ {
public static final float MIN_BOUND = 0.3125F;
public static final float MAX_BOUND = 0.6875F;
public BlockTransmitter(int id) public BlockTransmitter(int id)
{ {
super(id, Material.wood); super(id, Material.wood);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);
setBlockBounds(0.3F, 0.3F, 0.3F, 0.7F, 0.7F, 0.7F); setBlockBounds(MIN_BOUND, MIN_BOUND, MIN_BOUND, MAX_BOUND, MAX_BOUND, MAX_BOUND);
setCreativeTab(Mekanism.tabMekanism); setCreativeTab(Mekanism.tabMekanism);
} }
@ -83,42 +86,42 @@ public class BlockTransmitter extends Block
{ {
boolean[] connectable = getConnectable(world, x, y, z); boolean[] connectable = getConnectable(world, x, y, z);
setBlockBounds(0.3F, 0.3F, 0.3F, 0.7F, 0.7F, 0.7F); setBlockBounds(MIN_BOUND, MIN_BOUND, MIN_BOUND, MAX_BOUND, MAX_BOUND, MAX_BOUND);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
if(connectable[4]) if(connectable[4])
{ {
setBlockBounds(0.0F, 0.3F, 0.3F, 0.7F, 0.7F, 0.7F); setBlockBounds(0.0F, MIN_BOUND, MIN_BOUND, MAX_BOUND, MAX_BOUND, MAX_BOUND);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
} }
if(connectable[5]) if(connectable[5])
{ {
setBlockBounds(0.3F, 0.3F, 0.3F, 1.0F, 0.7F, 0.7F); setBlockBounds(MIN_BOUND, MIN_BOUND, MIN_BOUND, 1.0F, MAX_BOUND, MAX_BOUND);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
} }
if(connectable[0]) if(connectable[0])
{ {
setBlockBounds(0.3F, 0.0F, 0.3F, 0.7F, 0.7F, 0.7F); setBlockBounds(MIN_BOUND, 0.0F, MIN_BOUND, MAX_BOUND, MAX_BOUND, MAX_BOUND);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
} }
if(connectable[1]) if(connectable[1])
{ {
setBlockBounds(0.3F, 0.3F, 0.3F, 0.7F, 1.0F, 0.7F); setBlockBounds(MIN_BOUND, MIN_BOUND, MIN_BOUND, MAX_BOUND, 1.0F, MAX_BOUND);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
} }
if(connectable[2]) if(connectable[2])
{ {
setBlockBounds(0.3F, 0.3F, 0.0F, 0.7F, 0.7F, 0.7F); setBlockBounds(MIN_BOUND, MIN_BOUND, 0.0F, MAX_BOUND, MAX_BOUND, MAX_BOUND);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
} }
if(connectable[3]) if(connectable[3])
{ {
setBlockBounds(0.3F, 0.3F, 0.3F, 0.7F, 0.7F, 1.0F); setBlockBounds(MIN_BOUND, MIN_BOUND, MIN_BOUND, MAX_BOUND, MAX_BOUND, 1.0F);
super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, list, entity);
} }
@ -132,12 +135,12 @@ public class BlockTransmitter extends Block
if(connectable != null) if(connectable != null)
{ {
float minX = 0.3F; float minX = MIN_BOUND;
float minY = 0.3F; float minY = MIN_BOUND;
float minZ = 0.3F; float minZ = MIN_BOUND;
float maxX = 0.7F; float maxX = MAX_BOUND;
float maxY = 0.7F; float maxY = MAX_BOUND;
float maxZ = 0.7F; float maxZ = MAX_BOUND;
if(connectable[0]) if(connectable[0])
{ {
@ -224,12 +227,12 @@ public class BlockTransmitter extends Block
{ {
TileEntity tileEntity = world.getBlockTileEntity(x, y, z); TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
float minX = 0.3F; float minX = MIN_BOUND;
float minY = 0.3F; float minY = MIN_BOUND;
float minZ = 0.3F; float minZ = MIN_BOUND;
float maxX = 0.7F; float maxX = MAX_BOUND;
float maxY = 0.7F; float maxY = MAX_BOUND;
float maxZ = 0.7F; float maxZ = MAX_BOUND;
boolean[] connectable = getConnectable(world, x, y, z); boolean[] connectable = getConnectable(world, x, y, z);
@ -374,7 +377,7 @@ public class BlockTransmitter extends Block
if(!returnBlock) if(!returnBlock)
{ {
float motion = 0.7F; float motion = 0.3F;
double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;