mirror of
https://github.com/X0nk/Bliss-Shader.git
synced 2024-12-22 09:38:52 +08:00
Merge pull request #323 from MikiP98/main
Adds SSS, Waving and Floodfill corrections to some mods as well as some other minor mod support stuff and changes
This commit is contained in:
commit
4ba7728cdc
@ -32,3 +32,11 @@ 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
@ -313,7 +313,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
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ 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) {
|
if (blockId == BLOCK_SSS_WEAK || blockId == BLOCK_SSS_WEAK_3 || blockId == BLOCK_SSS_STRONG) {
|
||||||
mixWeight = 1.0;
|
mixWeight = 1.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
|
||||||
################################################
|
################################################
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user