diff --git a/common/src/main/java/biomesoplenty/worldgen/feature/misc/FleshTendonFeature.java b/common/src/main/java/biomesoplenty/worldgen/feature/misc/FleshTendonFeature.java index 05f6f7dc3..72e828637 100644 --- a/common/src/main/java/biomesoplenty/worldgen/feature/misc/FleshTendonFeature.java +++ b/common/src/main/java/biomesoplenty/worldgen/feature/misc/FleshTendonFeature.java @@ -27,7 +27,7 @@ public class FleshTendonFeature extends Feature { - protected SimpleBlockPredicate replace = (world, pos) -> TreeFeature.isAirOrLeaves(world, pos) || world.getBlockState(pos).getBlock() == BOPBlocks.ROSE_QUARTZ_CLUSTER || world.getBlockState(pos).getBlock() == BOPBlocks.LARGE_ROSE_QUARTZ_BUD || world.getBlockState(pos).getBlock() == BOPBlocks.MEDIUM_ROSE_QUARTZ_BUD || world.getBlockState(pos).getBlock() == BOPBlocks.SMALL_ROSE_QUARTZ_BUD || world.getBlockState(pos).getBlock() == BOPBlocks.FLESH_TENDONS_STRAND || world.getBlockState(pos).getBlock() == BOPBlocks.FLESH_TENDONS || world.getBlockState(pos).getBlock() == BOPBlocks.PUS_BUBBLE || world.getBlockState(pos).getBlock() == BOPBlocks.HAIR || world.getBlockState(pos).getBlock() == BOPBlocks.BLOOD; + protected SimpleBlockPredicate replace = (world, pos) -> TreeFeature.isAirOrLeaves(world, pos) || world.getBlockState(pos).getBlock() == BOPBlocks.ROSE_QUARTZ_CLUSTER || world.getBlockState(pos).getBlock() == BOPBlocks.LARGE_ROSE_QUARTZ_BUD || world.getBlockState(pos).getBlock() == BOPBlocks.MEDIUM_ROSE_QUARTZ_BUD || world.getBlockState(pos).getBlock() == BOPBlocks.SMALL_ROSE_QUARTZ_BUD || world.getBlockState(pos).getBlock() == BOPBlocks.FLESH_TENDONS_STRAND || world.getBlockState(pos).getBlock() == BOPBlocks.FLESH_TENDONS || world.getBlockState(pos).getBlock() == BOPBlocks.PUS_BUBBLE || world.getBlockState(pos).getBlock() == BOPBlocks.HAIR || world.getBlockState(pos).getBlock() == BOPBlocks.EYEBULB || world.getBlockState(pos).getBlock() == BOPBlocks.BLOOD || world.getBlockState(pos).getBlock() == Blocks.LAVA; private static final int MIN_DISTANCE = 8; private static final int MAX_DISTANCE = 32; diff --git a/common/src/main/resources/assets/biomesoplenty/shaders/block.properties b/common/src/main/resources/assets/biomesoplenty/shaders/block.properties index d96dfd144..77b00ef80 100644 --- a/common/src/main/resources/assets/biomesoplenty/shaders/block.properties +++ b/common/src/main/resources/assets/biomesoplenty/shaders/block.properties @@ -1,41 +1,40 @@ # # NOTE: # -# These IDs are based off of what Sildur's shaderpacks use, and may only be compatible with those shaderpacks, as others often use a wildly different set of IDs for their blocks. +# These IDs are based off of what Complementary Reimagined/Unbound uses, and may only be compatible with that shaderpack, as others often use a different set of IDs for their blocks. # Sadly we cannot accomodate all shaderpacks in this single block.properties file, as it would lead to conflicts and prevent BOP from working properly with *any* shaderpack. # #================================================================================================================== # Foliage -block.10031 = biomesoplenty:sprout biomesoplenty:dune_grass biomesoplenty:desert_grass biomesoplenty:dead_grass biomesoplenty:enderphyte biomesoplenty:null_plant - -# Flowers and Plants -block.10059 = biomesoplenty:origin_sapling biomesoplenty:flowering_oak_sapling biomesoplenty:snowblossom_sapling biomesoplenty:rainbow_birch_sapling biomesoplenty:fir_sapling biomesoplenty:pine_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 biomesoplenty:hellbark_sapling biomesoplenty:empyreal_sapling biomesoplenty:rose biomesoplenty:violet biomesoplenty:lavender biomesoplenty:wildflower biomesoplenty:orange_cosmos biomesoplenty:pink_daffodil biomesoplenty:pink_hibiscus biomesoplenty:white_petals biomesoplenty:glowflower biomesoplenty:wilted_lily biomesoplenty:burning_blossom biomesoplenty:bush biomesoplenty:clover biomesoplenty:tundra_shrub biomesoplenty:toadstool biomesoplenty:glowshroom biomesoplenty:hair biomesoplenty:endbloom +block.10004 = biomesoplenty:sprout biomesoplenty:dune_grass biomesoplenty:desert_grass biomesoplenty:dead_grass biomesoplenty:enderphyte biomesoplenty:null_plant biomesoplenty:origin_sapling biomesoplenty:flowering_oak_sapling biomesoplenty:snowblossom_sapling biomesoplenty:rainbow_birch_sapling biomesoplenty:fir_sapling biomesoplenty:pine_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 biomesoplenty:hellbark_sapling biomesoplenty:empyreal_sapling biomesoplenty:rose biomesoplenty:violet biomesoplenty:lavender biomesoplenty:white_lavender biomesoplenty:wildflower biomesoplenty:orange_cosmos biomesoplenty:pink_daffodil biomesoplenty:pink_hibiscus biomesoplenty:white_petals biomesoplenty:glowflower biomesoplenty:wilted_lily biomesoplenty:burning_blossom biomesoplenty:bush biomesoplenty:clover biomesoplenty:huge_clover_petal biomesoplenty:tundra_shrub biomesoplenty:toadstool biomesoplenty:glowshroom biomesoplenty:hair biomesoplenty:endbloom biomesoplenty:tall_lavender:half=lower biomesoplenty:tall_white_lavender:half=lower biomesoplenty:blue_hydrangea:half=lower biomesoplenty:goldenrod:half=lower biomesoplenty:icy_iris:half=lower biomesoplenty:cattail:half=lower biomesoplenty:barley:half=lower biomesoplenty:reed:half=lower biomesoplenty:watergrass:half=lower biomesoplenty:sea_oats:half=lower biomesoplenty:eyebulb:half=lower # Tall Plants -block.10175 = biomesoplenty:tall_lavender:half=lower biomesoplenty:tall_white_lavender:half=lower biomesoplenty:blue_hydrangea:half=lower biomesoplenty:goldenrod:half=lower biomesoplenty:icy_iris:half=lower biomesoplenty:cattail:half=lower biomesoplenty:barley:half=lower biomesoplenty:reed:half=lower biomesoplenty:watergrass:half=lower biomesoplenty:sea_oats:half=lower -block.10176 = biomesoplenty:tall_lavender:half=upper biomesoplenty:tall_white_lavender:half=upper biomesoplenty:blue_hydrangea:half=upper biomesoplenty:goldenrod:half=upper biomesoplenty:icy_iris:half=upper biomesoplenty:cattail:half=upper biomesoplenty:barley:half=upper biomesoplenty:reed:half=upper biomesoplenty:watergrass:half=upper biomesoplenty:sea_oats:half=upper biomesoplenty:huge_clover_petal +block.10020 = biomesoplenty:tall_lavender:half=upper biomesoplenty:tall_white_lavender:half=upper biomesoplenty:blue_hydrangea:half=upper biomesoplenty:goldenrod:half=upper biomesoplenty:icy_iris:half=upper biomesoplenty:cattail:half=upper biomesoplenty:barley:half=upper biomesoplenty:reed:half=upper biomesoplenty:watergrass:half=upper biomesoplenty:sea_oats:half=upper biomesoplenty:eyebulb:half=upper biomesoplenty:high_grass biomesoplenty:high_grass_plant biomesoplenty:lumaloop biomesoplenty:lumaloop_plant # Leaves -block.10018 = biomesoplenty:null_leaves biomesoplenty:origin_leaves biomesoplenty:flowering_oak_leaves biomesoplenty:snowblossom_leaves biomesoplenty:rainbow_birch_leaves biomesoplenty:fir_leaves biomesoplenty:pine_leaves biomesoplenty:red_maple_leaves biomesoplenty:orange_maple_leaves biomesoplenty:yellow_maple_leaves biomesoplenty:redwood_leaves biomesoplenty:mahogany_leaves biomesoplenty:jacaranda_leaves biomesoplenty:palm_leaves biomesoplenty:willow_leaves biomesoplenty:dead_leaves biomesoplenty:magic_leaves biomesoplenty:umbran_leaves biomesoplenty:hellbark_leaves biomesoplenty:empyreal_leaves +block.10008 = biomesoplenty:null_leaves biomesoplenty:origin_leaves biomesoplenty:flowering_oak_leaves biomesoplenty:snowblossom_leaves biomesoplenty:rainbow_birch_leaves biomesoplenty:fir_leaves biomesoplenty:pine_leaves biomesoplenty:red_maple_leaves biomesoplenty:orange_maple_leaves biomesoplenty:yellow_maple_leaves biomesoplenty:redwood_leaves biomesoplenty:mahogany_leaves biomesoplenty:jacaranda_leaves biomesoplenty:palm_leaves biomesoplenty:willow_leaves biomesoplenty:dead_leaves biomesoplenty:magic_leaves biomesoplenty:umbran_leaves biomesoplenty:hellbark_leaves biomesoplenty:empyreal_leaves biomesoplenty:bramble_leaves # Vines -block.10106 = biomesoplenty:willow_vine biomesoplenty:high_grass biomesoplenty:high_grass_plant biomesoplenty:lumaloop biomesoplenty:lumaloop_plant biomesoplenty:spanish_moss biomesoplenty:spanish_moss_plant biomesoplenty:glowworm_silk biomesoplenty:glowworm_silk_strand biomesoplenty:hanging_cobweb biomesoplenty:hanging_cobweb_strand biomesoplenty:flesh_tendons biomesoplenty:flesh_tendons_strand +block.10012 = biomesoplenty:willow_vine biomesoplenty:spanish_moss biomesoplenty:spanish_moss_plant biomesoplenty:glowworm_silk biomesoplenty:glowworm_silk_strand biomesoplenty:hanging_cobweb biomesoplenty:hanging_cobweb_strand biomesoplenty:flesh_tendons biomesoplenty:flesh_tendons_strand + +# Non-Waving Plants +block.10016 = biomesoplenty:tiny_cactus biomesoplenty:pus_bubble biomesoplenty:red_maple_leaf_pile biomesoplenty:orange_maple_leaf_pile biomesoplenty:yellow_maple_leaf_pile # Floating Plants -block.10111 = biomesoplenty:huge_lily_pad biomesoplenty:waterlily +block.10488 = biomesoplenty:huge_lily_pad biomesoplenty:waterlily # Metallic Blocks -block.10080 = biomesoplenty:rose_quartz_block +block.10328 = biomesoplenty:rose_quartz_block # Polished Blocks -block.10081 = biomesoplenty:white_sandstone biomesoplenty:chiseled_white_sandstone biomesoplenty:cut_white_sandstone biomesoplenty:smooth_white_sandstone biomesoplenty:white_sandstone_slab biomesoplenty:cut_white_sandstone_slab biomesoplenty:smooth_white_sandstone_slab biomesoplenty:white_sandstone_stairs biomesoplenty:white_sandstone_wall biomesoplenty:smooth_white_sandstone_stairs biomesoplenty:orange_sandstone biomesoplenty:chiseled_orange_sandstone biomesoplenty:cut_orange_sandstone biomesoplenty:smooth_orange_sandstone biomesoplenty:orange_sandstone_slab biomesoplenty:cut_orange_sandstone_slab biomesoplenty:smooth_orange_sandstone_slab biomesoplenty:orange_sandstone_stairs biomesoplenty:orange_sandstone_wall biomesoplenty:smooth_orange_sandstone_stairs biomesoplenty:black_sandstone biomesoplenty:chiseled_black_sandstone biomesoplenty:cut_black_sandstone biomesoplenty:smooth_black_sandstone biomesoplenty:black_sandstone_slab biomesoplenty:cut_black_sandstone_slab biomesoplenty:smooth_black_sandstone_slab biomesoplenty:black_sandstone_stairs biomesoplenty:black_sandstone_wall biomesoplenty:smooth_black_sandstone_stairs biomesoplenty:thermal_calcite biomesoplenty:thermal_calcite_vent biomesoplenty:brimstone_bricks biomesoplenty:brimstone_bricks_slab biomesoplenty:brimstone_bricks_stairs biomesoplenty:brimstone_bricks_wall biomesoplenty:chiseled_brimstone_bricks +block.10240 = biomesoplenty:white_sandstone biomesoplenty:chiseled_white_sandstone biomesoplenty:cut_white_sandstone biomesoplenty:smooth_white_sandstone biomesoplenty:white_sandstone_slab biomesoplenty:cut_white_sandstone_slab biomesoplenty:smooth_white_sandstone_slab biomesoplenty:white_sandstone_stairs biomesoplenty:white_sandstone_wall biomesoplenty:smooth_white_sandstone_stairs biomesoplenty:orange_sandstone biomesoplenty:chiseled_orange_sandstone biomesoplenty:cut_orange_sandstone biomesoplenty:smooth_orange_sandstone biomesoplenty:orange_sandstone_slab biomesoplenty:cut_orange_sandstone_slab biomesoplenty:smooth_orange_sandstone_slab biomesoplenty:orange_sandstone_stairs biomesoplenty:orange_sandstone_wall biomesoplenty:smooth_orange_sandstone_stairs biomesoplenty:black_sandstone biomesoplenty:chiseled_black_sandstone biomesoplenty:cut_black_sandstone biomesoplenty:smooth_black_sandstone biomesoplenty:black_sandstone_slab biomesoplenty:cut_black_sandstone_slab biomesoplenty:smooth_black_sandstone_slab biomesoplenty:black_sandstone_stairs biomesoplenty:black_sandstone_wall biomesoplenty:smooth_black_sandstone_stairs biomesoplenty:thermal_calcite biomesoplenty:thermal_calcite_vent biomesoplenty:brimstone_bricks biomesoplenty:brimstone_bricks_slab biomesoplenty:brimstone_bricks_stairs biomesoplenty:brimstone_bricks_wall biomesoplenty:chiseled_brimstone_bricks # Cobwebs -block.10030 = biomesoplenty:hanging_cobweb biomesoplenty:hanging_cobweb_strand biomesoplenty:stringy_cobweb biomesoplenty:webbing +block.10744 = biomesoplenty:stringy_cobweb biomesoplenty:webbing -# Non-Waving Plants -block.10576 = biomesoplenty:bramble biomesoplenty:bramble_leaves +# Stem Plants +block.10504 = biomesoplenty:bramble -# Light Blocks -block.10089 = biomesoplenty:wispjelly biomesoplenty:glowshroom biomesoplenty:glowshroom_block biomesoplenty:glowing_moss_block biomesoplenty:glowing_moss_carpet biomesoplenty:glowworm_silk biomesoplenty:glowworm_silk_strand biomesoplenty:blackstone_bulb biomesoplenty:spider_egg biomesoplenty:glowflower biomesoplenty:burning_blossom biomesoplenty:potted_glowshroom biomesoplenty:potted_glowflower biomesoplenty:potted_burning_blossom \ No newline at end of file +# Translucent Blocks +block.30016 = biomesoplenty:wispjelly \ No newline at end of file