From 5d4fd1c739714a7e5181741c14137a92651ce8c0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 1 Jan 2026 19:39:06 +0000 Subject: [PATCH] more stuff for the volcano biome --- .../ambientsounds/basic/regions/venus.json | 4 +- .../betterend/blockstates/shadow_plant.json | 12 +++ .../betterend/blockstates/twisted_vine.json | 10 +- kubejs/assets/betterend/lang/en_us.json | 3 +- .../models/block/shadow_plant_1.json | 6 ++ .../models/block/shadow_plant_2.json | 6 ++ .../models/block/shadow_plant_3.json | 6 ++ .../models/block/shadow_plant_4.json | 6 ++ .../models/block/shadow_plant_5.json | 6 ++ .../models/block/shadow_plant_6.json | 6 ++ .../models/block/twisted_vine_bottom_1.json | 6 ++ .../models/block/twisted_vine_bottom_2.json | 6 ++ .../models/block/twisted_vine_middle_1.json | 6 ++ .../models/block/twisted_vine_middle_2.json | 6 ++ .../models/block/twisted_vine_top.json | 76 +++++++++++++ .../betterend/models/item/shadow_plant.json | 6 ++ .../betterend/textures/block/twisted_vine.png | Bin 328 -> 368 bytes .../textures/block/twisted_vine_bottom.png | Bin 294 -> 299 bytes .../textures/block/twisted_vine_roots.png | Bin 277 -> 370 bytes .../assets/tfg/blockstates/lava_source.json | 7 ++ .../assets/tfg/blockstates/smoker_source.json | 7 ++ kubejs/assets/tfg/lang/en_us.json | 6 +- kubejs/assets/tfg/lang/uk_ua.json | 2 +- kubejs/assets/tfg/lang/zh_cn.json | 2 +- .../assets/tfg/models/block/lava_source.json | 65 +++++++++++ .../tfg/models/block/smoker_source.json | 65 +++++++++++ .../assets/tfg/models/item/lava_source.json | 6 ++ .../assets/tfg/models/item/smoker_source.json | 6 ++ .../block/planets/venus/lava_source.png | Bin 0 -> 506 bytes .../block/planets/venus/smoker_source.png | Bin 0 -> 452 bytes kubejs/data/ad_astra/dimension/venus.json | 6 +- ...ountains.json => scorching_volcanoes.json} | 21 +++- .../venus/surface/geyser_source_patch.json | 101 +++++++++--------- .../venus/surface/lava_source_patch.json | 44 ++++++++ .../venus/surface/shadow_plant_patch.json | 44 ++++++++ .../venus/surface/smoker_source_patch.json | 44 ++++++++ .../venus/surface/sulfur_crystals.json | 66 ++++++++---- .../venus/surface/twisted_vine.json | 43 ++++++++ .../venus/terrain/basalt_columns_large.json | 19 ++++ .../venus/terrain/basalt_columns_small.json | 13 +++ .../worldgen/noise_settings/venus_noise.json | 19 +++- .../venus/surface/geyser_source_patch.json | 38 ++----- .../venus/surface/lava_source_patch.json | 15 +++ .../venus/surface/shadow_plant_patch.json | 15 +++ .../venus/surface/smoker_source_patch.json | 15 +++ .../venus/surface/twisted_vine.json | 19 ++++ .../venus/terrain/basalt_columns_large.json | 19 ++++ .../venus/terrain/basalt_columns_small.json | 19 ++++ .../venus/terrain/basalt_pillar.json | 27 +++++ kubejs/server_scripts/tfg/venus/tags.venus.js | 5 +- .../server_scripts/tfg/worldgen/entities.js | 7 ++ .../tfg/worldgen/select_climates.js | 7 ++ kubejs/startup_scripts/tfg/constants.js | 2 +- .../tfg/venus/blocks.venus_deco.js | 38 +++++++ .../tfg/worldgen/register_climates.js | 37 ++++++- 55 files changed, 896 insertions(+), 124 deletions(-) create mode 100644 kubejs/assets/betterend/blockstates/shadow_plant.json create mode 100644 kubejs/assets/betterend/models/block/shadow_plant_1.json create mode 100644 kubejs/assets/betterend/models/block/shadow_plant_2.json create mode 100644 kubejs/assets/betterend/models/block/shadow_plant_3.json create mode 100644 kubejs/assets/betterend/models/block/shadow_plant_4.json create mode 100644 kubejs/assets/betterend/models/block/shadow_plant_5.json create mode 100644 kubejs/assets/betterend/models/block/shadow_plant_6.json create mode 100644 kubejs/assets/betterend/models/block/twisted_vine_bottom_1.json create mode 100644 kubejs/assets/betterend/models/block/twisted_vine_bottom_2.json create mode 100644 kubejs/assets/betterend/models/block/twisted_vine_middle_1.json create mode 100644 kubejs/assets/betterend/models/block/twisted_vine_middle_2.json create mode 100644 kubejs/assets/betterend/models/block/twisted_vine_top.json create mode 100644 kubejs/assets/betterend/models/item/shadow_plant.json create mode 100644 kubejs/assets/tfg/blockstates/lava_source.json create mode 100644 kubejs/assets/tfg/blockstates/smoker_source.json create mode 100644 kubejs/assets/tfg/models/block/lava_source.json create mode 100644 kubejs/assets/tfg/models/block/smoker_source.json create mode 100644 kubejs/assets/tfg/models/item/lava_source.json create mode 100644 kubejs/assets/tfg/models/item/smoker_source.json create mode 100644 kubejs/assets/tfg/textures/block/planets/venus/lava_source.png create mode 100644 kubejs/assets/tfg/textures/block/planets/venus/smoker_source.png rename kubejs/data/tfg/worldgen/biome/venus/{volcanic_mountains.json => scorching_volcanoes.json} (85%) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/lava_source_patch.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/smoker_source_patch.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/twisted_vine.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_large.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_small.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/surface/lava_source_patch.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/surface/shadow_plant_patch.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/surface/smoker_source_patch.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/surface/twisted_vine.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_large.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_small.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_pillar.json diff --git a/kubejs/assets/ambientsounds/basic/regions/venus.json b/kubejs/assets/ambientsounds/basic/regions/venus.json index 4cec2093a..b52db9052 100644 --- a/kubejs/assets/ambientsounds/basic/regions/venus.json +++ b/kubejs/assets/ambientsounds/basic/regions/venus.json @@ -10,7 +10,9 @@ "geysers", "salt_flats", "sulfuric_ravine", - "fumaroles" + "fumaroles", + "jagged_tablelands", + "scorching_volcanoes" ], "sounds": [ { diff --git a/kubejs/assets/betterend/blockstates/shadow_plant.json b/kubejs/assets/betterend/blockstates/shadow_plant.json new file mode 100644 index 000000000..08fb1caee --- /dev/null +++ b/kubejs/assets/betterend/blockstates/shadow_plant.json @@ -0,0 +1,12 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/shadow_plant_1" }, + { "model": "betterend:block/shadow_plant_2" }, + { "model": "betterend:block/shadow_plant_3" }, + { "model": "betterend:block/shadow_plant_4" }, + { "model": "betterend:block/shadow_plant_5" }, + { "model": "betterend:block/shadow_plant_6" } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/blockstates/twisted_vine.json b/kubejs/assets/betterend/blockstates/twisted_vine.json index 718311e23..b713a16a7 100644 --- a/kubejs/assets/betterend/blockstates/twisted_vine.json +++ b/kubejs/assets/betterend/blockstates/twisted_vine.json @@ -1,13 +1,15 @@ { "variants": { - "shape=top": { "model": "betterend:block/twisted_vine_top" }, - "shape=middle": [ + "height=0": { "model": "betterend:block/twisted_vine_top" }, + "height=1": [ { "model": "betterend:block/twisted_vine_middle_1" }, { "model": "betterend:block/twisted_vine_middle_2" } ], - "shape=bottom": [ + "height=2": [ { "model": "betterend:block/twisted_vine_bottom_1" }, { "model": "betterend:block/twisted_vine_bottom_2" } - ] + ], + "height=3": { "model": "" }, + "height=4": { "model": "" } } } diff --git a/kubejs/assets/betterend/lang/en_us.json b/kubejs/assets/betterend/lang/en_us.json index fcb9d958b..11244c122 100644 --- a/kubejs/assets/betterend/lang/en_us.json +++ b/kubejs/assets/betterend/lang/en_us.json @@ -87,6 +87,7 @@ "block.betterend.shadow_berry": "Nox Berries", "block.betterend.shadow_berry_wild": "Wild Nox Berries", "block.betterend.shadow_berry_dead": "Dead Nox Berries", + "block.betterend.shadow_plant": "Blackened Ashgrass", "block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom", "block.betterend.sulphur_crystal": "Sulfur Crystal", "block.betterend.sulphuric_rock": "Raw Ignimbrite", @@ -98,7 +99,7 @@ "block.betterend.twisted_moss": "Twisted Moss", "block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss", "block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss", - "block.betterend.twisted_vine": "Twisted Vine", + "block.betterend.twisted_vine": "Carbonic Vine", "block.betterend.umbrella_moss": "Umbrella Moss", "block.betterend.umbrella_moss_tall": "Umbrella Moss", "block.betterend.vaiolush_fern": "Vaiolush Fern", diff --git a/kubejs/assets/betterend/models/block/shadow_plant_1.json b/kubejs/assets/betterend/models/block/shadow_plant_1.json new file mode 100644 index 000000000..8966a93e7 --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_plant_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/shadow_plant" + } +} diff --git a/kubejs/assets/betterend/models/block/shadow_plant_2.json b/kubejs/assets/betterend/models/block/shadow_plant_2.json new file mode 100644 index 000000000..e5b0883c7 --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_plant_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/shadow_plant" + } +} diff --git a/kubejs/assets/betterend/models/block/shadow_plant_3.json b/kubejs/assets/betterend/models/block/shadow_plant_3.json new file mode 100644 index 000000000..747d552e8 --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_plant_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/shadow_plant_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/shadow_plant_4.json b/kubejs/assets/betterend/models/block/shadow_plant_4.json new file mode 100644 index 000000000..33760a4c8 --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_plant_4.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/shadow_plant_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/shadow_plant_5.json b/kubejs/assets/betterend/models/block/shadow_plant_5.json new file mode 100644 index 000000000..27fc96c3f --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_plant_5.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/tail_moss" + } +} diff --git a/kubejs/assets/betterend/models/block/shadow_plant_6.json b/kubejs/assets/betterend/models/block/shadow_plant_6.json new file mode 100644 index 000000000..e2110fee0 --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_plant_6.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/tail_moss" + } +} diff --git a/kubejs/assets/betterend/models/block/twisted_vine_bottom_1.json b/kubejs/assets/betterend/models/block/twisted_vine_bottom_1.json new file mode 100644 index 000000000..c64d397a7 --- /dev/null +++ b/kubejs/assets/betterend/models/block/twisted_vine_bottom_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/twisted_vine_bottom" + } +} diff --git a/kubejs/assets/betterend/models/block/twisted_vine_bottom_2.json b/kubejs/assets/betterend/models/block/twisted_vine_bottom_2.json new file mode 100644 index 000000000..13696d557 --- /dev/null +++ b/kubejs/assets/betterend/models/block/twisted_vine_bottom_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/twisted_vine_bottom" + } +} diff --git a/kubejs/assets/betterend/models/block/twisted_vine_middle_1.json b/kubejs/assets/betterend/models/block/twisted_vine_middle_1.json new file mode 100644 index 000000000..50cd9cb87 --- /dev/null +++ b/kubejs/assets/betterend/models/block/twisted_vine_middle_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/twisted_vine" + } +} diff --git a/kubejs/assets/betterend/models/block/twisted_vine_middle_2.json b/kubejs/assets/betterend/models/block/twisted_vine_middle_2.json new file mode 100644 index 000000000..eb0a34031 --- /dev/null +++ b/kubejs/assets/betterend/models/block/twisted_vine_middle_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/twisted_vine" + } +} diff --git a/kubejs/assets/betterend/models/block/twisted_vine_top.json b/kubejs/assets/betterend/models/block/twisted_vine_top.json new file mode 100644 index 000000000..c6cbd1d12 --- /dev/null +++ b/kubejs/assets/betterend/models/block/twisted_vine_top.json @@ -0,0 +1,76 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/twisted_vine", + "texture": "betterend:block/twisted_vine", + "roots": "betterend:block/twisted_vine_roots" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 16, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 5, 0, 0.5 ], + "to": [ 5.001, 16, 16.5 ], + "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "east": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 11 ], + "to": [ 16.5, 16, 11.001 ], + "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "south": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 0.5 ], + "to": [ 11.001, 16, 16.5 ], + "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "east": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 5 ], + "to": [ 16.5, 16, 5.001 ], + "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" }, + "south": { "uv": [ 0, 16, 16, 0 ], "texture": "#roots" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/shadow_plant.json b/kubejs/assets/betterend/models/item/shadow_plant.json new file mode 100644 index 000000000..e7b848fa4 --- /dev/null +++ b/kubejs/assets/betterend/models/item/shadow_plant.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/shadow_plant" + } +} diff --git a/kubejs/assets/betterend/textures/block/twisted_vine.png b/kubejs/assets/betterend/textures/block/twisted_vine.png index 9403574843b777f53648bf9ec26586fe064c552f..47a64f263a60569c4f89e5199279d352343f5de1 100644 GIT binary patch delta 352 zcmX@X^nq!DWIY=L1B3kM|A`C?44efXk;M!Q+`=Ht$S`Y;1Oo%3lBbJfh(+(zNe5Ro zC5W`x>o*E=bhdD3PTZj#{_dYx>IJpiA{a?{QEyK z&7xT1#et6%Q~uWJGpu`kDsA&by*Tx*MHiktEz-RFGK67U{q41L{Fc`(_GfN5nzS&z za^7~IIy>G~tBhuC&z!{|(I#go)yt;JsL-Xv$kF7$aB9;ZIYmz)&chpAXPr$u%vWJI z-*n^2oXBZwuD?!XyZ(Bs>z3T;|Bo%Esd)bCy=PoCPo3et^qu$LAJ#Gy$hdRoZNL5h zh?nL}AGN)U>}@kXRPBwdu$%8z+^x~|q`-pbcGC9SoCmVD3N`$!S=X95t1drjT58bs zt&ATkYc#mjaSWGr~sQESZh z<>YAxr@0OZbGwp*t6KN4h@IHn*wVI}=jZ8dJwF~v`^#9QT$VHXyn*M0_VjrglBL-m zM~>7Vur5kSnL5o-(0pA)&BfIDrN&Y!Zz?l2qHBycpV}tr%pStY^2o@bu)SkjHjm5% zVU8=O4(t`x+Tz2pOlQWf-G;YP+Ozv}g{0po2k%~O>vAQd;7Ob2^SH`mD=NP8AMrT$ VIh=XIQ3eJE22WQ%mvv4FO#p9Ai%I|h diff --git a/kubejs/assets/betterend/textures/block/twisted_vine_bottom.png b/kubejs/assets/betterend/textures/block/twisted_vine_bottom.png index 44dfe5ad5f6d16174887d1d1a9413c02c34e5fbe..c1518f352e691de1e0b84db21e787370fc69377d 100644 GIT binary patch delta 283 zcmZ3+w3=yxWIY=L1B3kM|A`C?44efXk;M!Q+`=Ht$S`Y;1Oo%ZT~8Os5R2Zk6BqWi z8i=^Ghq9D6=Ljrte5l8zQmVqjqR80j_^G~z^?sAmPXCKGpURvov)oPJ&Uv{-{KxgE zX|BsMC#`>2{I`^YL13bZZ?gD;twD%ecAaxLqZ25? nSul6f)+s?nb}!BMGKkoCh1eaMxxto!fq}u()z4*}Q$iB}hHP^I delta 278 zcmZ3@w2WzjWIYQ51H;x|=C2qS7~XoiIEGZrX`Qg!?{I*Ci+^v&qt_0pOB?!PJ~gO_ zG_rZ!QB>4m_&9+l$g5uB|3UqUKLP}rWH}dVZkw@q?p)Wpkix{Y_Ab?+kDVt@)uiVg z+GpIZv$MEM=hcC|n${(AEmIulN2_b6o38WqcwzP6f~I(%gh{=*Ou@?=9tDRwgZnHO ztzy<}^hlYmo6aY>_KoQVmw7!)O5PYg+kSi3qs{AWieAk)BWUz}4c`gwozK0}HuP?( zC}6H|E^3ynR@<^;lb|AV(|rf8`*$Mxe>iaE@vt%7c2V;D%%-Wq!{WuQa_Jt+k|i6q lsJK_1_5ZiFzEPi(^RmNi{uloiGcYhPc)I$ztaD0e0sy}Zc&`8e diff --git a/kubejs/assets/betterend/textures/block/twisted_vine_roots.png b/kubejs/assets/betterend/textures/block/twisted_vine_roots.png index a68c549b74b79940b8588d6e4dbbe8b860162934..8dcb9b9166192140ce36284882f3b30437ad1ac0 100644 GIT binary patch delta 354 zcmbQr^oePLWIY=L1B3kM|A`C?44efXk;M!Q+`=Ht$S`Y;1Oo%3il>WXh(+(#e%ri5 z4g#(Ai(?Wj8>E9HnWR!O?gl1E^*Crx&^^-6dVKN1$6|L_Gz?~mT+Dl8v2jAcvYB(g zKdaq+I&HIH!{LVtzyHQD^rTrGDBCUCa5pb~tIp{b6JOT)4R>3vz1|wj60tU{%q(t_ zO8hKN=8Uy(D>p`P94OkUb8ySGPr=H4$&543KUYn*n#*+{$87Vj6eG=c#$%5+GPneW zm~xv+^?KDEmRWaQo8kE5i;{fp^-k};S7&Z(IQ}^C=;fDBS`vR~FWJF<;lu^|N@yHl5Ms;#l`ogF^kXN#rv z{B=Fixu#`d>t*!n*PeN(>KAysD05$R`kjiI`dfQDqW^p-d-BRFce>?;I(FZ8>vX=p z&6T|Ur{w#wh@I6-=8Ei(nQ3;}&o1g?NRs<()h{P*{ya4K%gG42+)Mi|$@#V0D{d+Y VmJ8x6Vqjok@O1TaS?83{1OV!Of2{xj diff --git a/kubejs/assets/tfg/blockstates/lava_source.json b/kubejs/assets/tfg/blockstates/lava_source.json new file mode 100644 index 000000000..53b3726e0 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/lava_source.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/lava_source" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/smoker_source.json b/kubejs/assets/tfg/blockstates/smoker_source.json new file mode 100644 index 000000000..1de3f05c2 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/smoker_source.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/smoker_source" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index ef111dc2e..37a394129 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -43,7 +43,7 @@ "biome.tfg.venus/salt_flats": "Salt Flats", "biome.tfg.venus/stromatolite_beach": "Stromatolite Beach", "biome.tfg.venus/sulfuric_ravine": "Sulfuric Ravine", - "biome.tfg.venus/volcanic_mountains": "Scorching Volcanoes", + "biome.tfg.venus/scorching_volcanoes": "Scorching Volcanoes", "block.tfg.piglin_disguise": "Piglin Disguise", "block.tfg.piglin_disguise_block": "Piglin Disguise", "block.tfg.dry_ice": "Dry Ice", @@ -459,6 +459,10 @@ "block.tfg.stromatolite_cluster_medium": "Large Stromatolite Cluster", "block.tfg.rock.raw.geyserite": "Raw Geyserite", "block.tfg.rock.spike.geyserite": "Geyserite Spike", + "block.tfg.geyser_source_small": "Small Steaming Geyser", + "block.tfg.geyser_source": "Steaming Geyser", + "block.tfg.smoker_source": "Volcanic Smoker", + "block.tfg.lava_source": "Lava Vent", "block.tfg.rock.halite": "Halite", "block.tfg.mushroom_roots": "Mushroom Roots", "block.tfg.mushroom_sprouts": "Mushroom Sprouts", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index b970c20a3..333c4a8d4 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -43,7 +43,7 @@ "biome.tfg.venus/salt_flats": "Соляні рівнини", "biome.tfg.venus/stromatolite_beach": "Строматолітовий пляж", "biome.tfg.venus/sulfuric_ravine": "Сірчаний яр", - "biome.tfg.venus/volcanic_mountains": "Палючі вулкани", + "biome.tfg.venus/scorching_volcanoes": "Палючі вулкани", "block.tfg.piglin_disguise": "Маскування Пігліна", "block.tfg.piglin_disguise_block": "Маскування Пігліна", "block.tfg.dry_ice": "Сухий лід", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index aaec701fd..e2bdc744f 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -43,7 +43,7 @@ "biome.tfg.venus/salt_flats": "盐滩", "biome.tfg.venus/stromatolite_beach": "叠层石滩", "biome.tfg.venus/sulfuric_ravine": "硫酸峡谷", - "biome.tfg.venus/volcanic_mountains": "灼热火山", + "biome.tfg.venus/scorching_volcanoes": "灼热火山", "block.tfg.piglin_disguise": "猪灵伪装", "block.tfg.piglin_disguise_block": "猪灵伪装", "block.tfg.dry_ice": "干冰", diff --git a/kubejs/assets/tfg/models/block/lava_source.json b/kubejs/assets/tfg/models/block/lava_source.json new file mode 100644 index 000000000..48139f706 --- /dev/null +++ b/kubejs/assets/tfg/models/block/lava_source.json @@ -0,0 +1,65 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "render_type": "cutout_mipped", + "textures": { + "0": "tfg:block/planets/venus/lava_source", + "particle": "tfg:block/planets/venus/lava_source" + }, + "elements": [ + { + "from": [0.8, 0, 8], + "to": [15.2, 16, 8], + "shade": false, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + }, + { + "from": [8, 0, 0.8], + "to": [8, 16, 15.2], + "shade": false, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 2.5], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 2.5], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [0, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "translation": [0, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/smoker_source.json b/kubejs/assets/tfg/models/block/smoker_source.json new file mode 100644 index 000000000..c8969467c --- /dev/null +++ b/kubejs/assets/tfg/models/block/smoker_source.json @@ -0,0 +1,65 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "render_type": "cutout_mipped", + "textures": { + "0": "tfg:block/planets/venus/smoker_source", + "particle": "tfg:block/planets/venus/smoker_source" + }, + "elements": [ + { + "from": [0.8, 0, 8], + "to": [15.2, 16, 8], + "shade": false, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + }, + { + "from": [8, 0, 0.8], + "to": [8, 16, 15.2], + "shade": false, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 2.5], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 2.5], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [0, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "translation": [0, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lava_source.json b/kubejs/assets/tfg/models/item/lava_source.json new file mode 100644 index 000000000..1b4b23d49 --- /dev/null +++ b/kubejs/assets/tfg/models/item/lava_source.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:block/planets/venus/lava_source" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/smoker_source.json b/kubejs/assets/tfg/models/item/smoker_source.json new file mode 100644 index 000000000..9f6860a25 --- /dev/null +++ b/kubejs/assets/tfg/models/item/smoker_source.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:block/planets/venus/smoker_source" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/planets/venus/lava_source.png b/kubejs/assets/tfg/textures/block/planets/venus/lava_source.png new file mode 100644 index 0000000000000000000000000000000000000000..cc2c1ce2dcde92ac66e8bd43dbbfc21a91d1f644 GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s78o-U3d7QJsL`DY6UiX5%ie-dwPym8CrYh}S+QCl;)l~iZvu#~4MH|eoVuVeem zRVQfP^h@y0k*OY~iDJ%L3%OM1nw??ckkL*hQ7Z3Pyg;-<4x{)_H?#$;XM5v z4c2R4Kbw?VtfuNYD?o4Bjs2U>zuqp(kSDjL;@6viTEp z7TP5+eppd^y5_?!hBrCaI2X-$+goL4*yAj7dSO~LOJL6_wJBbyaix5&f(aV#Z*s0h z#_sC5{{G|BFD;?hQy=gPG&pYF^u$Qw*NPk_2a)#8!g=yB##*xlTnyv(vp4MC&|tuJ zeA7?1md7oRC!fEP!_6>N>rkPQ@ee82A3@K~*=J4C5@=H3D0ucf;H6GLyqDI~Q|Ikx zWc6N@ia%Ae%S*J`c)r)lu2Ui@O)IapJZ4F+JcT}+-#PgHh*DF>hP!$HGd_L2 z$#HmsMIYmixb?O5d*f!Wd+l-g%CB?Ve;ml#YP9eD+_;|tq#9R(I_efG14=}WZcQVSWry?G29Zol=BXzMwiylb6umy+Ld z;pwMaE&3#R*q&7O1#zAK{6lU7>xP>-XMWbODRe2VT9srr`>XKjO-H`h+MHj!N^91# zgWGa1nQYz1;L@VeHN$VY#?l@4-}|Tu%k{G}#9kL { case "ad_astra:venus": newHP = 70; } } + else if (type === "minecraft:magma_cube") { + switch (dimension) { + // use default for beneath + case "ad_astra:venus": newHp = entity.health * 6; + } + } if (newHP === 0) return; diff --git a/kubejs/server_scripts/tfg/worldgen/select_climates.js b/kubejs/server_scripts/tfg/worldgen/select_climates.js index 0fda74bd9..d31b1ecb7 100644 --- a/kubejs/server_scripts/tfg/worldgen/select_climates.js +++ b/kubejs/server_scripts/tfg/worldgen/select_climates.js @@ -14,9 +14,16 @@ TFCEvents.selectClimateModel(event => { event.setModel('tfg:mars_climate'); break; + case 'ad_astra:venus': + event.setModel('tfg:venus_climate'); + break; + case 'ad_astra:earth_orbit': case 'ad_astra:moon_orbit': case 'ad_astra:mars_orbit': + case 'ad_astra:venus_orbit': + case 'ad_astra:mercury_orbit': + case 'ad_astra:glacio_orbit': event.setModel('tfg:orbit_climate'); break; diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index 630c96719..efbac9cbe 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -122,7 +122,7 @@ global.VENUS_BIOMES = [ 'tfg:venus/salt_flats', 'tfg:venus/stromatolite_beach', 'tfg:venus/sulfuric_ravine', - 'tfg:venus/volcanic_mountains' + 'tfg:venus/scorching_volcanoes' ] /** diff --git a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js index 35f5341fa..e8a14ea49 100644 --- a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js +++ b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js @@ -24,6 +24,28 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .particleCount(2) .particleForced(false) + event.create('tfg:smoker_source', 'tfg:particle_emitter_decoration') + .soundType('dripstone_block') + .mapColor('color_gray') + .resistance(6) + .hardness(1.5) + .particleOffset(0.3, 1, 0.3) + .particleVelocity(0, 0.05, 0) + .particle('minecraft:campfire_cosy_smoke') + .particleCount(1) + .particleForced(false) + + event.create('tfg:lava_source', 'tfg:particle_emitter_decoration') + .soundType('dripstone_block') + .mapColor('color_black') + .resistance(6) + .hardness(1.5) + .particleOffset(0.3, 0.5, 0.3) + .particleVelocity(0, 0, 0) + .particle('lava') + .particleCount(1) + .particleForced(false) + //Geyserite event.create('tfg:rock/raw/geyserite', 'tfc:raw_rock') .textureAll('tfg:block/planets/venus/geyserite') @@ -285,4 +307,20 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .box(3, 0, 3, 13, 16, 13) .tagItem('tfg:venus_plants') .tagBlock('tfg:do_not_destroy_in_space') + + event.create('betterend:shadow_plant', 'tfg:decorative_plant') + .soundType('crop') + .mapColor('color_black') + .box(2, 0, 2, 14, 13, 13) + .tagItem('tfg:venus_plants') + .tagBlock('tfg:do_not_destroy_in_space') + + event.create('betterend:twisted_vine', 'tfg:tall_decorative_plant') + .height(3) + .soundType('crop') + .mapColor('color_black') + .box(3, 0, 3, 13, 16, 13) + .tagItem('tfg:venus_plants') + .tagBlock('tfg:do_not_destroy_in_space') + } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/worldgen/register_climates.js b/kubejs/startup_scripts/tfg/worldgen/register_climates.js index 946e6d24a..4cee7a697 100644 --- a/kubejs/startup_scripts/tfg/worldgen/register_climates.js +++ b/kubejs/startup_scripts/tfg/worldgen/register_climates.js @@ -162,7 +162,7 @@ TFCEvents.registerClimateModel(event => { }) builder.setAirFog((level, pos, calendarTicks) => 0) - builder.setWaterFog((level, pos, calendarTicks) => 0.6) + builder.setWaterFog((level, pos, calendarTicks) => 0.02) builder.setWindVector((level, block, calendarTicks) => builder.vector(0, 0)) }) @@ -176,7 +176,7 @@ TFCEvents.registerClimateModel(event => { builder.setAverageTemperatureCalculation((level, pos) => -270) builder.setAverageRainfallCalculation((level, pos) => 0) builder.setAirFog((level, pos, calendarTicks) => 0) - builder.setWaterFog((level, pos, calendarTicks) => 0.25) + builder.setWaterFog((level, pos, calendarTicks) => 0.02) builder.setWindVector((level, block, calendarTicks) => builder.vector(0, 0)) }) @@ -192,7 +192,7 @@ TFCEvents.registerClimateModel(event => { builder.setAverageTemperatureCalculation((level, pos) => -5) builder.setAverageRainfallCalculation((level, pos) => 0) builder.setAirFog((level, pos, calendarTicks) => 0) - builder.setWaterFog((level, pos, calendarTicks) => 0.25) + builder.setWaterFog((level, pos, calendarTicks) => 0.02) builder.setWindVector((level, block, calendarTicks) => builder.vector(0, 0)) }) @@ -226,4 +226,35 @@ TFCEvents.registerClimateModel(event => { builder.setAirFog(controller.createFogCallback(builder)); builder.setWindVector(controller.createWindCallback(builder)); }) + + event.register('tfg:venus_climate', builder => { + + builder.setCurrentTemperatureCalculation((level, pos, calendarTicks, daysInMonth) => { + if (OxygenAPI.hasOxygen(level, pos.above())) { + return OXYGENATED_TEMP; + } + + let avgTemp = calcAverage(pos.z, global.VENUS_PLANET_SIZE, 454, 474); + return calcCurrentTemp(avgTemp, 58, pos.y, calendarTicks, 10, 670, 1); + }) + + builder.setAverageTemperatureCalculation((level, pos) => { + return calcAverage(pos.z, global.VENUS_PLANET_SIZE, 454, 474); + }) + + builder.setAverageRainfallCalculation((level, pos) => { + return 300; + }) + + builder.setAirFog((level, pos, calendarTicks) => 0) + builder.setWaterFog((level, pos, calendarTicks) => 0.6) + builder.setWindVector((level, block, calendarTicks) => { + const strength = Math.max(0, Math.sin(calendarTicks / 10000)) * 0.2; + + const newX = Math.cos(calendarTicks / 2400) * strength; + const newZ = Math.sin(calendarTicks / 2400) * strength; + + return builder.vector(newX, newZ); + }) + }) }) \ No newline at end of file