diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json index 16e175457..20c254e07 100644 --- a/config/fallingtrees_common.json +++ b/config/fallingtrees_common.json @@ -50,7 +50,11 @@ "beneath:wood/leaves/crimson", "beneath:wood/leaves/warped", "ad_astra:aeronos_cap", - "ad_astra:strophar_cap" + "ad_astra:strophar_cap", + "tfg:crimson_wart_block", + "tfg:warped_wart_block", + "tfg:aeronos_cap", + "tfg:strophar_cap" ], "blacklist": [] }, diff --git a/kubejs/data/tfg/loot_tables/blocks/aeronos_cap.json b/kubejs/data/tfg/loot_tables/blocks/aeronos_cap.json new file mode 100644 index 000000000..fd8916aa1 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/aeronos_cap.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "ad_astra:aeronos_cap", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "forge:shears" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:saplings/aeronos", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.013 + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/crimson_wart_block.json b/kubejs/data/tfg/loot_tables/blocks/crimson_wart_block.json new file mode 100644 index 000000000..f4f7b5427 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/crimson_wart_block.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:nether_wart_block", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "forge:shears" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:saplings/crimson", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.013 + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/strophar_cap.json b/kubejs/data/tfg/loot_tables/blocks/strophar_cap.json new file mode 100644 index 000000000..47aada38d --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/strophar_cap.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "ad_astra:strophar_cap", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "forge:shears" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:saplings/strophar", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.013 + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/warped_wart_block.json b/kubejs/data/tfg/loot_tables/blocks/warped_wart_block.json new file mode 100644 index 000000000..2d21d8276 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/warped_wart_block.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:warped_wart_block", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "forge:shears" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:saplings/warped", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.013 + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos.json index 9bfbcf030..8c804f751 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos.json @@ -17,7 +17,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ad_astra:aeronos_cap" + "Name": "tfg:aeronos_cap" } }, "force_dirt": false, diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_mini.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_mini.json index e242d1417..ac230e3ac 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_mini.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_mini.json @@ -17,7 +17,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ad_astra:aeronos_cap" + "Name": "tfg:aeronos_cap" } }, "force_dirt": false, diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_old_growth.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_old_growth.json index beab02448..62bf9878e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_old_growth.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_old_growth.json @@ -17,7 +17,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ad_astra:aeronos_cap" + "Name": "tfg:aeronos_cap" } }, "force_dirt": false, diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json index 17ddda756..2dca067a5 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json @@ -5,7 +5,7 @@ "Name": "beneath:wood/leaves/crimson" }, "hat_state": { - "Name": "minecraft:nether_wart_block" + "Name": "tfg:crimson_wart_block" }, "planted": false, "replaceable_blocks": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_dirt.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_dirt.json index 2d006ee26..2bad5e6ee 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_dirt.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_dirt.json @@ -5,7 +5,7 @@ "Name": "beneath:wood/leaves/crimson" }, "hat_state": { - "Name": "minecraft:nether_wart_block" + "Name": "tfg:crimson_wart_block" }, "planted": false, "replaceable_blocks": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json index c4ddd4aea..03bd7c6fd 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json @@ -5,7 +5,7 @@ "Name": "beneath:wood/leaves/crimson" }, "hat_state": { - "Name": "minecraft:nether_wart_block" + "Name": "tfg:crimson_wart_block" }, "planted": false, "replaceable_blocks": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json index a0e370030..68855409b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json @@ -5,7 +5,7 @@ "Name": "beneath:wood/leaves/crimson" }, "hat_state": { - "Name": "minecraft:nether_wart_block" + "Name": "tfg:crimson_wart_block" }, "planted": false, "replaceable_blocks": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar.json index 75d79598c..227db3c64 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar.json @@ -22,7 +22,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ad_astra:strophar_cap" + "Name": "tfg:strophar_cap" } }, "force_dirt": false, diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_mini.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_mini.json index bfc8f32f0..7e4bc974a 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_mini.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_mini.json @@ -22,7 +22,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ad_astra:strophar_cap" + "Name": "tfg:strophar_cap" } }, "force_dirt": false, diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json index 42a417e5c..5f5ee03d7 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json @@ -22,7 +22,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ad_astra:strophar_cap" + "Name": "tfg:strophar_cap" } }, "force_dirt": false, diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json index 6016e4a85..1b74c6360 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json @@ -5,7 +5,7 @@ "Name": "beneath:wood/leaves/warped" }, "hat_state": { - "Name": "minecraft:warped_wart_block" + "Name": "tfg:warped_wart_block" }, "planted": false, "replaceable_blocks": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_dirt.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_dirt.json index 2b5789a94..222c7cf9f 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_dirt.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_dirt.json @@ -5,7 +5,7 @@ "Name": "beneath:wood/leaves/warped" }, "hat_state": { - "Name": "minecraft:warped_wart_block" + "Name": "tfg:warped_wart_block" }, "planted": false, "replaceable_blocks": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json index 69cbc3e67..29215affd 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json @@ -5,7 +5,7 @@ "Name": "beneath:wood/leaves/warped" }, "hat_state": { - "Name": "minecraft:warped_wart_block" + "Name": "tfg:warped_wart_block" }, "planted": false, "replaceable_blocks": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json index 78f0aed59..d473cc4a2 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json @@ -5,7 +5,7 @@ "Name": "beneath:wood/leaves/warped" }, "hat_state": { - "Name": "minecraft:warped_wart_block" + "Name": "tfg:warped_wart_block" }, "planted": false, "replaceable_blocks": { diff --git a/kubejs/server_scripts/tfg/mars/tags.mars.js b/kubejs/server_scripts/tfg/mars/tags.mars.js index f5147aafe..d90736a11 100644 --- a/kubejs/server_scripts/tfg/mars/tags.mars.js +++ b/kubejs/server_scripts/tfg/mars/tags.mars.js @@ -212,6 +212,10 @@ function registerTFGMarsBlockTags(event) { event.add('tfg:heightmap_ignore', 'betterend:glacian_hymenophore') event.add('tfg:heightmap_ignore', 'species:alphacene_moss_block') event.add('tfg:heightmap_ignore', 'minecraft:ice') + event.add('tfg:heightmap_ignore', 'tfg:crimson_wart_block') + event.add('tfg:heightmap_ignore', 'tfg:warped_wart_block') + event.add('tfg:heightmap_ignore', 'tfg:aeronos_cap') + event.add('tfg:heightmap_ignore', 'tfg:strophar_cap') event.remove('minecraft:enderman_holdable', 'minecraft:crimson_fungus') event.remove('minecraft:enderman_holdable', 'minecraft:warped_fungus') @@ -302,11 +306,11 @@ function registerTFGMarsBlockTags(event) { event.add('tfg:decorative_plant_attachable', 'minecraft:mushroom_stem') event.add('tfg:decorative_plant_attachable', 'species:alphacene_mushroom_block') event.add('tfg:decorative_plant_attachable', 'species:alphacene_moss_block') - event.add('tfg:decorative_plant_attachable', 'ad_astra:aeronos_cap') - event.add('tfg:decorative_plant_attachable', 'ad_astra:strophar_cap') + event.add('tfg:decorative_plant_attachable', 'tfg:aeronos_cap') + event.add('tfg:decorative_plant_attachable', 'tfg:strophar_cap') event.add('tfg:decorative_plant_attachable', 'tfg:glacian_leaves') - event.add('tfg:decorative_plant_attachable', 'minecraft:nether_wart_block') - event.add('tfg:decorative_plant_attachable', 'minecraft:warped_wart_block') + event.add('tfg:decorative_plant_attachable', 'tfg:crimson_wart_block') + event.add('tfg:decorative_plant_attachable', 'tfg:warped_wart_block') event.add('tfg:decorative_plant_attachable', 'betterend:cave_bush') event.add('tfg:decorative_plant_attachable', 'betterend:lucernia_leaves') diff --git a/kubejs/server_scripts/tfg/worldgen/events.forests.js b/kubejs/server_scripts/tfg/worldgen/events.forests.js index ca1f2e5a4..c31d4b844 100644 --- a/kubejs/server_scripts/tfg/worldgen/events.forests.js +++ b/kubejs/server_scripts/tfg/worldgen/events.forests.js @@ -80,7 +80,7 @@ TFCEvents.worldgenData(event => { climate.fuzzy(true) }, 'ad_astra:aeronos_stem', - 'ad_astra:aeronos_cap', + 'tfg:aeronos_cap', null, null, [ @@ -103,7 +103,7 @@ TFCEvents.worldgenData(event => { climate.fuzzy(true) }, 'ad_astra:strophar_stem', - 'ad_astra:strophar_cap', + 'tfg:strophar_cap', null, null, [ diff --git a/kubejs/startup_scripts/tfg/primitive/blocks.supports.js b/kubejs/startup_scripts/tfg/primitive/blocks.supports.js index 662327468..be0b6aa3f 100644 --- a/kubejs/startup_scripts/tfg/primitive/blocks.supports.js +++ b/kubejs/startup_scripts/tfg/primitive/blocks.supports.js @@ -34,7 +34,7 @@ function registerTFGSupportBlocks(event) { .soundType('wood') .hardness(2) .resistance(2) - .mapColor('color_white') + .mapColor('terracotta_purple') .tagBlock('minecraft:mineable/axe') .requiresTool(false) diff --git a/kubejs/startup_scripts/tfg/worldgen/blocks.trees.js b/kubejs/startup_scripts/tfg/worldgen/blocks.trees.js index 1f7faf606..7c1c084cd 100644 --- a/kubejs/startup_scripts/tfg/worldgen/blocks.trees.js +++ b/kubejs/startup_scripts/tfg/worldgen/blocks.trees.js @@ -119,4 +119,50 @@ function registerTFGWorldGenTrees(event) { stripped.tagBoth('c:hidden_from_recipe_viewers') stripped.soundType('wood') }) + + // Mars leaves + + event.create('tfg:crimson_wart_block', 'tfc:leaves') + .soundType('shroomlight') + .tagBlock('minecraft:mineable/hoe') + .tagBlock('tfg:do_not_destroy_in_space') + .tagBlock('tfg:solid_leaves') + .textureAll('minecraft:block/nether_wart_block') + .mapColor('crimson_hyphae') + .seasonalColors(false) + .noDynamicTinting() + .fallenLeaves(null) + + event.create('tfg:warped_wart_block', 'tfc:leaves') + .soundType('shroomlight') + .tagBlock('minecraft:mineable/hoe') + .tagBlock('tfg:do_not_destroy_in_space') + .tagBlock('tfg:solid_leaves') + .textureAll('minecraft:block/warped_wart_block') + .mapColor('warped_wart_block') + .seasonalColors(false) + .noDynamicTinting() + .fallenLeaves(null) + + event.create('tfg:aeronos_cap', 'tfc:leaves') + .soundType('shroomlight') + .tagBlock('minecraft:mineable/hoe') + .tagBlock('tfg:do_not_destroy_in_space') + .tagBlock('tfg:solid_leaves') + .textureAll('ad_astra:block/aeronos_cap') + .mapColor('terracotta_blue') + .seasonalColors(false) + .noDynamicTinting() + .fallenLeaves(null) + + event.create('tfg:strophar_cap', 'tfc:leaves') + .soundType('shroomlight') + .tagBlock('minecraft:mineable/hoe') + .tagBlock('tfg:do_not_destroy_in_space') + .tagBlock('tfg:solid_leaves') + .textureAll('ad_astra:block/strophar_cap') + .mapColor('terracotta_purple') + .seasonalColors(false) + .noDynamicTinting() + .fallenLeaves(null) } \ No newline at end of file