mckuhei
/
1.3.2_128bit
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: mckuhei:master
Branches Tags
mckuhei:master
mckuhei:test
SolDev69:master
SolDev69:main
SolDev69:stripelands
SolDev69:test
SolDev69:remove-fringelands
...
pull from: SolDev69:master
Branches Tags
SolDev69:master
SolDev69:main
SolDev69:stripelands
SolDev69:test
SolDev69:remove-fringelands
mckuhei:master
mckuhei:test

2 Commits
master ... master

Author SHA1 Message Date
SolDev69 0be652573c Revert "Add fringelands." 
This reverts commit acc69336a3.
 1 year ago
SolDev69 3662aced93 Revert "Deobfuscate some variables." 
This reverts commit b603f86c1c.
 1 year ago
4 changed files with 89 additions and 116 deletions
Show Stats

183
src/minecraft/net/minecraft/src/ChunkProviderGenerate.java
Unescape Escape View File

@ -4,8 +4,6 @@ import org.mcmodule.math.BigInteger;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import static net.minecraft.src.Constants.*;
public class ChunkProviderGenerate implements IChunkProvider public class ChunkProviderGenerate implements IChunkProvider
{ {
/** RNG. */ /** RNG. */
@ -98,83 +96,72 @@ public class ChunkProviderGenerate implements IChunkProvider
*/ */
public void generateTerrain(BigInteger par1, BigInteger par2, byte[] par3ArrayOfByte) public void generateTerrain(BigInteger par1, BigInteger par2, byte[] par3ArrayOfByte)
{ {
byte width1 = 4; byte var4 = 4;
byte height1 = 16; byte var5 = 16;
byte seaLevel = 63; byte var6 = 63;
// int var7 = width1 + 1; int var7 = var4 + 1;
byte noiseHeight = 17; byte var8 = 17;
int noiseWidth = width1 + 1; int var9 = var4 + 1;
this.biomesForGeneration = this.worldObj.getWorldChunkManager().getBiomesForGeneration(this.biomesForGeneration, par1.multiply(BigInteger.valueOf(4)).subtract(BigInteger.valueOf(2)), par2.multiply(BigInteger.valueOf(4)).subtract(BigInteger.valueOf(2)), noiseWidth + 5, noiseWidth + 5); this.biomesForGeneration = this.worldObj.getWorldChunkManager().getBiomesForGeneration(this.biomesForGeneration, par1.multiply(BigInteger.valueOf(4)).subtract(BigInteger.valueOf(2)), par2.multiply(BigInteger.valueOf(4)).subtract(BigInteger.valueOf(2)), var7 + 5, var9 + 5);
this.noiseArray = this.initializeNoiseField(this.noiseArray, par1.multiply(BigInteger.valueOf(width1)), 0, par2.multiply(BigInteger.valueOf(width1)), noiseWidth, noiseHeight, noiseWidth); this.noiseArray = this.initializeNoiseField(this.noiseArray, par1.multiply(BigInteger.valueOf(var4)), 0, par2.multiply(BigInteger.valueOf(var4)), var7, var8, var9);
// Scan blocks... for (int var10 = 0; var10 < var4; ++var10)
for (int x1 = 0; x1 < width1; ++x1)
{ {
for (int z1 = 0; z1 < width1; ++z1) for (int var11 = 0; var11 < var4; ++var11)
{ {
for (int y1 = 0; y1 < height1; ++y1) for (int var12 = 0; var12 < var5; ++var12)
{ {
// Who is faster? Is LOAD faster or LDC faster? double var13 = 0.125D;
double step8 = 0.125D; double var15 = this.noiseArray[((var10 + 0) * var9 + var11 + 0) * var8 + var12 + 0];
// Evil gradient variables. double var17 = this.noiseArray[((var10 + 0) * var9 + var11 + 1) * var8 + var12 + 0];
double AA = this.noiseArray[((x1 + 0) * noiseWidth + z1 + 0) * noiseHeight + y1 + 0]; double var19 = this.noiseArray[((var10 + 1) * var9 + var11 + 0) * var8 + var12 + 0];
double BB = this.noiseArray[((x1 + 0) * noiseWidth + z1 + 1) * noiseHeight + y1 + 0]; double var21 = this.noiseArray[((var10 + 1) * var9 + var11 + 1) * var8 + var12 + 0];
double CC = this.noiseArray[((x1 + 1) * noiseWidth + z1 + 0) * noiseHeight + y1 + 0]; double var23 = (this.noiseArray[((var10 + 0) * var9 + var11 + 0) * var8 + var12 + 1] - var15) * var13;
double DD = this.noiseArray[((x1 + 1) * noiseWidth + z1 + 1) * noiseHeight + y1 + 0]; double var25 = (this.noiseArray[((var10 + 0) * var9 + var11 + 1) * var8 + var12 + 1] - var17) * var13;
double stepAA = (this.noiseArray[((x1 + 0) * noiseWidth + z1 + 0) * noiseHeight + y1 + 1] - AA) * step8; // Use 0.125D instead of step8 may faster??? double var27 = (this.noiseArray[((var10 + 1) * var9 + var11 + 0) * var8 + var12 + 1] - var19) * var13;
double stepBB = (this.noiseArray[((x1 + 0) * noiseWidth + z1 + 1) * noiseHeight + y1 + 1] - BB) * step8; double var29 = (this.noiseArray[((var10 + 1) * var9 + var11 + 1) * var8 + var12 + 1] - var21) * var13;
double stepCC = (this.noiseArray[((x1 + 1) * noiseWidth + z1 + 0) * noiseHeight + y1 + 1] - CC) * step8;
double stepDD = (this.noiseArray[((x1 + 1) * noiseWidth + z1 + 1) * noiseHeight + y1 + 1] - DD) * step8; for (int var31 = 0; var31 < 8; ++var31)
for (int y2 = 0; y2 < 8; ++y2)
{ {
double step4 = 0.25D; double var32 = 0.25D;
double EE = AA; double var34 = var15;
double FF = BB; double var36 = var17;
double stepEE = (CC - AA) * step4; double var38 = (var19 - var15) * var32;
double stepFF = (DD - BB) * step4; double var40 = (var21 - var17) * var32;
for (int x2 = 0; x2 < 4; ++x2) for (int var42 = 0; var42 < 4; ++var42)
{ {
int xzy = x2 + x1 * 4 << 11 | 0 + z1 * 4 << 7 | y1 * 8 + y2; int var43 = var42 + var10 * 4 << 11 | 0 + var11 * 4 << 7 | var12 * 8 + var31;
short height = 128; short var44 = 128;
xzy -= height; var43 -= var44;
// double var45 = 0.25D; double var45 = 0.25D;
double stepGG = (FF - EE) * step4; double var49 = (var36 - var34) * var45;
double GG = EE - stepGG; double var47 = var34 - var49;
for (int z2 = 0; z2 < 4; ++z2) for (int var51 = 0; var51 < 4; ++var51)
{ {
if(!ENABLE_FRINGE_LAND) { if ((var47 += var49) > 0.0D)
GG += stepGG;
} else {
if(z2 == 0) GG = EE;
}
if (GG > 0.0D)
{ {
par3ArrayOfByte[xzy += height] = (byte)Block.stone.blockID; par3ArrayOfByte[var43 += var44] = (byte)Block.stone.blockID;
} }
else if (y1 * 8 + y2 < seaLevel) else if (var12 * 8 + var31 < var6)
{ {
par3ArrayOfByte[xzy += height] = (byte)Block.waterStill.blockID; par3ArrayOfByte[var43 += var44] = (byte)Block.waterStill.blockID;
} }
else else
{ {
par3ArrayOfByte[xzy += height] = 0; par3ArrayOfByte[var43 += var44] = 0;
} }
if(ENABLE_FRINGE_LAND) {
GG += stepGG;
}
} }
EE += stepEE; var34 += var38;
FF += stepFF; var36 += var40;
} }
AA += stepAA; var15 += var23;
BB += stepBB; var17 += var25;
CC += stepCC; var19 += var27;
DD += stepDD; var21 += var29;
} }
} }
} }
@ -204,15 +191,15 @@ public class ChunkProviderGenerate implements IChunkProvider
for (int var16 = 127; var16 >= 0; --var16) for (int var16 = 127; var16 >= 0; --var16)
{ {
int xzy = (var9 * 16 + var8) * 128 + var16; int var17 = (var9 * 16 + var8) * 128 + var16;
if (var16 <= 0 + this.rand.nextInt(5)) if (var16 <= 0 + this.rand.nextInt(5))
{ {
par3ArrayOfByte[xzy] = (byte)Block.bedrock.blockID; par3ArrayOfByte[var17] = (byte)Block.bedrock.blockID;
} }
else else
{ {
byte var18 = par3ArrayOfByte[xzy]; byte var18 = par3ArrayOfByte[var17];
if (var18 == 0) if (var18 == 0)
{ {
@ -249,17 +236,17 @@ public class ChunkProviderGenerate implements IChunkProvider
if (var16 >= var5 - 1) if (var16 >= var5 - 1)
{ {
par3ArrayOfByte[xzy] = var14; par3ArrayOfByte[var17] = var14;
} }
else else
{ {
par3ArrayOfByte[xzy] = var15; par3ArrayOfByte[var17] = var15;
} }
} }
else if (var13 > 0) else if (var13 > 0)
{ {
--var13; --var13;
par3ArrayOfByte[xzy] = var15; par3ArrayOfByte[var17] = var15;
if (var13 == 0 && var15 == Block.sand.blockID) if (var13 == 0 && var15 == Block.sand.blockID)
{ {
@ -320,11 +307,11 @@ public class ChunkProviderGenerate implements IChunkProvider
* generates a subset of the level's terrain data. Takes 7 arguments: the [empty] noise array, the position, and the * generates a subset of the level's terrain data. Takes 7 arguments: the [empty] noise array, the position, and the
* size. * size.
*/ */
private double[] initializeNoiseField(double[] noiseTable, BigInteger x, int y, BigInteger z, int width, int depth, int height) private double[] initializeNoiseField(double[] par1ArrayOfDouble, BigInteger par2, int par3, BigInteger par4, int par5, int par6, int par7)
{ {
if (noiseTable == null) if (par1ArrayOfDouble == null)
{ {
noiseTable = new double[width * depth * height]; par1ArrayOfDouble = new double[par5 * par6 * par7];
} }
if (this.parabolicField == null) if (this.parabolicField == null)
@ -341,33 +328,33 @@ public class ChunkProviderGenerate implements IChunkProvider
} }
} }
double scaleX = 684.412D; double var44 = 684.412D;
double scaleY = 684.412D; double var45 = 684.412D;
this.noise5 = this.noiseGen5.generateNoiseOctaves(this.noise5, x, z, width, height, 1.121D, 1.121D, 0.5D); this.noise5 = this.noiseGen5.generateNoiseOctaves(this.noise5, par2, par4, par5, par7, 1.121D, 1.121D, 0.5D);
this.noise6 = this.noiseGen6.generateNoiseOctaves(this.noise6, x, z, width, height, 200.0D, 200.0D, 0.5D); this.noise6 = this.noiseGen6.generateNoiseOctaves(this.noise6, par2, par4, par5, par7, 200.0D, 200.0D, 0.5D);
this.noise3 = this.noiseGen3.generateNoiseOctaves(this.noise3, x, y, z, width, depth, height, scaleX / 80.0D, scaleY / 160.0D, scaleX / 80.0D); this.noise3 = this.noiseGen3.generateNoiseOctaves(this.noise3, par2, par3, par4, par5, par6, par7, var44 / 80.0D, var45 / 160.0D, var44 / 80.0D);
this.noise1 = this.noiseGen1.generateNoiseOctaves(this.noise1, x, y, z, width, depth, height, scaleX, scaleY, scaleX); this.noise1 = this.noiseGen1.generateNoiseOctaves(this.noise1, par2, par3, par4, par5, par6, par7, var44, var45, var44);
this.noise2 = this.noiseGen2.generateNoiseOctaves(this.noise2, x, y, z, width, depth, height, scaleX, scaleY, scaleX); this.noise2 = this.noiseGen2.generateNoiseOctaves(this.noise2, par2, par3, par4, par5, par6, par7, var44, var45, var44);
boolean var43 = false; boolean var43 = false;
boolean var42 = false; boolean var42 = false;
int var12 = 0; int var12 = 0;
int var13 = 0; int var13 = 0;
for (int var14 = 0; var14 < width; ++var14) for (int var14 = 0; var14 < par5; ++var14)
{ {
for (int var15 = 0; var15 < height; ++var15) for (int var15 = 0; var15 < par7; ++var15)
{ {
float maxHeight = 0.0F; float var16 = 0.0F;
float minHeight = 0.0F; float var17 = 0.0F;
float var18 = 0.0F; float var18 = 0.0F;
byte var19 = 2; byte var19 = 2;
BiomeGenBase var20 = this.biomesForGeneration[var14 + 2 + (var15 + 2) * (width + 5)]; BiomeGenBase var20 = this.biomesForGeneration[var14 + 2 + (var15 + 2) * (par5 + 5)];
for (int var21 = -var19; var21 <= var19; ++var21) for (int var21 = -var19; var21 <= var19; ++var21)
{ {
for (int var22 = -var19; var22 <= var19; ++var22) for (int var22 = -var19; var22 <= var19; ++var22)
{ {
BiomeGenBase var23 = this.biomesForGeneration[var14 + var21 + 2 + (var15 + var22 + 2) * (width + 5)]; BiomeGenBase var23 = this.biomesForGeneration[var14 + var21 + 2 + (var15 + var22 + 2) * (par5 + 5)];
float var24 = this.parabolicField[var21 + 2 + (var22 + 2) * 5] / (var23.minHeight + 2.0F); float var24 = this.parabolicField[var21 + 2 + (var22 + 2) * 5] / (var23.minHeight + 2.0F);
if (var23.minHeight > var20.minHeight) if (var23.minHeight > var20.minHeight)
@ -375,16 +362,16 @@ public class ChunkProviderGenerate implements IChunkProvider
var24 /= 2.0F; var24 /= 2.0F;
} }
maxHeight += var23.maxHeight * var24; var16 += var23.maxHeight * var24;
minHeight += var23.minHeight * var24; var17 += var23.minHeight * var24;
var18 += var24; var18 += var24;
} }
} }
maxHeight /= var18; var16 /= var18;
minHeight /= var18; var17 /= var18;
maxHeight = maxHeight * 0.9F + 0.1F; var16 = var16 * 0.9F + 0.1F;
minHeight = (minHeight * 4.0F - 1.0F) / 8.0F; var17 = (var17 * 4.0F - 1.0F) / 8.0F;
double var46 = this.noise6[var13] / 8000.0D; double var46 = this.noise6[var13] / 8000.0D;
if (var46 < 0.0D) if (var46 < 0.0D)
@ -418,13 +405,13 @@ public class ChunkProviderGenerate implements IChunkProvider
++var13; ++var13;
for (int var47 = 0; var47 < depth; ++var47) for (int var47 = 0; var47 < par6; ++var47)
{ {
double var48 = (double)minHeight; double var48 = (double)var17;
double var26 = (double)maxHeight; double var26 = (double)var16;
var48 += var46 * 0.2D; var48 += var46 * 0.2D;
var48 = var48 * (double)depth / 16.0D; var48 = var48 * (double)par6 / 16.0D;
double var28 = (double)depth / 2.0D + var48 * 4.0D; double var28 = (double)par6 / 2.0D + var48 * 4.0D;
double var30 = 0.0D; double var30 = 0.0D;
double var32 = ((double)var47 - var28) * 12.0D * 128.0D / 128.0D / var26; double var32 = ((double)var47 - var28) * 12.0D * 128.0D / 128.0D / var26;
@ -452,19 +439,19 @@ public class ChunkProviderGenerate implements IChunkProvider
var30 -= var32; var30 -= var32;
if (var47 > depth - 4) if (var47 > par6 - 4)
{ {
double var40 = (double)((float)(var47 - (depth - 4)) / 3.0F); double var40 = (double)((float)(var47 - (par6 - 4)) / 3.0F);
var30 = var30 * (1.0D - var40) + -10.0D * var40; var30 = var30 * (1.0D - var40) + -10.0D * var40;
} }
noiseTable[var12] = var30; par1ArrayOfDouble[var12] = var30;
++var12; ++var12;
} }
} }
} }
return noiseTable; return par1ArrayOfDouble;
} }
/** /**

10
src/minecraft/net/minecraft/src/Constants.java
Unescape Escape View File

@ -1,7 +1,6 @@
package net.minecraft.src; package net.minecraft.src;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import sun.misc.Unsafe;
public class Constants { public class Constants {
public static boolean DISABLE_MODULO = false, public static boolean DISABLE_MODULO = false,
@ -13,18 +12,9 @@ public class Constants {
public static boolean USE_64BIT_PERLIN_GENERATOR = false; public static boolean USE_64BIT_PERLIN_GENERATOR = false;
static { static {
Unsafe unsafe;
try {
Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
unsafeField.setAccessible(true);
unsafe = (Unsafe) unsafeField.get(null);
} catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
throw new RuntimeException(e);
}
Class<Constants> cls = Constants.class; Class<Constants> cls = Constants.class;
try { try {
for(Field f : cls.getDeclaredFields()) { for(Field f : cls.getDeclaredFields()) {
// unsafe.putBoolean(cls, unsafe.fieldOffset(f), Boolean.getBoolean(cls.getName() + "." + f.getName()));
f.setBoolean(null, Boolean.getBoolean(cls.getName() + "." + f.getName())); f.setBoolean(null, Boolean.getBoolean(cls.getName() + "." + f.getName()));
} }
} catch(Throwable t) { } catch(Throwable t) {

6
src/minecraft/net/minecraft/src/NoiseGeneratorPerlin.java
Unescape Escape View File

@ -2,8 +2,6 @@ package net.minecraft.src;
import java.util.Random; import java.util.Random;
import static net.minecraft.src.Constants.*;
public class NoiseGeneratorPerlin extends NoiseGenerator public class NoiseGeneratorPerlin extends NoiseGenerator
{ {
private int[] permutations; private int[] permutations;
@ -124,7 +122,7 @@ public class NoiseGeneratorPerlin extends NoiseGenerator
var73 = this.lerp(var35, this.grad3d(this.permutations[var66 + 1], var31, 0.0D, var38 - 1.0D), this.grad3d(this.permutations[var22 + 1], var31 - 1.0D, 0.0D, var38 - 1.0D)); var73 = this.lerp(var35, this.grad3d(this.permutations[var66 + 1], var31, 0.0D, var38 - 1.0D), this.grad3d(this.permutations[var22 + 1], var31 - 1.0D, 0.0D, var38 - 1.0D));
double var79 = this.lerp(var42, var70, var73); double var79 = this.lerp(var42, var70, var73);
var10001 = var75++; var10001 = var75++;
par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var79 * var77) : var79 * var77; par1ArrayOfDouble[var10001] += (var79 * var77);
} }
} }
} }
@ -205,7 +203,7 @@ public class NoiseGeneratorPerlin extends NoiseGenerator
double var60 = this.lerp(var56, var33, var35); double var60 = this.lerp(var56, var33, var35);
double var62 = this.lerp(var49, var58, var60); double var62 = this.lerp(var49, var58, var60);
var10001 = var19++; var10001 = var19++;
par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var62 * var20) : var62 * var20; par1ArrayOfDouble[var10001] += (var62 * var20);
} }
} }
} }

6
src/minecraft/net/minecraft/src/NoiseGeneratorPerlin64.java
Unescape Escape View File

@ -2,8 +2,6 @@ package net.minecraft.src;
import java.util.Random; import java.util.Random;
import static net.minecraft.src.Constants.*;
public class NoiseGeneratorPerlin64 extends NoiseGenerator public class NoiseGeneratorPerlin64 extends NoiseGenerator
{ {
private int[] permutations; private int[] permutations;
@ -124,7 +122,7 @@ public class NoiseGeneratorPerlin64 extends NoiseGenerator
var73 = this.lerp(var35, this.grad3d(this.permutations[var66 + 1], var31, 0.0D, var38 - 1.0D), this.grad3d(this.permutations[var22 + 1], var31 - 1.0D, 0.0D, var38 - 1.0D)); var73 = this.lerp(var35, this.grad3d(this.permutations[var66 + 1], var31, 0.0D, var38 - 1.0D), this.grad3d(this.permutations[var22 + 1], var31 - 1.0D, 0.0D, var38 - 1.0D));
double var79 = this.lerp(var42, var70, var73); double var79 = this.lerp(var42, var70, var73);
var10001 = var75++; var10001 = var75++;
par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var79 * var77) : var79 * var77; par1ArrayOfDouble[var10001] += (var79 * var77);
} }
} }
} }
@ -205,7 +203,7 @@ public class NoiseGeneratorPerlin64 extends NoiseGenerator
double var60 = this.lerp(var56, var33, var35); double var60 = this.lerp(var56, var33, var35);
double var62 = this.lerp(var49, var58, var60); double var62 = this.lerp(var49, var58, var60);
var10001 = var19++; var10001 = var19++;
par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var62 * var20) : var62 * var20; par1ArrayOfDouble[var10001] += (var62 * var20);
} }
} }
} }

Write Preview
Loading…
Cancel
Save