Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2024-12-23 01:59:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'X0nk:main' into main

Browse Source
This commit is contained in:
Aidan Saull 2024-11-30 16:10:06 -05:00 committed by GitHub
commit b79aa9acd8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 308 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CREDITS.txt
View File

@ -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)

2
README.md
View File

@ -11,7 +11,7 @@ i wanted to emphasize a varying scene, where the lighting isn't always the same
+ Emin, and Gri573, for teaching me how to stop alot of light leaking + Emin, and Gri573, for teaching me how to stop alot of light leaking
+ RRe36 and Sixthsurge, for the great ideas to steal + RRe36 and Sixthsurge, for the great ideas to steal
### [You can contact me on discord, by joining the shaderLabs discord server and using the "bliss-xonk" channel](https://discord.com/invite/RpzWN9S) ### [You can contact me on discord, by joining the shaderLabs discord server and using the "bliss-xonk" channel](https://discord.com/invite/RpzWN9S)
### [Want to support me? Consider donating](https://buymeacoffee.com/xonkdev) ### [Want to support me? Consider donating](https://ko-fi.com/xonkdev)
# IN-DEVELOPMENT VERSIONS AND RELEASE VERSIONS # IN-DEVELOPMENT VERSIONS AND RELEASE VERSIONS
`In-development versions` are the very latest versions, and are released regularly to be tested by anyone. **Please report any issues you find.** `In-development versions` are the very latest versions, and are released regularly to be tested by anyone. **Please report any issues you find.**

384
shaders/block.properties
View File

File diff suppressed because one or more lines are too long

2
shaders/dimensions/all_solid.vsh
View File

@ -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

2
shaders/dimensions/setup.csh
View File

@ -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;
} }

6
shaders/entity.properties
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
################################################ ################################################

2
shaders/item.properties
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