Version 2.0

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

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings=1.20.1+build.10
 loader_version=0.16.7
 
 # Mod Properties
-mod_version=1.9.2
+mod_version=2.0.0
 maven_group=net.snackbag.mcvera
 archives_base_name=mcvera
 

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

src/main/java/com/example/demo/DemoApplication.java

@@ -0,0 +1,64 @@
+package com.example.demo;
+
+import net.snackbag.vera.Vera;
+import net.snackbag.vera.core.VColor;
+import net.snackbag.vera.core.VCursorShape;
+import net.snackbag.vera.core.VeraApp;
+import net.snackbag.vera.event.VShortcut;
+import net.snackbag.vera.flag.VLayoutAlignmentFlag;
+import net.snackbag.vera.layout.VHLayout;
+import net.snackbag.vera.layout.VVLayout;
+import net.snackbag.vera.style.VStyleState;
+import net.snackbag.vera.widget.VLabel;
+
+public class DemoApplication extends VeraApp {
+    private int clicks = 0;
+    private VHLayout layout;
+    private VVLayout centerLayout;
+
+    @Override
+    public void init() {
+        new VShortcut(this, "escape", this::hide);
+        setBackgroundColor(VColor.black().withOpacity(0.2f));
+
+        layout = new VHLayout(this, 0, 0);
+        layout.alignment = VLayoutAlignmentFlag.CENTER;
+
+        centerLayout = new VVLayout(layout);
+        centerLayout.alignment = VLayoutAlignmentFlag.CENTER;
+
+        VLabel label = new VLabel("Not clicked yet", this).alsoAddTo(centerLayout);
+        label.modifyFontColor().rgb(VColor.white());
+
+        VLabel button = new VLabel("Click me", this).alsoAddTo(centerLayout);
+
+        button.modifyFontColor().rgb(VColor.of(95, 180, 0));
+        button.setStyle("background-color", VColor.white());
+        button.setStyle("padding", 4);
+        button.setStyle("overlay", VStyleState.HOVERED, VColor.white().withOpacity(0.5f));
+        button.setStyle("border-size", 1);
+        button.setStyle("border-color", VColor.of(95, 180, 0));
+        button.setStyle("cursor", VCursorShape.POINTING_HAND);
+
+        button.onLeftClick(() -> {
+            clicks++;
+            label.setText("Clicks: " + clicks);
+            label.adjustSize();
+        });
+
+        new VShortcut(this, "leftctrl+d", () -> {
+            System.out.println("Debug hit");
+        });
+    }
+
+    @Override
+    public void update() {
+        super.update();
+
+        setWidth(Vera.provider.getScreenWidth());
+        setHeight(Vera.provider.getScreenHeight());
+
+        layout.setSize(getWidth(), getHeight());
+        centerLayout.setHeight(getHeight());
+    }
+}

src/main/java/com/example/demo/DemoMod.java

@@ -0,0 +1,7 @@
+package com.example.demo;
+
+public class DemoMod {
+    public static void init() {
+        new DemoApplication().show();
+    }
+}

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

@@ -0,0 +1,63 @@
+package net.snackbag.mcvera;
+
+import com.example.demo.DemoMod;
+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.*;
+
+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("layoutalignments").executes((ctx) -> {
+                                    LayoutCenteringTestApplication.INSTANCE.show();
+                                    return 1;
+                                }))
+                                .then(ClientCommandManager.literal("hierarchy").executes(ctx -> {
+                                    HierarchyTest.INSTANCE.start();
+                                    return 1;
+                                }))
+                                .then(ClientCommandManager.literal("quads").executes(ctx -> {
+                                    QuadTestApplication.INSTANCE.show();
+                                    return 1;
+                                }))
+                                .then(ClientCommandManager.literal("demo").executes(ctx -> {
+                                    DemoMod.init();
+                                    return 1;
+                                }))
+                        )
+                        .then(ClientCommandManager.literal("clear-tests")
+                                .executes((ctx) -> {
+                                    TestApplication.INSTANCE = new TestApplication();
+                                    StyleTestApplication.INSTANCE = new StyleTestApplication();
+                                    LayoutTestApplication.INSTANCE = new LayoutTestApplication();
+                                    LayoutCenteringTestApplication.INSTANCE = new LayoutCenteringTestApplication();
+                                    HierarchyTest.INSTANCE = new HierarchyTest();
+                                    QuadTestApplication.INSTANCE = new QuadTestApplication();
+                                    return 1;
+                                })
+                        )
+        );
+    }
+}

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

@@ -1,17 +1,56 @@
 package net.snackbag.mcvera;
 
 import net.snackbag.vera.core.VeraApp;
+import net.snackbag.vera.flag.VAppFlag;
+import net.snackbag.vera.flag.VAppPositioningFlag;
+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<VAppPositioningFlag, LinkedHashSet<VeraApp>> visibleApplications = new HashMap<>();
+    public static HashMap<VAppFlag, List<VeraApp>> appFlags = new HashMap<>();
+
+    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 (!appFlags.containsKey(VAppFlag.HIERARCHIC)) return false;
+        runnable.accept(getTopHierarchy());
+        return true;
+    }
+
+    public static @Nullable VeraApp getTopHierarchy() {
+        List<VeraApp> apps = getAppsWithFlag(VAppFlag.HIERARCHIC);
+        if (apps.isEmpty()) return null;
+        return apps.get(0);
+    }
+
+    public static boolean isTopHierarchy(VeraApp app) {
+        return getTopHierarchy() == app;
+    }
+
+    /**
+     * Returns an UNMODIFIABLE version of the {@link #appFlags} entry for the given flag. If the entry is empty, it
+     * returns an empty unmodifiable list. If you want to access a modifiable version of the flag, you have to manually
+     * work with the {@link #appFlags} variable.
+     *
+     * @param flag the flag to check
+     * @return an unmodifiable list of the apps under the flag
+     */
+    public static List<VeraApp> getAppsWithFlag(VAppFlag flag) {
+        if (!appFlags.containsKey(flag)) return Collections.unmodifiableList(new ArrayList<>());
+        return Collections.unmodifiableList(appFlags.get(flag));
+    }
 }

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,16 @@ 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 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));
         });
     }