add contents of Miki_P98's PR in main branch

This commit is contained in:
Xonk 2024-11-16 19:19:12 -05:00
parent 9145d19e46
commit 06c571c00a
6 changed files with 485 additions and 152 deletions

View File

@ -32,3 +32,10 @@ Credit to the people who inspired many changes and ideas, that you NEED to know
EminGt / https://github.com/EminGT EminGt / https://github.com/EminGT
Null / https://github.com/Null-MC Null / https://github.com/Null-MC
L4mbads / l4mbads (discord) | https://www.youtube.com/channel/UC-5tMMYBNrGJfp1SMjuAf2w L4mbads / l4mbads (discord) | https://www.youtube.com/channel/UC-5tMMYBNrGJfp1SMjuAf2w
Temporal credits entry to people who added more mod support to Bliss:
MikiP98 / https://github.com/MikiP98 | Miki-Liki (Modrinth)
Benjamin Rühl / https://github.com/benruehl
ludo_silver (discord)

File diff suppressed because one or more lines are too long

View File

@ -316,7 +316,7 @@ void main() {
// medium // medium
// low // low
if(entityId == ENTITY_SSS_WEAK || entityId == ENTITY_PLAYER) SSSAMOUNT = 0.3; if(entityId == ENTITY_SSS_WEAK || entityId == ENTITY_PLAYER) SSSAMOUNT = 0.4;
#endif #endif
#endif #endif

View File

@ -62,6 +62,10 @@ void main() {
uint mixMask = 0xFFFF; uint mixMask = 0xFFFF;
vec3 tintColor = vec3(1.0); vec3 tintColor = vec3(1.0);
if (blockId == BLOCK_SSS_WEAK || blockId == BLOCK_SSS_WEAK_3 || blockId == BLOCK_SSS_STRONG) {
mixWeight = 1.0;
}
switch (blockId) { switch (blockId) {
case BLOCK_WATER: case BLOCK_WATER:
mixWeight = 0.8; mixWeight = 0.8;
@ -766,7 +770,9 @@ void main() {
mixWeight = 0.8; mixWeight = 0.8;
} }
if (blockId == BLOCK_TORCH || blockId == ITEM_TORCH) { if (blockId == BLOCK_TORCH || blockId == ITEM_TORCH ||
blockId == BLOCK_LANTERN || blockId == ITEM_LANTERN
) {
lightColor = vec3(TORCH_R, TORCH_G, TORCH_B); lightColor = vec3(TORCH_R, TORCH_G, TORCH_B);
lightRange = 14.0; lightRange = 14.0;
mixWeight = 0.8; mixWeight = 0.8;
@ -917,7 +923,16 @@ void main() {
// LPV shapes // LPV shapes
case BLOCK_LPV_IGNORE: case BLOCK_LPV_IGNORE:
mixWeight = 1.0; mixWeight = 1.00;
break;
case BLOCK_LPV_MIN:
mixWeight = 0.75;
break;
case BLOCK_LPV_MED:
mixWeight = 0.50;
break;
case BLOCK_LPV_MAX:
mixWeight = 0.25;
break; break;
case BLOCK_CARPET: case BLOCK_CARPET:
@ -942,16 +957,6 @@ void main() {
mixWeight = 0.8; mixWeight = 0.8;
break; break;
case BLOCK_FENCE:
case BLOCK_FENCE_GATE:
mixWeight = 0.7;
break;
case BLOCK_FLOWER_POT:
mixWeight = 0.7;
break;
case BLOCK_IRON_BARS:
mixWeight = 0.6;
break;
case BLOCK_PRESSURE_PLATE: case BLOCK_PRESSURE_PLATE:
mixMask = BuildLpvMask(1u, 1u, 1u, 1u, 1u, 0u); mixMask = BuildLpvMask(1u, 1u, 1u, 1u, 1u, 0u);
mixWeight = 0.9; mixWeight = 0.9;
@ -993,6 +998,73 @@ void main() {
break; break;
} }
// STAIRS
if (blockId >= BLOCK_STAIRS_BOTTOM_N && blockId <= BLOCK_STAIRS_TOP_OUTER_S_W) {
mixWeight = 0.25;
switch (blockId) {
case BLOCK_STAIRS_BOTTOM_N:
mixMask = BuildLpvMask(1u, 1u, 0u, 1u, 1u, 0u);
break;
case BLOCK_STAIRS_BOTTOM_E:
mixMask = BuildLpvMask(1u, 1u, 1u, 0u, 1u, 0u);
break;
case BLOCK_STAIRS_BOTTOM_S:
mixMask = BuildLpvMask(0u, 1u, 1u, 1u, 1u, 0u);
break;
case BLOCK_STAIRS_BOTTOM_W:
mixMask = BuildLpvMask(1u, 0u, 1u, 1u, 1u, 0u);
break;
case BLOCK_STAIRS_BOTTOM_INNER_S_E:
mixMask = BuildLpvMask(0u, 1u, 1u, 0u, 0u, 1u);
break;
case BLOCK_STAIRS_BOTTOM_INNER_S_W:
mixMask = BuildLpvMask(0u, 0u, 1u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_BOTTOM_INNER_N_W:
mixMask = BuildLpvMask(1u, 0u, 0u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_BOTTOM_INNER_N_E:
mixMask = BuildLpvMask(1u, 1u, 0u, 0u, 0u, 1u);
break;
}
if (blockId >= BLOCK_STAIRS_BOTTOM_OUTER_N_W && blockId <= BLOCK_STAIRS_BOTTOM_OUTER_S_W) {
mixMask = BuildLpvMask(1u, 1u, 1u, 1u, 0u, 1u);
}
switch (blockId) {
case BLOCK_STAIRS_TOP_N:
mixMask = BuildLpvMask(1u, 1u, 0u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_E:
mixMask = BuildLpvMask(1u, 1u, 1u, 0u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_S:
mixMask = BuildLpvMask(0u, 1u, 1u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_W:
mixMask = BuildLpvMask(1u, 0u, 1u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_INNER_S_E:
mixMask = BuildLpvMask(0u, 1u, 1u, 0u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_INNER_S_W:
mixMask = BuildLpvMask(0u, 0u, 1u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_INNER_N_W:
mixMask = BuildLpvMask(1u, 0u, 0u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_INNER_N_E:
mixMask = BuildLpvMask(1u, 1u, 0u, 0u, 0u, 1u);
break;
}
if (blockId >= BLOCK_STAIRS_TOP_OUTER_N_W && blockId <= BLOCK_STAIRS_TOP_OUTER_S_W) {
mixMask = BuildLpvMask(1u, 1u, 1u, 1u, 0u, 1u);
}
}
// WALL // WALL
if (blockId >= BLOCK_WALL_MIN && blockId <= BLOCK_WALL_MAX) { if (blockId >= BLOCK_WALL_MIN && blockId <= BLOCK_WALL_MAX) {
mixWeight = 0.25; mixWeight = 0.25;

View File

@ -27,10 +27,12 @@ entity.1611=spectral_arrow bigglobe:torch_arrow entity_flame
################################################ ################################################
## medium sss (same as strong sss for blocks) ## medium sss (same as strong sss for blocks)
entity.1801=giant ghast elder_guardian entity.1801=giant ghast elder_guardian \
naturalist:butterfly naturalist:firefly naturalist:caterpillar naturalist:dragonfly
## weak sss (same as weak sss for blocks) ## weak sss (same as weak sss for blocks)
entity.1802=furnace_minecart sheep frog chicken iron_golem snow_golem polar_bear zombie_horse armor_stand arrow squid bat cat cod cow donkey fox horse mooshroom mule ocelot parrot pig piglin polar_bear pufferfish rabbit salmon strider tropical_fish turtle villager wandering_trader bee cave_spider dolphin enderman llama panda spider wolf zombified_piglin creeper drowned endermite evoker guardian hoglin husk phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager trader_llama entity.1802=furnace_minecart sheep frog chicken iron_golem snow_golem polar_bear zombie_horse armor_stand arrow squid bat cat cod cow donkey fox horse mooshroom mule ocelot parrot pig piglin polar_bear pufferfish rabbit salmon strider tropical_fish turtle villager wandering_trader bee cave_spider dolphin enderman llama panda spider wolf zombified_piglin creeper drowned endermite evoker guardian hoglin husk phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager trader_llama \
naturalist:bear naturalist:snail naturalist:snake naturalist:coral_snake naturalist:rattlesnake naturalist:bluejay naturalist:cardinal naturalist:canary naturalist:robin naturalist:finch naturalist:sparrow naturalist:rhino naturalist:elephant naturalist:lion naturalist:zebra naturalist:giraffe naturalist:hippo naturalist:vulture naturalist:boar naturalist:catfish naturalist:alligator naturalist:bass naturalist:tortoise naturalist:duck
#removed: player blaze magma_cube #removed: player blaze magma_cube
################################################ ################################################

View File

@ -41,7 +41,7 @@ item.1018=redstone_torch
item.1019=sculk_catalyst item.1019=sculk_catalyst
item.1020=sea_lantern item.1020=sea_lantern betternether:willow_torch
item.1021=shroomlight item.1021=shroomlight