MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

A little refactoring

Browse source
This commit is contained in:
Aleksey 2021-01-12 11:30:31 +03:00
parent a2d7a5f7c8
commit 0ffbb1c8f2
2 changed files with 75 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/ru/betterend/util/MHelper.java
View file

@ -161,6 +161,14 @@ public class MHelper {
return i * i; return i * i;
} }
public static float pow2(float f) {
return f * f;
}
public static double pow2(double d) {
return d * d;
}
public static int fromHSBtoRGB(float hue, float saturation, float brightness) { public static int fromHSBtoRGB(float hue, float saturation, float brightness) {
int red = 0; int red = 0;
int green = 0; int green = 0;

14
src/main/java/ru/betterend/world/structures/piece/LakePiece.java
View file

@ -48,7 +48,7 @@ public class LakePiece extends BasePiece {
this.center = center; this.center = center;
this.radius = radius; this.radius = radius;
this.depth = depth; this.depth = depth;
this.r2 = radius * radius; this.r2 = MHelper.pow2(radius);
this.seed1 = random.nextInt(); this.seed1 = random.nextInt();
this.seed2 = random.nextInt(); this.seed2 = random.nextInt();
this.noise1 = new OpenSimplexNoise(this.seed1); this.noise1 = new OpenSimplexNoise(this.seed1);
@ -77,7 +77,7 @@ public class LakePiece extends BasePiece {
center = NbtHelper.toBlockPos(tag.getCompound("center")); center = NbtHelper.toBlockPos(tag.getCompound("center"));
radius = tag.getFloat("radius"); radius = tag.getFloat("radius");
depth = tag.getFloat("depth"); depth = tag.getFloat("depth");
r2 = radius * radius; r2 = MHelper.pow2(radius);
seed1 = tag.getInt("seed1"); seed1 = tag.getInt("seed1");
seed2 = tag.getInt("seed2"); seed2 = tag.getInt("seed2");
noise1 = new OpenSimplexNoise(seed1); noise1 = new OpenSimplexNoise(seed1);
@ -94,15 +94,14 @@ public class LakePiece extends BasePiece {
Heightmap map = chunk.getHeightmap(Type.WORLD_SURFACE_WG); Heightmap map = chunk.getHeightmap(Type.WORLD_SURFACE_WG);
for (int x = 0; x < 16; x++) { for (int x = 0; x < 16; x++) {
int px = x + sx; int px = x + sx;
int px2 = px - center.getX(); int px2 = MHelper.pow2(px - center.getX());
px2 *= px2;
pos.setX(x); pos.setX(x);
for (int z = 0; z < 16; z++) { for (int z = 0; z < 16; z++) {
int pz = z + sz; int pz = z + sz;
int pz2 = pz - center.getZ(); int pz2 = MHelper.pow2(pz - center.getZ());
pz2 *= pz2;
float dist = px2 + pz2; float dist = px2 + pz2;
if (dist < r2) { if (dist > r2) continue;
pos.setZ(z); pos.setZ(z);
dist = 1 - dist / r2; dist = 1 - dist / r2;
int maxY = map.get(x, z); int maxY = map.get(x, z);
@ -176,7 +175,6 @@ public class LakePiece extends BasePiece {
} }
} }
} }
}
map = chunk.getHeightmap(Type.WORLD_SURFACE); map = chunk.getHeightmap(Type.WORLD_SURFACE);