aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java')
-rw-r--r--src/Java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java162
1 files changed, 68 insertions, 94 deletions
diff --git a/src/Java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java b/src/Java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java
index 4455c81317..160e734bb7 100644
--- a/src/Java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java
+++ b/src/Java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java
@@ -10,58 +10,54 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.gen.MapGenRavine;
-public class MapGenLargeRavine extends MapGenRavine
-{
+public class MapGenLargeRavine extends MapGenRavine {
private float[] field_75046_d = new float[1024];
@Override
- protected void func_151540_a(long aSeed, int var1, int var2, Block[] aBlocksInChunkOrPassedIn, double p_151540_6_, double p_151540_8_, double p_151540_10_, float p_151540_12_, float p_151540_13_, float p_151540_14_, int possibleCurrentY, int possibleMaxY, double p_151540_17_)
- {
- //Logger.INFO("Generating Large Ravine.");
+ protected void func_151540_a(long aSeed, int var1, int var2, Block[] aBlocksInChunkOrPassedIn, double p_151540_6_,
+ double p_151540_8_, double p_151540_10_, float p_151540_12_, float p_151540_13_, float p_151540_14_,
+ int possibleCurrentY, int possibleMaxY, double p_151540_17_) {
Random random = CORE.RANDOM;
+ //gtPlusPlus.api.objects.Logger.WORLD("Generating Large Ravine. 1");
this.range *= 2;
- double d4 = (double)(var1 * 24 + 16);
- double d5 = (double)(var2 * 24 + 16);
+ double d4 = (double) (var1 * 24 + 16);
+ double d5 = (double) (var2 * 24 + 16);
float f3 = 0.0F;
float f4 = 0.0F;
- if (possibleMaxY <= 25)
- {
+ if (possibleMaxY <= 25) {
int j1 = Math.min(this.range * 16 - 32, 200);
possibleMaxY = j1 - random.nextInt(j1 / 4);
}
boolean possibleIsUnderGroundFlag = false;
- if (possibleCurrentY <= -1)
- {
+ if (possibleCurrentY <= -1) {
possibleCurrentY = possibleMaxY / 3;
possibleIsUnderGroundFlag = true;
}
float f5 = 1.0F;
- for (int k1 = 0; k1 < 256; ++k1)
- {
- if (k1 == 0 || random.nextInt(3) == 0)
- {
+ for (int k1 = 0; k1 < 256; ++k1) {
+ if (k1 == 0 || random.nextInt(3) == 0) {
f5 = 1.0F + random.nextFloat() * random.nextFloat() * 1.0F;
}
this.field_75046_d[k1] = f5 * f5;
}
- for (; possibleCurrentY < possibleMaxY; ++possibleCurrentY)
- {
- double d12 = 3.5D + (double)(MathHelper.sin((float)possibleCurrentY * CORE.PI / (float)possibleMaxY) * p_151540_12_ * 1.0F);
+ for (; possibleCurrentY < possibleMaxY; ++possibleCurrentY) {
+ double d12 = 3.5D + (double) (MathHelper.sin((float) possibleCurrentY * CORE.PI / (float) possibleMaxY)
+ * p_151540_12_ * 1.0F);
double d6 = d12 * p_151540_17_;
- d12 *= (double)random.nextFloat() * 0.55D + 0.75D;
- d6 *= (double)random.nextFloat() * 0.55D + 0.75D;
+ d12 *= (double) random.nextFloat() * 0.55D + 0.75D;
+ d6 *= (double) random.nextFloat() * 0.55D + 0.75D;
float f6 = MathHelper.cos(p_151540_14_);
float f7 = MathHelper.sin(p_151540_14_);
- p_151540_6_ += (double)(MathHelper.cos(p_151540_13_) * f6);
- p_151540_8_ += (double)f7;
- p_151540_10_ += (double)(MathHelper.sin(p_151540_13_) * f6);
+ p_151540_6_ += (double) (MathHelper.cos(p_151540_13_) * f6);
+ p_151540_8_ += (double) f7;
+ p_151540_10_ += (double) (MathHelper.sin(p_151540_13_) * f6);
p_151540_14_ *= 1.7F;
p_151540_14_ += f4 * 0.25F;
p_151540_13_ += f3 * 0.25F;
@@ -70,20 +66,18 @@ public class MapGenLargeRavine extends MapGenRavine
f4 += (random.nextFloat() - random.nextFloat()) * random.nextFloat() * 2.0F;
f3 += (random.nextFloat() - random.nextFloat()) * random.nextFloat() * 4.0F;
- if (possibleIsUnderGroundFlag || random.nextInt(4) != 0)
- {
+ if (possibleIsUnderGroundFlag || random.nextInt(4) != 0) {
double d7 = p_151540_6_ - d4;
double d8 = p_151540_10_ - d5;
- double d9 = (double)(possibleMaxY - possibleCurrentY);
- double d10 = (double)(p_151540_12_ + 2.0F + 16.0F);
+ double d9 = (double) (possibleMaxY - possibleCurrentY);
+ double d10 = (double) (p_151540_12_ + 2.0F + 16.0F);
- if (d7 * d7 + d8 * d8 - d9 * d9 > d10 * d10)
- {
+ if (d7 * d7 + d8 * d8 - d9 * d9 > d10 * d10) {
return;
}
- if (p_151540_6_ >= d4 - 16.0D - d12 * 2.0D && p_151540_10_ >= d5 - 16.0D - d12 * 2.0D && p_151540_6_ <= d4 + 16.0D + d12 * 2.0D && p_151540_10_ <= d5 + 16.0D + d12 * 2.0D)
- {
+ if (p_151540_6_ >= d4 - 16.0D - d12 * 2.0D && p_151540_10_ >= d5 - 16.0D - d12 * 2.0D
+ && p_151540_6_ <= d4 + 16.0D + d12 * 2.0D && p_151540_10_ <= d5 + 16.0D + d12 * 2.0D) {
int i4 = MathHelper.floor_double(p_151540_6_ - d12) - var1 * 16 - 1;
int l1 = MathHelper.floor_double(p_151540_6_ + d12) - var1 * 16 + 1;
int j4 = MathHelper.floor_double(p_151540_8_ - d6) - 1;
@@ -91,33 +85,27 @@ public class MapGenLargeRavine extends MapGenRavine
int k4 = MathHelper.floor_double(p_151540_10_ - d12) - var2 * 16 - 1;
int j2 = MathHelper.floor_double(p_151540_10_ + d12) - var2 * 16 + 1;
- if (i4 < 0)
- {
+ if (i4 < 0) {
i4 = 0;
}
- if (l1 > 16)
- {
+ if (l1 > 16) {
l1 = 16;
}
- if (j4 < 1)
- {
+ if (j4 < 1) {
j4 = 1;
}
- if (i2 > 248)
- {
+ if (i2 > 248) {
i2 = 248;
}
- if (k4 < 0)
- {
+ if (k4 < 0) {
k4 = 0;
}
- if (j2 > 16)
- {
+ if (j2 > 16) {
j2 = 16;
}
@@ -125,25 +113,19 @@ public class MapGenLargeRavine extends MapGenRavine
int k2;
int j3;
- for (k2 = i4; !flag2 && k2 < l1; ++k2)
- {
- for (int l2 = k4; !flag2 && l2 < j2; ++l2)
- {
- for (int i3 = i2 + 1; !flag2 && i3 >= j4 - 1; --i3)
- {
+ for (k2 = i4; !flag2 && k2 < l1; ++k2) {
+ for (int l2 = k4; !flag2 && l2 < j2; ++l2) {
+ for (int i3 = i2 + 1; !flag2 && i3 >= j4 - 1; --i3) {
j3 = (k2 * 16 + l2) * 256 + i3;
- if (i3 >= 0 && i3 < 256)
- {
+ if (i3 >= 0 && i3 < 256) {
Block block = aBlocksInChunkOrPassedIn[j3];
- if (isOceanBlock(aBlocksInChunkOrPassedIn, j3, k2, i3, l2, var1, var2))
- {
+ if (isOceanBlock(aBlocksInChunkOrPassedIn, j3, k2, i3, l2, var1, var2)) {
flag2 = true;
}
- if (i3 != j4 - 1 && k2 != i4 && k2 != l1 - 1 && l2 != k4 && l2 != j2 - 1)
- {
+ if (i3 != j4 - 1 && k2 != i4 && k2 != l1 - 1 && l2 != k4 && l2 != j2 - 1) {
i3 = j4;
}
}
@@ -151,33 +133,28 @@ public class MapGenLargeRavine extends MapGenRavine
}
}
- if (!flag2)
- {
- for (k2 = i4; k2 < l1; ++k2)
- {
- double d13 = ((double)(k2 + var1 * 16) + 0.5D - p_151540_6_) / d12;
+ if (!flag2) {
+ for (k2 = i4; k2 < l1; ++k2) {
+ double d13 = ((double) (k2 + var1 * 16) + 0.5D - p_151540_6_) / d12;
- for (j3 = k4; j3 < j2; ++j3)
- {
- double d14 = ((double)(j3 + var2 * 16) + 0.5D - p_151540_10_) / d12;
+ for (j3 = k4; j3 < j2; ++j3) {
+ double d14 = ((double) (j3 + var2 * 16) + 0.5D - p_151540_10_) / d12;
int k3 = (k2 * 16 + j3) * 256 + i2;
boolean flag = false;
- if (d13 * d13 + d14 * d14 < 1.0D)
- {
- for (int l3 = i2 - 1; l3 >= j4; --l3)
- {
- double d11 = ((double)l3 + 0.5D - p_151540_8_) / d6;
+ if (d13 * d13 + d14 * d14 < 1.0D) {
+ for (int l3 = i2 - 1; l3 >= j4; --l3) {
+ double d11 = ((double) l3 + 0.5D - p_151540_8_) / d6;
- if ((d13 * d13 + d14 * d14) * (double)this.field_75046_d[l3] + d11 * d11 / 6.0D < 1.0D)
- {
+ if ((d13 * d13 + d14 * d14) * (double) this.field_75046_d[l3]
+ + d11 * d11 / 6.0D < 1.0D) {
Block block1 = aBlocksInChunkOrPassedIn[k3];
- if (checkIfTopBlock(aBlocksInChunkOrPassedIn, k3, k2, l3, j3, var1, var2))
- {
+ if (checkIfTopBlock(aBlocksInChunkOrPassedIn, k3, k2, l3, j3, var1, var2)) {
flag = true;
}
+ gtPlusPlus.api.objects.Logger.WORLD("Generating Large Ravine. 2");
digBlock(aBlocksInChunkOrPassedIn, k3, k2, l3, j3, var1, var2, flag);
}
@@ -187,8 +164,7 @@ public class MapGenLargeRavine extends MapGenRavine
}
}
- if (possibleIsUnderGroundFlag)
- {
+ if (possibleIsUnderGroundFlag) {
break;
}
}
@@ -197,21 +173,18 @@ public class MapGenLargeRavine extends MapGenRavine
}
}
-
- //generate?
- @Override
- protected void func_151538_a(World p_151538_1_, int p_151538_2_, int p_151538_3_, int chunkX, int chunkZ, Block[] blocks)
- {
- if (this.rand.nextInt(50) == 0)
- {
- double d0 = (double)(p_151538_2_ * 16 + this.rand.nextInt(16));
- double d1 = (double)(this.rand.nextInt(this.rand.nextInt(40) + 8) + 20);
- double d2 = (double)(p_151538_3_ * 16 + this.rand.nextInt(16));
+ // generate?
+ @Override
+ protected void func_151538_a(World p_151538_1_, int p_151538_2_, int p_151538_3_, int chunkX, int chunkZ,
+ Block[] blocks) {
+ if (this.rand.nextInt(50) == 0) {
+ double d0 = (double) (p_151538_2_ * 16 + this.rand.nextInt(16));
+ double d1 = (double) (this.rand.nextInt(this.rand.nextInt(40) + 8) + 20);
+ double d2 = (double) (p_151538_3_ * 16 + this.rand.nextInt(16));
byte b0 = 1;
- for (int i1 = 0; i1 < b0; ++i1)
- {
- float f = this.rand.nextFloat() * (float)Math.PI * 2.0F;
+ for (int i1 = 0; i1 < b0; ++i1) {
+ float f = this.rand.nextFloat() * (float) Math.PI * 2.0F;
float f1 = (this.rand.nextFloat() - 0.5F) * 2.0F / 8.0F;
float f2 = (this.rand.nextFloat() * 2.0F + this.rand.nextFloat()) * 2.0F;
this.func_151540_a(this.rand.nextLong(), chunkX, chunkZ, blocks, d0, d1, d2, f2, f, f1, 0, 0, 3.0D);
@@ -221,20 +194,21 @@ public class MapGenLargeRavine extends MapGenRavine
private static Method isTopBlock;
- //Determine if the block at the specified location is the top block for the biome, we take into account
- private synchronized boolean checkIfTopBlock(Block[] data, int index, int x, int y, int z, int chunkX, int chunkZ){
+ // Determine if the block at the specified location is the top block for the
+ // biome, we take into account
+ private synchronized boolean checkIfTopBlock(Block[] data, int index, int x, int y, int z, int chunkX, int chunkZ) {
try {
if (isTopBlock == null) {
- isTopBlock = MapGenRavine.class.getDeclaredMethod("isTopBlock", Block[].class, int.class, int.class, int.class, int.class, int.class, int.class);
+ isTopBlock = MapGenRavine.class.getDeclaredMethod("isTopBlock", Block[].class, int.class, int.class,
+ int.class, int.class, int.class, int.class);
}
if (isTopBlock != null) {
return (boolean) isTopBlock.invoke(this, data, index, x, y, z, chunkX, chunkZ);
- }
- else {
+ } else {
return false;
}
- }
- catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException n) {
+ } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException n) {
return false;
}
}
generated by cgit (git 2.46.0) at 2025-03-10 00:05:55 +0000