Backups/Eclipse-Shader
1
0
Fork 0
mirror of https://github.com/Merlin1809/Eclipse-Shader.git synced 2026-10-10 21:13:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Huge emissives and mod compat update (sculk now glows!)

Browse Source
This commit is contained in:
Merlin1809
2025-04-22 20:10:00 +02:00
parent b81573f0a4
commit d68eb35c76
5 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shaders/block.properties
+19 -9
View File
@@ -12,7 +12,7 @@ block.12=minecraft:short_grass minecraft:grass \
block.13=minecraft:small_dripleaf:half=lower minecraft:pitcher_plant:half=lower minecraft:tall_grass:half=lower minecraft:sunflower:half=lower minecraft:large_fern:half=lower minecraft:peony:half=lower minecraft:rose_bush:half=lower minecraft:lilac:half=lower minecraft:tall_seagrass:half=lower \
biomesoplenty:sea_oats:half=lower biomesoplenty:tall_lavender:half=lower biomesoplenty:tall_white_lavender:half=lower biomesoplenty:watergrass:half=lower biomesoplenty:reed:half=lower biomesoplenty:cattail:half=lower biomesoplenty:barley:half=lower biomesoplenty:icy_iris:half=lower biomesoplenty:goldenrod:half=lower biomesoplenty:eyebulb:half=lower biomesoplenty:blue_hydrangea:half=lower \
conquest:large_fern_1:half=lower conquest:large_fern_2:half=lower conquest:large_fern_3:half=lower conquest:thick_fern:half=lower conquest:tall_grass:half=lower conquest:large_fern:half=lower conquest:sunflower:half=lower conquest:tall_lilac:half=lower conquest:peony:half=lower conquest:rose_bush:half=lower conquest:tall_seagrass:half=lower \
farmersdelight:wild_rice:half=lower farmersdelight:rice:half=lower\
farmersdelight:wild_rice:half=lower farmersdelight:rice \
flying_stuff:golden_fern:half=lower flying_stuff:smoke_flower_plant:half=lower flying_stuff:lavic_mushrooms:half=lower flying_stuff:smoke_flower_plant_grow_stage:half=lower \
meadow:eriophorum_tall:half=lower meadow:small_fir:half=lower \
natures_spirit:large_lush_fern:half=lower natures_spirit:gardenia:half=lower natures_spirit:cattail:half=lower
@@ -20,7 +20,7 @@ block.13=minecraft:small_dripleaf:half=lower minecraft:pitcher_plant:half=lower
block.14=minecraft:small_dripleaf:half=upper minecraft:pitcher_plant:half=upper minecraft:tall_grass:half=upper minecraft:sunflower:half=upper minecraft:large_fern:half=upper minecraft:peony:half=upper minecraft:rose_bush:half=upper minecraft:lilac:half=upper minecraft:tall_seagrass:half=upper \
biomesoplenty:sea_oats:half=upper biomesoplenty:tall_lavender:half=upper biomesoplenty:tall_white_lavender:half=upper biomesoplenty:watergrass:half=upper biomesoplenty:reed:half=upper biomesoplenty:cattail:half=upper biomesoplenty:barley:half=upper biomesoplenty:icy_iris:half=upper biomesoplenty:goldenrod:half=upper biomesoplenty:eyebulb:half=upper biomesoplenty:blue_hydrangea:half=upper \
conquest:large_fern_1:half=upper conquest:large_fern_2:half=upper conquest:large_fern_3:half=upper conquest:thick_fern:half=upper conquest:tall_grass:half=upper conquest:large_fern:half=upper conquest:sunflower:half=upper conquest:tall_lilac:half=upper conquest:peony:half=upper conquest:rose_bush:half=upper conquest:tall_seagrass:half=upper \
farmersdelight:wild_rice:half=upper farmersdelight:rice_panicles:half=upper\
farmersdelight:wild_rice:half=upper farmersdelight:rice_panicles \
flying_stuff:golden_fern:half=upper flying_stuff:smoke_flower_plant:half=upper flying_stuff:lavic_mushrooms:half=upper flying_stuff:smoke_flower_plant_grow_stage:half=upper \
meadow:eriophorum_tall:half=upper meadow:small_fir:half=upper \
natures_spirit:large_lush_fern:half=upper natures_spirit:gardenia:half=upper natures_spirit:cattail:half=upper
@@ -447,7 +447,8 @@ block.187=end_gateway
block.188=end_rod \
mcwlights:garden_light:lit=true
block.189=fire campfire:lit=true
block.189=fire campfire:lit=true \
supplementaries:fire_pit
block.190=conquest:fire_flies
@@ -457,13 +458,16 @@ block.192=pearlescent_froglight
block.193=verdant_froglight
block.194=furnace:lit=true blast_furnace:lit=true smoker:lit=true
block.194=furnace:lit=true blast_furnace:lit=true smoker:lit=true \
farmersdelight:stove \
create:blaze_burner create:lit_blaze_burner
block.195=glow_lichen \
flying_stuff:celestium_spike flying_stuff:celestium_antenna
block.196=glowstone \
mcwlights:glowstone_slab
mcwlights:glowstone_slab \
additionalplacements:mcwlights.glowstone_slab
block.197=jack_o_lantern \
humility-afm:jack_o_lantern_redstone
@@ -511,7 +515,9 @@ block.215=magma_block
block.216=powered_rail:powered=true
block.217=redstone_lamp:lit=true \
mcwlights:redstone_lamp_slab
mcwlights:redstone_lamp_slab \
additionalplacements:mcwlights.redstone_lamp_slab \
supplementaries:stone_lamp supplementaries:end_stone_lamp supplementaries:deepslate_lamp supplementaries:blackstone_lamp
block.218=redstone_ore:lit=true
@@ -549,7 +555,7 @@ block.234=redstone_wire:power=15
block.235=repeater:powered=true
block.236=respawn_anchor:charges=4
block.236=respawn_anchor:charges=1 respawn_anchor:charges=2 respawn_anchor:charges=3 respawn_anchor:charges=4
block.237=sculk_sensor:sculk_sensor_phase=active
@@ -564,10 +570,12 @@ block.241=sea_pickle:waterlogged=true:pickles=4
block.242=sea_lantern \
flying_stuff:celestium_block \
humility-afm:jack_o_lantern_soul \
mcwlights:sea_lantern_slab
mcwlights:sea_lantern_slab \
additionalplacements:mcwlights.sea_lantern_slab
block.243=shroomlight \
mcwlights:shroomlight_slab
mcwlights:shroomlight_slab \
additionalplacements:mcwlights.shroomlight_slab
block.244=soul_fire soul_campfire:lit=true
@@ -653,6 +661,8 @@ block.265=betterend:iron_bulb_lantern_yellow betterend:terminite_bulb_lantern_ye
humility-afm:led_yellow \
mcwlights:yellow_lamp:lit=true mcwlights:yellow_paper_lamp:lit=true mcwlights:yellow_ceiling_light:lit=true
block.266=sculk sculk_vein sculk_sensor sculk_catalyst calibrated_sculk_sensor sculk_shrieker
####### ----- reflective translucents / glass ----- #######
block.301=glass glass_pane \
shaders/dimensions/all_particles.fsh
-1
View File
@@ -71,7 +71,6 @@ flat varying float HELD_ITEM_BRIGHTNESS;
uniform mat4 gbufferPreviousModelView;
uniform vec3 previousCameraPosition;
varying vec4 pos;
#include "/lib/util.glsl"
#include "/lib/projections.glsl"
shaders/dimensions/all_solid.fsh
+9 -2
View File
@@ -5,6 +5,7 @@
#include "/lib/entities.glsl"
#include "/lib/items.glsl"
#include "/lib/bayer_matrix.glsl"
#include "/lib/hsv.glsl"
flat varying int NameTags;
@@ -306,6 +307,12 @@ void convertHandDepth(inout float depth) {
depth = ndcDepth * 0.5 + 0.5;
}
float getEmission(vec3 Albedo) {
vec3 hsv = RgbToHsv(Albedo.rgb);
float emissive = smoothstep(0.05, 0.35, hsv.y) * pow(hsv.z, 3.5);
return emissive * 0.5;
}
//////////////////////////////VOID MAIN//////////////////////////////
//////////////////////////////VOID MAIN//////////////////////////////
//////////////////////////////VOID MAIN//////////////////////////////
@@ -608,12 +615,12 @@ void main() {
#endif
#if EMISSIVE_TYPE == 1
gl_FragData[1].a = EMISSIVE;
gl_FragData[1].a = getEmission(Albedo.rgb) * EMISSIVE;
#endif
#if EMISSIVE_TYPE == 2
gl_FragData[1].a = SpecularTex.a;
if(SpecularTex.a <= 0.0) gl_FragData[1].a = EMISSIVE;
if(SpecularTex.a <= 0.0) gl_FragData[1].a =getEmission(Albedo.rgb) * EMISSIVE;
#endif
#if EMISSIVE_TYPE == 3
shaders/dimensions/all_solid.vsh
+10
View File
@@ -278,7 +278,17 @@ void main() {
// normal block lightsources
if(mc_Entity.x >= 100 && mc_Entity.x < 300) EMISSIVE = 0.5;
if(mc_Entity.x == 266) EMISSIVE = 0.2; // sculk stuff
if(mc_Entity.x == 195) EMISSIVE = 0.3; // glow lichen
if(mc_Entity.x == 185) EMISSIVE = 1.5; // crying obsidian
if(mc_Entity.x == 105) EMISSIVE = 2.0; // brewing stand
if(mc_Entity.x == 236) EMISSIVE = 1.0; // respawn anchor
// special cases light lightning and beacon beams...
#ifdef ENTITIES
if(entityId == ENTITY_LIGHTNING){
shaders/item.properties
+8 -8
View File
@@ -36,19 +36,19 @@ item.1016=lava_bucket
## ITEM_LIGHT
# item.1017 = light
item.1018=magma_block
item.1017=magma_block
item.1019=redstone_torch
item.1018=redstone_torch
item.1020=sculk_catalyst
item.1029=sculk_catalyst
item.1021=sea_lantern \
item.1020=sea_lantern \
betternether:willow_torch
item.1022=shroomlight
item.1021=shroomlight
item.1023=soul_lantern
item.1022=soul_lantern
item.1024=soul_torch
item.1023=soul_torch
item.1025=torch
item.1024=torch