OC-23 some things

2 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
index d11956d..5853585 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
@@ -19,7 +19,6 @@ import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 
 public class ModCard extends BasicElement {
-    private final String iconPath;
     private final Mod modData;
     private final BasicElement favoriteHitbox = new BasicElement(32, 32, -2, true);
     private boolean active, disabled, favorite;
@@ -27,10 +26,9 @@ public class ModCard extends BasicElement {
     private int colorPrimary = OneConfigConfig.PRIMARY_600;
     private boolean isHoveredMain = false;
 
-    public ModCard(@NotNull Mod mod, @Nullable String iconPath, boolean active, boolean disabled, boolean favorite) {
+    public ModCard(@NotNull Mod mod, boolean active, boolean disabled, boolean favorite) {
         super(244, 119, false);
         this.modData = mod;
-        this.iconPath = iconPath;
         this.active = active;
         toggled = active;
         this.disabled = disabled;
@@ -45,8 +43,10 @@ public class ModCard extends BasicElement {
         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);
-        if (iconPath != null) {
-            RenderManager.drawImage(vg, iconPath, x, y, width, 87);
+        if (modData.modIcon != null) {
+            if (modData.modIcon.toLowerCase().endsWith(".svg"))
+                RenderManager.drawSvg(vg, modData.modIcon, x + 98, y + 19, 48, 48);
+            else RenderManager.drawImage(vg, modData.modIcon, x + 98, y + 19, 48, 48);
         } else {
             RenderManager.drawSvg(vg, SVGs.BOX, x + 98, y + 19, 48, 48);
         }
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java
index 4be79c4..5ecaa9e 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java
@@ -74,7 +74,7 @@ public class ConfigColorElement extends BasicOption {
         if (element.isClicked() && !element.isToggled()) {
             OneConfigGui.INSTANCE.initColorSelector(new ColorSelector(color, InputUtils.mouseX(), InputUtils.mouseY()));
         }
-        if(OneConfigGui.INSTANCE.currentColorSelector != null) {
+        if (OneConfigGui.INSTANCE != null && OneConfigGui.INSTANCE.currentColorSelector != null) {
             color = (OneConfigGui.INSTANCE.getColor());
         }
         setColor(color);