From 777b710dc2a5b8dcd0e4fe989498d818a9486246 Mon Sep 17 00:00:00 2001 From: Roman Holubenko Date: Mon, 30 Mar 2026 00:53:41 +0300 Subject: [PATCH] add fluid and plant types for TFC compatibility --- shaders/block.properties | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/shaders/block.properties b/shaders/block.properties index 946ffbd4..2a4dd898 100644 --- a/shaders/block.properties +++ b/shaders/block.properties @@ -6,11 +6,16 @@ layer.translucent = minecraft:glass minecraft:glass_pane layer.solid = minecraft:grass_block #endif -block.8=minecraft:water minecraft:flowing_water tfc:flowing_spring_water tfc:spring_water tfc:river_water tfc:salt_water tfc:flowing_salt_water tfc:limewater tfc:flowing_limewater +block.8=minecraft:water minecraft:flowing_water tfc:flowing_spring_water tfc:spring_water tfc:river_water tfc:salt_water tfc:flowing_salt_water tfc:limewater tfc:flowing_limewater \ + tfc:fluid/fresh_water tfc:fluid/finite_fresh_water tfc:fluid/salt_water tfc:fluid/finite_salt_water tfc:fluid/river_water tfc:fluid/finite_river_water tfc:fluid/spring_water block.11=bamboo bamboo_sapling -block.12=minecraft:short_grass minecraft:grass +block.12=minecraft:short_grass minecraft:grass \ + tfc:plant/beachgrass tfc:plant/bluegrass tfc:plant/bromegrass tfc:plant/fountain_grass tfc:plant/orchard_grass tfc:plant/ryegrass tfc:plant/scutch_grass tfc:plant/timothy_grass tfc:plant/raddia_grass \ + tfc:plant/blackberry_bush tfc:plant/raspberry_bush tfc:plant/blueberry_bush tfc:plant/elderberry_bush tfc:plant/snowberry_bush tfc:plant/bunchberry_bush tfc:plant/gooseberry_bush tfc:plant/cloudberry_bush tfc:plant/strawberry_bush tfc:plant/wintergreen_berry_bush tfc:plant/cranberry_bush \ + tfc:wild_crop/barley tfc:wild_crop/oat tfc:wild_crop/rye tfc:wild_crop/maize tfc:wild_crop/wheat tfc:wild_crop/rice tfc:wild_crop/beet tfc:wild_crop/cabbage tfc:wild_crop/carrot tfc:wild_crop/garlic tfc:wild_crop/green_bean tfc:wild_crop/potato tfc:wild_crop/onion tfc:wild_crop/soybean tfc:wild_crop/squash tfc:wild_crop/sugarcane tfc:wild_crop/tomato tfc:wild_crop/jute tfc:wild_crop/papyrus tfc:wild_crop/pumpkin tfc:wild_crop/melon \ + firmalife:plant/butterfly_grass firmalife:plant/basil firmalife:plant/bay_laurel firmalife:plant/cardamom firmalife:plant/cilantro firmalife:plant/cumin firmalife:plant/oregano firmalife:plant/pimento firmalife:plant/vanilla block.13=minecraft:small_dripleaf:half=lower minecraft:pitcher_plant:half=lower minecraft:tall_grass:half=lower minecraft:sunflower:half=lower minecraft:large_fern:half=lower minecraft:peony:half=lower minecraft:rose_bush:half=lower minecraft:lilac:half=lower minecraft:tall_seagrass:half=lower \ biomesoplenty:sea_oats:half=lower biomesoplenty:tall_lavender:half=lower biomesoplenty:tall_white_lavender:half=lower biomesoplenty:watergrass:half=lower biomesoplenty:reed:half=lower biomesoplenty:cattail:half=lower biomesoplenty:barley:half=lower biomesoplenty:icy_iris:half=lower biomesoplenty:goldenrod:half=lower biomesoplenty:eyebulb:half=lower biomesoplenty:blue_hydrangea:half=lower \ @@ -18,7 +23,8 @@ block.13=minecraft:small_dripleaf:half=lower minecraft:pitcher_plant:half=lower farmersdelight:wild_rice:half=lower farmersdelight:rice \ flying_stuff:golden_fern:half=lower flying_stuff:smoke_flower_plant:half=lower flying_stuff:lavic_mushrooms:half=lower flying_stuff:smoke_flower_plant_grow_stage:half=lower \ meadow:eriophorum_tall:half=lower meadow:small_fir:half=lower \ - natures_spirit:large_lush_fern:half=lower natures_spirit:gardenia:half=lower natures_spirit:cattail:half=lower + natures_spirit:large_lush_fern:half=lower natures_spirit:gardenia:half=lower natures_spirit:cattail:half=lower \ + tfc:plant/foxglove:half=lower tfc:plant/pampas_grass:half=lower tfc:plant/hibiscus:half=lower tfc:plant/tall_fescue_grass:half=lower tfc:plant/king_fern:half=lower tfc:plant/lilac:half=lower tfc:plant/ostrich_fern:half=lower tfc:plant/toquilla_palm:half=lower tfc:plant/red_sealing_wax_palm:half=lower tfc:plant/rose:half=lower tfc:plant/switchgrass:half=lower tfc:plant/sapphire_tower:half=lower block.14=minecraft:small_dripleaf:half=upper minecraft:pitcher_plant:half=upper minecraft:tall_grass:half=upper minecraft:sunflower:half=upper minecraft:large_fern:half=upper minecraft:peony:half=upper minecraft:rose_bush:half=upper minecraft:lilac:half=upper minecraft:tall_seagrass:half=upper \ biomesoplenty:sea_oats:half=upper biomesoplenty:tall_lavender:half=upper biomesoplenty:tall_white_lavender:half=upper biomesoplenty:watergrass:half=upper biomesoplenty:reed:half=upper biomesoplenty:cattail:half=upper biomesoplenty:barley:half=upper biomesoplenty:icy_iris:half=upper biomesoplenty:goldenrod:half=upper biomesoplenty:eyebulb:half=upper biomesoplenty:blue_hydrangea:half=upper \ @@ -26,12 +32,14 @@ block.14=minecraft:small_dripleaf:half=upper minecraft:pitcher_plant:half=upper farmersdelight:wild_rice:half=upper farmersdelight:rice_panicles \ flying_stuff:golden_fern:half=upper flying_stuff:smoke_flower_plant:half=upper flying_stuff:lavic_mushrooms:half=upper flying_stuff:smoke_flower_plant_grow_stage:half=upper \ meadow:eriophorum_tall:half=upper meadow:small_fir:half=upper \ - natures_spirit:large_lush_fern:half=upper natures_spirit:gardenia:half=upper natures_spirit:cattail:half=upper + natures_spirit:large_lush_fern:half=upper natures_spirit:gardenia:half=upper natures_spirit:cattail:half=upper \ + tfc:plant/foxglove:half=upper tfc:plant/pampas_grass:half=upper tfc:plant/hibiscus:half=upper tfc:plant/tall_fescue_grass:half=upper tfc:plant/king_fern:half=upper tfc:plant/lilac:half=upper tfc:plant/ostrich_fern:half=upper tfc:plant/toquilla_palm:half=upper tfc:plant/red_sealing_wax_palm:half=upper tfc:plant/rose:half=upper tfc:plant/switchgrass:half=upper tfc:plant/sapphire_tower:half=upper block.15=acacia_sapling birch_sapling cherry_sapling crimson_sapling dark_oak_sapling jungle_sapling mangrove_sapling oak_sapling pale_oak_sapling spruce_sapling warped_sapling \ biomesoplenty:hellbark_sapling biomesoplenty:empyreal_sapling biomesoplenty:origin_sapling biomesoplenty:flowering_oak_sapling biomesoplenty:cypress_sapling biomesoplenty:snowblossom_sapling biomesoplenty:rainbow_birch_sapling biomesoplenty:fir_sapling biomesoplenty:red_maple_sapling biomesoplenty:orange_maple_sapling biomesoplenty:yellow_maple_sapling biomesoplenty:redwood_sapling biomesoplenty:mahogany_sapling biomesoplenty:jacaranda_sapling biomesoplenty:palm_sapling biomesoplenty:willow_sapling biomesoplenty:dead_sapling biomesoplenty:magic_sapling biomesoplenty:umbran_sapling \ - dtbop:aspen_sapling dtbop:dark_poplar_sapling dtbop:dying_sapling dtbop:fir_sapling dtbop:flowering_oak_sapling dtbop:glowshroom_sapling dtbop:hellbark_sapling dtbop:jacaranda_sapling dtbop:magic_poplar_sapling dtbop:mahogany_sapling dtbop:orange_maple_sapling dtbop:palm_sapling dtbop:pine_sapling dtbop:poplar_sapling dtbop:rainbow_birch_sapling dtbop:red_maple_sapling dtbop:redwood_sapling dtbop:snowblossom_sapling dtbop:spruce_poplar_sapling dtbop:toadstool_sapling dtbop:umbran_sapling dtbop:willow_sapling dtbop:yellow_maple_sapling + dtbop:aspen_sapling dtbop:dark_poplar_sapling dtbop:dying_sapling dtbop:fir_sapling dtbop:flowering_oak_sapling dtbop:glowshroom_sapling dtbop:hellbark_sapling dtbop:jacaranda_sapling dtbop:magic_poplar_sapling dtbop:mahogany_sapling dtbop:orange_maple_sapling dtbop:palm_sapling dtbop:pine_sapling dtbop:poplar_sapling dtbop:rainbow_birch_sapling dtbop:red_maple_sapling dtbop:redwood_sapling dtbop:snowblossom_sapling dtbop:spruce_poplar_sapling dtbop:toadstool_sapling dtbop:umbran_sapling dtbop:willow_sapling dtbop:yellow_maple_sapling \ + tfc:wood/acacia_sapling tfc:wood/ash_sapling tfc:wood/aspen_sapling tfc:wood/birch_sapling tfc:wood/blackwood_sapling tfc:wood/chestnut_sapling tfc:wood/douglas_fir_sapling tfc:wood/hickory_sapling tfc:wood/kapok_sapling tfc:wood/maple_sapling tfc:wood/oak_sapling tfc:wood/palm_sapling tfc:wood/pine_sapling tfc:wood/rosewood_sapling tfc:wood/sequoia_sapling tfc:wood/spruce_sapling tfc:wood/sycamore_sapling tfc:wood/white_cedar_sapling tfc:wood/willow_sapling #ifdef BOES_EARTH_BLOCKSTATES #define vine_entry vine:is_on_leaves=false #else @@ -85,7 +93,9 @@ block.50=lever minecraft:iron_chain minecraft:copper_chain minecraft:exposed_cop refurbished_furniture:plate \ biomesoplenty:webbing biomesoplenty:stringy_cobweb biomesoplenty:red_maple_leaf_litter biomesoplenty:yellow_maple_leaf_litter biomesoplenty:orange_maple_leaf_litter biomesoplenty:barnacles \ create:factory_gauge create:controller_rail:power=0 create:brass_table_cloth create:andesite_table_cloth create:copper_table_cloth create:white_table_cloth create:orange_table_cloth create:magenta_table_cloth create:light_blue_table_cloth create:yellow_table_cloth create:lime_table_cloth create:pink_table_cloth create:gray_table_cloth create:light_gray_table_cloth create:cyan_table_cloth create:purple_table_cloth create:blue_table_cloth create:brown_table_cloth create:green_table_cloth create:red_table_cloth create:black_table_cloth \ - supplementaries:way_sign_wall supplementaries:way_sign supplementaries:jar supplementaries:candle_holder:lit=false supplementaries:candle_holder_black:lit=false supplementaries:candle_holder_blue:lit=false supplementaries:candle_holder_brown:lit=false supplementaries:candle_holder_cyan:lit=false supplementaries:candle_holder_gray:lit=false supplementaries:candle_holder_green:lit=false supplementaries:candle_holder_light_blue:lit=false supplementaries:candle_holder_light_gray:lit=false supplementaries:candle_holder_lime:lit=false supplementaries:candle_holder_magenta:lit=false supplementaries:candle_holder_orange:lit=false supplementaries:candle_holder_pink:lit=false supplementaries:candle_holder_purple:lit=false supplementaries:candle_holder_red:lit=false supplementaries:candle_holder_white:lit=false supplementaries:candle_holder_yellow:lit=false + supplementaries:way_sign_wall supplementaries:way_sign supplementaries:jar supplementaries:candle_holder:lit=false supplementaries:candle_holder_black:lit=false supplementaries:candle_holder_blue:lit=false supplementaries:candle_holder_brown:lit=false supplementaries:candle_holder_cyan:lit=false supplementaries:candle_holder_gray:lit=false supplementaries:candle_holder_green:lit=false supplementaries:candle_holder_light_blue:lit=false supplementaries:candle_holder_light_gray:lit=false supplementaries:candle_holder_lime:lit=false supplementaries:candle_holder_magenta:lit=false supplementaries:candle_holder_orange:lit=false supplementaries:candle_holder_pink:lit=false supplementaries:candle_holder_purple:lit=false supplementaries:candle_holder_red:lit=false supplementaries:candle_holder_white:lit=false supplementaries:candle_holder_yellow:lit=false \ + tfc:metal/chain/copper tfc:metal/chain/wrought_iron tfc:metal/chain/steel tfc:metal/chain/black_steel tfc:metal/chain/red_steel tfc:metal/chain/blue_steel tfc:metal/chain/bronze tfc:metal/chain/bismuth_bronze tfc:metal/chain/black_bronze \ + tfc:metal/bars/copper tfc:metal/bars/wrought_iron tfc:metal/bars/steel tfc:metal/bars/black_steel tfc:metal/bars/red_steel tfc:metal/bars/blue_steel tfc:metal/bars/bronze tfc:metal/bars/bismuth_bronze tfc:metal/bars/black_bronze # Blocks that occlude 25% of light @@ -163,7 +173,8 @@ block.56=minecraft:pale_hanging_moss minecraft:azalea_leaves minecraft:flowering westerosblocks:vine_jasmine westerosblocks:apple_fruit_leaves westerosblocks:apricot_fruit_leaves westerosblocks:cherry_fruit_leaves westerosblocks:purple_grape_fruit_leaves westerosblocks:lemon_fruit_leaves westerosblocks:lime_fruit_leaves westerosblocks:orange_fruit_leaves westerosblocks:peach_fruit_leaves westerosblocks:plum_fruit_leaves westerosblocks:pomegranate_fruit_leaves westerosblocks:weirwood_leaves westerosblocks:hop_fruit_leaves westerosblocks:olive_fruit_leaves westerosblocks:palm_leaves westerosblocks:white_grape_fruit_leaves \ dtbop:acacia_twiglet_leaves dtbop:acacia_undergrowth_leaves dtbop:cherry_twiglet_leaves dtbop:cypress_willow_leaves dtbop:dark_oak_twiglet_leaves dtbop:dark_poplar_leaves dtbop:dying_leaves dtbop:hellbark_bush_leaves dtbop:hellbark_leaves dtbop:jacaranda_leaves dtbop:jungle_twiglet_leaves dtbop:magic_poplar_leaves dtbop:mahogany_leaves dtbop:mangrove_twiglet_leaves dtbop:mega_dark_oak_leaves dtbop:oak_twiglet_leaves dtbop:orange_maple_leaves dtbop:pine_leaves dtbop:poplar_leaves dtbop:rainbow_birch_leaves dtbop:redwood_leaves dtbop:snowblossom_leaves dtbop:snowblossom_twiglet_leaves dtbop:sparse_acacia_leaves dtbop:sparse_oak_leaves dtbop:spruce_poplar_leaves dtbop:spruce_twiglet_leaves dtbop:spruce_undergrowth_leaves dtbop:umbran_leaves \ dtbop:aspen_leaves dtbop:fir_leaves dtbop:flowering_oak_undergrowth_leaves dtbop:maple_twiglet_leaves dtbop:palm_leaves dtbop:red_maple_leaves dtbop:willow_leaves dtbop:yellow_maple_leaves \ - dtbop:flowering_oak_leaves + dtbop:flowering_oak_leaves \ + tfc:wood/acacia_leaves tfc:wood/ash_leaves tfc:wood/aspen_leaves tfc:wood/birch_leaves tfc:wood/blackwood_leaves tfc:wood/chestnut_leaves tfc:wood/douglas_fir_leaves tfc:wood/hickory_leaves tfc:wood/kapok_leaves tfc:wood/maple_leaves tfc:wood/oak_leaves tfc:wood/palm_leaves tfc:wood/pine_leaves tfc:wood/rosewood_leaves tfc:wood/sequoia_leaves tfc:wood/spruce_leaves tfc:wood/sycamore_leaves tfc:wood/white_cedar_leaves tfc:wood/willow_leaves block.57=birch_button:face=floor:facing=north cherry_button:face=floor:facing=north crimson_button:face=floor:facing=north dark_oak_button:face=floor:facing=north jungle_button:face=floor:facing=north mangrove_button:face=floor:facing=north oak_button:face=floor:facing=north pale_oak_button:face=floor:facing=north spruce_button:face=floor:facing=north warped_button:face=floor:facing=north polished_blackstone_button:face=floor:facing=north stone_button:face=floor:facing=north birch_button:face=floor:facing=south cherry_button:face=floor:facing=south crimson_button:face=floor:facing=south dark_oak_button:face=floor:facing=south jungle_button:face=floor:facing=south mangrove_button:face=floor:facing=south oak_button:face=floor:facing=south pale_oak_button:face=floor:facing=south spruce_button:face=floor:facing=south warped_button:face=floor:facing=south polished_blackstone_button:face=floor:facing=south stone_button:face=floor:facing=south block.58=birch_button:face=floor:facing=east cherry_button:face=floor:facing=east crimson_button:face=floor:facing=east dark_oak_button:face=floor:facing=east jungle_button:face=floor:facing=east mangrove_button:face=floor:facing=east oak_button:face=floor:facing=east pale_oak_button:face=floor:facing=east spruce_button:face=floor:facing=east warped_button:face=floor:facing=east polished_blackstone_button:face=floor:facing=east stone_button:face=floor:facing=east birch_button:face=floor:facing=west cherry_button:face=floor:facing=west crimson_button:face=floor:facing=west dark_oak_button:face=floor:facing=west jungle_button:face=floor:facing=west mangrove_button:face=floor:facing=west oak_button:face=floor:facing=west pale_oak_button:face=floor:facing=west spruce_button:face=floor:facing=west warped_button:face=floor:facing=west polished_blackstone_button:face=floor:facing=west stone_button:face=floor:facing=west