From 79ffaf629441448ffea5c3d42032ce3ccd639cec Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sat, 4 Nov 2023 19:21:12 +0900
Subject: [PATCH] ore autotiling and tile randomiser to use BlockAddr

---
 .../modulebasegame/worldgenerator/OregenAutotiling.kt |  4 ++--
 src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt  | 11 ++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt b/src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt
index f62b7433b..243821401 100644
--- a/src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt
+++ b/src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt
@@ -9,6 +9,7 @@ import net.torvald.terrarum.gameitems.isOre
 import net.torvald.terrarum.gameworld.GameWorld
 import net.torvald.terrarum.gameworld.fmod
 import net.torvald.terrarum.modulebasegame.TerrarumIngame
+import net.torvald.terrarum.realestate.LandUtil
 import net.torvald.terrarum.serialise.toBig64
 import net.torvald.terrarum.toInt
 import net.torvald.terrarum.utils.OrePlacement
@@ -33,8 +34,7 @@ class OregenAutotiling(world: GameWorld, seed: Long, val tilingModes: HashMap<It
         Worldgen.threadExecutor.join()
     }
 
-    private fun getHashCoord(x: Int, y: Int, mod: Int) =
-        (XXHash64.hash((y.toLong().shl(32) or x.toLong().and(0xFFFFFFFF)).toBig64(), mod.toLong()).and(0x7FFFFFFFFFFFFFFFL) % mod).toInt()
+    private fun getHashCoord(x: Int, y: Int, mod: Int) = (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), mod.toLong()) fmod mod.toLong()).toInt()
 
     private fun draw(x: Int) {
         for (y in 0 until world.height) {
diff --git a/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt b/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
index a3ecbd401..5ad0fa282 100644
--- a/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
+++ b/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
@@ -16,6 +16,7 @@ import net.torvald.terrarum.gamecontroller.KeyToggler
 import net.torvald.terrarum.gameitems.ItemID
 import net.torvald.terrarum.gameworld.GameWorld
 import net.torvald.terrarum.gameworld.fmod
+import net.torvald.terrarum.realestate.LandUtil
 import net.torvald.terrarum.serialise.toBig64
 import net.torvald.terrarum.worlddrawer.CreateTileAtlas.Companion.WALL_OVERLAY_COLOUR
 import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
@@ -306,15 +307,7 @@ internal object BlocksDrawer {
     }
 
 
-    private fun getHashCoord(x: Int, y: Int, mod: Int) =
-        (XXHash64.hash(
-                (
-                        y.fmod(world.height).toLong().shl(32) or
-                        x.fmod(world.width).toLong().and(0xFFFFFFFF)
-                ).toBig64(), mod.toLong()
-            ).and(0x7FFFFFFFFFFFFFFFL) % mod
-        ).toInt()
-
+    private fun getHashCoord(x: Int, y: Int, mod: Int) = (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), mod.toLong()) fmod mod.toLong()).toInt()
 
     /**
      * Autotiling; writes to buffer. Actual draw code must be called after this operation.