merge

2 files changed, 7 insertions, 13 deletions

diff --git a/src/main/java/io/polyfrost/oneconfig/hud/interfaces/BasicHud.java b/src/main/java/io/polyfrost/oneconfig/hud/interfaces/BasicHud.java
index 723a09e..cce2440 100644
--- a/src/main/java/io/polyfrost/oneconfig/hud/interfaces/BasicHud.java
+++ b/src/main/java/io/polyfrost/oneconfig/hud/interfaces/BasicHud.java
@@ -55,9 +55,7 @@ public abstract class BasicHud {
     }
 
     private void drawBackground(float x, float y, float scale) {
-        Renderer.drawRoundRect((int) x, (int) y,
-                (int) (getTotalWidth(scale) + paddingX * scale), (int) (getTotalHeight(scale) + paddingY * scale),
-                (int) (2 * scale), new Color(0, 0, 0, 120).getRGB());
+        Renderer.drawRoundRect((int) x, (int) y, (int) (getTotalWidth(scale) + paddingX * scale), (int) (getTotalHeight(scale) + paddingY * scale), (int) (2 * scale), new Color(0, 0, 0, 120).getRGB());
     }
 
     public float getXScaled(int screenWidth) {
diff --git a/src/main/java/io/polyfrost/oneconfig/hud/interfaces/TextHud.java b/src/main/java/io/polyfrost/oneconfig/hud/interfaces/TextHud.java
index 33bbd79..3c9cf4c 100644
--- a/src/main/java/io/polyfrost/oneconfig/hud/interfaces/TextHud.java
+++ b/src/main/java/io/polyfrost/oneconfig/hud/interfaces/TextHud.java
@@ -14,10 +14,10 @@ public class TextHud extends BasicHud {
      */
     private final FontRenderer fb = Minecraft.getMinecraft().fontRendererObj;
     boolean shadow = false;
+    boolean doExample = false;
     private List<String> cachedLines;
     private int cachedWidth;
     private int cachedHeight;
-    boolean doExample = false;
     private List<String> cachedExampleLines;
     private int cachedExampleWidth;
     private int cachedExampleHeight;
@@ -35,8 +35,7 @@ public class TextHud extends BasicHud {
             cachedWidth = 0;
             for (String line : cachedLines) {
                 int width = fb.getStringWidth(line);
-                if (width > cachedWidth)
-                    cachedWidth = width;
+                if (width > cachedWidth) cachedWidth = width;
             }
         }
         if (doExample) {
@@ -46,8 +45,7 @@ public class TextHud extends BasicHud {
                 cachedExampleWidth = 0;
                 for (String line : cachedExampleLines) {
                     int width = fb.getStringWidth(line);
-                    if (width > cachedExampleWidth)
-                        cachedExampleWidth = width;
+                    if (width > cachedExampleWidth) cachedExampleWidth = width;
                 }
             }
         }
@@ -59,20 +57,18 @@ public class TextHud extends BasicHud {
 
     @Override
     public void draw(int x, int y, float scale) {
-        if (cachedLines != null)
-            drawText(cachedLines, x, y, scale);
+        if (cachedLines != null) drawText(cachedLines, x, y, scale);
     }
 
     @Override
     public void drawExample(int x, int y, float scale) {
         doExample = true;
-        if (cachedExampleLines != null)
-            drawText(cachedExampleLines, x, y, scale);
+        if (cachedExampleLines != null) drawText(cachedExampleLines, x, y, scale);
     }
 
     private void drawText(List<String> lines, int x, int y, float scale) {
         for (int i = 0; i < lines.size(); i++) {
-            Renderer.drawTextScale(lines.get(i), x, y + i * 12, 0xffffff, shadow, scale);
+            Renderer.drawScaledString(lines.get(i), x, y + i * 12, 0xffffff, shadow, scale);
         }
     }