From d90edca10537179d26b18685dc17774a618ba16b Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Wed, 13 Sep 2023 01:12:04 -0400
Subject: Hide Status Effect Overlay

---
 .../xmrvizzy/skyblocker/config/SkyblockerConfig.java  |  1 +
 .../mixin/AbstractInventoryScreenMixin.java           | 19 +++++++++++++++++++
 .../me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java  |  5 +++++
 3 files changed, 25 insertions(+)
 create mode 100644 src/main/java/me/xmrvizzy/skyblocker/mixin/AbstractInventoryScreenMixin.java

(limited to 'src/main/java/me')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index ca3b221a..e0c2a740 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -146,6 +146,7 @@ public class SkyblockerConfig implements ConfigData {
         public boolean acceptReparty = true;
         public boolean backpackPreviewWithoutShift = false;
         public boolean hideEmptyTooltips = true;
+        public boolean hideStatusEffectOverlay = true;
 
         @ConfigEntry.Category("tabHud")
         @ConfigEntry.Gui.CollapsibleObject()
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/AbstractInventoryScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/AbstractInventoryScreenMixin.java
new file mode 100644
index 00000000..db517411
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/AbstractInventoryScreenMixin.java
@@ -0,0 +1,19 @@
+package me.xmrvizzy.skyblocker.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.utils.Utils;
+import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen;
+
+@Mixin(AbstractInventoryScreen.class)
+public class AbstractInventoryScreenMixin {
+
+	@Inject(method = "drawStatusEffects", at = @At("HEAD"), cancellable = true)
+	private void skyblocker$dontDrawStatusEffects(CallbackInfo ci) {
+		if (Utils.isOnSkyblock() && SkyblockerConfig.get().general.hideStatusEffectOverlay) ci.cancel();
+	}
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java
index bc3df266..752b102a 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java
@@ -61,4 +61,9 @@ public abstract class InGameHudMixin {
         if (Utils.isOnSkyblock() && SkyblockerConfig.get().general.bars.enableBars && !Utils.isInTheRift())
             ci.cancel();
     }
+    
+    @Inject(method = "renderStatusEffectOverlay", at = @At("HEAD"), cancellable = true)
+    private void skyblocker$dontRenderStatusEffects(CallbackInfo ci) {
+        if (Utils.isOnSkyblock() && SkyblockerConfig.get().general.hideStatusEffectOverlay) ci.cancel();
+    }
 }
\ No newline at end of file
-- 
cgit 


From 5c8d19ad863d9a9231e59dbb96c2507185d2f6b6 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Fri, 15 Sep 2023 00:43:41 -0400
Subject: Change default

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/me')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index e0c2a740..4241f68c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -146,7 +146,7 @@ public class SkyblockerConfig implements ConfigData {
         public boolean acceptReparty = true;
         public boolean backpackPreviewWithoutShift = false;
         public boolean hideEmptyTooltips = true;
-        public boolean hideStatusEffectOverlay = true;
+        public boolean hideStatusEffectOverlay = false;
 
         @ConfigEntry.Category("tabHud")
         @ConfigEntry.Gui.CollapsibleObject()
-- 
cgit