stuff

2 files changed, 16 insertions, 15 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java b/src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java
index 165d201..400dc39 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java
@@ -19,7 +19,7 @@ public class ColorUtils {
                 case 0:
                     return OneConfigConfig.GRAY_400_80;
                 case 1:
-                    return OneConfigConfig.BLUE_600_80;
+                    return OneConfigConfig.PRIMARY_600_80;
             }
         }
 
@@ -32,7 +32,7 @@ public class ColorUtils {
             case 0:
                 return getColorComponents(color, splitColor(OneConfigConfig.GRAY_600), splitColor(OneConfigConfig.GRAY_300), hover, 25f);
             case 1:
-                return getColorComponents(color, splitColor(OneConfigConfig.BLUE_600), splitColor(OneConfigConfig.BLUE_500), hover, 150f);
+                return getColorComponents(color, splitColor(OneConfigConfig.PRIMARY_600), splitColor(OneConfigConfig.PRIMARY_500), hover, 150f);
             case 2:
                 return getColorComponents(color, splitColor(OneConfigConfig.GRAY_500), splitColor(OneConfigConfig.GRAY_300), hover, 50f);
             case 3:
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/TextUtils.java b/src/main/java/cc/polyfrost/oneconfig/utils/TextUtils.java
index f574ea1..22baee0 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/TextUtils.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/TextUtils.java
@@ -4,28 +4,29 @@ import cc.polyfrost.oneconfig.lwjgl.RenderManager;
 import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 public class TextUtils {
 
     public static ArrayList<String> wrapText(long vg, String text, float maxWidth, float fontSize, Fonts font) {
         ArrayList<String> wrappedText = new ArrayList<>();
-        List<String> split = Arrays.asList(text.split(" "));
-        for (int i = split.size(); i >= 0; i--) {
-            String textPart = String.join(" ", split.subList(0, i));
+        text += " ";
+        int prevIndex = 0;
+        for (int i = text.indexOf(" "); i >= 0; i = text.indexOf(" ", i + 1)) {
+            String textPart = text.substring(0, i);
             float textWidth = RenderManager.getTextWidth(vg, textPart, fontSize, font);
-            if (textWidth > maxWidth) continue;
-            wrappedText.add(textPart);
-            if (i != split.size())
-                wrappedText.addAll(wrapText(vg, String.join(" ", split.subList(i, split.size())), maxWidth, fontSize, font));
+            if (textWidth < maxWidth) {
+                prevIndex = i;
+                continue;
+            }
+            wrappedText.add(text.substring(0, prevIndex) + " ");
+            wrappedText.addAll(wrapText(vg, text.substring(prevIndex + 1), maxWidth, fontSize, font));
             break;
         }
-        if (text.endsWith(" ")) {
-            String lastLine = wrappedText.get(wrappedText.size() - 1);
-            lastLine += " ";
+        if (wrappedText.size() == 0) wrappedText.add(text);
+        String temp = wrappedText.get(wrappedText.size() - 1);
+        if (temp.length() != 0) {
             wrappedText.remove(wrappedText.size() - 1);
-            wrappedText.add(lastLine);
+            wrappedText.add(temp.substring(0, temp.length() - 1));
         }
         return wrappedText;
     }