fix

Author: brachy84

src/main/java/com/cleanroommc/modularui/api/IThemeApi.java

@@ -64,6 +64,14 @@ public interface IThemeApi {
     WidgetThemeKey<SlotTheme> ITEM_SLOT_PLAYER_MAIN_INV = ITEM_SLOT_PLAYER.createSubKey("playerMainInventory");
     WidgetThemeKey<SlotTheme> ITEM_SLOT_PLAYER_OFFHAND = ITEM_SLOT_PLAYER.createSubKey("playerOffhand");
     WidgetThemeKey<SlotTheme> ITEM_SLOT_PLAYER_ARMOR = ITEM_SLOT_PLAYER.createSubKey("playerArmor");
+    /* copy and paste into theme for testing
+      "itemSlot:player": {
+        "color": "#FF914354"
+      },
+      "itemSlot:playerHotbar": {
+        "color": "#FF60917c"
+      }
+     */
 
     String HOVER_SUFFIX = ":hover";
 

src/main/java/com/cleanroommc/modularui/drawable/Icon.java

@@ -48,10 +48,6 @@ public Box getMargin() {
         return this.margin;
     }
 
-    public int getColor() {
-        return color;
-    }
-
     @SideOnly(Side.CLIENT)
     @Override
     public void draw(GuiContext context, int x, int y, int width, int height, WidgetTheme widgetTheme) {

src/main/java/com/cleanroommc/modularui/widgets/SchemaWidget.java

@@ -5,7 +5,7 @@
 import com.cleanroommc.modularui.api.widget.Interactable;
 import com.cleanroommc.modularui.drawable.GuiTextures;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
-import com.cleanroommc.modularui.theme.WidgetTheme;
+import com.cleanroommc.modularui.theme.WidgetThemeEntry;
 import com.cleanroommc.modularui.utils.MathUtils;
 import com.cleanroommc.modularui.utils.Vector3f;
 import com.cleanroommc.modularui.utils.fakeworld.BaseSchemaRenderer;
@@ -44,10 +44,10 @@ public SchemaWidget(BaseSchemaRenderer schema) {
     }
 
     @Override
-    public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
+    public void draw(ModularGuiContext context, WidgetThemeEntry<?> widgetTheme) {
         Vec3d f = this.schema.getSchema().getFocus();
         this.schema.getCamera().setLookAtAndAngle((float) (f.x + this.offset.x), (float) (f.y + this.offset.y), (float) (f.z + this.offset.z), scale, yaw, pitch);
-        this.schema.drawAtZero(context, getArea(), widgetTheme);
+        this.schema.drawAtZero(context, getArea(), widgetTheme.getTheme());
     }
 
     @Override

src/main/resources/assets/modularui/themes/vanilla.json

@@ -1,9 +1,3 @@
 {
-  "parent": "DEFAULT",
-  "itemSlot:player": {
-    "color": "#FF914354"
-  },
-  "itemSlot:player_hotbar": {
-    "color": "#FF60917c"
-  }
-}
+  "parent": "DEFAULT"
+}