diff --git a/.gradle/7.4/checksums/checksums.lock b/.gradle/7.4/checksums/checksums.lock index cc94578..45c9f35 100644 Binary files a/.gradle/7.4/checksums/checksums.lock and b/.gradle/7.4/checksums/checksums.lock differ diff --git a/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock index ddd7e7b..b49701e 100644 Binary files a/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock and b/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock differ diff --git a/.gradle/7.4/executionHistory/executionHistory.bin b/.gradle/7.4/executionHistory/executionHistory.bin index 026b01d..0dfa9c3 100644 Binary files a/.gradle/7.4/executionHistory/executionHistory.bin and b/.gradle/7.4/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock index 5e76c28..a87e280 100644 Binary files a/.gradle/7.4/executionHistory/executionHistory.lock and b/.gradle/7.4/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.4/fileHashes/fileHashes.bin b/.gradle/7.4/fileHashes/fileHashes.bin index 7197267..3ee621a 100644 Binary files a/.gradle/7.4/fileHashes/fileHashes.bin and b/.gradle/7.4/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock index aefc606..deb4dcd 100644 Binary files a/.gradle/7.4/fileHashes/fileHashes.lock and b/.gradle/7.4/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.4/fileHashes/resourceHashesCache.bin b/.gradle/7.4/fileHashes/resourceHashesCache.bin index ac72995..ef5f3d7 100644 Binary files a/.gradle/7.4/fileHashes/resourceHashesCache.bin and b/.gradle/7.4/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 3acfc8e..a80a216 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 9482d76..78406f8 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index f38cc82..df60fe6 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/eu/mhsl/minenet/minigames/score/Score.java b/src/main/java/eu/mhsl/minenet/minigames/score/Score.java index 1e9330d..5c6f7e1 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/score/Score.java +++ b/src/main/java/eu/mhsl/minenet/minigames/score/Score.java @@ -73,7 +73,6 @@ public class Score { public List getMapFormatted() { List out = new ArrayList<>(); - int counter = 0; for (Map.Entry entry : getMap().entrySet()) { out.add(entry.getValue() + ": " + entry.getKey().getUsername()); } diff --git a/src/main/java/eu/mhsl/minenet/minigames/world/generator/terrain/SquareTerrainGenerator.java b/src/main/java/eu/mhsl/minenet/minigames/world/generator/terrain/SquareTerrainGenerator.java index e1cb293..d929859 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/world/generator/terrain/SquareTerrainGenerator.java +++ b/src/main/java/eu/mhsl/minenet/minigames/world/generator/terrain/SquareTerrainGenerator.java @@ -11,6 +11,7 @@ import net.minestom.server.instance.generator.GenerationUnit; import net.minestom.server.instance.generator.Generator; import org.jetbrains.annotations.NotNull; +import java.util.Arrays; import java.util.Random; public class SquareTerrainGenerator implements Generator { @@ -21,8 +22,6 @@ public class SquareTerrainGenerator implements Generator { private final boolean generatePlate; - protected final Pos mapStart = new Pos(0, 50, 0); - public SquareTerrainGenerator(int width, int length, boolean generatePlate) { this.width = width; this.length = length; @@ -60,8 +59,6 @@ public class SquareTerrainGenerator implements Generator { for (int z = 0; z < unit.size().z(); z++) { Point bottom = start.add(x, 0, z); - double distance = bottom.distance(new Pos(0, 0, 0)); - if(generatePlate) { if(bottom.x() <= width && bottom.x() >= 0 && bottom.z() <= length && bottom.z() >= 0) { unit.modifier().fill(bottom, bottom.add(1, 50, 1), BlockPallet.GROUND.rnd()); @@ -73,7 +70,14 @@ public class SquareTerrainGenerator implements Generator { synchronized (base) { double baseNoise = base.getNoise(bottom.x(), bottom.z()); - double currentHeight = minTwo(RangeMap.map(distance, 0, 400, -(this.width / 5), 200)) + baseNoise * 8; + double possibleHeights[] = { + minTwo(RangeMap.map(bottom.distance(new Pos(0, 0, 0)), 0, 400, -(this.width / 5), 200)) + baseNoise * 8, + minTwo(RangeMap.map(bottom.distance(new Pos(width, 0, 0)), 0, 400, -(this.width / 5), 200)) + baseNoise * 8, + minTwo(RangeMap.map(bottom.distance(new Pos(0, 0, length)), 0, 400, -(this.width / 5), 200)) + baseNoise * 8, + minTwo(RangeMap.map(bottom.distance(new Pos(width, 0, length)), 0, 400, -(this.width / 5), 200)) + baseNoise * 8 + }; + + double currentHeight = Arrays.stream(possibleHeights).min().getAsDouble(); synchronized (batches) { double elementNoise = batches.getNoise(bottom.x(), bottom.z());