minor changes

Author: brachy84

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

@@ -43,9 +43,9 @@ public interface IThemeApi {
             .register();
 
     // shouldn't inherit from button -> not a sub theme
-    WidgetThemeKey<WidgetTheme> CLOSE_BUTTON = get().widgetThemeKeyBuilder("close_button", WidgetTheme.class)
-            .defaultTheme(WidgetTheme.whiteTextShadow(10, 10, new DrawableStack(GuiTextures.MC_BUTTON, GuiTextures.CROSS_TINY)))
-            .defaultHoverTheme(WidgetTheme.whiteTextShadow(10, 10, new DrawableStack(GuiTextures.MC_BUTTON_HOVERED, GuiTextures.CROSS_TINY)))
+    WidgetThemeKey<WidgetTheme> CLOSE_BUTTON = get().widgetThemeKeyBuilder("closeButton", WidgetTheme.class)
+            .defaultTheme(WidgetTheme.whiteTextShadow(10, 10, GuiTextures.MC_BUTTON))
+            .defaultHoverTheme(WidgetTheme.whiteTextShadow(10, 10, GuiTextures.MC_BUTTON_HOVERED))
             .register();
 
     WidgetThemeKey<SlotTheme> ITEM_SLOT = get().widgetThemeKeyBuilder("itemSlot", SlotTheme.class)

src/main/java/com/cleanroommc/modularui/factory/HandGuiData.java

@@ -7,6 +7,7 @@
 /**
  * See {@link GuiData} for an explanation for what this is for.
  */
+@Deprecated
 public class HandGuiData extends GuiData {
 
     private final EnumHand hand;

src/main/java/com/cleanroommc/modularui/factory/ItemGuiFactory.java

@@ -11,6 +11,9 @@
 
 import java.util.Objects;
 
+/**
+ * @deprecated use {@link PlayerInventoryGuiFactory}
+ */
 @Deprecated
 public class ItemGuiFactory extends AbstractUIFactory<HandGuiData> {
 

src/main/java/com/cleanroommc/modularui/theme/ThemeAPI.java

@@ -22,7 +22,7 @@ public class ThemeAPI implements IThemeApi {
     public static final String DEFAULT_ID = "DEFAULT";
     public static final ITheme DEFAULT_THEME = DefaultTheme.INSTANCE;
 
-    public static final Pattern widgetThemeNamePattern = Pattern.compile("[a-zA-Z0-9_-]+");
+    public static final Pattern widgetThemeNamePattern = Pattern.compile("[a-zA-Z0-9$_-]+");
 
     private final Object2ObjectMap<String, ITheme> themes = new Object2ObjectOpenHashMap<>();
     protected final Object2ObjectMap<String, List<JsonBuilder>> defaultThemes = new Object2ObjectOpenHashMap<>();

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

@@ -5,6 +5,7 @@
 import com.cleanroommc.modularui.api.UpOrDown;
 import com.cleanroommc.modularui.api.widget.IGuiAction;
 import com.cleanroommc.modularui.api.widget.Interactable;
+import com.cleanroommc.modularui.drawable.GuiTextures;
 import com.cleanroommc.modularui.theme.WidgetThemeEntry;
 import com.cleanroommc.modularui.value.sync.InteractionSyncHandler;
 import com.cleanroommc.modularui.value.sync.SyncHandler;
@@ -18,6 +19,7 @@ public static ButtonWidget<?> panelCloseButton() {
         ButtonWidget<?> buttonWidget = new ButtonWidget<>();
         return buttonWidget.widgetTheme(IThemeApi.CLOSE_BUTTON)
                 .top(4).right(4)
+                .overlay(GuiTextures.CROSS_TINY)
                 .onMousePressed(mouseButton -> {
                     if (mouseButton == 0 || mouseButton == 1) {
                         buttonWidget.getPanel().closeIfOpen();