Add oldWaterColorFog

Author: lowercasebtw

CHANGELOG.md

@@ -1,15 +1,18 @@
 ### NOTICE: This update will reset your settings! I'm sorry.
 
 ## Added:
+
 #### Server (For Server Developers)
-- New Server Features: 
-  - "all" - enables everything
-  - "mining_item_usage" - Allows mining blocks whilst using an item like in <=1.7
-  - "pick_inflation" - inflates the pick radius to 0.1 like in <=1.8
-  - "clientside_entities" - makes entity movement client-sided like in <=1.7
-  - "old_sneak_height" - Makes the sneaking bounding box/eye height as it was in <=1.8
+
+- New Server Features:
+    - "all" - enables everything
+    - "mining_item_usage" - Allows mining blocks whilst using an item like in <=1.7
+    - "pick_inflation" - inflates the pick radius to 0.1 like in <=1.8
+    - "clientside_entities" - makes entity movement client-sided like in <=1.7
+    - "old_sneak_height" - Makes the sneaking bounding box/eye height as it was in <=1.8
+
 #### General
-- Merged Extras Back Into Animatium as a new config tab (all disabled by default)
+
 - Onboarding Screen
 - Old Render Distance Checks
 - Old Depth Far
@@ -26,11 +29,37 @@
 - Center Crosshair (like it was in older versions around <=1.12.2)
 - Old Cloud Rendering (<=1.21.5)
 - Old Water Overlay Opacity (the texture when you are submerged) (<=1.12.2)
+- Old Water Color Fog
+- Merged Extras Back Into Animatium as a new config tab (all disabled by default)
+    - Minimal View Bobbing
+    - Show Self Nametag
+    - Hide Nametag Background
+    - Toggle Nametag Shadow
+    - 1.7 Debug Hud Text Color
+    - Allow usage swinging w/ item in offhand
+    - Allow usage swinging always (even in the air)
+    - Always Show Sharpness Particles
+    - Disable Recipe/Tutorial Toasts
+    - Show Arm Whilst Invisible
+    - Fake the miss-penalty arm swing
+    - Disable Blue Void Movement
+    - Disable Entity Falling Over on Death
+    - Deep Red Hurt Tint
+    - Disable Particle Physics
+    - Disable Self Particles (First-person)
+    - Don't Clear Chat (on server leave/etc)
+    - Don't Close Chat (on teleport or whatever)
+    - Old Water Color (Restores old water color (WHITE) in biomes | REQUIRES RESOURCE PACK (PROVIDED))
 
 ## Changed:
+
 #### General
+
 - Simplified a ton of settings (Combined stuff like Sneaking Settings/Fishing Rod Version)
+
 ### Server
+
 - Current config info is now sent inside the "info" payload (README for documentation)
-- Info payload now sends on server join instead of having to be requested, similar to how it originally was but better now
+- Info payload now sends on server join instead of having to be requested, similar to how it originally was but better
+  now
     - During PLAY JOIN

src/main/java/org/visuals/legacy/animatium/config/category/OtherConfigCategory.java

@@ -64,6 +64,7 @@ public class OtherConfigCategory extends Category {
 	public boolean fastGrass = true;
 	public boolean oldY0Height = true;
 	public boolean oldWaterOverlayOpacity = true;
+	public boolean oldWaterColorFog = true;
 	// public boolean disableRandomBlockRotations = true; // TODO: 3.1
 	public VoidFogSetting voidFog = VoidFogSetting.BOTH;
 
@@ -110,6 +111,7 @@ public EntryBundle bundle() {
 		bundle.booleanEntry("fastGrass");
 		bundle.booleanEntry("oldY0Height");
 		bundle.booleanEntry("oldWaterOverlayOpacity");
+		bundle.booleanEntry("oldWaterColorFog");
 		// bundle.booleanEntry("disableRandomBlockRotations");
 		bundle.enumEntry("voidFog", VoidFogSetting.class);
 

src/main/java/org/visuals/legacy/animatium/mixins/v1/rendering/fog/MixinWaterFogEnvironment_OldWaterColor.java

@@ -43,20 +43,20 @@
 
 @Mixin(WaterFogEnvironment.class)
 public abstract class MixinWaterFogEnvironment_OldWaterColor {
-    @WrapOperation(method = "getBaseColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/biome/Biome;getWaterFogColor()I"))
-    private int animatium$oldWaterFogColor(Biome instance, Operation<Integer> original, ClientLevel level, Camera camera, int renderDistance, float partialTick) {
-        if (Animatium.isEnabled() && AnimatiumConfig.instance().extras.oldWaterColorEffects) {
-            float value = 0.0F;
-            if (camera.getEntity() instanceof LivingEntity livingEntity) {
-                value = EnchantmentHelper.getEnchantmentLevel(level.registryAccess().getOrThrow(Enchantments.RESPIRATION), livingEntity) * 0.2F;
-                if (livingEntity.hasEffect(MobEffects.WATER_BREATHING)) {
-                    value *= 0.9F;
-                }
-            }
+	@WrapOperation(method = "getBaseColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/biome/Biome;getWaterFogColor()I"))
+	private int animatium$oldWaterFogColor(Biome instance, Operation<Integer> original, ClientLevel level, Camera camera, int renderDistance, float partialTick) {
+		if (Animatium.isEnabled() && AnimatiumConfig.instance().other.oldWaterColorFog) {
+			float value = 0.0F;
+			if (camera.getEntity() instanceof LivingEntity livingEntity) {
+				value = EnchantmentHelper.getEnchantmentLevel(level.registryAccess().getOrThrow(Enchantments.RESPIRATION), livingEntity) * 0.2F;
+				if (livingEntity.hasEffect(MobEffects.WATER_BREATHING)) {
+					value *= 0.9F;
+				}
+			}
 
-            return ARGB.colorFromFloat(1.0F, 0.02F + value, 0.02F + value, 0.2F + value);
-        } else {
-            return original.call(instance);
-        }
-    }
+			return ARGB.colorFromFloat(1.0F, 0.02F + value, 0.02F + value, 0.2F + value);
+		} else {
+			return original.call(instance);
+		}
+	}
 }

src/main/java/org/visuals/legacy/animatium/util/config/Version.java

@@ -142,6 +142,7 @@ public enum Version {
         other.fastGrass = true;
         other.oldY0Height = true;
         other.oldWaterOverlayOpacity = true;
+        other.oldWaterColorFog = true;
 		// other.disableRandomBlockRotations = true;
     }),
 
@@ -246,6 +247,7 @@ public enum Version {
         other.fastGrass = false;
         other.oldY0Height = true;
         other.oldWaterOverlayOpacity = true;
+        other.oldWaterColorFog = true;
 		// other.disableRandomBlockRotations = false;
     }),
 
@@ -364,6 +366,7 @@ public enum Version {
         other.fastGrass = false;
         other.oldY0Height = false;
         other.oldWaterOverlayOpacity = false;
+        other.oldWaterColorFog = false;
 		// other.disableRandomBlockRotations = false;
     });
 

src/main/resources/assets/animatium/lang/en_us.json

@@ -247,6 +247,8 @@
 	"animatium.oldY0Height.description": "Changes the minY of the world back to 0 like it was in <=1.16.5.",
 	"animatium.oldWaterOverlayOpacity": "[1.12] Old Water Overlay Opacity",
 	"animatium.oldWaterOverlayOpacity.description": "Changes the water texture overlay opacity to 0.5 like it was in <=1.12.2.\n\nThis is when you are submerged in water.",
+	"animatium.oldWaterColorFog": "[1.12] Old Water Color Fog",
+	"animatium.oldWaterColorFog.description": "Restores the old water fog-color calculation from <=1.12.x",
 	"animatium.voidFog": "[1.7] Void Fog/Particles Preset",
 	"animatium.voidFog.description": "Reintroduces void fog & void particles from <=1.7.x",
 	"animatium.enum.VoidFogSetting.BOTH": "Both",