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 940357484..47a64f263 100644 Binary files a/kubejs/assets/betterend/textures/block/twisted_vine.png and b/kubejs/assets/betterend/textures/block/twisted_vine.png differ diff --git a/kubejs/assets/betterend/textures/block/twisted_vine_bottom.png b/kubejs/assets/betterend/textures/block/twisted_vine_bottom.png index 44dfe5ad5..c1518f352 100644 Binary files a/kubejs/assets/betterend/textures/block/twisted_vine_bottom.png and b/kubejs/assets/betterend/textures/block/twisted_vine_bottom.png differ diff --git a/kubejs/assets/betterend/textures/block/twisted_vine_roots.png b/kubejs/assets/betterend/textures/block/twisted_vine_roots.png index a68c549b7..8dcb9b916 100644 Binary files a/kubejs/assets/betterend/textures/block/twisted_vine_roots.png and b/kubejs/assets/betterend/textures/block/twisted_vine_roots.png differ 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 000000000..cc2c1ce2d Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/lava_source.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/smoker_source.png b/kubejs/assets/tfg/textures/block/planets/venus/smoker_source.png new file mode 100644 index 000000000..7305ee126 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/smoker_source.png differ diff --git a/kubejs/data/ad_astra/dimension/venus.json b/kubejs/data/ad_astra/dimension/venus.json index b35603594..6d7dba3d4 100644 --- a/kubejs/data/ad_astra/dimension/venus.json +++ b/kubejs/data/ad_astra/dimension/venus.json @@ -790,7 +790,7 @@ { - "biome": "tfg:venus/volcanic_mountains", + "biome": "tfg:venus/scorching_volcanoes", "parameters": { "temperature": 0, "humidity": 0, @@ -802,7 +802,7 @@ } }, { - "biome": "tfg:venus/volcanic_mountains", + "biome": "tfg:venus/scorching_volcanoes", "parameters": { "temperature": 0, "humidity": 0, @@ -814,7 +814,7 @@ } }, { - "biome": "tfg:venus/volcanic_mountains", + "biome": "tfg:venus/scorching_volcanoes", "parameters": { "temperature": 0, "humidity": 0, diff --git a/kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json similarity index 85% rename from kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json rename to kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json index 967f4e282..ca1df7de1 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json @@ -40,9 +40,14 @@ "tfg:venus/terrain/lava_rivulet", "tfg:venus/terrain/magma_rivulet" ], + [ + "tfg:venus/terrain/basalt_pillar" + ], [], - [], - [], + [ + "tfg:venus/terrain/basalt_columns_small", + "tfg:venus/terrain/basalt_columns_large" + ], [], "#tfg:venus_veins", "#tfg:venus_underground_decoration", @@ -51,7 +56,11 @@ "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", "tfc:cobble_boulder_small_patch", - "tfg:venus/terrain/thermal_vent_rare" + "tfg:venus/terrain/thermal_vent_rare", + "tfg:venus/surface/smoker_source_patch", + "tfg:venus/surface/lava_source_patch", + "tfg:venus/surface/twisted_vine", + "tfg:venus/surface/shadow_plant_patch" ], [ "tfg:venus/terrain/lava_fill" @@ -129,6 +138,12 @@ "minCount": 1, "weight": 100 }, + { + "type": "minecraft:magma_cube", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, { "type": "species:cliff_hanger", "maxCount": 3, diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/geyser_source_patch.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/geyser_source_patch.json index fec45853b..02ce3e1d0 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/geyser_source_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/geyser_source_patch.json @@ -1,50 +1,55 @@ { - "type": "minecraft:random_patch", - "config": { - "feature": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:weighted_state_provider", - "entries": [ - { - "weight": 15, - "data": { - "Name": "tfg:geyser_source" - } - }, - { - "weight": 50, - "data": { - "Name": "tfg:geyser_source_small" - } - } - ] - } - } - }, - "placement": [ - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE" - }, - { - "type": "minecraft:block_predicate_filter", - "predicate": { - "type": "minecraft:matching_blocks", - "offset": [ - 0, - -1, - 0 - ], - "blocks": "tfg:rock/raw/geyserite" - } - } - ] - }, - "tries": 32, - "xz_spread": 16, - "y_spread": 3 - } + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 15, + "data": { + "Name": "tfg:geyser_source" + } + }, + { + "weight": 50, + "data": { + "Name": "tfg:geyser_source_small" + } + } + ] + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": "tfg:rock/raw/geyserite" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] + } + } + ] + }, + "tries": 32, + "xz_spread": 8, + "y_spread": 1 + } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/lava_source_patch.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/lava_source_patch.json new file mode 100644 index 000000000..3f98163bf --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/lava_source_patch.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:lava_source" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:has_sturdy_face", + "offset": [ 0, -1, 0 ], + "direction": "down" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] + } + } + ] + }, + "tries": 12, + "xz_spread": 4, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json new file mode 100644 index 000000000..abaeb145b --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:shadow_plant" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:venus_stone_replaceables" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] + } + } + ] + }, + "tries": 16, + "xz_spread": 5, + "y_spread": 0 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/smoker_source_patch.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/smoker_source_patch.json new file mode 100644 index 000000000..7e400ff27 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/smoker_source_patch.json @@ -0,0 +1,44 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:smoker_source" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:has_sturdy_face", + "offset": [ 0, -1, 0 ], + "direction": "down" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] + } + } + ] + }, + "tries": 12, + "xz_spread": 6, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/sulfur_crystals.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/sulfur_crystals.json index 65a026404..601939180 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/sulfur_crystals.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/sulfur_crystals.json @@ -3,35 +3,59 @@ "config": { "feature": { "feature": { - "type": "minecraft:simple_block", + "type": "lithostitched:select", "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "betterend:sulphur_crystal" + "features": [ + { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:sulphur_crystal" + } + } + } + }, + "placement": [] + }, + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + }, + { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:sulphur_crystal", + "Properties": { + "fluid": "sulfur_fumes" + } + } + } + } + }, + "placement": [] + }, + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "tfg:fluid/sulfur_fumes" + } } - } + ] } }, "placement": [ { "type": "minecraft:heightmap", "heightmap": "OCEAN_FLOOR_WG" - }, - { - "type": "minecraft:block_predicate_filter", - "predicate": { - "type": "minecraft:all_of", - "predicates": [ - { - "type": "minecraft:matching_blocks", - "blocks": [ - "minecraft:air", - "tfg:fluid/sulfur_fumes" - ] - } - ] - } } ] }, diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/twisted_vine.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/twisted_vine.json new file mode 100644 index 000000000..1234bee2f --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/twisted_vine.json @@ -0,0 +1,43 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "tfg:tall_decorative_plant", + "config": { + "block": "betterend:twisted_vine", + "plantHeight": 3, + "minHeight": 2, + "maxHeight": 4, + "middle": 1 + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:venus_stone_replaceables" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] + } + } + ] + }, + "tries": 6, + "xz_spread": 4, + "y_spread": 0 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_large.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_large.json new file mode 100644 index 000000000..e52016bcb --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_large.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:basalt_columns", + "config": { + "height": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 10, + "min_inclusive": 4 + } + }, + "reach": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 1 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_small.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_small.json new file mode 100644 index 000000000..108d52449 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_small.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:basalt_columns", + "config": { + "height": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 4, + "min_inclusive": 1 + } + }, + "reach": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json index 166ef402a..1486614e7 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -430,7 +430,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ "tfg:venus/volcanic_mountains" ] + "biome_is": [ "tfg:venus/scorching_volcanoes" ] }, "then_run": { "type": "minecraft:condition", @@ -473,7 +473,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:venus_lava", "min_threshold": 0.08, - "max_threshold": 0.27 + "max_threshold": 0.37 }, "then_run": { "type": "minecraft:block", @@ -482,6 +482,21 @@ } } }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:venus_lava", + "min_threshold": -0.4, + "max_threshold": -0.31 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:smooth_basalt" + } + } + }, { "type": "minecraft:block", "result_state": { diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/geyser_source_patch.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/geyser_source_patch.json index 814ceede1..430123383 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/geyser_source_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/geyser_source_patch.json @@ -1,39 +1,15 @@ { - "feature": "tfg:venus/surface/geyser_source_patch", - "placement": [ - { - "type": "minecraft:count", - "count": 20 - }, + "feature": "tfg:venus/surface/geyser_source_patch", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, { "type": "minecraft:in_square" }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "max_inclusive": { - "absolute": 380 - }, - "min_inclusive": { - "above_bottom": 123 - } - } - }, - { - "type": "minecraft:block_predicate_filter", - "predicate": { - "type": "minecraft:has_sturdy_face", - "offset": [ - 0, - -1, - 0 - ], - "direction": "down" - } - }, { "type": "minecraft:biome" } - ] + ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/lava_source_patch.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/lava_source_patch.json new file mode 100644 index 000000000..43e6e7f34 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/lava_source_patch.json @@ -0,0 +1,15 @@ +{ + "feature": "tfg:venus/surface/lava_source_patch", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/shadow_plant_patch.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/shadow_plant_patch.json new file mode 100644 index 000000000..ecff092ae --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/shadow_plant_patch.json @@ -0,0 +1,15 @@ +{ + "feature": "tfg:venus/surface/shadow_plant_patch", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/smoker_source_patch.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/smoker_source_patch.json new file mode 100644 index 000000000..18f4d98a6 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/smoker_source_patch.json @@ -0,0 +1,15 @@ +{ + "feature": "tfg:venus/surface/smoker_source_patch", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/twisted_vine.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/twisted_vine.json new file mode 100644 index 000000000..9fea6b3e0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/twisted_vine.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:venus/surface/twisted_vine", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_large.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_large.json new file mode 100644 index 000000000..19aaa0403 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_large.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:venus/terrain/basalt_columns_large", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_small.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_small.json new file mode 100644 index 000000000..e87e191c7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_columns_small.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:venus/terrain/basalt_columns_small", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 1 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_pillar.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_pillar.json new file mode 100644 index 000000000..0d156c7f7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/basalt_pillar.json @@ -0,0 +1,27 @@ +{ + "feature": "minecraft:basalt_pillar", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 200 + }, + "min_inclusive": { + "absolute": 80 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/venus/tags.venus.js b/kubejs/server_scripts/tfg/venus/tags.venus.js index f2b77e41a..d7d0e690b 100644 --- a/kubejs/server_scripts/tfg/venus/tags.venus.js +++ b/kubejs/server_scripts/tfg/venus/tags.venus.js @@ -93,12 +93,11 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'tfc:raw_sandstone/red') event.add('ad_astra:venus_stone_replaceables', 'tfc:sand/black') event.add('ad_astra:venus_stone_replaceables', 'tfc:raw_sandstone/black') - //event.add('ad_astra:venus_stone_replaceables', 'tfg:fluid/geyser_slurry') - //event.add('ad_astra:venus_stone_replaceables', 'tfg:fluid/sulfur_fumes') - event.add('ad_astra:venus_stone_replaceables', 'minecraft:lava') event.add('ad_astra:venus_stone_replaceables', 'create:scoria') event.add('ad_astra:venus_stone_replaceables', 'create:scorchia') event.add('ad_astra:venus_stone_replaceables', 'minecraft:tuff') + event.add('ad_astra:venus_stone_replaceables', 'minecraft:basalt') + event.add('ad_astra:venus_stone_replaceables', 'minecraft:smooth_basalt') event.add('ad_astra:venus_stone_replaceables', 'betterend:brimstone') event.add('ad_astra:venus_stone_replaceables', 'betterend:flavolite') event.add('ad_astra:venus_stone_replaceables', 'betterend:sandy_jadestone') diff --git a/kubejs/server_scripts/tfg/worldgen/entities.js b/kubejs/server_scripts/tfg/worldgen/entities.js index 491aee336..9415715c4 100644 --- a/kubejs/server_scripts/tfg/worldgen/entities.js +++ b/kubejs/server_scripts/tfg/worldgen/entities.js @@ -27,6 +27,7 @@ const NEW_MOB_MAX_HP = { "endermanoverhaul:desert_enderman": 70, "ad_astra:sulfur_creeper": 60, "species:cliff_hanger": 75, + "species:trooper": 20, // europa mobs "endermanoverhaul:ice_spikes_enderman": 85, @@ -75,6 +76,12 @@ EntityEvents.spawned((event) => { 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