mirror of
https://github.com/X0nk/Bliss-Shader.git
synced 2025-06-19 23:57:22 +08:00
add more floodfill light sources
This commit is contained in:
NULL511
parent
14b20cdcfc
commit
dde6acac97
@ -19,11 +19,11 @@ block.16=vine
|
||||
|
||||
## ground waving
|
||||
## add a newline to organize for modded blocks
|
||||
block.60 = minecraft:sunflower:half=upper minecraft:beetroots minecraft:potatoes minecraft:carrots minecraft:wheat minecraft:nether_wart minecraft:kelp minecraft:large_fern:half=upper minecraft:peony:half=upper minecraft:rose_bush:half=upper minecraft:lilac:half=upper minecraft:crimson_roots minecraft:nether_sprouts minecraft:warped_roots minecraft:seagrass minecraft:tall_seagrass:half=upper 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
|
||||
block.60=minecraft:sunflower:half=upper minecraft:beetroots minecraft:potatoes minecraft:carrots minecraft:wheat minecraft:nether_wart minecraft:kelp minecraft:large_fern:half=upper minecraft:peony:half=upper minecraft:rose_bush:half=upper minecraft:lilac:half=upper minecraft:crimson_roots minecraft:nether_sprouts minecraft:warped_roots minecraft:seagrass minecraft:tall_seagrass:half=upper 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
|
||||
# removed: sapling(s)
|
||||
|
||||
## ground waving vertical models. this exists to brighten up the sides of grass and stuff in shaded places they blend in better with the world.
|
||||
block.61=minecraft:fern conquest:red_clover_flowers conquest:acacia_sapling conquest:alder_tree_sapling conquest:apple_tree_sapling conquest:aspen_tree_sapling conquest:birch_sapling conquest:cherry_tree_sapling conquest:dark_oak_sapling conquest:downy_willow_tree_sapling conquest:gorse_tree_sapling conquest:grape_vine_sapling conquest:horse_chestnut_tree_sapling conquest:jungle_sapling conquest:larch_tree_sapling conquest:mallorn_tree_sapling conquest:oak_sapling conquest:orange_tree_sapling conquest:pear_tree_sapling conquest:pine_tree_sapling conquest:plum_tree_sapling conquest:rowan_tree_sapling conquest:spruce_sapling conquest:willow_tree_sapling conquest:angelica conquest:black_knapweed conquest:buttercups conquest:cornflower conquest:dandelion conquest:elanor conquest:goldenrod conquest:harebell conquest:lily_of_the_valley conquest:lobelia_flowers conquest:marsh_ragwort conquest:meadow_saffron conquest:mediterranean_wild_tulip conquest:moorland_spotted_orchid conquest:niphredil conquest:orange_tulip conquest:orpine conquest:oxeye_daisy conquest:pasque_flower conquest:pink_tulip conquest:poppy conquest:red_tulip conquest:rock_rose conquest:sea_lavender conquest:simbelmyne conquest:white_clematis conquest:white_tulip conquest:wild_dagga conquest:allium conquest:barley conquest:bean_pole conquest:beetroots conquest:cabbage conquest:carrots conquest:common_beans conquest:corn conquest:flax conquest:heirloom_wheat_crops conquest:hemp conquest:lavender conquest:peas conquest:potatoes conquest:rice conquest:thyme conquest:tobacco conquest:turnips conquest:water_mint conquest:wheat conquest:wild_basil conquest:wild_parsley conquest:wild_wheat conquest:common_meadow_grass conquest:cotton_grass conquest:dead_grass conquest:deergrass conquest:grass conquest:kentucky_bluegrass conquest:lush_grass conquest:purple_moor_grass conquest:sea_arrowgrass conquest:seagrass conquest:sweet_grass conquest:timothy_grass conquest:wavy_hair_grass conquest:pine_cones conquest:spruce_cones conquest:beautyberry_bush conquest:bilberry_bush conquest:blackberry_bush conquest:bog_blueberry_bush conquest:broom_bush conquest:dead_bush conquest:hawthorn_bush conquest:lingonberry_bush conquest:raspberry_bush conquest:alpine_sow_thristle conquest:athelas conquest:autumnal_dwarf_birch conquest:birdsfoot_trefoil conquest:bog_asphodel conquest:bottle_sedge conquest:cattails conquest:common_cow_wheat conquest:cow_parsley conquest:cross leaved heath conquest:dead_reeds conquest:dead_shrubs conquest:desert_shrub conquest:dogs_mercury conquest:dooryard_dock conquest:dry_reeds conquest:greater_fen_sedge conquest:greater_wood_rush conquest:green_meadow_fescue conquest:green_spurge conquest:heather conquest:meadow_fescue conquest:melancholy_thristle conquest:nettles conquest:nightshade conquest:papyrus conquest:purple_wolfs_bane conquest:red_common_cow_wheat conquest:rosebay_willowherb conquest:rushes conquest:wild_shrub conquest:sedge conquest:small_fescue conquest:small_scabious conquest:sweet_woodruff conquest:wild_overgrown_nettles conquest:wild_shrub conquest:wood_horsetail conquest:woodland_sedge conquest:wormwood conquest:yellow_wolfs_bane conquest:autumnal_bracken conquest:bracken conquest:dark_autumnal_bracken conquest:dead_bracken conquest:fern conquest:fern_1 conquest:fern_2 conquest:harts_tongue_fern conquest:large_fern_1 conquest:large_fern_2 conquest:large_fern_3 conquest:thick_fern conquest:tall_grass conquest:large_fern conquest:sunflower conquest:tall_lilac conquest:peony conquest:rose_bush conquest:tall_seagrass conquest:cypress conquest:young_tree conquest:young_frozen_tree conquest:cross_leaved_heath conquest:jungle_ground_cover conquest:alpine_sow_thistle conquest:duckweed conquest:red_mushroom conquest:brown_mushroom
|
||||
block.61=minecraft:fern conquest:acacia_sapling conquest:alder_tree_sapling conquest:apple_tree_sapling conquest:aspen_tree_sapling conquest:birch_sapling conquest:cherry_tree_sapling conquest:dark_oak_sapling conquest:downy_willow_tree_sapling conquest:gorse_tree_sapling conquest:grape_vine_sapling conquest:horse_chestnut_tree_sapling conquest:jungle_sapling conquest:larch_tree_sapling conquest:mallorn_tree_sapling conquest:oak_sapling conquest:orange_tree_sapling conquest:pear_tree_sapling conquest:pine_tree_sapling conquest:plum_tree_sapling conquest:rowan_tree_sapling conquest:spruce_sapling conquest:willow_tree_sapling conquest:angelica conquest:black_knapweed conquest:buttercups conquest:cornflower conquest:dandelion conquest:elanor conquest:goldenrod conquest:harebell conquest:lily_of_the_valley conquest:lobelia_flowers conquest:marsh_ragwort conquest:meadow_saffron conquest:mediterranean_wild_tulip conquest:moorland_spotted_orchid conquest:niphredil conquest:orange_tulip conquest:orpine conquest:oxeye_daisy conquest:pasque_flower conquest:pink_tulip conquest:poppy conquest:red_tulip conquest:rock_rose conquest:sea_lavender conquest:simbelmyne conquest:white_clematis conquest:white_tulip conquest:wild_dagga conquest:allium conquest:barley conquest:bean_pole conquest:beetroots conquest:cabbage conquest:carrots conquest:common_beans conquest:corn conquest:flax conquest:heirloom_wheat_crops conquest:hemp conquest:lavender conquest:peas conquest:potatoes conquest:rice conquest:thyme conquest:tobacco conquest:turnips conquest:water_mint conquest:wheat conquest:wild_basil conquest:wild_parsley conquest:wild_wheat conquest:common_meadow_grass conquest:cotton_grass conquest:dead_grass conquest:deergrass conquest:grass conquest:kentucky_bluegrass conquest:lush_grass conquest:purple_moor_grass conquest:sea_arrowgrass conquest:seagrass conquest:sweet_grass conquest:timothy_grass conquest:wavy_hair_grass conquest:pine_cones conquest:spruce_cones conquest:beautyberry_bush conquest:bilberry_bush conquest:blackberry_bush conquest:bog_blueberry_bush conquest:broom_bush conquest:dead_bush conquest:hawthorn_bush conquest:lingonberry_bush conquest:raspberry_bush conquest:alpine_sow_thristle conquest:athelas conquest:autumnal_dwarf_birch conquest:birdsfoot_trefoil conquest:bog_asphodel conquest:bottle_sedge conquest:cattails conquest:common_cow_wheat conquest:cow_parsley conquest:cross leaved heath conquest:dead_reeds conquest:dead_shrubs conquest:desert_shrub conquest:dogs_mercury conquest:dooryard_dock conquest:dry_reeds conquest:greater_fen_sedge conquest:greater_wood_rush conquest:green_meadow_fescue conquest:green_spurge conquest:heather conquest:meadow_fescue conquest:melancholy_thristle conquest:nettles conquest:nightshade conquest:papyrus conquest:purple_wolfs_bane conquest:red_common_cow_wheat conquest:rosebay_willowherb conquest:rushes conquest:wild_shrub conquest:sedge conquest:small_fescue conquest:small_scabious conquest:sweet_woodruff conquest:wild_overgrown_nettles conquest:wild_shrub conquest:wood_horsetail conquest:woodland_sedge conquest:wormwood conquest:yellow_wolfs_bane conquest:autumnal_bracken conquest:bracken conquest:dark_autumnal_bracken conquest:dead_bracken conquest:fern conquest:fern_1 conquest:fern_2 conquest:harts_tongue_fern conquest:large_fern_1 conquest:large_fern_2 conquest:large_fern_3 conquest:thick_fern conquest:tall_grass conquest:large_fern conquest:sunflower conquest:tall_lilac conquest:peony conquest:rose_bush conquest:tall_seagrass conquest:cypress conquest:young_tree conquest:young_frozen_tree conquest:cross_leaved_heath conquest:jungle_ground_cover conquest:alpine_sow_thistle conquest:duckweed conquest:red_mushroom conquest:brown_mushroom
|
||||
|
||||
## air waving
|
||||
## add a newline to organize for modded blocks
|
||||
@ -226,124 +226,130 @@ block.184=conduit
|
||||
|
||||
block.185=crying_obsidian
|
||||
|
||||
block.186=end_gateway
|
||||
block.186=deepslate_redstone_ore:lit=true
|
||||
|
||||
block.187=end_rod
|
||||
block.187=end_gateway
|
||||
|
||||
block.188=fire campfire:lit=true
|
||||
block.188=end_rod
|
||||
|
||||
block.189=ochre_froglight
|
||||
block.189=fire campfire:lit=true
|
||||
|
||||
block.190=pearlescent_froglight
|
||||
block.190=ochre_froglight
|
||||
|
||||
block.191=verdant_froglight
|
||||
block.191=pearlescent_froglight
|
||||
|
||||
block.192=furnace:lit=true blast_furnace:lit=true smoker:lit=true
|
||||
block.192=verdant_froglight
|
||||
|
||||
block.193=glow_lichen
|
||||
block.193=furnace:lit=true blast_furnace:lit=true smoker:lit=true
|
||||
|
||||
block.194=glowstone
|
||||
block.194=glow_lichen
|
||||
|
||||
block.195=jack_o_lantern
|
||||
block.195=glowstone
|
||||
|
||||
block.196=lantern
|
||||
block.196=jack_o_lantern
|
||||
|
||||
block.197=lava
|
||||
block.197=lantern
|
||||
|
||||
block.198=light:level=1
|
||||
block.198=lava
|
||||
|
||||
block.199=light:level=2
|
||||
block.199=light:level=1
|
||||
|
||||
block.200=light:level=3
|
||||
block.200=light:level=2
|
||||
|
||||
block.201=light:level=4
|
||||
block.201=light:level=3
|
||||
|
||||
block.202=light:level=5
|
||||
block.202=light:level=4
|
||||
|
||||
block.203=light:level=6
|
||||
block.203=light:level=5
|
||||
|
||||
block.204=light:level=7
|
||||
block.204=light:level=6
|
||||
|
||||
block.205=light:level=8
|
||||
block.205=light:level=7
|
||||
|
||||
block.206=light:level=9
|
||||
block.206=light:level=8
|
||||
|
||||
block.207=light:level=10
|
||||
block.207=light:level=9
|
||||
|
||||
block.208=light:level=11
|
||||
block.208=light:level=10
|
||||
|
||||
block.209=light:level=12
|
||||
block.209=light:level=11
|
||||
|
||||
block.210=light:level=13
|
||||
block.210=light:level=12
|
||||
|
||||
block.211=light:level=14
|
||||
block.211=light:level=13
|
||||
|
||||
block.212=light:level=15
|
||||
block.212=light:level=14
|
||||
|
||||
block.213=magma_block
|
||||
block.213=light:level=15
|
||||
|
||||
block.214=redstone_lamp:lit=true
|
||||
block.214=magma_block
|
||||
|
||||
block.215=redstone_torch:lit=true redstone_wall_torch:lit=true
|
||||
block.215=powered_rail:powered=true
|
||||
|
||||
block.216=redstone_wire:power=1
|
||||
block.216=redstone_lamp:lit=true
|
||||
|
||||
block.217=redstone_wire:power=2
|
||||
block.217=redstone_ore:lit=true
|
||||
|
||||
block.218=redstone_wire:power=3
|
||||
block.218=redstone_torch:lit=true redstone_wall_torch:lit=true
|
||||
|
||||
block.219=redstone_wire:power=4
|
||||
block.219=redstone_wire:power=1
|
||||
|
||||
block.220=redstone_wire:power=5
|
||||
block.220=redstone_wire:power=2
|
||||
|
||||
block.221=redstone_wire:power=6
|
||||
block.221=redstone_wire:power=3
|
||||
|
||||
block.222=redstone_wire:power=7
|
||||
block.222=redstone_wire:power=4
|
||||
|
||||
block.223=redstone_wire:power=8
|
||||
block.223=redstone_wire:power=5
|
||||
|
||||
block.224=redstone_wire:power=9
|
||||
block.224=redstone_wire:power=6
|
||||
|
||||
block.225=redstone_wire:power=10
|
||||
block.225=redstone_wire:power=7
|
||||
|
||||
block.226=redstone_wire:power=11
|
||||
block.226=redstone_wire:power=8
|
||||
|
||||
block.227=redstone_wire:power=12
|
||||
block.227=redstone_wire:power=9
|
||||
|
||||
block.228=redstone_wire:power=13
|
||||
block.228=redstone_wire:power=10
|
||||
|
||||
block.229=redstone_wire:power=14
|
||||
block.229=redstone_wire:power=11
|
||||
|
||||
block.230=redstone_wire:power=15
|
||||
block.230=redstone_wire:power=12
|
||||
|
||||
block.231=repeater:powered=true
|
||||
block.231=redstone_wire:power=13
|
||||
|
||||
block.232=respawn_anchor:charges=4
|
||||
block.232=redstone_wire:power=14
|
||||
|
||||
block.233=sculk_sensor:sculk_sensor_phase=active
|
||||
block.233=redstone_wire:power=15
|
||||
|
||||
block.234=sea_pickle:waterlogged=true:pickles=1
|
||||
block.234=repeater:powered=true
|
||||
|
||||
block.235=sea_pickle:waterlogged=true:pickles=2
|
||||
block.235=respawn_anchor:charges=4
|
||||
|
||||
block.236=sea_pickle:waterlogged=true:pickles=3
|
||||
block.236=sculk_sensor:sculk_sensor_phase=active
|
||||
|
||||
block.237=sea_pickle:waterlogged=true:pickles=4
|
||||
block.237=sea_pickle:waterlogged=true:pickles=1
|
||||
|
||||
block.238=sea_lantern
|
||||
block.238=sea_pickle:waterlogged=true:pickles=2
|
||||
|
||||
block.239=shroomlight
|
||||
block.239=sea_pickle:waterlogged=true:pickles=3
|
||||
|
||||
block.240=soul_fire soul_campfire:lit=true
|
||||
block.240=sea_pickle:waterlogged=true:pickles=4
|
||||
|
||||
block.241=soul_lantern
|
||||
block.241=sea_lantern
|
||||
|
||||
block.242=soul_torch soul_wall_torch
|
||||
block.242=shroomlight
|
||||
|
||||
block.243=torch wall_torch
|
||||
block.243=soul_fire soul_campfire:lit=true
|
||||
|
||||
block.244=westerosblocks:safe_fire
|
||||
block.245=conquest:white_paper_lantern conquest:yellow_paper_lantern conquest:small_red_paper_lantern conquest:chinese_palace_lantern conquest:campfire conquest:brazier conquest:hanging_brazier conquest:chandelier conquest:candelabra conquest:cross_chandelier conquest:iron_candelabrum_1 conquest:golden_candelabrum_1 conquest:candle conquest:hanging_candle_holder conquest:candle_in_a_lantern conquest:candles conquest:hand_candle conquest:torch_with_grille conquest:elven_hand_light conquest:ship_lantern conquest:victorian_lantern conquest:small_lantern conquest:big_lantern conquest:hanging_oil_lamp conquest:oil_lamp conquest:terracotta_oil_lamp conquest:invisible_light_low conquest:invisible_light_medium conquest:invisible_light
|
||||
block.244=soul_lantern
|
||||
|
||||
block.245=soul_torch soul_wall_torch
|
||||
|
||||
block.246=torch wall_torch
|
||||
|
||||
block.247=westerosblocks:safe_fire
|
||||
block.248=conquest:white_paper_lantern conquest:yellow_paper_lantern conquest:small_red_paper_lantern conquest:chinese_palace_lantern conquest:campfire conquest:brazier conquest:hanging_brazier conquest:chandelier conquest:candelabra conquest:cross_chandelier conquest:iron_candelabrum_1 conquest:golden_candelabrum_1 conquest:candle conquest:hanging_candle_holder conquest:candle_in_a_lantern conquest:candles conquest:hand_candle conquest:torch_with_grille conquest:elven_hand_light conquest:ship_lantern conquest:victorian_lantern conquest:small_lantern conquest:big_lantern conquest:hanging_oil_lamp conquest:oil_lamp conquest:terracotta_oil_lamp conquest:invisible_light_low conquest:invisible_light_medium conquest:invisible_light
|
||||
|
||||
|
||||
####### ----- reflective translucents / glass ----- #######
|
||||
|
||||
@ -606,97 +606,87 @@ void main() {
|
||||
lightRange = 8.0;
|
||||
}
|
||||
|
||||
switch (blockId) {
|
||||
case BLOCK_LIGHT_1:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 1;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_2:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 2;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_3:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 3;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_4:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 4;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_5:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 5;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_6:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 6;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_7:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 7;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_8:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 8;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_9:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 9;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_10:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 10;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_11:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 11;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_12:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 12;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_13:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 13;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_14:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 14;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
case BLOCK_LIGHT_15:
|
||||
lightColor = LightColor_LightBlock;
|
||||
lightRange = 15;
|
||||
mixWeight = 1.0;
|
||||
break;
|
||||
if (blockId >= BLOCK_LIGHT_1 && blockId <= BLOCK_LIGHT_15) {
|
||||
lightColor = LightColor_LightBlock;
|
||||
mixWeight = 1.0;
|
||||
|
||||
switch (blockId) {
|
||||
case BLOCK_LIGHT_1:
|
||||
lightRange = 1;
|
||||
break;
|
||||
case BLOCK_LIGHT_2:
|
||||
lightRange = 2;
|
||||
break;
|
||||
case BLOCK_LIGHT_3:
|
||||
lightRange = 3;
|
||||
break;
|
||||
case BLOCK_LIGHT_4:
|
||||
lightRange = 4;
|
||||
break;
|
||||
case BLOCK_LIGHT_5:
|
||||
lightRange = 5;
|
||||
break;
|
||||
case BLOCK_LIGHT_6:
|
||||
lightRange = 6;
|
||||
break;
|
||||
case BLOCK_LIGHT_7:
|
||||
lightRange = 7;
|
||||
break;
|
||||
case BLOCK_LIGHT_8:
|
||||
lightRange = 8;
|
||||
break;
|
||||
case BLOCK_LIGHT_9:
|
||||
lightRange = 9;
|
||||
break;
|
||||
case BLOCK_LIGHT_10:
|
||||
lightRange = 10;
|
||||
break;
|
||||
case BLOCK_LIGHT_11:
|
||||
lightRange = 11;
|
||||
break;
|
||||
case BLOCK_LIGHT_12:
|
||||
lightRange = 12;
|
||||
break;
|
||||
case BLOCK_LIGHT_13:
|
||||
lightRange = 13;
|
||||
break;
|
||||
case BLOCK_LIGHT_14:
|
||||
lightRange = 14;
|
||||
break;
|
||||
case BLOCK_LIGHT_15:
|
||||
lightRange = 15;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (blockId == BLOCK_MAGMA || blockId == ITEM_MAGMA) {
|
||||
lightColor = vec3(0.747, 0.323, 0.110);
|
||||
lightRange = 3.0;
|
||||
mixWeight = 0.0;
|
||||
}
|
||||
|
||||
if (blockId == BLOCK_RAIL_POWERED_ON) {
|
||||
lightColor = LightColor_RedstoneTorch;
|
||||
lightRange = 7.0;
|
||||
mixWeight = 0.9;
|
||||
}
|
||||
|
||||
if (blockId == BLOCK_REDSTONE_LAMP_LIT) {
|
||||
lightColor = vec3(0.953, 0.796, 0.496);
|
||||
lightRange = 15.0;
|
||||
mixWeight = 0.0;
|
||||
}
|
||||
|
||||
if (blockId == BLOCK_REDSTONE_ORE_LIT || blockId == BLOCK_DEEPSLATE_REDSTONE_ORE_LIT) {
|
||||
lightColor = LightColor_RedstoneTorch;
|
||||
lightRange = 7.0;
|
||||
mixWeight = 0.0;
|
||||
}
|
||||
|
||||
if (blockId == BLOCK_REDSTONE_TORCH_LIT || blockId == ITEM_REDSTONE_TORCH) {
|
||||
lightColor = LightColor_RedstoneTorch;
|
||||
lightRange = 7.0;
|
||||
mixWeight = 0.9;
|
||||
}
|
||||
|
||||
switch (blockId) {
|
||||
@ -1010,6 +1000,13 @@ void main() {
|
||||
if (blockId == ENTITY_FIREBALL_SMALL) {
|
||||
lightColor = vec3(0.000, 1.000, 0.000);
|
||||
lightRange = 8.0;
|
||||
mixWeight = 1.0;
|
||||
}
|
||||
|
||||
if (blockId == ENTITY_GLOW_SQUID) {
|
||||
lightColor = vec3(0.180, 0.675, 0.761);
|
||||
lightRange = 6.0;
|
||||
mixWeight = 0.5;
|
||||
}
|
||||
|
||||
if (blockId == ENTITY_MAGMA_CUBE) {
|
||||
|
||||
@ -10,15 +10,17 @@ entity.1604=ender_dragon wither
|
||||
|
||||
entity.1605=end_crystal
|
||||
|
||||
entity.1606=item_frame item_display
|
||||
entity.1606=glow_squid
|
||||
|
||||
entity.1607=magma_cube
|
||||
entity.1607=item_frame item_display
|
||||
|
||||
entity.1608=tnt firework_rocket
|
||||
entity.1608=magma_cube
|
||||
|
||||
entity.1609=small_fireball
|
||||
entity.1609=tnt firework_rocket
|
||||
|
||||
entity.1610=spectral_arrow bigglobe:torch_arrow
|
||||
entity.1610=small_fireball
|
||||
|
||||
entity.1611=spectral_arrow bigglobe:torch_arrow
|
||||
|
||||
################################################
|
||||
###### SUB-SURFACE SCATTERING
|
||||
|
||||
@ -99,64 +99,67 @@
|
||||
#define BLOCK_COPPER_BULB_WEATHERED_LIT 183
|
||||
#define BLOCK_CONDUIT 184
|
||||
#define BLOCK_CRYING_OBSIDIAN 185
|
||||
#define BLOCK_END_GATEWAY 186
|
||||
#define BLOCK_END_ROD 187
|
||||
#define BLOCK_FIRE 188
|
||||
#define BLOCK_FROGLIGHT_OCHRE 189
|
||||
#define BLOCK_FROGLIGHT_PEARLESCENT 190
|
||||
#define BLOCK_FROGLIGHT_VERDANT 191
|
||||
#define BLOCK_FURNACE_LIT 192
|
||||
#define BLOCK_GLOW_LICHEN 193
|
||||
#define BLOCK_GLOWSTONE 194
|
||||
#define BLOCK_JACK_O_LANTERN 195
|
||||
#define BLOCK_LANTERN 196
|
||||
#define BLOCK_LAVA 197
|
||||
#define BLOCK_LIGHT_1 198
|
||||
#define BLOCK_LIGHT_2 199
|
||||
#define BLOCK_LIGHT_3 200
|
||||
#define BLOCK_LIGHT_4 201
|
||||
#define BLOCK_LIGHT_5 202
|
||||
#define BLOCK_LIGHT_6 203
|
||||
#define BLOCK_LIGHT_7 204
|
||||
#define BLOCK_LIGHT_8 205
|
||||
#define BLOCK_LIGHT_9 206
|
||||
#define BLOCK_LIGHT_10 207
|
||||
#define BLOCK_LIGHT_11 208
|
||||
#define BLOCK_LIGHT_12 209
|
||||
#define BLOCK_LIGHT_13 210
|
||||
#define BLOCK_LIGHT_14 211
|
||||
#define BLOCK_LIGHT_15 212
|
||||
#define BLOCK_MAGMA 213
|
||||
#define BLOCK_REDSTONE_LAMP_LIT 214
|
||||
#define BLOCK_REDSTONE_TORCH_LIT 215
|
||||
#define BLOCK_REDSTONE_WIRE_1 216
|
||||
#define BLOCK_REDSTONE_WIRE_2 217
|
||||
#define BLOCK_REDSTONE_WIRE_3 218
|
||||
#define BLOCK_REDSTONE_WIRE_4 219
|
||||
#define BLOCK_REDSTONE_WIRE_5 220
|
||||
#define BLOCK_REDSTONE_WIRE_6 221
|
||||
#define BLOCK_REDSTONE_WIRE_7 222
|
||||
#define BLOCK_REDSTONE_WIRE_8 223
|
||||
#define BLOCK_REDSTONE_WIRE_9 224
|
||||
#define BLOCK_REDSTONE_WIRE_10 225
|
||||
#define BLOCK_REDSTONE_WIRE_11 226
|
||||
#define BLOCK_REDSTONE_WIRE_12 227
|
||||
#define BLOCK_REDSTONE_WIRE_13 228
|
||||
#define BLOCK_REDSTONE_WIRE_14 229
|
||||
#define BLOCK_REDSTONE_WIRE_15 230
|
||||
#define BLOCK_REPEATER_LIT 231
|
||||
#define BLOCK_RESPAWN_ANCHOR_4 232
|
||||
#define BLOCK_SCULK_SENSOR_ACTIVE 233
|
||||
#define BLOCK_SEA_PICKLE_WET_1 234
|
||||
#define BLOCK_SEA_PICKLE_WET_2 235
|
||||
#define BLOCK_SEA_PICKLE_WET_3 236
|
||||
#define BLOCK_SEA_PICKLE_WET_4 237
|
||||
#define BLOCK_SEA_LANTERN 238
|
||||
#define BLOCK_SHROOMLIGHT 239
|
||||
#define BLOCK_SOUL_FIRE 240
|
||||
#define BLOCK_SOUL_LANTERN 241
|
||||
#define BLOCK_SOUL_TORCH 242
|
||||
#define BLOCK_TORCH 243
|
||||
#define BLOCK_DEEPSLATE_REDSTONE_ORE_LIT 186
|
||||
#define BLOCK_END_GATEWAY 187
|
||||
#define BLOCK_END_ROD 188
|
||||
#define BLOCK_FIRE 189
|
||||
#define BLOCK_FROGLIGHT_OCHRE 190
|
||||
#define BLOCK_FROGLIGHT_PEARLESCENT 191
|
||||
#define BLOCK_FROGLIGHT_VERDANT 192
|
||||
#define BLOCK_FURNACE_LIT 193
|
||||
#define BLOCK_GLOW_LICHEN 194
|
||||
#define BLOCK_GLOWSTONE 195
|
||||
#define BLOCK_JACK_O_LANTERN 196
|
||||
#define BLOCK_LANTERN 197
|
||||
#define BLOCK_LAVA 198
|
||||
#define BLOCK_LIGHT_1 199
|
||||
#define BLOCK_LIGHT_2 200
|
||||
#define BLOCK_LIGHT_3 201
|
||||
#define BLOCK_LIGHT_4 202
|
||||
#define BLOCK_LIGHT_5 203
|
||||
#define BLOCK_LIGHT_6 204
|
||||
#define BLOCK_LIGHT_7 205
|
||||
#define BLOCK_LIGHT_8 206
|
||||
#define BLOCK_LIGHT_9 207
|
||||
#define BLOCK_LIGHT_10 208
|
||||
#define BLOCK_LIGHT_11 209
|
||||
#define BLOCK_LIGHT_12 210
|
||||
#define BLOCK_LIGHT_13 211
|
||||
#define BLOCK_LIGHT_14 212
|
||||
#define BLOCK_LIGHT_15 213
|
||||
#define BLOCK_MAGMA 214
|
||||
#define BLOCK_RAIL_POWERED_ON 215
|
||||
#define BLOCK_REDSTONE_LAMP_LIT 216
|
||||
#define BLOCK_REDSTONE_ORE_LIT 217
|
||||
#define BLOCK_REDSTONE_TORCH_LIT 218
|
||||
#define BLOCK_REDSTONE_WIRE_1 219
|
||||
#define BLOCK_REDSTONE_WIRE_2 220
|
||||
#define BLOCK_REDSTONE_WIRE_3 221
|
||||
#define BLOCK_REDSTONE_WIRE_4 222
|
||||
#define BLOCK_REDSTONE_WIRE_5 223
|
||||
#define BLOCK_REDSTONE_WIRE_6 224
|
||||
#define BLOCK_REDSTONE_WIRE_7 225
|
||||
#define BLOCK_REDSTONE_WIRE_8 226
|
||||
#define BLOCK_REDSTONE_WIRE_9 227
|
||||
#define BLOCK_REDSTONE_WIRE_10 228
|
||||
#define BLOCK_REDSTONE_WIRE_11 229
|
||||
#define BLOCK_REDSTONE_WIRE_12 230
|
||||
#define BLOCK_REDSTONE_WIRE_13 231
|
||||
#define BLOCK_REDSTONE_WIRE_14 232
|
||||
#define BLOCK_REDSTONE_WIRE_15 233
|
||||
#define BLOCK_REPEATER_LIT 234
|
||||
#define BLOCK_RESPAWN_ANCHOR_4 235
|
||||
#define BLOCK_SCULK_SENSOR_ACTIVE 236
|
||||
#define BLOCK_SEA_PICKLE_WET_1 237
|
||||
#define BLOCK_SEA_PICKLE_WET_2 238
|
||||
#define BLOCK_SEA_PICKLE_WET_3 239
|
||||
#define BLOCK_SEA_PICKLE_WET_4 240
|
||||
#define BLOCK_SEA_LANTERN 241
|
||||
#define BLOCK_SHROOMLIGHT 242
|
||||
#define BLOCK_SOUL_FIRE 243
|
||||
#define BLOCK_SOUL_LANTERN 244
|
||||
#define BLOCK_SOUL_TORCH 245
|
||||
#define BLOCK_TORCH 246
|
||||
#define BLOCK_GLASS 301
|
||||
#define BLOCK_HONEY 302
|
||||
#define BLOCK_ICE 303
|
||||
|
||||
@ -3,11 +3,12 @@
|
||||
#define ENTITY_BLAZE 1603
|
||||
#define ENTITY_DRAGON_WITHER 1604
|
||||
#define ENTITY_END_CRYSTAL 1605
|
||||
#define ENTITY_ITEM_FRAME 1606
|
||||
#define ENTITY_MAGMA_CUBE 1607
|
||||
#define ENTITY_TNT 1608
|
||||
#define ENTITY_FIREBALL_SMALL 1609
|
||||
#define ENTITY_SPECTRAL_ARROW 1610
|
||||
#define ENTITY_GLOW_SQUID 1606
|
||||
#define ENTITY_ITEM_FRAME 1607
|
||||
#define ENTITY_MAGMA_CUBE 1608
|
||||
#define ENTITY_TNT 1609
|
||||
#define ENTITY_FIREBALL_SMALL 1610
|
||||
#define ENTITY_SPECTRAL_ARROW 1611
|
||||
#define ENTITY_SSS_MEDIUM 1801
|
||||
#define ENTITY_SSS_WEAK 1802
|
||||
#define ENTITY_SLIME 1803
|
||||
|
||||
@ -330,6 +330,9 @@ block.*= vine
|
||||
#= BLOCK_CRYING_OBSIDIAN
|
||||
block.*= crying_obsidian
|
||||
|
||||
#= BLOCK_DEEPSLATE_REDSTONE_ORE_LIT
|
||||
block.*= deepslate_redstone_ore:lit=true
|
||||
|
||||
#= BLOCK_END_GATEWAY
|
||||
block.*= end_gateway
|
||||
|
||||
@ -414,9 +417,15 @@ block.*= vine
|
||||
#= BLOCK_MAGMA
|
||||
block.*= magma_block
|
||||
|
||||
#= BLOCK_RAIL_POWERED_ON
|
||||
block.*= powered_rail:powered=true
|
||||
|
||||
#= BLOCK_REDSTONE_LAMP_LIT
|
||||
block.*= redstone_lamp:lit=true
|
||||
|
||||
#= BLOCK_REDSTONE_ORE_LIT
|
||||
block.*= redstone_ore:lit=true
|
||||
|
||||
#= BLOCK_REDSTONE_TORCH_LIT
|
||||
block.*= redstone_torch:lit=true redstone_wall_torch:lit=true
|
||||
|
||||
|
||||
@ -15,6 +15,9 @@ entity.*= ender_dragon wither
|
||||
#= ENTITY_END_CRYSTAL
|
||||
entity.*= end_crystal
|
||||
|
||||
#= ENTITY_GLOW_SQUID
|
||||
entity.*= glow_squid
|
||||
|
||||
#= ENTITY_ITEM_FRAME
|
||||
entity.*= item_frame item_display
|
||||
|
||||
|
||||
@ -72,6 +72,7 @@ void main() {
|
||||
case ENTITY_BLAZE:
|
||||
case ENTITY_END_CRYSTAL:
|
||||
// case ENTITY_FIREBALL_SMALL:
|
||||
case ENTITY_GLOW_SQUID:
|
||||
case ENTITY_MAGMA_CUBE:
|
||||
case ENTITY_SPECTRAL_ARROW:
|
||||
case ENTITY_TNT:
|
||||
|
||||
@ -212,7 +212,7 @@ void main() {
|
||||
) {
|
||||
uint voxelId = 0u;
|
||||
|
||||
if (currentRenderedItemId > 0) {
|
||||
if (currentRenderedItemId > 0 && currentRenderedItemId < 1000) {
|
||||
if (entityId != ENTITY_ITEM_FRAME && entityId != ENTITY_PLAYER)
|
||||
voxelId = uint(currentRenderedItemId);
|
||||
}
|
||||
@ -221,6 +221,7 @@ void main() {
|
||||
case ENTITY_BLAZE:
|
||||
case ENTITY_END_CRYSTAL:
|
||||
// case ENTITY_FIREBALL_SMALL:
|
||||
case ENTITY_GLOW_SQUID:
|
||||
case ENTITY_MAGMA_CUBE:
|
||||
case ENTITY_SPECTRAL_ARROW:
|
||||
case ENTITY_TNT:
|
||||
|
||||
@ -72,6 +72,7 @@ void main() {
|
||||
case ENTITY_BLAZE:
|
||||
case ENTITY_END_CRYSTAL:
|
||||
// case ENTITY_FIREBALL_SMALL:
|
||||
case ENTITY_GLOW_SQUID:
|
||||
case ENTITY_MAGMA_CUBE:
|
||||
case ENTITY_SPECTRAL_ARROW:
|
||||
case ENTITY_TNT:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user