From 6291c799cf9bc5d468fd9bc63f4ccbefb2ebc25d Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sat, 11 Nov 2023 12:17:25 +0900
Subject: [PATCH] fix: tile randomiser breaks on world seam again

---
 .../modulebasegame/worldgenerator/OregenAutotiling.kt       | 5 ++++-
 .../terrarum/modulebasegame/worldgenerator/Treegen.kt       | 6 ++++++
 src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt        | 5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 src/net/torvald/terrarum/modulebasegame/worldgenerator/Treegen.kt

diff --git a/src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt b/src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt
index 4363ca39e..f6fd80ea9 100644
--- a/src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt
+++ b/src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt
@@ -34,7 +34,10 @@ class OregenAutotiling(world: GameWorld, seed: Long, val tilingModes: HashMap<It
         Worldgen.threadExecutor.join()
     }
 
-    private fun getHashCoord(x: Int, y: Int, mod: Int) = (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), ((x*16777619) xor (y+1073)).toLong()) fmod mod.toLong()).toInt()
+    private fun getHashCoord(x: Int, y: Int, mod: Int): Int {
+        val (x, y) = world.coerceXY(x, y)
+        return (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), ((x*16777619) xor (y+1073)).toLong()) fmod mod.toLong()).toInt()
+    }
 
     private fun draw(x: Int) {
         for (y in 0 until world.height) {
diff --git a/src/net/torvald/terrarum/modulebasegame/worldgenerator/Treegen.kt b/src/net/torvald/terrarum/modulebasegame/worldgenerator/Treegen.kt
new file mode 100644
index 000000000..a8b167612
--- /dev/null
+++ b/src/net/torvald/terrarum/modulebasegame/worldgenerator/Treegen.kt
@@ -0,0 +1,6 @@
+package net.torvald.terrarum.modulebasegame.worldgenerator
+
+/**
+ * Created by minjaesong on 2023-11-10.
+ */class Treegen {
+}
\ No newline at end of file
diff --git a/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt b/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
index 2d374c4a0..5a89337e9 100644
--- a/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
+++ b/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
@@ -307,7 +307,10 @@ internal object BlocksDrawer {
     }
 
 
-    private fun getHashCoord(x: Int, y: Int, mod: Int, layer: Int) = (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), ((x*16777619) xor (y+1+layer)).toLong()) fmod mod.toLong()).toInt()
+    private fun getHashCoord(x: Int, y: Int, mod: Int, layer: Int): Int {
+        val (x, y) = world.coerceXY(x, y)
+        return (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), ((x*16777619) xor (y+1+layer)).toLong()) fmod mod.toLong()).toInt()
+    }
 
     /**
      * Autotiling; writes to buffer. Actual draw code must be called after this operation.