diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/mars_poles.json b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/mars_poles.json index c02cbc969..2199f553e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/mars_poles.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/mars_poles.json @@ -1,8 +1,8 @@ { "type": "tfg:martian_poles", "config": { - "snowStartTemp": -95, - "snowFinishTemp": -100, - "maximumTemp": -90 + "snowStartTemp": -105, + "snowFinishTemp": -109, + "maximumTemp": -100 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/clay_disc.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/clay_disc.json index d998fe967..b96c1cf58 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/clay_disc.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/clay_disc.json @@ -7,7 +7,7 @@ }, { "type": "tfc:climate", - "min_temperature": -95 + "min_temperature": -100 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_extra_large.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_extra_large.json deleted file mode 100644 index 76da1fdb5..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_extra_large.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "feature": "tfg:moon/crater/extra_large", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 300 - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:random_offset", - "xz_spread": 0, - "y_spread": 10 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_large.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_large.json deleted file mode 100644 index b372ea5b1..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_large.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "feature": "tfg:moon/crater/large", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 280 - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:random_offset", - "xz_spread": 0, - "y_spread": 6 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_medium.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_medium.json deleted file mode 100644 index 4fecd0675..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_medium.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "feature": "tfg:moon/crater/medium", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 260 - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:random_offset", - "xz_spread": 0, - "y_spread": 5 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/kaolin_clay_disc.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/kaolin_clay_disc.json index ca7882712..40f74211f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/kaolin_clay_disc.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/kaolin_clay_disc.json @@ -7,7 +7,7 @@ }, { "type": "tfc:climate", - "min_temperature": -65 + "min_temperature": -85 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/peat_disc.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/peat_disc.json index d85c18d8f..c54e32423 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/peat_disc.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/peat_disc.json @@ -6,18 +6,19 @@ "chance": 200 }, { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR_WG" + "type": "tfc:climate", + "min_temperature": -85, + "min_forest": "edge" }, { "type": "minecraft:biome" }, { - "type": "tfc:climate", - "min_forest": "edge" + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" } ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/powder_snow.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/powder_snow.json index 59e1c318b..93e2e9a45 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/powder_snow.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/powder_snow.json @@ -7,7 +7,7 @@ }, { "type": "tfc:climate", - "max_temperature": -97 + "max_temperature": -107 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/red_quicksand.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/red_quicksand.json index dcd745543..0d98c28fb 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/red_quicksand.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/red_quicksand.json @@ -7,7 +7,7 @@ }, { "type": "tfc:climate", - "min_temperature": -97 + "min_temperature": -107 }, { "type": "minecraft:in_square" 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 df7a41469..39a11ee38 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": -97 + "max_temperature": -105 }, { "type": "minecraft:count", diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json index 462a4977b..7c88e4d04 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json @@ -3,7 +3,7 @@ "placement": [ { "type": "tfc:climate", - "max_temperature": -50 + "max_temperature": -60 }, { "type": "minecraft:count", diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle_extra.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle_extra.json index 917518ef5..e941abeab 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle_extra.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle_extra.json @@ -3,7 +3,7 @@ "placement": [ { "type": "tfc:climate", - "max_temperature": -85 + "max_temperature": -100 }, { "type": "minecraft:count", diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 8f600d983..0a49530a4 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -875,9 +875,10 @@ function registerTFGFLPlanters(event) { /** @param {Internal.TFCDataEventJS} event */ function registerTFGFauna(event) { + // -108 is the average at z=-4k to z=-6k, which feels like a big enough band event.fauna( climate => { - climate.maxTemp(-100) + climate.maxTemp(-108) }, faunaData => { faunaData.solidGround(true) @@ -886,7 +887,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-97) + climate.minTemp(-102) climate.maxTemp(-30) climate.fuzzy(true) }, @@ -897,7 +898,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-95) + climate.minTemp(-100) climate.fuzzy(true) }, faunaData => { @@ -907,7 +908,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-105) + climate.minTemp(-108) climate.fuzzy(true) }, faunaData => { @@ -917,7 +918,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-102) + climate.minTemp(-109) climate.fuzzy(true) }, faunaData => { @@ -927,7 +928,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-90) + climate.minTemp(-97) climate.fuzzy(true) }, faunaData => { @@ -937,7 +938,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-106) + climate.minTemp(-109) climate.fuzzy(true) }, faunaData => { @@ -947,7 +948,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-90) + climate.minTemp(-100) climate.fuzzy(true) }, faunaData => { @@ -957,7 +958,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-100) + climate.minTemp(-105) climate.fuzzy(true) }, faunaData => { @@ -967,7 +968,7 @@ function registerTFGFauna(event) { event.fauna( climate => { - climate.minTemp(-100) + climate.minTemp(-106) climate.fuzzy(true) }, faunaData => { diff --git a/kubejs/server_scripts/tfg/events.chunks.js b/kubejs/server_scripts/tfg/events.chunks.js index efcc005c8..c93e55ae6 100644 --- a/kubejs/server_scripts/tfg/events.chunks.js +++ b/kubejs/server_scripts/tfg/events.chunks.js @@ -153,7 +153,7 @@ TFCEvents.createChunkDataProvider('mars', event => { */ function calcAverage(playerZ, scale, min, max) { - let relative = (playerZ / scale * -1) + 0.5; + let relative = (playerZ / (scale * -1)) + 0.5; // relative is now 1 for peak -z, 0 for peak +z diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js index 42f4a041b..bda91c251 100644 --- a/kubejs/server_scripts/tfg/events.forests.js +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -21,7 +21,7 @@ TFCEvents.worldgenData(event => { event.forestEntry('tfg:mars/crimson_forest_entry', climate => { climate.maxTemp(-24) - climate.minTemp(-101) + climate.minTemp(-108) climate.minRain(-12) climate.fuzzy(true) }, @@ -51,7 +51,7 @@ TFCEvents.worldgenData(event => { event.forestEntry('tfg:mars/warped_forest_entry', climate => { climate.maxTemp(-24) - climate.minTemp(-101) + climate.minTemp(-108) climate.maxRain(0) climate.fuzzy(true) }, @@ -75,7 +75,7 @@ TFCEvents.worldgenData(event => { event.forestEntry('tfg:mars/aeronos_forest_entry', climate => { - climate.minTemp(-92) + climate.minTemp(-97) climate.minRain(-14) climate.fuzzy(true) }, @@ -98,7 +98,7 @@ TFCEvents.worldgenData(event => { event.forestEntry('tfg:mars/strophar_forest_entry', climate => { - climate.minTemp(-92) + climate.minTemp(-97) climate.maxRain(2) climate.fuzzy(true) }, @@ -121,7 +121,7 @@ TFCEvents.worldgenData(event => { event.forestEntry('tfg:mars/alphacene_forest_entry', climate => { - climate.minTemp(-65) + climate.minTemp(-75) climate.fuzzy(true) }, null, @@ -143,7 +143,7 @@ TFCEvents.worldgenData(event => { event.forestEntry('tfg:mars/glacian_forest_entry', climate => { - climate.maxTemp(-92) + climate.maxTemp(-105) climate.fuzzy(true) }, 'tfg:glacian_wood_stripped', diff --git a/kubejs/startup_scripts/tfg/register_climates.js b/kubejs/startup_scripts/tfg/register_climates.js index bdd003f6a..6328fbdfd 100644 --- a/kubejs/startup_scripts/tfg/register_climates.js +++ b/kubejs/startup_scripts/tfg/register_climates.js @@ -76,7 +76,7 @@ function calcCurrentTemp(averageTemp, seaLevel, playerY, calendarTicks, tempRang */ function calcAverage(playerZ, scale, min, max) { - let relative = (playerZ / scale * -1) + 0.5; + let relative = (playerZ / (scale * -1)) + 0.5; // relative is now 1 for peak -z, 0 for peak +z