mirror of
https://github.com/X0nk/Bliss-Shader.git
synced 2025-06-21 00:07:50 +08:00
Merge pull request #135 from Null-MC/more.floodfill.lights
More floodfill light sources
This commit is contained in:
commit
d357554021
File diff suppressed because one or more lines are too long
@ -711,8 +711,10 @@ if (gl_FragCoord.x * texelSize.x < 1.0 && gl_FragCoord.y * texelSize.y < 1.0 )
|
|||||||
vec3 normalOffset = 0.5*worldSpaceNormal;
|
vec3 normalOffset = 0.5*worldSpaceNormal;
|
||||||
|
|
||||||
#if LPV_NORMAL_STRENGTH > 0
|
#if LPV_NORMAL_STRENGTH > 0
|
||||||
|
if (any(greaterThan(abs(normal), vec3(1.0e-6)))) {
|
||||||
vec3 texNormalOffset = -normalOffset + viewToWorld(normal);
|
vec3 texNormalOffset = -normalOffset + viewToWorld(normal);
|
||||||
normalOffset = mix(normalOffset, texNormalOffset, (LPV_NORMAL_STRENGTH*0.01));
|
normalOffset = mix(normalOffset, texNormalOffset, (LPV_NORMAL_STRENGTH*0.01));
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
vec3 lpvPos = GetLpvPosition(feetPlayerPos) + normalOffset;
|
vec3 lpvPos = GetLpvPosition(feetPlayerPos) + normalOffset;
|
||||||
|
@ -606,97 +606,87 @@ void main() {
|
|||||||
lightRange = 8.0;
|
lightRange = 8.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (blockId >= BLOCK_LIGHT_1 && blockId <= BLOCK_LIGHT_15) {
|
||||||
|
lightColor = LightColor_LightBlock;
|
||||||
|
mixWeight = 1.0;
|
||||||
|
|
||||||
switch (blockId) {
|
switch (blockId) {
|
||||||
case BLOCK_LIGHT_1:
|
case BLOCK_LIGHT_1:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 1;
|
lightRange = 1;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_2:
|
case BLOCK_LIGHT_2:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 2;
|
lightRange = 2;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_3:
|
case BLOCK_LIGHT_3:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 3;
|
lightRange = 3;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_4:
|
case BLOCK_LIGHT_4:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 4;
|
lightRange = 4;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_5:
|
case BLOCK_LIGHT_5:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 5;
|
lightRange = 5;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_6:
|
case BLOCK_LIGHT_6:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 6;
|
lightRange = 6;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_7:
|
case BLOCK_LIGHT_7:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 7;
|
lightRange = 7;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_8:
|
case BLOCK_LIGHT_8:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 8;
|
lightRange = 8;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_9:
|
case BLOCK_LIGHT_9:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 9;
|
lightRange = 9;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_10:
|
case BLOCK_LIGHT_10:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 10;
|
lightRange = 10;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_11:
|
case BLOCK_LIGHT_11:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 11;
|
lightRange = 11;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_12:
|
case BLOCK_LIGHT_12:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 12;
|
lightRange = 12;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_13:
|
case BLOCK_LIGHT_13:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 13;
|
lightRange = 13;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_14:
|
case BLOCK_LIGHT_14:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 14;
|
lightRange = 14;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
case BLOCK_LIGHT_15:
|
case BLOCK_LIGHT_15:
|
||||||
lightColor = LightColor_LightBlock;
|
|
||||||
lightRange = 15;
|
lightRange = 15;
|
||||||
mixWeight = 1.0;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (blockId == BLOCK_MAGMA || blockId == ITEM_MAGMA) {
|
if (blockId == BLOCK_MAGMA || blockId == ITEM_MAGMA) {
|
||||||
lightColor = vec3(0.747, 0.323, 0.110);
|
lightColor = vec3(0.747, 0.323, 0.110);
|
||||||
lightRange = 3.0;
|
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) {
|
if (blockId == BLOCK_REDSTONE_LAMP_LIT) {
|
||||||
lightColor = vec3(0.953, 0.796, 0.496);
|
lightColor = vec3(0.953, 0.796, 0.496);
|
||||||
lightRange = 15.0;
|
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) {
|
if (blockId == BLOCK_REDSTONE_TORCH_LIT || blockId == ITEM_REDSTONE_TORCH) {
|
||||||
lightColor = LightColor_RedstoneTorch;
|
lightColor = LightColor_RedstoneTorch;
|
||||||
lightRange = 7.0;
|
lightRange = 7.0;
|
||||||
|
mixWeight = 0.9;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (blockId) {
|
switch (blockId) {
|
||||||
@ -989,6 +979,27 @@ void main() {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WALL
|
||||||
|
if (blockId >= BLOCK_WALL_MIN && blockId <= BLOCK_WALL_MAX) {
|
||||||
|
mixWeight = 0.25;
|
||||||
|
|
||||||
|
if (blockId == BLOCK_WALL_POST_TALL_ALL || blockId == BLOCK_WALL_TALL_ALL
|
||||||
|
|| blockId == BLOCK_WALL_POST_TALL_N_W_S
|
||||||
|
|| blockId == BLOCK_WALL_POST_TALL_N_E_S
|
||||||
|
|| blockId == BLOCK_WALL_POST_TALL_W_N_E
|
||||||
|
|| blockId == BLOCK_WALL_POST_TALL_W_S_E) {
|
||||||
|
mixMask = BuildLpvMask(0u, 0u, 0u, 0u, 1u, 1u);
|
||||||
|
mixWeight = 0.125;
|
||||||
|
}
|
||||||
|
else if (blockId == BLOCK_WALL_POST_TALL_N_S || blockId == BLOCK_WALL_TALL_N_S) {
|
||||||
|
mixMask = BuildLpvMask(1u, 0u, 1u, 0u, 1u, 1u);
|
||||||
|
}
|
||||||
|
else if (blockId == BLOCK_WALL_POST_TALL_W_E || blockId == BLOCK_WALL_TALL_W_E) {
|
||||||
|
mixMask = BuildLpvMask(0u, 1u, 0u, 1u, 1u, 1u);
|
||||||
|
}
|
||||||
|
// TODO: more walls
|
||||||
|
}
|
||||||
|
|
||||||
// Misc
|
// Misc
|
||||||
|
|
||||||
if (blockId == BLOCK_SIGN) {
|
if (blockId == BLOCK_SIGN) {
|
||||||
@ -1010,6 +1021,13 @@ void main() {
|
|||||||
if (blockId == ENTITY_FIREBALL_SMALL) {
|
if (blockId == ENTITY_FIREBALL_SMALL) {
|
||||||
lightColor = vec3(0.000, 1.000, 0.000);
|
lightColor = vec3(0.000, 1.000, 0.000);
|
||||||
lightRange = 8.0;
|
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) {
|
if (blockId == ENTITY_MAGMA_CUBE) {
|
||||||
|
@ -10,15 +10,17 @@ entity.1604=ender_dragon wither
|
|||||||
|
|
||||||
entity.1605=end_crystal
|
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
|
###### SUB-SURFACE SCATTERING
|
||||||
|
@ -99,64 +99,67 @@
|
|||||||
#define BLOCK_COPPER_BULB_WEATHERED_LIT 183
|
#define BLOCK_COPPER_BULB_WEATHERED_LIT 183
|
||||||
#define BLOCK_CONDUIT 184
|
#define BLOCK_CONDUIT 184
|
||||||
#define BLOCK_CRYING_OBSIDIAN 185
|
#define BLOCK_CRYING_OBSIDIAN 185
|
||||||
#define BLOCK_END_GATEWAY 186
|
#define BLOCK_DEEPSLATE_REDSTONE_ORE_LIT 186
|
||||||
#define BLOCK_END_ROD 187
|
#define BLOCK_END_GATEWAY 187
|
||||||
#define BLOCK_FIRE 188
|
#define BLOCK_END_ROD 188
|
||||||
#define BLOCK_FROGLIGHT_OCHRE 189
|
#define BLOCK_FIRE 189
|
||||||
#define BLOCK_FROGLIGHT_PEARLESCENT 190
|
#define BLOCK_FROGLIGHT_OCHRE 190
|
||||||
#define BLOCK_FROGLIGHT_VERDANT 191
|
#define BLOCK_FROGLIGHT_PEARLESCENT 191
|
||||||
#define BLOCK_FURNACE_LIT 192
|
#define BLOCK_FROGLIGHT_VERDANT 192
|
||||||
#define BLOCK_GLOW_LICHEN 193
|
#define BLOCK_FURNACE_LIT 193
|
||||||
#define BLOCK_GLOWSTONE 194
|
#define BLOCK_GLOW_LICHEN 194
|
||||||
#define BLOCK_JACK_O_LANTERN 195
|
#define BLOCK_GLOWSTONE 195
|
||||||
#define BLOCK_LANTERN 196
|
#define BLOCK_JACK_O_LANTERN 196
|
||||||
#define BLOCK_LAVA 197
|
#define BLOCK_LANTERN 197
|
||||||
#define BLOCK_LIGHT_1 198
|
#define BLOCK_LAVA 198
|
||||||
#define BLOCK_LIGHT_2 199
|
#define BLOCK_LIGHT_1 199
|
||||||
#define BLOCK_LIGHT_3 200
|
#define BLOCK_LIGHT_2 200
|
||||||
#define BLOCK_LIGHT_4 201
|
#define BLOCK_LIGHT_3 201
|
||||||
#define BLOCK_LIGHT_5 202
|
#define BLOCK_LIGHT_4 202
|
||||||
#define BLOCK_LIGHT_6 203
|
#define BLOCK_LIGHT_5 203
|
||||||
#define BLOCK_LIGHT_7 204
|
#define BLOCK_LIGHT_6 204
|
||||||
#define BLOCK_LIGHT_8 205
|
#define BLOCK_LIGHT_7 205
|
||||||
#define BLOCK_LIGHT_9 206
|
#define BLOCK_LIGHT_8 206
|
||||||
#define BLOCK_LIGHT_10 207
|
#define BLOCK_LIGHT_9 207
|
||||||
#define BLOCK_LIGHT_11 208
|
#define BLOCK_LIGHT_10 208
|
||||||
#define BLOCK_LIGHT_12 209
|
#define BLOCK_LIGHT_11 209
|
||||||
#define BLOCK_LIGHT_13 210
|
#define BLOCK_LIGHT_12 210
|
||||||
#define BLOCK_LIGHT_14 211
|
#define BLOCK_LIGHT_13 211
|
||||||
#define BLOCK_LIGHT_15 212
|
#define BLOCK_LIGHT_14 212
|
||||||
#define BLOCK_MAGMA 213
|
#define BLOCK_LIGHT_15 213
|
||||||
#define BLOCK_REDSTONE_LAMP_LIT 214
|
#define BLOCK_MAGMA 214
|
||||||
#define BLOCK_REDSTONE_TORCH_LIT 215
|
#define BLOCK_RAIL_POWERED_ON 215
|
||||||
#define BLOCK_REDSTONE_WIRE_1 216
|
#define BLOCK_REDSTONE_LAMP_LIT 216
|
||||||
#define BLOCK_REDSTONE_WIRE_2 217
|
#define BLOCK_REDSTONE_ORE_LIT 217
|
||||||
#define BLOCK_REDSTONE_WIRE_3 218
|
#define BLOCK_REDSTONE_TORCH_LIT 218
|
||||||
#define BLOCK_REDSTONE_WIRE_4 219
|
#define BLOCK_REDSTONE_WIRE_1 219
|
||||||
#define BLOCK_REDSTONE_WIRE_5 220
|
#define BLOCK_REDSTONE_WIRE_2 220
|
||||||
#define BLOCK_REDSTONE_WIRE_6 221
|
#define BLOCK_REDSTONE_WIRE_3 221
|
||||||
#define BLOCK_REDSTONE_WIRE_7 222
|
#define BLOCK_REDSTONE_WIRE_4 222
|
||||||
#define BLOCK_REDSTONE_WIRE_8 223
|
#define BLOCK_REDSTONE_WIRE_5 223
|
||||||
#define BLOCK_REDSTONE_WIRE_9 224
|
#define BLOCK_REDSTONE_WIRE_6 224
|
||||||
#define BLOCK_REDSTONE_WIRE_10 225
|
#define BLOCK_REDSTONE_WIRE_7 225
|
||||||
#define BLOCK_REDSTONE_WIRE_11 226
|
#define BLOCK_REDSTONE_WIRE_8 226
|
||||||
#define BLOCK_REDSTONE_WIRE_12 227
|
#define BLOCK_REDSTONE_WIRE_9 227
|
||||||
#define BLOCK_REDSTONE_WIRE_13 228
|
#define BLOCK_REDSTONE_WIRE_10 228
|
||||||
#define BLOCK_REDSTONE_WIRE_14 229
|
#define BLOCK_REDSTONE_WIRE_11 229
|
||||||
#define BLOCK_REDSTONE_WIRE_15 230
|
#define BLOCK_REDSTONE_WIRE_12 230
|
||||||
#define BLOCK_REPEATER_LIT 231
|
#define BLOCK_REDSTONE_WIRE_13 231
|
||||||
#define BLOCK_RESPAWN_ANCHOR_4 232
|
#define BLOCK_REDSTONE_WIRE_14 232
|
||||||
#define BLOCK_SCULK_SENSOR_ACTIVE 233
|
#define BLOCK_REDSTONE_WIRE_15 233
|
||||||
#define BLOCK_SEA_PICKLE_WET_1 234
|
#define BLOCK_REPEATER_LIT 234
|
||||||
#define BLOCK_SEA_PICKLE_WET_2 235
|
#define BLOCK_RESPAWN_ANCHOR_4 235
|
||||||
#define BLOCK_SEA_PICKLE_WET_3 236
|
#define BLOCK_SCULK_SENSOR_ACTIVE 236
|
||||||
#define BLOCK_SEA_PICKLE_WET_4 237
|
#define BLOCK_SEA_PICKLE_WET_1 237
|
||||||
#define BLOCK_SEA_LANTERN 238
|
#define BLOCK_SEA_PICKLE_WET_2 238
|
||||||
#define BLOCK_SHROOMLIGHT 239
|
#define BLOCK_SEA_PICKLE_WET_3 239
|
||||||
#define BLOCK_SOUL_FIRE 240
|
#define BLOCK_SEA_PICKLE_WET_4 240
|
||||||
#define BLOCK_SOUL_LANTERN 241
|
#define BLOCK_SEA_LANTERN 241
|
||||||
#define BLOCK_SOUL_TORCH 242
|
#define BLOCK_SHROOMLIGHT 242
|
||||||
#define BLOCK_TORCH 243
|
#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_GLASS 301
|
||||||
#define BLOCK_HONEY 302
|
#define BLOCK_HONEY 302
|
||||||
#define BLOCK_ICE 303
|
#define BLOCK_ICE 303
|
||||||
@ -197,5 +200,64 @@
|
|||||||
#define BLOCK_TRAPDOOR_E 417
|
#define BLOCK_TRAPDOOR_E 417
|
||||||
#define BLOCK_TRAPDOOR_S 418
|
#define BLOCK_TRAPDOOR_S 418
|
||||||
#define BLOCK_TRAPDOOR_W 419
|
#define BLOCK_TRAPDOOR_W 419
|
||||||
|
#define BLOCK_WALL_POST 420
|
||||||
|
#define BLOCK_WALL_MIN 420
|
||||||
|
#define BLOCK_WALL_POST_LOW_N 421
|
||||||
|
#define BLOCK_WALL_POST_LOW_E 422
|
||||||
|
#define BLOCK_WALL_POST_LOW_S 423
|
||||||
|
#define BLOCK_WALL_POST_LOW_W 424
|
||||||
|
#define BLOCK_WALL_POST_LOW_N_S 425
|
||||||
|
#define BLOCK_WALL_POST_LOW_W_E 426
|
||||||
|
#define BLOCK_WALL_POST_LOW_N_W 427
|
||||||
|
#define BLOCK_WALL_POST_LOW_N_E 428
|
||||||
|
#define BLOCK_WALL_POST_LOW_S_W 429
|
||||||
|
#define BLOCK_WALL_POST_LOW_S_E 430
|
||||||
|
#define BLOCK_WALL_POST_LOW_N_W_S 431
|
||||||
|
#define BLOCK_WALL_POST_LOW_N_E_S 432
|
||||||
|
#define BLOCK_WALL_POST_LOW_W_N_E 433
|
||||||
|
#define BLOCK_WALL_POST_LOW_W_S_E 434
|
||||||
|
#define BLOCK_WALL_POST_LOW_ALL 435
|
||||||
|
#define BLOCK_WALL_POST_TALL_N 436
|
||||||
|
#define BLOCK_WALL_POST_TALL_E 437
|
||||||
|
#define BLOCK_WALL_POST_TALL_S 438
|
||||||
|
#define BLOCK_WALL_POST_TALL_W 439
|
||||||
|
#define BLOCK_WALL_POST_TALL_N_S 440
|
||||||
|
#define BLOCK_WALL_POST_TALL_W_E 441
|
||||||
|
#define BLOCK_WALL_POST_TALL_N_W 442
|
||||||
|
#define BLOCK_WALL_POST_TALL_N_E 443
|
||||||
|
#define BLOCK_WALL_POST_TALL_S_W 444
|
||||||
|
#define BLOCK_WALL_POST_TALL_S_E 445
|
||||||
|
#define BLOCK_WALL_POST_TALL_N_W_S 446
|
||||||
|
#define BLOCK_WALL_POST_TALL_N_E_S 447
|
||||||
|
#define BLOCK_WALL_POST_TALL_W_N_E 448
|
||||||
|
#define BLOCK_WALL_POST_TALL_W_S_E 449
|
||||||
|
#define BLOCK_WALL_POST_TALL_ALL 450
|
||||||
|
#define BLOCK_WALL_POST_TALL_N_LOW_S 451
|
||||||
|
#define BLOCK_WALL_POST_TALL_E_LOW_W 452
|
||||||
|
#define BLOCK_WALL_POST_TALL_S_LOW_N 453
|
||||||
|
#define BLOCK_WALL_POST_TALL_W_LOW_E 454
|
||||||
|
#define BLOCK_WALL_POST_TALL_N_S_LOW_W_E 455
|
||||||
|
#define BLOCK_WALL_POST_TALL_W_E_LOW_N_S 456
|
||||||
|
#define BLOCK_WALL_POST_TALL_N_W_LOW_S_E 457
|
||||||
|
#define BLOCK_WALL_POST_TALL_N_E_LOW_S_W 458
|
||||||
|
#define BLOCK_WALL_POST_TALL_S_W_LOW_N_E 459
|
||||||
|
#define BLOCK_WALL_POST_TALL_S_E_LOW_N_W 460
|
||||||
|
#define BLOCK_WALL_LOW_N_S 461
|
||||||
|
#define BLOCK_WALL_LOW_W_E 462
|
||||||
|
#define BLOCK_WALL_LOW_N_W 463
|
||||||
|
#define BLOCK_WALL_LOW_N_E 464
|
||||||
|
#define BLOCK_WALL_LOW_S_W 465
|
||||||
|
#define BLOCK_WALL_LOW_S_E 466
|
||||||
|
#define BLOCK_WALL_LOW_ALL 467
|
||||||
|
#define BLOCK_WALL_TALL_N_S 468
|
||||||
|
#define BLOCK_WALL_TALL_W_E 469
|
||||||
|
#define BLOCK_WALL_TALL_N_W 470
|
||||||
|
#define BLOCK_WALL_TALL_N_E 471
|
||||||
|
#define BLOCK_WALL_TALL_S_W 472
|
||||||
|
#define BLOCK_WALL_TALL_S_E 473
|
||||||
|
#define BLOCK_WALL_TALL_ALL 474
|
||||||
|
#define BLOCK_WALL_TALL_N_S_LOW_W_E 475
|
||||||
|
#define BLOCK_WALL_TALL_W_E_LOW_N_S 476
|
||||||
|
#define BLOCK_WALL_MAX 476
|
||||||
#define BLOCK_END_PORTAL 500
|
#define BLOCK_END_PORTAL 500
|
||||||
#define BLOCK_SIGN 501
|
#define BLOCK_SIGN 501
|
||||||
|
@ -3,11 +3,12 @@
|
|||||||
#define ENTITY_BLAZE 1603
|
#define ENTITY_BLAZE 1603
|
||||||
#define ENTITY_DRAGON_WITHER 1604
|
#define ENTITY_DRAGON_WITHER 1604
|
||||||
#define ENTITY_END_CRYSTAL 1605
|
#define ENTITY_END_CRYSTAL 1605
|
||||||
#define ENTITY_ITEM_FRAME 1606
|
#define ENTITY_GLOW_SQUID 1606
|
||||||
#define ENTITY_MAGMA_CUBE 1607
|
#define ENTITY_ITEM_FRAME 1607
|
||||||
#define ENTITY_TNT 1608
|
#define ENTITY_MAGMA_CUBE 1608
|
||||||
#define ENTITY_FIREBALL_SMALL 1609
|
#define ENTITY_TNT 1609
|
||||||
#define ENTITY_SPECTRAL_ARROW 1610
|
#define ENTITY_FIREBALL_SMALL 1610
|
||||||
|
#define ENTITY_SPECTRAL_ARROW 1611
|
||||||
#define ENTITY_SSS_MEDIUM 1801
|
#define ENTITY_SSS_MEDIUM 1801
|
||||||
#define ENTITY_SSS_WEAK 1802
|
#define ENTITY_SSS_WEAK 1802
|
||||||
#define ENTITY_SLIME 1803
|
#define ENTITY_SLIME 1803
|
||||||
|
@ -330,6 +330,9 @@ block.*= vine
|
|||||||
#= BLOCK_CRYING_OBSIDIAN
|
#= BLOCK_CRYING_OBSIDIAN
|
||||||
block.*= crying_obsidian
|
block.*= crying_obsidian
|
||||||
|
|
||||||
|
#= BLOCK_DEEPSLATE_REDSTONE_ORE_LIT
|
||||||
|
block.*= deepslate_redstone_ore:lit=true
|
||||||
|
|
||||||
#= BLOCK_END_GATEWAY
|
#= BLOCK_END_GATEWAY
|
||||||
block.*= end_gateway
|
block.*= end_gateway
|
||||||
|
|
||||||
@ -414,9 +417,15 @@ block.*= vine
|
|||||||
#= BLOCK_MAGMA
|
#= BLOCK_MAGMA
|
||||||
block.*= magma_block
|
block.*= magma_block
|
||||||
|
|
||||||
|
#= BLOCK_RAIL_POWERED_ON
|
||||||
|
block.*= powered_rail:powered=true
|
||||||
|
|
||||||
#= BLOCK_REDSTONE_LAMP_LIT
|
#= BLOCK_REDSTONE_LAMP_LIT
|
||||||
block.*= redstone_lamp:lit=true
|
block.*= redstone_lamp:lit=true
|
||||||
|
|
||||||
|
#= BLOCK_REDSTONE_ORE_LIT
|
||||||
|
block.*= redstone_ore:lit=true
|
||||||
|
|
||||||
#= BLOCK_REDSTONE_TORCH_LIT
|
#= BLOCK_REDSTONE_TORCH_LIT
|
||||||
block.*= redstone_torch:lit=true redstone_wall_torch:lit=true
|
block.*= redstone_torch:lit=true redstone_wall_torch:lit=true
|
||||||
|
|
||||||
@ -665,6 +674,201 @@ block.*= vine
|
|||||||
#= BLOCK_TRAPDOOR_W
|
#= BLOCK_TRAPDOOR_W
|
||||||
block.*= [trapdoor]:facing=west:open=true
|
block.*= [trapdoor]:facing=west:open=true
|
||||||
|
|
||||||
|
#=== WALLS ===#
|
||||||
|
|
||||||
|
group.wall=cobblestone_wall andesite_wall blackstone_wall brick_wall \
|
||||||
|
cobbled_deepslate_wall deepslate_brick_wall deepslate_tile_wall diorite_wall \
|
||||||
|
end_stone_brick_wall granite_wall mossy_cobblestone_wall mossy_stone_brick_wall \
|
||||||
|
mud_brick_wall nether_brick_wall polished_blackstone_brick_wall polished_blackstone_wall \
|
||||||
|
polished_deepslate_wall prismarine_wall red_nether_brick_wall red_sandstone_wall \
|
||||||
|
sandstone_wall stone_brick_wall \
|
||||||
|
\
|
||||||
|
create:cut_andesite_wall create:polished_cut_andesite_wall create:cut_andesite_brick_wall create:small_andesite_brick_wall \
|
||||||
|
create:cut_asurine_wall create:polished_cut_asurine_wall create:cut_asurine_brick_wall create:small_asurine_brick_wall \
|
||||||
|
create:cut_calcite_wall create:polished_cut_calcite_wall create:cut_calcite_brick_wall create:small_calcite_brick_wall \
|
||||||
|
create:cut_crimsite_wall create:polished_cut_crimsite_wall create:cut_crimsite_brick_wall create:small_crimsite_brick_wall \
|
||||||
|
create:cut_deepslate_wall create:polished_cut_deepslate_wall create:cut_deepslate_brick_wall create:small_deepslate_brick_wall \
|
||||||
|
create:cut_diorite_wall create:polished_cut_diorite_wall create:cut_diorite_brick_wall create:small_diorite_brick_wall \
|
||||||
|
create:cut_dripstone_wall create:polished_cut_dripstone_wall create:cut_dripstone_brick_wall create:small_dripstone_brick_wall \
|
||||||
|
create:cut_granite_wall create:polished_cut_granite_wall create:cut_granite_brick_wall create:small_granite_brick_wall \
|
||||||
|
create:cut_limestone_wall create:polished_cut_limestone_wall create:cut_limestone_brick_wall create:small_limestone_brick_wall \
|
||||||
|
create:cut_ochrum_wall create:polished_cut_ochrum_wall create:cut_ochrum_brick_wall create:small_ochrum_brick_wall \
|
||||||
|
create:cut_scorchia_wall create:polished_cut_scorchia_wall create:cut_scorchia_brick_wall create:small_scorchia_brick_wall \
|
||||||
|
create:cut_scoria_wall create:polished_cut_scoria_wall create:cut_scoria_brick_wall create:small_scoria_brick_wall \
|
||||||
|
create:cut_tuff_wall create:polished_cut_tuff_wall create:cut_tuff_brick_wall create:small_tuff_brick_wall \
|
||||||
|
create:cut_veridium_wall create:polished_cut_veridium_wall create:cut_veridium_brick_wall create:small_veridium_brick_wall
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST, BLOCK_WALL_MIN
|
||||||
|
block.*=[wall]:north=none:east=none:south=none:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_N
|
||||||
|
block.*=[wall]:north=low:east=none:south=none:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_E
|
||||||
|
block.*=[wall]:north=none:east=low:south=none:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_S
|
||||||
|
block.*=[wall]:north=none:east=none:south=low:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_W
|
||||||
|
block.*=[wall]:north=none:east=none:south=none:west=low:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_N_S
|
||||||
|
block.*=[wall]:north=low:east=none:south=low:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_W_E
|
||||||
|
block.*=[wall]:north=none:east=low:south=none:west=low:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_N_W
|
||||||
|
block.*=[wall]:north=low:east=none:south=none:west=low:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_N_E
|
||||||
|
block.*=[wall]:north=low:east=low:south=none:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_S_W
|
||||||
|
block.*=[wall]:north=none:east=none:south=low:west=low:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_S_E
|
||||||
|
block.*=[wall]:north=none:east=low:south=low:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_N_W_S
|
||||||
|
block.*=[wall]:north=low:east=none:south=low:west=low:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_N_E_S
|
||||||
|
block.*=[wall]:north=low:east=low:south=low:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_W_N_E
|
||||||
|
block.*=[wall]:north=low:east=low:south=none:west=low:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_W_S_E
|
||||||
|
block.*=[wall]:north=none:east=low:south=low:west=low:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_LOW_ALL
|
||||||
|
block.*=[wall]:north=low:east=low:south=low:west=low:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_N
|
||||||
|
block.*=[wall]:north=tall:east=none:south=none:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_E
|
||||||
|
block.*=[wall]:north=none:east=tall:south=none:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_S
|
||||||
|
block.*=[wall]:north=none:east=none:south=tall:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_W
|
||||||
|
block.*=[wall]:north=none:east=none:south=none:west=tall:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_N_S
|
||||||
|
block.*=[wall]:north=tall:east=none:south=tall:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_W_E
|
||||||
|
block.*=[wall]:north=none:east=tall:south=none:west=tall:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_N_W
|
||||||
|
block.*=[wall]:north=tall:east=none:south=none:west=tall:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_N_E
|
||||||
|
block.*=[wall]:north=tall:east=tall:south=none:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_S_W
|
||||||
|
block.*=[wall]:north=none:east=none:south=tall:west=tall:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_S_E
|
||||||
|
block.*=[wall]:north=none:east=tall:south=tall:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_N_W_S
|
||||||
|
block.*=[wall]:north=tall:east=none:south=tall:west=tall:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_N_E_S
|
||||||
|
block.*=[wall]:north=tall:east=tall:south=tall:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_W_N_E
|
||||||
|
block.*=[wall]:north=tall:east=tall:south=none:west=tall:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_W_S_E
|
||||||
|
block.*=[wall]:north=none:east=tall:south=tall:west=tall:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_ALL
|
||||||
|
block.*=[wall]:north=tall:east=tall:south=tall:west=tall:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_N_LOW_S
|
||||||
|
block.*=[wall]:north=tall:east=none:south=low:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_E_LOW_W
|
||||||
|
block.*=[wall]:north=none:east=tall:south=none:west=low:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_S_LOW_N
|
||||||
|
block.*=[wall]:north=low:east=none:south=tall:west=none:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_W_LOW_E
|
||||||
|
block.*=[wall]:north=none:east=low:south=none:west=tall:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_N_S_LOW_W_E
|
||||||
|
block.*=[wall]:north=tall:east=low:south=tall:west=low:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_W_E_LOW_N_S
|
||||||
|
block.*=[wall]:north=low:east=tall:south=low:west=tall:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_N_W_LOW_S_E
|
||||||
|
block.*=[wall]:north=tall:east=low:south=low:west=tall:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_N_E_LOW_S_W
|
||||||
|
block.*=[wall]:north=tall:east=tall:south=low:west=low:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_S_W_LOW_N_E
|
||||||
|
block.*=[wall]:north=low:east=low:south=tall:west=tall:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_POST_TALL_S_E_LOW_N_W
|
||||||
|
block.*=[wall]:north=low:east=tall:south=tall:west=low:up=true
|
||||||
|
|
||||||
|
#= BLOCK_WALL_LOW_N_S
|
||||||
|
block.*=[wall]:north=low:east=none:south=low:west=none:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_LOW_W_E
|
||||||
|
block.*=[wall]:north=none:east=low:south=none:west=low:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_LOW_N_W
|
||||||
|
block.*=[wall]:north=low:east=none:south=none:west=low:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_LOW_N_E
|
||||||
|
block.*=[wall]:north=low:east=low:south=none:west=none:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_LOW_S_W
|
||||||
|
block.*=[wall]:north=none:east=none:south=low:west=low:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_LOW_S_E
|
||||||
|
block.*=[wall]:north=none:east=low:south=low:west=none:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_LOW_ALL
|
||||||
|
block.*=[wall]:north=low:east=low:south=low:west=low:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_TALL_N_S
|
||||||
|
block.*=[wall]:north=tall:east=none:south=tall:west=none:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_TALL_W_E
|
||||||
|
block.*=[wall]:north=none:east=tall:south=none:west=tall:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_TALL_N_W
|
||||||
|
block.*=[wall]:north=tall:east=none:south=none:west=tall:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_TALL_N_E
|
||||||
|
block.*=[wall]:north=tall:east=tall:south=none:west=none:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_TALL_S_W
|
||||||
|
block.*=[wall]:north=none:east=none:south=tall:west=tall:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_TALL_S_E
|
||||||
|
block.*=[wall]:north=none:east=tall:south=tall:west=none:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_TALL_ALL
|
||||||
|
block.*=[wall]:north=tall:east=tall:south=tall:west=tall:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_TALL_N_S_LOW_W_E
|
||||||
|
block.*=[wall]:north=tall:east=low:south=tall:west=low:up=false
|
||||||
|
|
||||||
|
#= BLOCK_WALL_TALL_W_E_LOW_N_S, BLOCK_WALL_MAX
|
||||||
|
block.*=[wall]:north=low:east=tall:south=low:west=tall:up=false
|
||||||
|
|
||||||
|
|
||||||
####### ----- misc ----- #######
|
####### ----- misc ----- #######
|
||||||
|
|
||||||
|
@ -15,6 +15,9 @@ entity.*= ender_dragon wither
|
|||||||
#= ENTITY_END_CRYSTAL
|
#= ENTITY_END_CRYSTAL
|
||||||
entity.*= end_crystal
|
entity.*= end_crystal
|
||||||
|
|
||||||
|
#= ENTITY_GLOW_SQUID
|
||||||
|
entity.*= glow_squid
|
||||||
|
|
||||||
#= ENTITY_ITEM_FRAME
|
#= ENTITY_ITEM_FRAME
|
||||||
entity.*= item_frame item_display
|
entity.*= item_frame item_display
|
||||||
|
|
||||||
|
@ -72,6 +72,7 @@ void main() {
|
|||||||
case ENTITY_BLAZE:
|
case ENTITY_BLAZE:
|
||||||
case ENTITY_END_CRYSTAL:
|
case ENTITY_END_CRYSTAL:
|
||||||
// case ENTITY_FIREBALL_SMALL:
|
// case ENTITY_FIREBALL_SMALL:
|
||||||
|
case ENTITY_GLOW_SQUID:
|
||||||
case ENTITY_MAGMA_CUBE:
|
case ENTITY_MAGMA_CUBE:
|
||||||
case ENTITY_SPECTRAL_ARROW:
|
case ENTITY_SPECTRAL_ARROW:
|
||||||
case ENTITY_TNT:
|
case ENTITY_TNT:
|
||||||
|
@ -212,7 +212,7 @@ void main() {
|
|||||||
) {
|
) {
|
||||||
uint voxelId = 0u;
|
uint voxelId = 0u;
|
||||||
|
|
||||||
if (currentRenderedItemId > 0) {
|
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);
|
||||||
}
|
}
|
||||||
@ -221,6 +221,7 @@ void main() {
|
|||||||
case ENTITY_BLAZE:
|
case ENTITY_BLAZE:
|
||||||
case ENTITY_END_CRYSTAL:
|
case ENTITY_END_CRYSTAL:
|
||||||
// case ENTITY_FIREBALL_SMALL:
|
// case ENTITY_FIREBALL_SMALL:
|
||||||
|
case ENTITY_GLOW_SQUID:
|
||||||
case ENTITY_MAGMA_CUBE:
|
case ENTITY_MAGMA_CUBE:
|
||||||
case ENTITY_SPECTRAL_ARROW:
|
case ENTITY_SPECTRAL_ARROW:
|
||||||
case ENTITY_TNT:
|
case ENTITY_TNT:
|
||||||
|
@ -72,6 +72,7 @@ void main() {
|
|||||||
case ENTITY_BLAZE:
|
case ENTITY_BLAZE:
|
||||||
case ENTITY_END_CRYSTAL:
|
case ENTITY_END_CRYSTAL:
|
||||||
// case ENTITY_FIREBALL_SMALL:
|
// case ENTITY_FIREBALL_SMALL:
|
||||||
|
case ENTITY_GLOW_SQUID:
|
||||||
case ENTITY_MAGMA_CUBE:
|
case ENTITY_MAGMA_CUBE:
|
||||||
case ENTITY_SPECTRAL_ARROW:
|
case ENTITY_SPECTRAL_ARROW:
|
||||||
case ENTITY_TNT:
|
case ENTITY_TNT:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user