mod cards, loading of mods, fixes, and some more stuff

10 files changed, 186 insertions, 36 deletions

diff --git a/src/main/java/io/polyfrost/oneconfig/OneConfig.java b/src/main/java/io/polyfrost/oneconfig/OneConfig.java
index 5d20af3..0f8fed9 100644
--- a/src/main/java/io/polyfrost/oneconfig/OneConfig.java
+++ b/src/main/java/io/polyfrost/oneconfig/OneConfig.java
@@ -2,16 +2,26 @@ package io.polyfrost.oneconfig;
 
 import io.polyfrost.oneconfig.command.OneConfigCommand;
 import io.polyfrost.oneconfig.config.OneConfigConfig;
+import io.polyfrost.oneconfig.config.core.ConfigCore;
+import io.polyfrost.oneconfig.config.data.ModData;
+import io.polyfrost.oneconfig.config.data.ModType;
 import io.polyfrost.oneconfig.hud.HudCore;
 import io.polyfrost.oneconfig.test.TestConfig;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.ModContainer;
+import net.minecraftforge.fml.common.ModMetadata;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
 
 @Mod(modid = "@ID@", name = "@NAME@", version = "@VER@")
 public class OneConfig {
@@ -21,6 +31,8 @@ public class OneConfig {
     public static File themesDir = new File(oneConfigDir, "themes/");
     public static OneConfigConfig config;
     public static TestConfig testConfig;
+    public static List<ModData> loadedMods = new ArrayList<>();
+    public static List<ModMetadata> loadedOtherMods = new ArrayList<>();
 
     @Mod.EventHandler
     public void onPreFMLInit(FMLPreInitializationEvent event) {
@@ -37,4 +49,20 @@ public class OneConfig {
         MinecraftForge.EVENT_BUS.register(this);
         MinecraftForge.EVENT_BUS.register(new HudCore());
     }
+
+    @Mod.EventHandler
+    public void onPostFMLInit(FMLPostInitializationEvent event) {
+        loadedMods.addAll(ConfigCore.settings.keySet());
+        LinkedHashSet<ModData> modData = new LinkedHashSet<>(ConfigCore.settings.keySet());
+        for(ModContainer mod : Loader.instance().getActiveModList()) {
+            ModMetadata metadata = mod.getMetadata();
+            loadedOtherMods.add(metadata);
+            String author = metadata.authorList.size() > 0 ? metadata.authorList.get(0) : "";
+            ModData newMod = new ModData(metadata.name, ModType.OTHER, author, metadata.version);
+            if(newMod.name.equals("OneConfig") || newMod.name.equals("Minecraft Coder Pack") || newMod.name.equals("Forge Mod Loader") || newMod.name.equals("Minecraft Forge")) {
+                continue;
+            }
+            if(modData.add(newMod)) loadedMods.add(newMod);     // anti duplicate fix
+        }
+    }
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java b/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java
index 04cc24f..3ebc876 100644
--- a/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java
+++ b/src/main/java/io/polyfrost/oneconfig/config/OneConfigConfig.java
@@ -25,7 +25,9 @@ public class OneConfigConfig extends Config {
     public static final int GRAY_500 = new Color(49, 51, 56, 255).getRGB();           // Gray 500         // button sidebar hover, button gray normal
     public static final int GRAY_500_80 = new Color(49, 51, 56, 204).getRGB();        // Gray 500 80%     // button sidebar pressed
 
-    public static final int GRAY_400 = new Color(55, 59, 69, 255).getRGB();           // Gray 400         // button gray hover
+    public static final int GRAY_400 = new Color(55, 59, 69, 255).getRGB();           // Gray 400
+    public static final int GRAY_300 = new Color(73, 79, 92, 255).getRGB();           // Gray 300         // button gray hover
+    public static final int GRAY_200 = new Color(100, 107, 125, 255).getRGB();        // Gray 200
     public static final int GRAY_400_80 = new Color(55, 59, 69, 204).getRGB();        // Gray 400 80%     // button gray pressed
     public static final int BLUE_700 = new Color(18, 71, 178, 255).getRGB();          // Blue 700
     public static final int BLUE_600 = new Color(20, 82, 204, 255).getRGB();          // Blue 600         // button blue normal
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/BasicButton.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/BasicButton.java
index 1de952e..8fc2a63 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/BasicButton.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/BasicButton.java
@@ -83,7 +83,7 @@ public class BasicButton extends BasicElement {
 
         if(thisAlignment == ALIGNMENT_CENTER) {
             int middle = x + this.width / 2;
-            RenderManager.drawString(vg, text, middle - contentWidth / 2 + (fileNameLeftIco != null ? 28 : 0), y + ((float) height / 2), textColor, fontSize, Fonts.INTER_MEDIUM);
+            RenderManager.drawString(vg, text, middle - contentWidth / 2 + (fileNameLeftIco != null ? 28 : 0), y + ((float) height / 2) + 1, textColor, fontSize, Fonts.INTER_MEDIUM);
             if (fileNameLeftIco != null) {
                 RenderManager.drawImage(vg, fileNameLeftIco, middle - contentWidth / 2, y + 8, 20, 20);
             }
@@ -94,9 +94,9 @@ public class BasicButton extends BasicElement {
         if(thisAlignment == ALIGNMENT_LEFT) {
             if(fileNameLeftIco != null) {
                 RenderManager.drawImage(vg, fileNameLeftIco, x + 12, y + 8, 20, 20);
-                RenderManager.drawString(vg, text, x + 40, y + ((float) height / 2), textColor, fontSize, Fonts.INTER_MEDIUM);
+                RenderManager.drawString(vg, text, x + 40, y + ((float) height / 2) + 1, textColor, fontSize, Fonts.INTER_MEDIUM);
             } else {
-                RenderManager.drawString(vg, text, x + 12, y + ((float) height / 2), textColor, fontSize, Fonts.INTER_MEDIUM);
+                RenderManager.drawString(vg, text, x + 12, y + ((float) height / 2) + 1, textColor, fontSize, Fonts.INTER_MEDIUM);
             }
             if(fileNameRightIco != null) {
                 RenderManager.drawImage(vg, fileNameRightIco, x + width - 28, y + 8, 20, 20);
@@ -108,11 +108,13 @@ public class BasicButton extends BasicElement {
                 currentColor = OneConfigConfig.TRANSPARENT;
                 return;
             }
-            currentColor = ColorUtils.getColor(currentColor, colorPalette, hovered, clicked);
-            if(toggleable && toggled) {
-                currentColor = OneConfigConfig.BLUE_600;
+            if(!toggleable) {
+                currentColor = ColorUtils.getColor(currentColor, colorPalette, hovered, clicked);
+            } else {
+                if (toggled) {
+                    currentColor = ColorUtils.smoothColor(currentColor, OneConfigConfig.GRAY_500, OneConfigConfig.BLUE_600, true, 30f);
+                } else currentColor = ColorUtils.getColor(currentColor, colorPalette, hovered, clicked);
             }
-
         }
     }
 
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/BasicElement.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/BasicElement.java
index 68e25f6..dd72217 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/BasicElement.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/BasicElement.java
@@ -2,14 +2,9 @@ package io.polyfrost.oneconfig.gui.elements;
 
 import io.polyfrost.oneconfig.lwjgl.RenderManager;
 import io.polyfrost.oneconfig.utils.ColorUtils;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.util.ChatComponentText;
+import io.polyfrost.oneconfig.utils.InputUtils;
 import org.lwjgl.input.Mouse;
 
-import java.lang.reflect.Method;
-import java.util.function.Consumer;
-
 public class BasicElement {
     protected int width, height;
     protected int colorPalette;
@@ -45,12 +40,8 @@ public class BasicElement {
     }
 
     public void update(int x, int y) {
-        int mouseX = Mouse.getX();
-        int mouseY = Minecraft.getMinecraft().displayHeight - Math.abs(Mouse.getY());
-        int buttonRight = x + width;
-        int buttonBottom = y + height;
+        hovered = InputUtils.isAreaHovered(x - hitBoxX, y - hitBoxY, width + hitBoxX, height + hitBoxY);
 
-        hovered = mouseX > x - hitBoxX && mouseY > y - hitBoxY && mouseX < buttonRight + hitBoxX && mouseY < buttonBottom + hitBoxY;
         if (hovered) {
             if (Mouse.isButtonDown(0) && !clicked) {
                 toggled = !toggled;
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/elements/ModCard.java b/src/main/java/io/polyfrost/oneconfig/gui/elements/ModCard.java
index dd4fe87..38304e4 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/elements/ModCard.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/elements/ModCard.java
@@ -1,37 +1,104 @@
 package io.polyfrost.oneconfig.gui.elements;
 
 import io.polyfrost.oneconfig.config.OneConfigConfig;
+import io.polyfrost.oneconfig.config.data.ModData;
 import io.polyfrost.oneconfig.lwjgl.RenderManager;
 import io.polyfrost.oneconfig.lwjgl.font.Fonts;
+import io.polyfrost.oneconfig.utils.ColorUtils;
+import io.polyfrost.oneconfig.utils.InputUtils;
+import net.minecraft.client.Minecraft;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.lwjgl.nanovg.NanoVG;
 
 public class ModCard extends BasicElement {
-    private final String modName, iconPath;
+    private final String iconPath;
+    private final ModData modData;
+    private final BasicElement favoriteHitbox = new BasicElement(32, 32, -2, true);
     private boolean active, disabled, favorite;
+    private int colorGray = OneConfigConfig.GRAY_600;
+    private int colorPrimary = OneConfigConfig.BLUE_600;
+    private boolean isHoveredMain = false;
 
-    public ModCard(@NotNull String modName, @Nullable String iconPath, boolean active, boolean disabled, boolean favorite) {
-        super(224, 119, true);
-        this.modName = modName;
+    public ModCard(@NotNull ModData mod, @Nullable String iconPath, boolean active, boolean disabled, boolean favorite) {
+        super(244, 119, false);
+        this.modData = mod;
         this.iconPath = iconPath;
         this.active = active;
+        toggled = active;
         this.disabled = disabled;
         this.favorite = favorite;
     }
 
     @Override
     public void draw(long vg, int x, int y) {
-        RenderManager.drawRoundedRect(vg, x, y, width, 100, OneConfigConfig.GRAY_600, 12f);
-        RenderManager.drawRoundedRect(vg, x, y + 75, width, 32, OneConfigConfig.BLUE_600, 12f);
-        RenderManager.drawRect(vg, x, y + 75, width, 12, OneConfigConfig.BLUE_600);
+        if(disabled) NanoVG.nvgGlobalAlpha(vg, 0.5f);
+        RenderManager.drawRoundedRectVaried(vg, x, y, width, 87, colorGray, 12f, 12f, 0f, 0f);
+        RenderManager.drawRoundedRectVaried(vg, x, y + 87, width, 32, colorPrimary, 0f, 0f, 12f, 12f);
+        RenderManager.drawLine(vg, x, y + 86, x + width, y + 86, 2,OneConfigConfig.GRAY_300);
+        //RenderManager.drawRect(vg, x, y + 87, width, 12, colorPrimary);
         if(iconPath != null) {
             RenderManager.drawImage(vg, iconPath, x, y, width, 87);
         } else {
-            RenderManager.drawImage(vg, "assets/oneconfig/textures/box.png", x + 98, y + 19, 40, 40);
+            RenderManager.drawImage(vg, "/assets/oneconfig/textures/box.png", x + 98, y + 19, 48, 48);
         }
-        RenderManager.drawString(vg, modName, x + 12, y + 92, OneConfigConfig.WHITE, 14f, Fonts.INTER_MEDIUM);
+        //favoriteHitbox.draw(vg, x + 212, y + 87);
+        favoriteHitbox.update(x + 212, y + 87);
+        favoriteHitbox.currentColor = ColorUtils.getColor(favoriteHitbox.currentColor, favoriteHitbox.colorPalette, favoriteHitbox.hovered, favoriteHitbox.clicked);
+        RenderManager.drawRoundedRectVaried(vg, x + 212, y + 87, 32, 32, favoriteHitbox.currentColor, 0f, 0f, 12f, 0f);
+        favorite = favoriteHitbox.isToggled();
+        RenderManager.drawString(vg, modData.name, x + 12, y + 102, OneConfigConfig.WHITE, 14f, Fonts.INTER_MEDIUM);
         if(favorite) {
-            // TODO
+            RenderManager.drawImage(vg, "/assets/oneconfig/textures/love.png", x + 220, y + 95, 16, 16);
+        } else {
+            RenderManager.drawImage(vg, "/assets/oneconfig/textures/love_empty.png", x + 220, y + 95, 16, 16);
+        }
+        super.update(x, y);
+        isHoveredMain = InputUtils.isAreaHovered(x, y, width, 87);
+        boolean isHoveredSecondary = InputUtils.isAreaHovered(x, y + 87, width - 32, 32) && !disabled;
+        colorGray = ColorUtils.getColor(colorGray, 0, isHoveredMain, clicked && isHoveredMain);
+        if(active && !disabled) {
+            colorPrimary = ColorUtils.getColor(colorPrimary, 1, isHoveredSecondary, clicked && isHoveredSecondary);
+        } else colorPrimary = ColorUtils.smoothColor(colorPrimary, OneConfigConfig.GRAY_500, OneConfigConfig.GRAY_400, isHoveredSecondary, 20f);
+
+        if(clicked && isHoveredMain) {
+            if(!active) toggled = false;
+        }
+        if(clicked && favoriteHitbox.hovered) toggled = false;
+        if(clicked && !isHoveredSecondary && active) toggled = true;
+        if(!active & disabled) toggled = false;
+        //RenderManager.drawString(vg, "active=" + active, x + 300, y + 12, OneConfigConfig.WHITE, 12f, Fonts.INTER_MEDIUM);        // TODO remove debug stuff
+        //RenderManager.drawString(vg, "disabled=" + disabled, x + 300, y + 24, OneConfigConfig.WHITE, 12f, Fonts.INTER_MEDIUM);
+        //RenderManager.drawString(vg, "favorite=" + favorite, x + 300, y + 36, OneConfigConfig.WHITE, 12f, Fonts.INTER_MEDIUM);
+
+
+        active = toggled;
+        NanoVG.nvgGlobalAlpha(vg, 1f);
+    }
+
+    public void onClick() {
+        if(isHoveredMain) {
+            Minecraft.getMinecraft().thePlayer.sendChatMessage("you thought you opened the config for " + modData.name + " but actually it doesnt exist");
         }
     }
+
+    public ModData getModData() {
+        return modData;
+    }
+
+    public boolean isDisabled() {
+        return disabled;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setDisabled(boolean disabled) {
+        this.disabled = disabled;
+    }
+
+    public boolean isFavorite() {
+        return favorite;
+    }
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/pages/ModsPage.java b/src/main/java/io/polyfrost/oneconfig/gui/pages/ModsPage.java
index 97751d6..856b2f3 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/pages/ModsPage.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/pages/ModsPage.java
@@ -1,10 +1,12 @@
 package io.polyfrost.oneconfig.gui.pages;
 
-import io.polyfrost.oneconfig.config.OneConfigConfig;
+import io.polyfrost.oneconfig.OneConfig;
+import io.polyfrost.oneconfig.config.data.ModData;
 import io.polyfrost.oneconfig.gui.elements.BasicButton;
 import io.polyfrost.oneconfig.gui.elements.ModCard;
-import io.polyfrost.oneconfig.lwjgl.RenderManager;
-import io.polyfrost.oneconfig.lwjgl.font.Fonts;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class ModsPage extends Page {
     private final BasicButton allBtn = new BasicButton(49, 40, "All", null, null, 0, BasicButton.ALIGNMENT_CENTER, true);
@@ -16,10 +18,13 @@ public class ModsPage extends Page {
     private final BasicButton utilBtn = new BasicButton(104, 40, "Utility", null, null, 0, BasicButton.ALIGNMENT_CENTER, true);
     private final BasicButton customBtn = new BasicButton(104, 40, "Custom", null, null, 0, BasicButton.ALIGNMENT_CENTER, true);
 
-    private final ModCard exCard = new ModCard("Placeholder Mod Name", null, true, false, false);
+    private final List<ModCard> modCards = new ArrayList<>();
 
     public ModsPage() {
         super("Mods");
+        for(ModData modData : OneConfig.loadedMods) {
+            modCards.add(new ModCard(modData, null, true, false, false));
+        }
     }
 
     public void draw(long vg, int x, int y) {
@@ -32,7 +37,16 @@ public class ModsPage extends Page {
         utilBtn.draw(vg, x + 632, y + 16);
         customBtn.draw(vg, x + 748, y + 16);
 
-        exCard.draw(vg, x + 16, y + 72);
+        int iX = x + 16;
+        int iY = y + 72;
+        for(ModCard modCard : modCards) {
+            modCard.draw(vg, iX, iY);
+            iX += 260;
+            if(iX > x + 796) {
+                iX = x + 16;
+                iY += 135;
+            }
+        }
 
     }
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/lwjgl/RenderManager.java b/src/main/java/io/polyfrost/oneconfig/lwjgl/RenderManager.java
index dcfd513..4406836 100644
--- a/src/main/java/io/polyfrost/oneconfig/lwjgl/RenderManager.java
+++ b/src/main/java/io/polyfrost/oneconfig/lwjgl/RenderManager.java
@@ -124,6 +124,15 @@ public final class RenderManager {
         nvgColor.free();
     }
 
+    public static void drawRoundedRectVaried(long vg, float x, float y, float width, float height, int color, float radiusTL, float radiusTR, float radiusBR, float radiusBL) {
+        nvgBeginPath(vg);
+        nvgRoundedRectVarying(vg, x, y, width, height, radiusTL, radiusTR, radiusBR, radiusBL);
+        color(vg, color);
+        NVGColor nvgColor = color(vg, color);
+        nvgFill(vg);
+        nvgColor.free();
+    }
+
     public static void drawHollowRoundRect(long vg, float x, float y, float width, float height, int color, float radius, float thickness) {
         nvgBeginPath(vg);
         nvgRoundedRect(vg, x + thickness, y + thickness, width - thickness, height - thickness, radius);
diff --git a/src/main/java/io/polyfrost/oneconfig/utils/ColorUtils.java b/src/main/java/io/polyfrost/oneconfig/utils/ColorUtils.java
index b8d56bd..dd9a78e 100644
--- a/src/main/java/io/polyfrost/oneconfig/utils/ColorUtils.java
+++ b/src/main/java/io/polyfrost/oneconfig/utils/ColorUtils.java
@@ -1,6 +1,8 @@
 package io.polyfrost.oneconfig.utils;
 
 import io.polyfrost.oneconfig.config.OneConfigConfig;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 
 import java.awt.*;
 
@@ -10,6 +12,8 @@ public class ColorUtils {
         float[] color = splitColor(currentColor);
         if(click) {
             switch (colorPalette) {
+                case -2:
+                    return new Color(0.9f,0.9f,0.9f,0.2f).getRGB();
                 case -1:
                     return OneConfigConfig.GRAY_500_80;
                 default:
@@ -21,11 +25,13 @@ public class ColorUtils {
         }
 
         switch (colorPalette) {
+            case -2:
+                return getColorComponents(color, splitColor(OneConfigConfig.TRANSPARENT), new float[]{0.9f,0.9f,0.9f,0.3f}, hover, 20f);
             case -1:
                 return getColorComponents(color, splitColor(OneConfigConfig.TRANSPARENT), splitColor(OneConfigConfig.GRAY_500), hover, 10f);
             default:
             case 0:
-                return getColorComponents(color, splitColor(OneConfigConfig.GRAY_500), splitColor(OneConfigConfig.GRAY_400), hover, 130f);
+                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);
 
@@ -33,7 +39,22 @@ public class ColorUtils {
 
     }
 
-    private static float[] splitColor(int color) {
+    /**
+     * Smooths the transition of a color between two colors.
+     * @param currentColor the current color (also the one you want to change)
+     * @param direction false to move towards initColor, true to move towards finalColor
+     * @param speed speed of the transition
+     * @return currentColor but with the new color
+     */
+    public static int smoothColor(int currentColor, int initColor, int finalColor, boolean direction, float speed) {
+        float[] init = splitColor(initColor);
+        float[] finalC = splitColor(finalColor);
+        float[] current = splitColor(currentColor);
+        return getColorComponents(current, init, finalC, direction, speed);
+    }
+
+    @Contract(value = "_ -> new", pure = true)
+    private static float @NotNull [] splitColor(int color) {
         return new float[] { (color >> 16 & 255) / 255f, (color >> 8 & 255) / 255f, (color & 255) / 255f, (color >> 24 & 255) /255f };
     }
 
diff --git a/src/main/java/io/polyfrost/oneconfig/utils/InputUtils.java b/src/main/java/io/polyfrost/oneconfig/utils/InputUtils.java
new file mode 100644
index 0000000..d5ad44b
--- /dev/null
+++ b/src/main/java/io/polyfrost/oneconfig/utils/InputUtils.java
@@ -0,0 +1,16 @@
+package io.polyfrost.oneconfig.utils;
+
+import net.minecraft.client.Minecraft;
+import org.lwjgl.input.Mouse;
+
+public class InputUtils {
+    /**
+     * function to determine weather the mouse is currently over a specific region. Uses the current nvgScale to fix to any scale.
+     * @return true if mouse is over region, false if not.
+     */
+    public static boolean isAreaHovered(int x, int y, int width, int height) {
+        int mouseX = Mouse.getX();
+        int mouseY = Minecraft.getMinecraft().displayHeight - Math.abs(Mouse.getY());
+        return mouseX > x && mouseY > y && mouseX < x + width && mouseY < y + height;       // TODO add scaling info
+    }
+}
diff --git a/src/main/resources/assets/oneconfig/textures/love_empty.png b/src/main/resources/assets/oneconfig/textures/love_empty.png
new file mode 100644
index 0000000..f91d77c
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/textures/love_empty.png