Invert heartFlash

Author: lowercasebtw

CHANGELOG.md

@@ -55,11 +55,13 @@
 
 #### General
 
+- Refactored a lot of settings to be reversed of what they were before
+    - If all settings are disabled should now result in vanilla behaviour
 - 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
-    - During PLAY JOIN
+    - During PLAY (JOIN) state

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

@@ -33,7 +33,7 @@
 public class ScreenConfigCategory extends Category {
 	public CameraVersion cameraVersion = CameraVersion.V1_8;
 	public boolean crosshairInThirdPerson = true;
-	public boolean heartFlash = true;
+	public boolean disableHeartFlash = true;
 	public boolean centerScrollableListWidgets = true;
 	public boolean listWidgetSelectedBorderColor = true;
 	public boolean legacyButtonHoverTextColor = true;
@@ -67,7 +67,7 @@ public EntryBundle bundle() {
 
 		bundle.enumEntry("cameraVersion", CameraVersion.class);
 		bundle.booleanEntry("crosshairInThirdPerson");
-		bundle.booleanEntry("heartFlash");
+		bundle.booleanEntry("disableHeartFlash");
 		bundle.booleanEntry("centerScrollableListWidgets");
 		bundle.booleanEntry("listWidgetSelectedBorderColor");
 		bundle.booleanEntry("legacyButtonHoverTextColor");

src/main/java/org/visuals/legacy/animatium/mixins/v1/gui/MixinInGameHud.java

@@ -41,26 +41,26 @@
 
 @Mixin(Gui.class)
 public abstract class MixinInGameHud {
-    @WrapOperation(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/CameraType;isFirstPerson()Z"))
-    private boolean animatium$crosshairInThirdPerson(CameraType instance, Operation<Boolean> original) {
-        if (Animatium.isEnabled() && AnimatiumConfig.instance().screen.crosshairInThirdPerson) {
-            return true;
-        } else {
-            return original.call(instance);
-        }
-    }
+	@WrapOperation(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/CameraType;isFirstPerson()Z"))
+	private boolean animatium$crosshairInThirdPerson(CameraType instance, Operation<Boolean> original) {
+		if (Animatium.isEnabled() && AnimatiumConfig.instance().screen.crosshairInThirdPerson) {
+			return true;
+		} else {
+			return original.call(instance);
+		}
+	}
 
-    @WrapWithCondition(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIII)V", ordinal = 2))
-    private boolean animatium$fixHighAttackSpeedIndicator(GuiGraphics instance, RenderPipeline renderPipeline, ResourceLocation resourceLocation, int i, int j, int k, int l, @Local float f) {
-        if (AnimatiumConfig.instance().fixes.fixHighAttackSpeedIndicator) {
-            return (int) (f * 17.0F) != 0;
-        } else {
-            return true;
-        }
-    }
+	@WrapWithCondition(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIII)V", ordinal = 2))
+	private boolean animatium$fixHighAttackSpeedIndicator(GuiGraphics instance, RenderPipeline renderPipeline, ResourceLocation resourceLocation, int i, int j, int k, int l, @Local float f) {
+		if (AnimatiumConfig.instance().fixes.fixHighAttackSpeedIndicator) {
+			return (int) (f * 17.0F) != 0;
+		} else {
+			return true;
+		}
+	}
 
-    @WrapWithCondition(method = "renderHearts", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderHeart(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/gui/Gui$HeartType;IIZZZ)V"))
-    private boolean animatium$heartFlash(Gui instance, GuiGraphics guiGraphics, Gui.HeartType type, int x, int y, boolean hardcore, boolean blinking, boolean half) {
-        return !Animatium.isEnabled() || AnimatiumConfig.instance().screen.heartFlash || !blinking || type == Gui.HeartType.CONTAINER;
-    }
+	@WrapWithCondition(method = "renderHearts", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderHeart(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/gui/Gui$HeartType;IIZZZ)V"))
+	private boolean animatium$heartFlash(Gui instance, GuiGraphics guiGraphics, Gui.HeartType type, int x, int y, boolean hardcore, boolean blinking, boolean half) {
+		return !Animatium.isEnabled() || !AnimatiumConfig.instance().screen.disableHeartFlash || !blinking || type == Gui.HeartType.CONTAINER;
+	}
 }

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

@@ -87,7 +87,7 @@ public enum Version {
 
         final ScreenConfigCategory screen = config.screen;
         screen.crosshairInThirdPerson = true;
-        screen.heartFlash = true;
+        screen.disableHeartFlash = true;
         screen.centerScrollableListWidgets = true;
         screen.listWidgetSelectedBorderColor = true;
         screen.legacyButtonHoverTextColor = true;
@@ -192,7 +192,7 @@ public enum Version {
 
         final ScreenConfigCategory screen = config.screen;
         screen.crosshairInThirdPerson = true;
-        screen.heartFlash = false;
+        screen.disableHeartFlash = false;
         screen.centerScrollableListWidgets = false;
         screen.listWidgetSelectedBorderColor = true;
         screen.legacyButtonHoverTextColor = true;
@@ -311,7 +311,7 @@ public enum Version {
 
         final ScreenConfigCategory screen = config.screen;
         screen.crosshairInThirdPerson = false;
-        screen.heartFlash = false;
+        screen.disableHeartFlash = false;
         screen.centerScrollableListWidgets = false;
         screen.listWidgetSelectedBorderColor = false;
         screen.legacyButtonHoverTextColor = false;

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

@@ -48,8 +48,8 @@
 	"animatium.enum.CameraVersion.V1_8": "1.8 and below",
 	"animatium.crosshairInThirdPerson": "[1.8] Show crosshair in third-person",
 	"animatium.crosshairInThirdPerson.description": "Show crosshair whilst in thirdperson like in <=1.8.x.",
-	"animatium.heartFlash": "[1.7] Toggle hearts flashing when taking damage",
-	"animatium.heartFlash.description": "Enable/disable heart blinking like in <=1.7.x.",
+	"animatium.disableHeartFlash": "[1.7] Disable hearts flashing when taking damage",
+	"animatium.disableHeartFlash.description": "Disables the heart texture blinking like in <=1.7.x.",
 	"animatium.centerScrollableListWidgets": "[1.7] Center scrollable list widgets",
 	"animatium.centerScrollableListWidgets.description": "Center scrollable list widgets like <=1.7.x.",
 	"animatium.listWidgetSelectedBorderColor": "[1.15] List widget selected border color",
@@ -241,7 +241,7 @@
 	"animatium.oldCloudRendering.description": "Brings back the recently-old cloud rendering from <=1.21.5.",
 	"animatium.alwaysSteveModel": "[1.7] Always Steve Model",
 	"animatium.alwaysSteveModel.description": "Forces all player models to be the steve type like in <=1.7.x.",
-	"animatium.fastGrass": "[1.7] Fast Grass",
+	"animatium.fastGrass": "[1.7-fast] Fast Grass",
 	"animatium.fastGrass.description": "Brings back the non-biome-tinted grass side texture from <=1.7.x.",
 	"animatium.oldY0Height": "[1.16] Old Y0 Height",
 	"animatium.oldY0Height.description": "Changes the minY of the world back to 0 like it was in <=1.16.5.",