From 0ab4afd3188778cf29a83233a291ca4ed4f2f898 Mon Sep 17 00:00:00 2001 From: mckuhei Date: Wed, 22 Mar 2023 20:24:13 +0800 Subject: [PATCH] 1552 -> 1309 errors --- .../net/minecraft/client/Minecraft.java | 18 +++---- .../net/minecraft/src/BlockCactus.java | 25 +++++----- .../net/minecraft/src/BlockCake.java | 23 ++++----- .../net/minecraft/src/BlockDragonEgg.java | 27 +++++----- .../net/minecraft/src/BlockFenceGate.java | 18 ++++--- .../net/minecraft/src/BlockLeaves.java | 32 ++++++------ .../net/minecraft/src/BlockSand.java | 15 +++--- .../net/minecraft/src/EffectRenderer.java | 15 +++--- .../net/minecraft/src/EntityFallingSand.java | 6 ++- .../net/minecraft/src/EntityFishHook.java | 23 ++++----- .../minecraft/src/EntityLightningBolt.java | 27 +++++----- .../net/minecraft/src/EntityPainting.java | 13 ++--- .../net/minecraft/src/EntitySnowman.java | 18 ++++--- .../net/minecraft/src/EntityVillager.java | 2 +- src/minecraft/net/minecraft/src/ItemBed.java | 10 ++-- .../net/minecraft/src/ItemBlock.java | 20 ++++---- .../net/minecraft/src/ItemBucket.java | 18 ++++--- src/minecraft/net/minecraft/src/ItemDoor.java | 14 +++--- .../net/minecraft/src/ItemEnderEye.java | 49 +++++++++---------- .../net/minecraft/src/ItemFireball.java | 14 +++--- .../net/minecraft/src/ItemFlintAndSteel.java | 14 +++--- .../net/minecraft/src/ItemGlassBottle.java | 6 ++- src/minecraft/net/minecraft/src/ItemHoe.java | 6 ++- .../net/minecraft/src/ItemLilyPad.java | 6 ++- .../net/minecraft/src/ItemPainting.java | 4 +- .../net/minecraft/src/ItemRedstone.java | 12 +++-- src/minecraft/net/minecraft/src/ItemReed.java | 14 +++--- .../net/minecraft/src/ItemSeeds.java | 4 +- src/minecraft/net/minecraft/src/ItemSign.java | 12 +++-- src/minecraft/net/minecraft/src/ItemSlab.java | 32 ++++++------ .../net/minecraft/src/MapGenCaves.java | 2 +- .../net/minecraft/src/MapGenStructure.java | 1 + .../net/minecraft/src/NBTTagCompound.java | 10 ++++ .../minecraft/src/Packet25EntityPainting.java | 13 ++--- src/minecraft/net/minecraft/src/World.java | 2 +- .../net/minecraft/src/WorldGenPumpkin.java | 7 +-- .../net/minecraft/src/WorldGenVines.java | 11 +++-- .../net/minecraft/src/WorldGenWaterlily.java | 7 +-- 38 files changed, 303 insertions(+), 247 deletions(-) diff --git a/src/minecraft/net/minecraft/client/Minecraft.java b/src/minecraft/net/minecraft/client/Minecraft.java index cfcd44e..7626b75 100644 --- a/src/minecraft/net/minecraft/client/Minecraft.java +++ b/src/minecraft/net/minecraft/client/Minecraft.java @@ -9,6 +9,7 @@ import java.awt.Frame; import java.awt.Graphics; import java.io.File; import java.io.IOException; +import java.math.BigInteger; import java.nio.ByteBuffer; import java.text.DecimalFormat; import java.util.HashMap; @@ -1215,9 +1216,9 @@ public abstract class Minecraft implements Runnable, IPlayerUsage { if (par2 && this.objectMouseOver != null && this.objectMouseOver.typeOfHit == EnumMovingObjectType.TILE && par1 == 0) { - int var3 = this.objectMouseOver.blockX; + BigInteger var3 = this.objectMouseOver.blockX; int var4 = this.objectMouseOver.blockY; - int var5 = this.objectMouseOver.blockZ; + BigInteger var5 = this.objectMouseOver.blockZ; this.playerController.onPlayerDamageBlock(var3, var4, var5, this.objectMouseOver.sideHit); if (this.thePlayer.canPlayerEdit(var3, var4, var5)) @@ -1275,9 +1276,9 @@ public abstract class Minecraft implements Runnable, IPlayerUsage } else if (this.objectMouseOver.typeOfHit == EnumMovingObjectType.TILE) { - int var4 = this.objectMouseOver.blockX; + BigInteger var4 = this.objectMouseOver.blockX; int var5 = this.objectMouseOver.blockY; - int var6 = this.objectMouseOver.blockZ; + BigInteger var6 = this.objectMouseOver.blockZ; int var7 = this.objectMouseOver.sideHit; if (par1 == 0) @@ -1764,7 +1765,7 @@ public abstract class Minecraft implements Runnable, IPlayerUsage if (!this.isGamePaused && this.theWorld != null) { - this.theWorld.func_73029_E(MathHelper.floor_double(this.thePlayer.posX), MathHelper.floor_double(this.thePlayer.posY), MathHelper.floor_double(this.thePlayer.posZ)); + this.theWorld.func_73029_E(MathHelper.floor_double_BigInteger(this.thePlayer.posX), MathHelper.floor_double(this.thePlayer.posY), MathHelper.floor_double_BigInteger(this.thePlayer.posZ)); } this.mcProfiler.endStartSection("particles"); @@ -2192,13 +2193,12 @@ public abstract class Minecraft implements Runnable, IPlayerUsage int var3 = 0; boolean var4 = false; int var2; - int var5; if (this.objectMouseOver.typeOfHit == EnumMovingObjectType.TILE) { - var5 = this.objectMouseOver.blockX; + BigInteger var5 = this.objectMouseOver.blockX; int var6 = this.objectMouseOver.blockY; - int var7 = this.objectMouseOver.blockZ; + BigInteger var7 = this.objectMouseOver.blockZ; Block var8 = Block.blocksList[this.theWorld.getBlockId(var5, var6, var7)]; if (var8 == null) @@ -2266,7 +2266,7 @@ public abstract class Minecraft implements Runnable, IPlayerUsage if (var1) { - var5 = this.thePlayer.inventorySlots.inventorySlots.size() - 9 + this.thePlayer.inventory.currentItem; + int var5 = this.thePlayer.inventorySlots.inventorySlots.size() - 9 + this.thePlayer.inventory.currentItem; this.playerController.sendSlotPacket(this.thePlayer.inventory.getStackInSlot(this.thePlayer.inventory.currentItem), var5); } } diff --git a/src/minecraft/net/minecraft/src/BlockCactus.java b/src/minecraft/net/minecraft/src/BlockCactus.java index 2c87b01..afd814b 100644 --- a/src/minecraft/net/minecraft/src/BlockCactus.java +++ b/src/minecraft/net/minecraft/src/BlockCactus.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class BlockCactus extends Block @@ -14,7 +15,7 @@ public class BlockCactus 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.isAirBlock(par2, par3 + 1, par4)) { @@ -46,19 +47,19 @@ public class BlockCactus extends Block * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been * cleared to be reused) */ - public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) + public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4) { float var5 = 0.0625F; - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2 + var5), (double)par3, (double)((float)par4 + var5), (double)((float)(par2 + 1) - var5), (double)((float)(par3 + 1) - var5), (double)((float)(par4 + 1) - var5)); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var5), (double)par3, (double)((float)par4.floatValue() + var5), (double)((float)(par2.floatValue() + 1) - var5), (double)((float)(par3 + 1) - var5), (double)((float)(par4.floatValue() + 1) - var5)); } /** * Returns the bounding box of the wired rectangular prism to render. */ - public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, int par2, int par3, int par4) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4) { float var5 = 0.0625F; - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2 + var5), (double)par3, (double)((float)par4 + var5), (double)((float)(par2 + 1) - var5), (double)(par3 + 1), (double)((float)(par4 + 1) - var5)); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var5), (double)par3, (double)((float)par4.floatValue() + var5), (double)((float)(par2.floatValue() + 1) - var5), (double)(par3 + 1), (double)((float)(par4.floatValue() + 1) - var5)); } /** @@ -97,7 +98,7 @@ public class BlockCactus 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 !super.canPlaceBlockAt(par1World, par2, par3, par4) ? false : this.canBlockStay(par1World, par2, par3, par4); } @@ -106,7 +107,7 @@ public class BlockCactus 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.canBlockStay(par1World, par2, par3, par4)) { @@ -118,21 +119,21 @@ public class BlockCactus extends Block /** * Can this block stay at this position. Similar to canPlaceBlockAt except gets checked often with plants. */ - public boolean canBlockStay(World par1World, int par2, int par3, int par4) + public boolean canBlockStay(World par1World, BigInteger par2, int par3, BigInteger par4) { - if (par1World.getBlockMaterial(par2 - 1, par3, par4).isSolid()) + if (par1World.getBlockMaterial(par2.subtract(BigInteger.ONE), par3, par4).isSolid()) { return false; } - else if (par1World.getBlockMaterial(par2 + 1, par3, par4).isSolid()) + else if (par1World.getBlockMaterial(par2.add(BigInteger.ONE), par3, par4).isSolid()) { return false; } - else if (par1World.getBlockMaterial(par2, par3, par4 - 1).isSolid()) + else if (par1World.getBlockMaterial(par2, par3, par4.subtract(BigInteger.ONE)).isSolid()) { return false; } - else if (par1World.getBlockMaterial(par2, par3, par4 + 1).isSolid()) + else if (par1World.getBlockMaterial(par2, par3, par4.add(BigInteger.ONE)).isSolid()) { return false; } diff --git a/src/minecraft/net/minecraft/src/BlockCake.java b/src/minecraft/net/minecraft/src/BlockCake.java index 7961b75..2238401 100644 --- a/src/minecraft/net/minecraft/src/BlockCake.java +++ b/src/minecraft/net/minecraft/src/BlockCake.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class BlockCake extends Block @@ -13,7 +14,7 @@ public class BlockCake 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); float var6 = 0.0625F; @@ -36,25 +37,25 @@ public class BlockCake extends Block * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been * cleared to be reused) */ - public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) + public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4) { int var5 = par1World.getBlockMetadata(par2, par3, par4); float var6 = 0.0625F; float var7 = (float)(1 + var5 * 2) / 16.0F; float var8 = 0.5F; - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2 + var7), (double)par3, (double)((float)par4 + var6), (double)((float)(par2 + 1) - var6), (double)((float)par3 + var8 - var6), (double)((float)(par4 + 1) - var6)); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var7), (double)par3, (double)((float)par4.floatValue() + var6), (double)((float)(par2.floatValue() + 1) - var6), (double)((float)par3 + var8 - var6), (double)((float)(par4.floatValue() + 1) - var6)); } /** * Returns the bounding box of the wired rectangular prism to render. */ - public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, int par2, int par3, int par4) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, BigInteger par2, int par3, BigInteger par4) { int var5 = par1World.getBlockMetadata(par2, par3, par4); float var6 = 0.0625F; float var7 = (float)(1 + var5 * 2) / 16.0F; float var8 = 0.5F; - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2 + var7), (double)par3, (double)((float)par4 + var6), (double)((float)(par2 + 1) - var6), (double)((float)par3 + var8), (double)((float)(par4 + 1) - var6)); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + var7), (double)par3, (double)((float)par4.floatValue() + var6), (double)((float)(par2.floatValue() + 1) - var6), (double)((float)par3 + var8), (double)((float)(par4.floatValue() + 1) - var6)); } /** @@ -93,7 +94,7 @@ public class BlockCake 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) { this.eatCakeSlice(par1World, par2, par3, par4, par5EntityPlayer); return true; @@ -102,7 +103,7 @@ public class BlockCake 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.eatCakeSlice(par1World, par2, par3, par4, par5EntityPlayer); } @@ -110,7 +111,7 @@ public class BlockCake extends Block /** * Heals the player and removes a slice from the cake. */ - private void eatCakeSlice(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer) + private void eatCakeSlice(World par1World, BigInteger par2, int par3, BigInteger par4, EntityPlayer par5EntityPlayer) { if (par5EntityPlayer.canEat(false)) { @@ -132,7 +133,7 @@ public class BlockCake 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 !super.canPlaceBlockAt(par1World, par2, par3, par4) ? false : this.canBlockStay(par1World, par2, par3, par4); } @@ -141,7 +142,7 @@ public class BlockCake 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.canBlockStay(par1World, par2, par3, par4)) { @@ -153,7 +154,7 @@ public class BlockCake extends Block /** * Can this block stay at this position. Similar to canPlaceBlockAt except gets checked often with plants. */ - public boolean canBlockStay(World par1World, int par2, int par3, int par4) + public boolean canBlockStay(World par1World, BigInteger par2, int par3, BigInteger par4) { return par1World.getBlockMaterial(par2, par3 - 1, par4).isSolid(); } diff --git a/src/minecraft/net/minecraft/src/BlockDragonEgg.java b/src/minecraft/net/minecraft/src/BlockDragonEgg.java index 02816ba..18bba4a 100644 --- a/src/minecraft/net/minecraft/src/BlockDragonEgg.java +++ b/src/minecraft/net/minecraft/src/BlockDragonEgg.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class BlockDragonEgg extends Block @@ -12,7 +13,7 @@ public class BlockDragonEgg 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) { par1World.scheduleBlockUpdate(par2, par3, par4, this.blockID, this.tickRate()); } @@ -21,7 +22,7 @@ public class BlockDragonEgg 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) { par1World.scheduleBlockUpdate(par2, par3, par4, this.blockID, this.tickRate()); } @@ -29,7 +30,7 @@ public class BlockDragonEgg 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) { this.fallIfPossible(par1World, par2, par3, par4); } @@ -37,15 +38,15 @@ public class BlockDragonEgg extends Block /** * Checks if the dragon egg can fall down, and if so, makes it fall. */ - private void fallIfPossible(World par1World, int par2, int par3, int par4) + private void fallIfPossible(World par1World, BigInteger par2, int par3, BigInteger par4) { if (BlockSand.canFallBelow(par1World, par2, par3 - 1, par4) && par3 >= 0) { byte var5 = 32; - if (!BlockSand.fallInstantly && par1World.checkChunksExist(par2 - var5, par3 - var5, par4 - var5, par2 + var5, par3 + var5, par4 + var5)) + if (!BlockSand.fallInstantly/* && par1World.checkChunksExist(par2 - var5, par3 - var5, par4 - var5, par2 + var5, par3 + var5, par4 + var5) */) { - EntityFallingSand var6 = new EntityFallingSand(par1World, (double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.blockID); + EntityFallingSand var6 = new EntityFallingSand(par1World, (double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F), this.blockID); par1World.spawnEntityInWorld(var6); } else @@ -68,7 +69,7 @@ public class BlockDragonEgg 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) { this.teleportNearby(par1World, par2, par3, par4); return true; @@ -77,7 +78,7 @@ public class BlockDragonEgg 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.teleportNearby(par1World, par2, par3, par4); } @@ -85,7 +86,7 @@ public class BlockDragonEgg extends Block /** * Teleports the dragon egg somewhere else in a 31x19x31 area centered on the egg. */ - private void teleportNearby(World par1World, int par2, int par3, int par4) + private void teleportNearby(World par1World, BigInteger par2, int par3, BigInteger par4) { if (par1World.getBlockId(par2, par3, par4) == this.blockID) { @@ -93,9 +94,9 @@ public class BlockDragonEgg extends Block { for (int var5 = 0; var5 < 1000; ++var5) { - int var6 = par2 + par1World.rand.nextInt(16) - par1World.rand.nextInt(16); + BigInteger var6 = par2.add(BigInteger.valueOf(par1World.rand.nextInt(16) - par1World.rand.nextInt(16))); int var7 = par3 + par1World.rand.nextInt(8) - par1World.rand.nextInt(8); - int var8 = par4 + par1World.rand.nextInt(16) - par1World.rand.nextInt(16); + BigInteger var8 = par4.add(BigInteger.valueOf(par1World.rand.nextInt(16) - par1World.rand.nextInt(16))); if (par1World.getBlockId(var6, var7, var8) == 0) { @@ -109,9 +110,9 @@ public class BlockDragonEgg extends Block float var13 = (par1World.rand.nextFloat() - 0.5F) * 0.2F; float var14 = (par1World.rand.nextFloat() - 0.5F) * 0.2F; float var15 = (par1World.rand.nextFloat() - 0.5F) * 0.2F; - double var16 = (double)var6 + (double)(par2 - var6) * var11 + (par1World.rand.nextDouble() - 0.5D) * 1.0D + 0.5D; + double var16 = (double)var6.doubleValue() + (double)(par2.subtract(var6)).doubleValue() * var11 + (par1World.rand.nextDouble() - 0.5D) * 1.0D + 0.5D; double var18 = (double)var7 + (double)(par3 - var7) * var11 + par1World.rand.nextDouble() * 1.0D - 0.5D; - double var20 = (double)var8 + (double)(par4 - var8) * var11 + (par1World.rand.nextDouble() - 0.5D) * 1.0D + 0.5D; + double var20 = (double)var8.doubleValue() + (double)(par4.subtract(var8)).doubleValue() * var11 + (par1World.rand.nextDouble() - 0.5D) * 1.0D + 0.5D; par1World.spawnParticle("portal", var16, var18, var20, (double)var13, (double)var14, (double)var15); } diff --git a/src/minecraft/net/minecraft/src/BlockFenceGate.java b/src/minecraft/net/minecraft/src/BlockFenceGate.java index ccbff19..deda8b2 100644 --- a/src/minecraft/net/minecraft/src/BlockFenceGate.java +++ b/src/minecraft/net/minecraft/src/BlockFenceGate.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class BlockFenceGate extends BlockDirectional { public BlockFenceGate(int par1, int par2) @@ -11,7 +13,7 @@ public class BlockFenceGate 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) { return !par1World.getBlockMaterial(par2, par3 - 1, par4).isSolid() ? false : super.canPlaceBlockAt(par1World, par2, par3, par4); } @@ -20,16 +22,16 @@ public class BlockFenceGate extends BlockDirectional * 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) { int var5 = par1World.getBlockMetadata(par2, par3, par4); - return isFenceGateOpen(var5) ? null : (var5 != 2 && var5 != 0 ? AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2 + 0.375F), (double)par3, (double)par4, (double)((float)par2 + 0.625F), (double)((float)par3 + 1.5F), (double)(par4 + 1)) : AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)par2, (double)par3, (double)((float)par4 + 0.375F), (double)(par2 + 1), (double)((float)par3 + 1.5F), (double)((float)par4 + 0.625F))); + return isFenceGateOpen(var5) ? null : (var5 != 2 && var5 != 0 ? AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)par2.floatValue() + 0.375F), (double)par3, (double)par4.doubleValue(), (double)((float)par2.floatValue() + 0.625F), (double)((float)par3 + 1.5F), (double)(par4.doubleValue() + 1)) : AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)par2.doubleValue(), (double)par3, (double)((float)par4.floatValue() + 0.375F), (double)(par2.doubleValue() + 1), (double)((float)par3 + 1.5F), (double)((float)par4.floatValue() + 0.625F))); } /** * 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 = getDirection(par1IBlockAccess.getBlockMetadata(par2, par3, par4)); @@ -60,7 +62,7 @@ public class BlockFenceGate extends BlockDirectional 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 isFenceGateOpen(par1IBlockAccess.getBlockMetadata(par2, par3, par4)); } @@ -76,7 +78,7 @@ public class BlockFenceGate 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) + 0.5D) & 3) % 4; par1World.setBlockMetadataWithNotify(par2, par3, par4, var6); @@ -85,7 +87,7 @@ public class BlockFenceGate extends BlockDirectional /** * 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) { int var10 = par1World.getBlockMetadata(par2, par3, par4); @@ -114,7 +116,7 @@ public class BlockFenceGate extends BlockDirectional * 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) { diff --git a/src/minecraft/net/minecraft/src/BlockLeaves.java b/src/minecraft/net/minecraft/src/BlockLeaves.java index 7d4fbfd..2ff0bb4 100644 --- a/src/minecraft/net/minecraft/src/BlockLeaves.java +++ b/src/minecraft/net/minecraft/src/BlockLeaves.java @@ -41,7 +41,7 @@ public class BlockLeaves extends BlockLeavesBase * 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) { int var5 = par1IBlockAccess.getBlockMetadata(par2, par3, par4); @@ -63,7 +63,7 @@ public class BlockLeaves extends BlockLeavesBase { for (int var10 = -1; var10 <= 1; ++var10) { - int var11 = par1IBlockAccess.getBiomeGenForCoords(par2 + var10, par4 + var9).getBiomeFoliageColor(); + int var11 = par1IBlockAccess.getBiomeGenForCoords(par2.add(BigInteger.valueOf(var10)), par4.add(BigInteger.valueOf(var9))).getBiomeFoliageColor(); var6 += (var11 & 16711680) >> 16; var7 += (var11 & 65280) >> 8; var8 += var11 & 255; @@ -82,20 +82,22 @@ public class BlockLeaves extends BlockLeavesBase byte var7 = 1; 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)))) { + // Thank you very much, Mojang, You are using correct loop method. + // 谢谢您，Mojang，您使用了正确的循环方式。 for (int var9 = -var7; var9 <= var7; ++var9) { for (int var10 = -var7; var10 <= var7; ++var10) { 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); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + int var13 = par1World.getBlockMetadata(par2.add(BigInteger.valueOf(var9)), par3 + var10, par4.add(BigInteger.valueOf(var11))); + par1World.setBlockMetadata(par2.add(BigInteger.valueOf(var9)), par3 + var10, par4.add(BigInteger.valueOf(var11)), var13 | 8); } } } @@ -106,7 +108,7 @@ public class BlockLeaves extends BlockLeavesBase /** * 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) { @@ -127,7 +129,7 @@ public class BlockLeaves extends BlockLeavesBase int var12; - 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)))) { int var13; int var14; @@ -139,7 +141,7 @@ public class BlockLeaves extends BlockLeavesBase { for (var14 = -var7; var14 <= var7; ++var14) { - var15 = par1World.getBlockId(par2 + var12, par3 + var13, par4 + var14); + var15 = par1World.getBlockId(par2.add(BigInteger.valueOf(var12)), par3 + var13, par4.add(BigInteger.valueOf(var14))); if (var15 == Block.wood.blockID) { @@ -220,18 +222,18 @@ public class BlockLeaves extends BlockLeavesBase /** * 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 (par1World.canLightningStrikeAt(par2, par3 + 1, par4) && !par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) && par5Random.nextInt(15) == 1) { - double var6 = (double)((float)par2 + par5Random.nextFloat()); + double var6 = (double)((float)par2.floatValue() + par5Random.nextFloat()); double var8 = (double)par3 - 0.05D; - double var10 = (double)((float)par4 + par5Random.nextFloat()); + double var10 = (double)((float)par4.floatValue() + par5Random.nextFloat()); par1World.spawnParticle("dripWater", var6, var8, var10, 0.0D, 0.0D, 0.0D); } } - private void removeLeaves(World par1World, int par2, int par3, int par4) + private void removeLeaves(World par1World, BigInteger par2, int par3, BigInteger par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); par1World.setBlockWithNotify(par2, par3, par4, 0); @@ -256,7 +258,7 @@ public class BlockLeaves extends BlockLeavesBase /** * 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) { if (!par1World.isRemote) { @@ -284,7 +286,7 @@ public class BlockLeaves extends BlockLeavesBase * Called when the player destroys a block with an item that can harvest it. (i, j, k) are the coordinates of the * block and l is the block's subtype/damage. */ - public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) + public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, BigInteger par3, int par4, BigInteger par5, int par6) { if (!par1World.isRemote && par2EntityPlayer.getCurrentEquippedItem() != null && par2EntityPlayer.getCurrentEquippedItem().itemID == Item.shears.shiftedIndex) { diff --git a/src/minecraft/net/minecraft/src/BlockSand.java b/src/minecraft/net/minecraft/src/BlockSand.java index 46cb96f..a474997 100644 --- a/src/minecraft/net/minecraft/src/BlockSand.java +++ b/src/minecraft/net/minecraft/src/BlockSand.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class BlockSand extends Block @@ -16,7 +17,7 @@ public class BlockSand 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) { par1World.scheduleBlockUpdate(par2, par3, par4, this.blockID, this.tickRate()); } @@ -25,7 +26,7 @@ public class BlockSand 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) { par1World.scheduleBlockUpdate(par2, par3, par4, this.blockID, this.tickRate()); } @@ -33,7 +34,7 @@ public class BlockSand 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) { @@ -44,17 +45,17 @@ public class BlockSand extends Block /** * If there is space to fall below will start this block falling */ - private void tryToFall(World par1World, int par2, int par3, int par4) + private void tryToFall(World par1World, BigInteger par2, int par3, BigInteger par4) { if (canFallBelow(par1World, par2, par3 - 1, par4) && par3 >= 0) { byte var8 = 32; - if (!fallInstantly && par1World.checkChunksExist(par2 - var8, par3 - var8, par4 - var8, par2 + var8, par3 + var8, par4 + var8)) + if (!fallInstantly && 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)))) { if (!par1World.isRemote) { - EntityFallingSand var9 = new EntityFallingSand(par1World, (double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), this.blockID); + EntityFallingSand var9 = new EntityFallingSand(par1World, (double)((float)par2.floatValue() + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4.floatValue() + 0.5F), this.blockID); par1World.spawnEntityInWorld(var9); } } @@ -86,7 +87,7 @@ public class BlockSand extends Block /** * Checks to see if the sand can fall into the block below it */ - public static boolean canFallBelow(World par0World, int par1, int par2, int par3) + public static boolean canFallBelow(World par0World, BigInteger par1, int par2, BigInteger par3) { int var4 = par0World.getBlockId(par1, par2, par3); diff --git a/src/minecraft/net/minecraft/src/EffectRenderer.java b/src/minecraft/net/minecraft/src/EffectRenderer.java index 75b9805..fec2257 100644 --- a/src/minecraft/net/minecraft/src/EffectRenderer.java +++ b/src/minecraft/net/minecraft/src/EffectRenderer.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -170,7 +171,7 @@ public class EffectRenderer /** * Adds block hit particles for the specified block. Args: x, y, z, sideHit */ - public void addBlockHitEffects(int par1, int par2, int par3, int par4) + public void addBlockHitEffects(BigInteger par1, int par2, BigInteger par3, int par4) { int var5 = this.worldObj.getBlockId(par1, par2, par3); @@ -178,9 +179,9 @@ public class EffectRenderer { Block var6 = Block.blocksList[var5]; float var7 = 0.1F; - double var8 = (double)par1 + this.rand.nextDouble() * (var6.maxX - var6.minX - (double)(var7 * 2.0F)) + (double)var7 + var6.minX; + double var8 = (double)par1.doubleValue() + this.rand.nextDouble() * (var6.maxX - var6.minX - (double)(var7 * 2.0F)) + (double)var7 + var6.minX; double var10 = (double)par2 + this.rand.nextDouble() * (var6.maxY - var6.minY - (double)(var7 * 2.0F)) + (double)var7 + var6.minY; - double var12 = (double)par3 + this.rand.nextDouble() * (var6.maxZ - var6.minZ - (double)(var7 * 2.0F)) + (double)var7 + var6.minZ; + double var12 = (double)par3.doubleValue() + this.rand.nextDouble() * (var6.maxZ - var6.minZ - (double)(var7 * 2.0F)) + (double)var7 + var6.minZ; if (par4 == 0) { @@ -194,22 +195,22 @@ public class EffectRenderer if (par4 == 2) { - var12 = (double)par3 + var6.minZ - (double)var7; + var12 = (double)par3.doubleValue() + var6.minZ - (double)var7; } if (par4 == 3) { - var12 = (double)par3 + var6.maxZ + (double)var7; + var12 = (double)par3.doubleValue() + var6.maxZ + (double)var7; } if (par4 == 4) { - var8 = (double)par1 + var6.minX - (double)var7; + var8 = (double)par1.doubleValue() + var6.minX - (double)var7; } if (par4 == 5) { - var8 = (double)par1 + var6.maxX + (double)var7; + var8 = (double)par1.doubleValue() + var6.maxX + (double)var7; } this.addEffect((new EntityDiggingFX(this.worldObj, var8, var10, var12, 0.0D, 0.0D, 0.0D, var6, par4, this.worldObj.getBlockMetadata(par1, par2, par3))).func_70596_a(par1, par2, par3).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F)); diff --git a/src/minecraft/net/minecraft/src/EntityFallingSand.java b/src/minecraft/net/minecraft/src/EntityFallingSand.java index 3a86d63..e7b7324 100644 --- a/src/minecraft/net/minecraft/src/EntityFallingSand.java +++ b/src/minecraft/net/minecraft/src/EntityFallingSand.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class EntityFallingSand extends Entity { public int blockID; @@ -82,9 +84,9 @@ public class EntityFallingSand extends Entity if (!this.worldObj.isRemote) { - int var1 = MathHelper.floor_double(this.posX); + BigInteger var1 = MathHelper.floor_double_BigInteger(this.posX); int var2 = MathHelper.floor_double(this.posY); - int var3 = MathHelper.floor_double(this.posZ); + BigInteger var3 = MathHelper.floor_double_BigInteger(this.posZ); if (this.fallTime == 1) { diff --git a/src/minecraft/net/minecraft/src/EntityFishHook.java b/src/minecraft/net/minecraft/src/EntityFishHook.java index 64a4d2a..359e328 100644 --- a/src/minecraft/net/minecraft/src/EntityFishHook.java +++ b/src/minecraft/net/minecraft/src/EntityFishHook.java @@ -1,18 +1,19 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Iterator; import java.util.List; public class EntityFishHook extends Entity { /** The tile this entity is on, X position */ - private int xTile; + private BigInteger xTile; /** The tile this entity is on, Y position */ private int yTile; /** The tile this entity is on, Z position */ - private int zTile; + private BigInteger zTile; private int inTile; private boolean inGround; public int shake; @@ -41,9 +42,9 @@ public class EntityFishHook extends Entity public EntityFishHook(World par1World) { super(par1World); - this.xTile = -1; + this.xTile = null; this.yTile = -1; - this.zTile = -1; + this.zTile = null; this.inTile = 0; this.inGround = false; this.shake = 0; @@ -66,9 +67,9 @@ public class EntityFishHook extends Entity public EntityFishHook(World par1World, EntityPlayer par2EntityPlayer) { super(par1World); - this.xTile = -1; + this.xTile = null; this.yTile = -1; - this.zTile = -1; + this.zTile = null; this.inTile = 0; this.inGround = false; this.shake = 0; @@ -352,7 +353,7 @@ public class EntityFishHook extends Entity { short var29 = 500; - if (this.worldObj.canLightningStrikeAt(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY) + 1, MathHelper.floor_double(this.posZ))) + if (this.worldObj.canLightningStrikeAt(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY) + 1, MathHelper.floor_double_BigInteger(this.posZ))) { var29 = 300; } @@ -411,9 +412,9 @@ public class EntityFishHook extends Entity */ public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { - par1NBTTagCompound.setShort("xTile", (short)this.xTile); + par1NBTTagCompound.setBigInteger("xTile", this.xTile); par1NBTTagCompound.setShort("yTile", (short)this.yTile); - par1NBTTagCompound.setShort("zTile", (short)this.zTile); + par1NBTTagCompound.setBigInteger("zTile", this.xTile); par1NBTTagCompound.setByte("inTile", (byte)this.inTile); par1NBTTagCompound.setByte("shake", (byte)this.shake); par1NBTTagCompound.setByte("inGround", (byte)(this.inGround ? 1 : 0)); @@ -424,9 +425,9 @@ public class EntityFishHook extends Entity */ public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { - this.xTile = par1NBTTagCompound.getShort("xTile"); + this.xTile = par1NBTTagCompound.getBigInteger("xTile"); this.yTile = par1NBTTagCompound.getShort("yTile"); - this.zTile = par1NBTTagCompound.getShort("zTile"); + this.zTile = par1NBTTagCompound.getBigInteger("zTile"); this.inTile = par1NBTTagCompound.getByte("inTile") & 255; this.shake = par1NBTTagCompound.getByte("shake") & 255; this.inGround = par1NBTTagCompound.getByte("inGround") == 1; diff --git a/src/minecraft/net/minecraft/src/EntityLightningBolt.java b/src/minecraft/net/minecraft/src/EntityLightningBolt.java index cc6f0c9..f3ff792 100644 --- a/src/minecraft/net/minecraft/src/EntityLightningBolt.java +++ b/src/minecraft/net/minecraft/src/EntityLightningBolt.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Iterator; import java.util.List; @@ -28,22 +29,22 @@ public class EntityLightningBolt extends EntityWeatherEffect this.boltVertex = this.rand.nextLong(); this.boltLivingTime = this.rand.nextInt(3) + 1; - if (par1World.difficultySetting >= 2 && par1World.doChunksNearChunkExist(MathHelper.floor_double(par2), MathHelper.floor_double(par4), MathHelper.floor_double(par6), 10)) + if (par1World.difficultySetting >= 2 && par1World.doChunksNearChunkExist(MathHelper.floor_double_BigInteger(par2), MathHelper.floor_double(par4), MathHelper.floor_double_BigInteger(par6), 10)) { - int var8 = MathHelper.floor_double(par2); - int var9 = MathHelper.floor_double(par4); - int var10 = MathHelper.floor_double(par6); + BigInteger x = MathHelper.floor_double_BigInteger(par2); + int y = MathHelper.floor_double(par4); + BigInteger z = MathHelper.floor_double_BigInteger(par6); - if (par1World.getBlockId(var8, var9, var10) == 0 && Block.fire.canPlaceBlockAt(par1World, var8, var9, var10)) + if (par1World.getBlockId(x, y, z) == 0 && Block.fire.canPlaceBlockAt(par1World, x, y, z)) { - par1World.setBlockWithNotify(var8, var9, var10, Block.fire.blockID); + par1World.setBlockWithNotify(x, y, z, Block.fire.blockID); } - for (var8 = 0; var8 < 4; ++var8) + for (int var8 = 0; var8 < 4; ++var8) { - var9 = MathHelper.floor_double(par2) + this.rand.nextInt(3) - 1; - var10 = MathHelper.floor_double(par4) + this.rand.nextInt(3) - 1; - int var11 = MathHelper.floor_double(par6) + this.rand.nextInt(3) - 1; + BigInteger var9 = MathHelper.floor_double_BigInteger(par2).add(BigInteger.valueOf(this.rand.nextInt(3) - 1)); + int var10 = MathHelper.floor_double(par4) + this.rand.nextInt(3) - 1; + BigInteger var11 = MathHelper.floor_double_BigInteger(par6).add(BigInteger.valueOf(this.rand.nextInt(3) - 1)); if (par1World.getBlockId(var9, var10, var11) == 0 && Block.fire.canPlaceBlockAt(par1World, var9, var10, var11)) { @@ -80,11 +81,11 @@ public class EntityLightningBolt extends EntityWeatherEffect this.lightningState = 1; this.boltVertex = this.rand.nextLong(); - if (this.worldObj.doChunksNearChunkExist(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ), 10)) + if (this.worldObj.doChunksNearChunkExist(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double_BigInteger(this.posZ), 10)) { - int var1 = MathHelper.floor_double(this.posX); + BigInteger var1 = MathHelper.floor_double_BigInteger(this.posX); int var2 = MathHelper.floor_double(this.posY); - int var3 = MathHelper.floor_double(this.posZ); + BigInteger var3 = MathHelper.floor_double_BigInteger(this.posZ); if (this.worldObj.getBlockId(var1, var2, var3) == 0 && Block.fire.canPlaceBlockAt(this.worldObj, var1, var2, var3)) { diff --git a/src/minecraft/net/minecraft/src/EntityPainting.java b/src/minecraft/net/minecraft/src/EntityPainting.java index d1e7da2..03f76dc 100644 --- a/src/minecraft/net/minecraft/src/EntityPainting.java +++ b/src/minecraft/net/minecraft/src/EntityPainting.java @@ -1,5 +1,6 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -10,9 +11,9 @@ public class EntityPainting extends Entity /** the direction the painting faces */ public int direction; - public int xPosition; + public BigInteger xPosition; public int yPosition; - public int zPosition; + public BigInteger zPosition; public EnumArt art; public EntityPainting(World par1World) @@ -24,7 +25,7 @@ public class EntityPainting extends Entity this.setSize(0.5F, 0.5F); } - public EntityPainting(World par1World, int par2, int par3, int par4, int par5) + public EntityPainting(World par1World, BigInteger par2, int par3, BigInteger par4, int par5) { this(par1World); this.xPosition = par2; @@ -54,7 +55,7 @@ public class EntityPainting extends Entity this.setDirection(par5); } - public EntityPainting(World par1World, int par2, int par3, int par4, int par5, String par6Str) + public EntityPainting(World par1World, BigInteger par2, int par3, BigInteger par4, int par5, String par6Str) { this(par1World); this.xPosition = par2; @@ -102,9 +103,9 @@ public class EntityPainting extends Entity var2 /= 32.0F; var3 /= 32.0F; var4 /= 32.0F; - float var5 = (float)this.xPosition + 0.5F; + float var5 = (float)this.xPosition.floatValue() + 0.5F; float var6 = (float)this.yPosition + 0.5F; - float var7 = (float)this.zPosition + 0.5F; + float var7 = (float)this.zPosition.floatValue() + 0.5F; float var8 = 0.5625F; if (par1 == 0) diff --git a/src/minecraft/net/minecraft/src/EntitySnowman.java b/src/minecraft/net/minecraft/src/EntitySnowman.java index 3c2c5a4..19b24b9 100644 --- a/src/minecraft/net/minecraft/src/EntitySnowman.java +++ b/src/minecraft/net/minecraft/src/EntitySnowman.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class EntitySnowman extends EntityGolem { public EntitySnowman(World par1World) @@ -41,23 +43,23 @@ public class EntitySnowman extends EntityGolem this.attackEntityFrom(DamageSource.drown, 1); } - int var1 = MathHelper.floor_double(this.posX); - int var2 = MathHelper.floor_double(this.posZ); + BigInteger x = MathHelper.floor_double_BigInteger(this.posX); + BigInteger z = MathHelper.floor_double_BigInteger(this.posZ); - if (this.worldObj.getBiomeGenForCoords(var1, var2).getFloatTemperature() > 1.0F) + if (this.worldObj.getBiomeGenForCoords(x, z).getFloatTemperature() > 1.0F) { this.attackEntityFrom(DamageSource.onFire, 1); } - for (var1 = 0; var1 < 4; ++var1) + for (int var1 = 0; var1 < 4; ++var1) { - var2 = MathHelper.floor_double(this.posX + (double)((float)(var1 % 2 * 2 - 1) * 0.25F)); + x = MathHelper.floor_double_BigInteger(this.posX + (double)((float)(var1 % 2 * 2 - 1) * 0.25F)); int var3 = MathHelper.floor_double(this.posY); - int var4 = MathHelper.floor_double(this.posZ + (double)((float)(var1 / 2 % 2 * 2 - 1) * 0.25F)); + z = MathHelper.floor_double_BigInteger(this.posZ + (double)((float)(var1 / 2 % 2 * 2 - 1) * 0.25F)); - if (this.worldObj.getBlockId(var2, var3, var4) == 0 && this.worldObj.getBiomeGenForCoords(var2, var4).getFloatTemperature() < 0.8F && Block.snow.canPlaceBlockAt(this.worldObj, var2, var3, var4)) + if (this.worldObj.getBlockId(x, var3, z) == 0 && this.worldObj.getBiomeGenForCoords(x, z).getFloatTemperature() < 0.8F && Block.snow.canPlaceBlockAt(this.worldObj, var2, var3, var4)) { - this.worldObj.setBlockWithNotify(var2, var3, var4, Block.snow.blockID); + this.worldObj.setBlockWithNotify(x, var3, z, Block.snow.blockID); } } } diff --git a/src/minecraft/net/minecraft/src/EntityVillager.java b/src/minecraft/net/minecraft/src/EntityVillager.java index 794bcda..4a9b2ee 100644 --- a/src/minecraft/net/minecraft/src/EntityVillager.java +++ b/src/minecraft/net/minecraft/src/EntityVillager.java @@ -89,7 +89,7 @@ public class EntityVillager extends EntityAgeable implements INpc, IMerchant { this.worldObj.villageCollectionObj.addVillagerPosition(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double_BigInteger(this.posZ)); this.randomTickDivider = 70 + this.rand.nextInt(50); - this.villageObj = this.worldObj.villageCollectionObj.findNearestVillage(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ), 32); + this.villageObj = this.worldObj.villageCollectionObj.findNearestVillage(MathHelper.floor_double_BigInteger(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double_BigInteger(this.posZ), 32); if (this.villageObj == null) { diff --git a/src/minecraft/net/minecraft/src/ItemBed.java b/src/minecraft/net/minecraft/src/ItemBed.java index 371ce2a..9e2fa1c 100644 --- a/src/minecraft/net/minecraft/src/ItemBed.java +++ b/src/minecraft/net/minecraft/src/ItemBed.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemBed extends Item { public ItemBed(int par1) @@ -8,7 +10,7 @@ public class ItemBed extends Item this.setTabToDisplayOn(CreativeTabs.tabDeco); } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { if (par7 != 1) { @@ -42,15 +44,15 @@ public class ItemBed extends Item var13 = 1; } - if (par2EntityPlayer.canPlayerEdit(par4, par5, par6) && par2EntityPlayer.canPlayerEdit(par4 + var13, par5, par6 + var14)) + if (par2EntityPlayer.canPlayerEdit(par4, par5, par6) && par2EntityPlayer.canPlayerEdit(par4.add(BigInteger.valueOf(var13)), par5, par6.add(BigInteger.valueOf(var14)))) { - if (par3World.isAirBlock(par4, par5, par6) && par3World.isAirBlock(par4 + var13, par5, par6 + var14) && par3World.doesBlockHaveSolidTopSurface(par4, par5 - 1, par6) && par3World.doesBlockHaveSolidTopSurface(par4 + var13, par5 - 1, par6 + var14)) + if (par3World.isAirBlock(par4, par5, par6) && par3World.isAirBlock(par4.add(BigInteger.valueOf(var13)), par5, par6.add(BigInteger.valueOf(var14))) && par3World.doesBlockHaveSolidTopSurface(par4, par5 - 1, par6) && par3World.doesBlockHaveSolidTopSurface(par4.add(BigInteger.valueOf(var13)), par5 - 1, par6.add(BigInteger.valueOf(var14)))) { par3World.setBlockAndMetadataWithNotify(par4, par5, par6, var11.blockID, var12); if (par3World.getBlockId(par4, par5, par6) == var11.blockID) { - par3World.setBlockAndMetadataWithNotify(par4 + var13, par5, par6 + var14, var11.blockID, var12 + 8); + par3World.setBlockAndMetadataWithNotify(par4.add(BigInteger.valueOf(var13)), par5, par6.add(BigInteger.valueOf(var14)), var11.blockID, var12 + 8); } --par1ItemStack.stackSize; diff --git a/src/minecraft/net/minecraft/src/ItemBlock.java b/src/minecraft/net/minecraft/src/ItemBlock.java index 1731e90..bbc664e 100644 --- a/src/minecraft/net/minecraft/src/ItemBlock.java +++ b/src/minecraft/net/minecraft/src/ItemBlock.java @@ -23,7 +23,7 @@ public class ItemBlock extends Item return this.blockID; } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { int var11 = par3World.getBlockId(par4, par5, par6); @@ -45,22 +45,22 @@ public class ItemBlock extends Item if (par7 == 2) { - --par6; + par6 = par6.subtract(BigInteger.ONE); } if (par7 == 3) { - ++par6; + par6 = par6.add(BigInteger.ONE); } if (par7 == 4) { - --par4; + par4 = par4.subtract(BigInteger.ONE); } if (par7 == 5) { - ++par4; + par4 = par4.add(BigInteger.ONE); } } @@ -88,7 +88,7 @@ public class ItemBlock extends Item Block.blocksList[this.blockID].onBlockPlacedBy(par3World, par4, par5, par6, par2EntityPlayer); } - par3World.playSoundEffect((double)((float)par4 + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6 + 0.5F), var12.stepSound.getStepSound(), (var12.stepSound.getVolume() + 1.0F) / 2.0F, var12.stepSound.getPitch() * 0.8F); + par3World.playSoundEffect((double)((float)par4.floatValue() + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6.floatValue() + 0.5F), var12.stepSound.getStepSound(), (var12.stepSound.getVolume() + 1.0F) / 2.0F, var12.stepSound.getPitch() * 0.8F); --par1ItemStack.stackSize; } @@ -125,22 +125,22 @@ public class ItemBlock extends Item if (par5 == 2) { - --par4; + par4 = par4.subtract(BigInteger.ONE); } if (par5 == 3) { - ++par4; + par4 = par4.add(BigInteger.ONE); } if (par5 == 4) { - --par2; + par2 = par2.subtract(BigInteger.ONE); } if (par5 == 5) { - ++par2; + par2 = par2.add(BigInteger.ONE); } } diff --git a/src/minecraft/net/minecraft/src/ItemBucket.java b/src/minecraft/net/minecraft/src/ItemBucket.java index 3b0d483..c061c88 100644 --- a/src/minecraft/net/minecraft/src/ItemBucket.java +++ b/src/minecraft/net/minecraft/src/ItemBucket.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemBucket extends Item { /** field for checking if the bucket has been filled. */ @@ -33,9 +35,9 @@ public class ItemBucket extends Item { if (var12.typeOfHit == EnumMovingObjectType.TILE) { - int var13 = var12.blockX; + BigInteger var13 = var12.blockX; int var14 = var12.blockY; - int var15 = var12.blockZ; + BigInteger var15 = var12.blockZ; if (!par2World.canMineBlock(par3EntityPlayer, var13, var14, var15)) { @@ -112,22 +114,22 @@ public class ItemBucket extends Item if (var12.sideHit == 2) { - --var15; + var15 = var15.subtract(BigInteger.ONE); } if (var12.sideHit == 3) { - ++var15; + var15 = var15.add(BigInteger.ONE); } if (var12.sideHit == 4) { - --var13; + var13 = var13.subtract(BigInteger.ONE); } if (var12.sideHit == 5) { - ++var13; + var13 = var13.add(BigInteger.ONE); } if (!par3EntityPlayer.canPlayerEdit(var13, var14, var15)) @@ -150,7 +152,7 @@ public class ItemBucket extends Item } } - public boolean func_77875_a(World par1World, double par2, double par4, double par6, int par8, int par9, int par10) + public boolean func_77875_a(World par1World, double par2, double par4, double par6, BigInteger par8, int par9, BigInteger par10) { if (this.isFull <= 0) { @@ -168,7 +170,7 @@ public class ItemBucket extends Item for (int var11 = 0; var11 < 8; ++var11) { - par1World.spawnParticle("largesmoke", (double)par8 + Math.random(), (double)par9 + Math.random(), (double)par10 + Math.random(), 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("largesmoke", (double)par8.doubleValue() + Math.random(), (double)par9 + Math.random(), (double)par10.doubleValue() + Math.random(), 0.0D, 0.0D, 0.0D); } } else diff --git a/src/minecraft/net/minecraft/src/ItemDoor.java b/src/minecraft/net/minecraft/src/ItemDoor.java index 063ecf3..2471ed3 100644 --- a/src/minecraft/net/minecraft/src/ItemDoor.java +++ b/src/minecraft/net/minecraft/src/ItemDoor.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemDoor extends Item { private Material doorMaterial; @@ -12,7 +14,7 @@ public class ItemDoor extends Item this.setTabToDisplayOn(CreativeTabs.tabRedstone); } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { if (par7 != 1) { @@ -53,7 +55,7 @@ public class ItemDoor extends Item } } - public static void placeDoorBlock(World par0World, int par1, int par2, int par3, int par4, Block par5Block) + public static void placeDoorBlock(World par0World, BigInteger par1, int par2, BigInteger par3, int par4, Block par5Block) { byte var6 = 0; byte var7 = 0; @@ -78,10 +80,10 @@ public class ItemDoor extends Item var6 = 1; } - int var8 = (par0World.isBlockNormalCube(par1 - var6, par2, par3 - var7) ? 1 : 0) + (par0World.isBlockNormalCube(par1 - var6, par2 + 1, par3 - var7) ? 1 : 0); - int var9 = (par0World.isBlockNormalCube(par1 + var6, par2, par3 + var7) ? 1 : 0) + (par0World.isBlockNormalCube(par1 + var6, par2 + 1, par3 + var7) ? 1 : 0); - boolean var10 = par0World.getBlockId(par1 - var6, par2, par3 - var7) == par5Block.blockID || par0World.getBlockId(par1 - var6, par2 + 1, par3 - var7) == par5Block.blockID; - boolean var11 = par0World.getBlockId(par1 + var6, par2, par3 + var7) == par5Block.blockID || par0World.getBlockId(par1 + var6, par2 + 1, par3 + var7) == par5Block.blockID; + int var8 = (par0World.isBlockNormalCube(par1.subtract(BigInteger.valueOf(var6)), par2, par3.subtract(BigInteger.valueOf(var7))) ? 1 : 0) + (par0World.isBlockNormalCube(par1.subtract(BigInteger.valueOf(var6)), par2 + 1, par3.subtract(BigInteger.valueOf(var7))) ? 1 : 0); + int var9 = (par0World.isBlockNormalCube(par1.add(BigInteger.valueOf(var6)), par2, par3.add(BigInteger.valueOf(var7))) ? 1 : 0) + (par0World.isBlockNormalCube(par1.add(BigInteger.valueOf(var6)), par2 + 1, par3.add(BigInteger.valueOf(var7))) ? 1 : 0); + boolean var10 = par0World.getBlockId(par1.subtract(BigInteger.valueOf(var6)), par2, par3.subtract(BigInteger.valueOf(var7))) == par5Block.blockID || par0World.getBlockId(par1.subtract(BigInteger.valueOf(var6)), par2 + 1, par3.subtract(BigInteger.valueOf(var7))) == par5Block.blockID; + boolean var11 = par0World.getBlockId(par1.add(BigInteger.valueOf(var6)), par2, par3.add(BigInteger.valueOf(var7))) == par5Block.blockID || par0World.getBlockId(par1.add(BigInteger.valueOf(var6)), par2 + 1, par3.add(BigInteger.valueOf(var7))) == par5Block.blockID; boolean var12 = false; if (var10 && !var11) diff --git a/src/minecraft/net/minecraft/src/ItemEnderEye.java b/src/minecraft/net/minecraft/src/ItemEnderEye.java index 8c1bed2..35d2665 100644 --- a/src/minecraft/net/minecraft/src/ItemEnderEye.java +++ b/src/minecraft/net/minecraft/src/ItemEnderEye.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemEnderEye extends Item { public ItemEnderEye(int par1) @@ -8,7 +10,7 @@ public class ItemEnderEye extends Item this.setTabToDisplayOn(CreativeTabs.tabMisc); } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { int var11 = par3World.getBlockId(par4, par5, par6); int var12 = par3World.getBlockMetadata(par4, par5, par6); @@ -27,9 +29,9 @@ public class ItemEnderEye extends Item for (var13 = 0; var13 < 16; ++var13) { - double var14 = (double)((float)par4 + (5.0F + itemRand.nextFloat() * 6.0F) / 16.0F); + double var14 = (double)((float)par4.floatValue() + (5.0F + itemRand.nextFloat() * 6.0F) / 16.0F); double var16 = (double)((float)par5 + 0.8125F); - double var18 = (double)((float)par6 + (5.0F + itemRand.nextFloat() * 6.0F) / 16.0F); + double var18 = (double)((float)par6.floatValue() + (5.0F + itemRand.nextFloat() * 6.0F) / 16.0F); double var20 = 0.0D; double var22 = 0.0D; double var24 = 0.0D; @@ -47,16 +49,17 @@ public class ItemEnderEye extends Item int var23; int var29; int var30; + BigInteger x, z; for (var19 = -2; var19 <= 2; ++var19) { - var29 = par4 + Direction.offsetX[var28] * var19; - var21 = par6 + Direction.offsetZ[var28] * var19; - var30 = par3World.getBlockId(var29, par5, var21); + x = par4.add(BigInteger.valueOf(Direction.offsetX[var28] * var19)); + z = par6.add(BigInteger.valueOf(Direction.offsetZ[var28] * var19)); + var30 = par3World.getBlockId(x, par5, z); if (var30 == Block.endPortalFrame.blockID) { - var23 = par3World.getBlockMetadata(var29, par5, var21); + var23 = par3World.getBlockMetadata(x, par5, z); if (!BlockEndPortalFrame.isEnderEyeInserted(var23)) { @@ -78,12 +81,10 @@ public class ItemEnderEye extends Item { for (var19 = var26; var19 <= var15; ++var19) { - var29 = par4 + Direction.offsetX[var28] * var19; - var21 = par6 + Direction.offsetZ[var28] * var19; - var29 += Direction.offsetX[var13] * 4; - var21 += Direction.offsetZ[var13] * 4; - var30 = par3World.getBlockId(var29, par5, var21); - var23 = par3World.getBlockMetadata(var29, par5, var21); + x = par4.add(BigInteger.valueOf(Direction.offsetX[var28] * var19 + Direction.offsetX[var13] * 4)); + z = par6.add(BigInteger.valueOf(Direction.offsetZ[var28] * var19 + Direction.offsetZ[var13] * 4)); + var30 = par3World.getBlockId(x, par5, z); + var23 = par3World.getBlockMetadata(x, par5, z); if (var30 != Block.endPortalFrame.blockID || !BlockEndPortalFrame.isEnderEyeInserted(var23)) { @@ -96,12 +97,10 @@ public class ItemEnderEye extends Item { for (var29 = 1; var29 <= 3; ++var29) { - var21 = par4 + Direction.offsetX[var28] * var19; - var30 = par6 + Direction.offsetZ[var28] * var19; - var21 += Direction.offsetX[var13] * var29; - var30 += Direction.offsetZ[var13] * var29; - var23 = par3World.getBlockId(var21, par5, var30); - int var31 = par3World.getBlockMetadata(var21, par5, var30); + x = par4.add(BigInteger.valueOf(Direction.offsetX[var28] * var19 + Direction.offsetX[var13] * var29)); + z = par6.add(BigInteger.valueOf(Direction.offsetZ[var28] * var19 + Direction.offsetZ[var13] * var29)); + var23 = par3World.getBlockId(x, par5, z); + int var31 = par3World.getBlockMetadata(x, par5, z); if (var23 != Block.endPortalFrame.blockID || !BlockEndPortalFrame.isEnderEyeInserted(var31)) { @@ -117,11 +116,9 @@ public class ItemEnderEye extends Item { for (var29 = 1; var29 <= 3; ++var29) { - var21 = par4 + Direction.offsetX[var28] * var19; - var30 = par6 + Direction.offsetZ[var28] * var19; - var21 += Direction.offsetX[var13] * var29; - var30 += Direction.offsetZ[var13] * var29; - par3World.setBlockWithNotify(var21, par5, var30, Block.endPortal.blockID); + x = par4.add(BigInteger.valueOf(Direction.offsetX[var28] * var19 + Direction.offsetX[var13] * var29)); + z = par6.add(BigInteger.valueOf(Direction.offsetZ[var28] * var19 + Direction.offsetZ[var13] * var29)); + par3World.setBlockWithNotify(x, par5, z, Block.endPortal.blockID); } } } @@ -155,7 +152,7 @@ public class ItemEnderEye extends Item if (!par2World.isRemote) { - ChunkPosition var7 = par2World.findClosestStructure("Stronghold", (int)par3EntityPlayer.posX, (int)par3EntityPlayer.posY, (int)par3EntityPlayer.posZ); + ChunkPosition var7 = par2World.findClosestStructure("Stronghold", MathHelper.toBigInteger(par3EntityPlayer.posX), (int)par3EntityPlayer.posY, MathHelper.toBigInteger(par3EntityPlayer.posZ)); if (var7 != null) { @@ -163,7 +160,7 @@ public class ItemEnderEye extends Item var6.moveTowards(var7.x.doubleValue(), var7.y, var7.z.doubleValue()); par2World.spawnEntityInWorld(var6); par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - par2World.playAuxSFXAtEntity((EntityPlayer)null, 1002, (int)par3EntityPlayer.posX, (int)par3EntityPlayer.posY, (int)par3EntityPlayer.posZ, 0); + par2World.playAuxSFXAtEntity((EntityPlayer)null, 1002, MathHelper.toBigInteger(par3EntityPlayer.posX), (int)par3EntityPlayer.posY, MathHelper.toBigInteger(par3EntityPlayer.posZ), 0); if (!par3EntityPlayer.capabilities.isCreativeMode) { diff --git a/src/minecraft/net/minecraft/src/ItemFireball.java b/src/minecraft/net/minecraft/src/ItemFireball.java index fc1309c..053a530 100644 --- a/src/minecraft/net/minecraft/src/ItemFireball.java +++ b/src/minecraft/net/minecraft/src/ItemFireball.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemFireball extends Item { public ItemFireball(int par1) @@ -8,7 +10,7 @@ public class ItemFireball extends Item this.setTabToDisplayOn(CreativeTabs.tabMisc); } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { if (par3World.isRemote) { @@ -28,22 +30,22 @@ public class ItemFireball extends Item if (par7 == 2) { - --par6; + par6 = par6.subtract(BigInteger.ONE); } if (par7 == 3) { - ++par6; + par6 = par6.add(BigInteger.ONE); } if (par7 == 4) { - --par4; + par4 = par4.subtract(BigInteger.ONE); } if (par7 == 5) { - ++par4; + par4 = par4.add(BigInteger.ONE); } if (!par2EntityPlayer.canPlayerEdit(par4, par5, par6)) @@ -56,7 +58,7 @@ public class ItemFireball extends Item if (var11 == 0) { - par3World.playSoundEffect((double)par4 + 0.5D, (double)par5 + 0.5D, (double)par6 + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); + par3World.playSoundEffect((double)par4.doubleValue() + 0.5D, (double)par5 + 0.5D, (double)par6.doubleValue() + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); par3World.setBlockWithNotify(par4, par5, par6, Block.fire.blockID); } diff --git a/src/minecraft/net/minecraft/src/ItemFlintAndSteel.java b/src/minecraft/net/minecraft/src/ItemFlintAndSteel.java index d029201..9574bfa 100644 --- a/src/minecraft/net/minecraft/src/ItemFlintAndSteel.java +++ b/src/minecraft/net/minecraft/src/ItemFlintAndSteel.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemFlintAndSteel extends Item { public ItemFlintAndSteel(int par1) @@ -10,7 +12,7 @@ public class ItemFlintAndSteel extends Item this.setTabToDisplayOn(CreativeTabs.tabTools); } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { if (par7 == 0) { @@ -24,22 +26,22 @@ public class ItemFlintAndSteel extends Item if (par7 == 2) { - --par6; + par6 = par6.subtract(BigInteger.ONE); } if (par7 == 3) { - ++par6; + par6 = par6.add(BigInteger.ONE); } if (par7 == 4) { - --par4; + par4 = par4.subtract(BigInteger.ONE); } if (par7 == 5) { - ++par4; + par4 = par4.add(BigInteger.ONE); } if (!par2EntityPlayer.canPlayerEdit(par4, par5, par6)) @@ -52,7 +54,7 @@ public class ItemFlintAndSteel extends Item if (var11 == 0) { - par3World.playSoundEffect((double)par4 + 0.5D, (double)par5 + 0.5D, (double)par6 + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); + par3World.playSoundEffect((double)par4.doubleValue() + 0.5D, (double)par5 + 0.5D, (double)par6.doubleValue() + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); par3World.setBlockWithNotify(par4, par5, par6, Block.fire.blockID); } diff --git a/src/minecraft/net/minecraft/src/ItemGlassBottle.java b/src/minecraft/net/minecraft/src/ItemGlassBottle.java index f129afb..327e5ab 100644 --- a/src/minecraft/net/minecraft/src/ItemGlassBottle.java +++ b/src/minecraft/net/minecraft/src/ItemGlassBottle.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemGlassBottle extends Item { public ItemGlassBottle(int par1) @@ -23,9 +25,9 @@ public class ItemGlassBottle extends Item { if (var4.typeOfHit == EnumMovingObjectType.TILE) { - int var5 = var4.blockX; + BigInteger var5 = var4.blockX; int var6 = var4.blockY; - int var7 = var4.blockZ; + BigInteger var7 = var4.blockZ; if (!par2World.canMineBlock(par3EntityPlayer, var5, var6, var7)) { diff --git a/src/minecraft/net/minecraft/src/ItemHoe.java b/src/minecraft/net/minecraft/src/ItemHoe.java index aa0f5c5..9986289 100644 --- a/src/minecraft/net/minecraft/src/ItemHoe.java +++ b/src/minecraft/net/minecraft/src/ItemHoe.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemHoe extends Item { protected EnumToolMaterial field_77843_a; @@ -13,7 +15,7 @@ public class ItemHoe extends Item this.setTabToDisplayOn(CreativeTabs.tabTools); } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { if (!par2EntityPlayer.canPlayerEdit(par4, par5, par6)) { @@ -31,7 +33,7 @@ public class ItemHoe extends Item else { Block var13 = Block.tilledField; - par3World.playSoundEffect((double)((float)par4 + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6 + 0.5F), var13.stepSound.getStepSound(), (var13.stepSound.getVolume() + 1.0F) / 2.0F, var13.stepSound.getPitch() * 0.8F); + par3World.playSoundEffect((double)((float)par4.floatValue() + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6.floatValue() + 0.5F), var13.stepSound.getStepSound(), (var13.stepSound.getVolume() + 1.0F) / 2.0F, var13.stepSound.getPitch() * 0.8F); if (par3World.isRemote) { diff --git a/src/minecraft/net/minecraft/src/ItemLilyPad.java b/src/minecraft/net/minecraft/src/ItemLilyPad.java index 4387164..590281c 100644 --- a/src/minecraft/net/minecraft/src/ItemLilyPad.java +++ b/src/minecraft/net/minecraft/src/ItemLilyPad.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemLilyPad extends ItemColored { public ItemLilyPad(int par1) @@ -22,9 +24,9 @@ public class ItemLilyPad extends ItemColored { if (var4.typeOfHit == EnumMovingObjectType.TILE) { - int var5 = var4.blockX; + BigInteger var5 = var4.blockX; int var6 = var4.blockY; - int var7 = var4.blockZ; + BigInteger var7 = var4.blockZ; if (!par2World.canMineBlock(par3EntityPlayer, var5, var6, var7)) { diff --git a/src/minecraft/net/minecraft/src/ItemPainting.java b/src/minecraft/net/minecraft/src/ItemPainting.java index 55153d9..fc55161 100644 --- a/src/minecraft/net/minecraft/src/ItemPainting.java +++ b/src/minecraft/net/minecraft/src/ItemPainting.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemPainting extends Item { public ItemPainting(int par1) @@ -8,7 +10,7 @@ public class ItemPainting extends Item this.setTabToDisplayOn(CreativeTabs.tabDeco); } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { if (par7 == 0) { diff --git a/src/minecraft/net/minecraft/src/ItemRedstone.java b/src/minecraft/net/minecraft/src/ItemRedstone.java index 5eaa730..77cf685 100644 --- a/src/minecraft/net/minecraft/src/ItemRedstone.java +++ b/src/minecraft/net/minecraft/src/ItemRedstone.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemRedstone extends Item { public ItemRedstone(int par1) @@ -8,7 +10,7 @@ public class ItemRedstone extends Item this.setTabToDisplayOn(CreativeTabs.tabRedstone); } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { if (par3World.getBlockId(par4, par5, par6) != Block.snow.blockID) { @@ -24,22 +26,22 @@ public class ItemRedstone extends Item if (par7 == 2) { - --par6; + par6 = par6.subtract(BigInteger.ONE); } if (par7 == 3) { - ++par6; + par6 = par6.add(BigInteger.ONE); } if (par7 == 4) { - --par4; + par4 = par4.subtract(BigInteger.ONE); } if (par7 == 5) { - ++par4; + par4 = par4.add(BigInteger.ONE); } if (!par3World.isAirBlock(par4, par5, par6)) diff --git a/src/minecraft/net/minecraft/src/ItemReed.java b/src/minecraft/net/minecraft/src/ItemReed.java index 78b64ca..9a07daa 100644 --- a/src/minecraft/net/minecraft/src/ItemReed.java +++ b/src/minecraft/net/minecraft/src/ItemReed.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemReed extends Item { /** The ID of the block the reed will spawn when used from inventory bar. */ @@ -11,7 +13,7 @@ public class ItemReed extends Item this.spawnID = par2Block.blockID; } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { int var11 = par3World.getBlockId(par4, par5, par6); @@ -33,22 +35,22 @@ public class ItemReed extends Item if (par7 == 2) { - --par6; + par6 = par6.subtract(BigInteger.ONE); } if (par7 == 3) { - ++par6; + par6 = par6.add(BigInteger.ONE); } if (par7 == 4) { - --par4; + par4 = par4.subtract(BigInteger.ONE); } if (par7 == 5) { - ++par4; + par4 = par4.add(BigInteger.ONE); } } @@ -74,7 +76,7 @@ public class ItemReed extends Item Block.blocksList[this.spawnID].onBlockPlacedBy(par3World, par4, par5, par6, par2EntityPlayer); } - par3World.playSoundEffect((double)((float)par4 + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6 + 0.5F), var12.stepSound.getStepSound(), (var12.stepSound.getVolume() + 1.0F) / 2.0F, var12.stepSound.getPitch() * 0.8F); + par3World.playSoundEffect((double)((float)par4.floatValue() + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6 .floatValue()+ 0.5F), var12.stepSound.getStepSound(), (var12.stepSound.getVolume() + 1.0F) / 2.0F, var12.stepSound.getPitch() * 0.8F); --par1ItemStack.stackSize; } } diff --git a/src/minecraft/net/minecraft/src/ItemSeeds.java b/src/minecraft/net/minecraft/src/ItemSeeds.java index c84757c..fd8bb72 100644 --- a/src/minecraft/net/minecraft/src/ItemSeeds.java +++ b/src/minecraft/net/minecraft/src/ItemSeeds.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemSeeds extends Item { /** @@ -18,7 +20,7 @@ public class ItemSeeds extends Item this.setTabToDisplayOn(CreativeTabs.tabMaterials); } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { if (par7 != 1) { diff --git a/src/minecraft/net/minecraft/src/ItemSign.java b/src/minecraft/net/minecraft/src/ItemSign.java index 5885646..2a2447e 100644 --- a/src/minecraft/net/minecraft/src/ItemSign.java +++ b/src/minecraft/net/minecraft/src/ItemSign.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemSign extends Item { public ItemSign(int par1) @@ -9,7 +11,7 @@ public class ItemSign extends Item this.setTabToDisplayOn(CreativeTabs.tabDeco); } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { if (par7 == 0) { @@ -28,22 +30,22 @@ public class ItemSign extends Item if (par7 == 2) { - --par6; + par6 = par6.subtract(BigInteger.ONE); } if (par7 == 3) { - ++par6; + par6 = par6.add(BigInteger.ONE); } if (par7 == 4) { - --par4; + par4 = par4.subtract(BigInteger.ONE); } if (par7 == 5) { - ++par4; + par4 = par4.add(BigInteger.ONE); } if (!par2EntityPlayer.canPlayerEdit(par4, par5, par6)) diff --git a/src/minecraft/net/minecraft/src/ItemSlab.java b/src/minecraft/net/minecraft/src/ItemSlab.java index b5aa0a2..b957779 100644 --- a/src/minecraft/net/minecraft/src/ItemSlab.java +++ b/src/minecraft/net/minecraft/src/ItemSlab.java @@ -1,5 +1,7 @@ package net.minecraft.src; +import java.math.BigInteger; + public class ItemSlab extends ItemBlock { private final boolean field_77891_a; @@ -37,7 +39,7 @@ public class ItemSlab extends ItemBlock return this.field_77889_b.getFullSlabName(par1ItemStack.getItemDamage()); } - public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + public boolean tryPlaceIntoWorld(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7, float par8, float par9, float par10) { if (this.field_77891_a) { @@ -62,7 +64,7 @@ public class ItemSlab extends ItemBlock { if (par3World.checkIfAABBIsClear(this.field_77890_c.getCollisionBoundingBoxFromPool(par3World, par4, par5, par6)) && par3World.setBlockAndMetadataWithNotify(par4, par5, par6, this.field_77890_c.blockID, var13)) { - par3World.playSoundEffect((double)((float)par4 + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6 + 0.5F), this.field_77890_c.stepSound.getStepSound(), (this.field_77890_c.stepSound.getVolume() + 1.0F) / 2.0F, this.field_77890_c.stepSound.getPitch() * 0.8F); + par3World.playSoundEffect((double)((float)par4.floatValue() + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6.floatValue() + 0.5F), this.field_77890_c.stepSound.getStepSound(), (this.field_77890_c.stepSound.getVolume() + 1.0F) / 2.0F, this.field_77890_c.stepSound.getPitch() * 0.8F); --par1ItemStack.stackSize; } @@ -78,11 +80,11 @@ public class ItemSlab extends ItemBlock /** * Returns true if the given ItemBlock can be placed on the given side of the given block position. */ - public boolean canPlaceItemBlockOnSide(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer, ItemStack par7ItemStack) + public boolean canPlaceItemBlockOnSide(World par1World, BigInteger par2, int par3, BigInteger par4, int par5, EntityPlayer par6EntityPlayer, ItemStack par7ItemStack) { - int var8 = par2; + BigInteger var8 = par2; int var9 = par3; - int var10 = par4; + BigInteger var10 = par4; int var11 = par1World.getBlockId(par2, par3, par4); int var12 = par1World.getBlockMetadata(par2, par3, par4); int var13 = var12 & 7; @@ -106,22 +108,22 @@ public class ItemSlab extends ItemBlock if (par5 == 2) { - --par4; + par4 = par4.subtract(BigInteger.ONE); } if (par5 == 3) { - ++par4; + par4 = par4.add(BigInteger.ONE); } if (par5 == 4) { - --par2; + par2 = par2.subtract(BigInteger.ONE); } if (par5 == 5) { - ++par2; + par2 = par2.add(BigInteger.ONE); } var11 = par1World.getBlockId(par2, par3, par4); @@ -132,7 +134,7 @@ public class ItemSlab extends ItemBlock } } - private boolean func_77888_a(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7) + private boolean func_77888_a(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BigInteger par4, int par5, BigInteger par6, int par7) { if (par7 == 0) { @@ -146,22 +148,22 @@ public class ItemSlab extends ItemBlock if (par7 == 2) { - --par6; + par6 = par6.subtract(BigInteger.ONE); } if (par7 == 3) { - ++par6; + par6 = par6.add(BigInteger.ONE); } if (par7 == 4) { - --par4; + par4 = par4.subtract(BigInteger.ONE); } if (par7 == 5) { - ++par4; + par4 = par4.add(BigInteger.ONE); } int var8 = par3World.getBlockId(par4, par5, par6); @@ -172,7 +174,7 @@ public class ItemSlab extends ItemBlock { if (par3World.checkIfAABBIsClear(this.field_77890_c.getCollisionBoundingBoxFromPool(par3World, par4, par5, par6)) && par3World.setBlockAndMetadataWithNotify(par4, par5, par6, this.field_77890_c.blockID, var10)) { - par3World.playSoundEffect((double)((float)par4 + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6 + 0.5F), this.field_77890_c.stepSound.getStepSound(), (this.field_77890_c.stepSound.getVolume() + 1.0F) / 2.0F, this.field_77890_c.stepSound.getPitch() * 0.8F); + par3World.playSoundEffect((double)((float)par4.floatValue() + 0.5F), (double)((float)par5 + 0.5F), (double)((float)par6.floatValue() + 0.5F), this.field_77890_c.stepSound.getStepSound(), (this.field_77890_c.stepSound.getVolume() + 1.0F) / 2.0F, this.field_77890_c.stepSound.getPitch() * 0.8F); --par1ItemStack.stackSize; } diff --git a/src/minecraft/net/minecraft/src/MapGenCaves.java b/src/minecraft/net/minecraft/src/MapGenCaves.java index 70f3094..ef2d900 100644 --- a/src/minecraft/net/minecraft/src/MapGenCaves.java +++ b/src/minecraft/net/minecraft/src/MapGenCaves.java @@ -196,7 +196,7 @@ public class MapGenCaves extends MapGenBase /** * Recursively called by generate() (generate) and optionally by itself. */ - protected void recursiveGenerate(World par1World, int par2, int par3, int par4, int par5, byte[] par6ArrayOfByte) + protected void recursiveGenerate(World par1World, int par2, int par3, BigInteger par4, BigInteger par5, byte[] par6ArrayOfByte) { int var7 = this.rand.nextInt(this.rand.nextInt(this.rand.nextInt(40) + 1) + 1); diff --git a/src/minecraft/net/minecraft/src/MapGenStructure.java b/src/minecraft/net/minecraft/src/MapGenStructure.java index 6c9e9a4..22b84a6 100644 --- a/src/minecraft/net/minecraft/src/MapGenStructure.java +++ b/src/minecraft/net/minecraft/src/MapGenStructure.java @@ -22,6 +22,7 @@ public abstract class MapGenStructure extends MapGenBase if (par2.bitCount() < 31 && par3.bitCount() < 31 && this.canSpawnStructureAtCoords(par2, par3)) { + // I'm not planned to make structures to BigInteger. StructureStart var7 = this.getStructureStart(par2.intValueExact(), par3.intValueExact()); this.field_75053_d.put(new ChunkCoordIntPair(par2, par3), var7); } diff --git a/src/minecraft/net/minecraft/src/NBTTagCompound.java b/src/minecraft/net/minecraft/src/NBTTagCompound.java index ec37dff..4beb147 100644 --- a/src/minecraft/net/minecraft/src/NBTTagCompound.java +++ b/src/minecraft/net/minecraft/src/NBTTagCompound.java @@ -3,6 +3,7 @@ package net.minecraft.src; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import java.math.BigInteger; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; @@ -320,4 +321,13 @@ public class NBTTagCompound extends NBTBase { return super.hashCode() ^ this.tagMap.hashCode(); } + + public void setBigInteger(String key, BigInteger value) { + setString(key, value.toString()); + + } + + public BigInteger getBigInteger(String key) { + return new BigInteger(key); + } } diff --git a/src/minecraft/net/minecraft/src/Packet25EntityPainting.java b/src/minecraft/net/minecraft/src/Packet25EntityPainting.java index d664716..7bfb627 100644 --- a/src/minecraft/net/minecraft/src/Packet25EntityPainting.java +++ b/src/minecraft/net/minecraft/src/Packet25EntityPainting.java @@ -3,13 +3,14 @@ package net.minecraft.src; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import java.math.BigInteger; public class Packet25EntityPainting extends Packet { public int entityId; - public int xPosition; + public BigInteger xPosition; public int yPosition; - public int zPosition; + public BigInteger zPosition; public int direction; public String title; @@ -32,9 +33,9 @@ public class Packet25EntityPainting extends Packet { this.entityId = par1DataInputStream.readInt(); this.title = readString(par1DataInputStream, EnumArt.maxArtTitleLength); - this.xPosition = par1DataInputStream.readInt(); + this.xPosition = readBigInteger(par1DataInputStream); this.yPosition = par1DataInputStream.readInt(); - this.zPosition = par1DataInputStream.readInt(); + this.zPosition = readBigInteger(par1DataInputStream); this.direction = par1DataInputStream.readInt(); } @@ -45,9 +46,9 @@ public class Packet25EntityPainting extends Packet { par1DataOutputStream.writeInt(this.entityId); writeString(this.title, par1DataOutputStream); - par1DataOutputStream.writeInt(this.xPosition); + writeBigInteger(par1DataOutputStream, xPosition); par1DataOutputStream.writeInt(this.yPosition); - par1DataOutputStream.writeInt(this.zPosition); + writeBigInteger(par1DataOutputStream, zPosition); par1DataOutputStream.writeInt(this.direction); } diff --git a/src/minecraft/net/minecraft/src/World.java b/src/minecraft/net/minecraft/src/World.java index 5794987..2cf28e9 100644 --- a/src/minecraft/net/minecraft/src/World.java +++ b/src/minecraft/net/minecraft/src/World.java @@ -3601,7 +3601,7 @@ public abstract class World implements IBlockAccess /** * Called when checking if a certain block can be mined or not. The 'spawn safe zone' check is located here. */ - public boolean canMineBlock(EntityPlayer par1EntityPlayer, int par2, int par3, int par4) + public boolean canMineBlock(EntityPlayer par1EntityPlayer, BigInteger par2, int par3, BigInteger par4) { return true; } diff --git a/src/minecraft/net/minecraft/src/WorldGenPumpkin.java b/src/minecraft/net/minecraft/src/WorldGenPumpkin.java index 4a4b763..289f87e 100644 --- a/src/minecraft/net/minecraft/src/WorldGenPumpkin.java +++ b/src/minecraft/net/minecraft/src/WorldGenPumpkin.java @@ -1,16 +1,17 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class WorldGenPumpkin extends WorldGenerator { - 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) { for (int var6 = 0; var6 < 64; ++var6) { - int var7 = par3 + par2Random.nextInt(8) - par2Random.nextInt(8); + BigInteger var7 = par3.add(BigInteger.valueOf(par2Random.nextInt(8) - par2Random.nextInt(8))); int var8 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4); - int var9 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8); + BigInteger var9 = par5.add(BigInteger.valueOf(par2Random.nextInt(8) - par2Random.nextInt(8))); if (par1World.isAirBlock(var7, var8, var9) && par1World.getBlockId(var7, var8 - 1, var9) == Block.grass.blockID && Block.pumpkin.canPlaceBlockAt(par1World, var7, var8, var9)) { diff --git a/src/minecraft/net/minecraft/src/WorldGenVines.java b/src/minecraft/net/minecraft/src/WorldGenVines.java index 1e242ca..32ec590 100644 --- a/src/minecraft/net/minecraft/src/WorldGenVines.java +++ b/src/minecraft/net/minecraft/src/WorldGenVines.java @@ -1,14 +1,15 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class WorldGenVines extends WorldGenerator { - 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 var6 = par3; + BigInteger var6 = par3; - for (int var7 = par5; par4 < 128; ++par4) + for (BigInteger var7 = par5; par4 < 128; ++par4) { if (par1World.isAirBlock(par3, par4, par5)) { @@ -23,8 +24,8 @@ public class WorldGenVines extends WorldGenerator } else { - par3 = var6 + par2Random.nextInt(4) - par2Random.nextInt(4); - par5 = var7 + par2Random.nextInt(4) - par2Random.nextInt(4); + par3 = var6.add(BigInteger.valueOf(par2Random.nextInt(4) - par2Random.nextInt(4))); + par5 = var7.add(BigInteger.valueOf(par2Random.nextInt(4) - par2Random.nextInt(4))); } } diff --git a/src/minecraft/net/minecraft/src/WorldGenWaterlily.java b/src/minecraft/net/minecraft/src/WorldGenWaterlily.java index d06fb04..16c7220 100644 --- a/src/minecraft/net/minecraft/src/WorldGenWaterlily.java +++ b/src/minecraft/net/minecraft/src/WorldGenWaterlily.java @@ -1,16 +1,17 @@ package net.minecraft.src; +import java.math.BigInteger; import java.util.Random; public class WorldGenWaterlily extends WorldGenerator { - 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) { for (int var6 = 0; var6 < 10; ++var6) { - int var7 = par3 + par2Random.nextInt(8) - par2Random.nextInt(8); + BigInteger var7 = par3.add(BigInteger.valueOf(par2Random.nextInt(8) - par2Random.nextInt(8))); int var8 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4); - int var9 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8); + BigInteger var9 = par5.add(BigInteger.valueOf(par2Random.nextInt(8) - par2Random.nextInt(8))); if (par1World.isAirBlock(var7, var8, var9) && Block.waterlily.canPlaceBlockAt(par1World, var7, var8, var9)) {