diff --git a/shaders/block.properties b/shaders/block.properties index 9915831..5e1de2e 100644 --- a/shaders/block.properties +++ b/shaders/block.properties @@ -47,7 +47,7 @@ block.50=minecraft:frogspawn minecraft:leaf_litter chain ladder lever lightning_ garnished:walnut_sack garnished:almond_sack garnished:pecan_sack garnished:pistachio_sack garnished:macadamia_sack garnished:peanut_sack garnished:hazelnut_sack garnished:chestnut_sack garnished:cashew_sack \ humility-afm:candlestick_copper_candle:lit=false humility-afm:candlestick_exposed_copper_candle:lit=false humility-afm:candlestick_gold_candle:lit=false humility-afm:candlestick_oxidized_copper_candle:lit=false humility-afm:candlestick_waxed_copper_candle:lit=false humility-afm:candlestick_waxed_exposed_copper_candle:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle:lit=false humility-afm:candlestick_waxed_weathered_copper_candle:lit=false humility-afm:candlestick_weathered_copper_candle:lit=false humility-afm:candlestick_copper_candle_black:lit=false humility-afm:candlestick_copper_candle_blue:lit=false humility-afm:candlestick_copper_candle_brown:lit=false humility-afm:candlestick_copper_candle_cyan:lit=false humility-afm:candlestick_copper_candle_gray:lit=false humility-afm:candlestick_copper_candle_green:lit=false humility-afm:candlestick_copper_candle_light_blue:lit=false humility-afm:candlestick_copper_candle_light_gray:lit=false humility-afm:candlestick_copper_candle_lime:lit=false humility-afm:candlestick_copper_candle_magenta:lit=false humility-afm:candlestick_copper_candle_orange:lit=false humility-afm:candlestick_copper_candle_pink:lit=false humility-afm:candlestick_copper_candle_purple:lit=false humility-afm:candlestick_copper_candle_red:lit=false humility-afm:candlestick_copper_candle_white:lit=false humility-afm:candlestick_copper_candle_yellow:lit=false humility-afm:candlestick_exposed_copper_candle_black:lit=false humility-afm:candlestick_exposed_copper_candle_blue:lit=false humility-afm:candlestick_exposed_copper_candle_brown:lit=false humility-afm:candlestick_exposed_copper_candle_cyan:lit=false humility-afm:candlestick_exposed_copper_candle_gray:lit=false humility-afm:candlestick_exposed_copper_candle_green:lit=false humility-afm:candlestick_exposed_copper_candle_light_blue:lit=false humility-afm:candlestick_exposed_copper_candle_light_gray:lit=false humility-afm:candlestick_exposed_copper_candle_lime:lit=false humility-afm:candlestick_exposed_copper_candle_magenta:lit=false humility-afm:candlestick_exposed_copper_candle_orange:lit=false humility-afm:candlestick_exposed_copper_candle_pink:lit=false humility-afm:candlestick_exposed_copper_candle_purple:lit=false humility-afm:candlestick_exposed_copper_candle_red:lit=false humility-afm:candlestick_exposed_copper_candle_white:lit=false humility-afm:candlestick_exposed_copper_candle_yellow:lit=false humility-afm:candlestick_gold_candle_black:lit=false humility-afm:candlestick_gold_candle_blue:lit=false humility-afm:candlestick_gold_candle_brown:lit=false humility-afm:candlestick_gold_candle_cyan:lit=false humility-afm:candlestick_gold_candle_gray:lit=false humility-afm:candlestick_gold_candle_green:lit=false humility-afm:candlestick_gold_candle_light_blue:lit=false humility-afm:candlestick_gold_candle_light_gray:lit=false humility-afm:candlestick_gold_candle_lime:lit=false humility-afm:candlestick_gold_candle_magenta:lit=false humility-afm:candlestick_gold_candle_orange:lit=false humility-afm:candlestick_gold_candle_pink:lit=false humility-afm:candlestick_gold_candle_purple:lit=false humility-afm:candlestick_gold_candle_red:lit=false humility-afm:candlestick_gold_candle_white:lit=false humility-afm:candlestick_gold_candle_yellow:lit=false humility-afm:candlestick_oxidized_copper_candle_black:lit=false humility-afm:candlestick_oxidized_copper_candle_blue:lit=false humility-afm:candlestick_oxidized_copper_candle_brown:lit=false humility-afm:candlestick_oxidized_copper_candle_cyan:lit=false humility-afm:candlestick_oxidized_copper_candle_gray:lit=false humility-afm:candlestick_oxidized_copper_candle_green:lit=false humility-afm:candlestick_oxidized_copper_candle_light_blue:lit=false humility-afm:candlestick_oxidized_copper_candle_light_gray:lit=false humility-afm:candlestick_oxidized_copper_candle_lime:lit=false humility-afm:candlestick_oxidized_copper_candle_magenta:lit=false humility-afm:candlestick_oxidized_copper_candle_orange:lit=false humility-afm:candlestick_oxidized_copper_candle_pink:lit=false humility-afm:candlestick_oxidized_copper_candle_purple:lit=false humility-afm:candlestick_oxidized_copper_candle_red:lit=false humility-afm:candlestick_oxidized_copper_candle_white:lit=false humility-afm:candlestick_oxidized_copper_candle_yellow:lit=false humility-afm:candlestick_waxed_copper_candle_black:lit=false humility-afm:candlestick_waxed_copper_candle_blue:lit=false humility-afm:candlestick_waxed_copper_candle_brown:lit=false humility-afm:candlestick_waxed_copper_candle_cyan:lit=false humility-afm:candlestick_waxed_copper_candle_gray:lit=false humility-afm:candlestick_waxed_copper_candle_green:lit=false humility-afm:candlestick_waxed_copper_candle_light_blue:lit=false humility-afm:candlestick_waxed_copper_candle_light_gray:lit=false humility-afm:candlestick_waxed_copper_candle_lime:lit=false humility-afm:candlestick_waxed_copper_candle_magenta:lit=false humility-afm:candlestick_waxed_copper_candle_orange:lit=false humility-afm:candlestick_waxed_copper_candle_pink:lit=false humility-afm:candlestick_waxed_copper_candle_purple:lit=false humility-afm:candlestick_waxed_copper_candle_red:lit=false humility-afm:candlestick_waxed_copper_candle_white:lit=false humility-afm:candlestick_waxed_copper_candle_yellow:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_black:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_blue:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_brown:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_cyan:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_gray:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_green:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_light_blue:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_light_gray:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_lime:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_magenta:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_orange:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_pink:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_purple:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_red:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_white:lit=false humility-afm:candlestick_waxed_exposed_copper_candle_yellow:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_black:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_blue:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_brown:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_cyan:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_gray:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_green:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_light_blue:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_light_gray:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_lime:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_magenta:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_orange:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_pink:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_purple:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_red:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_white:lit=false humility-afm:candlestick_waxed_oxidized_copper_candle_yellow:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_black:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_blue:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_brown:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_cyan:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_gray:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_green:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_light_blue:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_light_gray:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_lime:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_magenta:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_orange:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_pink:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_purple:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_red:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_white:lit=false humility-afm:candlestick_waxed_weathered_copper_candle_yellow:lit=false humility-afm:candlestick_weathered_copper_candle_black:lit=false humility-afm:candlestick_weathered_copper_candle_blue:lit=false humility-afm:candlestick_weathered_copper_candle_brown:lit=false humility-afm:candlestick_weathered_copper_candle_cyan:lit=false humility-afm:candlestick_weathered_copper_candle_gray:lit=false humility-afm:candlestick_weathered_copper_candle_green:lit=false humility-afm:candlestick_weathered_copper_candle_light_blue:lit=false humility-afm:candlestick_weathered_copper_candle_light_gray:lit=false humility-afm:candlestick_weathered_copper_candle_lime:lit=false humility-afm:candlestick_weathered_copper_candle_magenta:lit=false humility-afm:candlestick_weathered_copper_candle_orange:lit=false humility-afm:candlestick_weathered_copper_candle_pink:lit=false humility-afm:candlestick_weathered_copper_candle_purple:lit=false humility-afm:candlestick_weathered_copper_candle_red:lit=false humility-afm:candlestick_weathered_copper_candle_white:lit=false humility-afm:candlestick_weathered_copper_candle_yellow:lit=false \ refurbished_furniture:plate \ - biomesoplenty:webbing biomesoplenty:stringy_cobweb \ + 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 @@ -86,7 +86,7 @@ block.53=dried_ghast hopper bell mangrove_roots copper_grate exposed_copper_grat ## ground waving ## add a newline to organize for modded blocks block.54=minecraft:tall_dry_grass minecraft:short_dry_grass minecraft:bush minecraft:firefly_bush minecraft:cactus_flower minecraft:melon_stem minecraft:pumpkin_stem minecraft:flowering_azalea minecraft:azalea minecraft:big_dripleaf minecraft:torchflower minecraft:torchflower_crop minecraft:pitcher_crop:half=upper minecraft:warped_fungus minecraft:twisting_vines minecraft:kelp minecraft:beetroots minecraft:potatoes minecraft:carrots minecraft:wheat minecraft:nether_wart minecraft:crimson_roots minecraft:nether_sprouts minecraft:warped_roots minecraft:seagrass minecraft:wither_rose minecraft:lily_of_the_valley minecraft:cornflower minecraft:sweet_berry_bush minecraft:oxeye_daisy minecraft:pink_tulip minecraft:white_tulip minecraft:orange_tulip minecraft:red_tulip minecraft:azure_bluet minecraft:allium minecraft:blue_orchid minecraft:poppy minecraft:dandelion minecraft:dead_bush minecraft:lily_pad \ -biomesoplenty:dead_grass biomesoplenty:tundra_shrub biomesoplenty:rose biomesoplenty:violet biomesoplenty:lavender biomesoplenty:white_lavender biomesoplenty:desert_grass biomesoplenty:orange_cosmos biomesoplenty:pink_daffodil biomesoplenty:pink_hibiscus biomesoplenty:glowflower biomesoplenty:wilted_lily biomesoplenty:burning_blossom biomesoplenty:blue_hydrangea_bottom biomesoplenty:blue_hydrangea_top biomesoplenty:goldenrod_bottom biomesoplenty:goldenrod_top biomesoplenty:waterlily biomesoplenty:huge_lily_pad biomesoplenty:high_grass biomesoplenty:huge_clover_petal biomesoplenty:sprout biomesoplenty:hair biomesoplenty:dune_grass \ + biomesoplenty:flower_bud biomesoplenty:origin_dandelion biomesoplenty:origin_rose biomesoplenty:endbloom biomesoplenty:marigold biomesoplenty:enderphyte biomesoplenty:lumaloop biomesoplenty:dead_grass biomesoplenty:tundra_shrub biomesoplenty:rose biomesoplenty:violet biomesoplenty:lavender biomesoplenty:white_lavender biomesoplenty:desert_grass biomesoplenty:orange_cosmos biomesoplenty:pink_daffodil biomesoplenty:pink_hibiscus biomesoplenty:glowflower biomesoplenty:wilted_lily biomesoplenty:burning_blossom biomesoplenty:blue_hydrangea_bottom biomesoplenty:blue_hydrangea_top biomesoplenty:goldenrod_bottom biomesoplenty:goldenrod_top biomesoplenty:waterlily biomesoplenty:huge_lily_pad biomesoplenty:high_grass biomesoplenty:huge_clover_petal biomesoplenty:sprout biomesoplenty:hair biomesoplenty:dune_grass \ farmersdelight:tomatoes farmersdelight:onions farmersdelight:budding_tomatoes farmersdelight:cabbages farmersdelight:sandy_shrub farmersdelight:wild_cabbages farmersdelight:wild_onions farmersdelight:wild_tomatoes farmersdelight:wild_carrots farmersdelight:wild_potatoes farmersdelight:wild_beetroots \ herbalbrews:wild_coffee_plant herbalbrews:wild_yerba_mate_plant herbalbrews:wild_rooibos_plant herbalbrews:hibiscus herbalbrews:lavender herbalbrews:coffee_plant herbalbrews:yerba_mate_plant herbalbrews:rooibos_plant \ natures_spirit:tall_frigid_grass natures_spirit:frigid_grass natures_spirit:tall_scorched_grass natures_spirit:scorched_grass natures_spirit:tall_beach_grass natures_spirit:beach_grass natures_spirit:tall_sedge_grass natures_spirit:sedge_grass natures_spirit:large_flaxen_fern natures_spirit:flaxen_fern natures_spirit:tall_oat_grass natures_spirit:oat_grass natures_spirit:lush_fern natures_spirit:tall_melic_grass natures_spirit:melic_grass natures_spirit:green_bearberries natures_spirit:red_bearberries natures_spirit:purple_bearberries natures_spirit:green_bitter_sprouts natures_spirit:red_bitter_sprouts natures_spirit:purple_bitter_sprouts natures_spirit:ornate_wall_succulent natures_spirit:drowsy_wall_succulent natures_spirit:aureate_wall_succulent natures_spirit:sage_wall_succulent natures_spirit:foamy_wall_succulent natures_spirit:imperial_wall_succulent natures_spirit:regal_wall_succulent natures_spirit:ornate_succulent natures_spirit:drowsy_succulent natures_spirit:aureate_succulent natures_spirit:sage_succulent natures_spirit:foamy_succulent natures_spirit:imperial_succulent natures_spirit:regal_succulent natures_spirit:lavender natures_spirit:bleeding_heart natures_spirit:blue_bulbs natures_spirit:carnation natures_spirit:snapdragon natures_spirit:foxglove natures_spirit:marigold natures_spirit:bluebell natures_spirit:tiger_lily natures_spirit:purple_wildflower natures_spirit:yellow_wildflower natures_spirit:red_heather natures_spirit:white_heather natures_spirit:purple_heather natures_spirit:anemone natures_spirit:dwarf_blossoms natures_spirit:protea natures_spirit:hibiscus natures_spirit:blue_iris natures_spirit:black_iris natures_spirit:ruby_blossoms natures_spirit:silverbush natures_spirit:helvola \ @@ -133,7 +133,7 @@ block.56=minecraft:pale_hanging_moss minecraft:azalea_leaves minecraft:flowering block.80=minecraft:pink_petals minecraft:wildflowers minecraft:kelp_plant minecraft:peony minecraft:rose_bush minecraft:lilac minecraft:packed_ice minecraft:blue_ice minecraft:attached_melon_stem minecraft:attached_pumpkin_stem \ aquamirae:elodea \ beachparty:lounge_chair beachparty:chair beachparty:table beachparty:beach_chair beachparty:deck_chair beachparty:hammock beachparty:tiki_chair beachparty:beach_towel \ - biomesoplenty:high_grass_plant biomesoplenty:white_petals biomesoplenty:wildflower biomesoplenty:red_maple_leaf_pile biomesoplenty:orange_maple_leaf_pile biomesoplenty:yellow_maple_leaf_pile biomesoplenty:clover biomesoplenty:flesh biomesoplenty:porous_flesh biomesoplenty:flesh_tendons biomesoplenty:pus_bubble biomesoplenty:willow_vine \ + biomesoplenty:high_grass_plant biomesoplenty:lumaloop_plant biomesoplenty:white_petals biomesoplenty:wildflower biomesoplenty:red_maple_leaf_pile biomesoplenty:orange_maple_leaf_pile biomesoplenty:yellow_maple_leaf_pile biomesoplenty:clover biomesoplenty:flesh biomesoplenty:porous_flesh biomesoplenty:flesh_tendons biomesoplenty:pus_bubble biomesoplenty:willow_vine \ conquest:duckweed conquest:big_water_lilies conquest:white_water_lilies conquest:upward_pine_branches conquest:upward_pine_twigs conquest:diagonal_upward_pine_branches conquest:cypress_leaves conquest:cypress_leaves_slab conquest:cypress_leaves_stump conquest:cypress_leaves_top conquest:cypress_leaves_vertical_quarter conquest:cypress_leaves_vertical_slab conquest:dead_cypress_leaves conquest:dead_cypress_leaves_slab conquest:dead_cypress_leaves_stump conquest:dead_cypress_leaves_top conquest:dead_cypress_leaves_vertical_quarter conquest:dead_cypress_leaves_vertical_slab conquest:half_dead_cypress_leaves conquest:half_dead_cypress_leaves_stump conquest:half_dead_light_cypress_leaves conquest:half_dead_light_cypress_leaves_stump conquest:light_cypress_leaves conquest:light_cypress_leaves_slab conquest:light_cypress_leaves_stump conquest:light_cypress_leaves_top conquest:light_cypress_leaves_vertical_quarter conquest:light_cypress_leaves_vertical_slab conquest:quarter_dead_cypress_leaves conquest:quarter_dead_cypress_leaves_stump conquest:quarter_dead_light_cypress_leaves conquest:quarter_dead_light_cypress_leaves_stump conquest:bean_pole conquest:moss_vines \ fd:wallpapers fd:wallpaper_1 fd:wallposterfacesf fd:wallposterfacesc fd:wallposterfacesb fd:ffdwallposterfaces_1 fd:ffdwallposterfaces_2 fd:ffdwallposterfaces_3 fd:fnaf_2postertoychica fd:fnaf_2postertoybonnie fd:fnaf_2postertoyfreddy fd:fnaf_2celebrateposter fd:fnaf_2posterfourfaces fd:paperpalclassic fd:paperpalfreddy fd:paperpalbonnie fd:switchon fd:switchoff \ flying_stuff:glaciated_leaves flying_stuff:ice_spikes \ @@ -155,7 +155,7 @@ block.80=minecraft:pink_petals minecraft:wildflowers minecraft:kelp_plant minecr block.81= minecraft:moss_block minecraft:bee_nest minecraft:amethyst_block minecraft:budding_amethyst minecraft:small_amethyst_bud minecraft:pitcher_plant minecraft:grass_block:snowy=true snow_layers_5_8_entry minecraft:snow_block powder_snow cobweb red_mushroom_block brown_mushroom_block weeping_vines_plant twisting_vines_plant tube_coral tube_coral_block tube_coral_fan tube_coral_wall_fan horn_coral horn_coral_block horn_coral_fan horn_coral_wall_fan fire_coral fire_coral_block fire_coral_fan fire_coral_wall_fan dead_brain_coral dead_brain_coral_block dead_brain_coral_fan dead_brain_coral_wall_fan dead_bubble_coral dead_bubble_coral_block dead_bubble_coral_fan dead_bubble_coral_wall_fan dead_fire_coral dead_fire_coral_block dead_fire_coral_fan dead_fire_coral_wall_fan dead_horn_coral dead_horn_coral_block dead_horn_coral_fan dead_horn_coral_wall_fan dead_tube_coral dead_tube_coral_block dead_tube_coral_fan dead_tube_coral_wall_fan bubble_coral bubble_coral_block bubble_coral_fan bubble_coral_wall_fan brain_coral brain_coral_block brain_coral_fan brain_coral_wall_fan minecraft:spore_blossom minecraft:cave_vines_plant:berries=false minecraft:melon minecraft:pumpkin minecraft:carved_pumpkin minecraft:big_dripleaf_stem minecraft:cactus minecraft:hay_block minecraft:brown_mushroom minecraft:red_mushroom minecraft:mushroom_stem minecraft:sugar_cane minecraft:crimson_fungus minecraft:sea_pickle:waterlogged=false minecraft:honeycomb_block \ aquamirae:painting_anglerfish aquamirae:painting_oxygelium aquamirae:painting_tortured_soul aquamirae:painting_aurora \ beachparty:seashell_block beachparty:beach_parasol \ - biomesoplenty:toadstool \ + biomesoplenty:toadstool biomesoplenty:cyan_flower_petal_block biomesoplenty:yellow_flower_petal_block biomesoplenty:green_flower_petal_block biomesoplenty:lime_flower_petal_block biomesoplenty:orange_flower_petal_block biomesoplenty:red_flower_petal_block biomesoplenty:black_flower_petal_block biomesoplenty:pink_flower_petal_block biomesoplenty:white_flower_petal_block biomesoplenty:purple_flower_petal_block biomesoplenty:magenta_flower_petal_block biomesoplenty:light_gray_flower_petal_block biomesoplenty:gray_flower_petal_block biomesoplenty:brown_flower_petal_block biomesoplenty:light_blue_flower_petal_block biomesoplenty:blue_flower_petal_block \ create:white_sail create:light_gray_sail create:gray_sail create:black_sail create:brown_sail create:red_sail create:orange_sail create:lime_sail create:yellow_sail create:green_sail create:cyan_sail create:light_blue_sail create:blue_sail create:purple_sail create:magenta_sail create:pink_sail \ conquest:hanging_roots conquest:prickly_pear_cacti conquest:small_cacti conquest:dark_bamboo conquest:golden_bamboo conquest:cactus conquest:thick_ivy conquest:lianas conquest:morel_mushrooms conquest:brittlegill_mushrooms conquest:red_mushroom conquest:brown_mushroom conquest:moss_on_the_ground conquest:alpine_bearberry conquest:open_book_and_inkwell conquest:birds_nest conquest:small_birds_nest conquest:dried_tobacco_rack conquest:brown_hanging_rabbit conquest:white_hanging_rabbit conquest:hanging_rabbit conquest:hanging_sausages conquest:hanging_salami conquest:hanging_fish conquest:hanging_sockeye_salmon conquest:hanging_beef_shank conquest:hanging_mentula_fish conquest:dark_green_sphagnum_moss conquest:green_sphagnum_moss conquest:red_sphagnum_moss conquest:yellow_sphagnum_moss conquest:yellow_mounted_pipe conquest:purple_stained_glass_pane conquest:sieve conquest:reindeer_lichen conquest:wolf_lichen conquest:elegant_sunburst_lichen conquest:maritime_sunburst_lichen conquest:big_bread conquest:arrow_bundle conquest:sacks conquest:quill_and_parchment conquest:pile_of_paper_on_the_ground conquest:net_on_the_ground conquest:fish_trap conquest:rope_on_the_ground conquest:rigging_pane conquest:rope_ladder conquest:hanging_rope conquest:noose conquest:climbing_rope conquest:silver_rope conquest:silver_rope_ladder conquest:yellow_and_red_buntings conquest:blue_and_green_buntings conquest:fishing_net conquest:hanging_net conquest:hanging_clownfish conquest:apples conquest:hanging_onions conquest:hanging_carrots conquest:clothes_line conquest:wall_of_rope_pane \ ends_delight:chorus_fruit_pie ends_delight:dragon_leg_with_sauce_block ends_delight:dragon_meat_stew_block ends_delight:steamed_dragon_egg_block ends_delight:grilled_shulker_block \ @@ -762,6 +762,8 @@ block.320=nether_portal block.321=slime_block +block.322=biomesoplenty:wispjelly + ####### ----- LPV shapes ----- ####### #ifdef BOES_EARTH_BLOCKSTATES @@ -780,7 +782,8 @@ block.404=pale_oak_door:facing=south:open=false acacia_door:facing=south:open=fa block.405=pale_oak_door:facing=west:open=false acacia_door:facing=west:open=false bamboo_door:facing=west:open=false birch_door:facing=west:open=false cherry_door:facing=west:open=false crimson_door:facing=west:open=false dark_oak_door:facing=west:open=false iron_door:facing=west:open=false jungle_door:facing=west:open=false mangrove_door:facing=west:open=false oak_door:facing=west:open=false spruce_door:facing=west:open=false warped_door:facing=west:open=false copper_door:facing=west:open=false exposed_copper_door:facing=west:open=false weathered_copper_door:facing=west:open=false oxidized_copper_door:facing=west:open=false waxed_copper_door:facing=west:open=false waxed_exposed_copper_door:facing=west:open=false waxed_weathered_copper_door:facing=west:open=false waxed_oxidized_copper_door:facing=west:open=false pale_oak_door:facing=south:hinge=left:open=true acacia_door:facing=south:hinge=left:open=true bamboo_door:facing=south:hinge=left:open=true birch_door:facing=south:hinge=left:open=true cherry_door:facing=south:hinge=left:open=true crimson_door:facing=south:hinge=left:open=true dark_oak_door:facing=south:hinge=left:open=true iron_door:facing=south:hinge=left:open=true jungle_door:facing=south:hinge=left:open=true mangrove_door:facing=south:hinge=left:open=true oak_door:facing=south:hinge=left:open=true spruce_door:facing=south:hinge=left:open=true warped_door:facing=south:hinge=left:open=true copper_door:facing=south:hinge=left:open=true exposed_copper_door:facing=south:hinge=left:open=true weathered_copper_door:facing=south:hinge=left:open=true oxidized_copper_door:facing=south:hinge=left:open=true waxed_copper_door:facing=south:hinge=left:open=true waxed_exposed_copper_door:facing=south:hinge=left:open=true waxed_weathered_copper_door:facing=south:hinge=left:open=true waxed_oxidized_copper_door:facing=south:hinge=left:open=true pale_oak_door:facing=north:hinge=right:open=true acacia_door:facing=north:hinge=right:open=true bamboo_door:facing=north:hinge=right:open=true birch_door:facing=north:hinge=right:open=true cherry_door:facing=north:hinge=right:open=true crimson_door:facing=north:hinge=right:open=true dark_oak_door:facing=north:hinge=right:open=true iron_door:facing=north:hinge=right:open=true jungle_door:facing=north:hinge=right:open=true mangrove_door:facing=north:hinge=right:open=true oak_door:facing=north:hinge=right:open=true spruce_door:facing=north:hinge=right:open=true warped_door:facing=north:hinge=right:open=true copper_door:facing=north:hinge=right:open=true exposed_copper_door:facing=north:hinge=right:open=true weathered_copper_door:facing=north:hinge=right:open=true oxidized_copper_door:facing=north:hinge=right:open=true waxed_copper_door:facing=north:hinge=right:open=true waxed_exposed_copper_door:facing=north:hinge=right:open=true waxed_weathered_copper_door:facing=north:hinge=right:open=true waxed_oxidized_copper_door:facing=north:hinge=right:open=true -block.406=pale_oak_pressure_plate acacia_pressure_plate bamboo_pressure_plate birch_pressure_plate cherry_pressure_plate crimson_pressure_plate dark_oak_pressure_plate heavy_weighted_pressure_plate jungle_pressure_plate light_weighted_pressure_plate mangrove_pressure_plate oak_pressure_plate polished_blackstone_pressure_plate spruce_pressure_plate stone_pressure_plate warped_pressure_plate +block.406=pale_oak_pressure_plate acacia_pressure_plate bamboo_pressure_plate birch_pressure_plate cherry_pressure_plate crimson_pressure_plate dark_oak_pressure_plate heavy_weighted_pressure_plate jungle_pressure_plate light_weighted_pressure_plate mangrove_pressure_plate oak_pressure_plate polished_blackstone_pressure_plate spruce_pressure_plate stone_pressure_plate warped_pressure_plate \ + biomesoplenty:origin_oak_pressure_plate biomesoplenty:fir_pressure_plate biomesoplenty:pine_pressure_plate biomesoplenty:maple_pressure_plate biomesoplenty:redwood_pressure_plate biomesoplenty:mahogany_pressure_plate biomesoplenty:jacaranda_pressure_plate biomesoplenty:palm_pressure_plate biomesoplenty:willow_pressure_plate biomesoplenty:dead_pressure_plate biomesoplenty:magic_pressure_plate biomesoplenty:umbran_pressure_plate biomesoplenty:hellbark_pressure_plate biomesoplenty:empyreal_pressure_plate block.407=pale_oak_slab:type=top acacia_slab:type=top bamboo_slab:type=top bamboo_mosaic_slab:type=top birch_slab:type=top cherry_slab:type=top crimson_slab:type=top dark_oak_slab:type=top jungle_slab:type=top mangrove_slab:type=top oak_slab:type=top spruce_slab:type=top warped_slab:type=top andesite_slab:type=top blackstone_slab:type=top brick_slab:type=top cobbled_deepslate_slab:type=top cobblestone_slab:type=top cut_copper_slab:type=top cut_red_sandstone_slab:type=top cut_sandstone_slab:type=top dark_prismarine_slab:type=top deepslate_brick_slab:type=top deepslate_tile_slab:type=top diorite_slab:type=top end_stone_brick_slab:type=top exposed_cut_copper_slab:type=top granite_slab:type=top mossy_cobblestone_slab:type=top mossy_stone_brick_slab:type=top mud_brick_slab:type=top nether_brick_slab:type=top oxidized_cut_copper_slab:type=top petrified_oak_slab:type=top polished_andesite_slab:type=top polished_blackstone_brick_slab:type=top polished_blackstone_slab:type=top polished_deepslate_slab:type=top polished_diorite_slab:type=top polished_granite_slab:type=top prismarine_brick_slab:type=top prismarine_slab:type=top purpur_slab:type=top quartz_slab:type=top red_nether_brick_slab:type=top red_sandstone_slab:type=top sandstone_slab:type=top smooth_quartz_slab:type=top smooth_red_sandstone_slab:type=top smooth_sandstone_slab:type=top smooth_stone_slab:type=top stone_brick_slab:type=top stone_slab:type=top waxed_cut_copper_slab:type=top waxed_exposed_cut_copper_slab:type=top waxed_oxidized_cut_copper_slab:type=top waxed_weathered_cut_copper_slab:type=top weathered_cut_copper_slab:type=top diff --git a/shaders/dimensions/all_translucent.vsh b/shaders/dimensions/all_translucent.vsh index d51c72d..42a5d42 100644 --- a/shaders/dimensions/all_translucent.vsh +++ b/shaders/dimensions/all_translucent.vsh @@ -203,6 +203,8 @@ void main() { if (mc_Entity.x == 320) mat = 0.6; + if (mc_Entity.x == 322) mat = lmtexcoord.z = 0.0; + #if defined ENTITIES && defined IS_IRIS NAMETAG = 0; if (entityId == 1600) NAMETAG = 1; diff --git a/shaders/dimensions/composite2.fsh b/shaders/dimensions/composite2.fsh index f1a69f2..158e3ad 100644 --- a/shaders/dimensions/composite2.fsh +++ b/shaders/dimensions/composite2.fsh @@ -703,7 +703,7 @@ void main() { #endif vec3 indirectLight = indirectLightColor_dynamic * skyLightLevelSmooth * ambient_brightness; - float minimumLightAmount = 0.02*nightVision + 0.005 * mix(MIN_LIGHT_AMOUNT_INSIDE, MIN_LIGHT_AMOUNT, skyLightLevelSmooth); + float minimumLightAmount = 0.02*nightVision + 0.001 * mix(MIN_LIGHT_AMOUNT_INSIDE, MIN_LIGHT_AMOUNT, clamp(skyLightLevelSmooth, 0.0, 1.0)); indirectLight += vec3(1.0) * minimumLightAmount; vec3 indirectLight_fog = indirectLightColor * skyLightLevelSmooth * ambient_brightness; diff --git a/shaders/dimensions/deferred.fsh b/shaders/dimensions/deferred.fsh index 13e1bec..5cb0a02 100644 --- a/shaders/dimensions/deferred.fsh +++ b/shaders/dimensions/deferred.fsh @@ -24,6 +24,8 @@ flat varying float avgBrightness; flat varying float rodExposure; flat varying float avgL2; flat varying float centerDepth; +uniform float skyLightLevelSmooth; +uniform float nightVision; uniform sampler2D noisetex; @@ -405,7 +407,12 @@ if (gl_FragCoord.x > 18.+257. && gl_FragCoord.y > 1. && gl_FragCoord.x < 18+257+ vec4 volumetricClouds = GetVolumetricClouds(viewPos, vec2(noise, 1.0-noise), WsunVec, WmoonVec, sunColor2*2.5, moonColor2*2.5, skyGroundCol/30.0, cloudPlaneDistance, cloudDistance); WsunVec = mix(WmoonVec, WsunVec, clamp(float(sunElevation > 1e-5)*2.0-1.0 ,0,1)); - vec4 volumetricFog = GetVolumetricFog(viewPos, WsunVec, vec2(noise, 1.0-noise), suncol*2.5, skyGroundCol/30.0, averageSkyCol_Clouds*5.0, cloudPlaneDistance); + + float minimumLightAmount = 0.8*nightVision + 0.05 * mix(MIN_LIGHT_AMOUNT_INSIDE, MIN_LIGHT_AMOUNT, clamp(skyLightLevelSmooth, 0.0, 1.0)); + vec3 indirectLight_fog = skyGroundCol/30.0 + vec3(1.0) * minimumLightAmount; + + + vec4 volumetricFog = GetVolumetricFog(viewPos, WsunVec, vec2(noise, 1.0-noise), suncol*2.5, indirectLight_fog, averageSkyCol_Clouds*5.0, cloudPlaneDistance); #if AURORA_LOCATION > 0 if (WsunVec.y < 0.0 && volumetricClouds.a > 0.01 diff --git a/shaders/dimensions/setup.csh b/shaders/dimensions/setup.csh index 620ee7f..f322b59 100644 --- a/shaders/dimensions/setup.csh +++ b/shaders/dimensions/setup.csh @@ -809,6 +809,14 @@ void main() { mixWeight = 0.8; } + if ( + blockId == WISPJELLY + ) { + lightColor = vec3(0.1, 0.1, 0.1); + lightRange = 2.0; + mixWeight = 0.2; + } + if (blockId >= BLOCK_LAMP_LIT_BLACK && blockId <= BLOCK_LAMP_LIT_YELLOW) { lightRange = 15.0; mixWeight = 0.25; @@ -950,6 +958,10 @@ void main() { tintColor = vec3(0.408, 0.725, 0.329); mixWeight = 1.0; break; + case WISPJELLY: + tintColor = vec3(0.27, 0.32, 0.39); + mixWeight = 1.0; + break; // LPV shapes diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang index 639eff2..b546698 100644 --- a/shaders/lang/en_us.lang +++ b/shaders/lang/en_us.lang @@ -1,6 +1,6 @@ option.SHADER_VERSION_LABEL = §d§lECLIPSE§r - A Bliss Edit prefix.SHADER_VERSION_LABEL = V - value.SHADER_VERSION_LABEL.482 = 5.5.0 + value.SHADER_VERSION_LABEL.482 = 5.5.1 # if you're here to translate, this is not a joke, these do what they say profile.POTATO=§4Potato diff --git a/shaders/lang/zh_cn.lang b/shaders/lang/zh_cn.lang index 09c0067..d810fcd 100644 --- a/shaders/lang/zh_cn.lang +++ b/shaders/lang/zh_cn.lang @@ -1,6 +1,6 @@ option.SHADER_VERSION_LABEL = §d§lECLIPSE§r - Bliss 编辑版 prefix.SHADER_VERSION_LABEL = 版本 - value.SHADER_VERSION_LABEL.482 = 5.5.0 + value.SHADER_VERSION_LABEL.482 = 5.5.1 # 如果你是来翻译的，这不是玩笑，这些选项的功能正如其名 profile.POTATO=§4土豆 (极低配置) diff --git a/shaders/lib/blocks.glsl b/shaders/lib/blocks.glsl index c9a99fc..9647119 100644 --- a/shaders/lib/blocks.glsl +++ b/shaders/lib/blocks.glsl @@ -208,6 +208,7 @@ #define BLOCK_ICE 319 #define BLOCK_NETHER_PORTAL 320 #define BLOCK_SLIME 321 +#define WISPJELLY 322 #define BLOCK_CARPET 401 #define BLOCK_DOOR_N 402 #define BLOCK_DOOR_E 403