From e493825ab7857aa052499ccd8fe1df69e8f55c34 Mon Sep 17 00:00:00 2001 From: dfsek Date: Fri, 30 Apr 2021 09:25:56 -0700 Subject: [PATCH 1/2] bump version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ca6752c10..10619408a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ import com.dfsek.terra.getGitHash -val versionObj = Version("5", "2", "0", true) +val versionObj = Version("5", "2", "1", true) allprojects { version = versionObj From 02870805c7fad00944a4604f509f1b90379cffd7 Mon Sep 17 00:00:00 2001 From: dfsek Date: Fri, 30 Apr 2021 09:35:15 -0700 Subject: [PATCH 2/2] hoist calculations in chunk generator --- .../generation/generators/DefaultChunkGenerator3D.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java b/common/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java index 76501b1a9..01ddbe380 100644 --- a/common/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java +++ b/common/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java @@ -103,9 +103,10 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator { @Override @SuppressWarnings({"try"}) public ChunkData generateChunkData(@NotNull World world, Random random, int chunkX, int chunkZ, ChunkData chunk) { - TerraWorld tw = main.getWorld(world); - BiomeProvider grid = tw.getBiomeProvider(); try(ProfileFrame ignore = main.getProfiler().profile("chunk_base_3d")) { + TerraWorld tw = main.getWorld(world); + BiomeProvider grid = tw.getBiomeProvider(); + if(!tw.isSafe()) return chunk; int xOrig = (chunkX << 4); int zOrig = (chunkZ << 4); @@ -119,7 +120,7 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator { int cx = xOrig + x; int cz = zOrig + z; - TerraBiome b = grid.getBiome(xOrig + x, zOrig + z); + TerraBiome b = grid.getBiome(cx, cz); BiomeTemplate c = ((UserDefinedBiome) b).getConfig(); int sea = c.getSeaLevel();