diff --git a/recompile.sh b/recompile.sh old mode 100644 new mode 100755 index 549b2bc..448d4ec --- a/recompile.sh +++ b/recompile.sh @@ -1,2 +1,2 @@ #!/bin/bash -python runtime/recompile.py "$@" +python2 runtime/recompile.py "$@" diff --git a/src/minecraft/net/minecraft/src/Frustrum.java b/src/minecraft/net/minecraft/src/Frustrum.java index e7a3a18..bc28893 100644 --- a/src/minecraft/net/minecraft/src/Frustrum.java +++ b/src/minecraft/net/minecraft/src/Frustrum.java @@ -2,6 +2,7 @@ package net.minecraft.src; public class Frustrum implements ICamera { + public static final boolean DISABLE_FRUSTRUM = Boolean.getBoolean("net.minecraft.src.DISABLE_FRUSTRUM"); private ClippingHelper clippingHelper = ClippingHelperImpl.getInstance(); private double xPosition; private double yPosition; @@ -19,7 +20,7 @@ public class Frustrum implements ICamera */ public boolean isBoxInFrustum(double par1, double par3, double par5, double par7, double par9, double par11) { - return this.clippingHelper.isBoxInFrustum(par1 - this.xPosition, par3 - this.yPosition, par5 - this.zPosition, par7 - this.xPosition, par9 - this.yPosition, par11 - this.zPosition); + return true || this.clippingHelper.isBoxInFrustum(par1 - this.xPosition, par3 - this.yPosition, par5 - this.zPosition, par7 - this.xPosition, par9 - this.yPosition, par11 - this.zPosition); } /** @@ -27,6 +28,6 @@ public class Frustrum implements ICamera */ public boolean isBoundingBoxInFrustum(AxisAlignedBB par1AxisAlignedBB) { - return this.isBoxInFrustum(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ, par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); + return true || this.isBoxInFrustum(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ, par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); } } diff --git a/src/minecraft/net/minecraft/src/NoiseGeneratorOctaves.java b/src/minecraft/net/minecraft/src/NoiseGeneratorOctaves.java index b779562..9fc2cc5 100644 --- a/src/minecraft/net/minecraft/src/NoiseGeneratorOctaves.java +++ b/src/minecraft/net/minecraft/src/NoiseGeneratorOctaves.java @@ -47,14 +47,14 @@ public class NoiseGeneratorOctaves extends NoiseGenerator double var17 = (double)par2.doubleValue() * var27 * par8; double var19 = (double)par3 * var27 * par10; double var21 = (double)par4.doubleValue() * var27 * par12; -// long var23 = MathHelper.floor_double_long(var17); -// long var25 = MathHelper.floor_double_long(var21); -// var17 -= (double)var23; -// var21 -= (double)var25; -// var23 %= 16777216L; -// var25 %= 16777216L; -// var17 += (double)var23; -// var21 += (double)var25; + long var23 = MathHelper.floor_double_long(var17); + long var25 = MathHelper.floor_double_long(var21); + var17 -= (double)var23; + var21 -= (double)var25; + var23 %= 16777216L; + var25 %= 16777216L; + var17 += (double)var23; + var21 += (double)var25; this.generatorCollection[var16].populateNoiseArray(par1ArrayOfDouble, var17, var19, var21, par5, par6, par7, par8 * var27, par10 * var27, par12 * var27, var27); var27 /= 2.0D; }