diff --git a/kubejs/assets/vintageimprovements/textures/block/sulfur_block.png b/kubejs/assets/vintageimprovements/textures/block/sulfur_block.png new file mode 100644 index 000000000..2ea74baf2 Binary files /dev/null and b/kubejs/assets/vintageimprovements/textures/block/sulfur_block.png differ diff --git a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json index 0484aa1c5..1919f5236 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json @@ -4,8 +4,8 @@ }, "downfall": 0, "effects": { - "sky_color": 10465603, - "fog_color": 9938052, + "sky_color": 11644227, + "fog_color": 10788996, "water_color": 8241044, "water_fog_color": 10866612, "grass_color": 13758586, @@ -20,7 +20,7 @@ "options": { "type": "minecraft:ash" }, - "probability": 0.1 + "probability": 0.03 } }, "features": [ @@ -38,9 +38,12 @@ "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", - "tfc:cobble_boulder_small_patch" + "tfc:cobble_boulder_small_patch", + "tfg:venus/terrain/thermal_vent_rare" + ], + [ + "tfg:venus/surface/sulfur_patch" ], - [], "#tfg:venus_top_layer_modification" ], "has_precipitation": true, diff --git a/kubejs/data/tfg/worldgen/biome/venus/geysers.json b/kubejs/data/tfg/worldgen/biome/venus/geysers.json index c75ade2c8..48cd0de43 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/geysers.json +++ b/kubejs/data/tfg/worldgen/biome/venus/geysers.json @@ -39,7 +39,8 @@ [ "tfc:raw_boulder_small_patch", "tfc:cobble_boulder_small_patch", - "tfg:venus/surface/geyser_source_patch" + "tfg:venus/surface/geyser_source_patch", + "tfg:venus/terrain/thermal_vent_rare" ], [], "#tfg:venus_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json index 63ee49846..01722f1a0 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json +++ b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json @@ -5,7 +5,7 @@ "downfall": 0, "effects": { "sky_color": 10465603, - "fog_color": 9938052, + "fog_color": 12237498, "water_color": 8241044, "water_fog_color": 10866612, "grass_color": 13758586, @@ -20,7 +20,7 @@ "options": { "type": "minecraft:ash" }, - "probability": 0.1 + "probability": 0.02 } }, "features": [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json index 8d3c0451c..065dec95d 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json +++ b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json @@ -4,8 +4,8 @@ }, "downfall": 0, "effects": { - "sky_color": 10465603, - "fog_color": 9938052, + "sky_color": 11644227, + "fog_color": 10788996, "water_color": 8241044, "water_fog_color": 10866612, "grass_color": 13758586, @@ -20,7 +20,7 @@ "options": { "type": "minecraft:ash" }, - "probability": 0.1 + "probability": 0.05 } }, "features": [ @@ -37,10 +37,11 @@ "#tfg:venus_veins", "#tfg:venus_underground_decoration", [ - "tfg:venus/surface/stromatolite_cluster_patch" + "tfg:venus/surface/stromatolite_cluster_patch", + "tfg:venus/terrain/thermal_vent_rare" ], [ - + "tfg:venus/surface/sulfur_patch" ], "#tfg:venus_top_layer_modification" ], diff --git a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json index b5bd95447..8be57e46a 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json +++ b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json @@ -4,8 +4,8 @@ }, "downfall": 0, "effects": { - "sky_color": 10465603, - "fog_color": 9938052, + "sky_color": 11644227, + "fog_color": 12232752, "water_color": 8241044, "water_fog_color": 10866612, "grass_color": 13758586, @@ -20,7 +20,7 @@ "options": { "type": "minecraft:ash" }, - "probability": 0.1 + "probability": 0.05 } }, "features": [ @@ -35,10 +35,14 @@ "#tfg:venus_veins", "#tfg:venus_underground_decoration", [ + "tfg:venus/terrain/sulfur_blob", "tfc:raw_boulder_small_patch", - "tfc:cobble_boulder_small_patch" + "tfc:cobble_boulder_small_patch", + "tfg:venus/terrain/thermal_vent" + ], + [ + "tfg:venus/surface/sulfur_patch" ], - [], "#tfg:venus_top_layer_modification" ], "has_precipitation": true, diff --git a/kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json b/kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json index 73db60050..7a6b92b61 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json @@ -45,7 +45,8 @@ "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", - "tfc:cobble_boulder_small_patch" + "tfc:cobble_boulder_small_patch", + "tfg:venus/terrain/thermal_vent_rare" ], [ "tfg:venus/terrain/lava_fill" 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 new file mode 100644 index 000000000..65a026404 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/sulfur_crystals.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:sulphur_crystal" + } + } + } + }, + "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" + ] + } + ] + } + } + ] + }, + "tries": 24, + "xz_spread": 3, + "y_spread": 0 + } +} \ 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 02371764e..5e543a20e 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 @@ -1,9 +1,9 @@ { - "type": "minecraft:delta_feature", - "config": { - "contents": { - "Name": "tfg:geyser_slurry" - }, + "type": "minecraft:delta_feature", + "config": { + "contents": { + "Name": "tfg:fluid/geyser_slurry" + }, "rim": { "Name": "tfg:rock/raw/geyserite" }, @@ -21,5 +21,5 @@ "min_inclusive": 4 } } - } + } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_columns.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_columns.json new file mode 100644 index 000000000..bf53f5020 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_columns.json @@ -0,0 +1,71 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:block_column", + "config": { + "direction": "up", + "allowed_placement": { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air", + "tfg:fluid/sulfur_fumes", + "tfg:fluid/geyser_slurry", + "minecraft:lava" + ] + }, + "prioritize_tip": false, + "layers": [ + { + "height": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:sulphuric_rock" + } + } + } + ] + } + }, + "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", + "minecraft:lava", + "tfg:fluid/sulfur_fumes", + "tfg:fluid/geyser_slurry" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": "betterend:sulphuric_rock" + } + ] + } + } + ] + }, + "tries": 32, + "xz_spread": 3, + "y_spread": 0 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_disk.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_disk.json new file mode 100644 index 000000000..37f12ab84 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_disk.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:disk", + "config": { + "state_provider": { + "fallback": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:sulphuric_rock" + } + }, + "rules": [] + }, + "radius": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 3, + "max_inclusive": 4 + } + }, + "half_height": 2, + "target": { + "type": "minecraft:matching_block_tag", + "tag": "ad_astra:venus_stone_replaceables" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_tube_worms.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_tube_worms.json new file mode 100644 index 000000000..a6eea8f10 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_tube_worms.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "tfg:attached_decorative_plant", + "config": { + "block": "betterend:tube_worm", + "heightRange": 5 + } + }, + "placement": [] + }, + "tries": 36, + "xz_spread": 4, + "y_spread": 0 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json new file mode 100644 index 000000000..dcbb0a413 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json @@ -0,0 +1,47 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:hydrothermal_vent" + } + } + } + }, + "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" + ] + }, + { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": "betterend:sulphuric_rock" + } + ] + } + } + ] + }, + "tries": 32, + "xz_spread": 2, + "y_spread": 0 + } +} \ 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 index 25d0e1bf4..d6aae93b0 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lakes.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lakes.json @@ -4,7 +4,7 @@ "to_place": { "type": "minecraft:simple_state_provider", "state": { - "Name": "tfg:geyser_slurry", + "Name": "tfg:fluid/geyser_slurry", "Properties": { "level": "0" } diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_blob.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_blob.json new file mode 100644 index 000000000..e163d2da2 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_blob.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 15, + "targets": [ + { + "state": { + "Name": "vintageimprovements:sulfur_block" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "ad_astra:venus_stone_replaceables" + } + } + ] + } +} \ 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 80bcb2e05..166ef402a 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -3365,12 +3365,12 @@ { "Name": "create:ochrum" }, { "Name": "betterend:sulphuric_rock" }, { "Name": "betterend:sandy_jadestone" }, - { "Name": "betterend:lacugrove_bark" }, { "Name": "tfg:sandstone/raw/fluorapatite/brown" }, { "Name": "tfg:sandstone/raw/fluorapatite/orange" }, { "Name": "tfg:sandstone/raw/fluorapatite/yellow" }, { "Name": "tfg:sandstone/raw/fluorapatite/yellow" }, { "Name": "tfg:sandstone/raw/fluorapatite/yellow" }, + { "Name": "vintageimprovements:sulfur_block" }, { "Name": "tfc:raw_sandstone/black" } ], "fallback": { diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/sulfur_patch.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/sulfur_patch.json new file mode 100644 index 000000000..cdfa8aa91 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/sulfur_patch.json @@ -0,0 +1,26 @@ +{ + "feature": "beneath:sulfur_patch", + "placement": [ + { + "type": "minecraft:count", + "count": 5 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "tfc:near_fluid", + "fluids": [ + "tfg:sulfur_fumes" + ], + "radius": 5 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_blob.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_blob.json new file mode 100644 index 000000000..091cc6827 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_blob.json @@ -0,0 +1,31 @@ +{ + "feature": { + "type": "tfc:if_then", + "config": { + "if": { + "feature": "tfg:venus/terrain/sulfur_blob", + "placement": [] + }, + "then": { + "feature": "tfg:venus/surface/sulfur_crystals", + "placement": [] + } + } + }, + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 1 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent.json new file mode 100644 index 000000000..b50e70ebd --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent.json @@ -0,0 +1,46 @@ +{ + "feature": { + "type": "tfc:multiple", + "config": { + "features": [ + { + "feature": "tfg:venus/terrain/ignimbrite_disk", + "placement": [] + }, + { + "feature": "tfg:venus/terrain/ignimbrite_columns", + "placement": [] + }, + { + "feature": "tfg:venus/terrain/ignimbrite_vents", + "placement": [] + }, + { + "feature": "tfg:venus/terrain/ignimbrite_tube_worms", + "placement": [] + } + ] + } + }, + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 1 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": -1 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent_rare.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent_rare.json new file mode 100644 index 000000000..fa99f779f --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent_rare.json @@ -0,0 +1,46 @@ +{ + "feature": { + "type": "tfc:multiple", + "config": { + "features": [ + { + "feature": "tfg:venus/terrain/ignimbrite_disk", + "placement": [] + }, + { + "feature": "tfg:venus/terrain/ignimbrite_columns", + "placement": [] + }, + { + "feature": "tfg:venus/terrain/ignimbrite_vents", + "placement": [] + }, + { + "feature": "tfg:venus/terrain/ignimbrite_tube_worms", + "placement": [] + } + ] + } + }, + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 4 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": -1 + } + ] +} \ 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 b41ce3ec4..877080d57 100644 --- a/kubejs/server_scripts/tfg/venus/tags.venus.js +++ b/kubejs/server_scripts/tfg/venus/tags.venus.js @@ -31,36 +31,52 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'ad_astra:venus_stone') event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_venus_stone') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/gravel_venus') event.add('ad_astra:venus_stone_replaceables', 'gtceu:red_granite') event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_red_granite') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/gravel_red_granite') event.add('ad_astra:venus_stone_replaceables', 'ad_astra:moon_deepslate') event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_moon_deepslate') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/gravel_moon_deepslate') event.add('ad_astra:venus_stone_replaceables', 'minecraft:deepslate') event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_deepslate') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/gravel_deepslate') event.add('ad_astra:venus_stone_replaceables', 'minecraft:dripstone_block') event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_dripstone') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/gravel_dripstone') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/granite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/granite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/granite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/diorite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/diorite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/diorite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/gabbro') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/gabbro') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/gabbro') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/basalt') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/basalt') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/basalt') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/rhyolite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/andesite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/andesite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/dacite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/dacite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/dacite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/slate') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/slate') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/slate') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/schist') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/schist') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/schist') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/gneiss') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/gneiss') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/gneiss') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/phyllite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/phyllite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/phyllite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/quartzite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/quartzite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/quartzite') event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/blue') event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/blue') event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/green') @@ -73,8 +89,12 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/white') event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/yellow') event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/yellow') - 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', 'tfc:sand/red') + 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') diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index e406882eb..6770553fe 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -470,14 +470,12 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:netherite_scrap', 'minecraft:suspicious_gravel', 'minecraft:gravel', - 'minecraft:large_fern', 'minecraft:tall_grass', 'minecraft:sculk_vein', 'minecraft:lily_pad', 'minecraft:vine', 'minecraft:seagrass', 'minecraft:grass', - 'minecraft:fern', 'minecraft:dandelion', 'minecraft:poppy', 'minecraft:blue_orchid', @@ -491,8 +489,6 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:cornflower', 'minecraft:lily_of_the_valley', 'minecraft:wither_rose', - 'minecraft:torchflower', - 'minecraft:pitcher_plant', 'minecraft:sculk', 'minecraft:sculk_vein', 'minecraft:sculk_catalyst', diff --git a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js index 48ebb4aa1..a30788490 100644 --- a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js +++ b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js @@ -185,7 +185,7 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .particleOffset(0.3, 1, 0.3) .particleVelocity(0, 0.1, 0) .particle('minecraft:large_smoke') - .particleCount(5) + .particleCount(2) .particleForced(true) event.create('betterend:tube_worm', 'tfg:attached_decorative_plant')