merge

24 files changed, 389 insertions, 370 deletions

diff --git a/build.gradle b/build.gradle
index e320d14..7efe09c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,79 +1,98 @@
+//file:noinspection UnnecessaryQualifiedReference
+//file:noinspection GroovyAssignabilityCheck
+
 plugins {
+    id "dev.architectury.architectury-pack200" version "0.1.3"
+    id "com.github.johnrengelman.shadow" version "7.1.0"
+    id "cc.woverflow.loom" version "0.10.6"
+    id "net.kyori.blossom" version "1.3.0"
     id "java"
-    id "com.github.johnrengelman.shadow" version "6.1.0"
-    id "net.minecraftforge.gradle.forge" version "6f53277"
 }
 
-group "io.polyfrost"
-version "1.0-SNAPSHOT"
-archivesBaseName = "OneConfig"
+version = mod_version
+group = "io.polyfrost"
+archivesBaseName = mod_name
+
+blossom {
+    String className = "src/main/java/io/polyfrost/oneconfig/OneConfig.java"
+    replaceToken("@VER@", project.version, className)
+    replaceToken("@NAME@", mod_name, className)
+    replaceToken("@ID@", mod_id, className)
+}
 
-sourceCompatibility = targetCompatibility = 1.8
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
 compileJava.options.encoding = 'UTF-8'
 
-minecraft {
-    version = "1.8.9-11.15.1.2318-1.8.9"
-    runDir = "run"
-    mappings = "stable_22"
-    makeObfSourceJar = false
+loom {
+    launchConfigs {
+        client {
+
+        }
+    }
+    runConfigs {
+        client {
+            ideConfigGenerated = true
+        }
+    }
+    forge {
+        pack200Provider = new dev.architectury.pack200.java.Pack200Adapter()
+    }
 }
 
 configurations {
-    shade
-    implementation.extendsFrom(shade)
+    include
+    implementation.extendsFrom(include)
 }
 
 repositories {
-mavenCentral()
+    maven { url 'https://repo.woverflow.cc/' }
 }
 
 dependencies {
-implementation 'org.jetbrains:annotations:22.0.0'
+    minecraft("com.mojang:minecraft:1.8.9")
+    mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
+    forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
 }
 
-/**
- * This task simply replaces the `${version}` and `${mcversion}` properties in the mcmod.info with the data from Gradle
- */
 processResources {
     // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
+    inputs.property "version", version
+    inputs.property "name", mod_name
+    inputs.property "id", mod_id
 
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-
-        // replace version and mcversion
-        expand 'version': project.version, 'mcversion': project.minecraft.version
+    filesMatching("mcmod.info") {
+        expand(
+                "id": mod_id,
+                "name": mod_name,
+                "version": version
+        )
     }
 
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
+    rename '(.+_at.cfg)', 'META-INF/$1'
 }
 
-/**
- * This task simply moves resources so they can be accessed at runtime, Forge is quite weird isn't it
- */
-task moveResources {
-    doLast {
-        ant.move file: "${buildDir}/resources/main",
-                todir: "${buildDir}/classes/java"
+sourceSets {
+    main {
+        output.resourcesDir = java.classesDirectory
     }
 }
 
-moveResources.dependsOn processResources
-classes.dependsOn moveResources
+remapJar {
+    archiveClassifier = "nodeps"
+}
+
+jar {
+    manifest.attributes(
+            'ModSide': 'CLIENT',
+            'ForceLoadAsMod': true,
+            "TweakOrder": "0"
+    )
+}
 
 shadowJar {
-    archiveClassifier.set('dep')
-    configurations = [project.configurations.shade]
+    archiveClassifier.set('')
+    from(remapJar.archiveFile)
+    configurations = [project.configurations.include]
     duplicatesStrategy DuplicatesStrategy.EXCLUDE
 }
-
-reobf { shadowJar { mappingType = "SEARGE" } }
-tasks.reobfShadowJar.mustRunAfter shadowJar
-afterEvaluate {
-    build.dependsOn reobfShadowJar
-}
\ No newline at end of file
+assemble.dependsOn shadowJar
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..527e3ee
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,6 @@
+org.gradle.jvmargs=-Xmx2G
+mod_name = OneConfig
+mod_id = oneconfig
+mod_version = 1.0.0
+
+loom.platform = forge
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d913..b1159fc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 9c76f81..4f8d00d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,30 +1,8 @@
 pluginManagement {
     repositories {
-        mavenCentral()
         gradlePluginPortal()
-
-        // Add the Forge Repository (ForgeGradle fetches most of its stuff from here)
-        maven {
-            name = "Forge"
-            url = "https://maven.minecraftforge.net"
-        }
-
-        // Add the Jitpack Repository (We fetch ForgeGradle from this)
-        maven {
-            name = "Jitpack"
-            url = "https://jitpack.io/"
-        }
-    }
-    resolutionStrategy {
-        eachPlugin {
-            // If the "net.minecraftforge.gradle.forge" plugin is requested we redirect it to asbyth's ForgeGradle fork
-            if (requested.id.id == "net.minecraftforge.gradle.forge") {
-                useModule("com.github.asbyth:ForgeGradle:${requested.version}")
-            }
-        }
+        maven { url = "https://repo.woverflow.cc" }
     }
 }
 
-
-rootProject.name = 'oneConfig'
-
+rootProject.name = mod_name
\ No newline at end of file
diff --git a/src/main/java/io/polyfrost/oneconfig/OneConfig.java b/src/main/java/io/polyfrost/oneconfig/OneConfig.java
index da4a604..7f29c39 100644
--- a/src/main/java/io/polyfrost/oneconfig/OneConfig.java
+++ b/src/main/java/io/polyfrost/oneconfig/OneConfig.java
@@ -14,7 +14,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
 import java.io.File;
 
-@Mod(modid = "oneconfig", name = "OneConfig", version = "${version}")
+@Mod(modid = "@ID@", name = "@NAME@", version = "@VER@")
 public class OneConfig {
     private static final Minecraft mc = Minecraft.getMinecraft();
     public static File jarFile;
diff --git a/src/main/java/io/polyfrost/oneconfig/command/OneConfigCommand.java b/src/main/java/io/polyfrost/oneconfig/command/OneConfigCommand.java
index 575fc3f..df727a0 100644
--- a/src/main/java/io/polyfrost/oneconfig/command/OneConfigCommand.java
+++ b/src/main/java/io/polyfrost/oneconfig/command/OneConfigCommand.java
@@ -39,8 +39,7 @@ public class OneConfigCommand implements ICommand {
 
     @Override
     public void processCommand(ICommandSender sender, String[] args) {
-        if (args.length == 0)
-            new TickDelay(() -> mc.displayGuiScreen(new Window()), 1);
+        if (args.length == 0) new TickDelay(() -> mc.displayGuiScreen(new Window()), 1);
         else {
             switch (args[0]) {
                 case "hud":
diff --git a/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java b/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java
index a518633..b46c65d 100644
--- a/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java
+++ b/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java
@@ -8,16 +8,16 @@ import java.io.*;
 import java.nio.charset.StandardCharsets;
 
 public class OneConfigConfig extends Config {
+    public static String currentProfile = "Default Profile";
+
     public OneConfigConfig() {
         super(null, "OneConfig.json");
     }
 
     @Override
     public void init(ModData modData) {
-        if (new File("OneConfig/" + configFile).exists())
-            load();
-        else
-            save();
+        if (new File("OneConfig/" + configFile).exists()) load();
+        else save();
     }
 
     @Override
@@ -37,6 +37,4 @@ public class OneConfigConfig extends Config {
             e.printStackTrace();
         }
     }
-
-    public static String currentProfile = "Default Profile";
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/config/core/ConfigCore.java b/src/main/java/io/polyfrost/oneconfig/config/core/ConfigCore.java
index a66a8a0..9bb2e85 100644
--- a/src/main/java/io/polyfrost/oneconfig/config/core/ConfigCore.java
+++ b/src/main/java/io/polyfrost/oneconfig/config/core/ConfigCore.java
@@ -10,13 +10,13 @@ import java.util.HashMap;
 public class ConfigCore {
     public static HashMap<ModData, ArrayList<Option>> settings = new HashMap<>();
 
-    public static void saveAll () {
+    public static void saveAll() {
         for (ModData modData : settings.keySet()) {
             modData.config.save();
         }
     }
 
-    public static void reInitAll () {
+    public static void reInitAll() {
         ArrayList<ModData> data = new ArrayList<>(settings.keySet());
         settings.clear();
         HudCore.huds.clear();
diff --git a/src/main/java/io/polyfrost/oneconfig/config/interfaces/Config.java b/src/main/java/io/polyfrost/oneconfig/config/interfaces/Config.java
index 2e3e92d..73dbbe7 100644
--- a/src/main/java/io/polyfrost/oneconfig/config/interfaces/Config.java
+++ b/src/main/java/io/polyfrost/oneconfig/config/interfaces/Config.java
@@ -20,8 +20,7 @@ import java.util.Optional;
 
 public class Config {
     protected final String configFile;
-    protected final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).setPrettyPrinting()
-            .registerTypeAdapterFactory(OneConfigTypeAdapterFactory.getStaticTypeAdapterFactory()).create();
+    protected final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).setPrettyPrinting().registerTypeAdapterFactory(OneConfigTypeAdapterFactory.getStaticTypeAdapterFactory()).create();
 
     /**
      * @param modData    information about the mod
@@ -33,10 +32,8 @@ public class Config {
     }
 
     public void init(ModData modData) {
-        if (Profiles.getProfileFile(configFile).exists())
-            load();
-        else
-            save();
+        if (Profiles.getProfileFile(configFile).exists()) load();
+        else save();
         modData.config = this;
         ConfigCore.settings.put(modData, generateOptionList(this.getClass()));
     }
@@ -109,8 +106,7 @@ public class Config {
                 }
             } else {
                 Option customOption = processCustomOption(field);
-                if (customOption != null)
-                    options.add(customOption);
+                if (customOption != null) options.add(customOption);
             }
         }
         return options;
diff --git a/src/main/java/io/polyfrost/oneconfig/config/interfaces/Option.java b/src/main/java/io/polyfrost/oneconfig/config/interfaces/Option.java
index 5980a63..99cf656 100644
--- a/src/main/java/io/polyfrost/oneconfig/config/interfaces/Option.java
+++ b/src/main/java/io/polyfrost/oneconfig/config/interfaces/Option.java
@@ -19,8 +19,7 @@ public abstract class Option {
         this.field = field;
         this.name = name;
         this.description = description;
-        if (field != null)
-            field.setAccessible(true);
+        if (field != null) field.setAccessible(true);
     }
 
     /**
diff --git a/src/main/java/io/polyfrost/oneconfig/config/profiles/Profiles.java b/src/main/java/io/polyfrost/oneconfig/config/profiles/Profiles.java
index db9fce2..45d448d 100644
--- a/src/main/java/io/polyfrost/oneconfig/config/profiles/Profiles.java
+++ b/src/main/java/io/polyfrost/oneconfig/config/profiles/Profiles.java
@@ -11,8 +11,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 public class Profiles {
-    public static ArrayList<String> profiles;
     private static final File profileDir = new File("OneConfig/profiles");
+    public static ArrayList<String> profiles;
 
     public static String getCurrentProfile() {
         if (!profileDir.exists() && !profileDir.mkdir()) {
@@ -21,8 +21,7 @@ public class Profiles {
         }
         if (profiles == null) {
             String[] profilesArray = new File("OneConfig/profiles").list((file, s) -> file.isDirectory());
-            if (profilesArray != null)
-                profiles = new ArrayList<>(Arrays.asList(profilesArray));
+            if (profilesArray != null) profiles = new ArrayList<>(Arrays.asList(profilesArray));
         }
         if (!getProfileDir(OneConfigConfig.currentProfile).exists()) {
             createProfile(OneConfigConfig.currentProfile);
@@ -62,8 +61,7 @@ public class Profiles {
         try {
             File newFile = new File(new File("OneConfig/profiles"), newName);
             FileUtils.moveDirectory(getProfileDir(name), newFile);
-            if (OneConfigConfig.currentProfile.equals(name))
-                OneConfigConfig.currentProfile = newName;
+            if (OneConfigConfig.currentProfile.equals(name)) OneConfigConfig.currentProfile = newName;
             profiles.remove(name);
             profiles.add(newName);
         } catch (IOException e) {
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/Window.java b/src/main/java/io/polyfrost/oneconfig/gui/Window.java
index 62576a9..fa672d5 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/Window.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/Window.java
@@ -1,10 +1,8 @@
 package io.polyfrost.oneconfig.gui;
 
 import io.polyfrost.oneconfig.gui.elements.OCBlock;
-import io.polyfrost.oneconfig.gui.elements.OCButton;
 import io.polyfrost.oneconfig.gui.elements.OCStoreBlock;
 import io.polyfrost.oneconfig.themes.Theme;
-import io.polyfrost.oneconfig.themes.textures.ThemeElement;
 import io.polyfrost.oneconfig.themes.Themes;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
@@ -24,10 +22,11 @@ public class Window extends GuiScreen {
     long secondCounter = System.currentTimeMillis();
     long prevTime = System.currentTimeMillis();
     int frames = 0;
-    OCBlock block = new OCBlock(-1, 100, 200);
+    OCBlock block = new OCBlock(() -> {
+        t.getFont().drawString("hi", 10, 10, 1f, 1f, -1);
+    },750, 144);
     ResourceLocation example = new ResourceLocation("oneconfig", "textures/hudsettings.png");
     OCStoreBlock storeBlock = new OCStoreBlock("OneConfig Theme", "OneConfig default theme with the default look you love.", example, new Color(27,27,27,255).getRGB());
-    OCButton button = new OCButton("Mod Settings","Configure all supported mods",ThemeElement.MOD_SETTINGS,false,758, 144);
     public static ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft());
 
     public Window() {
@@ -74,15 +73,16 @@ public class Window extends GuiScreen {
         int bottom = (int) (1024 * currentProgress);
         //Gui.drawRect(left - 1, top - 1, right + 1, bottom + 1, testingColor.getRGB());
         //new Color(16, 17, 19, 255).getRGB()
-        t.getTextureManager().draw(ThemeElement.BACKGROUND, left, top, right, bottom);
+        //t.getTextureManager().draw(ThemeElement.BACKGROUND, left, top, right, bottom);
         //t.getTextureManager().draw(ThemeElement.BUTTON_OFF, left + 480, top + 40, 640, 48);
-        t.getTextureManager().draw(ThemeElement.SEARCH, left + 504, top + 48, 32, 32);
-        t.getFont().drawString("Search all of OneConfig", left + 548, top + 48, 1.1f, 1f, new Color(242,242,242,255).getRGB());
+        //t.getTextureManager().draw(ThemeElement.SEARCH, left + 504, top + 48, 32, 32);
+        //t.getFont().drawString("Search all of OneConfig", left + 548, top + 48, 1.1f, 1f, new Color(242,242,242,255).getRGB());
+
         //t.getTextureManager().draw(ThemeElement.BUTTON_OFF, left + 1504, top + 32, 64, 64);
         //t.getTextureManager().draw(ThemeElement.BUTTON_OFF, left + 1424, top + 32, 64, 64);
         //t.getTextureManager().draw(ThemeElement.BUTTON_OFF, left + 1344, top + 32, 64, 64);
         //block.draw(200, 300);
-        button.draw(500,300);
+        block.draw(100,200);
         //t.getTextureManager().draw(ThemeElement.CLOSE, left + 1504, top + 32, 64, 64);
         //t.getTextureManager().draw(ThemeElement.BUTTON_OFF, left + 100, top + 100, 296, 64);
         //t.getTextureManager().draw(ThemeElement.CLOSE);
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/OCBlock.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/OCBlock.java
index 180215c..abcd5ca 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/OCBlock.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/OCBlock.java
@@ -5,7 +5,6 @@ import io.polyfrost.oneconfig.themes.Theme;
 import io.polyfrost.oneconfig.themes.Themes;
 import io.polyfrost.oneconfig.themes.textures.ThemeElement;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.GlStateManager;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.input.Keyboard;
@@ -22,9 +21,10 @@ import static io.polyfrost.oneconfig.gui.Window.resolution;
 public class OCBlock {
     public static final Theme theme = Themes.getActiveTheme();
     private static final Minecraft mc = Minecraft.getMinecraft();
-    private Color color;
-    private String text;
     private final boolean bold;
+    private final Color elementColor = theme.getElementColor();
+    private final Color hoverColor = theme.getHoverColor();
+    private final Runnable draw;
     /**
      * Width of the element in pixels.
      */
@@ -33,34 +33,44 @@ public class OCBlock {
      * Height of the element in pixels.
      */
     public int height;
+    private Color color;
+    private String text;
     private ThemeElement element;
     private boolean clicked = false;
     private boolean rightClicked = false;
     private int mouseX, mouseY;
     private boolean hovered;
+    private float percentHoveredRed = 0f;
+    private float percentHoveredGreen = 0f;
+    private float percentHoveredBlue = 0f;
+    private float percentHoveredAlpha = 0f;
 
     /**
-     * Create a basic element with nothing. Used for extended classes.
+     * Create a basic element.
      */
     public OCBlock(int width, int height) {
-        this(null, false, -1, width, height);
+        this(null, false, theme.getElementColor().getRGB(), width, height);
     }
 
     /**
      * Create a new basic element.
-     * @param color color of the element
-     * @param width width of the element
+     *
+     * @param color  color of the element
+     * @param width  width of the element
      * @param height height of the element
+     * @deprecated This method DOES NOT respect the theme colors for the element. Use of {@link #OCBlock(int, int)} is recommended instead.
      */
+    @Deprecated()
     public OCBlock(int color, int width, int height) {
         this(null, false, color, width, height);
     }
 
     /**
      * Create a new element with the specified text, and automatic width/height + padding.
-     * @param text text to use
-     * @param bold weather or not to use bold text
-     * @param color color of the background to use
+     *
+     * @param text  text to use
+     * @param bold  weather or not to use bold text
+     * @param color color for the text
      */
     public OCBlock(@NotNull String text, boolean bold, int color) {
         this(text, bold, color, theme.getFont().getWidth(text) + 6, theme.getFont().getHeight() + 4);
@@ -68,11 +78,13 @@ public class OCBlock {
 
     /**
      * Create a new element with the specified text, and custom width/height.
-     * @param text text to use
-     * @param bold weather or not to use bold text
-     * @param color color of the background to use
+     *
+     * @param text  text to use
+     * @param bold  weather or not to use bold text
+     * @param color color for the text (use {@link Theme#getTextColor()} or {@link Theme#getAccentTextColor()} for default colors)
      */
     public OCBlock(String text, boolean bold, int color, int width, int height) {
+        this.draw = null;
         this.text = text;
         this.bold = bold;
         this.color = Renderer.getColorFromInt(color);
@@ -82,10 +94,12 @@ public class OCBlock {
 
     /**
      * Create a new Element with the specified image.
-     * @param element element to use
+     *
+     * @param element   element to use
      * @param colorMask color mast to use (-1 for default)
      */
     public OCBlock(ThemeElement element, int colorMask, int width, int height) {
+        this.draw = null;
         this.element = element;
         this.color = Renderer.getColorFromInt(colorMask);
         this.width = width;
@@ -94,26 +108,48 @@ public class OCBlock {
     }
 
     /**
+     * Create a new Element with a custom render script. The {@link Runnable} should ONLY contain #draw() calls or equivalent.
+     *
+     * @param whatToDraw a {@link Runnable}, containing draw scripts for elements. You will need to instantiate the objects first, if they are sub-elements.
+     */
+    public OCBlock(Runnable whatToDraw, int width, int height) {
+        this.draw = whatToDraw;
+        this.bold = false;
+        this.width = width;
+        this.height = height;
+    }
+
+    /**
      * Draw the element at the specified coordinates.
      */
     public void draw(int x, int y) {
+        GlStateManager.enableBlend();
+        percentHoveredRed = smooth(percentHoveredRed, elementColor.getRed() / 255f, hoverColor.getRed() / 255f);
+        percentHoveredGreen = smooth(percentHoveredGreen, elementColor.getGreen() / 255f, hoverColor.getGreen() / 255f);
+        percentHoveredBlue = smooth(percentHoveredBlue, elementColor.getBlue() / 255f, hoverColor.getBlue() / 255f);
+        percentHoveredAlpha = smooth(percentHoveredAlpha, elementColor.getAlpha() / 255f, hoverColor.getAlpha() / 255f);
+        GlStateManager.color(percentHoveredRed, percentHoveredGreen, percentHoveredBlue, percentHoveredAlpha);
         update(x, y);
-        if(element != null) {
-            Gui.drawRect(x, y, x + width, y + height, color.getRGB());
+        if (draw != null) {
+            draw.run();
+        }
+        if (element != null) {
+            theme.getTextureManager().draw(ThemeElement.BUTTON, x, y, width, height);
             GlStateManager.color(color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
             theme.getTextureManager().draw(element, x, y, width, height);
         }
-        if(text == null) {
-            Gui.drawRect(x, y, x + width, y + height, color.getRGB());
-        }
-        else {
-            Gui.drawRect(x, y, x + width, y + height, color.getRGB());
-            if(bold) {
-                theme.getBoldFont().drawString(text, x + 3, y + 2, 1f, 1f, -1);
+        if (text == null) {
+            theme.getTextureManager().draw(ThemeElement.BUTTON, x, y, width, height);
+        } else {
+            theme.getTextureManager().draw(ThemeElement.BUTTON, x, y, width, height);
+            if (bold) {
+                theme.getBoldFont().drawString(text, x + 3, y + 2, 1f, 1f, color.getRGB());
             } else {
-                theme.getFont().drawString(text, x + 3, y + 2, 1.1f, 1f, -1);
+                theme.getFont().drawString(text, x + 3, y + 2, 1.1f, 1f, color.getRGB());
             }
         }
+        GlStateManager.disableBlend();
+
 
     }
 
@@ -124,7 +160,7 @@ public class OCBlock {
         int mouseX = Mouse.getX() / resolution.getScaleFactor();
         int mouseY = Math.abs((Mouse.getY() / resolution.getScaleFactor()) - resolution.getScaledHeight());
         hovered = mouseX > x && mouseY > y && mouseX < x + width && mouseY < y + height;
-        if(hovered) {
+        if (hovered) {
             onHover();
             if (Mouse.isButtonDown(0) && !clicked) {
                 onClick(0);
@@ -137,7 +173,10 @@ public class OCBlock {
             rightClicked = Mouse.isButtonDown(1);
             onKeyPress(Keyboard.getEventKey());
         }
-        if(!hovered && clicked) clicked = false;
+        if (clicked) {
+            Renderer.color(theme.getClickColor());
+        }
+        if (!hovered && clicked) clicked = false;
     }
 
     /**
@@ -152,6 +191,7 @@ public class OCBlock {
 
     /**
      * Override this method to set a function when a key is pressed while this element is hovered.
+     *
      * @param keyCode key code that was pressed (check org.lwjgl.Keyboard for keymap)
      */
     public void onKeyPress(int keyCode) {
@@ -160,6 +200,7 @@ public class OCBlock {
 
     /**
      * Override this method to set a function when the element is hovered.
+     *
      * @param button the button that was pressed (0 is left, 1 is right)
      */
     public void onClick(int button) {
@@ -174,36 +215,49 @@ public class OCBlock {
 
     }
 
-    public void setText(String text) {
-        this.text = text;
-    }
 
-    public void setWidth(int width) {
-        this.width = width;
-    }
+    private float smooth(float current, float min, float max) {
+        current = Renderer.easeOut(current, isHovered() ? 1f : 0f);
+        if (current <= min) {
+            current = min;
+        }
 
-    public void setHeight(int height) {
-        this.height = height;
+        if (current >= max) {
+            current = max;
+        }
+        return current;
     }
 
     public int getHeight() {
         return height;
     }
 
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
     public Color getColor() {
         return color;
     }
 
+    public void setColor(Color color) {
+        this.color = color;
+    }
+
     public int getWidth() {
         return width;
     }
 
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
     public String getText() {
         return text;
     }
 
-    public void setColor(Color color) {
-        this.color = color;
+    public void setText(String text) {
+        this.text = text;
     }
 
     public boolean isHovered() {
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/OCButton.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/OCButton.java
index 2ffeaf7..5f78baa 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/OCButton.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/OCButton.java
@@ -8,13 +8,13 @@ import org.jetbrains.annotations.NotNull;
 import java.awt.*;
 
 public class OCButton extends OCBlock {
+    private final Color elementColor = theme.getElementColor();
+    private final Color hoverColor = theme.getHoverColor();
     private float percentHoveredRed = 0f;
     private float percentHoveredGreen = 0f;
     private float percentHoveredBlue = 0f;
     private float percentHoveredAlpha = 0f;
     private float percentDescription = 0f;
-    private final Color elementColor = theme.getElementColor();
-    private final Color hoverColor = theme.getHoverColor();
     private ThemeElement element;
     private boolean alwaysShowDesc = true;
     private String title, description;
@@ -58,27 +58,27 @@ public class OCButton extends OCBlock {
         percentHoveredGreen = smooth(percentHoveredGreen, elementColor.getGreen() / 255f, hoverColor.getGreen() / 255f);
         percentHoveredBlue = smooth(percentHoveredBlue, elementColor.getBlue() / 255f, hoverColor.getBlue() / 255f);
         percentHoveredAlpha = smooth(percentHoveredAlpha, elementColor.getAlpha() / 255f, hoverColor.getAlpha() / 255f);
-        if(!alwaysShowDesc) {
+        if (!alwaysShowDesc) {
             percentDescription = Renderer.clamp(Renderer.easeOut(percentDescription, isHovered() ? 1f : 0f));
         }
         GlStateManager.color(percentHoveredRed, percentHoveredGreen, percentHoveredBlue, percentHoveredAlpha);
-        if(isClicked()) {
-            Renderer.setGlColor(theme.getClickColor());
+        if (isClicked()) {
+            //Renderer.setGlColor(theme.getClickColor());
         }
 
         theme.getTextureManager().draw(ThemeElement.BUTTON, x, y, width, height);
-        if(element != null) {
-            GlStateManager.color(1f,1f,1f, isClicked() ? 0.6f : 1f);