diff --git a/src/minecraft/net/minecraft/src/ChunkProviderGenerate.java b/src/minecraft/net/minecraft/src/ChunkProviderGenerate.java index cfdaef1..cd22b63 100644 --- a/src/minecraft/net/minecraft/src/ChunkProviderGenerate.java +++ b/src/minecraft/net/minecraft/src/ChunkProviderGenerate.java @@ -185,7 +185,8 @@ public class ChunkProviderGenerate implements IChunkProvider { byte var5 = 63; double var6 = 0.03125D; - this.stoneNoise = this.noiseGen4.generateNoiseOctaves(this.stoneNoise, par1.shiftLeft(4), par2.shiftLeft(4), BigInteger.ZERO, 16, 1, 16, var6 * 2.0D, var6 * 2.0D, var6 * 2.0D); + // X, Y, 0 -> X. 0, Y + this.stoneNoise = this.noiseGen4.generateNoiseOctaves(this.stoneNoise, par1.shiftLeft(4), BigInteger.ZERO, par2.shiftLeft(4), 16, 1, 16, var6 * 2.0D, var6 * 2.0D, var6 * 2.0D); for (int var8 = 0; var8 < 16; ++var8) { @@ -530,7 +531,6 @@ public class ChunkProviderGenerate implements IChunkProvider ; } } -// FIXME: java.lang.RuntimeException: Already decorating!! var6.decorate(this.worldObj, rand, var4, var5); SpawnerAnimals.performWorldGenSpawning(this.worldObj, var6, var4.add(BigInteger.valueOf(8)), var5.add(BigInteger.valueOf(8)), 16, 16, rand); var4 = var4.add(BigInteger.valueOf(8)); diff --git a/src/minecraft/net/minecraft/src/RenderGlobal.java b/src/minecraft/net/minecraft/src/RenderGlobal.java index 9149082..a241839 100644 --- a/src/minecraft/net/minecraft/src/RenderGlobal.java +++ b/src/minecraft/net/minecraft/src/RenderGlobal.java @@ -858,7 +858,7 @@ public class RenderGlobal implements IWorldAccess for (int var6 = 0; var6 < var5; ++var6) { RenderList var7 = var4[var6]; - var7.func_78419_a(); + var7.func_78419_a(theWorld.theProfiler); } this.theWorld.theProfiler.endSection(); diff --git a/src/minecraft/net/minecraft/src/RenderList.java b/src/minecraft/net/minecraft/src/RenderList.java index 5697857..bf97433 100644 --- a/src/minecraft/net/minecraft/src/RenderList.java +++ b/src/minecraft/net/minecraft/src/RenderList.java @@ -41,11 +41,11 @@ public class RenderList if (this.field_78424_g.remaining() == 0) { - this.func_78419_a(); + this.func_78419_a(null); } } - public void func_78419_a() + public void func_78419_a(Profiler profiler) { if (this.field_78430_h) { @@ -58,8 +58,11 @@ public class RenderList if (this.field_78424_g.remaining() > 0) { GL11.glPushMatrix(); + if(profiler != null) profiler.startSection("translate"); GL11.glTranslatef((float)(MathHelper.toBigDecimal(this.field_78429_a).subtract(this.field_78425_d).floatValue()), (float)((double)this.field_78427_b - this.field_78426_e), (float)(MathHelper.toBigDecimal(this.field_78428_c).subtract(this.field_78423_f).floatValue())); + if(profiler != null) profiler.endStartSection("opengl"); GL11.glCallLists(this.field_78424_g); + if(profiler != null) profiler.endSection(); GL11.glPopMatrix(); } }