From d49fe21c5f7aa31c5e6b5fee394aa7d9e08a4b45 Mon Sep 17 00:00:00 2001
From: Pyritie <pyritie@gmail.com>
Date: Sun, 21 Sep 2025 18:12:45 +0100
Subject: [PATCH] more glacian tree tweaks

---
 .../configured_feature/mars/tree/glacian.json      |  4 ++--
 .../configured_feature/mars/tree/glacian_dead.json |  4 ++--
 .../configured_feature/mars/tree/glacian_mini.json |  8 --------
 .../worldgen/placed_feature/mars/tree/glacian.json | 10 +++-------
 .../placed_feature/mars/tree/glacian_dead.json     | 10 +++-------
 .../placed_feature/mars/underground/ice_cave.json  |  2 +-
 kubejs/server_scripts/tfg/events.forests.js        | 14 ++++++++++++--
 kubejs/startup_scripts/betterend/blocks.js         |  1 -
 8 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian.json
index a6669a17f..8546d84c1 100644
--- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian.json
+++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian.json
@@ -1,5 +1,5 @@
 {
-	"type": "tfc:stacked_tree",
+	"type": "afc:trunkless_stacked_tree",
 	"config": {
 		"layers": [
 			{
@@ -34,7 +34,7 @@
 		],
 		"trunk": {
 			"state": {
-				"Name": "tfg:glacian_log"
+				"Name": "tfg:glacian_wood"
 			},
 			"min_height": 0,
 			"max_height": 1,
diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_dead.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_dead.json
index ea2ff6e15..9a277c8f5 100644
--- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_dead.json
+++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_dead.json
@@ -1,5 +1,5 @@
 {
-	"type": "tfc:stacked_tree",
+	"type": "afc:trunkless_stacked_tree",
 	"config": {
 		"layers": [
 			{
@@ -20,7 +20,7 @@
 		],
 		"trunk": {
 			"state": {
-				"Name": "tfg:glacian_log"
+				"Name": "tfg:glacian_wood"
 			},
 			"min_height": 0,
 			"max_height": 1,
diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_mini.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_mini.json
index ebb41deb7..3baea6d11 100644
--- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_mini.json
+++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/glacian_mini.json
@@ -4,14 +4,6 @@
 		"structures": [
 			"tfg:trees/mossy_glowshroom_mini_1"
 		],
-		"trunk": {
-			"state": {
-				"Name": "tfg:glacian_log"
-			},
-			"min_height": 0,
-			"max_height": 1,
-			"wide": true
-		},
 		"placement": {
 			"width": 4,
 			"height": 10,
diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian.json
index 78afaf5f7..ee917a6be 100644
--- a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian.json
+++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian.json
@@ -2,13 +2,9 @@
 	"feature": "tfg:mars/tree/glacian",
 	"placement": [
 		{
-			"type": "minecraft:heightmap",
-			"heightmap": "OCEAN_FLOOR"
-		},
-		{
-			"type": "minecraft:random_offset",
-			"xz_spread": 0,
-			"y_spread": -2
+			"type": "tfc:flat_enough",
+			"flatness": 0.8,
+			"radius": 4
 		}
 	]
 }
\ No newline at end of file
diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian_dead.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian_dead.json
index 78afaf5f7..ee917a6be 100644
--- a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian_dead.json
+++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/glacian_dead.json
@@ -2,13 +2,9 @@
 	"feature": "tfg:mars/tree/glacian",
 	"placement": [
 		{
-			"type": "minecraft:heightmap",
-			"heightmap": "OCEAN_FLOOR"
-		},
-		{
-			"type": "minecraft:random_offset",
-			"xz_spread": 0,
-			"y_spread": -2
+			"type": "tfc:flat_enough",
+			"flatness": 0.8,
+			"radius": 4
 		}
 	]
 }
\ No newline at end of file
diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json
index 64e28d980..34bc3b272 100644
--- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json
+++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json
@@ -3,7 +3,7 @@
 	"placement": [
 		{
 			"type": "tfc:climate",
-			"max_temperature": -85
+			"max_temperature": -87
 		},
 		{
 			"type": "minecraft:count",
diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js
index fd6f2342a..c945860df 100644
--- a/kubejs/server_scripts/tfg/events.forests.js
+++ b/kubejs/server_scripts/tfg/events.forests.js
@@ -146,7 +146,7 @@ TFCEvents.worldgenData(event => {
 			climate.maxTemp(-82)
 			climate.fuzzy(true)
 		},
-		'ad_astra:glacian_log',
+		'tfg:glacian_wood_stripped',
 		'tfg:glacian_leaves',
 		null,
 		null,
@@ -159,7 +159,17 @@ TFCEvents.worldgenData(event => {
 		'tfg:mars/tree/glacian_dead',
 		'tfg:mars/tree/glacian',
 		null, null, null, null, null, null,
-		placement => {}
+		placement => {
+			placement.flatEnough(flatness => {
+				flatness.flatness(0.8)
+				flatness.radius(4)
+			})
+			placement.jsonPlacement({
+				"type": "minecraft:random_offset",
+				"xz_spread": 0,
+				"y_spread": -2
+			})
+		}
 	)
 })
 
diff --git a/kubejs/startup_scripts/betterend/blocks.js b/kubejs/startup_scripts/betterend/blocks.js
index 88ac307d1..d2f2a66b9 100644
--- a/kubejs/startup_scripts/betterend/blocks.js
+++ b/kubejs/startup_scripts/betterend/blocks.js
@@ -128,7 +128,6 @@ function registerBetterEndBlocks(event) {
 	event.create('betterend:glacian_hymenophore', 'tfg:attached_decorative_plant')
 		.soundType('crop')
 		.allowVertical(true)
-		.tagItem('tfg:mars_plants')
 		.tagBlock('minecraft:replaceable')
 		.tagBlock('tfg:do_not_destroy_in_space')