From f0adb029c3cf6fc5b6ae61184e6b546a942aecf5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 7 May 2025 01:30:12 +0100 Subject: [PATCH] back on that moon decoration grindset --- kubejs/data/ad_astra/dimension/moon.json | 36 +++-- .../{lunar_plains.json => lunar_corals.json} | 42 +++--- ...te_delta.json => lunar_corals_sparse.json} | 0 ...nar_basalt_maria.json => lunar_maria.json} | 2 +- .../worldgen/biome/moon/lunar_sprouts.json | 131 ++++++++++++++++++ .../biome/moon/lunar_sprouts_sparse.json | 130 +++++++++++++++++ ...r_gabbro_uplift.json => lunar_uplift.json} | 0 .../moon/blob/smooth_basalt.json | 18 --- .../moon/surface/warped_roots_patch.json | 13 +- .../moon/surface/warped_sprouts_patch.json | 13 +- .../moon/surface/warped_vine.json | 31 ++++- .../moon/blob/smooth_basalt.json | 24 ---- .../moon/surface/warped_roots_patch.json | 7 +- .../moon/surface/warped_sprouts_patch.json | 7 +- .../moon/surface/warped_vine.json | 3 - kubejs/server_scripts/ad_astra/tags.js | 13 +- kubejs/startup_scripts/tfg/blocks.space.js | 32 ++++- 17 files changed, 396 insertions(+), 106 deletions(-) rename kubejs/data/tfg/worldgen/biome/moon/{lunar_plains.json => lunar_corals.json} (75%) rename kubejs/data/tfg/worldgen/biome/moon/{lunar_diorite_delta.json => lunar_corals_sparse.json} (100%) rename kubejs/data/tfg/worldgen/biome/moon/{lunar_basalt_maria.json => lunar_maria.json} (100%) create mode 100644 kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts.json create mode 100644 kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts_sparse.json rename kubejs/data/tfg/worldgen/biome/moon/{lunar_gabbro_uplift.json => lunar_uplift.json} (100%) delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/blob/smooth_basalt.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/blob/smooth_basalt.json diff --git a/kubejs/data/ad_astra/dimension/moon.json b/kubejs/data/ad_astra/dimension/moon.json index 88693e3f3..abd018142 100644 --- a/kubejs/data/ad_astra/dimension/moon.json +++ b/kubejs/data/ad_astra/dimension/moon.json @@ -7,49 +7,61 @@ "type": "minecraft:multi_noise", "biomes": [ { - "biome": "tfg:moon/lunar_plains", + "biome": "tfg:moon/lunar_sprouts", "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, + "continentalness": [ 0.3, 1 ], "erosion": 0, - "weirdness": -0.5, + "weirdness": 0, "depth": 0, "offset": 0 } }, { - "biome": "tfg:moon/lunar_basalt_maria", + "biome": "tfg:moon/lunar_sprouts_sparse", "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.5, + "continentalness": [ 0.15, 0.4 ], "erosion": 0, - "weirdness": -0.5, + "weirdness": 0, "depth": 0, "offset": 0 } }, { - "biome": "tfg:moon/lunar_gabbro_uplift", + "biome": "tfg:moon/lunar_uplift", "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.5, + "continentalness": [ -0.15, 0.15 ], "erosion": 0, - "weirdness": 0.5, + "weirdness": 0, "depth": 0, "offset": 0 } }, { - "biome": "tfg:moon/lunar_diorite_delta", + "biome": "tfg:moon/lunar_corals_sparse", "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, + "continentalness": [ -0.4, -0.15 ], "erosion": 0, - "weirdness": 0.5, + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "tfg:moon/lunar_corals", + "parameters": { + "temperature": 0, + "humidity": 0, + "continentalness": [ -1, -0.3 ], + "erosion": 0, + "weirdness": 0, "depth": 0, "offset": 0 } diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals.json similarity index 75% rename from kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json rename to kubejs/data/tfg/worldgen/biome/moon/lunar_corals.json index f0dec75b1..dcb14b818 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals.json @@ -42,24 +42,16 @@ [], [], [ - "tfg:moon/surface/moon_rock_pile", - "tfg:moon/surface/loose_moon_stone_rocks" + "tfg:moon/surface/dead_coral", + "tfg:moon/surface/dead_coral_fans", + "tfg:moon/surface/loose_diorite_rocks" ], [ "tfg:moon/hardening" ] ], "has_precipitation": false, - "spawn_costs": { - "minecraft:enderman": { - "charge": 0.7, - "energy_budget": 0.015 - }, - "endermanoverhaul:windswept_hills_enderman": { - "charge": 0.7, - "energy_budget": 0.015 - } - }, + "spawn_costs": {}, "spawners": { "ambient": [], "axolotls": [], @@ -68,14 +60,20 @@ "type": "minecraft:rabbit", "maxCount": 1, "minCount": 1, - "weight": 80 + "weight": 20 } ], "misc": [], "monster": [ { - "type": "species:limpet", - "maxCount": 2, + "type": "ad_astra:star_crawler", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "ad_astra:corrupted_lunarian", + "maxCount": 3, "minCount": 1, "weight": 100 }, @@ -83,13 +81,25 @@ "type": "minecraft:enderman", "maxCount": 1, "minCount": 1, + "weight": 50 + }, + { + "type": "minecraft:endermite", + "maxCount": 3, + "minCount": 1, "weight": 20 }, + { + "type": "species:limpet", + "maxCount": 2, + "minCount": 1, + "weight": 100 + }, { "type": "endermanoverhaul:windswept_hills_enderman", "maxCount": 1, "minCount": 1, - "weight": 20 + "weight": 100 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_diorite_delta.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json similarity index 100% rename from kubejs/data/tfg/worldgen/biome/moon/lunar_diorite_delta.json rename to kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_basalt_maria.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_maria.json similarity index 100% rename from kubejs/data/tfg/worldgen/biome/moon/lunar_basalt_maria.json rename to kubejs/data/tfg/worldgen/biome/moon/lunar_maria.json index 5bf6b5a97..799d47700 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_basalt_maria.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_maria.json @@ -43,9 +43,9 @@ [], [ "tfg:moon/surface/basalt_delta", - "tfg:moon/surface/warped_vine", "tfg:moon/surface/warped_roots_patch", "tfg:moon/surface/warped_sprouts_patch", + "tfg:moon/surface/warped_vine", "tfg:moon/surface/loose_basalt_rocks" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts.json new file mode 100644 index 000000000..5fab64afd --- /dev/null +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts.json @@ -0,0 +1,131 @@ +{ + "carvers": { + "air": [ + "minecraft:cave", + "minecraft:cave_extra_underground", + "minecraft:canyon" + ] + }, + "downfall": 0.0, + "effects": { + "fog_color": 0, + "mood_sound": { + "block_search_extent": 8, + "offset": 2.0, + "sound": "minecraft:ambient.cave", + "tick_delay": 6000 + }, + "sky_color": 0, + "water_color": 4159204, + "water_fog_color": 329011 + }, + "features": [ + [], + [], + [ + "tfg:moon/blob/asurine", + "tfg:earth/geode/amethyst", + "tfg:earth/geode/barite", + "tfg:earth/geode/calcite", + "tfg:earth/geode/gypsum", + "tfg:earth/geode/opal", + "tfg:earth/geode/pyrite", + "tfg:earth/geode/quartzite" + ], + [], + [ + "tfc:vein/gabbro_dike", + "tfc:vein/diorite_dike" + ], + [], + "#tfg:moon_veins", + [], + [], + [ + "tfg:moon/surface/warped_roots_patch", + "tfg:moon/surface/warped_sprouts_patch", + "tfg:moon/surface/warped_vine", + "tfg:moon/surface/moon_rock_pile", + "tfg:moon/surface/loose_moon_stone_rocks" + ], + [ + "tfg:moon/hardening" + ] + ], + "has_precipitation": false, + "spawn_costs": { + "minecraft:enderman": { + "charge": 0.7, + "energy_budget": 0.015 + }, + "endermanoverhaul:windswept_hills_enderman": { + "charge": 0.7, + "energy_budget": 0.015 + }, + "endermanoverhaul:soulsand_valley_enderman": { + "charge": 0.7, + "energy_budget": 0.015 + } + }, + "spawners": { + "ambient": [], + "axolotls": [], + "creature": [ + { + "type": "minecraft:rabbit", + "maxCount": 1, + "minCount": 1, + "weight": 80 + } + ], + "misc": [], + "monster": [ + { + "type": "ad_astra:star_crawler", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "ad_astra:corrupted_lunarian", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, + { + "type": "species:limpet", + "maxCount": 2, + "minCount": 1, + "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, + { + "type": "minecraft:endermite", + "maxCount": 4, + "minCount": 2, + "weight": 10 + }, + { + "type": "endermanoverhaul:windswept_hills_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, + { + "type": "endermanoverhaul:soulsand_valley_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 5 + } + ], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": -0.5 +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts_sparse.json new file mode 100644 index 000000000..c29419d5d --- /dev/null +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sprouts_sparse.json @@ -0,0 +1,130 @@ +{ + "carvers": { + "air": [ + "minecraft:cave", + "minecraft:cave_extra_underground", + "minecraft:canyon" + ] + }, + "downfall": 0.0, + "effects": { + "fog_color": 0, + "mood_sound": { + "block_search_extent": 8, + "offset": 2.0, + "sound": "minecraft:ambient.cave", + "tick_delay": 6000 + }, + "sky_color": 0, + "water_color": 4159204, + "water_fog_color": 329011 + }, + "features": [ + [], + [], + [ + "tfg:moon/blob/asurine", + "tfg:earth/geode/amethyst", + "tfg:earth/geode/barite", + "tfg:earth/geode/calcite", + "tfg:earth/geode/gypsum", + "tfg:earth/geode/opal", + "tfg:earth/geode/pyrite", + "tfg:earth/geode/quartzite" + ], + [], + [ + "tfc:vein/gabbro_dike", + "tfc:vein/diorite_dike" + ], + [], + "#tfg:moon_veins", + [], + [], + [ + "tfg:moon/surface/warped_roots_patch", + "tfg:moon/surface/warped_sprouts_patch", + "tfg:moon/surface/moon_rock_pile", + "tfg:moon/surface/loose_moon_stone_rocks" + ], + [ + "tfg:moon/hardening" + ] + ], + "has_precipitation": false, + "spawn_costs": { + "minecraft:enderman": { + "charge": 0.7, + "energy_budget": 0.015 + }, + "endermanoverhaul:windswept_hills_enderman": { + "charge": 0.7, + "energy_budget": 0.015 + }, + "endermanoverhaul:soulsand_valley_enderman": { + "charge": 0.7, + "energy_budget": 0.015 + } + }, + "spawners": { + "ambient": [], + "axolotls": [], + "creature": [ + { + "type": "minecraft:rabbit", + "maxCount": 1, + "minCount": 1, + "weight": 80 + } + ], + "misc": [], + "monster": [ + { + "type": "ad_astra:star_crawler", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "ad_astra:corrupted_lunarian", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, + { + "type": "species:limpet", + "maxCount": 2, + "minCount": 1, + "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, + { + "type": "minecraft:endermite", + "maxCount": 4, + "minCount": 2, + "weight": 10 + }, + { + "type": "endermanoverhaul:windswept_hills_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, + { + "type": "endermanoverhaul:soulsand_valley_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 5 + } + ], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": -0.5 +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_gabbro_uplift.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_uplift.json similarity index 100% rename from kubejs/data/tfg/worldgen/biome/moon/lunar_gabbro_uplift.json rename to kubejs/data/tfg/worldgen/biome/moon/lunar_uplift.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/blob/smooth_basalt.json b/kubejs/data/tfg/worldgen/configured_feature/moon/blob/smooth_basalt.json deleted file mode 100644 index 873a66bf6..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/blob/smooth_basalt.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:ore", - "config": { - "discard_chance_on_air_exposure": 0.0, - "size": 40, - "targets": [ - { - "state": { - "Name": "minecraft:smooth_basalt" - }, - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/basalt" - } - } - ] - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_roots_patch.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_roots_patch.json index 1a4a463b5..fd3649fdd 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_roots_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_roots_patch.json @@ -14,17 +14,22 @@ } }, "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:moon_stone_replaceables" } } ] }, - "tries": 64, - "xz_spread": 7, + "tries": 36, + "xz_spread": 15, "y_spread": 3 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_sprouts_patch.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_sprouts_patch.json index 177998972..35dba842b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_sprouts_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_sprouts_patch.json @@ -14,17 +14,22 @@ } }, "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:moon_stone_replaceables" } } ] }, - "tries": 48, - "xz_spread": 14, + "tries": 36, + "xz_spread": 16, "y_spread": 3 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine.json index 2f9c9b7ee..551557c0c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine.json @@ -5,20 +5,37 @@ "dirt_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "tfc:rock/gravel/basalt" + "Name": "ad_astra:moon_sand" } }, "foliage_placer": { "type": "minecraft:blob_foliage_placer", "height": 0, "offset": 1, - "radius": 0 + "radius": 1 }, "foliage_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 50, + "data": { + "Name": "minecraft:pearlescent_froglight" + } + }, + { + "weight": 30, + "data": { + "Name": "minecraft:verdant_froglight" + } + }, + { + "weight": 20, + "data": { + "Name": "minecraft:ochre_froglight" + } + } + ] }, "force_dirt": false, "ignore_vines": true, @@ -31,7 +48,7 @@ "trunk_placer": { "type": "minecraft:straight_trunk_placer", "base_height": 5, - "height_rand_a": 2, + "height_rand_a": 10, "height_rand_b": 0 }, "trunk_provider": { diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/blob/smooth_basalt.json b/kubejs/data/tfg/worldgen/placed_feature/moon/blob/smooth_basalt.json deleted file mode 100644 index e4f9db6c3..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/blob/smooth_basalt.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "feature": "tfg:moon/blob/smooth_basalt", - "placement": [ - { - "type": "minecraft:count", - "count": 8 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:trapezoid", - "max_inclusive": { - "absolute": 210 - }, - "min_inclusive": { - "absolute": 8 - } - } - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_roots_patch.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_roots_patch.json index 650d797c6..b868d9283 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_roots_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_roots_patch.json @@ -3,17 +3,14 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 5 + "chance": 3 }, { "type": "minecraft:in_square" }, { "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" + "heightmap": "WORLD_SURFACE" } ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_sprouts_patch.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_sprouts_patch.json index 2a500cb84..6040f5570 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_sprouts_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_sprouts_patch.json @@ -3,17 +3,14 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 3 + "chance": 2 }, { "type": "minecraft:in_square" }, { "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" + "heightmap": "WORLD_SURFACE" } ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine.json index aeec830b2..bcf79d425 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine.json @@ -11,9 +11,6 @@ { "type": "minecraft:heightmap", "heightmap": "MOTION_BLOCKING" - }, - { - "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 8868d545c..5bde44fc5 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -83,11 +83,20 @@ const registerAdAstraBlockTags = (event) => { event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/rhyolite') event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/andesite') event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/dacite') - - event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/hardened_moon_stone') + + event.add('ad_astra:moon_stone_replaceables', 'ad_astra:moon_sand') + event.add('ad_astra:moon_stone_replaceables', 'tfc:sand/white') + event.add('ad_astra:moon_stone_replaceables', 'tfc:sand/black') + event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/gravel/diorite') + event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/gravel/gabbro') + event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/gravel/basalt') + event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/gravel/rhyolite') + event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/gravel/andesite') + event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/gravel/dacite') event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/hardened_moon_deepslate') event.add('ad_astra:moon_stone_replaceables', 'ad_astra:glacio_stone') event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/hardened_glacio_stone') + event.add('ad_astra:moon_stone_replaceables', 'ad_astra:glacio_cobblestone') event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/raw/basalt') event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/hardened/basalt') event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/raw/gabbro') diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 4a290a518..4fe02dfc8 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -1,11 +1,33 @@ function registerTFGSpaceBlocks(event) { - const $Blocks = Java.loadClass('net.minecraft.world.level.block.Blocks') - const $Properties = Java.loadClass('net.minecraft.world.level.block.state.BlockBehaviour$Properties') - const $SproutsBlock = Java.loadClass('net.minecraft.world.level.block.NetherSproutsBlock') + // TODO: replace these two with new blocks from tfg-core so they have a proper CanSurvive + event.create('tfg:lunar_warped_roots') + .soundType('nether_sprouts') + .hardness(0.2) + .item(item => { + item.modelJson({ parent: 'minecraft:item/warped_roots' }) + }) + .tagBlock('tfc:can_carve') + .fullBlock(false) + .defaultCutout() + .model('tfg:block/lunar_warped_roots') + .box(3, 0, 3, 12, 12, 12, true) + .noCollision() + .noDrops() - event.createCustom(`tfg:lunar_warped_roots`, () => new $SproutsBlock($Properties.copy($Blocks.DEAD_TUBE_CORAL_BLOCK))) - event.createCustom(`tfg:lunar_sprouts`, () => new $SproutsBlock( $Properties.copy($Blocks.DEAD_TUBE_CORAL_BLOCK))) + event.create('tfg:lunar_sprouts') + .soundType('nether_sprouts') + .hardness(0.2) + .item(item => { + item.modelJson({ parent: 'minecraft:item/nether_sprouts' }) + }) + .tagBlock('tfc:can_carve') + .fullBlock(false) + .defaultCutout() + .model('tfg:block/lunar_sprouts') + .box(3, 0, 3, 12, 4, 12, true) + .noCollision() + .noDrops() event.create('tfg:rock/hardened_moon_stone') .stoneSoundType()