SolDev69
/
1.3.2_128bit
forked from mckuhei/1.3.2_128bit
1
0
Fork 0
Code Pull Requests Activity

Compare commits

base: SolDev69:master
Branches Tags
SolDev69:master
SolDev69:main
SolDev69:stripelands
SolDev69:test
SolDev69:remove-fringelands
mckuhei:master
mckuhei:test
..
compare: SolDev69:remove-fringelands
Branches Tags
SolDev69:master
SolDev69:main
SolDev69:stripelands
SolDev69:test
SolDev69:remove-fringelands
mckuhei:master
mckuhei:test

2 Commits
master ... remove-fri

Author SHA1 Message Date
SolDev69 ff5f14c0c3 Remove fringelands and stone noise 2 years ago
mckuhei 466edac92c What the fuck 2 years ago
5 changed files with 111 additions and 90 deletions
Show Stats

3
readme.md
Unescape Escape View File

@ -1,5 +1,6 @@
![Image](./Image.png) ![Image](http://git.mcmodule.org/mckuhei/1.3.2_128bit/raw/branch/master/Image.png)
Please made it you self :) Please made it you self :)
# End of support # End of support

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

@ -4,6 +4,8 @@ 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. */
@ -96,72 +98,75 @@ public class ChunkProviderGenerate implements IChunkProvider
*/ */
public void generateTerrain(BigInteger par1, BigInteger par2, byte[] par3ArrayOfByte) public void generateTerrain(BigInteger par1, BigInteger par2, byte[] par3ArrayOfByte)
{ {
byte var4 = 4; byte width1 = 4;
byte var5 = 16; byte height1 = 16;
byte var6 = 63; byte seaLevel = 63;
int var7 = var4 + 1; // int var7 = width1 + 1;
byte var8 = 17; byte noiseHeight = 17;
int var9 = var4 + 1; int noiseWidth = width1 + 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)), var7 + 5, var9 + 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)), noiseWidth + 5, noiseWidth + 5);
this.noiseArray = this.initializeNoiseField(this.noiseArray, par1.multiply(BigInteger.valueOf(var4)), 0, par2.multiply(BigInteger.valueOf(var4)), var7, var8, var9); this.noiseArray = this.initializeNoiseField(this.noiseArray, par1.multiply(BigInteger.valueOf(width1)), 0, par2.multiply(BigInteger.valueOf(width1)), noiseWidth, noiseHeight, noiseWidth);
for (int var10 = 0; var10 < var4; ++var10) // Scan blocks...
for (int x1 = 0; x1 < width1; ++x1)
{ {
for (int var11 = 0; var11 < var4; ++var11) for (int z1 = 0; z1 < width1; ++z1)
{ {
for (int var12 = 0; var12 < var5; ++var12) for (int y1 = 0; y1 < height1; ++y1)
{ {
double var13 = 0.125D; // Who is faster? Is LOAD faster or LDC faster?
double var15 = this.noiseArray[((var10 + 0) * var9 + var11 + 0) * var8 + var12 + 0]; double step8 = 0.125D;
double var17 = this.noiseArray[((var10 + 0) * var9 + var11 + 1) * var8 + var12 + 0]; // Evil gradient variables.
double var19 = this.noiseArray[((var10 + 1) * var9 + var11 + 0) * var8 + var12 + 0]; double AA = this.noiseArray[((x1 + 0) * noiseWidth + z1 + 0) * noiseHeight + y1 + 0];
double var21 = this.noiseArray[((var10 + 1) * var9 + var11 + 1) * var8 + var12 + 0]; double BB = this.noiseArray[((x1 + 0) * noiseWidth + z1 + 1) * noiseHeight + y1 + 0];
double var23 = (this.noiseArray[((var10 + 0) * var9 + var11 + 0) * var8 + var12 + 1] - var15) * var13; double CC = this.noiseArray[((x1 + 1) * noiseWidth + z1 + 0) * noiseHeight + y1 + 0];
double var25 = (this.noiseArray[((var10 + 0) * var9 + var11 + 1) * var8 + var12 + 1] - var17) * var13; double DD = this.noiseArray[((x1 + 1) * noiseWidth + z1 + 1) * noiseHeight + y1 + 0];
double var27 = (this.noiseArray[((var10 + 1) * var9 + var11 + 0) * var8 + var12 + 1] - var19) * var13; double stepAA = (this.noiseArray[((x1 + 0) * noiseWidth + z1 + 0) * noiseHeight + y1 + 1] - AA) * step8; // Use 0.125D instead of step8 may faster???
double var29 = (this.noiseArray[((var10 + 1) * var9 + var11 + 1) * var8 + var12 + 1] - var21) * var13; double stepBB = (this.noiseArray[((x1 + 0) * noiseWidth + z1 + 1) * noiseHeight + y1 + 1] - BB) * step8;
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 var32 = 0.25D; double step4 = 0.25D;
double var34 = var15; double EE = AA;
double var36 = var17; double FF = BB;
double var38 = (var19 - var15) * var32; double stepEE = (CC - AA) * step4;
double var40 = (var21 - var17) * var32; double stepFF = (DD - BB) * step4;
for (int var42 = 0; var42 < 4; ++var42) for (int x2 = 0; x2 < 4; ++x2)
{ {
int var43 = var42 + var10 * 4 << 11 | 0 + var11 * 4 << 7 | var12 * 8 + var31; int xzy = x2 + x1 * 4 << 11 | 0 + z1 * 4 << 7 | y1 * 8 + y2;
short var44 = 128; short height = 128;
var43 -= var44; xzy -= height;
double var45 = 0.25D; // double var45 = 0.25D;
double var49 = (var36 - var34) * var45; double stepGG = (FF - EE) * step4;
double var47 = var34 - var49; double GG = EE - stepGG;
for (int var51 = 0; var51 < 4; ++var51) for (int z2 = 0; z2 < 4; ++z2)
{ {
if ((var47 += var49) > 0.0D) if ((GG += stepGG) > 0.0D)
{ {
par3ArrayOfByte[var43 += var44] = (byte)Block.stone.blockID; par3ArrayOfByte[var43 += var44] = (byte)Block.stone.blockID;
} }
else if (var12 * 8 + var31 < var6) else if (y1 * 8 + y2 < seaLevel)
{ {
par3ArrayOfByte[var43 += var44] = (byte)Block.waterStill.blockID; par3ArrayOfByte[xzy += height] = (byte)Block.waterStill.blockID;
} }
else else
{ {
par3ArrayOfByte[var43 += var44] = 0; par3ArrayOfByte[xzy += height] = 0;
} }
} }
var34 += var38; EE += stepEE;
var36 += var40; FF += stepFF;
} }
var15 += var23; AA += stepAA;
var17 += var25; BB += stepBB;
var19 += var27; CC += stepCC;
var21 += var29; DD += stepDD;
} }
} }
} }
@ -176,7 +181,8 @@ public class ChunkProviderGenerate implements IChunkProvider
byte var5 = 63; byte var5 = 63;
double var6 = 0.03125D; double var6 = 0.03125D;
// X, Y, 0 -> X. 0, Y // 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); // Disabled for now
this.stoneNoise = this.noiseGen4.generateNoiseOctaves(this.stoneNoise, BigInteger.ZERO, BigInteger.ZERO, BigInteger.ZERO, 16, 1, 16, var6 * 2.0D, var6 * 2.0D, var6 * 2.0D);
for (int var8 = 0; var8 < 16; ++var8) for (int var8 = 0; var8 < 16; ++var8)
{ {
@ -191,15 +197,15 @@ public class ChunkProviderGenerate implements IChunkProvider
for (int var16 = 127; var16 >= 0; --var16) for (int var16 = 127; var16 >= 0; --var16)
{ {
int var17 = (var9 * 16 + var8) * 128 + var16; int xzy = (var9 * 16 + var8) * 128 + var16;
if (var16 <= 0 + this.rand.nextInt(5)) if (var16 <= 0 + this.rand.nextInt(5))
{ {
par3ArrayOfByte[var17] = (byte)Block.bedrock.blockID; par3ArrayOfByte[xzy] = (byte)Block.bedrock.blockID;
} }
else else
{ {
byte var18 = par3ArrayOfByte[var17]; byte var18 = par3ArrayOfByte[xzy];
if (var18 == 0) if (var18 == 0)
{ {
@ -236,17 +242,17 @@ public class ChunkProviderGenerate implements IChunkProvider
if (var16 >= var5 - 1) if (var16 >= var5 - 1)
{ {
par3ArrayOfByte[var17] = var14; par3ArrayOfByte[xzy] = var14;
} }
else else
{ {
par3ArrayOfByte[var17] = var15; par3ArrayOfByte[xzy] = var15;
} }
} }
else if (var13 > 0) else if (var13 > 0)
{ {
--var13; --var13;
par3ArrayOfByte[var17] = var15; par3ArrayOfByte[xzy] = var15;
if (var13 == 0 && var15 == Block.sand.blockID) if (var13 == 0 && var15 == Block.sand.blockID)
{ {
@ -307,11 +313,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[] par1ArrayOfDouble, BigInteger par2, int par3, BigInteger par4, int par5, int par6, int par7) private double[] initializeNoiseField(double[] noiseTable, BigInteger x, int y, BigInteger z, int width, int depth, int height)
{ {
if (par1ArrayOfDouble == null) if (noiseTable == null)
{ {
par1ArrayOfDouble = new double[par5 * par6 * par7]; noiseTable = new double[width * depth * height];
} }
if (this.parabolicField == null) if (this.parabolicField == null)
@ -328,33 +334,33 @@ public class ChunkProviderGenerate implements IChunkProvider
} }
} }
double var44 = 684.412D; double scaleX = 684.412D;
double var45 = 684.412D; double scaleY = 684.412D;
this.noise5 = this.noiseGen5.generateNoiseOctaves(this.noise5, par2, par4, par5, par7, 1.121D, 1.121D, 0.5D); this.noise5 = this.noiseGen5.generateNoiseOctaves(this.noise5, x, z, width, height, 1.121D, 1.121D, 0.5D);
this.noise6 = this.noiseGen6.generateNoiseOctaves(this.noise6, par2, par4, par5, par7, 200.0D, 200.0D, 0.5D); this.noise6 = this.noiseGen6.generateNoiseOctaves(this.noise6, x, z, width, height, 200.0D, 200.0D, 0.5D);
this.noise3 = this.noiseGen3.generateNoiseOctaves(this.noise3, par2, par3, par4, par5, par6, par7, var44 / 80.0D, var45 / 160.0D, var44 / 80.0D); this.noise3 = this.noiseGen3.generateNoiseOctaves(this.noise3, x, y, z, width, depth, height, scaleX / 80.0D, scaleY / 160.0D, scaleX / 80.0D);
this.noise1 = this.noiseGen1.generateNoiseOctaves(this.noise1, par2, par3, par4, par5, par6, par7, var44, var45, var44); this.noise1 = this.noiseGen1.generateNoiseOctaves(this.noise1, 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); this.noise2 = this.noiseGen2.generateNoiseOctaves(this.noise2, x, y, z, width, depth, height, scaleX, scaleY, scaleX);
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 < par5; ++var14) for (int var14 = 0; var14 < width; ++var14)
{ {
for (int var15 = 0; var15 < par7; ++var15) for (int var15 = 0; var15 < height; ++var15)
{ {
float var16 = 0.0F; float maxHeight = 0.0F;
float var17 = 0.0F; float minHeight = 0.0F;
float var18 = 0.0F; float var18 = 0.0F;
byte var19 = 2; byte var19 = 2;
BiomeGenBase var20 = this.biomesForGeneration[var14 + 2 + (var15 + 2) * (par5 + 5)]; BiomeGenBase var20 = this.biomesForGeneration[var14 + 2 + (var15 + 2) * (width + 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) * (par5 + 5)]; BiomeGenBase var23 = this.biomesForGeneration[var14 + var21 + 2 + (var15 + var22 + 2) * (width + 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)
@ -362,16 +368,16 @@ public class ChunkProviderGenerate implements IChunkProvider
var24 /= 2.0F; var24 /= 2.0F;
} }
var16 += var23.maxHeight * var24; maxHeight += var23.maxHeight * var24;
var17 += var23.minHeight * var24; minHeight += var23.minHeight * var24;
var18 += var24; var18 += var24;
} }
} }
var16 /= var18; maxHeight /= var18;
var17 /= var18; minHeight /= var18;
var16 = var16 * 0.9F + 0.1F; maxHeight = maxHeight * 0.9F + 0.1F;
var17 = (var17 * 4.0F - 1.0F) / 8.0F; minHeight = (minHeight * 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)
@ -405,13 +411,13 @@ public class ChunkProviderGenerate implements IChunkProvider
++var13; ++var13;
for (int var47 = 0; var47 < par6; ++var47) for (int var47 = 0; var47 < depth; ++var47)
{ {
double var48 = (double)var17; double var48 = (double)minHeight;
double var26 = (double)var16; double var26 = (double)maxHeight;
var48 += var46 * 0.2D; var48 += var46 * 0.2D;
var48 = var48 * (double)par6 / 16.0D; var48 = var48 * (double)depth / 16.0D;
double var28 = (double)par6 / 2.0D + var48 * 4.0D; double var28 = (double)depth / 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;
@ -439,19 +445,19 @@ public class ChunkProviderGenerate implements IChunkProvider
var30 -= var32; var30 -= var32;
if (var47 > par6 - 4) if (var47 > depth - 4)
{ {
double var40 = (double)((float)(var47 - (par6 - 4)) / 3.0F); double var40 = (double)((float)(var47 - (depth - 4)) / 3.0F);
var30 = var30 * (1.0D - var40) + -10.0D * var40; var30 = var30 * (1.0D - var40) + -10.0D * var40;
} }
par1ArrayOfDouble[var12] = var30; noiseTable[var12] = var30;
++var12; ++var12;
} }
} }
} }
return par1ArrayOfDouble; return noiseTable;
} }
/** /**

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

@ -1,6 +1,7 @@
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,
@ -12,9 +13,18 @@ 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,6 +2,8 @@ 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;
@ -122,7 +124,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] += (var79 * var77); par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var79 * var77) : var79 * var77;
} }
} }
} }
@ -203,7 +205,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] += (var62 * var20); par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var62 * var20) : var62 * var20;
} }
} }
} }

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

@ -2,6 +2,8 @@ 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;
@ -122,7 +124,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] += (var79 * var77); par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var79 * var77) : var79 * var77;
} }
} }
} }
@ -203,7 +205,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] += (var62 * var20); par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var62 * var20) : var62 * var20;
} }
} }
} }

Write Preview
Loading…
Cancel
Save