mirror of
https://github.com/X0nk/Bliss-Shader.git
synced 2024-12-23 01:59:39 +08:00
conquest fireflies
This commit is contained in:
NULL511
parent
a40843f2ae
commit
7b89809149
@ -244,168 +244,170 @@ block.188=end_rod \
|
|||||||
|
|
||||||
block.189=fire campfire:lit=true
|
block.189=fire campfire:lit=true
|
||||||
|
|
||||||
block.190=ochre_froglight
|
block.190=conquest:fire_flies
|
||||||
|
|
||||||
block.191=pearlescent_froglight
|
block.191=ochre_froglight
|
||||||
|
|
||||||
block.192=verdant_froglight
|
block.192=pearlescent_froglight
|
||||||
|
|
||||||
block.193=furnace:lit=true blast_furnace:lit=true smoker:lit=true
|
block.193=verdant_froglight
|
||||||
|
|
||||||
block.194=glow_lichen
|
block.194=furnace:lit=true blast_furnace:lit=true smoker:lit=true
|
||||||
|
|
||||||
block.195=glowstone \
|
block.195=glow_lichen
|
||||||
|
|
||||||
|
block.196=glowstone \
|
||||||
mcwlights:glowstone_slab
|
mcwlights:glowstone_slab
|
||||||
|
|
||||||
block.196=jack_o_lantern
|
block.197=jack_o_lantern
|
||||||
|
|
||||||
block.197=lantern \
|
block.198=lantern \
|
||||||
amendments:wall_lantern:light_level=15 \
|
amendments:wall_lantern:light_level=15:lit=true \
|
||||||
mcwlights:striped_lantern mcwlights:covered_lantern mcwlights:chain_lantern mcwlights:tavern_lantern mcwlights:festive_lantern mcwlights:cross_lantern mcwlights:bell_lantern mcwlights:wall_lantern mcwlights:striped_wall_lantern mcwlights:covered_wall_lantern mcwlights:chain_wall_lantern mcwlights:tavern_wall_lantern mcwlights:festive_wall_lantern mcwlights:cross_wall_lantern mcwlights:bell_wall_lantern mcwlights:classic_street_lamp:lit=true:part=top mcwlights:classic_street_lamp:lit=true:part=base mcwlights:double_street_lamp:lit=true:part=top mcwlights:double_street_lamp:lit=true:part=base
|
mcwlights:striped_lantern mcwlights:covered_lantern mcwlights:chain_lantern mcwlights:tavern_lantern mcwlights:festive_lantern mcwlights:cross_lantern mcwlights:bell_lantern mcwlights:wall_lantern mcwlights:striped_wall_lantern mcwlights:covered_wall_lantern mcwlights:chain_wall_lantern mcwlights:tavern_wall_lantern mcwlights:festive_wall_lantern mcwlights:cross_wall_lantern mcwlights:bell_wall_lantern mcwlights:classic_street_lamp:lit=true:part=top mcwlights:classic_street_lamp:lit=true:part=base mcwlights:double_street_lamp:lit=true:part=top mcwlights:double_street_lamp:lit=true:part=base
|
||||||
|
|
||||||
block.198=lava \
|
block.199=lava \
|
||||||
mcwlights:lava_lamp:lit=true
|
mcwlights:lava_lamp:lit=true
|
||||||
|
|
||||||
block.199=light:level=1
|
block.200=light:level=1
|
||||||
|
|
||||||
block.200=light:level=2
|
block.201=light:level=2
|
||||||
|
|
||||||
block.201=light:level=3
|
block.202=light:level=3
|
||||||
|
|
||||||
block.202=light:level=4
|
block.203=light:level=4
|
||||||
|
|
||||||
block.203=light:level=5
|
block.204=light:level=5
|
||||||
|
|
||||||
block.204=light:level=6
|
block.205=light:level=6
|
||||||
|
|
||||||
block.205=light:level=7
|
block.206=light:level=7
|
||||||
|
|
||||||
block.206=light:level=8
|
block.207=light:level=8
|
||||||
|
|
||||||
block.207=light:level=9
|
block.208=light:level=9
|
||||||
|
|
||||||
block.208=light:level=10
|
block.209=light:level=10
|
||||||
|
|
||||||
block.209=light:level=11
|
block.210=light:level=11
|
||||||
|
|
||||||
block.210=light:level=12
|
block.211=light:level=12
|
||||||
|
|
||||||
block.211=light:level=13
|
block.212=light:level=13
|
||||||
|
|
||||||
block.212=light:level=14
|
block.213=light:level=14
|
||||||
|
|
||||||
block.213=light:level=15
|
block.214=light:level=15
|
||||||
|
|
||||||
block.214=magma_block
|
block.215=magma_block
|
||||||
|
|
||||||
block.215=powered_rail:powered=true
|
block.216=powered_rail:powered=true
|
||||||
|
|
||||||
block.216=redstone_lamp:lit=true \
|
block.217=redstone_lamp:lit=true \
|
||||||
mcwlights:redstone_lamp_slab
|
mcwlights:redstone_lamp_slab
|
||||||
|
|
||||||
block.217=redstone_ore:lit=true
|
block.218=redstone_ore:lit=true
|
||||||
|
|
||||||
block.218=redstone_torch:lit=true redstone_wall_torch:lit=true
|
block.219=redstone_torch:lit=true redstone_wall_torch:lit=true
|
||||||
|
|
||||||
block.219=redstone_wire:power=1
|
block.220=redstone_wire:power=1
|
||||||
|
|
||||||
block.220=redstone_wire:power=2
|
block.221=redstone_wire:power=2
|
||||||
|
|
||||||
block.221=redstone_wire:power=3
|
block.222=redstone_wire:power=3
|
||||||
|
|
||||||
block.222=redstone_wire:power=4
|
block.223=redstone_wire:power=4
|
||||||
|
|
||||||
block.223=redstone_wire:power=5
|
block.224=redstone_wire:power=5
|
||||||
|
|
||||||
block.224=redstone_wire:power=6
|
block.225=redstone_wire:power=6
|
||||||
|
|
||||||
block.225=redstone_wire:power=7
|
block.226=redstone_wire:power=7
|
||||||
|
|
||||||
block.226=redstone_wire:power=8
|
block.227=redstone_wire:power=8
|
||||||
|
|
||||||
block.227=redstone_wire:power=9
|
block.228=redstone_wire:power=9
|
||||||
|
|
||||||
block.228=redstone_wire:power=10
|
block.229=redstone_wire:power=10
|
||||||
|
|
||||||
block.229=redstone_wire:power=11
|
block.230=redstone_wire:power=11
|
||||||
|
|
||||||
block.230=redstone_wire:power=12
|
block.231=redstone_wire:power=12
|
||||||
|
|
||||||
block.231=redstone_wire:power=13
|
block.232=redstone_wire:power=13
|
||||||
|
|
||||||
block.232=redstone_wire:power=14
|
block.233=redstone_wire:power=14
|
||||||
|
|
||||||
block.233=redstone_wire:power=15
|
block.234=redstone_wire:power=15
|
||||||
|
|
||||||
block.234=repeater:powered=true
|
block.235=repeater:powered=true
|
||||||
|
|
||||||
block.235=respawn_anchor:charges=4
|
block.236=respawn_anchor:charges=4
|
||||||
|
|
||||||
block.236=sculk_sensor:sculk_sensor_phase=active
|
block.237=sculk_sensor:sculk_sensor_phase=active
|
||||||
|
|
||||||
block.237=sea_pickle:waterlogged=true:pickles=1
|
block.238=sea_pickle:waterlogged=true:pickles=1
|
||||||
|
|
||||||
block.238=sea_pickle:waterlogged=true:pickles=2
|
block.239=sea_pickle:waterlogged=true:pickles=2
|
||||||
|
|
||||||
block.239=sea_pickle:waterlogged=true:pickles=3
|
block.240=sea_pickle:waterlogged=true:pickles=3
|
||||||
|
|
||||||
block.240=sea_pickle:waterlogged=true:pickles=4
|
block.241=sea_pickle:waterlogged=true:pickles=4
|
||||||
|
|
||||||
block.241=sea_lantern \
|
block.242=sea_lantern \
|
||||||
mcwlights:sea_lantern_slab
|
mcwlights:sea_lantern_slab
|
||||||
|
|
||||||
block.242=shroomlight \
|
block.243=shroomlight \
|
||||||
mcwlights:shroomlight_slab
|
mcwlights:shroomlight_slab
|
||||||
|
|
||||||
block.243=soul_fire soul_campfire:lit=true
|
block.244=soul_fire soul_campfire:lit=true
|
||||||
|
|
||||||
block.244=soul_lantern \
|
block.245=soul_lantern \
|
||||||
amendments:wall_lantern:light_level=10 \
|
amendments:wall_lantern:light_level=10:lit=true \
|
||||||
mcwlights:soul_classic_street_lamp:lit=true:part=top mcwlights:soul_classic_street_lamp:lit=true:part=base mcwlights:soul_double_street_lamp:lit=true:part=top mcwlights:soul_double_street_lamp:lit=true:part=base
|
mcwlights:soul_classic_street_lamp:lit=true:part=top mcwlights:soul_classic_street_lamp:lit=true:part=base mcwlights:soul_double_street_lamp:lit=true:part=top mcwlights:soul_double_street_lamp:lit=true:part=base
|
||||||
|
|
||||||
block.245=soul_torch soul_wall_torch \
|
block.246=soul_torch soul_wall_torch \
|
||||||
supplementaries:sconce_soul supplementaries:sconce_wall_soul \
|
supplementaries:sconce_soul supplementaries:sconce_wall_soul \
|
||||||
mcwlights:soul_acacia_tiki_torch mcwlights:soul_bamboo_tiki_torch mcwlights:soul_birch_tiki_torch mcwlights:soul_cherry_tiki_torch mcwlights:soul_crimson_tiki_torch mcwlights:soul_dark_oak_tiki_torch mcwlights:soul_jungle_tiki_torch mcwlights:soul_mangrove_tiki_torch mcwlights:soul_oak_tiki_torch mcwlights:soul_spruce_tiki_torch mcwlights:soul_warped_tiki_torch
|
mcwlights:soul_acacia_tiki_torch mcwlights:soul_bamboo_tiki_torch mcwlights:soul_birch_tiki_torch mcwlights:soul_cherry_tiki_torch mcwlights:soul_crimson_tiki_torch mcwlights:soul_dark_oak_tiki_torch mcwlights:soul_jungle_tiki_torch mcwlights:soul_mangrove_tiki_torch mcwlights:soul_oak_tiki_torch mcwlights:soul_spruce_tiki_torch mcwlights:soul_warped_tiki_torch
|
||||||
|
|
||||||
block.246=torch wall_torch \
|
block.247=torch wall_torch \
|
||||||
supplementaries:sconce supplementaries:sconce_wall supplementaries:sconce_lever \
|
supplementaries:sconce supplementaries:sconce_wall supplementaries:sconce_lever \
|
||||||
mcwlights:framed_torch mcwlights:iron_framed_torch mcwlights:reinforced_torch mcwlights:rustic_torch mcwlights:upgraded_torch mcwlights:acacia_tiki_torch mcwlights:bamboo_tiki_torch mcwlights:birch_tiki_torch mcwlights:cherry_tiki_torch mcwlights:crimson_tiki_torch mcwlights:dark_oak_tiki_torch mcwlights:jungle_tiki_torch mcwlights:mangrove_tiki_torch mcwlights:oak_tiki_torch mcwlights:spruce_tiki_torch mcwlights:warped_tiki_torch
|
mcwlights:framed_torch mcwlights:iron_framed_torch mcwlights:reinforced_torch mcwlights:rustic_torch mcwlights:upgraded_torch mcwlights:acacia_tiki_torch mcwlights:bamboo_tiki_torch mcwlights:birch_tiki_torch mcwlights:cherry_tiki_torch mcwlights:crimson_tiki_torch mcwlights:dark_oak_tiki_torch mcwlights:jungle_tiki_torch mcwlights:mangrove_tiki_torch mcwlights:oak_tiki_torch mcwlights:spruce_tiki_torch mcwlights:warped_tiki_torch
|
||||||
|
|
||||||
block.247=westerosblocks:safe_fire
|
block.248=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
|
block.249=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.249=mcwlights:black_lamp:lit=true mcwlights:black_paper_lamp:lit=true mcwlights:black_ceiling_light:lit=true
|
block.250=mcwlights:black_lamp:lit=true mcwlights:black_paper_lamp:lit=true mcwlights:black_ceiling_light:lit=true
|
||||||
|
|
||||||
block.250=mcwlights:blue_lamp:lit=true mcwlights:blue_paper_lamp:lit=true mcwlights:blue_ceiling_light:lit=true
|
block.251=mcwlights:blue_lamp:lit=true mcwlights:blue_paper_lamp:lit=true mcwlights:blue_ceiling_light:lit=true
|
||||||
|
|
||||||
block.251=mcwlights:brown_lamp:lit=true mcwlights:brown_paper_lamp:lit=true mcwlights:brown_ceiling_light:lit=true
|
block.252=mcwlights:brown_lamp:lit=true mcwlights:brown_paper_lamp:lit=true mcwlights:brown_ceiling_light:lit=true
|
||||||
|
|
||||||
block.252=mcwlights:cyan_lamp:lit=true mcwlights:cyan_paper_lamp:lit=true mcwlights:cyan_ceiling_light:lit=true
|
block.253=mcwlights:cyan_lamp:lit=true mcwlights:cyan_paper_lamp:lit=true mcwlights:cyan_ceiling_light:lit=true
|
||||||
|
|
||||||
block.253=mcwlights:gray_lamp:lit=true mcwlights:gray_paper_lamp:lit=true mcwlights:gray_ceiling_light:lit=true
|
block.254=mcwlights:gray_lamp:lit=true mcwlights:gray_paper_lamp:lit=true mcwlights:gray_ceiling_light:lit=true
|
||||||
|
|
||||||
block.254=mcwlights:green_lamp:lit=true mcwlights:green_paper_lamp:lit=true mcwlights:green_ceiling_light:lit=true
|
block.255=mcwlights:green_lamp:lit=true mcwlights:green_paper_lamp:lit=true mcwlights:green_ceiling_light:lit=true
|
||||||
|
|
||||||
block.255=mcwlights:light_blue_lamp:lit=true mcwlights:light_blue_paper_lamp:lit=true mcwlights:light_blue_ceiling_light:lit=true
|
block.256=mcwlights:light_blue_lamp:lit=true mcwlights:light_blue_paper_lamp:lit=true mcwlights:light_blue_ceiling_light:lit=true
|
||||||
|
|
||||||
block.256=mcwlights:light_gray_lamp:lit=true mcwlights:light_gray_paper_lamp:lit=true mcwlights:light_gray_ceiling_light:lit=true
|
block.257=mcwlights:light_gray_lamp:lit=true mcwlights:light_gray_paper_lamp:lit=true mcwlights:light_gray_ceiling_light:lit=true
|
||||||
|
|
||||||
block.257=mcwlights:lime_lamp:lit=true mcwlights:lime_paper_lamp:lit=true mcwlights:lime_ceiling_light:lit=true
|
block.258=mcwlights:lime_lamp:lit=true mcwlights:lime_paper_lamp:lit=true mcwlights:lime_ceiling_light:lit=true
|
||||||
|
|
||||||
block.258=mcwlights:magenta_lamp:lit=true mcwlights:magenta_paper_lamp:lit=true mcwlights:magenta_ceiling_light:lit=true
|
block.259=mcwlights:magenta_lamp:lit=true mcwlights:magenta_paper_lamp:lit=true mcwlights:magenta_ceiling_light:lit=true
|
||||||
|
|
||||||
block.259=mcwlights:orange_lamp:lit=true mcwlights:orange_paper_lamp:lit=true mcwlights:orange_ceiling_light:lit=true
|
block.260=mcwlights:orange_lamp:lit=true mcwlights:orange_paper_lamp:lit=true mcwlights:orange_ceiling_light:lit=true
|
||||||
|
|
||||||
block.260=mcwlights:pink_lamp:lit=true mcwlights:pink_paper_lamp:lit=true mcwlights:pink_ceiling_light:lit=true
|
block.261=mcwlights:pink_lamp:lit=true mcwlights:pink_paper_lamp:lit=true mcwlights:pink_ceiling_light:lit=true
|
||||||
|
|
||||||
block.261=mcwlights:purple_lamp:lit=true mcwlights:purple_paper_lamp:lit=true mcwlights:purple_ceiling_light:lit=true
|
block.262=mcwlights:purple_lamp:lit=true mcwlights:purple_paper_lamp:lit=true mcwlights:purple_ceiling_light:lit=true
|
||||||
|
|
||||||
block.262=mcwlights:red_lamp:lit=true mcwlights:red_paper_lamp:lit=true mcwlights:red_ceiling_light:lit=true
|
block.263=mcwlights:red_lamp:lit=true mcwlights:red_paper_lamp:lit=true mcwlights:red_ceiling_light:lit=true
|
||||||
|
|
||||||
block.263=mcwlights:white_lamp:lit=true mcwlights:white_paper_lamp:lit=true mcwlights:white_ceiling_light:lit=true
|
block.264=mcwlights:white_lamp:lit=true mcwlights:white_paper_lamp:lit=true mcwlights:white_ceiling_light:lit=true
|
||||||
|
|
||||||
block.264=mcwlights:yellow_lamp:lit=true mcwlights:yellow_paper_lamp:lit=true mcwlights:yellow_ceiling_light:lit=true
|
block.265=mcwlights:yellow_lamp:lit=true mcwlights:yellow_paper_lamp:lit=true mcwlights:yellow_ceiling_light:lit=true
|
||||||
|
|
||||||
|
|
||||||
####### ----- reflective translucents / glass ----- #######
|
####### ----- reflective translucents / glass ----- #######
|
||||||
|
|||||||
@ -564,6 +564,12 @@ void main() {
|
|||||||
mixWeight = 1.0;
|
mixWeight = 1.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (blockId == BLOCK_FIRE_FLIES) {
|
||||||
|
lightColor = vec3(0.729, 0.639, 0.31);
|
||||||
|
lightRange = 2.0;
|
||||||
|
mixWeight = 1.0;
|
||||||
|
}
|
||||||
|
|
||||||
if (blockId == BLOCK_FROGLIGHT_OCHRE || blockId == ITEM_FROGLIGHT_OCHRE) {
|
if (blockId == BLOCK_FROGLIGHT_OCHRE || blockId == ITEM_FROGLIGHT_OCHRE) {
|
||||||
lightColor = vec3(0.768, 0.648, 0.108);
|
lightColor = vec3(0.768, 0.648, 0.108);
|
||||||
lightRange = 15.0;
|
lightRange = 15.0;
|
||||||
|
|||||||
@ -104,79 +104,80 @@
|
|||||||
#define BLOCK_END_GATEWAY 187
|
#define BLOCK_END_GATEWAY 187
|
||||||
#define BLOCK_END_ROD 188
|
#define BLOCK_END_ROD 188
|
||||||
#define BLOCK_FIRE 189
|
#define BLOCK_FIRE 189
|
||||||
#define BLOCK_FROGLIGHT_OCHRE 190
|
#define BLOCK_FIRE_FLIES 190
|
||||||
#define BLOCK_FROGLIGHT_PEARLESCENT 191
|
#define BLOCK_FROGLIGHT_OCHRE 191
|
||||||
#define BLOCK_FROGLIGHT_VERDANT 192
|
#define BLOCK_FROGLIGHT_PEARLESCENT 192
|
||||||
#define BLOCK_FURNACE_LIT 193
|
#define BLOCK_FROGLIGHT_VERDANT 193
|
||||||
#define BLOCK_GLOW_LICHEN 194
|
#define BLOCK_FURNACE_LIT 194
|
||||||
#define BLOCK_GLOWSTONE 195
|
#define BLOCK_GLOW_LICHEN 195
|
||||||
#define BLOCK_JACK_O_LANTERN 196
|
#define BLOCK_GLOWSTONE 196
|
||||||
#define BLOCK_LANTERN 197
|
#define BLOCK_JACK_O_LANTERN 197
|
||||||
#define BLOCK_LAVA 198
|
#define BLOCK_LANTERN 198
|
||||||
#define BLOCK_LIGHT_1 199
|
#define BLOCK_LAVA 199
|
||||||
#define BLOCK_LIGHT_2 200
|
#define BLOCK_LIGHT_1 200
|
||||||
#define BLOCK_LIGHT_3 201
|
#define BLOCK_LIGHT_2 201
|
||||||
#define BLOCK_LIGHT_4 202
|
#define BLOCK_LIGHT_3 202
|
||||||
#define BLOCK_LIGHT_5 203
|
#define BLOCK_LIGHT_4 203
|
||||||
#define BLOCK_LIGHT_6 204
|
#define BLOCK_LIGHT_5 204
|
||||||
#define BLOCK_LIGHT_7 205
|
#define BLOCK_LIGHT_6 205
|
||||||
#define BLOCK_LIGHT_8 206
|
#define BLOCK_LIGHT_7 206
|
||||||
#define BLOCK_LIGHT_9 207
|
#define BLOCK_LIGHT_8 207
|
||||||
#define BLOCK_LIGHT_10 208
|
#define BLOCK_LIGHT_9 208
|
||||||
#define BLOCK_LIGHT_11 209
|
#define BLOCK_LIGHT_10 209
|
||||||
#define BLOCK_LIGHT_12 210
|
#define BLOCK_LIGHT_11 210
|
||||||
#define BLOCK_LIGHT_13 211
|
#define BLOCK_LIGHT_12 211
|
||||||
#define BLOCK_LIGHT_14 212
|
#define BLOCK_LIGHT_13 212
|
||||||
#define BLOCK_LIGHT_15 213
|
#define BLOCK_LIGHT_14 213
|
||||||
#define BLOCK_MAGMA 214
|
#define BLOCK_LIGHT_15 214
|
||||||
#define BLOCK_RAIL_POWERED_ON 215
|
#define BLOCK_MAGMA 215
|
||||||
#define BLOCK_REDSTONE_LAMP_LIT 216
|
#define BLOCK_RAIL_POWERED_ON 216
|
||||||
#define BLOCK_REDSTONE_ORE_LIT 217
|
#define BLOCK_REDSTONE_LAMP_LIT 217
|
||||||
#define BLOCK_REDSTONE_TORCH_LIT 218
|
#define BLOCK_REDSTONE_ORE_LIT 218
|
||||||
#define BLOCK_REDSTONE_WIRE_1 219
|
#define BLOCK_REDSTONE_TORCH_LIT 219
|
||||||
#define BLOCK_REDSTONE_WIRE_2 220
|
#define BLOCK_REDSTONE_WIRE_1 220
|
||||||
#define BLOCK_REDSTONE_WIRE_3 221
|
#define BLOCK_REDSTONE_WIRE_2 221
|
||||||
#define BLOCK_REDSTONE_WIRE_4 222
|
#define BLOCK_REDSTONE_WIRE_3 222
|
||||||
#define BLOCK_REDSTONE_WIRE_5 223
|
#define BLOCK_REDSTONE_WIRE_4 223
|
||||||
#define BLOCK_REDSTONE_WIRE_6 224
|
#define BLOCK_REDSTONE_WIRE_5 224
|
||||||
#define BLOCK_REDSTONE_WIRE_7 225
|
#define BLOCK_REDSTONE_WIRE_6 225
|
||||||
#define BLOCK_REDSTONE_WIRE_8 226
|
#define BLOCK_REDSTONE_WIRE_7 226
|
||||||
#define BLOCK_REDSTONE_WIRE_9 227
|
#define BLOCK_REDSTONE_WIRE_8 227
|
||||||
#define BLOCK_REDSTONE_WIRE_10 228
|
#define BLOCK_REDSTONE_WIRE_9 228
|
||||||
#define BLOCK_REDSTONE_WIRE_11 229
|
#define BLOCK_REDSTONE_WIRE_10 229
|
||||||
#define BLOCK_REDSTONE_WIRE_12 230
|
#define BLOCK_REDSTONE_WIRE_11 230
|
||||||
#define BLOCK_REDSTONE_WIRE_13 231
|
#define BLOCK_REDSTONE_WIRE_12 231
|
||||||
#define BLOCK_REDSTONE_WIRE_14 232
|
#define BLOCK_REDSTONE_WIRE_13 232
|
||||||
#define BLOCK_REDSTONE_WIRE_15 233
|
#define BLOCK_REDSTONE_WIRE_14 233
|
||||||
#define BLOCK_REPEATER_LIT 234
|
#define BLOCK_REDSTONE_WIRE_15 234
|
||||||
#define BLOCK_RESPAWN_ANCHOR_4 235
|
#define BLOCK_REPEATER_LIT 235
|
||||||
#define BLOCK_SCULK_SENSOR_ACTIVE 236
|
#define BLOCK_RESPAWN_ANCHOR_4 236
|
||||||
#define BLOCK_SEA_PICKLE_WET_1 237
|
#define BLOCK_SCULK_SENSOR_ACTIVE 237
|
||||||
#define BLOCK_SEA_PICKLE_WET_2 238
|
#define BLOCK_SEA_PICKLE_WET_1 238
|
||||||
#define BLOCK_SEA_PICKLE_WET_3 239
|
#define BLOCK_SEA_PICKLE_WET_2 239
|
||||||
#define BLOCK_SEA_PICKLE_WET_4 240
|
#define BLOCK_SEA_PICKLE_WET_3 240
|
||||||
#define BLOCK_SEA_LANTERN 241
|
#define BLOCK_SEA_PICKLE_WET_4 241
|
||||||
#define BLOCK_SHROOMLIGHT 242
|
#define BLOCK_SEA_LANTERN 242
|
||||||
#define BLOCK_SOUL_FIRE 243
|
#define BLOCK_SHROOMLIGHT 243
|
||||||
#define BLOCK_SOUL_LANTERN 244
|
#define BLOCK_SOUL_FIRE 244
|
||||||
#define BLOCK_SOUL_TORCH 245
|
#define BLOCK_SOUL_LANTERN 245
|
||||||
#define BLOCK_TORCH 246
|
#define BLOCK_SOUL_TORCH 246
|
||||||
#define BLOCK_LAMP_LIT_BLACK 249
|
#define BLOCK_TORCH 247
|
||||||
#define BLOCK_LAMP_LIT_BLUE 250
|
#define BLOCK_LAMP_LIT_BLACK 250
|
||||||
#define BLOCK_LAMP_LIT_BROWN 251
|
#define BLOCK_LAMP_LIT_BLUE 251
|
||||||
#define BLOCK_LAMP_LIT_CYAN 252
|
#define BLOCK_LAMP_LIT_BROWN 252
|
||||||
#define BLOCK_LAMP_LIT_GRAY 253
|
#define BLOCK_LAMP_LIT_CYAN 253
|
||||||
#define BLOCK_LAMP_LIT_GREEN 254
|
#define BLOCK_LAMP_LIT_GRAY 254
|
||||||
#define BLOCK_LAMP_LIT_LIGHT_BLUE 255
|
#define BLOCK_LAMP_LIT_GREEN 255
|
||||||
#define BLOCK_LAMP_LIT_LIGHT_GRAY 256
|
#define BLOCK_LAMP_LIT_LIGHT_BLUE 256
|
||||||
#define BLOCK_LAMP_LIT_LIME 257
|
#define BLOCK_LAMP_LIT_LIGHT_GRAY 257
|
||||||
#define BLOCK_LAMP_LIT_MAGENTA 258
|
#define BLOCK_LAMP_LIT_LIME 258
|
||||||
#define BLOCK_LAMP_LIT_ORANGE 259
|
#define BLOCK_LAMP_LIT_MAGENTA 259
|
||||||
#define BLOCK_LAMP_LIT_PINK 260
|
#define BLOCK_LAMP_LIT_ORANGE 260
|
||||||
#define BLOCK_LAMP_LIT_PURPLE 261
|
#define BLOCK_LAMP_LIT_PINK 261
|
||||||
#define BLOCK_LAMP_LIT_RED 262
|
#define BLOCK_LAMP_LIT_PURPLE 262
|
||||||
#define BLOCK_LAMP_LIT_WHITE 263
|
#define BLOCK_LAMP_LIT_RED 263
|
||||||
#define BLOCK_LAMP_LIT_YELLOW 264
|
#define BLOCK_LAMP_LIT_WHITE 264
|
||||||
|
#define BLOCK_LAMP_LIT_YELLOW 265
|
||||||
#define BLOCK_GLASS 301
|
#define BLOCK_GLASS 301
|
||||||
#define BLOCK_HONEY 302
|
#define BLOCK_HONEY 302
|
||||||
#define BLOCK_ICE 303
|
#define BLOCK_ICE 303
|
||||||
|
|||||||
@ -352,6 +352,9 @@ block.*= minecraft:hanging_roots minecraft:weeping_vines minecraft:cave_vines:be
|
|||||||
#= BLOCK_FIRE
|
#= BLOCK_FIRE
|
||||||
block.*= fire campfire:lit=true
|
block.*= fire campfire:lit=true
|
||||||
|
|
||||||
|
#= BLOCK_FIRE_FLIES
|
||||||
|
block.*= conquest:fire_flies
|
||||||
|
|
||||||
#= BLOCK_FROGLIGHT_OCHRE
|
#= BLOCK_FROGLIGHT_OCHRE
|
||||||
block.*= ochre_froglight
|
block.*= ochre_froglight
|
||||||
|
|
||||||
@ -376,7 +379,7 @@ block.*= minecraft:hanging_roots minecraft:weeping_vines minecraft:cave_vines:be
|
|||||||
|
|
||||||
#= BLOCK_LANTERN
|
#= BLOCK_LANTERN
|
||||||
block.*= lantern \
|
block.*= lantern \
|
||||||
amendments:wall_lantern:light_level=15 \
|
amendments:wall_lantern:light_level=15:lit=true \
|
||||||
mcwlights:striped_lantern mcwlights:covered_lantern mcwlights:chain_lantern mcwlights:tavern_lantern mcwlights:festive_lantern mcwlights:cross_lantern mcwlights:bell_lantern mcwlights:wall_lantern mcwlights:striped_wall_lantern mcwlights:covered_wall_lantern mcwlights:chain_wall_lantern mcwlights:tavern_wall_lantern mcwlights:festive_wall_lantern mcwlights:cross_wall_lantern mcwlights:bell_wall_lantern mcwlights:classic_street_lamp:lit=true:part=top mcwlights:classic_street_lamp:lit=true:part=base mcwlights:double_street_lamp:lit=true:part=top mcwlights:double_street_lamp:lit=true:part=base
|
mcwlights:striped_lantern mcwlights:covered_lantern mcwlights:chain_lantern mcwlights:tavern_lantern mcwlights:festive_lantern mcwlights:cross_lantern mcwlights:bell_lantern mcwlights:wall_lantern mcwlights:striped_wall_lantern mcwlights:covered_wall_lantern mcwlights:chain_wall_lantern mcwlights:tavern_wall_lantern mcwlights:festive_wall_lantern mcwlights:cross_wall_lantern mcwlights:bell_wall_lantern mcwlights:classic_street_lamp:lit=true:part=top mcwlights:classic_street_lamp:lit=true:part=base mcwlights:double_street_lamp:lit=true:part=top mcwlights:double_street_lamp:lit=true:part=base
|
||||||
|
|
||||||
#= BLOCK_LAVA
|
#= BLOCK_LAVA
|
||||||
@ -523,7 +526,7 @@ block.*= minecraft:hanging_roots minecraft:weeping_vines minecraft:cave_vines:be
|
|||||||
|
|
||||||
#= BLOCK_SOUL_LANTERN
|
#= BLOCK_SOUL_LANTERN
|
||||||
block.*= soul_lantern \
|
block.*= soul_lantern \
|
||||||
amendments:wall_lantern:light_level=10 \
|
amendments:wall_lantern:light_level=10:lit=true \
|
||||||
mcwlights:soul_classic_street_lamp:lit=true:part=top mcwlights:soul_classic_street_lamp:lit=true:part=base mcwlights:soul_double_street_lamp:lit=true:part=top mcwlights:soul_double_street_lamp:lit=true:part=base
|
mcwlights:soul_classic_street_lamp:lit=true:part=top mcwlights:soul_classic_street_lamp:lit=true:part=base mcwlights:soul_double_street_lamp:lit=true:part=top mcwlights:soul_double_street_lamp:lit=true:part=base
|
||||||
|
|
||||||
#= BLOCK_SOUL_TORCH
|
#= BLOCK_SOUL_TORCH
|
||||||
|
|||||||
@ -220,12 +220,14 @@ void main() {
|
|||||||
|
|
||||||
#ifdef LPV_ENTITY_LIGHTS
|
#ifdef LPV_ENTITY_LIGHTS
|
||||||
if (
|
if (
|
||||||
(currentRenderedItemId > 0 || entityId > 0) &&
|
((renderStage == MC_RENDER_STAGE_ENTITIES && (currentRenderedItemId > 0 || entityId > 0)) || renderStage == MC_RENDER_STAGE_BLOCK_ENTITIES)
|
||||||
(renderStage == MC_RENDER_STAGE_BLOCK_ENTITIES || renderStage == MC_RENDER_STAGE_ENTITIES)
|
|
||||||
) {
|
) {
|
||||||
uint voxelId = 0u;
|
uint voxelId = 0u;
|
||||||
|
|
||||||
if (currentRenderedItemId > 0 && currentRenderedItemId < 1000) {
|
if (renderStage == MC_RENDER_STAGE_BLOCK_ENTITIES) {
|
||||||
|
voxelId = uint(blockEntityId);
|
||||||
|
}
|
||||||
|
else if (currentRenderedItemId > 0 && currentRenderedItemId < 1000) {
|
||||||
if (entityId != ENTITY_ITEM_FRAME && entityId != ENTITY_PLAYER)
|
if (entityId != ENTITY_ITEM_FRAME && entityId != ENTITY_PLAYER)
|
||||||
voxelId = uint(currentRenderedItemId);
|
voxelId = uint(currentRenderedItemId);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user