From 757dd63ff65858cfc14eed684cabdcbe146930b0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 20 Dec 2025 17:58:23 +0000 Subject: [PATCH] Add mossy cobble to beneath, fix bastion loot chests (#2485) * add mossy cobble blobs to beneath * fix deepslate mossy cobble landslide * fix mossy cobble * fix bastion chests --- .../loot_tables/chests/bastion_bridge.json | 2 +- .../chests/bastion_hoglin_stable.json | 2 +- .../loot_tables/chests/bastion_other.json | 2 +- .../tfg/worldgen/biome/nether/ash_forest.json | 3 +- .../worldgen/biome/nether/basalt_deltas.json | 3 +- .../biome/nether/decaying_caverns.json | 3 +- .../worldgen/biome/nether/diorite_caves.json | 3 +- .../worldgen/biome/nether/gabbro_caves.json | 3 +- .../worldgen/biome/nether/gneiss_caves.json | 3 +- .../worldgen/biome/nether/granite_caves.json | 3 +- .../tfg/worldgen/biome/nether/lava_floes.json | 3 +- .../worldgen/biome/nether/lush_hollow.json | 4 +- .../worldgen/biome/nether/schist_caves.json | 3 +- .../worldgen/biome/nether/webbed_lair.json | 3 +- .../nether/terrain/mossy_cobble.json | 99 +++++++++++++++++++ .../nether/terrain/mossy_cobble.json | 24 +++++ .../tfg/natural_blocks/recipes.collapse.js | 2 +- 17 files changed, 150 insertions(+), 15 deletions(-) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/nether/terrain/mossy_cobble.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/nether/terrain/mossy_cobble.json diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json index 6aaa98888..95c89e635 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json @@ -217,7 +217,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1},}" + "tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1}}" } ], "weight": 100 diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json index 3c73933cf..cb2e48916 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json @@ -217,7 +217,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\": 1}" + "tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\": 1}}" } ], "weight": 100 diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json index e43b9d277..95c89e635 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json @@ -217,7 +217,7 @@ }, { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1}" + "tag": "{\"tfc:forging_bonus\": 3, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1}}" } ], "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json b/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json index c9cd4251f..3014a34d6 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json +++ b/kubejs/data/tfg/worldgen/biome/nether/ash_forest.json @@ -50,7 +50,8 @@ "#tfg:nether_veins", "#tfg:nether_underground_decoration", [ - "tfg:nether/terrain/spring_lava" + "tfg:nether/terrain/spring_lava", + "tfg:nether/terrain/mossy_cobble" ], [ "minecraft:spring_delta", diff --git a/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json b/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json index 6472a30a6..94e99b931 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json +++ b/kubejs/data/tfg/worldgen/biome/nether/basalt_deltas.json @@ -52,7 +52,8 @@ "#tfg:nether_veins", "#tfg:nether_underground_decoration", [ - "tfg:nether/terrain/spring_lava" + "tfg:nether/terrain/spring_lava", + "tfg:nether/terrain/mossy_cobble" ], [ "minecraft:spring_delta", diff --git a/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json b/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json index 6cbfa40de..419bd5819 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json +++ b/kubejs/data/tfg/worldgen/biome/nether/decaying_caverns.json @@ -51,7 +51,8 @@ "#tfg:nether_veins", "#tfg:nether_underground_decoration", [ - "tfg:nether/terrain/spring_lava" + "tfg:nether/terrain/spring_lava", + "tfg:nether/terrain/mossy_cobble" ], [ "beneath:blackstone_boulders", diff --git a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json index c81f371e0..ad91ba528 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json @@ -47,7 +47,8 @@ "#tfg:nether_veins", "#tfg:nether_underground_decoration", [ - "tfg:nether/terrain/spring_lava" + "tfg:nether/terrain/spring_lava", + "tfg:nether/terrain/mossy_cobble" ], [ "beneath:blackstone_boulders", diff --git a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json index dbd3d9c92..35edf53c6 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json @@ -47,7 +47,8 @@ "#tfg:nether_veins", "#tfg:nether_underground_decoration", [ - "tfg:nether/terrain/spring_lava" + "tfg:nether/terrain/spring_lava", + "tfg:nether/terrain/mossy_cobble" ], [ "beneath:blackstone_boulders", diff --git a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json index 037f3abe5..8e48d183a 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json @@ -48,7 +48,8 @@ "#tfg:nether_veins", "#tfg:nether_underground_decoration", [ - "tfg:nether/terrain/spring_lava" + "tfg:nether/terrain/spring_lava", + "tfg:nether/terrain/mossy_cobble" ], [ "beneath:blackstone_boulders", diff --git a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json index ab5dc1fb6..5f8e8e0ac 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json @@ -48,7 +48,8 @@ "#tfg:nether_veins", "#tfg:nether_underground_decoration", [ - "tfg:nether/terrain/spring_lava" + "tfg:nether/terrain/spring_lava", + "tfg:nether/terrain/mossy_cobble" ], [ "beneath:blackstone_boulders", diff --git a/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json b/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json index fc9ed3bef..a3163c71b 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json +++ b/kubejs/data/tfg/worldgen/biome/nether/lava_floes.json @@ -51,7 +51,8 @@ "#tfg:nether_veins", "#tfg:nether_underground_decoration", [ - "tfg:nether/terrain/spring_lava" + "tfg:nether/terrain/spring_lava", + "tfg:nether/terrain/mossy_cobble" ], [ "minecraft:spring_delta", diff --git a/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json b/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json index e3c576ac1..ab9622948 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json +++ b/kubejs/data/tfg/worldgen/biome/nether/lush_hollow.json @@ -46,7 +46,9 @@ [], "#tfg:nether_veins", "#tfg:nether_underground_decoration", - [], + [ + "tfg:nether/terrain/mossy_cobble" + ], [ "beneath:blackstone_boulders", "tfg:nether/surface/loose_deepslate", diff --git a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json index 8c88bae78..1f6c953fe 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json +++ b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json @@ -47,7 +47,8 @@ "#tfg:nether_veins", "#tfg:nether_underground_decoration", [ - "tfg:nether/terrain/spring_lava" + "tfg:nether/terrain/spring_lava", + "tfg:nether/terrain/mossy_cobble" ], [ "beneath:blackstone_boulders", diff --git a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json index 327f54f8f..68e4b223d 100644 --- a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json +++ b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json @@ -40,7 +40,8 @@ "#tfg:nether_veins", "#tfg:nether_underground_decoration", [ - "tfg:nether/terrain/spring_lava" + "tfg:nether/terrain/spring_lava", + "tfg:nether/terrain/mossy_cobble" ], [ "beneath:blackstone_boulders", diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/mossy_cobble.json b/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/mossy_cobble.json new file mode 100644 index 000000000..6883d59a0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/mossy_cobble.json @@ -0,0 +1,99 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0, + "size": 20, + "targets": [ + { + "state": { + "Name": "tfg:rock/mossy_cobble_deepslate" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:deepslate" + } + }, + { + "state": { + "Name": "tfg:rock/mossy_cobble_blackstone" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:blackstone" + } + }, + { + "state": { + "Name": "tfg:rock/mossy_cobble_dripstone" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:dripstone_block" + } + }, + { + "state": { + "Name": "tfg:rock/mossy_cobble_crackrack" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "beneath:crackrack" + } + }, + { + "state": { + "Name": "tfc:rock/mossy_cobble/diorite" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "tfc:rock/raw/diorite" + } + }, + { + "state": { + "Name": "tfc:rock/mossy_cobble/gabbro" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "tfc:rock/raw/gabbro" + } + }, + { + "state": { + "Name": "tfc:rock/mossy_cobble/gneiss" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "tfc:rock/raw/gneiss" + } + }, + { + "state": { + "Name": "tfc:rock/mossy_cobble/granite" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "tfc:rock/raw/granite" + } + }, + { + "state": { + "Name": "tfc:rock/mossy_cobble/schist" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "tfc:rock/raw/schist" + } + }, + { + "state": { + "Name": "tfc:rock/mossy_cobble/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/placed_feature/nether/terrain/mossy_cobble.json b/kubejs/data/tfg/worldgen/placed_feature/nether/terrain/mossy_cobble.json new file mode 100644 index 000000000..0255d382d --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/nether/terrain/mossy_cobble.json @@ -0,0 +1,24 @@ +{ + "feature": "tfg:nether/terrain/mossy_cobble", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 120 + }, + "min_inclusive": { + "absolute": 32 + } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.collapse.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.collapse.js index 2c39a3f07..25c6a741b 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.collapse.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.collapse.js @@ -22,7 +22,7 @@ function registerTFGCollapseRecipes(event) { event.recipes.tfc.landslide('tfg:ash_pile', 'tfg:ash_pile') event.recipes.tfc.landslide('minecraft:cobbled_deepslate', 'minecraft:cobbled_deepslate') - event.recipes.tfc.landslide('minecraft:mossy_cobbled_deepslate', 'minecraft:mossy_cobbled_deepslate') + event.recipes.tfc.landslide('tfg:rock/mossy_cobble_deepslate', 'tfg:rock/mossy_cobble_deepslate') event.recipes.tfc.landslide('tfg:rock/cobble_blackstone', 'tfg:rock/cobble_blackstone') event.recipes.tfc.landslide('tfg:rock/mossy_cobble_blackstone', 'tfg:rock/mossy_cobble_blackstone') event.recipes.tfc.landslide('tfg:rock/cobble_dripstone', 'tfg:rock/cobble_dripstone')