Version 1.10

README.md

@@ -0,0 +1,41 @@
+# Vera
+Because UI should be simple.
+
+Vera is a simple yet powerful Fabric UI library. There are currently no plans for a Forge version.\
+[Submit a Logo](https://github.com/snackbag/vera/issues/new) [Visit Wiki](https://wiki.snackbag.net/w/vera)
+
+## Features
+
+- Various standard widgets
+  - Labels
+  - Checkboxes
+  - Dropdowns
+  - Images
+  - Text input
+  - Tabs
+  - Rectangles
+  - Easy creation of custom widgets
+- Styling system written from the ground up
+- Customizable animation system
+  - Style-composite rendering pipeline
+  - (Custom) easings!
+- Layout system
+- HUD-rendering
+- 2D rendering developer QOL
+- App hierarchy
+- Simple keybindings
+- Heavy optimization
+- (Developer) QOL with [Verto](https://github.com/snackbag/verto)
+- Extensive documentation
+
+### Coming soon
+
+- Full docstrings everywhere
+- More standard composites
+- Multi-versions
+- More precise font options
+- Vertex & fragment shaders
+- Revised rendering API
+- Double buffer rendering
+- Vanilla-UI abilities
+- Widget Compounds

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

src/main/java/net/snackbag/mcvera/InternalCommands.java

@@ -0,0 +1,45 @@
+package net.snackbag.mcvera;
+
+import com.mojang.brigadier.CommandDispatcher;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.command.CommandRegistryAccess;
+import net.snackbag.mcvera.test.LayoutTestApplication;
+import net.snackbag.mcvera.test.StyleTestApplication;
+import net.snackbag.mcvera.test.TestApplication;
+
+public class InternalCommands {
+    public static void register(
+            CommandDispatcher<FabricClientCommandSource> dispatcher,
+            CommandRegistryAccess ra
+    ) {
+        if (!FabricLoader.getInstance().isDevelopmentEnvironment()) return;
+
+        dispatcher.register(
+                ClientCommandManager.literal("vera")
+                        .then(ClientCommandManager.literal("test")
+                            .then(ClientCommandManager.literal("generic").executes((ctx) -> {
+                                TestApplication.INSTANCE.show();
+                                return 1;
+                            }))
+                            .then(ClientCommandManager.literal("styles").executes((ctx) -> {
+                                StyleTestApplication.INSTANCE.show();
+                                return 1;
+                            }))
+                            .then(ClientCommandManager.literal("layout").executes((ctx) -> {
+                                LayoutTestApplication.INSTANCE.show();
+                                return 1;
+                            }))
+                        )
+                        .then(ClientCommandManager.literal("clear-tests")
+                                .executes((ctx) -> {
+                                    TestApplication.INSTANCE = new TestApplication();
+                                    StyleTestApplication.INSTANCE = new StyleTestApplication();
+                                    LayoutTestApplication.INSTANCE = new LayoutTestApplication();
+                                    return 1;
+                                })
+                        )
+        );
+    }
+}

src/main/java/net/snackbag/mcvera/MCVeraData.java

@@ -1,17 +1,37 @@
 package net.snackbag.mcvera;
 
 import net.snackbag.vera.core.VeraApp;
+import net.snackbag.vera.flag.VWindowPositioningFlag;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.function.Consumer;
 
 public class MCVeraData {
-    public static Set<VeraApp> applications = new HashSet<>();
-    public static Set<VeraApp> visibleApplications = new HashSet<>();
+    public static LinkedHashSet<VeraApp> applications = new LinkedHashSet<>();
+    public static HashMap<VWindowPositioningFlag, LinkedHashSet<VeraApp>> visibleApplications = new HashMap<>();
+    public static List<VeraApp> appHierarchy = new ArrayList<>();
+
+    public static int appsWithMouseRequired = 0;
+
     public static final List<Integer> pressedKeys = new ArrayList<>();
     public static List<Integer> previousPressedKeys = new ArrayList<>();
-    public static final Set<VeraApp> debugApps = new HashSet<>();
-    public static int appsWithMouseRequired = 0;
+
+    /**
+     * Executes a method as the top hierarchy app. If there is no top app it won't execute the specified code.
+     *
+     * @param runnable code to execute
+     * @return whether something has been executed
+     */
+    public static boolean asTopHierarchy(@NotNull Consumer<VeraApp> runnable) {
+        if (appHierarchy.isEmpty()) return false;
+
+        runnable.accept(appHierarchy.get(0));
+        return true;
+    }
+
+    public static @Nullable VeraApp getTopHierarchy() {
+        return appHierarchy.isEmpty() ? null : appHierarchy.get(0);
+    }
 }

src/main/java/net/snackbag/mcvera/MinecraftVera.java

@@ -2,6 +2,8 @@
 
 import net.fabricmc.api.ModInitializer;
 
+import net.snackbag.vera.Vera;
+import net.snackbag.vera.style.standard.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,5 +14,17 @@ public class MinecraftVera implements ModInitializer {
 	@Override
 	public void onInitialize() {
 		LOGGER.info("Loading Vera...");
+
+		LOGGER.info("Registering standard styles");
+		// sorted by "complicatedness" & importance
+		Vera.registrar.registerStandardStyle(new WidgetStandardStyle());
+
+		Vera.registrar.registerStandardStyle(new RectStandardStyle());
+		Vera.registrar.registerStandardStyle(new ImageStandardStyle());
+		Vera.registrar.registerStandardStyle(new CheckBoxStandardStyle());
+		Vera.registrar.registerStandardStyle(new LabelStandardStyle());
+		Vera.registrar.registerStandardStyle(new DropdownStandardStyle());
+		Vera.registrar.registerStandardStyle(new TabWidgetStandardStyle());
+		Vera.registrar.registerStandardStyle(new LineInputStandardStyle());
 	}
 }

src/main/java/net/snackbag/mcvera/MinecraftVeraClient.java

@@ -4,16 +4,12 @@
 import com.google.gson.JsonObject;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.resource.Resource;
 import net.minecraft.util.Identifier;
-import net.snackbag.mcvera.impl.MCVeraProvider;
-import net.snackbag.mcvera.impl.MCVeraRenderer;
 import net.snackbag.mcvera.test.TestHandler;
 import net.snackbag.vera.Vera;
-import net.snackbag.vera.core.VeraApp;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -25,24 +21,13 @@ public void onInitializeClient() {
         MinecraftVera.LOGGER.info("Loading client Vera implementation...");
         TestHandler.impl(false);
 
-        HudRenderCallback.EVENT.register((context, tickDelta) -> {
-            MCVeraRenderer.drawContext = context;
-            MCVeraRenderer renderer = MCVeraRenderer.getInstance();
-
-            for (VeraApp app : MCVeraData.visibleApplications) {
-                renderer.renderApp(app);
-            }
-        });
-
         ClientTickEvents.END_CLIENT_TICK.register((client) -> {
             // only when changing
             if (MCVeraData.previousPressedKeys.equals(MCVeraData.pressedKeys)) return;
             MCVeraData.previousPressedKeys = new ArrayList<>(MCVeraData.pressedKeys);
 
             String combination = makeCombination(client);
-            for (VeraApp app : MCVeraData.visibleApplications) {
-                app.handleShortcut(combination);
-            }
+            Vera.forVisibleAndAllowedApps(app -> app.handleShortcut(combination));
         });
     }
 

src/main/java/net/snackbag/mcvera/impl/MCVeraProvider.java

@@ -7,28 +7,26 @@
 import net.snackbag.vera.Vera;
 import net.snackbag.vera.core.VFont;
 import net.snackbag.vera.core.VeraApp;
+import net.snackbag.vera.event.Events;
 import net.snackbag.vera.event.VShortcut;
 import net.snackbag.vera.widget.VWidget;
 
 import java.nio.file.Path;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class MCVeraProvider {
     public void handleAppInitialization(VeraApp app) {
         MCVeraData.applications.add(app);
+        Vera.registrar.applyStandardWidgetStyles(app.styleSheet);
         MinecraftClient.getInstance().send(app::init);
         MinecraftClient.getInstance().send(app::update);
-
-        app.addShortcut(new VShortcut(app, "LeftCtrl+LeftAlt+LeftShift+D", () -> {
-            MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.of("Debug mode enabled"));
-            MCVeraData.debugApps.add(app);
-        }, false));
     }
 
     public void handleAppShow(VeraApp app) {
         if (app.isVisible()) return;
 
-        MCVeraData.visibleApplications.add(app);
+        MCVeraData.visibleApplications.get(app.getPositioning()).add(app);
         if (app.isMouseRequired()) MCVeraData.appsWithMouseRequired += 1;
         MinecraftClient client = MinecraftClient.getInstance();
         client.send(app::update);
@@ -44,7 +42,7 @@ public void handleAppHide(VeraApp app) {
         if (!app.isVisible()) return;
 
         if (app.isMouseRequired()) MCVeraData.appsWithMouseRequired -= 1;
-        MCVeraData.visibleApplications.remove(app);
+        MCVeraData.visibleApplications.get(app.getPositioning()).remove(app);
         MinecraftClient client = MinecraftClient.getInstance();
         client.send(app::update);
 
@@ -101,15 +99,11 @@ public int getMouseY() {
     }
 
     public void handleKeyPressed(int keyCode, int scanCode, int modifiers) {
-        for (VeraApp app : MCVeraData.visibleApplications) {
-            app.keyPressed(keyCode, scanCode, modifiers);
-        }
+        Vera.forVisibleAndAllowedApps(app -> app.keyPressed(keyCode, scanCode, modifiers));
     }
 
     public void handleCharTyped(char chr, int modifiers) {
-        for (VeraApp app : MCVeraData.visibleApplications) {
-            app.charTyped(chr, modifiers);
-        }
+        Vera.forVisibleAndAllowedApps(app -> app.charTyped(chr, modifiers));
     }
 
     public String getDefaultFontName() {
@@ -129,8 +123,29 @@ public void handleAppSetMouseRequired(VeraApp app, boolean mouseRequired) {
     }
 
     public void handleFilesDropped(List<Path> paths) {
-        Vera.forHoveredWidget(Vera.getMouseX(), Vera.getMouseY(), (widget) -> {
-            widget.fireEvent("files-dropped", paths);
+        VeraApp top = MCVeraData.getTopHierarchy();
+
+        int x = Vera.getMouseX();
+        int y = Vera.getMouseY();
+
+        if (top != null && top.isPointOverThis(x, y)) {
+            VWidget<?> widget = top.getTopWidgetAt(x, y);
+            if (widget != null) {
+                widget.events.fire(Events.Widget.FILES_DROPPED, paths);
+                return;
+            }
+        }
+
+        AtomicBoolean didSomething = new AtomicBoolean(false);
+        Vera.forAllVisibleApps(app -> {
+            if (didSomething.get()) return;
+            if (!app.isPointOverThis(x, y)) return;
+
+            VWidget<?> widget = app.getTopWidgetAt(x, y);
+            if (widget != null) {
+                widget.events.fire(Events.Widget.FILES_DROPPED, paths);
+                didSomething.set(true);
+            }
         });
     }
 }

src/main/java/net/snackbag/mcvera/impl/MCVeraRegistrar.java

@@ -0,0 +1,39 @@
+package net.snackbag.mcvera.impl;
+
+import net.snackbag.vera.style.animation.easing.VEasing;
+import net.snackbag.vera.style.standard.VStandardStyle;
+import net.snackbag.vera.style.VStyleSheet;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Main Vera registry manager. Use with caution: there are (almost) no
+ * safety checks. Therefore, it is recommended to use the classes that directly
+ * implement registrar functionality than touching it yourself.
+ */
+public class MCVeraRegistrar {
+    private final List<VStandardStyle> standardStyles = new ArrayList<>();
+    private final HashMap<String, VEasing> easings = new HashMap<>();
+
+    public void registerStandardStyle(VStandardStyle style) {
+        standardStyles.add(style);
+    }
+
+    public void applyStandardWidgetStyles(VStyleSheet sheet) {
+        for (VStandardStyle standardStyle : standardStyles) {
+            standardStyle.reserve(sheet);
+            standardStyle.apply(sheet);
+        }
+    }
+
+    public void registerEasing(String name, VEasing easing) {
+        easings.put(name.toLowerCase(), easing);
+    }
+
+    public @Nullable VEasing getEasingIgnoreCase(String name) {
+        return easings.getOrDefault(name.toLowerCase(), null);
+    }
+}