diff --git a/kubejs/assets/tfg/textures/block/planets/venus/geyser_slurry_flow.png b/kubejs/assets/tfg/textures/block/planets/venus/geyser_slurry_flow.png new file mode 100644 index 000000000..c05015d09 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/geyser_slurry_flow.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/super_heated_slurry_flow.png.mcmeta b/kubejs/assets/tfg/textures/block/planets/venus/geyser_slurry_flow.png.mcmeta similarity index 56% rename from kubejs/assets/tfg/textures/block/planets/venus/super_heated_slurry_flow.png.mcmeta rename to kubejs/assets/tfg/textures/block/planets/venus/geyser_slurry_flow.png.mcmeta index 0645f48c6..8e55e43ba 100644 --- a/kubejs/assets/tfg/textures/block/planets/venus/super_heated_slurry_flow.png.mcmeta +++ b/kubejs/assets/tfg/textures/block/planets/venus/geyser_slurry_flow.png.mcmeta @@ -1,5 +1,5 @@ { "animation": { - "frametime": 2 + "frametime": 3 } } diff --git a/kubejs/assets/tfg/textures/block/planets/venus/geyser_slurry_still.png b/kubejs/assets/tfg/textures/block/planets/venus/geyser_slurry_still.png new file mode 100644 index 000000000..c19ac8bf3 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/geyser_slurry_still.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/super_heated_slurry_still.png.mcmeta b/kubejs/assets/tfg/textures/block/planets/venus/geyser_slurry_still.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/block/planets/venus/super_heated_slurry_still.png.mcmeta rename to kubejs/assets/tfg/textures/block/planets/venus/geyser_slurry_still.png.mcmeta diff --git a/kubejs/assets/tfg/textures/block/planets/venus/super_heated_slurry_flow.png b/kubejs/assets/tfg/textures/block/planets/venus/super_heated_slurry_flow.png deleted file mode 100644 index 3378326fe..000000000 Binary files a/kubejs/assets/tfg/textures/block/planets/venus/super_heated_slurry_flow.png and /dev/null differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/super_heated_slurry_still.png b/kubejs/assets/tfg/textures/block/planets/venus/super_heated_slurry_still.png deleted file mode 100644 index 99f283c5f..000000000 Binary files a/kubejs/assets/tfg/textures/block/planets/venus/super_heated_slurry_still.png and /dev/null differ diff --git a/kubejs/data/tfg/worldgen/biome/venus/venus_fractured_lands.json b/kubejs/data/tfg/worldgen/biome/venus/venus_fractured_lands.json index d9157a93e..965eb2a07 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/venus_fractured_lands.json +++ b/kubejs/data/tfg/worldgen/biome/venus/venus_fractured_lands.json @@ -24,5 +24,7 @@ "spawners": {}, "starts": [], "carvers": {}, - "features": [] + "features": [ + "#tfg:venus_fractured_lands_terrain_features" + ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/hot_spring_delta.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/hot_spring_delta.json index 89720a68e..02371764e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/hot_spring_delta.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/hot_spring_delta.json @@ -2,7 +2,7 @@ "type": "minecraft:delta_feature", "config": { "contents": { - "Name": "tfg:super_heated_slurry" + "Name": "tfg:geyser_slurry" }, "rim": { "Name": "tfg:rock/raw/geyserite" diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_basalt_gravel.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_basalt_gravel.json new file mode 100644 index 000000000..a3b3eee8d --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_basalt_gravel.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:disk", + "config": { + "half_height": 4, + "radius": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 4, + "max_inclusive": 8 + } + }, + "state_provider": { + "fallback": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfc:rock/gravel/basalt" + } + }, + "rules": [] + }, + "target": { + "type": "minecraft:matching_blocks", + "blocks": [ + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert" + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_basalt_stone.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_basalt_stone.json new file mode 100644 index 000000000..77e579c34 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_basalt_stone.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:disk", + "config": { + "half_height": 3, + "radius": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 4, + "max_inclusive": 6 + } + }, + "state_provider": { + "fallback": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfc:rock/hardened/basalt" + } + }, + "rules": [] + }, + "target": { + "type": "minecraft:matching_blocks", + "blocks": [ + "tfc:rock/gravel/basalt", + + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert" + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_geyserite.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_geyserite.json new file mode 100644 index 000000000..d94dfd3a0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_geyserite.json @@ -0,0 +1,38 @@ +{ + "type": "minecraft:disk", + "config": { + "half_height": 2, + "radius": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 3, + "max_inclusive": 4 + } + }, + "state_provider": { + "fallback": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:rock/raw/geyserite" + } + }, + "rules": [] + }, + "target": { + "type": "minecraft:matching_blocks", + "blocks": [ + "tfc:rock/gravel/basalt", + "tfc:rock/hardened/basalt", + + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert" + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_orange_sand.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_orange_sand.json new file mode 100644 index 000000000..bccc8591a --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_orange_sand.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:disk", + "config": { + "half_height": 1, + "radius": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 2, + "max_inclusive": 3 + } + }, + "state_provider": { + "fallback": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:sand/fluorapatite/orange" + } + }, + "rules": [] + }, + "target": { + "type": "minecraft:matching_blocks", + "blocks": [ + "tfc:rock/gravel/basalt", + "tfc:rock/hardened/basalt", + "tfg:rock/raw/geyserite", + + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert" + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_yellow_sand.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_yellow_sand.json new file mode 100644 index 000000000..a90ceb638 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_yellow_sand.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:disk", + "config": { + "half_height": 0, + "radius": 1, + "state_provider": { + "fallback": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:sand/fluorapatite/yellow" + } + }, + "rules": [] + }, + "target": { + "type": "minecraft:matching_blocks", + "blocks": [ + "tfc:rock/gravel/basalt", + "tfc:rock/hardened/basalt", + "tfg:rock/raw/geyserite", + "tfg:sand/fluorapatite/orange", + + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert" + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lakes.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lakes.json new file mode 100644 index 000000000..95f453f44 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lakes.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:geyser_slurry", + "Properties": { + "level": "0" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_delta.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_delta.json new file mode 100644 index 000000000..8ab7a0126 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_delta.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:delta_feature", + "config": { + "contents": { + "Name": "minecraft:lava" + }, + "rim": { + "Name": "tfc:rock/hardened/basalt" + }, + "rim_size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + }, + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 16, + "min_inclusive": 4 + } + } + } +} \ 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 7b0e981ab..4b663344f 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -436,10 +436,10 @@ { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 0, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sand/fluorapatite/green" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 1, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sand/fluorapatite/green" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 2, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/blue" } } }, - { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 3, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/orange" } } }, + { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 3, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfc:deposit/native_gold/chert" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 4, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/white" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 5, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" } } }, - { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 6, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/orange" } } }, + { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 6, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfc:deposit/native_gold/chert" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 7, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/blue" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 8, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/white" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 0, "surface_type": "ceiling", "add_surface_depth": true, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/blue" } } } @@ -457,16 +457,16 @@ "then_run": { "type": "minecraft:sequence", "sequence": [ - { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 0, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sand/fluorapatite/orange" } } }, - { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 1, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sand/fluorapatite/orange" } } }, - { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 2, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/orange" } } }, + { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 0, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfc:deposit/native_silver/chert" } } }, + { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 1, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfc:deposit/native_silver/chert" } } }, + { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 2, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfc:deposit/native_gold/chert" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 3, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 4, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/white" } } }, - { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 5, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/orange" } } }, + { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 5, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfc:deposit/native_gold/chert" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 6, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/white" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 7, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/blue" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 8, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/white" } } }, - { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 0, "surface_type": "ceiling", "add_surface_depth": true, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/orange" } } } + { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 0, "surface_type": "ceiling", "add_surface_depth": true, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfc:deposit/native_gold/chert" } } } ] } }, @@ -489,7 +489,7 @@ { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 5, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/blue" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 6, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 7, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/white" } } }, - { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 8, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/orange" } } }, + { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 8, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfc:deposit/native_gold/chert" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 0, "surface_type": "ceiling", "add_surface_depth": true, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/blue" } } } ] } @@ -498,7 +498,7 @@ { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 1, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sand/fluorapatite/white" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 2, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/white" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 3, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/white" } } }, - { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 4, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/orange" } } }, + { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 4, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfc:deposit/native_gold/chert" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 5, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/blue" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 6, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/blue" } } }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", "offset": 7, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:block", "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" } } }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_basalt_gravel.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_basalt_gravel.json new file mode 100644 index 000000000..755e3d275 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_basalt_gravel.json @@ -0,0 +1,34 @@ +{ + "feature": "tfg:venus/terrain/lake_basalt_gravel", + "placement": [ + { + "type": "minecraft:count", + "count": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 67 + }, + "max_inclusive": { + "absolute": 70 + } + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_fluids", + "fluids": "tfg:geyser_slurry" + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_basalt_stone.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_basalt_stone.json new file mode 100644 index 000000000..47d91e7a5 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_basalt_stone.json @@ -0,0 +1,34 @@ +{ + "feature": "tfg:venus/terrain/lake_basalt_stone", + "placement": [ + { + "type": "minecraft:count", + "count": 228 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 67 + }, + "max_inclusive": { + "absolute": 70 + } + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_fluids", + "fluids": "tfg:geyser_slurry" + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_geyserite.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_geyserite.json new file mode 100644 index 000000000..040164f66 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_geyserite.json @@ -0,0 +1,34 @@ +{ + "feature": "tfg:venus/terrain/lake_geyserite", + "placement": [ + { + "type": "minecraft:count", + "count": 228 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 67 + }, + "max_inclusive": { + "absolute": 70 + } + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_fluids", + "fluids": "tfg:geyser_slurry" + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_orange_sand.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_orange_sand.json new file mode 100644 index 000000000..601fef6e8 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_orange_sand.json @@ -0,0 +1,38 @@ +{ + "feature": "tfg:venus/terrain/lake_orange_sand", + "placement": [ + { + "type": "minecraft:count", + "count": 4 + }, + { + "type": "minecraft:count", + "count": 82 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 67 + }, + "max_inclusive": { + "absolute": 70 + } + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_fluids", + "fluids": "tfg:geyser_slurry" + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_yellow_sand.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_yellow_sand.json new file mode 100644 index 000000000..2e55be876 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_yellow_sand.json @@ -0,0 +1,38 @@ +{ + "feature": "tfg:venus/terrain/lake_yellow_sand", + "placement": [ + { + "type": "minecraft:count", + "count": 188 + }, + { + "type": "minecraft:count", + "count": 6 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 68 + }, + "max_inclusive": { + "absolute": 68 + } + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_fluids", + "fluids": "tfg:geyser_slurry" + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lakes.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lakes.json new file mode 100644 index 000000000..9bc2823cf --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lakes.json @@ -0,0 +1,400 @@ +{ + "feature": "tfg:venus/terrain/lakes", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:count", + "count": 30 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "minecraft:biome" + }, + { + "type": "count", + "count": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 5, + "max_inclusive": 5 + } + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": -4, + "max_inclusive": 4 + } + }, + "y_spread": 0 + }, + { + "type": "environment_scan", + "direction_of_search": "down", + "max_steps": 6, + "target_condition": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:not", + "predicate": { + "type": "minecraft:any_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "offset": [ + -1, + 0, + 0 + ], + "blocks": [ + "tfc:rock/hardened/basalt", + "tfg:sand/fluorapatite/orange", + "tfg:rock/raw/geyserite", + "minecraft:air", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + 1, + 0, + 0 + ], + "blocks": [ + "tfc:rock/hardened/basalt", + "tfg:sand/fluorapatite/orange", + "tfg:rock/raw/geyserite", + "minecraft:air", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + 0, + -1 + ], + "blocks": [ + "tfc:rock/hardened/basalt", + "tfg:sand/fluorapatite/orange", + "tfg:rock/raw/geyserite", + "minecraft:air", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + 0, + 1 + ], + "blocks": [ + "tfc:rock/hardened/basalt", + "tfg:sand/fluorapatite/orange", + "tfg:rock/raw/geyserite", + "minecraft:air", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + -1, + 0, + -1 + ], + "blocks": [ + "tfc:rock/hardened/basalt", + "tfg:sand/fluorapatite/orange", + "tfg:rock/raw/geyserite", + "minecraft:air", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + 1, + 0, + 1 + ], + "blocks": [ + "tfc:rock/hardened/basalt", + "tfg:sand/fluorapatite/orange", + "tfg:rock/raw/geyserite", + "minecraft:air", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + 1, + 0, + -1 + ], + "blocks": [ + "tfc:rock/hardened/basalt", + "tfg:sand/fluorapatite/orange", + "tfg:rock/raw/geyserite", + "minecraft:air", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + -1, + 0, + 1 + ], + "blocks": [ + "tfc:rock/hardened/basalt", + "tfg:sand/fluorapatite/orange", + "tfg:rock/raw/geyserite", + "minecraft:air", + "minecraft:lava" + ] + } + ] + } + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + 0, + 0 + ], + "blocks": [ + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert" + ] + }, + { + "type": "minecraft:not", + "predicate": { + "type": "minecraft:any_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "offset": [ + -1, + 1, + 0 + ], + "blocks": [ + "tfc:rock/gravel/basalt", + "tfc:rock/hardened/basalt", + "tfg:rock/raw/geyserite", + "tfg:sand/fluorapatite/orange", + + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + 1, + 1, + 0 + ], + "blocks": [ + "tfc:rock/gravel/basalt", + "tfc:rock/hardened/basalt", + "tfg:rock/raw/geyserite", + "tfg:sand/fluorapatite/orange", + + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + 1, + -1 + ], + "blocks": [ + "tfc:rock/gravel/basalt", + "tfc:rock/hardened/basalt", + "tfg:rock/raw/geyserite", + "tfg:sand/fluorapatite/orange", + + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + 1, + 1 + ], + "blocks": [ + "tfc:rock/gravel/basalt", + "tfc:rock/hardened/basalt", + "tfg:rock/raw/geyserite", + "tfg:sand/fluorapatite/orange", + + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + -1, + 1, + -1 + ], + "blocks": [ + "tfc:rock/gravel/basalt", + "tfc:rock/hardened/basalt", + "tfg:rock/raw/geyserite", + "tfg:sand/fluorapatite/orange", + + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + -1, + 1, + 1 + ], + "blocks": [ + "tfc:rock/gravel/basalt", + "tfc:rock/hardened/basalt", + "tfg:rock/raw/geyserite", + "tfg:sand/fluorapatite/orange", + + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + 1, + 1, + -1 + ], + "blocks": [ + "tfc:rock/gravel/basalt", + "tfc:rock/hardened/basalt", + "tfg:rock/raw/geyserite", + "tfg:sand/fluorapatite/orange", + + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert", + "minecraft:lava" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ + 1, + 1, + 1 + ], + "blocks": [ + "tfc:rock/gravel/basalt", + "tfc:rock/hardened/basalt", + "tfg:rock/raw/geyserite", + "tfg:sand/fluorapatite/orange", + + "tfg:sand/fluorapatite/green", + "tfg:sandstone/raw/fluorapatite/green", + "tfg:sand/fluorapatite/white", + "tfg:sandstone/raw/fluorapatite/white", + "tfg:sand/fluorapatite/blue", + "tfg:sandstone/raw/fluorapatite/blue", + "tfc:deposit/native_silver/chert", + "tfc:deposit/native_gold/chert", + "minecraft:lava" + ] + } + ] + } + } + ] + } + } + ] +} diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lava_delta.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lava_delta.json new file mode 100644 index 000000000..638c977d1 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lava_delta.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:venus/terrain/lava_delta", + "placement": [ + { + "type": "minecraft:count", + "count": 1 + }, + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 200 + }, + "min_inclusive": { + "above_bottom": 54 + } + } + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 40a2ed96a..0a3caa72a 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -350,5 +350,13 @@ const registerAdAstraPlacedFeatures = (event) => { event.add('tfg:venus_delta_surface_features', 'tfg:venus/surface/stromatolite_tower') event.add('tfg:venus_delta_terrain_features', 'tfg:venus/terrain/hot_spring_delta') + event.add('tfg:venus_delta_terrain_features', 'tfg:venus/terrain/lava_delta') event.add('tfg:venus_delta_terrain_features', 'tfg:venus/terrain/stromatolite_disk') + + event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lakes') + event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_basalt_gravel') + event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_basalt_stone') + event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_geyserite') + event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_orange_sand') + event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_yellow_sand') } diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 9697306e2..12af4f721 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -352,39 +352,6 @@ function registerTFGSpaceBlocks(event) { .mapColor(`color_${color}`) .fullBlock(true) .opaque(true) - //Raw Sandstone Wall - event.create(`tfg:sandstone/wall/raw/fluorapatite/${color}`, 'wall') - .textureAll(`tfg:block/planets/venus/sandstone_bottom_fluorapatite_${color}`) - .hardness(0.8) - .resistance(0.8) - .soundType('stone') - .requiresTool(true) - .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) - .fullBlock(true) - .opaque(true) - //Raw Sandstone Slab - event.create(`tfg:sandstone/slab/raw/fluorapatite/${color}`, 'slab') - .textureAll(`tfg:block/planets/venus/sandstone_bottom_fluorapatite_${color}`) - .hardness(0.8) - .resistance(0.8) - .soundType('stone') - .requiresTool(true) - .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) - .fullBlock(true) - .opaque(true) - //Raw Sandstone Stairs - event.create(`tfg:sandstone/stairs/raw/fluorapatite/${color}`, 'stairs') - .textureAll(`tfg:block/planets/venus/sandstone_bottom_fluorapatite_${color}`) - .hardness(0.8) - .resistance(0.8) - .soundType('stone') - .requiresTool(true) - .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) - .fullBlock(true) - .opaque(true) //Smooth Sandstone event.create(`tfg:sandstone/smooth/fluorapatite/${color}`) .textureAll(`tfg:block/planets/venus/sandstone_top_fluorapatite_${color}`) @@ -398,39 +365,6 @@ function registerTFGSpaceBlocks(event) { .mapColor(`color_${color}`) .fullBlock(true) .opaque(true) - //Smooth Sandstone Wall - event.create(`tfg:sandstone/smooth/wall/fluorapatite/${color}`, 'wall') - .textureAll(`tfg:block/planets/venus/sandstone_top_fluorapatite_${color}`) - .hardness(0.8) - .resistance(0.8) - .soundType('stone') - .requiresTool(true) - .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) - .fullBlock(true) - .opaque(true) - //Smooth Sandstone Slab - event.create(`tfg:sandstone/smooth/slab/fluorapatite/${color}`, 'slab') - .textureAll(`tfg:block/planets/venus/sandstone_top_fluorapatite_${color}`) - .hardness(0.8) - .resistance(0.8) - .soundType('stone') - .requiresTool(true) - .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) - .fullBlock(true) - .opaque(true) - //Smooth Sandstone Stairs - event.create(`tfg:sandstone/smooth/stairs/fluorapatite/${color}`, 'stairs') - .textureAll(`tfg:block/planets/venus/sandstone_top_fluorapatite_${color}`) - .hardness(0.8) - .resistance(0.8) - .soundType('stone') - .requiresTool(true) - .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) - .fullBlock(true) - .opaque(true) //Chiseled Sandstone event.create(`tfg:sandstone/smooth/chiseled/fluorapatite/${color}`) .textureAll(`tfg:block/planets/venus/sandstone_chiseled_fluorapatite_${color}`) diff --git a/kubejs/startup_scripts/tfg/fluids.js b/kubejs/startup_scripts/tfg/fluids.js index 6e2670ff9..d7e7599e6 100644 --- a/kubejs/startup_scripts/tfg/fluids.js +++ b/kubejs/startup_scripts/tfg/fluids.js @@ -44,10 +44,11 @@ const registerTFGFluids = (event) => { .density(0) .renderType('translucent') - event.create('tfg:super_heated_slurry', 'tfc:spring') - .stillTexture('tfg:block/planets/venus/super_heated_slurry_still') - .flowingTexture('tfg:block/planets/venus/super_heated_slurry_flow') + event.create('tfg:geyser_slurry', 'tfc:spring') + .stillTexture('tfg:block/planets/venus/geyser_slurry_still') + .flowingTexture('tfg:block/planets/venus/geyser_slurry_flow') .bucketColor(0xc4d984) + .temperature(1000) .renderType('translucent') //#endregion } \ No newline at end of file