illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Give Mars tree leaves distance property (#2661)

Browse source 
* Make TFG copies of Mars foliage
They still return the original items.

* Change strophar supports to match item color

* Change soundType to shroomlight

---------

Co-authored-by: Xikaro <os.valerievich@ya.ru>
This commit is contained in:
Mqrius 2026-01-08 23:25:19 +01:00 • committed by GitHub
parent 9ece43f122
commit 5985f389b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 284 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/fallingtrees_common.json
View file

@ -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": []
},

52
kubejs/data/tfg/loot_tables/blocks/aeronos_cap.json Normal file
View file

@ -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"
}
]
}
]
}

52
kubejs/data/tfg/loot_tables/blocks/crimson_wart_block.json Normal file
View file

@ -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"
}
]
}
]
}

52
kubejs/data/tfg/loot_tables/blocks/strophar_cap.json Normal file
View file

@ -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"
}
]
}
]
}

52
kubejs/data/tfg/loot_tables/blocks/warped_wart_block.json Normal file
View file

@ -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"
}
]
}
]
}

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos.json
View file

@ -17,7 +17,7 @@
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "ad_astra:aeronos_cap"
"Name": "tfg:aeronos_cap"
}
},
"force_dirt": false,

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_mini.json
View file

@ -17,7 +17,7 @@
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "ad_astra:aeronos_cap"
"Name": "tfg:aeronos_cap"
}
},
"force_dirt": false,

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_old_growth.json
View file

@ -17,7 +17,7 @@
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "ad_astra:aeronos_cap"
"Name": "tfg:aeronos_cap"
}
},
"force_dirt": false,

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json
View file

@ -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": {

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_dirt.json
View file

@ -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": {

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json
View file

@ -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": {

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json
View file

@ -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": {

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar.json
View file

@ -22,7 +22,7 @@
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "ad_astra:strophar_cap"
"Name": "tfg:strophar_cap"
}
},
"force_dirt": false,

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_mini.json
View file

@ -22,7 +22,7 @@
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "ad_astra:strophar_cap"
"Name": "tfg:strophar_cap"
}
},
"force_dirt": false,

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json
View file

@ -22,7 +22,7 @@
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "ad_astra:strophar_cap"
"Name": "tfg:strophar_cap"
}
},
"force_dirt": false,

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json
View file

@ -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": {

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_dirt.json
View file

@ -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": {

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json
View file

@ -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": {

2
kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json
View file

@ -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": {

12
kubejs/server_scripts/tfg/mars/tags.mars.js
View file

@ -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')

4
kubejs/server_scripts/tfg/worldgen/events.forests.js
View file

@ -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,
[

2
kubejs/startup_scripts/tfg/primitive/blocks.supports.js
View file

@ -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)

46
kubejs/startup_scripts/tfg/worldgen/blocks.trees.js
View file

@ -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)
}