Fix block collision.

remove-fringelands
mckuhei 2 years ago
parent 4050b8fae6
commit 0cab667816

@ -16,7 +16,7 @@ public class BlockButton extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

@ -14,14 +14,14 @@ public class BlockFarmland extends Block
this.setLightOpacity(255);
}
/**
* 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)
{
return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)(par2 + 0), (double)(par3 + 0), (double)(par4 + 0), (double)(par2 + 1), (double)(par3 + 1), (double)(par4 + 1));
}
// /**
// * 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)
// {
// return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)(par2 + 0), (double)(par3 + 0), (double)(par4 + 0), (double)(par2 + 1), (double)(par3 + 1), (double)(par4 + 1));
// }
/**
* Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two

@ -58,7 +58,7 @@ public class BlockFire extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

@ -76,7 +76,7 @@ public class BlockFlower extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

@ -157,7 +157,7 @@ public abstract class BlockFluid extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

@ -14,7 +14,7 @@ public class BlockLever extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

@ -37,9 +37,9 @@ public class BlockLilyPad extends BlockFlower
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)par2 + this.minX, (double)par3 + this.minY, (double)par4 + this.minZ, (double)par2 + this.maxX, (double)par3 + this.maxY, (double)par4 + this.maxZ);
return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)par2.doubleValue() + this.minX, (double)par3 + this.minY, (double)par4.doubleValue() + this.minZ, (double)par2.doubleValue() + this.maxX, (double)par3 + this.maxY, (double)par4.doubleValue() + this.maxZ);
}
public int getBlockColor()

@ -31,7 +31,7 @@ public class BlockPressurePlate extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

@ -46,7 +46,7 @@ public class BlockRail extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

@ -34,7 +34,7 @@ public class BlockRedstoneWire extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

@ -1,5 +1,7 @@
package net.minecraft.src;
import org.mcmodule.math.BigInteger;
public class BlockSoulSand extends Block
{
public BlockSoulSand(int par1, int par2)
@ -12,10 +14,10 @@ public class BlockSoulSand extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
float var5 = 0.125F;
return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)par2, (double)par3, (double)par4, (double)(par2 + 1), (double)((float)(par3 + 1) - var5), (double)(par4 + 1));
return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)par2.doubleValue(), (double)par3, (double)par4.doubleValue(), (double)(par2.doubleValue() + 1), (double)((float)(par3 + 1) - var5), (double)(par4.doubleValue() + 1));
}
/**

@ -16,7 +16,7 @@ public class BlockTorch extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

@ -25,7 +25,7 @@ public class BlockTripWire extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

@ -16,7 +16,7 @@ public class BlockTripWireSource extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

@ -120,7 +120,7 @@ public class BlockVine extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

@ -2,6 +2,8 @@ package net.minecraft.src;
import java.util.Random;
import org.mcmodule.math.BigInteger;
public class BlockWeb extends Block
{
public BlockWeb(int par1, int par2)
@ -31,7 +33,7 @@ public class BlockWeb extends Block
* 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)
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4)
{
return null;
}

Loading…
Cancel
Save