From eec61c92581e06c9ad66e24cc45ad7103ebab612 Mon Sep 17 00:00:00 2001
From: Sen <sen@sen.gay>
Date: Wed, 23 Jul 2025 00:59:37 +0200
Subject: [PATCH] biome rework test 2

---
 client/src/main/java/client/Client.java                     | 2 +-
 common/src/main/java/common/item/tool/ItemScanner.java      | 5 +++--
 common/src/main/java/common/world/AWorldServer.java         | 2 ++
 server/src/main/java/server/world/WorldServer.java          | 2 +-
 server/src/main/java/server/worldgen/ReplacerAltSimple.java | 2 +-
 server/src/main/java/server/worldgen/ReplacerTerranian.java | 4 ++--
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java
index 4930e5f7..172dd0b7 100755
--- a/client/src/main/java/client/Client.java
+++ b/client/src/main/java/client/Client.java
@@ -1723,7 +1723,7 @@ public class Client implements IThreadListener {
 		String lline;
 		if(this.world.isBlockLoaded(blockpos)) {
 			ChunkClient chunk = this.world.getChunk(blockpos);
-			bline = String.format("Biom: %.2f K, N: %.2f K, D: %s (%s)", 0.0f, 0.0f,
+			bline = String.format("Biom: %.2f K, N: %.2f K, D: %s (%s)", chunk.getTemperature(blockpos), chunk.getOffset(blockpos),
 					TextColor.stripCodes(this.world.dimension.getDisplay()),
 					this.dimensionName == null ? UniverseRegistry.getName(this.world.dimension) : this.dimensionName);
 			lline = "Licht: " + chunk.getLightSub(blockpos, 0) + " (" + chunk.getLight(LightType.SKY, blockpos) + " Himmel, "
diff --git a/common/src/main/java/common/item/tool/ItemScanner.java b/common/src/main/java/common/item/tool/ItemScanner.java
index 58bc51ed..eadcdcfa 100755
--- a/common/src/main/java/common/item/tool/ItemScanner.java
+++ b/common/src/main/java/common/item/tool/ItemScanner.java
@@ -15,9 +15,10 @@ public class ItemScanner extends ItemWand {
     
     public void onUse(ItemStack stack, EntityNPC player, AWorldServer world, Vec3 vec)
     {
-    	player.connection.addHotbar(TextColor.NEON + "* Position in %s: %.3f %.3f %.3f, %.2f K, %.2f °C", world.dimension.getDisplay(), 
+    	BlockPos pos = new BlockPos(vec);
+    	player.connection.addHotbar(TextColor.NEON + "* Position in %s: %.1f %.1f %.1f, %.1f K, %.1f °C, G: %.1f °C, %.1f %%", world.dimension.getDisplay(), 
     			vec.xCoord, vec.yCoord, vec.zCoord, 
-    			world.getTemperatureK(new BlockPos(vec)), world.getTemperatureC(new BlockPos(vec)));
+    			world.getTemperatureK(pos), world.getTemperatureC(pos), world.getGenTemperature(pos.getX(), pos.getZ()), world.getGenHumidity(pos.getX(), pos.getZ()));
     }
     
 	public int getRange(ItemStack stack, EntityNPC player) {
diff --git a/common/src/main/java/common/world/AWorldServer.java b/common/src/main/java/common/world/AWorldServer.java
index b0b473fa..fcad3723 100644
--- a/common/src/main/java/common/world/AWorldServer.java
+++ b/common/src/main/java/common/world/AWorldServer.java
@@ -50,4 +50,6 @@ public abstract class AWorldServer extends World {
 	public abstract void growGrass(BlockPos pos, State state, Random rand);
 	public abstract boolean generateBigMushroom(BlockPos pos, State state, Random rand);
 	public abstract void generateTree(BlockPos pos, State state, Random rand);
+	public abstract float getGenTemperature(int x, int z);
+	public abstract float getGenHumidity(int x, int z);
 }
diff --git a/server/src/main/java/server/world/WorldServer.java b/server/src/main/java/server/world/WorldServer.java
index 1abf1ee0..e479134e 100755
--- a/server/src/main/java/server/world/WorldServer.java
+++ b/server/src/main/java/server/world/WorldServer.java
@@ -2353,7 +2353,7 @@ public final class WorldServer extends AWorldServer {
     }
 	
 	public float getGenTemperature(int x, int z) {
-		return this.dimension.getTemperature() + (this.biomeGen == null ? 0.0f : this.biomeGen.getBiomeAt(x, z).temperature);
+		return World.ABSOLUTE_ZERO + this.dimension.getTemperature() + this.dimension.getOrbitOffset() * 0.5f + (this.biomeGen == null ? 0.0f : this.biomeGen.getBiomeAt(x, z).temperature);
 	}
 	
 	public float getGenHumidity(int x, int z) {
diff --git a/server/src/main/java/server/worldgen/ReplacerAltSimple.java b/server/src/main/java/server/worldgen/ReplacerAltSimple.java
index 9cdae782..06874629 100644
--- a/server/src/main/java/server/worldgen/ReplacerAltSimple.java
+++ b/server/src/main/java/server/worldgen/ReplacerAltSimple.java
@@ -65,7 +65,7 @@ public class ReplacerAltSimple extends ReplacerBiome
 
                     if (by < this.seaLevel && (surface == null || surface.getBlock() == Blocks.air))
                     {
-                    	if (this.freeze && world.getTemperatureC(pos.set(x, by, z)) <= 0.0F)
+                    	if (this.freeze && world.getTemperatureC(pos.set((x & ~15) | bz, by, (z & ~15) | bx)) <= 0.0F)
                         {
                             surface = Blocks.ice.getState();
                         }
diff --git a/server/src/main/java/server/worldgen/ReplacerTerranian.java b/server/src/main/java/server/worldgen/ReplacerTerranian.java
index 07a6d690..4120d4c7 100644
--- a/server/src/main/java/server/worldgen/ReplacerTerranian.java
+++ b/server/src/main/java/server/worldgen/ReplacerTerranian.java
@@ -24,8 +24,8 @@ public class ReplacerTerranian extends ReplacerAltSimple {
     
     public void genTerrainBlocks(WorldServer world, Random rand, ChunkPrimer primer, int x, int z, double noise)
     {
-        float absTemp = world.getGenTemperature(x, z);
-        float humidity = world.getGenHumidity(x, z);
+        float absTemp = world.getGenTemperature((x & ~15) | (z & 15), (z & ~15) | (x & 15));
+        float humidity = world.getGenHumidity((x & ~15) | (z & 15), (z & ~15) | (x & 15));
         
     	State topBlock = this.surface;
     	State fillerBlock = this.top;