From d8b995ba606155fed25f4a243d6b896b12910b48 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 18 Sep 2025 00:50:38 +0100 Subject: [PATCH] updated moon worldgen with new rock stuff! --- .../moon/surface/delta/moon_deepslate.json | 2 +- .../moon/surface/pile/glacio_stone.json | 16 +++++++++++++-- .../moon/surface/pile/moon_deepslate.json | 20 +++++++++++++++---- .../moon/surface/pile/moon_stone.json | 16 +++++++++++++-- .../worldgen/noise_settings/moon_noise.json | 4 ++-- .../mars/surface/aurant_polypore.json | 4 ++-- .../mars/surface/filalux_wings.json | 4 ++-- .../mars/surface/filalux_wings_top.json | 4 ++-- .../mars/surface/purple_polypore.json | 4 ++-- .../moon/surface/delta/glacio_stone.json | 2 +- .../moon/surface/delta/moon_deepslate.json | 2 +- .../moon/surface/delta/moon_stone.json | 2 +- .../moon/surface/loose/glacio_stone.json | 2 +- .../moon/surface/loose/moon_deepslate.json | 2 +- .../moon/surface/loose/moon_stone.json | 2 +- .../moon/surface/pile/glacio_stone.json | 2 +- .../moon/surface/pile/moon_deepslate.json | 2 +- .../moon/surface/pile/moon_stone.json | 2 +- 18 files changed, 64 insertions(+), 28 deletions(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/moon_deepslate.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/moon_deepslate.json index cfb93fe3b..4b2e45541 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/moon_deepslate.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/moon_deepslate.json @@ -2,7 +2,7 @@ "type": "minecraft:delta_feature", "config": { "contents": { - "Name": "tfc:rock/cobble/basalt_slab" + "Name": "tfg:rock/cobble_moon_deepslate_slab" }, "rim": { "Name": "tfg:rock/hardened_moon_deepslate" diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/glacio_stone.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/glacio_stone.json index d7b754a9a..b3b3df1c8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/glacio_stone.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/glacio_stone.json @@ -5,7 +5,7 @@ "type": "minecraft:weighted_state_provider", "entries": [ { - "weight": 35, + "weight": 10, "data": { "Name": "tfg:rock/hardened_glacio_stone" } @@ -17,7 +17,7 @@ } }, { - "weight": 20, + "weight": 5, "data": { "Name": "ad_astra:glacio_stone_slab" } @@ -27,6 +27,18 @@ "data": { "Name": "ad_astra:glacio_cobblestone_slab" } + }, + { + "weight": 25, + "data": { + "Name": "tfg:rock/mossy_cobble_glacio" + } + }, + { + "weight": 10, + "data": { + "Name": "tfg:rock/mossy_cobble_glacio_slab" + } } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_deepslate.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_deepslate.json index 490c9b7d4..d824ea980 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_deepslate.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_deepslate.json @@ -5,7 +5,7 @@ "type": "minecraft:weighted_state_provider", "entries": [ { - "weight": 35, + "weight": 10, "data": { "Name": "tfg:rock/hardened_moon_deepslate" } @@ -13,19 +13,31 @@ { "weight": 25, "data": { - "Name": "ad_astra:moon_deepslate" + "Name": "tfg:rock/cobble_moon_deepslate" + } + }, + { + "weight": 5, + "data": { + "Name": "tfg:rock/moon_deepslate_slab" } }, { "weight": 10, "data": { - "Name": "ad_astra:moon_cobblestone" + "Name": "tfg:rock/cobble_moon_deepslate_slab" + } + }, + { + "weight": 25, + "data": { + "Name": "tfg:rock/mossy_cobble_moon_deepslate" } }, { "weight": 10, "data": { - "Name": "ad_astra:moon_cobblestone_slab" + "Name": "tfg:rock/mossy_cobble_moon_deepslate_slab" } } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_stone.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_stone.json index 977879c19..b52a0d320 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_stone.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_stone.json @@ -5,7 +5,7 @@ "type": "minecraft:weighted_state_provider", "entries": [ { - "weight": 35, + "weight": 10, "data": { "Name": "tfg:rock/hardened_moon_stone" } @@ -17,7 +17,7 @@ } }, { - "weight": 20, + "weight": 5, "data": { "Name": "ad_astra:moon_stone_slab" } @@ -27,6 +27,18 @@ "data": { "Name": "ad_astra:moon_cobblestone_slab" } + }, + { + "weight": 25, + "data": { + "Name": "tfg:rock/mossy_cobble_moon" + } + }, + { + "weight": 10, + "data": { + "Name": "tfg:rock/mossy_cobble_moon_slab" + } } ] } diff --git a/kubejs/data/tfg/worldgen/noise_settings/moon_noise.json b/kubejs/data/tfg/worldgen/noise_settings/moon_noise.json index b3dbf1ba7..a3b282786 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/moon_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/moon_noise.json @@ -395,7 +395,7 @@ { "type": "minecraft:block", "result_state": { - "Name": "tfc:sand/black" + "Name": "tfg:rock/gravel_moon_deepslate" } } ] @@ -511,7 +511,7 @@ { "type": "minecraft:block", "result_state": { - "Name": "ad_astra:moon_sand" + "Name": "tfg:rock/gravel_moon" } } ] diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aurant_polypore.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aurant_polypore.json index cadf9f243..392a28ace 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aurant_polypore.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aurant_polypore.json @@ -6,8 +6,8 @@ "min_forest": "edge" }, { - "type": "minecraft:rarity_filter", - "chance": 2 + "type": "minecraft:count", + "count": 2 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/filalux_wings.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/filalux_wings.json index d6db1c1c9..c05d940a1 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/filalux_wings.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/filalux_wings.json @@ -6,8 +6,8 @@ "min_forest": "edge" }, { - "type": "minecraft:rarity_filter", - "chance": 2 + "type": "minecraft:count", + "count": 2 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/filalux_wings_top.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/filalux_wings_top.json index 88e46fa88..81c3fbee6 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/filalux_wings_top.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/filalux_wings_top.json @@ -6,8 +6,8 @@ "min_forest": "edge" }, { - "type": "minecraft:rarity_filter", - "chance": 2 + "type": "minecraft:count", + "count": 2 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/purple_polypore.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/purple_polypore.json index 2a6ecae80..85dcabc6b 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/purple_polypore.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/purple_polypore.json @@ -6,8 +6,8 @@ "min_forest": "edge" }, { - "type": "minecraft:rarity_filter", - "chance": 2 + "type": "minecraft:count", + "count": 2 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/glacio_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/glacio_stone.json index 783e67d06..724e04a68 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/glacio_stone.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/glacio_stone.json @@ -20,7 +20,7 @@ "blocks": [ "ad_astra:glacio_stone", "tfg:rock/hardened_glacio_stone", - "ad_astra:glacio_cobblestone" + "tfg:rock/gravel_glacio" ] } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_deepslate.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_deepslate.json index 6a0dc3a13..f466ab215 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_deepslate.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_deepslate.json @@ -20,7 +20,7 @@ "blocks": [ "ad_astra:moon_deepslate", "tfg:rock/hardened_moon_deepslate", - "tfc:sand/black" + "tfg:rock/gravel_moon_deepslate" ] } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_stone.json index 559c6bf67..285c53bfb 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_stone.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_stone.json @@ -20,7 +20,7 @@ "blocks": [ "ad_astra:moon_stone", "tfg:rock/hardened_moon_stone", - "ad_astra:moon_sand" + "tfg:rock/gravel_moon" ] } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/glacio_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/glacio_stone.json index 0cfac2c35..8d85abd60 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/glacio_stone.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/glacio_stone.json @@ -20,7 +20,7 @@ "blocks": [ "ad_astra:glacio_stone", "tfg:rock/hardened_glacio_stone", - "ad_astra:glacio_cobblestone" + "tfg:rock/gravel_glacio" ] } }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_deepslate.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_deepslate.json index 3691966a0..25d318abb 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_deepslate.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_deepslate.json @@ -20,7 +20,7 @@ "blocks": [ "ad_astra:moon_deepslate", "tfg:rock/hardened_moon_deepslate", - "tfc:sand/black" + "tfg:rock/gravel_moon_deepslate" ] } }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_stone.json index 5e267969f..6a22e3b88 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_stone.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_stone.json @@ -20,7 +20,7 @@ "blocks": [ "ad_astra:moon_stone", "tfg:rock/hardened_moon_stone", - "ad_astra:moon_sand" + "tfg:rock/gravel_moon" ] } }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/glacio_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/glacio_stone.json index c92714851..1ebfa27b4 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/glacio_stone.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/glacio_stone.json @@ -20,7 +20,7 @@ "blocks": [ "ad_astra:glacio_stone", "tfg:rock/hardened_glacio_stone", - "ad_astra:glacio_cobblestone" + "tfg:rock/gravel_glacio" ] } }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_deepslate.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_deepslate.json index a9ecd0c6f..17a2eee8a 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_deepslate.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_deepslate.json @@ -20,7 +20,7 @@ "blocks": [ "ad_astra:moon_deepslate", "tfg:rock/hardened_moon_deepslate", - "tfc:sand/black" + "tfg:rock/gravel_moon_deepslate" ] } }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_stone.json index 419577639..f9a27a854 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_stone.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_stone.json @@ -20,7 +20,7 @@ "blocks": [ "ad_astra:moon_stone", "tfg:rock/hardened_moon_stone", - "ad_astra:moon_sand" + "tfg:rock/gravel_moon" ] } },