accidentally left debug setting enabled. fix naming of filepaths for dimension flags

2025-06-26 18:22:33 +08:00 · 2025-03-23 21:33:15 -04:00
parent 8226094fb2
commit de35db8d0b
174 changed files with 4 additions and 3 deletions
--- a/shaders/dimension.properties
+++ b/shaders/dimension.properties
@ -13,5 +13,6 @@ dimension.world-1 = minecraft:the_nether
 dimension.world1 = minecraft:the_end
 dimension.worldx = 

-dimension.world0_with_aether_tag = aether:the_aether
-dimension.world0_with_twilight_forest_tag = twilightforest:twilight_forest
+# this is using alternate versions of the overworld shader, that have tweaks targeted at specific dimensions
+dimension.world0_with_aether_flag = aether:the_aether
+dimension.world0_with_twilight_forest_flag = twilightforest:twilight_forest
--- a/shaders/lib/settings.glsl
+++ b/shaders/lib/settings.glsl
@ -814,7 +814,7 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631)
 #define debug_DEPTHTEX0 9
 #define debug_DEPTHTEX1 10
 #define DEBUG_VIEW debug_OFF // [debug_OFF debug_SHADOWMAP debug_NORMALS debug_SPECULAR debug_INDIRECT debug_DIRECT debug_VIEW_POSITION debug_DH_WATER_BLENDING debug_FILTERED_STUFF debug_DEPTHTEX0 debug_DEPTHTEX1]
-#define ISOLATE_RESOURCEPACK_SKY
+// #define ISOLATE_RESOURCEPACK_SKY

 #if DEBUG_VIEW == debug_DEPTHTEX0 || DEBUG_VIEW == debug_DEPTHTEX1
 	#undef TAA
--- a/shaders/world0_with_aether_flag/composite.fsh
+++ b/shaders/world0_with_aether_flag/composite.fsh
--- a/shaders/world0_with_aether_flag/composite.vsh
+++ b/shaders/world0_with_aether_flag/composite.vsh
--- a/shaders/world0_with_aether_flag/composite1.fsh
+++ b/shaders/world0_with_aether_flag/composite1.fsh
--- a/shaders/world0_with_aether_flag/composite1.vsh
+++ b/shaders/world0_with_aether_flag/composite1.vsh
--- a/shaders/world0_with_aether_flag/composite10.fsh
+++ b/shaders/world0_with_aether_flag/composite10.fsh
--- a/shaders/world0_with_aether_flag/composite10.vsh
+++ b/shaders/world0_with_aether_flag/composite10.vsh
--- a/shaders/world0_with_aether_flag/composite11.fsh
+++ b/shaders/world0_with_aether_flag/composite11.fsh
--- a/shaders/world0_with_aether_flag/composite11.vsh
+++ b/shaders/world0_with_aether_flag/composite11.vsh
--- a/shaders/world0_with_aether_flag/composite12.fsh
+++ b/shaders/world0_with_aether_flag/composite12.fsh
--- a/shaders/world0_with_aether_flag/composite12.vsh
+++ b/shaders/world0_with_aether_flag/composite12.vsh
--- a/shaders/world0_with_aether_flag/composite13.fsh
+++ b/shaders/world0_with_aether_flag/composite13.fsh
--- a/shaders/world0_with_aether_flag/composite13.vsh
+++ b/shaders/world0_with_aether_flag/composite13.vsh
--- a/shaders/world0_with_aether_flag/composite2.fsh
+++ b/shaders/world0_with_aether_flag/composite2.fsh
--- a/shaders/world0_with_aether_flag/composite2.vsh
+++ b/shaders/world0_with_aether_flag/composite2.vsh
--- a/shaders/world0_with_aether_flag/composite3.fsh
+++ b/shaders/world0_with_aether_flag/composite3.fsh
--- a/shaders/world0_with_aether_flag/composite3.vsh
+++ b/shaders/world0_with_aether_flag/composite3.vsh
--- a/shaders/world0_with_aether_flag/composite4.fsh
+++ b/shaders/world0_with_aether_flag/composite4.fsh
--- a/shaders/world0_with_aether_flag/composite4.vsh
+++ b/shaders/world0_with_aether_flag/composite4.vsh
--- a/shaders/world0_with_aether_flag/composite5.fsh
+++ b/shaders/world0_with_aether_flag/composite5.fsh
--- a/shaders/world0_with_aether_flag/composite5.vsh
+++ b/shaders/world0_with_aether_flag/composite5.vsh
--- a/shaders/world0_with_aether_flag/composite6.fsh
+++ b/shaders/world0_with_aether_flag/composite6.fsh
--- a/shaders/world0_with_aether_flag/composite6.vsh
+++ b/shaders/world0_with_aether_flag/composite6.vsh
--- a/shaders/world0_with_aether_flag/composite7.fsh
+++ b/shaders/world0_with_aether_flag/composite7.fsh
--- a/shaders/world0_with_aether_flag/composite7.vsh
+++ b/shaders/world0_with_aether_flag/composite7.vsh
--- a/shaders/world0_with_aether_flag/composite8.fsh
+++ b/shaders/world0_with_aether_flag/composite8.fsh
--- a/shaders/world0_with_aether_flag/composite8.vsh
+++ b/shaders/world0_with_aether_flag/composite8.vsh
--- a/shaders/world0_with_aether_flag/composite9.fsh
+++ b/shaders/world0_with_aether_flag/composite9.fsh
--- a/shaders/world0_with_aether_flag/composite9.vsh
+++ b/shaders/world0_with_aether_flag/composite9.vsh
--- a/shaders/world0_with_aether_flag/deferred.fsh
+++ b/shaders/world0_with_aether_flag/deferred.fsh
--- a/shaders/world0_with_aether_flag/deferred.vsh
+++ b/shaders/world0_with_aether_flag/deferred.vsh
--- a/shaders/world0_with_aether_flag/deferred1.fsh
+++ b/shaders/world0_with_aether_flag/deferred1.fsh
--- a/shaders/world0_with_aether_flag/deferred1.vsh
+++ b/shaders/world0_with_aether_flag/deferred1.vsh
--- a/shaders/world0_with_aether_flag/deferred2.fsh
+++ b/shaders/world0_with_aether_flag/deferred2.fsh
--- a/shaders/world0_with_aether_flag/deferred2.vsh
+++ b/shaders/world0_with_aether_flag/deferred2.vsh
--- a/shaders/world0_with_aether_flag/dh_generic.fsh
+++ b/shaders/world0_with_aether_flag/dh_generic.fsh
--- a/shaders/world0_with_aether_flag/dh_generic.vsh
+++ b/shaders/world0_with_aether_flag/dh_generic.vsh
--- a/shaders/world0_with_aether_flag/dh_shadow.fsh
+++ b/shaders/world0_with_aether_flag/dh_shadow.fsh
--- a/shaders/world0_with_aether_flag/dh_shadow.vsh
+++ b/shaders/world0_with_aether_flag/dh_shadow.vsh
--- a/shaders/world0_with_aether_flag/dh_terrain.fsh
+++ b/shaders/world0_with_aether_flag/dh_terrain.fsh
--- a/shaders/world0_with_aether_flag/dh_terrain.vsh
+++ b/shaders/world0_with_aether_flag/dh_terrain.vsh
--- a/shaders/world0_with_aether_flag/dh_water.fsh
+++ b/shaders/world0_with_aether_flag/dh_water.fsh
--- a/shaders/world0_with_aether_flag/dh_water.vsh
+++ b/shaders/world0_with_aether_flag/dh_water.vsh
--- a/shaders/world0_with_aether_flag/final.fsh
+++ b/shaders/world0_with_aether_flag/final.fsh
--- a/shaders/world0_with_aether_flag/final.vsh
+++ b/shaders/world0_with_aether_flag/final.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_armor_glint.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_armor_glint.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_armor_glint.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_armor_glint.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_basic.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_basic.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_basic.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_basic.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_beaconbeam.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_beaconbeam.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_beaconbeam.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_beaconbeam.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_block.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_block.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_block.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_block.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_block_translucent.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_block_translucent.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_block_translucent.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_block_translucent.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_damagedblock.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_damagedblock.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_damagedblock.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_damagedblock.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_entities.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_entities.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_entities.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_entities.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_entities_glowing.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_entities_glowing.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_entities_glowing.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_entities_glowing.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_entities_translucent.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_entities_translucent.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_entities_translucent.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_entities_translucent.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_hand.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_hand.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_hand.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_hand.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_hand_water.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_hand_water.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_hand_water.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_hand_water.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_skybasic.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_skybasic.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_skybasic.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_skybasic.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_skytextured.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_skytextured.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_skytextured.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_skytextured.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_spidereyes.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_spidereyes.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_spidereyes.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_spidereyes.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_terrain.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_terrain.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_terrain.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_terrain.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_textured.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_textured.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_textured.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_textured.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_textured_lit.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_textured_lit.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_textured_lit.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_textured_lit.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_water.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_water.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_water.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_water.vsh
--- a/shaders/world0_with_aether_flag/gbuffers_weather.fsh
+++ b/shaders/world0_with_aether_flag/gbuffers_weather.fsh
--- a/shaders/world0_with_aether_flag/gbuffers_weather.vsh
+++ b/shaders/world0_with_aether_flag/gbuffers_weather.vsh
--- a/shaders/world0_with_aether_flag/setup.csh
+++ b/shaders/world0_with_aether_flag/setup.csh
--- a/shaders/world0_with_aether_flag/shadow.fsh
+++ b/shaders/world0_with_aether_flag/shadow.fsh
--- a/shaders/world0_with_aether_flag/shadow.vsh
+++ b/shaders/world0_with_aether_flag/shadow.vsh
--- a/shaders/world0_with_aether_flag/shadowcomp.csh
+++ b/shaders/world0_with_aether_flag/shadowcomp.csh
--- a/shaders/world0_with_twilight_forest_flag/composite.fsh
+++ b/shaders/world0_with_twilight_forest_flag/composite.fsh
--- a/shaders/world0_with_twilight_forest_flag/composite.vsh
+++ b/shaders/world0_with_twilight_forest_flag/composite.vsh
--- a/shaders/world0_with_twilight_forest_flag/composite1.fsh
+++ b/shaders/world0_with_twilight_forest_flag/composite1.fsh
--- a/shaders/world0_with_twilight_forest_flag/composite1.vsh
+++ b/shaders/world0_with_twilight_forest_flag/composite1.vsh
--- a/shaders/world0_with_twilight_forest_flag/composite10.fsh
+++ b/shaders/world0_with_twilight_forest_flag/composite10.fsh
--- a/shaders/world0_with_twilight_forest_flag/composite10.vsh
+++ b/shaders/world0_with_twilight_forest_flag/composite10.vsh
--- a/shaders/world0_with_twilight_forest_flag/composite11.fsh
+++ b/shaders/world0_with_twilight_forest_flag/composite11.fsh
--- a/shaders/world0_with_twilight_forest_flag/composite11.vsh
+++ b/shaders/world0_with_twilight_forest_flag/composite11.vsh
--- a/shaders/world0_with_twilight_forest_flag/composite12.fsh
+++ b/shaders/world0_with_twilight_forest_flag/composite12.fsh
--- a/shaders/world0_with_twilight_forest_flag/composite12.vsh
+++ b/shaders/world0_with_twilight_forest_flag/composite12.vsh
--- a/shaders/world0_with_twilight_forest_flag/composite13.fsh
+++ b/shaders/world0_with_twilight_forest_flag/composite13.fsh
--- a/shaders/world0_with_twilight_forest_flag/composite13.vsh
+++ b/shaders/world0_with_twilight_forest_flag/composite13.vsh
--- a/Show More
+++ b/Show More