From bbc1ce5a9fb80a3800ef6426228d861ab4548c88 Mon Sep 17 00:00:00 2001 From: Xonk Date: Sat, 16 Nov 2024 20:22:33 -0500 Subject: [PATCH] fix imparity in blocks.glsl. fix syntax error in block.properties --- shaders/block.properties | 2 +- shaders/lib/blocks.glsl | 187 ++++++++++++++++++++++----------------- 2 files changed, 106 insertions(+), 83 deletions(-) diff --git a/shaders/block.properties b/shaders/block.properties index db55592..9a2212d 100644 --- a/shaders/block.properties +++ b/shaders/block.properties @@ -621,7 +621,7 @@ block.260= betterend:terminite_bulb_lantern_orange betterend:iron_bulb_lantern_o humility-afm:led_orange \ mcwlights:orange_lamp:lit=true mcwlights:orange_paper_lamp:lit=true mcwlights:orange_ceiling_light:lit=true -block.261=betterend:terminite_bulb_lantern_pink betterend:iron_bulb_lantern_pink +block.261=betterend:terminite_bulb_lantern_pink betterend:iron_bulb_lantern_pink \ humility-afm:led_pink \ mcwlights:pink_lamp:lit=true mcwlights:pink_paper_lamp:lit=true mcwlights:pink_ceiling_light:lit=true diff --git a/shaders/lib/blocks.glsl b/shaders/lib/blocks.glsl index ed6ea06..062e78c 100644 --- a/shaders/lib/blocks.glsl +++ b/shaders/lib/blocks.glsl @@ -6,9 +6,13 @@ #define BLOCK_SAPLING 15 #define BLOCK_VINE 16 #define BLOCK_VINE_OTHER 17 -#define BLOCK_GROUND_WAVING 60 -#define BLOCK_GROUND_WAVING_VERTICAL 61 -#define BLOCK_AIR_WAVING 62 +#define BLOCK_LPV_IGNORE 50 +#define BLOCK_LPV_MIN 51 +#define BLOCK_LPV_MED 52 +#define BLOCK_LPV_MAX 53 +#define BLOCK_GROUND_WAVING 54 +#define BLOCK_GROUND_WAVING_VERTICAL 55 +#define BLOCK_AIR_WAVING 56 #define BLOCK_SSS_STRONG 80 #define BLOCK_SSS_WEAK 81 #define BLOCK_SSS_WEAK_2 82 @@ -199,84 +203,103 @@ #define BLOCK_ICE 319 #define BLOCK_NETHER_PORTAL 320 #define BLOCK_SLIME 321 -#define BLOCK_LPV_IGNORE 401 -#define BLOCK_CARPET 402 -#define BLOCK_DOOR_N 403 -#define BLOCK_DOOR_E 404 -#define BLOCK_DOOR_S 405 -#define BLOCK_DOOR_W 406 -#define BLOCK_FENCE 407 -#define BLOCK_FENCE_GATE 408 -#define BLOCK_FLOWER_POT 409 -#define BLOCK_IRON_BARS 410 -#define BLOCK_PRESSURE_PLATE 411 -#define BLOCK_SLAB_TOP 412 -#define BLOCK_SLAB_BOTTOM 413 -#define BLOCK_SNOW_LAYERS 414 -#define BLOCK_TRAPDOOR_BOTTOM 415 -#define BLOCK_TRAPDOOR_TOP 416 -#define BLOCK_TRAPDOOR_N 417 -#define BLOCK_TRAPDOOR_E 418 -#define BLOCK_TRAPDOOR_S 419 -#define BLOCK_TRAPDOOR_W 420 -#define BLOCK_WALL_POST 421 -#define BLOCK_WALL_MIN 421 -#define BLOCK_WALL_POST_LOW_N 422 -#define BLOCK_WALL_POST_LOW_E 423 -#define BLOCK_WALL_POST_LOW_S 424 -#define BLOCK_WALL_POST_LOW_W 425 -#define BLOCK_WALL_POST_LOW_N_S 426 -#define BLOCK_WALL_POST_LOW_W_E 427 -#define BLOCK_WALL_POST_LOW_N_W 428 -#define BLOCK_WALL_POST_LOW_N_E 429 -#define BLOCK_WALL_POST_LOW_S_W 430 -#define BLOCK_WALL_POST_LOW_S_E 431 -#define BLOCK_WALL_POST_LOW_N_W_S 432 -#define BLOCK_WALL_POST_LOW_N_E_S 433 -#define BLOCK_WALL_POST_LOW_W_N_E 434 -#define BLOCK_WALL_POST_LOW_W_S_E 435 -#define BLOCK_WALL_POST_LOW_ALL 436 -#define BLOCK_WALL_POST_TALL_N 437 -#define BLOCK_WALL_POST_TALL_E 438 -#define BLOCK_WALL_POST_TALL_S 439 -#define BLOCK_WALL_POST_TALL_W 440 -#define BLOCK_WALL_POST_TALL_N_S 441 -#define BLOCK_WALL_POST_TALL_W_E 442 -#define BLOCK_WALL_POST_TALL_N_W 443 -#define BLOCK_WALL_POST_TALL_N_E 444 -#define BLOCK_WALL_POST_TALL_S_W 445 -#define BLOCK_WALL_POST_TALL_S_E 446 -#define BLOCK_WALL_POST_TALL_N_W_S 447 -#define BLOCK_WALL_POST_TALL_N_E_S 448 -#define BLOCK_WALL_POST_TALL_W_N_E 449 -#define BLOCK_WALL_POST_TALL_W_S_E 450 -#define BLOCK_WALL_POST_TALL_ALL 451 -#define BLOCK_WALL_POST_TALL_N_LOW_S 452 -#define BLOCK_WALL_POST_TALL_E_LOW_W 453 -#define BLOCK_WALL_POST_TALL_S_LOW_N 454 -#define BLOCK_WALL_POST_TALL_W_LOW_E 455 -#define BLOCK_WALL_POST_TALL_N_S_LOW_W_E 456 -#define BLOCK_WALL_POST_TALL_W_E_LOW_N_S 457 -#define BLOCK_WALL_POST_TALL_N_W_LOW_S_E 458 -#define BLOCK_WALL_POST_TALL_N_E_LOW_S_W 459 -#define BLOCK_WALL_POST_TALL_S_W_LOW_N_E 460 -#define BLOCK_WALL_POST_TALL_S_E_LOW_N_W 461 -#define BLOCK_WALL_LOW_N_S 462 -#define BLOCK_WALL_LOW_W_E 463 -#define BLOCK_WALL_LOW_N_W 464 -#define BLOCK_WALL_LOW_N_E 465 -#define BLOCK_WALL_LOW_S_W 466 -#define BLOCK_WALL_LOW_S_E 467 -#define BLOCK_WALL_LOW_ALL 468 -#define BLOCK_WALL_TALL_N_S 469 -#define BLOCK_WALL_TALL_W_E 470 -#define BLOCK_WALL_TALL_N_W 471 -#define BLOCK_WALL_TALL_N_E 472 -#define BLOCK_WALL_TALL_S_W 473 -#define BLOCK_WALL_TALL_S_E 474 -#define BLOCK_WALL_TALL_ALL 475 -#define BLOCK_WALL_TALL_N_S_LOW_W_E 476 -#define BLOCK_WALL_TALL_W_E_LOW_N_S 477 -#define BLOCK_WALL_MAX 477 +#define BLOCK_CARPET 401 +#define BLOCK_DOOR_N 402 +#define BLOCK_DOOR_E 403 +#define BLOCK_DOOR_S 404 +#define BLOCK_DOOR_W 405 +#define BLOCK_PRESSURE_PLATE 406 +#define BLOCK_SLAB_TOP 407 +#define BLOCK_SLAB_BOTTOM 408 +#define BLOCK_SNOW_LAYERS 409 +#define BLOCK_TRAPDOOR_BOTTOM 410 +#define BLOCK_TRAPDOOR_TOP 411 +#define BLOCK_TRAPDOOR_N 412 +#define BLOCK_TRAPDOOR_E 413 +#define BLOCK_TRAPDOOR_S 414 +#define BLOCK_TRAPDOOR_W 415 +#define BLOCK_STAIRS_BOTTOM_N 416 +#define BLOCK_STAIRS_BOTTOM_E 417 +#define BLOCK_STAIRS_BOTTOM_S 418 +#define BLOCK_STAIRS_BOTTOM_W 419 +#define BLOCK_STAIRS_BOTTOM_INNER_S_E 420 +#define BLOCK_STAIRS_BOTTOM_INNER_S_W 421 +#define BLOCK_STAIRS_BOTTOM_INNER_N_W 422 +#define BLOCK_STAIRS_BOTTOM_INNER_N_E 423 +#define BLOCK_STAIRS_BOTTOM_OUTER_N_W 424 +#define BLOCK_STAIRS_BOTTOM_OUTER_N_E 425 +#define BLOCK_STAIRS_BOTTOM_OUTER_S_E 426 +#define BLOCK_STAIRS_BOTTOM_OUTER_S_W 427 +#define BLOCK_STAIRS_TOP_N 428 +#define BLOCK_STAIRS_TOP_E 429 +#define BLOCK_STAIRS_TOP_S 430 +#define BLOCK_STAIRS_TOP_W 431 +#define BLOCK_STAIRS_TOP_INNER_S_E 432 +#define BLOCK_STAIRS_TOP_INNER_S_W 433 +#define BLOCK_STAIRS_TOP_INNER_N_W 434 +#define BLOCK_STAIRS_TOP_INNER_N_E 435 +#define BLOCK_STAIRS_TOP_OUTER_N_W 436 +#define BLOCK_STAIRS_TOP_OUTER_N_E 437 +#define BLOCK_STAIRS_TOP_OUTER_S_E 438 +#define BLOCK_STAIRS_TOP_OUTER_S_W 439 +#define BLOCK_WALL_POST 440 +#define BLOCK_WALL_MIN 440 +#define BLOCK_WALL_POST_LOW_N 441 +#define BLOCK_WALL_POST_LOW_E 442 +#define BLOCK_WALL_POST_LOW_S 443 +#define BLOCK_WALL_POST_LOW_W 444 +#define BLOCK_WALL_POST_LOW_N_S 445 +#define BLOCK_WALL_POST_LOW_W_E 446 +#define BLOCK_WALL_POST_LOW_N_W 447 +#define BLOCK_WALL_POST_LOW_N_E 448 +#define BLOCK_WALL_POST_LOW_S_W 449 +#define BLOCK_WALL_POST_LOW_S_E 450 +#define BLOCK_WALL_POST_LOW_N_W_S 451 +#define BLOCK_WALL_POST_LOW_N_E_S 452 +#define BLOCK_WALL_POST_LOW_W_N_E 453 +#define BLOCK_WALL_POST_LOW_W_S_E 454 +#define BLOCK_WALL_POST_LOW_ALL 455 +#define BLOCK_WALL_POST_TALL_N 456 +#define BLOCK_WALL_POST_TALL_E 457 +#define BLOCK_WALL_POST_TALL_S 458 +#define BLOCK_WALL_POST_TALL_W 459 +#define BLOCK_WALL_POST_TALL_N_S 460 +#define BLOCK_WALL_POST_TALL_W_E 461 +#define BLOCK_WALL_POST_TALL_N_W 462 +#define BLOCK_WALL_POST_TALL_N_E 463 +#define BLOCK_WALL_POST_TALL_S_W 464 +#define BLOCK_WALL_POST_TALL_S_E 465 +#define BLOCK_WALL_POST_TALL_N_W_S 466 +#define BLOCK_WALL_POST_TALL_N_E_S 467 +#define BLOCK_WALL_POST_TALL_W_N_E 468 +#define BLOCK_WALL_POST_TALL_W_S_E 469 +#define BLOCK_WALL_POST_TALL_ALL 470 +#define BLOCK_WALL_POST_TALL_N_LOW_S 471 +#define BLOCK_WALL_POST_TALL_E_LOW_W 472 +#define BLOCK_WALL_POST_TALL_S_LOW_N 473 +#define BLOCK_WALL_POST_TALL_W_LOW_E 474 +#define BLOCK_WALL_POST_TALL_N_S_LOW_W_E 475 +#define BLOCK_WALL_POST_TALL_W_E_LOW_N_S 476 +#define BLOCK_WALL_POST_TALL_N_W_LOW_S_E 477 +#define BLOCK_WALL_POST_TALL_N_E_LOW_S_W 478 +#define BLOCK_WALL_POST_TALL_S_W_LOW_N_E 479 +#define BLOCK_WALL_POST_TALL_S_E_LOW_N_W 480 +#define BLOCK_WALL_LOW_N_S 481 +#define BLOCK_WALL_LOW_W_E 482 +#define BLOCK_WALL_LOW_N_W 483 +#define BLOCK_WALL_LOW_N_E 484 +#define BLOCK_WALL_LOW_S_W 485 +#define BLOCK_WALL_LOW_S_E 486 +#define BLOCK_WALL_LOW_ALL 487 +#define BLOCK_WALL_TALL_N_S 488 +#define BLOCK_WALL_TALL_W_E 489 +#define BLOCK_WALL_TALL_N_W 490 +#define BLOCK_WALL_TALL_N_E 491 +#define BLOCK_WALL_TALL_S_W 492 +#define BLOCK_WALL_TALL_S_E 493 +#define BLOCK_WALL_TALL_ALL 494 +#define BLOCK_WALL_TALL_N_S_LOW_W_E 495 +#define BLOCK_WALL_TALL_W_E_LOW_N_S 496 +#define BLOCK_WALL_MAX 496 #define BLOCK_END_PORTAL 500 #define BLOCK_SIGN 501