Add shadow argument to ITextColoring

mchorse · mchorse · commit f9531d2d470b · 2021-08-10T11:43:57.000+01:00
diff --git a/src/main/java/mchorse/mclib/client/gui/framework/elements/buttons/GuiButtonElement.java b/src/main/java/mchorse/mclib/client/gui/framework/elements/buttons/GuiButtonElement.java
@@ -3,16 +3,20 @@
 import mchorse.mclib.McLib;
 import mchorse.mclib.client.gui.framework.elements.utils.GuiContext;
 import mchorse.mclib.client.gui.framework.elements.utils.GuiDraw;
+import mchorse.mclib.client.gui.framework.elements.utils.ITextColoring;
 import mchorse.mclib.client.gui.utils.keys.IKey;
 import mchorse.mclib.utils.ColorUtils;
 import net.minecraft.client.Minecraft;
 
 import java.util.function.Consumer;
 
-public class GuiButtonElement extends GuiClickElement<GuiButtonElement>
+public class GuiButtonElement extends GuiClickElement<GuiButtonElement> implements ITextColoring
 {
     public IKey label;
 
+    public int textColor = 0xffffff;
+    public boolean textShadow = true;
+
     public boolean custom;
     public int customColor;
 
@@ -32,6 +36,21 @@ public GuiButtonElement color(int color)
         return this;
     }
 
+    public GuiButtonElement textColor(int color, boolean shadow)
+    {
+        this.textColor = color;
+        this.textShadow = shadow;
+
+        return this;
+    }
+
+    @Override
+    public void setColor(int color, boolean shadow)
+    {
+        this.textColor = color;
+        this.textShadow = shadow;
+    }
+
     @Override
     protected GuiButtonElement get()
     {
@@ -54,7 +73,7 @@ protected void drawSkin(GuiContext context)
         int x = this.area.mx(this.font.getStringWidth(label));
         int y = this.area.my(this.font.FONT_HEIGHT - 1);
 
-        this.font.drawStringWithShadow(label, x, y, this.hover ? 16777120 : 0xffffff);
+        this.font.drawString(label, x, y, ColorUtils.multiplyColor(this.textColor, this.hover ? 0.9F : 1F), this.textShadow);
 
         GuiDraw.drawLockedArea(this);
     }
diff --git a/src/main/java/mchorse/mclib/client/gui/framework/elements/buttons/GuiToggleElement.java b/src/main/java/mchorse/mclib/client/gui/framework/elements/buttons/GuiToggleElement.java
@@ -17,6 +17,7 @@ public class GuiToggleElement extends GuiClickElement<GuiToggleElement> implemen
 {
     public IKey label;
     public int color = 0xffffff;
+    public boolean textShadow = true;
     private boolean state;
 
     public GuiToggleElement(Minecraft mc, ValueBoolean value)
@@ -49,9 +50,9 @@ public GuiToggleElement(Minecraft mc, IKey label, boolean state, Consumer<GuiTog
     }
 
     @Override
-    public void setColor(int color)
+    public void setColor(int color, boolean shadow)
     {
-        this.color(color);
+        this.color(color, shadow);
     }
 
     public GuiToggleElement label(IKey label)
@@ -69,8 +70,14 @@ public GuiToggleElement toggled(boolean state)
     }
 
     public GuiToggleElement color(int color)
+    {
+        return this.color(color, true);
+    }
+
+    public GuiToggleElement color(int color, boolean textShadow)
     {
         this.color = color;
+        this.textShadow = textShadow;
 
         return this;
     }
@@ -110,10 +117,10 @@ protected void drawSkin(GuiContext context)
 
             if (this.state)
             {
-                this.font.drawStringWithShadow("x", this.area.x + 3, y - 2, 0xffffff);
+                this.font.drawString("x", this.area.x + 3, y - 2, 0xffffff, this.textShadow);
             }
 
-            this.font.drawStringWithShadow(this.label.get(), this.area.x + 14, y, this.color);
+            this.font.drawString(this.label.get(), this.area.x + 14, y, this.color, this.textShadow);
 
             if (!this.isEnabled())
             {
@@ -123,7 +130,7 @@ protected void drawSkin(GuiContext context)
         }
         else
         {
-            this.font.drawStringWithShadow(this.label.get(), this.area.x, this.area.my(this.font.FONT_HEIGHT - 1), this.color);
+            this.font.drawString(this.label.get(), this.area.x, this.area.my(this.font.FONT_HEIGHT - 1), this.color, this.textShadow);
 
             /* Draw toggle switch */
             int w = 16;
diff --git a/src/main/java/mchorse/mclib/client/gui/framework/elements/utils/GuiDraw.java b/src/main/java/mchorse/mclib/client/gui/framework/elements/utils/GuiDraw.java
@@ -520,6 +520,11 @@ public static void drawTextBackground(FontRenderer font, String text, int x, int
     }
 
     public static void drawTextBackground(FontRenderer font, String text, int x, int y, int color, int background, int offset)
+    {
+        drawTextBackground(font, text, x, y, color, background, offset, true);
+    }
+
+    public static void drawTextBackground(FontRenderer font, String text, int x, int y, int color, int background, int offset, boolean shadow)
     {
         int a = background >> 24 & 0xff;
 
@@ -528,7 +533,7 @@ public static void drawTextBackground(FontRenderer font, String text, int x, int
             Gui.drawRect(x - offset, y - offset, x + font.getStringWidth(text) + offset, y + font.FONT_HEIGHT + offset, background);
         }
 
-        font.drawStringWithShadow(text, x, y, color);
+        font.drawString(text, x, y, color, shadow);
     }
 
     public static void drawCustomBackground(int x, int y, int width, int height)
diff --git a/src/main/java/mchorse/mclib/client/gui/framework/elements/utils/GuiLabel.java b/src/main/java/mchorse/mclib/client/gui/framework/elements/utils/GuiLabel.java
@@ -11,6 +11,7 @@ public class GuiLabel extends GuiElement implements ITextColoring
 {
     public IKey label;
     public int color;
+    public boolean textShadow = true;
     public float anchorX;
     public float anchorY;
     public int background;
@@ -30,13 +31,19 @@ public GuiLabel(Minecraft mc, IKey label, int color)
     }
 
     @Override
-    public void setColor(int color)
+    public void setColor(int color, boolean shadow)
     {
-        this.color(color);
+        this.color(color, shadow);
     }
 
     public GuiLabel color(int color)
     {
+        return this.color(color, true);
+    }
+
+    public GuiLabel color(int color, boolean textShadow)
+    {
+        this.textShadow = textShadow;
         this.color = color;
 
         return this;
@@ -81,7 +88,7 @@ public void draw(GuiContext context)
         int x = this.area.x(this.anchorX, this.font.getStringWidth(label));
         int y = this.area.y(this.anchorY, this.font.FONT_HEIGHT);
 
-        GuiDraw.drawTextBackground(this.font, label, x, y, this.color, this.getColor());
+        GuiDraw.drawTextBackground(this.font, label, x, y, this.color, this.getColor(), 3, this.textShadow);
 
         super.draw(context);
     }
diff --git a/src/main/java/mchorse/mclib/client/gui/framework/elements/utils/ITextColoring.java b/src/main/java/mchorse/mclib/client/gui/framework/elements/utils/ITextColoring.java
@@ -2,5 +2,5 @@
 
 public interface ITextColoring
 {
-    public void setColor(int color);
+    public void setColor(int color, boolean shadow);
 }
diff --git a/src/main/java/mchorse/mclib/config/gui/GuiConfigPanel.java b/src/main/java/mchorse/mclib/config/gui/GuiConfigPanel.java
@@ -208,7 +208,7 @@ public void refresh()
                     {
                         for (ITextColoring elem : element.getChildren(ITextColoring.class, new ArrayList<ITextColoring>(), true))
                         {
-                            elem.setColor(0x999999);
+                            elem.setColor(0x999999, true);
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public class GuiToggleElement extends GuiClickElement<GuiToggleElement> implemen`
`17`	`17`	`{`
`18`	`18`	`public IKey label;`
`19`	`19`	`public int color = 0xffffff;`
	`20`	`+ public boolean textShadow = true;`
`20`	`21`	`private boolean state;`
`21`	`22`
`22`	`23`	`public GuiToggleElement(Minecraft mc, ValueBoolean value)`
`@@ -49,9 +50,9 @@ public GuiToggleElement(Minecraft mc, IKey label, boolean state, Consumer<GuiTog`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`@Override`
`52`		`- public void setColor(int color)`
	`53`	`+ public void setColor(int color, boolean shadow)`
`53`	`54`	`{`
`54`		`- this.color(color);`
	`55`	`+ this.color(color, shadow);`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`public GuiToggleElement label(IKey label)`
`@@ -69,8 +70,14 @@ public GuiToggleElement toggled(boolean state)`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`public GuiToggleElement color(int color)`
	`73`	`+ {`
	`74`	`+ return this.color(color, true);`
	`75`	`+ }`
	`76`	`+`
	`77`	`+ public GuiToggleElement color(int color, boolean textShadow)`
`72`	`78`	`{`
`73`	`79`	`this.color = color;`
	`80`	`+ this.textShadow = textShadow;`
`74`	`81`
`75`	`82`	`return this;`
`76`	`83`	`}`
`@@ -110,10 +117,10 @@ protected void drawSkin(GuiContext context)`
`110`	`117`
`111`	`118`	`if (this.state)`
`112`	`119`	`{`
`113`		`- this.font.drawStringWithShadow("x", this.area.x + 3, y - 2, 0xffffff);`
	`120`	`+ this.font.drawString("x", this.area.x + 3, y - 2, 0xffffff, this.textShadow);`
`114`	`121`	`}`
`115`	`122`
`116`		`- this.font.drawStringWithShadow(this.label.get(), this.area.x + 14, y, this.color);`
	`123`	`+ this.font.drawString(this.label.get(), this.area.x + 14, y, this.color, this.textShadow);`
`117`	`124`
`118`	`125`	`if (!this.isEnabled())`
`119`	`126`	`{`
`@@ -123,7 +130,7 @@ protected void drawSkin(GuiContext context)`
`123`	`130`	`}`
`124`	`131`	`else`
`125`	`132`	`{`
`126`		`- this.font.drawStringWithShadow(this.label.get(), this.area.x, this.area.my(this.font.FONT_HEIGHT - 1), this.color);`
	`133`	`+ this.font.drawString(this.label.get(), this.area.x, this.area.my(this.font.FONT_HEIGHT - 1), this.color, this.textShadow);`
`127`	`134`
`128`	`135`	`/* Draw toggle switch */`
`129`	`136`	`int w = 16;`
Original file line number	Diff line number	Diff line change
`@@ -520,6 +520,11 @@ public static void drawTextBackground(FontRenderer font, String text, int x, int`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`public static void drawTextBackground(FontRenderer font, String text, int x, int y, int color, int background, int offset)`
	`523`	`+ {`
	`524`	`+ drawTextBackground(font, text, x, y, color, background, offset, true);`
	`525`	`+ }`
	`526`	`+`
	`527`	`+ public static void drawTextBackground(FontRenderer font, String text, int x, int y, int color, int background, int offset, boolean shadow)`
`523`	`528`	`{`
`524`	`529`	`int a = background >> 24 & 0xff;`
`525`	`530`
`@@ -528,7 +533,7 @@ public static void drawTextBackground(FontRenderer font, String text, int x, int`
`528`	`533`	`Gui.drawRect(x - offset, y - offset, x + font.getStringWidth(text) + offset, y + font.FONT_HEIGHT + offset, background);`
`529`	`534`	`}`
`530`	`535`
`531`		`- font.drawStringWithShadow(text, x, y, color);`
	`536`	`+ font.drawString(text, x, y, color, shadow);`
`532`	`537`	`}`
`533`	`538`
`534`	`539`	`public static void drawCustomBackground(int x, int y, int width, int height)`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public class GuiLabel extends GuiElement implements ITextColoring`
`11`	`11`	`{`
`12`	`12`	`public IKey label;`
`13`	`13`	`public int color;`
	`14`	`+ public boolean textShadow = true;`
`14`	`15`	`public float anchorX;`
`15`	`16`	`public float anchorY;`
`16`	`17`	`public int background;`
`@@ -30,13 +31,19 @@ public GuiLabel(Minecraft mc, IKey label, int color)`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`@Override`
`33`		`- public void setColor(int color)`
	`34`	`+ public void setColor(int color, boolean shadow)`
`34`	`35`	`{`
`35`		`- this.color(color);`
	`36`	`+ this.color(color, shadow);`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`public GuiLabel color(int color)`
`39`	`40`	`{`
	`41`	`+ return this.color(color, true);`
	`42`	`+ }`
	`43`	`+`
	`44`	`+ public GuiLabel color(int color, boolean textShadow)`
	`45`	`+ {`
	`46`	`+ this.textShadow = textShadow;`
`40`	`47`	`this.color = color;`
`41`	`48`
`42`	`49`	`return this;`
`@@ -81,7 +88,7 @@ public void draw(GuiContext context)`
`81`	`88`	`int x = this.area.x(this.anchorX, this.font.getStringWidth(label));`
`82`	`89`	`int y = this.area.y(this.anchorY, this.font.FONT_HEIGHT);`
`83`	`90`
`84`		`- GuiDraw.drawTextBackground(this.font, label, x, y, this.color, this.getColor());`
	`91`	`+ GuiDraw.drawTextBackground(this.font, label, x, y, this.color, this.getColor(), 3, this.textShadow);`
`85`	`92`
`86`	`93`	`super.draw(context);`
`87`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`
`3`	`3`	`public interface ITextColoring`
`4`	`4`	`{`
`5`		`- public void setColor(int color);`
	`5`	`+ public void setColor(int color, boolean shadow);`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public void refresh()`
`208`	`208`	`{`
`209`	`209`	`for (ITextColoring elem : element.getChildren(ITextColoring.class, new ArrayList<ITextColoring>(), true))`
`210`	`210`	`{`
`211`		`- elem.setColor(0x999999);`
	`211`	`+ elem.setColor(0x999999, true);`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`	`}`