diff --git a/src/minecraft/net/minecraft/src/BiomeGenDesert.java b/src/minecraft/net/minecraft/src/BiomeGenDesert.java index de19309..342248d 100644 --- a/src/minecraft/net/minecraft/src/BiomeGenDesert.java +++ b/src/minecraft/net/minecraft/src/BiomeGenDesert.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class BiomeGenDesert extends BiomeGenBase @@ -16,14 +17,14 @@ public class BiomeGenDesert extends BiomeGenBase this.theBiomeDecorator.cactiPerChunk = 10; } - public void decorate(World par1World, Random par2Random, int par3, int par4) + public void decorate(World par1World, Random par2Random, BigInteger par3, BigInteger par4) { super.decorate(par1World, par2Random, par3, par4); if (par2Random.nextInt(1000) == 0) { - int var5 = par3 + par2Random.nextInt(16) + 8; - int var6 = par4 + par2Random.nextInt(16) + 8; + BigInteger var5 = par3.add(BigInteger.valueOf(par2Random.nextInt(16) + 8)); + BigInteger var6 = par4.add(BigInteger.valueOf(par2Random.nextInt(16) + 8)); WorldGenDesertWells var7 = new WorldGenDesertWells(); var7.generate(par1World, par2Random, var5, par1World.getHeightValue(var5, var6) + 1, var6); } diff --git a/src/minecraft/net/minecraft/src/BiomeGenHills.java b/src/minecraft/net/minecraft/src/BiomeGenHills.java index a374427..929bd4a 100644 --- a/src/minecraft/net/minecraft/src/BiomeGenHills.java +++ b/src/minecraft/net/minecraft/src/BiomeGenHills.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class BiomeGenHills extends BiomeGenBase @@ -9,16 +10,16 @@ public class BiomeGenHills extends BiomeGenBase super(par1); } - public void decorate(World par1World, Random par2Random, int par3, int par4) + public void decorate(World par1World, Random par2Random, BigInteger par3, BigInteger par4) { super.decorate(par1World, par2Random, par3, par4); int var5 = 3 + par2Random.nextInt(6); for (int var6 = 0; var6 < var5; ++var6) { - int var7 = par3 + par2Random.nextInt(16); + BigInteger var7 = par3.add(BigInteger.valueOf(par2Random.nextInt(16))); int var8 = par2Random.nextInt(28) + 4; - int var9 = par4 + par2Random.nextInt(16); + BigInteger var9 = par4.add(BigInteger.valueOf(par2Random.nextInt(16))); int var10 = par1World.getBlockId(var7, var8, var9); if (var10 == Block.stone.blockID) diff --git a/src/minecraft/net/minecraft/src/BiomeGenJungle.java b/src/minecraft/net/minecraft/src/BiomeGenJungle.java index 6b63dcb..d756ce5 100644 --- a/src/minecraft/net/minecraft/src/BiomeGenJungle.java +++ b/src/minecraft/net/minecraft/src/BiomeGenJungle.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class BiomeGenJungle extends BiomeGenBase @@ -30,16 +31,16 @@ public class BiomeGenJungle extends BiomeGenBase return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1); } - public void decorate(World par1World, Random par2Random, int par3, int par4) + public void decorate(World par1World, Random par2Random, BigInteger par3, BigInteger par4) { super.decorate(par1World, par2Random, par3, par4); WorldGenVines var5 = new WorldGenVines(); for (int var6 = 0; var6 < 50; ++var6) { - int var7 = par3 + par2Random.nextInt(16) + 8; + BigInteger var7 = par3.add(BigInteger.valueOf(par2Random.nextInt(16) + 8)); byte var8 = 64; - int var9 = par4 + par2Random.nextInt(16) + 8; + BigInteger var9 = par4.add(BigInteger.valueOf(par2Random.nextInt(16) + 8)); var5.generate(par1World, par2Random, var7, var8, var9); } } diff --git a/src/minecraft/net/minecraft/src/Block.java b/src/minecraft/net/minecraft/src/Block.java index 7af2697..ef3d53c 100644 --- a/src/minecraft/net/minecraft/src/Block.java +++ b/src/minecraft/net/minecraft/src/Block.java @@ -668,7 +668,7 @@ public class Block /** * called by spawner, ore, redstoneOre blocks */ - protected void dropXpOnBlockBreak(World par1World, int par2, int par3, int par4, int par5) + protected void dropXpOnBlockBreak(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { if (!par1World.isRemote) { @@ -676,7 +676,7 @@ public class Block { int var6 = EntityXPOrb.getXPSplit(par5); par5 -= var6; - par1World.spawnEntityInWorld(new EntityXPOrb(par1World, (double)par2 + 0.5D, (double)par3 + 0.5D, (double)par4 + 0.5D, var6)); + par1World.spawnEntityInWorld(new EntityXPOrb(par1World, (double)par2.doubleValue() + 0.5D, (double)par3 + 0.5D, (double)par4.doubleValue() + 0.5D, var6)); } } } diff --git a/src/minecraft/net/minecraft/src/BlockFluid.java b/src/minecraft/net/minecraft/src/BlockFluid.java index 2ee070c..70b0ca3 100644 --- a/src/minecraft/net/minecraft/src/BlockFluid.java +++ b/src/minecraft/net/minecraft/src/BlockFluid.java @@ -28,7 +28,7 @@ public abstract class BlockFluid extends Block * Returns a integer with hex for 0xrrggbb with this color multiplied against the blocks color. Note only called * when first determining what to render. */ - public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + public int colorMultiplier(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { if (this.blockMaterial != Material.water) { @@ -44,7 +44,7 @@ public abstract class BlockFluid extends Block { for (int var9 = -1; var9 <= 1; ++var9) { - int var10 = par1IBlockAccess.getBiomeGenForCoords(par2 + var9, par4 + var8).waterColorMultiplier; + int var10 = par1IBlockAccess.getBiomeGenForCoords(par2.add(BigInteger.valueOf(var9)), par4.add(BigInteger.valueOf(var8))).waterColorMultiplier; var5 += (var10 & 16711680) >> 16; var6 += (var10 & 65280) >> 8; var7 += var10 & 255; @@ -80,7 +80,7 @@ public abstract class BlockFluid extends Block * Returns the amount of fluid decay at the coordinates, or -1 if the block at the coordinates is not the same * material as the fluid. */ - protected int getFlowDecay(World par1World, int par2, int par3, int par4) + protected int getFlowDecay(World par1World, BigInteger par2, int par3, BigInteger par4) { return par1World.getBlockMaterial(par2, par3, par4) == this.blockMaterial ? par1World.getBlockMetadata(par2, par3, par4) : -1; } @@ -89,7 +89,7 @@ public abstract class BlockFluid extends Block * Returns the flow decay but converts values indicating falling liquid (values >=8) to their effective source block * value of zero. */ - protected int getEffectiveFlowDecay(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + protected int getEffectiveFlowDecay(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { if (par1IBlockAccess.getBlockMaterial(par2, par3, par4) != this.blockMaterial) { @@ -137,7 +137,7 @@ public abstract class BlockFluid extends Block * Returns Returns true if the given side of this block type should be rendered (if it's solid or not), if the * adjacent block is at the given coordinates. Args: blockAccess, x, y, z, side */ - public boolean isBlockSolid(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean isBlockSolid(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4, int par5) { Material var6 = par1IBlockAccess.getBlockMaterial(par2, par3, par4); return var6 == this.blockMaterial ? false : (par5 == 1 ? true : (var6 == Material.ice ? false : super.isBlockSolid(par1IBlockAccess, par2, par3, par4, par5))); @@ -147,7 +147,7 @@ public abstract class BlockFluid extends Block * Returns true if the given side of this block type should be rendered, if the adjacent block is at the given * coordinates. Args: blockAccess, x, y, z, side */ - public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4, int par5) { Material var6 = par1IBlockAccess.getBlockMaterial(par2, par3, par4); return var6 == this.blockMaterial ? false : (par5 == 1 ? true : (var6 == Material.ice ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5))); @@ -189,34 +189,34 @@ public abstract class BlockFluid extends Block /** * Returns a vector indicating the direction and intensity of fluid flow. */ - private Vec3 getFlowVector(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + private Vec3 getFlowVector(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { Vec3 var5 = Vec3.getVec3Pool().getVecFromPool(0.0D, 0.0D, 0.0D); int var6 = this.getEffectiveFlowDecay(par1IBlockAccess, par2, par3, par4); for (int var7 = 0; var7 < 4; ++var7) { - int var8 = par2; - int var10 = par4; + BigInteger var8 = par2; + BigInteger var10 = par4; if (var7 == 0) { - var8 = par2 - 1; + var8 = par2.subtract(BigInteger.ONE); } if (var7 == 1) { - var10 = par4 - 1; + var10 = par4.subtract(BigInteger.ONE); } if (var7 == 2) { - ++var8; + var8 = var8.add(BigInteger.ONE); } if (var7 == 3) { - ++var10; + var10 = var10.add(BigInteger.ONE); } int var11 = this.getEffectiveFlowDecay(par1IBlockAccess, var8, par3, var10); @@ -231,14 +231,14 @@ public abstract class BlockFluid extends Block if (var11 >= 0) { var12 = var11 - (var6 - 8); - var5 = var5.addVector((double)((var8 - par2) * var12), (double)((par3 - par3) * var12), (double)((var10 - par4) * var12)); + var5 = var5.addVector((double)((var8.subtract(par2)).doubleValue() * var12), (double)((par3 - par3) * var12), (double)((var10.subtract(par4)).doubleValue() * var12)); } } } else if (var11 >= 0) { var12 = var11 - var6; - var5 = var5.addVector((double)((var8 - par2) * var12), (double)((par3 - par3) * var12), (double)((var10 - par4) * var12)); + var5 = var5.addVector((double)((var8.subtract(par2)).doubleValue() * var12), (double)((par3 - par3) * var12), (double)((var10.subtract(par4)).doubleValue() * var12)); } } @@ -246,42 +246,42 @@ public abstract class BlockFluid extends Block { boolean var13 = false; - if (var13 || this.isBlockSolid(par1IBlockAccess, par2, par3, par4 - 1, 2)) + if (var13 || this.isBlockSolid(par1IBlockAccess, par2, par3, par4.subtract(BigInteger.ONE), 2)) { var13 = true; } - if (var13 || this.isBlockSolid(par1IBlockAccess, par2, par3, par4 + 1, 3)) + if (var13 || this.isBlockSolid(par1IBlockAccess, par2, par3, par4.add(BigInteger.ONE), 3)) { var13 = true; } - if (var13 || this.isBlockSolid(par1IBlockAccess, par2 - 1, par3, par4, 4)) + if (var13 || this.isBlockSolid(par1IBlockAccess, par2.subtract(BigInteger.ONE), par3, par4, 4)) { var13 = true; } - if (var13 || this.isBlockSolid(par1IBlockAccess, par2 + 1, par3, par4, 5)) + if (var13 || this.isBlockSolid(par1IBlockAccess, par2.add(BigInteger.ONE), par3, par4, 5)) { var13 = true; } - if (var13 || this.isBlockSolid(par1IBlockAccess, par2, par3 + 1, par4 - 1, 2)) + if (var13 || this.isBlockSolid(par1IBlockAccess, par2, par3 + 1, par4.subtract(BigInteger.ONE), 2)) { var13 = true; } - if (var13 || this.isBlockSolid(par1IBlockAccess, par2, par3 + 1, par4 + 1, 3)) + if (var13 || this.isBlockSolid(par1IBlockAccess, par2, par3 + 1, par4.add(BigInteger.ONE), 3)) { var13 = true; } - if (var13 || this.isBlockSolid(par1IBlockAccess, par2 - 1, par3 + 1, par4, 4)) + if (var13 || this.isBlockSolid(par1IBlockAccess, par2.subtract(BigInteger.ONE), par3 + 1, par4, 4)) { var13 = true; } - if (var13 || this.isBlockSolid(par1IBlockAccess, par2 + 1, par3 + 1, par4, 5)) + if (var13 || this.isBlockSolid(par1IBlockAccess, par2.add(BigInteger.ONE), par3 + 1, par4, 5)) { var13 = true; } @@ -299,7 +299,7 @@ public abstract class BlockFluid extends Block /** * Can add to the passed in vector for a movement vector to be applied to the entity. Args: x, y, z, entity, vec3d */ - public void velocityToAddToEntity(World par1World, int par2, int par3, int par4, Entity par5Entity, Vec3 par6Vec3) + public void velocityToAddToEntity(World par1World, BigInteger par2, int par3, BigInteger par4, Entity par5Entity, Vec3 par6Vec3) { Vec3 var7 = this.getFlowVector(par1World, par2, par3, par4); par6Vec3.xCoord += var7.xCoord; @@ -318,7 +318,7 @@ public abstract class BlockFluid extends Block /** * Goes straight to getLightBrightnessForSkyBlocks for Blocks, does some fancy computing for Fluids */ - public int getMixedBrightnessForBlock(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + public int getMixedBrightnessForBlock(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { int var5 = par1IBlockAccess.getLightBrightnessForSkyBlocks(par2, par3, par4, 0); int var6 = par1IBlockAccess.getLightBrightnessForSkyBlocks(par2, par3 + 1, par4, 0); @@ -332,7 +332,7 @@ public abstract class BlockFluid extends Block /** * How bright to render this block based on the light its receiving. Args: iBlockAccess, x, y, z */ - public float getBlockBrightness(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + public float getBlockBrightness(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { float var5 = par1IBlockAccess.getLightBrightness(par2, par3, par4); float var6 = par1IBlockAccess.getLightBrightness(par2, par3 + 1, par4); @@ -350,7 +350,7 @@ public abstract class BlockFluid extends Block /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, BigInteger par2, int par3, BigInteger par4, Random par5Random) { int var6; @@ -362,61 +362,61 @@ public abstract class BlockFluid extends Block if (var6 <= 0 || var6 >= 8) { - par1World.spawnParticle("suspended", (double)((float)par2 + par5Random.nextFloat()), (double)((float)par3 + par5Random.nextFloat()), (double)((float)par4 + par5Random.nextFloat()), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("suspended", (double)((float)par2.floatValue() + par5Random.nextFloat()), (double)((float)par3 + par5Random.nextFloat()), (double)((float)par4.floatValue() + par5Random.nextFloat()), 0.0D, 0.0D, 0.0D); } } for (var6 = 0; var6 < 0; ++var6) { int var7 = par5Random.nextInt(4); - int var8 = par2; - int var9 = par4; + BigInteger var8 = par2; + BigInteger var9 = par4; if (var7 == 0) { - var8 = par2 - 1; + var8 = par2.subtract(BigInteger.ONE); } if (var7 == 1) { - ++var8; + var8 = var8.add(BigInteger.ONE); } if (var7 == 2) { - var9 = par4 - 1; + var9 = par4.subtract(BigInteger.ONE); } if (var7 == 3) { - ++var9; + var9 = var9.add(BigInteger.ONE); } if (par1World.getBlockMaterial(var8, par3, var9) == Material.air && (par1World.getBlockMaterial(var8, par3 - 1, var9).blocksMovement() || par1World.getBlockMaterial(var8, par3 - 1, var9).isLiquid())) { float var10 = 0.0625F; - double var11 = (double)((float)par2 + par5Random.nextFloat()); + double var11 = (double)((float)par2.floatValue() + par5Random.nextFloat()); double var13 = (double)((float)par3 + par5Random.nextFloat()); - double var15 = (double)((float)par4 + par5Random.nextFloat()); + double var15 = (double)((float)par4.floatValue() + par5Random.nextFloat()); if (var7 == 0) { - var11 = (double)((float)par2 - var10); + var11 = (double)((float)par2.floatValue() - var10); } if (var7 == 1) { - var11 = (double)((float)(par2 + 1) + var10); + var11 = (double)((float)(par2.add(BigInteger.ONE)).floatValue() + var10); } if (var7 == 2) { - var15 = (double)((float)par4 - var10); + var15 = (double)((float)par4.floatValue() - var10); } if (var7 == 3) { - var15 = (double)((float)(par4 + 1) + var10); + var15 = (double)((float)(par4.add(BigInteger.ONE)).floatValue() + var10); } double var17 = 0.0D; @@ -453,7 +453,7 @@ public abstract class BlockFluid extends Block if (var6 > 0 && var6 < 8) { - par1World.playSound((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), "liquid.water", par5Random.nextFloat() * 0.25F + 0.75F, par5Random.nextFloat() * 1.0F + 0.5F); + par1World.playSound((double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F), "liquid.water", par5Random.nextFloat() * 0.25F + 0.75F, par5Random.nextFloat() * 1.0F + 0.5F); } } @@ -465,24 +465,24 @@ public abstract class BlockFluid extends Block { if (par5Random.nextInt(100) == 0) { - var21 = (double)((float)par2 + par5Random.nextFloat()); + var21 = (double)((float)par2.floatValue() + par5Random.nextFloat()); var22 = (double)par3 + this.maxY; - var23 = (double)((float)par4 + par5Random.nextFloat()); + var23 = (double)((float)par4.floatValue() + par5Random.nextFloat()); par1World.spawnParticle("lava", var21, var22, var23, 0.0D, 0.0D, 0.0D); par1World.playSound(var21, var22, var23, "liquid.lavapop", 0.2F + par5Random.nextFloat() * 0.2F, 0.9F + par5Random.nextFloat() * 0.15F); } if (par5Random.nextInt(200) == 0) { - par1World.playSound((double)par2, (double)par3, (double)par4, "liquid.lava", 0.2F + par5Random.nextFloat() * 0.2F, 0.9F + par5Random.nextFloat() * 0.15F); + par1World.playSound((double)par2.doubleValue(), (double)par3, (double)par4.doubleValue(), "liquid.lava", 0.2F + par5Random.nextFloat() * 0.2F, 0.9F + par5Random.nextFloat() * 0.15F); } } if (par5Random.nextInt(10) == 0 && par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) && !par1World.getBlockMaterial(par2, par3 - 2, par4).blocksMovement()) { - var21 = (double)((float)par2 + par5Random.nextFloat()); + var21 = (double)((float)par2.floatValue() + par5Random.nextFloat()); var22 = (double)par3 - 1.05D; - var23 = (double)((float)par4 + par5Random.nextFloat()); + var23 = (double)((float)par4.floatValue() + par5Random.nextFloat()); if (this.blockMaterial == Material.water) { @@ -518,7 +518,7 @@ public abstract class BlockFluid extends Block /** * Called whenever the block is added into the world. Args: world, x, y, z */ - public void onBlockAdded(World par1World, int par2, int par3, int par4) + public void onBlockAdded(World par1World, BigInteger par2, int par3, BigInteger par4) { this.checkForHarden(par1World, par2, par3, par4); } @@ -527,7 +527,7 @@ public abstract class BlockFluid extends Block * 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) + public void onNeighborBlockChange(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { this.checkForHarden(par1World, par2, par3, par4); } @@ -535,7 +535,7 @@ public abstract class BlockFluid extends Block /** * Forces lava to check to see if it is colliding with water, and then decide what it should harden to. */ - private void checkForHarden(World par1World, int par2, int par3, int par4) + private void checkForHarden(World par1World, BigInteger par2, int par3, BigInteger par4) { if (par1World.getBlockId(par2, par3, par4) == this.blockID) { @@ -543,22 +543,22 @@ public abstract class BlockFluid extends Block { boolean var5 = false; - if (var5 || par1World.getBlockMaterial(par2, par3, par4 - 1) == Material.water) + if (var5 || par1World.getBlockMaterial(par2, par3, par4.subtract(BigInteger.ONE)) == Material.water) { var5 = true; } - if (var5 || par1World.getBlockMaterial(par2, par3, par4 + 1) == Material.water) + if (var5 || par1World.getBlockMaterial(par2, par3, par4.add(BigInteger.ONE)) == Material.water) { var5 = true; } - if (var5 || par1World.getBlockMaterial(par2 - 1, par3, par4) == Material.water) + if (var5 || par1World.getBlockMaterial(par2.subtract(BigInteger.ONE), par3, par4) == Material.water) { var5 = true; } - if (var5 || par1World.getBlockMaterial(par2 + 1, par3, par4) == Material.water) + if (var5 || par1World.getBlockMaterial(par2.add(BigInteger.ONE), par3, par4) == Material.water) { var5 = true; } @@ -590,13 +590,13 @@ public abstract class BlockFluid extends Block /** * Creates fizzing sound and smoke. Used when lava flows over block or mixes with water. */ - protected void triggerLavaMixEffects(World par1World, int par2, int par3, int par4) + protected void triggerLavaMixEffects(World par1World, BigInteger par2, int par3, BigInteger par4) { - par1World.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), "random.fizz", 0.5F, 2.6F + (par1World.rand.nextFloat() - par1World.rand.nextFloat()) * 0.8F); + par1World.playSoundEffect((double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F), "random.fizz", 0.5F, 2.6F + (par1World.rand.nextFloat() - par1World.rand.nextFloat()) * 0.8F); for (int var5 = 0; var5 < 8; ++var5) { - par1World.spawnParticle("largesmoke", (double)par2 + Math.random(), (double)par3 + 1.2D, (double)par4 + Math.random(), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("largesmoke", (double)par2.doubleValue() + Math.random(), (double)par3 + 1.2D, (double)par4.doubleValue() + Math.random(), 0.0D, 0.0D, 0.0D); } } } diff --git a/src/minecraft/net/minecraft/src/BlockLever.java b/src/minecraft/net/minecraft/src/BlockLever.java index 07b2b22..069e476 100644 --- a/src/minecraft/net/minecraft/src/BlockLever.java +++ b/src/minecraft/net/minecraft/src/BlockLever.java @@ -47,23 +47,23 @@ public class BlockLever extends Block /** * checks to see if you can place this block can be placed on that side of a block: BlockLever overrides */ - public boolean canPlaceBlockOnSide(World par1World, int par2, int par3, int par4, int par5) + public boolean canPlaceBlockOnSide(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { - return par5 == 0 && par1World.isBlockNormalCube(par2, par3 + 1, par4) ? true : (par5 == 1 && par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) ? true : (par5 == 2 && par1World.isBlockNormalCube(par2, par3, par4 + 1) ? true : (par5 == 3 && par1World.isBlockNormalCube(par2, par3, par4 - 1) ? true : (par5 == 4 && par1World.isBlockNormalCube(par2 + 1, par3, par4) ? true : par5 == 5 && par1World.isBlockNormalCube(par2 - 1, par3, par4))))); + return par5 == 0 && par1World.isBlockNormalCube(par2, par3 + 1, par4) ? true : (par5 == 1 && par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) ? true : (par5 == 2 && par1World.isBlockNormalCube(par2, par3, par4.add(BigInteger.ONE)) ? true : (par5 == 3 && par1World.isBlockNormalCube(par2, par3, par4.subtract(BigInteger.ONE)) ? true : (par5 == 4 && par1World.isBlockNormalCube(par2.add(BigInteger.ONE), par3, par4) ? true : par5 == 5 && par1World.isBlockNormalCube(par2.subtract(BigInteger.ONE), par3, par4))))); } /** * 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) + public boolean canPlaceBlockAt(World par1World, BigInteger par2, int par3, BigInteger par4) { - return par1World.isBlockNormalCube(par2 - 1, par3, par4) ? true : (par1World.isBlockNormalCube(par2 + 1, par3, par4) ? true : (par1World.isBlockNormalCube(par2, par3, par4 - 1) ? true : (par1World.isBlockNormalCube(par2, par3, par4 + 1) ? true : (par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) ? true : par1World.isBlockNormalCube(par2, par3 + 1, par4))))); + return par1World.isBlockNormalCube(par2.subtract(BigInteger.ONE), par3, par4) ? true : (par1World.isBlockNormalCube(par2.add(BigInteger.ONE), par3, par4) ? true : (par1World.isBlockNormalCube(par2, par3, par4.subtract(BigInteger.ONE)) ? true : (par1World.isBlockNormalCube(par2, par3, par4.add(BigInteger.ONE)) ? true : (par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) ? true : par1World.isBlockNormalCube(par2, par3 + 1, par4))))); } /** * called before onBlockPlacedBy by ItemBlock and ItemReed */ - public void updateBlockMetadata(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8) + public void updateBlockMetadata(World par1World, BigInteger par2, int par3, BigInteger par4, int par5, float par6, float par7, float par8) { int var9 = par1World.getBlockMetadata(par2, par3, par4); int var10 = var9 & 8; @@ -80,22 +80,22 @@ public class BlockLever extends Block var9 = 5 + par1World.rand.nextInt(2); } - if (par5 == 2 && par1World.isBlockNormalCube(par2, par3, par4 + 1)) + if (par5 == 2 && par1World.isBlockNormalCube(par2, par3, par4.add(BigInteger.ONE))) { var9 = 4; } - if (par5 == 3 && par1World.isBlockNormalCube(par2, par3, par4 - 1)) + if (par5 == 3 && par1World.isBlockNormalCube(par2, par3, par4.subtract(BigInteger.ONE))) { var9 = 3; } - if (par5 == 4 && par1World.isBlockNormalCube(par2 + 1, par3, par4)) + if (par5 == 4 && par1World.isBlockNormalCube(par2.add(BigInteger.ONE), par3, par4)) { var9 = 2; } - if (par5 == 5 && par1World.isBlockNormalCube(par2 - 1, par3, par4)) + if (par5 == 5 && par1World.isBlockNormalCube(par2.subtract(BigInteger.ONE), par3, par4)) { var9 = 1; } @@ -145,29 +145,29 @@ public class BlockLever extends Block * 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) + public void onNeighborBlockChange(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { if (this.checkIfAttachedToBlock(par1World, par2, par3, par4)) { int var6 = par1World.getBlockMetadata(par2, par3, par4) & 7; boolean var7 = false; - if (!par1World.isBlockNormalCube(par2 - 1, par3, par4) && var6 == 1) + if (!par1World.isBlockNormalCube(par2.subtract(BigInteger.ONE), par3, par4) && var6 == 1) { var7 = true; } - if (!par1World.isBlockNormalCube(par2 + 1, par3, par4) && var6 == 2) + if (!par1World.isBlockNormalCube(par2.add(BigInteger.ONE), par3, par4) && var6 == 2) { var7 = true; } - if (!par1World.isBlockNormalCube(par2, par3, par4 - 1) && var6 == 3) + if (!par1World.isBlockNormalCube(par2, par3, par4.subtract(BigInteger.ONE)) && var6 == 3) { var7 = true; } - if (!par1World.isBlockNormalCube(par2, par3, par4 + 1) && var6 == 4) + if (!par1World.isBlockNormalCube(par2, par3, par4.add(BigInteger.ONE)) && var6 == 4) { var7 = true; } @@ -204,7 +204,7 @@ public class BlockLever extends Block * Checks if the block is attached to another block. If it is not, it returns false and drops the block as an item. * If it is it returns true. */ - private boolean checkIfAttachedToBlock(World par1World, int par2, int par3, int par4) + private boolean checkIfAttachedToBlock(World par1World, BigInteger par2, int par3, BigInteger par4) { if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { @@ -221,7 +221,7 @@ public class BlockLever extends Block /** * 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) + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { int var5 = par1IBlockAccess.getBlockMetadata(par2, par3, par4) & 7; float var6 = 0.1875F; @@ -260,7 +260,7 @@ public class BlockLever extends Block /** * Called when the block is clicked by a player. Args: x, y, z, entityPlayer */ - public void onBlockClicked(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer) + public void onBlockClicked(World par1World, BigInteger par2, int par3, BigInteger par4, EntityPlayer par5EntityPlayer) { this.onBlockActivated(par1World, par2, par3, par4, par5EntityPlayer, 0, 0.0F, 0.0F, 0.0F); } @@ -268,7 +268,7 @@ public class BlockLever extends Block /** * Called upon block activation (right click on the block.) */ - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) + public boolean onBlockActivated(World par1World, BigInteger par2, int par3, BigInteger par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { if (par1World.isRemote) { @@ -281,24 +281,24 @@ public class BlockLever extends Block int var12 = 8 - (var10 & 8); par1World.setBlockMetadataWithNotify(par2, par3, par4, var11 + var12); par1World.markBlocksDirty(par2, par3, par4, par2, par3, par4); - par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.5D, (double)par4 + 0.5D, "random.click", 0.3F, var12 > 0 ? 0.6F : 0.5F); + par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.5D, (double)par4.doubleValue() + 0.5D, "random.click", 0.3F, var12 > 0 ? 0.6F : 0.5F); par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this.blockID); if (var11 == 1) { - par1World.notifyBlocksOfNeighborChange(par2 - 1, par3, par4, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2.subtract(BigInteger.ONE), par3, par4, this.blockID); } else if (var11 == 2) { - par1World.notifyBlocksOfNeighborChange(par2 + 1, par3, par4, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2.add(BigInteger.ONE), par3, par4, this.blockID); } else if (var11 == 3) { - par1World.notifyBlocksOfNeighborChange(par2, par3, par4 - 1, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2, par3, par4.subtract(BigInteger.ONE), this.blockID); } else if (var11 == 4) { - par1World.notifyBlocksOfNeighborChange(par2, par3, par4 + 1, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2, par3, par4.add(BigInteger.ONE), this.blockID); } else if (var11 != 5 && var11 != 6) { @@ -328,19 +328,19 @@ public class BlockLever extends Block if (var7 == 1) { - par1World.notifyBlocksOfNeighborChange(par2 - 1, par3, par4, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2.subtract(BigInteger.ONE), par3, par4, this.blockID); } else if (var7 == 2) { - par1World.notifyBlocksOfNeighborChange(par2 + 1, par3, par4, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2.add(BigInteger.ONE), par3, par4, this.blockID); } else if (var7 == 3) { - par1World.notifyBlocksOfNeighborChange(par2, par3, par4 - 1, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2, par3, par4.subtract(BigInteger.ONE), this.blockID); } else if (var7 == 4) { - par1World.notifyBlocksOfNeighborChange(par2, par3, par4 + 1, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2, par3, par4.add(BigInteger.ONE), this.blockID); } else if (var7 != 5 && var7 != 6) { @@ -361,7 +361,7 @@ public class BlockLever extends Block /** * Is this block powering the block on the specified side */ - public boolean isPoweringTo(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean isPoweringTo(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4, int par5) { return (par1IBlockAccess.getBlockMetadata(par2, par3, par4) & 8) > 0; } @@ -369,7 +369,7 @@ public class BlockLever extends Block /** * Is this block indirectly powering the block on the specified side */ - public boolean isIndirectlyPoweringTo(World par1World, int par2, int par3, int par4, int par5) + public boolean isIndirectlyPoweringTo(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { int var6 = par1World.getBlockMetadata(par2, par3, par4); diff --git a/src/minecraft/net/minecraft/src/BlockLog.java b/src/minecraft/net/minecraft/src/BlockLog.java index 3400201..74b8828 100644 --- a/src/minecraft/net/minecraft/src/BlockLog.java +++ b/src/minecraft/net/minecraft/src/BlockLog.java @@ -48,7 +48,7 @@ public class BlockLog extends Block byte var7 = 4; int var8 = var7 + 1; - if (par1World.checkChunksExist(par2 - var8, par3 - var8, par4 - var8, par2 + var8, par3 + var8, par4 + var8)) + if (par1World.checkChunksExist(par2.subtract(BigInteger.valueOf(var8)), par3 - var8, par4.subtract(BigInteger.valueOf(var8)), par2.add(BigInteger.valueOf(var8)), par3 + var8, par4.add(BigInteger.valueOf(var8)))) { for (int var9 = -var7; var9 <= var7; ++var9) { @@ -56,15 +56,15 @@ public class BlockLog extends Block { for (int var11 = -var7; var11 <= var7; ++var11) { - int var12 = par1World.getBlockId(par2 + var9, par3 + var10, par4 + var11); + int var12 = par1World.getBlockId(par2.add(BigInteger.valueOf(var9)), par3 + var10, par4.add(BigInteger.valueOf(var11))); if (var12 == Block.leaves.blockID) { - int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); + int var13 = par1World.getBlockMetadata(par2.add(BigInteger.valueOf(var9)), par3 + var10, par4.add(BigInteger.valueOf(var11))); if ((var13 & 8) == 0) { - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadata(par2.add(BigInteger.valueOf(var9)), par3 + var10, par4.add(BigInteger.valueOf(var11)), var13 | 8); } } } @@ -76,7 +76,7 @@ public class BlockLog extends Block /** * Called when the block is placed in the world. */ - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLiving par5EntityLiving) + public void onBlockPlacedBy(World par1World, BigInteger par2, int par3, BigInteger par4, EntityLiving par5EntityLiving) { int var6 = par1World.getBlockMetadata(par2, par3, par4) & 3; int var7 = BlockPistonBase.determineOrientation(par1World, par2, par3, par4, (EntityPlayer)par5EntityLiving); diff --git a/src/minecraft/net/minecraft/src/BlockMobSpawner.java b/src/minecraft/net/minecraft/src/BlockMobSpawner.java index df43a75..642ad6c 100644 --- a/src/minecraft/net/minecraft/src/BlockMobSpawner.java +++ b/src/minecraft/net/minecraft/src/BlockMobSpawner.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class BlockMobSpawner extends BlockContainer @@ -36,7 +37,7 @@ public class BlockMobSpawner extends BlockContainer /** * Drops the block items with a specified chance of dropping the specified items */ - public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7) + public void dropBlockAsItemWithChance(World par1World, BigInteger par2, int par3, BigInteger par4, int par5, float par6, int par7) { super.dropBlockAsItemWithChance(par1World, par2, par3, par4, par5, par6, par7); int var8 = 15 + par1World.rand.nextInt(15) + par1World.rand.nextInt(15); diff --git a/src/minecraft/net/minecraft/src/BlockOre.java b/src/minecraft/net/minecraft/src/BlockOre.java index b3cf726..bc2e827 100644 --- a/src/minecraft/net/minecraft/src/BlockOre.java +++ b/src/minecraft/net/minecraft/src/BlockOre.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class BlockOre extends Block @@ -51,7 +52,7 @@ public class BlockOre extends Block /** * Drops the block items with a specified chance of dropping the specified items */ - public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7) + public void dropBlockAsItemWithChance(World par1World, BigInteger par2, int par3, BigInteger par4, int par5, float par6, int par7) { super.dropBlockAsItemWithChance(par1World, par2, par3, par4, par5, par6, par7); diff --git a/src/minecraft/net/minecraft/src/BlockPortal.java b/src/minecraft/net/minecraft/src/BlockPortal.java index 0cc433b..16bdc54 100644 --- a/src/minecraft/net/minecraft/src/BlockPortal.java +++ b/src/minecraft/net/minecraft/src/BlockPortal.java @@ -14,7 +14,7 @@ public class BlockPortal extends BlockBreakable /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, BigInteger par2, int par3, BigInteger par4, Random par5Random) { super.updateTick(par1World, par2, par3, par4, par5Random); @@ -29,7 +29,7 @@ public class BlockPortal extends BlockBreakable if (var6 > 0 && !par1World.isBlockNormalCube(par2, var6 + 1, par4)) { - ItemMonsterPlacer.spawnCreature(par1World, 57, (double)par2 + 0.5D, (double)var6 + 1.1D, (double)par4 + 0.5D); + ItemMonsterPlacer.spawnCreature(par1World, 57, (double)par2.doubleValue() + 0.5D, (double)var6 + 1.1D, (double)par4.doubleValue() + 0.5D); } } } @@ -38,7 +38,7 @@ public class BlockPortal extends BlockBreakable * 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,12 +46,12 @@ public class BlockPortal extends BlockBreakable /** * 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) + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { float var5; float var6; - if (par1IBlockAccess.getBlockId(par2 - 1, par3, par4) != this.blockID && par1IBlockAccess.getBlockId(par2 + 1, par3, par4) != this.blockID) + if (par1IBlockAccess.getBlockId(par2.subtract(BigInteger.ONE), par3, par4) != this.blockID && par1IBlockAccess.getBlockId(par2.add(BigInteger.ONE), par3, par4) != this.blockID) { var5 = 0.125F; var6 = 0.5F; @@ -90,12 +90,12 @@ public class BlockPortal extends BlockBreakable byte var5 = 0; byte var6 = 0; - if (par1World.getBlockId(par2 - 1, par3, par4) == Block.obsidian.blockID || par1World.getBlockId(par2 + 1, par3, par4) == Block.obsidian.blockID) + if (par1World.getBlockId(par2.subtract(BigInteger.ONE), par3, par4) == Block.obsidian.blockID || par1World.getBlockId(par2.add(BigInteger.ONE), par3, par4) == Block.obsidian.blockID) { var5 = 1; } - if (par1World.getBlockId(par2, par3, par4 - 1) == Block.obsidian.blockID || par1World.getBlockId(par2, par3, par4 + 1) == Block.obsidian.blockID) + if (par1World.getBlockId(par2, par3, par4.subtract(BigInteger.ONE)) == Block.obsidian.blockID || par1World.getBlockId(par2, par3, par4.add(BigInteger.ONE)) == Block.obsidian.blockID) { var6 = 1; } @@ -106,10 +106,10 @@ public class BlockPortal extends BlockBreakable } else { - if (par1World.getBlockId(par2 - var5, par3, par4 - var6) == 0) + if (par1World.getBlockId(par2.subtract(BigInteger.valueOf(var5)), par3, par4.subtract(BigInteger.valueOf(var6))) == 0) { - par2 -= var5; - par4 -= var6; + par2 = par2.subtract(BigInteger.valueOf(var5)); + par4 = par4.subtract(BigInteger.valueOf(var6)); } int var7; @@ -123,7 +123,7 @@ public class BlockPortal extends BlockBreakable if (var7 != -1 && var7 != 2 || var8 != -1 && var8 != 3) { - int var10 = par1World.getBlockId(par2 + var5 * var7, par3 + var8, par4 + var6 * var7); + int var10 = par1World.getBlockId(par2.add(BigInteger.valueOf(var5 * var7)), par3 + var8, par4.add(BigInteger.valueOf(var6 * var7))); if (var9) { @@ -146,7 +146,7 @@ public class BlockPortal extends BlockBreakable { for (var8 = 0; var8 < 3; ++var8) { - par1World.setBlockWithNotify(par2 + var5 * var7, par3 + var8, par4 + var6 * var7, Block.portal.blockID); + par1World.setBlockWithNotify(par2.add(BigInteger.valueOf(var5 * var7)), par3 + var8, par4.add(BigInteger.valueOf(var6 * var7)), Block.portal.blockID); } } @@ -159,12 +159,12 @@ public class BlockPortal extends BlockBreakable * 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) + public void onNeighborBlockChange(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { byte var6 = 0; byte var7 = 1; - if (par1World.getBlockId(par2 - 1, par3, par4) == this.blockID || par1World.getBlockId(par2 + 1, par3, par4) == this.blockID) + if (par1World.getBlockId(par2.subtract(BigInteger.ONE), par3, par4) == this.blockID || par1World.getBlockId(par2.add(BigInteger.ONE), par3, par4) == this.blockID) { var6 = 1; var7 = 0; @@ -192,8 +192,8 @@ public class BlockPortal extends BlockBreakable if (var9 == 3 && par1World.getBlockId(par2, var8 + var9, par4) == Block.obsidian.blockID) { - boolean var10 = par1World.getBlockId(par2 - 1, par3, par4) == this.blockID || par1World.getBlockId(par2 + 1, par3, par4) == this.blockID; - boolean var11 = par1World.getBlockId(par2, par3, par4 - 1) == this.blockID || par1World.getBlockId(par2, par3, par4 + 1) == this.blockID; + boolean var10 = par1World.getBlockId(par2.subtract(BigInteger.ONE), par3, par4) == this.blockID || par1World.getBlockId(par2.add(BigInteger.ONE), par3, par4) == this.blockID; + boolean var11 = par1World.getBlockId(par2, par3, par4.subtract(BigInteger.ONE)) == this.blockID || par1World.getBlockId(par2, par3, par4.add(BigInteger.ONE)) == this.blockID; if (var10 && var11) { @@ -201,7 +201,7 @@ public class BlockPortal extends BlockBreakable } else { - if ((par1World.getBlockId(par2 + var6, par3, par4 + var7) != Block.obsidian.blockID || par1World.getBlockId(par2 - var6, par3, par4 - var7) != this.blockID) && (par1World.getBlockId(par2 - var6, par3, par4 - var7) != Block.obsidian.blockID || par1World.getBlockId(par2 + var6, par3, par4 + var7) != this.blockID)) + if ((par1World.getBlockId(par2.add(BigInteger.valueOf(var6)), par3, par4.add(BigInteger.valueOf(var7))) != Block.obsidian.blockID || par1World.getBlockId(par2.subtract(BigInteger.valueOf(var6)), par3, par4.subtract(BigInteger.valueOf(var7))) != this.blockID) && (par1World.getBlockId(par2.subtract(BigInteger.valueOf(var6)), par3, par4.subtract(BigInteger.valueOf(var7))) != Block.obsidian.blockID || par1World.getBlockId(par2.add(BigInteger.valueOf(var6)), par3, par4.add(BigInteger.valueOf(var7))) != this.blockID)) { par1World.setBlockWithNotify(par2, par3, par4, 0); } @@ -218,7 +218,7 @@ public class BlockPortal extends BlockBreakable * Returns true if the given side of this block type should be rendered, if the adjacent block is at the given * coordinates. Args: blockAccess, x, y, z, side */ - public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4, int par5) { if (par1IBlockAccess.getBlockId(par2, par3, par4) == this.blockID) { @@ -226,10 +226,10 @@ public class BlockPortal extends BlockBreakable } else { - boolean var6 = par1IBlockAccess.getBlockId(par2 - 1, par3, par4) == this.blockID && par1IBlockAccess.getBlockId(par2 - 2, par3, par4) != this.blockID; - boolean var7 = par1IBlockAccess.getBlockId(par2 + 1, par3, par4) == this.blockID && par1IBlockAccess.getBlockId(par2 + 2, par3, par4) != this.blockID; - boolean var8 = par1IBlockAccess.getBlockId(par2, par3, par4 - 1) == this.blockID && par1IBlockAccess.getBlockId(par2, par3, par4 - 2) != this.blockID; - boolean var9 = par1IBlockAccess.getBlockId(par2, par3, par4 + 1) == this.blockID && par1IBlockAccess.getBlockId(par2, par3, par4 + 2) != this.blockID; + boolean var6 = par1IBlockAccess.getBlockId(par2.subtract(BigInteger.ONE), par3, par4) == this.blockID && par1IBlockAccess.getBlockId(par2.subtract(BigInteger.valueOf(2)), par3, par4) != this.blockID; + boolean var7 = par1IBlockAccess.getBlockId(par2.add(BigInteger.ONE), par3, par4) == this.blockID && par1IBlockAccess.getBlockId(par2.add(BigInteger.valueOf(2)), par3, par4) != this.blockID; + boolean var8 = par1IBlockAccess.getBlockId(par2, par3, par4.subtract(BigInteger.ONE)) == this.blockID && par1IBlockAccess.getBlockId(par2, par3, par4.subtract(BigInteger.valueOf(2))) != this.blockID; + boolean var9 = par1IBlockAccess.getBlockId(par2, par3, par4.add(BigInteger.ONE)) == this.blockID && par1IBlockAccess.getBlockId(par2, par3, par4.add(BigInteger.valueOf(2))) != this.blockID; boolean var10 = var6 || var7; boolean var11 = var8 || var9; return var10 && par5 == 4 ? true : (var10 && par5 == 5 ? true : (var11 && par5 == 2 ? true : var11 && par5 == 3)); @@ -266,18 +266,18 @@ public class BlockPortal extends BlockBreakable /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, BigInteger par2, int par3, BigInteger par4, Random par5Random) { if (par5Random.nextInt(100) == 0) { - par1World.playSound((double)par2 + 0.5D, (double)par3 + 0.5D, (double)par4 + 0.5D, "portal.portal", 0.5F, par5Random.nextFloat() * 0.4F + 0.8F); + par1World.playSound((double)par2.doubleValue() + 0.5D, (double)par3 + 0.5D, (double)par4.doubleValue() + 0.5D, "portal.portal", 0.5F, par5Random.nextFloat() * 0.4F + 0.8F); } for (int var6 = 0; var6 < 4; ++var6) { - double var7 = (double)((float)par2 + par5Random.nextFloat()); + double var7 = (double)((float)par2.floatValue() + par5Random.nextFloat()); double var9 = (double)((float)par3 + par5Random.nextFloat()); - double var11 = (double)((float)par4 + par5Random.nextFloat()); + double var11 = (double)((float)par4.floatValue() + par5Random.nextFloat()); double var13 = 0.0D; double var15 = 0.0D; double var17 = 0.0D; @@ -286,14 +286,14 @@ public class BlockPortal extends BlockBreakable var15 = ((double)par5Random.nextFloat() - 0.5D) * 0.5D; var17 = ((double)par5Random.nextFloat() - 0.5D) * 0.5D; - if (par1World.getBlockId(par2 - 1, par3, par4) != this.blockID && par1World.getBlockId(par2 + 1, par3, par4) != this.blockID) + if (par1World.getBlockId(par2.subtract(BigInteger.ONE), par3, par4) != this.blockID && par1World.getBlockId(par2.add(BigInteger.ONE), par3, par4) != this.blockID) { - var7 = (double)par2 + 0.5D + 0.25D * (double)var19; + var7 = (double)par2.doubleValue() + 0.5D + 0.25D * (double)var19; var13 = (double)(par5Random.nextFloat() * 2.0F * (float)var19); } else { - var11 = (double)par4 + 0.5D + 0.25D * (double)var19; + var11 = (double)par4.doubleValue() + 0.5D + 0.25D * (double)var19; var17 = (double)(par5Random.nextFloat() * 2.0F * (float)var19); } diff --git a/src/minecraft/net/minecraft/src/BlockPressurePlate.java b/src/minecraft/net/minecraft/src/BlockPressurePlate.java index 0d5b93e..bdf4391 100644 --- a/src/minecraft/net/minecraft/src/BlockPressurePlate.java +++ b/src/minecraft/net/minecraft/src/BlockPressurePlate.java @@ -61,7 +61,7 @@ public class BlockPressurePlate extends Block /** * 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) + public boolean canPlaceBlockAt(World par1World, BigInteger par2, int par3, BigInteger par4) { return par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) || BlockFence.isIdAFence(par1World.getBlockId(par2, par3 - 1, par4)); } @@ -70,7 +70,7 @@ public class BlockPressurePlate extends Block * 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) + public void onNeighborBlockChange(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { boolean var6 = false; @@ -89,7 +89,7 @@ public class BlockPressurePlate extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, BigInteger par2, int par3, BigInteger par4, Random par5Random) { if (!par1World.isRemote) { @@ -103,7 +103,7 @@ public class BlockPressurePlate extends Block /** * 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) + public void onEntityCollidedWithBlock(World par1World, BigInteger par2, int par3, BigInteger par4, Entity par5Entity) { if (!par1World.isRemote) { @@ -117,7 +117,7 @@ public class BlockPressurePlate extends Block /** * 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 par1World, int par2, int par3, int par4) + private void setStateIfMobInteractsWithPlate(World par1World, BigInteger par2, int par3, BigInteger par4) { boolean var5 = par1World.getBlockMetadata(par2, par3, par4) == 1; boolean var6 = false; @@ -126,17 +126,17 @@ public class BlockPressurePlate extends Block if (this.triggerMobType == EnumMobType.everything) { - var8 = par1World.getEntitiesWithinAABBExcludingEntity((Entity)null, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2 + var7), (double)par3, (double)((float)par4 + var7), (double)((float)(par2 + 1) - var7), (double)par3 + 0.25D, (double)((float)(par4 + 1) - var7))); + var8 = par1World.getEntitiesWithinAABBExcludingEntity((Entity)null, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var7), (double)par3, (double)((float)par4 .floatValue()+ var7), (double)((float)(par2.doubleValue() + 1) - var7), (double)par3 + 0.25D, (double)((float)(par4.doubleValue() + 1) - var7))); } if (this.triggerMobType == EnumMobType.mobs) { - var8 = par1World.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2 + var7), (double)par3, (double)((float)par4 + var7), (double)((float)(par2 + 1) - var7), (double)par3 + 0.25D, (double)((float)(par4 + 1) - var7))); + var8 = par1World.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var7), (double)par3, (double)((float)par4.floatValue() + var7), (double)((float)(par2.doubleValue() + 1) - var7), (double)par3 + 0.25D, (double)((float)(par4.doubleValue() + 1) - var7))); } if (this.triggerMobType == EnumMobType.players) { - var8 = par1World.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2 + var7), (double)par3, (double)((float)par4 + var7), (double)((float)(par2 + 1) - var7), (double)par3 + 0.25D, (double)((float)(par4 + 1) - var7))); + var8 = par1World.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var7), (double)par3, (double)((float)par4.floatValue() + var7), (double)((float)(par2.doubleValue() + 1) - var7), (double)par3 + 0.25D, (double)((float)(par4.doubleValue() + 1) - var7))); } if (!var8.isEmpty()) @@ -150,7 +150,7 @@ public class BlockPressurePlate extends Block par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this.blockID); par1World.notifyBlocksOfNeighborChange(par2, par3 - 1, par4, this.blockID); par1World.markBlocksDirty(par2, par3, par4, par2, par3, par4); - par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.1D, (double)par4 + 0.5D, "random.click", 0.3F, 0.6F); + par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.1D, (double)par4.doubleValue() + 0.5D, "random.click", 0.3F, 0.6F); } if (!var6 && var5) @@ -159,7 +159,7 @@ public class BlockPressurePlate extends Block par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this.blockID); par1World.notifyBlocksOfNeighborChange(par2, par3 - 1, par4, this.blockID); par1World.markBlocksDirty(par2, par3, par4, par2, par3, par4); - par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.1D, (double)par4 + 0.5D, "random.click", 0.3F, 0.5F); + par1World.playSoundEffect((double)par2.doubleValue() + 0.5D, (double)par3 + 0.1D, (double)par4.doubleValue() + 0.5D, "random.click", 0.3F, 0.5F); } if (var6) @@ -185,7 +185,7 @@ public class BlockPressurePlate extends Block /** * 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) + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { boolean var5 = par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 1; float var6 = 0.0625F; @@ -203,7 +203,7 @@ public class BlockPressurePlate extends Block /** * Is this block powering the block on the specified side */ - public boolean isPoweringTo(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean isPoweringTo(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4, int par5) { return par1IBlockAccess.getBlockMetadata(par2, par3, par4) > 0; } @@ -211,7 +211,7 @@ public class BlockPressurePlate extends Block /** * Is this block indirectly powering the block on the specified side */ - public boolean isIndirectlyPoweringTo(World par1World, int par2, int par3, int par4, int par5) + public boolean isIndirectlyPoweringTo(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { return par1World.getBlockMetadata(par2, par3, par4) == 0 ? false : par5 == 1; } diff --git a/src/minecraft/net/minecraft/src/BlockPumpkin.java b/src/minecraft/net/minecraft/src/BlockPumpkin.java index 9188640..d8bf2ee 100644 --- a/src/minecraft/net/minecraft/src/BlockPumpkin.java +++ b/src/minecraft/net/minecraft/src/BlockPumpkin.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class BlockPumpkin extends BlockDirectional { /** Boolean used to seperate different states of blocks */ @@ -51,7 +53,7 @@ public class BlockPumpkin extends BlockDirectional /** * Called whenever the block is added into the world. Args: world, x, y, z */ - public void onBlockAdded(World par1World, int par2, int par3, int par4) + public void onBlockAdded(World par1World, BigInteger par2, int par3, BigInteger par4) { super.onBlockAdded(par1World, par2, par3, par4); @@ -63,7 +65,7 @@ public class BlockPumpkin extends BlockDirectional par1World.setBlock(par2, par3 - 1, par4, 0); par1World.setBlock(par2, par3 - 2, par4, 0); EntitySnowman var9 = new EntitySnowman(par1World); - var9.setLocationAndAngles((double)par2 + 0.5D, (double)par3 - 1.95D, (double)par4 + 0.5D, 0.0F, 0.0F); + var9.setLocationAndAngles((double)par2.doubleValue() + 0.5D, (double)par3 - 1.95D, (double)par4.doubleValue() + 0.5D, 0.0F, 0.0F); par1World.spawnEntityInWorld(var9); par1World.notifyBlockChange(par2, par3, par4, 0); par1World.notifyBlockChange(par2, par3 - 1, par4, 0); @@ -72,13 +74,13 @@ public class BlockPumpkin extends BlockDirectional for (int var10 = 0; var10 < 120; ++var10) { - par1World.spawnParticle("snowshovel", (double)par2 + par1World.rand.nextDouble(), (double)(par3 - 2) + par1World.rand.nextDouble() * 2.5D, (double)par4 + par1World.rand.nextDouble(), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("snowshovel", (double)par2.doubleValue() + par1World.rand.nextDouble(), (double)(par3 - 2) + par1World.rand.nextDouble() * 2.5D, (double)par4.doubleValue() + par1World.rand.nextDouble(), 0.0D, 0.0D, 0.0D); } } else if (par1World.getBlockId(par2, par3 - 1, par4) == Block.blockSteel.blockID && par1World.getBlockId(par2, par3 - 2, par4) == Block.blockSteel.blockID) { - boolean var5 = par1World.getBlockId(par2 - 1, par3 - 1, par4) == Block.blockSteel.blockID && par1World.getBlockId(par2 + 1, par3 - 1, par4) == Block.blockSteel.blockID; - boolean var6 = par1World.getBlockId(par2, par3 - 1, par4 - 1) == Block.blockSteel.blockID && par1World.getBlockId(par2, par3 - 1, par4 + 1) == Block.blockSteel.blockID; + boolean var5 = par1World.getBlockId(par2.subtract(BigInteger.ONE), par3 - 1, par4) == Block.blockSteel.blockID && par1World.getBlockId(par2.add(BigInteger.ONE), par3 - 1, par4) == Block.blockSteel.blockID; + boolean var6 = par1World.getBlockId(par2, par3 - 1, par4.subtract(BigInteger.ONE)) == Block.blockSteel.blockID && par1World.getBlockId(par2, par3 - 1, par4.add(BigInteger.ONE)) == Block.blockSteel.blockID; if (var5 || var6) { @@ -88,23 +90,23 @@ public class BlockPumpkin extends BlockDirectional if (var5) { - par1World.setBlock(par2 - 1, par3 - 1, par4, 0); - par1World.setBlock(par2 + 1, par3 - 1, par4, 0); + par1World.setBlock(par2.subtract(BigInteger.ONE), par3 - 1, par4, 0); + par1World.setBlock(par2.add(BigInteger.ONE), par3 - 1, par4, 0); } else { - par1World.setBlock(par2, par3 - 1, par4 - 1, 0); - par1World.setBlock(par2, par3 - 1, par4 + 1, 0); + par1World.setBlock(par2, par3 - 1, par4.subtract(BigInteger.ONE), 0); + par1World.setBlock(par2, par3 - 1, par4.add(BigInteger.ONE), 0); } EntityIronGolem var7 = new EntityIronGolem(par1World); var7.setBit1FlagTo(true); - var7.setLocationAndAngles((double)par2 + 0.5D, (double)par3 - 1.95D, (double)par4 + 0.5D, 0.0F, 0.0F); + var7.setLocationAndAngles((double)par2.doubleValue() + 0.5D, (double)par3 - 1.95D, (double)par4.doubleValue() + 0.5D, 0.0F, 0.0F); par1World.spawnEntityInWorld(var7); for (int var8 = 0; var8 < 120; ++var8) { - par1World.spawnParticle("snowballpoof", (double)par2 + par1World.rand.nextDouble(), (double)(par3 - 2) + par1World.rand.nextDouble() * 3.9D, (double)par4 + par1World.rand.nextDouble(), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("snowballpoof", (double)par2.doubleValue() + par1World.rand.nextDouble(), (double)(par3 - 2) + par1World.rand.nextDouble() * 3.9D, (double)par4.doubleValue() + par1World.rand.nextDouble(), 0.0D, 0.0D, 0.0D); } par1World.notifyBlockChange(par2, par3, par4, 0); @@ -113,13 +115,13 @@ public class BlockPumpkin extends BlockDirectional if (var5) { - par1World.notifyBlockChange(par2 - 1, par3 - 1, par4, 0); - par1World.notifyBlockChange(par2 + 1, par3 - 1, par4, 0); + par1World.notifyBlockChange(par2.subtract(BigInteger.ONE), par3 - 1, par4, 0); + par1World.notifyBlockChange(par2.add(BigInteger.ONE), par3 - 1, par4, 0); } else { - par1World.notifyBlockChange(par2, par3 - 1, par4 - 1, 0); - par1World.notifyBlockChange(par2, par3 - 1, par4 + 1, 0); + par1World.notifyBlockChange(par2, par3 - 1, par4.subtract(BigInteger.ONE), 0); + par1World.notifyBlockChange(par2, par3 - 1, par4.add(BigInteger.ONE), 0); } } } @@ -128,7 +130,7 @@ public class BlockPumpkin extends BlockDirectional /** * 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) + public boolean canPlaceBlockAt(World par1World, BigInteger par2, int par3, BigInteger par4) { int var5 = par1World.getBlockId(par2, par3, par4); return (var5 == 0 || Block.blocksList[var5].blockMaterial.isGroundCover()) && par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4); @@ -137,7 +139,7 @@ public class BlockPumpkin extends BlockDirectional /** * Called when the block is placed in the world. */ - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLiving par5EntityLiving) + public void onBlockPlacedBy(World par1World, BigInteger par2, int par3, BigInteger par4, EntityLiving par5EntityLiving) { int var6 = MathHelper.floor_double((double)(par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 2.5D) & 3; par1World.setBlockMetadataWithNotify(par2, par3, par4, var6); diff --git a/src/minecraft/net/minecraft/src/BlockRedstoneOre.java b/src/minecraft/net/minecraft/src/BlockRedstoneOre.java index 0759b36..0c81473 100644 --- a/src/minecraft/net/minecraft/src/BlockRedstoneOre.java +++ b/src/minecraft/net/minecraft/src/BlockRedstoneOre.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class BlockRedstoneOre extends Block @@ -104,7 +105,7 @@ public class BlockRedstoneOre extends Block /** * Drops the block items with a specified chance of dropping the specified items */ - public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, int par7) + public void dropBlockAsItemWithChance(World par1World, BigInteger par2, int par3, BigInteger par4, int par5, float par6, int par7) { super.dropBlockAsItemWithChance(par1World, par2, par3, par4, par5, par6, par7); diff --git a/src/minecraft/net/minecraft/src/BlockTorch.java b/src/minecraft/net/minecraft/src/BlockTorch.java index 85b2359..69f00d3 100644 --- a/src/minecraft/net/minecraft/src/BlockTorch.java +++ b/src/minecraft/net/minecraft/src/BlockTorch.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class BlockTorch extends Block @@ -48,7 +49,7 @@ public class BlockTorch extends Block /** * Gets if we can place a torch on a block. */ - private boolean canPlaceTorchOn(World par1World, int par2, int par3, int par4) + private boolean canPlaceTorchOn(World par1World, BigInteger par2, int par3, BigInteger par4) { if (par1World.doesBlockHaveSolidTopSurface(par2, par3, par4)) { @@ -64,15 +65,15 @@ public class BlockTorch extends Block /** * 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) + public boolean canPlaceBlockAt(World par1World, BigInteger par2, int par3, BigInteger par4) { - return par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true) ? true : (par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true) ? true : (par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true) ? true : (par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true) ? true : this.canPlaceTorchOn(par1World, par2, par3 - 1, par4)))); + return par1World.isBlockNormalCubeDefault(par2.subtract(BigInteger.ONE), par3, par4, true) ? true : (par1World.isBlockNormalCubeDefault(par2.add(BigInteger.ONE), par3, par4, true) ? true : (par1World.isBlockNormalCubeDefault(par2, par3, par4.subtract(BigInteger.ONE), true) ? true : (par1World.isBlockNormalCubeDefault(par2, par3, par4.add(BigInteger.ONE), true) ? true : this.canPlaceTorchOn(par1World, par2, par3 - 1, par4)))); } /** * called before onBlockPlacedBy by ItemBlock and ItemReed */ - public void updateBlockMetadata(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8) + public void updateBlockMetadata(World par1World, BigInteger par2, int par3, BigInteger par4, int par5, float par6, float par7, float par8) { int var9 = par1World.getBlockMetadata(par2, par3, par4); @@ -81,22 +82,22 @@ public class BlockTorch extends Block var9 = 5; } - if (par5 == 2 && par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true)) + if (par5 == 2 && par1World.isBlockNormalCubeDefault(par2, par3, par4.add(BigInteger.ONE), true)) { var9 = 4; } - if (par5 == 3 && par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true)) + if (par5 == 3 && par1World.isBlockNormalCubeDefault(par2, par3, par4.subtract(BigInteger.ONE), true)) { var9 = 3; } - if (par5 == 4 && par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true)) + if (par5 == 4 && par1World.isBlockNormalCubeDefault(par2.add(BigInteger.ONE), par3, par4, true)) { var9 = 2; } - if (par5 == 5 && par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true)) + if (par5 == 5 && par1World.isBlockNormalCubeDefault(par2.subtract(BigInteger.ONE), par3, par4, true)) { var9 = 1; } @@ -107,7 +108,7 @@ public class BlockTorch extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, BigInteger par2, int par3, BigInteger par4, Random par5Random) { super.updateTick(par1World, par2, par3, par4, par5Random); @@ -120,21 +121,21 @@ public class BlockTorch extends Block /** * Called whenever the block is added into the world. Args: world, x, y, z */ - public void onBlockAdded(World par1World, int par2, int par3, int par4) + public void onBlockAdded(World par1World, BigInteger par2, int par3, BigInteger par4) { - if (par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true)) + if (par1World.isBlockNormalCubeDefault(par2.subtract(BigInteger.ONE), par3, par4, true)) { par1World.setBlockMetadataWithNotify(par2, par3, par4, 1); } - else if (par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true)) + else if (par1World.isBlockNormalCubeDefault(par2.add(BigInteger.ONE), par3, par4, true)) { par1World.setBlockMetadataWithNotify(par2, par3, par4, 2); } - else if (par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true)) + else if (par1World.isBlockNormalCubeDefault(par2, par3, par4.subtract(BigInteger.ONE), true)) { par1World.setBlockMetadataWithNotify(par2, par3, par4, 3); } - else if (par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true)) + else if (par1World.isBlockNormalCubeDefault(par2, par3, par4.add(BigInteger.ONE), true)) { par1World.setBlockMetadataWithNotify(par2, par3, par4, 4); } @@ -150,29 +151,29 @@ public class BlockTorch extends Block * 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) + public void onNeighborBlockChange(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { if (this.dropTorchIfCantStay(par1World, par2, par3, par4)) { int var6 = par1World.getBlockMetadata(par2, par3, par4); boolean var7 = false; - if (!par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true) && var6 == 1) + if (!par1World.isBlockNormalCubeDefault(par2.subtract(BigInteger.ONE), par3, par4, true) && var6 == 1) { var7 = true; } - if (!par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true) && var6 == 2) + if (!par1World.isBlockNormalCubeDefault(par2.add(BigInteger.ONE), par3, par4, true) && var6 == 2) { var7 = true; } - if (!par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true) && var6 == 3) + if (!par1World.isBlockNormalCubeDefault(par2, par3, par4.subtract(BigInteger.ONE), true) && var6 == 3) { var7 = true; } - if (!par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true) && var6 == 4) + if (!par1World.isBlockNormalCubeDefault(par2, par3, par4.add(BigInteger.ONE), true) && var6 == 4) { var7 = true; } @@ -194,7 +195,7 @@ public class BlockTorch extends Block * Tests if the block can remain at its current location and will drop as an item if it is unable to stay. Returns * True if it can stay and False if it drops. Args: world, x, y, z */ - private boolean dropTorchIfCantStay(World par1World, int par2, int par3, int par4) + private boolean dropTorchIfCantStay(World par1World, BigInteger par2, int par3, BigInteger par4) { if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { @@ -216,7 +217,7 @@ public class BlockTorch extends Block * Ray traces through the blocks collision from start vector to end vector returning a ray trace hit. Args: world, * x, y, z, startVec, endVec */ - public MovingObjectPosition collisionRayTrace(World par1World, int par2, int par3, int par4, Vec3 par5Vec3, Vec3 par6Vec3) + public MovingObjectPosition collisionRayTrace(World par1World, BigInteger par2, int par3, BigInteger par4, Vec3 par5Vec3, Vec3 par6Vec3) { int var7 = par1World.getBlockMetadata(par2, par3, par4) & 7; float var8 = 0.15F; @@ -249,12 +250,12 @@ public class BlockTorch extends Block /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, BigInteger par2, int par3, BigInteger par4, Random par5Random) { int var6 = par1World.getBlockMetadata(par2, par3, par4); - double var7 = (double)((float)par2 + 0.5F); + double var7 = (double)((float)par2.floatValue() + 0.5F); double var9 = (double)((float)par3 + 0.7F); - double var11 = (double)((float)par4 + 0.5F); + double var11 = (double)((float)par4.floatValue() + 0.5F); double var13 = 0.2199999988079071D; double var15 = 0.27000001072883606D; diff --git a/src/minecraft/net/minecraft/src/BlockTrapDoor.java b/src/minecraft/net/minecraft/src/BlockTrapDoor.java index 069225b..3cca71e 100644 --- a/src/minecraft/net/minecraft/src/BlockTrapDoor.java +++ b/src/minecraft/net/minecraft/src/BlockTrapDoor.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class BlockTrapDoor extends Block { protected BlockTrapDoor(int par1, Material par2Material) @@ -35,7 +37,7 @@ public class BlockTrapDoor extends Block return false; } - public boolean getBlocksMovement(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + public boolean getBlocksMovement(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { return !isTrapdoorOpen(par1IBlockAccess.getBlockMetadata(par2, par3, par4)); } @@ -48,29 +50,29 @@ public class BlockTrapDoor extends Block return 0; } - /** - * Returns the bounding box of the wired rectangular prism to render. - */ - public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, int par2, int par3, int par4) - { - this.setBlockBoundsBasedOnState(par1World, par2, par3, par4); - return super.getSelectedBoundingBoxFromPool(par1World, par2, par3, par4); - } - - /** - * 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) - { - this.setBlockBoundsBasedOnState(par1World, par2, par3, par4); - return super.getCollisionBoundingBoxFromPool(par1World, par2, par3, par4); - } +// /** +// * Returns the bounding box of the wired rectangular prism to render. +// */ +// public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, int par2, int par3, int par4) +// { +// this.setBlockBoundsBasedOnState(par1World, par2, par3, par4); +// return super.getSelectedBoundingBoxFromPool(par1World, par2, par3, par4); +// } +// +// /** +// * 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) +// { +// this.setBlockBoundsBasedOnState(par1World, par2, par3, par4); +// return super.getCollisionBoundingBoxFromPool(par1World, par2, par3, par4); +// } /** * 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) + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { this.setBlockBoundsForBlockRender(par1IBlockAccess.getBlockMetadata(par2, par3, par4)); } @@ -116,7 +118,7 @@ public class BlockTrapDoor extends Block /** * Called when the block is clicked by a player. Args: x, y, z, entityPlayer */ - public void onBlockClicked(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer) + public void onBlockClicked(World par1World, BigInteger par2, int par3, BigInteger par4, EntityPlayer par5EntityPlayer) { this.onBlockActivated(par1World, par2, par3, par4, par5EntityPlayer, 0, 0.0F, 0.0F, 0.0F); } @@ -124,7 +126,7 @@ public class BlockTrapDoor extends Block /** * Called upon block activation (right click on the block.) */ - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) + public boolean onBlockActivated(World par1World, BigInteger par2, int par3, BigInteger par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { if (this.blockMaterial == Material.iron) { @@ -139,7 +141,7 @@ public class BlockTrapDoor extends Block } } - public void onPoweredBlockChange(World par1World, int par2, int par3, int par4, boolean par5) + public void onPoweredBlockChange(World par1World, BigInteger par2, int par3, BigInteger par4, boolean par5) { int var6 = par1World.getBlockMetadata(par2, par3, par4); boolean var7 = (var6 & 4) > 0; @@ -155,32 +157,32 @@ public class BlockTrapDoor extends Block * 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) + public void onNeighborBlockChange(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { if (!par1World.isRemote) { int var6 = par1World.getBlockMetadata(par2, par3, par4); - int var7 = par2; - int var8 = par4; + BigInteger var7 = par2; + BigInteger var8 = par4; if ((var6 & 3) == 0) { - var8 = par4 + 1; + var8 = par4.add(BigInteger.ONE); } if ((var6 & 3) == 1) { - --var8; + var8 = var8.subtract(BigInteger.ONE); } if ((var6 & 3) == 2) { - var7 = par2 + 1; + var7 = par2.add(BigInteger.ONE); } if ((var6 & 3) == 3) { - --var7; + var7 = var7.subtract(BigInteger.ONE); } if (!isValidSupportBlock(par1World.getBlockId(var7, par3, var8))) @@ -198,20 +200,21 @@ public class BlockTrapDoor extends Block } } - /** - * Ray traces through the blocks collision from start vector to end vector returning a ray trace hit. Args: world, - * x, y, z, startVec, endVec - */ - public MovingObjectPosition collisionRayTrace(World par1World, int par2, int par3, int par4, Vec3 par5Vec3, Vec3 par6Vec3) - { - this.setBlockBoundsBasedOnState(par1World, par2, par3, par4); - return super.collisionRayTrace(par1World, par2, par3, par4, par5Vec3, par6Vec3); - } +// ¿ +// /** +// * Ray traces through the blocks collision from start vector to end vector returning a ray trace hit. Args: world, +// * x, y, z, startVec, endVec +// */ +// public MovingObjectPosition collisionRayTrace(World par1World, int par2, int par3, int par4, Vec3 par5Vec3, Vec3 par6Vec3) +// { +// this.setBlockBoundsBasedOnState(par1World, par2, par3, par4); +// return super.collisionRayTrace(par1World, par2, par3, par4, par5Vec3, par6Vec3); +// } /** * called before onBlockPlacedBy by ItemBlock and ItemReed */ - public void updateBlockMetadata(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8) + public void updateBlockMetadata(World par1World, BigInteger par2, int par3, BigInteger par4, int par5, float par6, float par7, float par8) { byte var9 = 0; @@ -241,7 +244,7 @@ public class BlockTrapDoor extends Block /** * checks to see if you can place this block can be placed on that side of a block: BlockLever overrides */ - public boolean canPlaceBlockOnSide(World par1World, int par2, int par3, int par4, int par5) + public boolean canPlaceBlockOnSide(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { if (par5 == 0) { @@ -255,22 +258,22 @@ public class BlockTrapDoor extends Block { if (par5 == 2) { - ++par4; + par4 = par4.add(BigInteger.ONE); } if (par5 == 3) { - --par4; + par4 = par4.subtract(BigInteger.ONE); } if (par5 == 4) { - ++par2; + par2 = par2.add(BigInteger.ONE); } if (par5 == 5) { - --par2; + par2 = par2.subtract(BigInteger.ONE); } return isValidSupportBlock(par1World.getBlockId(par2, par3, par4)); diff --git a/src/minecraft/net/minecraft/src/BlockTripWire.java b/src/minecraft/net/minecraft/src/BlockTripWire.java index 1c491ab..59daa9d 100644 --- a/src/minecraft/net/minecraft/src/BlockTripWire.java +++ b/src/minecraft/net/minecraft/src/BlockTripWire.java @@ -83,7 +83,7 @@ public class BlockTripWire extends Block * 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) + public void onNeighborBlockChange(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { int var6 = par1World.getBlockMetadata(par2, par3, par4); boolean var7 = (var6 & 2) == 2; @@ -99,7 +99,7 @@ public class BlockTripWire extends Block /** * 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) + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { int var5 = par1IBlockAccess.getBlockMetadata(par2, par3, par4); boolean var6 = (var5 & 4) == 4; @@ -122,7 +122,7 @@ public class BlockTripWire extends Block /** * Called whenever the block is added into the world. Args: world, x, y, z */ - public void onBlockAdded(World par1World, int par2, int par3, int par4) + public void onBlockAdded(World par1World, BigInteger par2, int par3, BigInteger par4) { int var5 = par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) ? 0 : 2; par1World.setBlockMetadataWithNotify(par2, par3, par4, var5); @@ -151,7 +151,7 @@ public class BlockTripWire extends Block } } - private void func_72149_e(World par1World, int par2, int par3, int par4, int par5) + private void func_72149_e(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { int var6 = 0; @@ -163,8 +163,8 @@ public class BlockTripWire extends Block { if (var7 < 42) { - int var8 = par2 + Direction.offsetX[var6] * var7; - int var9 = par4 + Direction.offsetZ[var6] * var7; + BigInteger var8 = par2.add(BigInteger.valueOf(Direction.offsetX[var6] * var7)); + BigInteger var9 = par4.add(BigInteger.valueOf(Direction.offsetZ[var6] * var7)); int var10 = par1World.getBlockId(var8, par3, var9); if (var10 == Block.tripWireSource.blockID) diff --git a/src/minecraft/net/minecraft/src/BlockTripWireSource.java b/src/minecraft/net/minecraft/src/BlockTripWireSource.java index f6a6723..02647c4 100644 --- a/src/minecraft/net/minecraft/src/BlockTripWireSource.java +++ b/src/minecraft/net/minecraft/src/BlockTripWireSource.java @@ -57,42 +57,42 @@ public class BlockTripWireSource extends Block /** * checks to see if you can place this block can be placed on that side of a block: BlockLever overrides */ - public boolean canPlaceBlockOnSide(World par1World, int par2, int par3, int par4, int par5) + public boolean canPlaceBlockOnSide(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { - return par5 == 2 && par1World.isBlockNormalCube(par2, par3, par4 + 1) ? true : (par5 == 3 && par1World.isBlockNormalCube(par2, par3, par4 - 1) ? true : (par5 == 4 && par1World.isBlockNormalCube(par2 + 1, par3, par4) ? true : par5 == 5 && par1World.isBlockNormalCube(par2 - 1, par3, par4))); + return par5 == 2 && par1World.isBlockNormalCube(par2, par3, par4.add(BigInteger.ONE)) ? true : (par5 == 3 && par1World.isBlockNormalCube(par2, par3, par4.subtract(BigInteger.ONE)) ? true : (par5 == 4 && par1World.isBlockNormalCube(par2.add(BigInteger.ONE), par3, par4) ? true : par5 == 5 && par1World.isBlockNormalCube(par2.subtract(BigInteger.ONE), par3, par4))); } /** * 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) + public boolean canPlaceBlockAt(World par1World, BigInteger par2, int par3, BigInteger par4) { - return par1World.isBlockNormalCube(par2 - 1, par3, par4) ? true : (par1World.isBlockNormalCube(par2 + 1, par3, par4) ? true : (par1World.isBlockNormalCube(par2, par3, par4 - 1) ? true : par1World.isBlockNormalCube(par2, par3, par4 + 1))); + return par1World.isBlockNormalCube(par2.subtract(BigInteger.ONE), par3, par4) ? true : (par1World.isBlockNormalCube(par2.add(BigInteger.ONE), par3, par4) ? true : (par1World.isBlockNormalCube(par2, par3, par4.subtract(BigInteger.ONE)) ? true : par1World.isBlockNormalCube(par2, par3, par4.add(BigInteger.ONE)))); } /** * called before onBlockPlacedBy by ItemBlock and ItemReed */ - public void updateBlockMetadata(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8) + public void updateBlockMetadata(World par1World, BigInteger par2, int par3, BigInteger par4, int par5, float par6, float par7, float par8) { byte var9 = 0; - if (par5 == 2 && par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true)) + if (par5 == 2 && par1World.isBlockNormalCubeDefault(par2, par3, par4.add(BigInteger.ONE), true)) { var9 = 2; } - if (par5 == 3 && par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true)) + if (par5 == 3 && par1World.isBlockNormalCubeDefault(par2, par3, par4.subtract(BigInteger.ONE), true)) { var9 = 0; } - if (par5 == 4 && par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true)) + if (par5 == 4 && par1World.isBlockNormalCubeDefault(par2.add(BigInteger.ONE), par3, par4, true)) { var9 = 1; } - if (par5 == 5 && par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true)) + if (par5 == 5 && par1World.isBlockNormalCubeDefault(par2.subtract(BigInteger.ONE), par3, par4, true)) { var9 = 3; } @@ -104,7 +104,7 @@ public class BlockTripWireSource extends Block * 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) + public void onNeighborBlockChange(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { if (par5 != this.blockID) { @@ -114,22 +114,22 @@ public class BlockTripWireSource extends Block int var7 = var6 & 3; boolean var8 = false; - if (!par1World.isBlockNormalCube(par2 - 1, par3, par4) && var7 == 3) + if (!par1World.isBlockNormalCube(par2.subtract(BigInteger.ONE), par3, par4) && var7 == 3) { var8 = true; } - if (!par1World.isBlockNormalCube(par2 + 1, par3, par4) && var7 == 1) + if (!par1World.isBlockNormalCube(par2.add(BigInteger.ONE), par3, par4) && var7 == 1) { var8 = true; } - if (!par1World.isBlockNormalCube(par2, par3, par4 - 1) && var7 == 0) + if (!par1World.isBlockNormalCube(par2, par3, par4.subtract(BigInteger.ONE)) && var7 == 0) { var8 = true; } - if (!par1World.isBlockNormalCube(par2, par3, par4 + 1) && var7 == 2) + if (!par1World.isBlockNormalCube(par2, par3, par4.add(BigInteger.ONE)) && var7 == 2) { var8 = true; } @@ -143,7 +143,7 @@ public class BlockTripWireSource extends Block } } - public void func_72143_a(World par1World, int par2, int par3, int par4, int par5, int par6, boolean par7, int par8, int par9) + public void func_72143_a(World par1World, BigInteger par2, int par3, BigInteger par4, int par5, int par6, boolean par7, int par8, int par9) { int var10 = par6 & 3; boolean var11 = (par6 & 4) == 4; @@ -285,29 +285,29 @@ public class BlockTripWireSource extends Block } } - private void notifyNeighborOfChange(World par1World, int par2, int par3, int par4, int par5) + private void notifyNeighborOfChange(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this.blockID); if (par5 == 3) { - par1World.notifyBlocksOfNeighborChange(par2 - 1, par3, par4, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2.subtract(BigInteger.ONE), par3, par4, this.blockID); } else if (par5 == 1) { - par1World.notifyBlocksOfNeighborChange(par2 + 1, par3, par4, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2.add(BigInteger.ONE), par3, par4, this.blockID); } else if (par5 == 0) { - par1World.notifyBlocksOfNeighborChange(par2, par3, par4 - 1, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2, par3, par4.subtract(BigInteger.ONE), this.blockID); } else if (par5 == 2) { - par1World.notifyBlocksOfNeighborChange(par2, par3, par4 + 1, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2, par3, par4.add(BigInteger.ONE), this.blockID); } } - private boolean func_72144_l(World par1World, int par2, int par3, int par4) + private boolean func_72144_l(World par1World, BigInteger par2, int par3, BigInteger par4) { if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { @@ -324,7 +324,7 @@ public class BlockTripWireSource extends Block /** * 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) + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4) { int var5 = par1IBlockAccess.getBlockMetadata(par2, par3, par4) & 3; float var6 = 0.1875F; @@ -367,19 +367,19 @@ public class BlockTripWireSource extends Block if (var9 == 3) { - par1World.notifyBlocksOfNeighborChange(par2 - 1, par3, par4, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2.subtract(BigInteger.ONE), par3, par4, this.blockID); } else if (var9 == 1) { - par1World.notifyBlocksOfNeighborChange(par2 + 1, par3, par4, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2.add(BigInteger.ONE), par3, par4, this.blockID); } else if (var9 == 0) { - par1World.notifyBlocksOfNeighborChange(par2, par3, par4 - 1, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2, par3, par4.subtract(BigInteger.ONE), this.blockID); } else if (var9 == 2) { - par1World.notifyBlocksOfNeighborChange(par2, par3, par4 + 1, this.blockID); + par1World.notifyBlocksOfNeighborChange(par2, par3, par4.add(BigInteger.ONE), this.blockID); } } @@ -389,7 +389,7 @@ public class BlockTripWireSource extends Block /** * Is this block powering the block on the specified side */ - public boolean isPoweringTo(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean isPoweringTo(IBlockAccess par1IBlockAccess, BigInteger par2, int par3, BigInteger par4, int par5) { return (par1IBlockAccess.getBlockMetadata(par2, par3, par4) & 8) == 8; } @@ -397,7 +397,7 @@ public class BlockTripWireSource extends Block /** * Is this block indirectly powering the block on the specified side */ - public boolean isIndirectlyPoweringTo(World par1World, int par2, int par3, int par4, int par5) + public boolean isIndirectlyPoweringTo(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { int var6 = par1World.getBlockMetadata(par2, par3, par4); diff --git a/src/minecraft/net/minecraft/src/ChunkProviderEnd.java b/src/minecraft/net/minecraft/src/ChunkProviderEnd.java index e682afc..be6a74d 100644 --- a/src/minecraft/net/minecraft/src/ChunkProviderEnd.java +++ b/src/minecraft/net/minecraft/src/ChunkProviderEnd.java @@ -336,12 +336,12 @@ public class ChunkProviderEnd implements IChunkProvider /** * Populates chunk with ores etc etc */ - public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) + public void populate(IChunkProvider par1IChunkProvider, BigInteger par2, BigInteger par3) { BlockSand.fallInstantly = true; - int var4 = par2 * 16; - int var5 = par3 * 16; - BiomeGenBase var6 = this.endWorld.getBiomeGenForCoords(var4 + 16, var5 + 16); + BigInteger var4 = par2.shiftLeft(4); + BigInteger var5 = par3.shiftLeft(4); + BiomeGenBase var6 = this.endWorld.getBiomeGenForCoords(var4.add(BigInteger.valueOf(16)), var5.add(BigInteger.valueOf(16))); var6.decorate(this.endWorld, this.endWorld.rand, var4, var5); BlockSand.fallInstantly = false; } diff --git a/src/minecraft/net/minecraft/src/EntityAIBreakDoor.java b/src/minecraft/net/minecraft/src/EntityAIBreakDoor.java index af3b042..052f1c6 100644 --- a/src/minecraft/net/minecraft/src/EntityAIBreakDoor.java +++ b/src/minecraft/net/minecraft/src/EntityAIBreakDoor.java @@ -32,7 +32,7 @@ public class EntityAIBreakDoor extends EntityAIDoorInteract */ public boolean continueExecuting() { - double var1 = this.theEntity.getDistanceSq((double)this.entityPosX, (double)this.entityPosY, (double)this.entityPosZ); + double var1 = this.theEntity.getDistanceSq((double)this.entityPosX.doubleValue(), (double)this.entityPosY, (double)this.entityPosZ.doubleValue()); return this.breakingTime <= 240 && !this.targetDoor.isDoorOpen(this.theEntity.worldObj, this.entityPosX, this.entityPosY, this.entityPosZ) && var1 < 4.0D; } diff --git a/src/minecraft/net/minecraft/src/EntityAIDoorInteract.java b/src/minecraft/net/minecraft/src/EntityAIDoorInteract.java index c0c4343..acf2282 100644 --- a/src/minecraft/net/minecraft/src/EntityAIDoorInteract.java +++ b/src/minecraft/net/minecraft/src/EntityAIDoorInteract.java @@ -1,11 +1,13 @@ package net.minecraft.src; +import java.math.BigInteger; + public abstract class EntityAIDoorInteract extends EntityAIBase { protected EntityLiving theEntity; - protected int entityPosX; + protected BigInteger entityPosX; protected int entityPosY; - protected int entityPosZ; + protected BigInteger entityPosZ; protected BlockDoor targetDoor; boolean field_75350_f; float entityPositionX; @@ -39,7 +41,7 @@ public abstract class EntityAIDoorInteract extends EntityAIBase this.entityPosY = var4.yCoord + 1; this.entityPosZ = var4.zCoord; - if (this.theEntity.getDistanceSq((double)this.entityPosX, this.theEntity.posY, (double)this.entityPosZ) <= 2.25D) + if (this.theEntity.getDistanceSq((double)this.entityPosX.doubleValue(), this.theEntity.posY, (double)this.entityPosZ.doubleValue()) <= 2.25D) { this.targetDoor = this.findUsableDoor(this.entityPosX, this.entityPosY, this.entityPosZ); @@ -50,9 +52,9 @@ public abstract class EntityAIDoorInteract extends EntityAIBase } } - this.entityPosX = MathHelper.floor_double(this.theEntity.posX); + this.entityPosX = MathHelper.floor_double_BigInteger(this.theEntity.posX); this.entityPosY = MathHelper.floor_double(this.theEntity.posY + 1.0D); - this.entityPosZ = MathHelper.floor_double(this.theEntity.posZ); + this.entityPosZ = MathHelper.floor_double_BigInteger(this.theEntity.posZ); this.targetDoor = this.findUsableDoor(this.entityPosX, this.entityPosY, this.entityPosZ); return this.targetDoor != null; } @@ -77,8 +79,8 @@ public abstract class EntityAIDoorInteract extends EntityAIBase public void startExecuting() { this.field_75350_f = false; - this.entityPositionX = (float)((double)((float)this.entityPosX + 0.5F) - this.theEntity.posX); - this.entityPositionZ = (float)((double)((float)this.entityPosZ + 0.5F) - this.theEntity.posZ); + this.entityPositionX = (float)((double)((float)this.entityPosX.floatValue() + 0.5F) - this.theEntity.posX); + this.entityPositionZ = (float)((double)((float)this.entityPosZ.floatValue() + 0.5F) - this.theEntity.posZ); } /** @@ -86,8 +88,8 @@ public abstract class EntityAIDoorInteract extends EntityAIBase */ public void updateTask() { - float var1 = (float)((double)((float)this.entityPosX + 0.5F) - this.theEntity.posX); - float var2 = (float)((double)((float)this.entityPosZ + 0.5F) - this.theEntity.posZ); + float var1 = (float)((double)((float)this.entityPosX.floatValue() + 0.5F) - this.theEntity.posX); + float var2 = (float)((double)((float)this.entityPosZ.floatValue() + 0.5F) - this.theEntity.posZ); float var3 = this.entityPositionX * var1 + this.entityPositionZ * var2; if (var3 < 0.0F) @@ -99,7 +101,7 @@ public abstract class EntityAIDoorInteract extends EntityAIBase /** * Determines if a door can be broken with AI. */ - private BlockDoor findUsableDoor(int par1, int par2, int par3) + private BlockDoor findUsableDoor(BigInteger par1, int par2, BigInteger par3) { int var4 = this.theEntity.worldObj.getBlockId(par1, par2, par3); return var4 != Block.doorWood.blockID ? null : (BlockDoor)Block.blocksList[var4]; diff --git a/src/minecraft/net/minecraft/src/EntityDiggingFX.java b/src/minecraft/net/minecraft/src/EntityDiggingFX.java index 67b1ed8..257c66c 100644 --- a/src/minecraft/net/minecraft/src/EntityDiggingFX.java +++ b/src/minecraft/net/minecraft/src/EntityDiggingFX.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class EntityDiggingFX extends EntityFX { private Block blockInstance; @@ -14,7 +16,7 @@ public class EntityDiggingFX extends EntityFX this.particleScale /= 2.0F; } - public EntityDiggingFX func_70596_a(int par1, int par2, int par3) + public EntityDiggingFX func_70596_a(BigInteger par1, int par2, BigInteger par3) { if (this.blockInstance == Block.grass) { diff --git a/src/minecraft/net/minecraft/src/WorldGeneratorBonusChest.java b/src/minecraft/net/minecraft/src/WorldGeneratorBonusChest.java index a87d680..4d00d5e 100644 --- a/src/minecraft/net/minecraft/src/WorldGeneratorBonusChest.java +++ b/src/minecraft/net/minecraft/src/WorldGeneratorBonusChest.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class WorldGeneratorBonusChest extends WorldGenerator @@ -13,7 +14,7 @@ public class WorldGeneratorBonusChest extends WorldGenerator this.field_76545_b = par2; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, Random par2Random, BigInteger par3, int par4, BigInteger par5) { int var12;