Merge Development into main

duplidev · web-flow · commit ff37bfb3e763 · 2023-03-22T22:27:29.000+01:00
Fix Gui Tweaks when disabled
diff --git a/1.12.2/cloudclient/src/main/java/dev/cloudmc/mixins/GuiScreenMixin.java b/1.12.2/cloudclient/src/main/java/dev/cloudmc/mixins/GuiScreenMixin.java
@@ -18,8 +18,8 @@ public abstract class GuiScreenMixin extends Gui {
             )
     )
     public void drawWorldBackground(GuiScreen instance, int left, int top, int right, int bottom, int startColor, int endColor) {
-        if (Cloud.INSTANCE.settingManager.getSettingByModAndName("Gui Tweaks", "Darken Background").isCheckToggled() &&
-                Cloud.INSTANCE.modManager.getMod("Gui Tweaks").isToggled()) {
+        if (Cloud.INSTANCE.settingManager.getSettingByModAndName("Gui Tweaks", "Darken Background").isCheckToggled() ||
+                !Cloud.INSTANCE.modManager.getMod("Gui Tweaks").isToggled()) {
             this.drawGradientRect(left, top, right, bottom, startColor, endColor);
         }
     }
diff --git a/1.7.10/cloudclient/src/main/java/dev/cloudmc/mixins/GuiScreenMixin.java b/1.7.10/cloudclient/src/main/java/dev/cloudmc/mixins/GuiScreenMixin.java
@@ -89,8 +89,8 @@ private static float getTooltipPosition(int tooltipY, int tooltipHeight, int scr
             )
     )
     public void drawWorldBackground(GuiScreen instance, int left, int top, int right, int bottom, int startColor, int endColor) {
-        if (Cloud.INSTANCE.settingManager.getSettingByModAndName("Gui Tweaks", "Darken Background").isCheckToggled() &&
-                Cloud.INSTANCE.modManager.getMod("Gui Tweaks").isToggled()) {
+        if (Cloud.INSTANCE.settingManager.getSettingByModAndName("Gui Tweaks", "Darken Background").isCheckToggled() ||
+                !Cloud.INSTANCE.modManager.getMod("Gui Tweaks").isToggled()) {
             this.drawGradientRect(left, top, right, bottom, startColor, endColor);
         }
     }
diff --git a/1.8.9/cloudclient/src/main/java/dev/cloudmc/mixins/GuiScreenMixin.java b/1.8.9/cloudclient/src/main/java/dev/cloudmc/mixins/GuiScreenMixin.java
@@ -18,8 +18,8 @@ public abstract class GuiScreenMixin extends Gui {
             )
     )
     public void drawWorldBackground(GuiScreen instance, int left, int top, int right, int bottom, int startColor, int endColor) {
-        if (Cloud.INSTANCE.settingManager.getSettingByModAndName("Gui Tweaks", "Darken Background").isCheckToggled() &&
-                Cloud.INSTANCE.modManager.getMod("Gui Tweaks").isToggled()) {
+        if (Cloud.INSTANCE.settingManager.getSettingByModAndName("Gui Tweaks", "Darken Background").isCheckToggled() ||
+                !Cloud.INSTANCE.modManager.getMod("Gui Tweaks").isToggled()) {
             this.drawGradientRect(left, top, right, bottom, startColor, endColor);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ public abstract class GuiScreenMixin extends Gui {`
`18`	`18`	`)`
`19`	`19`	`)`
`20`	`20`	`public void drawWorldBackground(GuiScreen instance, int left, int top, int right, int bottom, int startColor, int endColor) {`
`21`		`- if (Cloud.INSTANCE.settingManager.getSettingByModAndName("Gui Tweaks", "Darken Background").isCheckToggled() &&`
`22`		`- Cloud.INSTANCE.modManager.getMod("Gui Tweaks").isToggled()) {`
	`21`	`+ if (Cloud.INSTANCE.settingManager.getSettingByModAndName("Gui Tweaks", "Darken Background").isCheckToggled() \|\|`
	`22`	`+ !Cloud.INSTANCE.modManager.getMod("Gui Tweaks").isToggled()) {`
`23`	`23`	`this.drawGradientRect(left, top, right, bottom, startColor, endColor);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,8 @@ private static float getTooltipPosition(int tooltipY, int tooltipHeight, int scr`
`89`	`89`	`)`
`90`	`90`	`)`
`91`	`91`	`public void drawWorldBackground(GuiScreen instance, int left, int top, int right, int bottom, int startColor, int endColor) {`
`92`		`- if (Cloud.INSTANCE.settingManager.getSettingByModAndName("Gui Tweaks", "Darken Background").isCheckToggled() &&`
`93`		`- Cloud.INSTANCE.modManager.getMod("Gui Tweaks").isToggled()) {`
	`92`	`+ if (Cloud.INSTANCE.settingManager.getSettingByModAndName("Gui Tweaks", "Darken Background").isCheckToggled() \|\|`
	`93`	`+ !Cloud.INSTANCE.modManager.getMod("Gui Tweaks").isToggled()) {`
`94`	`94`	`this.drawGradientRect(left, top, right, bottom, startColor, endColor);`
`95`	`95`	`}`
`96`	`96`	`}`