refactor: major template engine refactor (AST-based)

build.gradle

@@ -113,6 +113,7 @@ tasks.test {
     jvmArgs "-Djava.util.logging.manager=com.hypixel.hytale.logger.backend.HytaleLogManager"
 
     testLogging {
+        showStandardStreams = true
         events "passed", "failed", "skipped"
     }
 }

src/main/java/au/ellie/hyui/HyUIPlugin.java

@@ -26,18 +26,10 @@
 import au.ellie.hyui.utils.HyvatarUtils;
 import au.ellie.hyui.utils.MultiHudWrapper;
 import au.ellie.hyui.utils.PngDownloadUtils;
-import com.hypixel.hytale.component.Ref;
-import com.hypixel.hytale.component.Store;
-import com.hypixel.hytale.logger.HytaleLogger;
 import com.hypixel.hytale.protocol.Asset;
 import com.hypixel.hytale.protocol.Packet;
-import com.hypixel.hytale.protocol.packets.setup.AssetFinalize;
 import com.hypixel.hytale.protocol.packets.setup.AssetInitialize;
-import com.hypixel.hytale.protocol.packets.setup.AssetPart;
-import com.hypixel.hytale.protocol.packets.setup.RequestCommonAssetsRebuild;
-import com.hypixel.hytale.server.core.asset.common.events.SendCommonAssetsEvent;
 import com.hypixel.hytale.server.core.entity.entities.Player;
-import com.hypixel.hytale.server.core.entity.entities.player.hud.HudManager;
 import com.hypixel.hytale.server.core.entity.entities.player.pages.PageManager;
 import com.hypixel.hytale.server.core.event.events.player.PlayerReadyEvent;
 import com.hypixel.hytale.server.core.io.PacketHandler;
@@ -46,46 +38,46 @@
 import com.hypixel.hytale.server.core.plugin.JavaPlugin;
 import com.hypixel.hytale.server.core.plugin.JavaPluginInit;
 import com.hypixel.hytale.server.core.universe.PlayerRef;
-import com.hypixel.hytale.server.core.universe.world.World;
-import com.hypixel.hytale.server.core.universe.world.storage.EntityStore;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
-import java.util.*;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ConcurrentMap;
 
 public class HyUIPlugin extends JavaPlugin {
 
-    private static HyUIPluginLogger instance;
-    
+    private static HyUIPluginLogger logger;
+
     private static final boolean ADD_CMDS = false;
+
     private static final ConcurrentMap<PlayerRef, Deque<Asset>> PENDING_ASSETS =
             new ConcurrentHashMap<>();
     private static final ConcurrentMap<PlayerRef, Boolean> REBUILD_SCHEDULED =
             new ConcurrentHashMap<>();
-    
+
     public static HyUIPluginLogger getLog() {
-        if (instance == null)
-            instance = new HyUIPluginLogger();
-        return instance;
+        if (logger == null)
+            logger = new HyUIPluginLogger();
+
+        return logger;
     }
 
     public HyUIPlugin(@Nonnull JavaPluginInit init) {
         super(init);
-        if (instance == null)
-            instance = new HyUIPluginLogger();
     }
 
     @Override
     protected void setup() {
         // Intercept: AssetFinalize, RequestCommonAssetsRebuild, AssetPart, AssetInitialize
         PacketAdapters.registerOutbound((PacketHandler handler, Packet packet) -> {
             var packetName = packet.getClass().getSimpleName();
-            if (!(handler instanceof GamePacketHandler h)) {
+            if (!(handler instanceof GamePacketHandler h))
                 return;
-            }
+
             switch (packetName) {
                 case "RequestCommonAssetsRebuild": {
                     var pRef = h.getPlayerRef();
@@ -99,11 +91,10 @@ protected void setup() {
                     break;
                 }
             }
-
         });
 
         if (ADD_CMDS) {
-            instance.logFinest("Setting up plugin " + this.getName());
+            getLog().logFinest("Setting up plugin " + this.getName());
             this.getCommandRegistry().registerCommand(new HyUITestGuiCommand());
             this.getCommandRegistry().registerCommand(new HyUIAddHudCommand());
             this.getCommandRegistry().registerCommand(new HyUIRemHudCommand());
@@ -112,34 +103,33 @@ protected void setup() {
             this.getCommandRegistry().registerCommand(new HyUITemplateRuntimeCommand());
             this.getCommandRegistry().registerCommand(new HyUIBountyCommand());
             this.getCommandRegistry().registerCommand(new HyUITabsCommand());
-            
+
             this.getEventRegistry().registerGlobal(PlayerReadyEvent.class, event -> {
-                instance.logFinest("Player ready event triggered for " + event.getPlayer().getDisplayName());
-
-                var player = event.getPlayer();
-                if (player == null) return;
+                getLog().logFinest("Player ready event triggered for " + event.getPlayer().getDisplayName());
 
-                Ref<EntityStore> ref = event.getPlayerRef();
+                var player = event.getPlayer();
+                var ref = event.getPlayerRef();
                 if (!ref.isValid()) return;
 
-                Store<EntityStore> store = ref.getStore();
-                World world = store.getExternalData().getWorld();
+                var store = ref.getStore();
+                var world = store.getExternalData().getWorld();
+
                 world.execute(() -> {
-                    PlayerRef playerRef = store.getComponent(ref, PlayerRef.getComponentType());
+                    var playerRef = store.getComponent(ref, PlayerRef.getComponentType());
                     try {
                         PngDownloadUtils.prefetchPngForPlayer(playerRef, HyvatarUtils.buildRenderUrl(
-                                player.getDisplayName(), 
-                                HyvatarUtils.RenderType.HEAD, 
+                                player.getDisplayName(),
+                                HyvatarUtils.RenderType.HEAD,
                                 64, null, null), 18000);
-                    } catch (IOException e) {
-                        throw new RuntimeException(e);
-                    } catch (InterruptedException e) {
+                    } catch (IOException | InterruptedException e) {
                         throw new RuntimeException(e);
                     }
-                    String html = "Pages/HudTest.html";
+
+                    var html = "Pages/HudTest.html";
                     var tp = new TemplateProcessor();
                     tp.setVariable("playerName", player.getDisplayName());
-                    var hud = HudBuilder.detachedHud()
+
+                    HudBuilder.detachedHud()
                             .loadHtml(html, tp)
                             .withRefreshRate(1000)
                             .onRefresh((h) -> {
@@ -152,19 +142,18 @@ protected void setup() {
 
             });
         }
-
     }
 
     private static void enqueueAsset(PlayerRef playerRef, Asset asset) {
-        if (playerRef == null || asset == null) {
+        if (playerRef == null || asset == null)
             return;
-        }
-        PENDING_ASSETS.computeIfAbsent(playerRef, ref -> new ConcurrentLinkedDeque<>()).push(asset);
+
+        PENDING_ASSETS.computeIfAbsent(playerRef, _ -> new ConcurrentLinkedDeque<>()).push(asset);
     }
 
     private static void scheduleReopenAfterRebuild(PlayerRef playerRef) {
-        if (playerRef == null || !playerRef.isValid() 
-                || playerRef.getReference() == null 
+        if (playerRef == null || !playerRef.isValid()
+                || playerRef.getReference() == null
                 || !playerRef.getReference().isValid()) {
             return;
         }

src/main/java/au/ellie/hyui/HyUIPluginLogger.java

@@ -21,15 +21,18 @@
 import com.hypixel.hytale.logger.HytaleLogger;
 
 public class HyUIPluginLogger {
-
-    private final HytaleLogger internalLogger = HytaleLogger.forEnclosingClass();
-
+
     public static final boolean IS_DEV = "true".equals(System.getenv("HYUI_DEV"));
+    private final HytaleLogger internalLogger = HytaleLogger.forEnclosingClass();
 
     public HyUIPluginLogger() {
-        
+
     }
-
+
+    public void logWarn(String message) {
+        internalLogger.atWarning().log(message);
+    }
+
     public void logFinest(String message) {
         internalLogger.atFinest().log(message);
     }

src/main/java/au/ellie/hyui/assets/DynamicImageAsset.java

@@ -125,7 +125,7 @@ protected CompletableFuture<byte[]> getBlob0() {
     public static void sendToPlayer(PacketHandler handler, CommonAsset asset) {
         byte[] allBytes = asset.getBlob().join();
         byte[][] parts = ArrayUtil.split(allBytes, 2621440);
-        
+
         ToClientPacket[] packets = new ToClientPacket[1 + parts.length];
         packets[0] = new AssetInitialize(asset.toPacket(), allBytes.length);
 

src/main/java/au/ellie/hyui/builders/ActionButtonBuilder.java

@@ -31,6 +31,7 @@
 import com.hypixel.hytale.server.core.ui.builder.EventData;
 import com.hypixel.hytale.server.core.ui.builder.UICommandBuilder;
 import com.hypixel.hytale.server.core.ui.builder.UIEventBuilder;
+
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -114,98 +115,98 @@ public ActionButtonBuilder withActionName(String actionName) {
      * Adds an event listener for the Activating event.
      */
     public ActionButtonBuilder onActivating(Runnable callback) {
-        return addEventListener(CustomUIEventBindingType.Activating, Void.class, v -> callback.run());
+        return addEventListener(CustomUIEventBindingType.Activating, callback);
     }
 
     /**
      * Adds an event listener for the Activating event with context.
      */
     public ActionButtonBuilder onActivating(BiConsumer<Void, UIContext> callback) {
-        return addEventListenerWithContext(CustomUIEventBindingType.Activating, Void.class, callback);
+        return addEventListenerWithContext(CustomUIEventBindingType.Activating, callback);
     }
 
     /**
      * Adds an event listener for the DoubleClicking event.
      */
     public ActionButtonBuilder onDoubleClicking(Runnable callback) {
-        return addEventListener(CustomUIEventBindingType.DoubleClicking, MouseEventData.class, v -> callback.run());
+        return addEventListener(CustomUIEventBindingType.DoubleClicking, callback);
     }
 
     /**
      * Adds an event listener for the DoubleClicking event.
      */
     public ActionButtonBuilder onDoubleClicking(Consumer<MouseEventData> callback) {
-        return addEventListener(CustomUIEventBindingType.DoubleClicking, MouseEventData.class, callback);
+        return addEventListenerWithContext(CustomUIEventBindingType.DoubleClicking, callback);
     }
 
     /**
      * Adds an event listener for the DoubleClicking event with context.
      */
     public ActionButtonBuilder onDoubleClicking(BiConsumer<MouseEventData, UIContext> callback) {
-        return addEventListenerWithContext(CustomUIEventBindingType.DoubleClicking, MouseEventData.class, callback);
+        return addEventListenerWithContext(CustomUIEventBindingType.DoubleClicking, callback);
     }
 
     /**
      * Adds an event listener for the RightClicking event.
      */
     public ActionButtonBuilder onRightClicking(Runnable callback) {
-        return addEventListener(CustomUIEventBindingType.RightClicking, MouseEventData.class, v -> callback.run());
+        return addEventListener(CustomUIEventBindingType.RightClicking, callback);
     }
 
     /**
      * Adds an event listener for the RightClicking event.
      */
     public ActionButtonBuilder onRightClicking(Consumer<MouseEventData> callback) {
-        return addEventListener(CustomUIEventBindingType.RightClicking, MouseEventData.class, callback);
+        return addEventListenerWithContext(CustomUIEventBindingType.RightClicking, callback);
     }
 
     /**
      * Adds an event listener for the RightClicking event with context.
      */
     public ActionButtonBuilder onRightClicking(BiConsumer<MouseEventData, UIContext> callback) {
-        return addEventListenerWithContext(CustomUIEventBindingType.RightClicking, MouseEventData.class, callback);
+        return addEventListenerWithContext(CustomUIEventBindingType.RightClicking, callback);
     }
 
     /**
      * Adds an event listener for the MouseEntered event.
      */
     public ActionButtonBuilder onMouseEntered(Runnable callback) {
-        return addEventListener(CustomUIEventBindingType.MouseEntered, MouseEventData.class, v -> callback.run());
+        return addEventListener(CustomUIEventBindingType.MouseEntered, callback);
     }
 
     /**
      * Adds an event listener for the MouseEntered event.
      */
     public ActionButtonBuilder onMouseEntered(Consumer<MouseEventData> callback) {
-        return addEventListener(CustomUIEventBindingType.MouseEntered, MouseEventData.class, callback);
+        return addEventListenerWithContext(CustomUIEventBindingType.MouseEntered, callback);
     }
 
     /**
      * Adds an event listener for the MouseEntered event with context.
      */
     public ActionButtonBuilder onMouseEntered(BiConsumer<MouseEventData, UIContext> callback) {
-        return addEventListenerWithContext(CustomUIEventBindingType.MouseEntered, MouseEventData.class, callback);
+        return addEventListenerWithContext(CustomUIEventBindingType.MouseEntered, callback);
     }
 
     /**
      * Adds an event listener for the MouseExited event.
      */
     public ActionButtonBuilder onMouseExited(Runnable callback) {
-        return addEventListener(CustomUIEventBindingType.MouseExited, MouseEventData.class, v -> callback.run());
+        return addEventListener(CustomUIEventBindingType.MouseExited, callback);
     }
 
     /**
      * Adds an event listener for the MouseExited event.
      */
     public ActionButtonBuilder onMouseExited(Consumer<MouseEventData> callback) {
-        return addEventListener(CustomUIEventBindingType.MouseExited, MouseEventData.class, callback);
+        return addEventListenerWithContext(CustomUIEventBindingType.MouseExited, callback);
     }
 
     /**
      * Adds an event listener for the MouseExited event with context.
      */
     public ActionButtonBuilder onMouseExited(BiConsumer<MouseEventData, UIContext> callback) {
-        return addEventListenerWithContext(CustomUIEventBindingType.MouseExited, MouseEventData.class, callback);
+        return addEventListenerWithContext(CustomUIEventBindingType.MouseExited, callback);
     }
 
     @Override
@@ -283,27 +284,27 @@ protected void onBuild(UICommandBuilder commands, UIEventBuilder events) {
                 HyUIPlugin.getLog().logFinest("Adding Activating event binding: " + eventId + " for " + selector);
                 events.addEventBinding(CustomUIEventBindingType.Activating, selector,
                         EventData.of("Action", UIEventActions.BUTTON_CLICKED)
-                            .append("Target", eventId), false);
+                                .append("Target", eventId), false);
             } else if (listener.type() == CustomUIEventBindingType.DoubleClicking) {
                 HyUIPlugin.getLog().logFinest("Adding DoubleClicking event binding for " + selector);
                 events.addEventBinding(CustomUIEventBindingType.DoubleClicking, selector,
                         EventData.of("Action", UIEventActions.DOUBLE_CLICKING)
-                            .append("Target", eventId), false);
+                                .append("Target", eventId), false);
             } else if (listener.type() == CustomUIEventBindingType.RightClicking) {
                 HyUIPlugin.getLog().logFinest("Adding RightClicking event binding for " + selector);
                 events.addEventBinding(CustomUIEventBindingType.RightClicking, selector,
                         EventData.of("Action", UIEventActions.RIGHT_CLICKING)
-                            .append("Target", eventId), false);
+                                .append("Target", eventId), false);
             } else if (listener.type() == CustomUIEventBindingType.MouseEntered) {
                 HyUIPlugin.getLog().logFinest("Adding MouseEntered event binding for " + selector);
                 events.addEventBinding(CustomUIEventBindingType.MouseEntered, selector,
                         EventData.of("Action", UIEventActions.MOUSE_ENTERED)
-                            .append("Target", eventId), false);
+                                .append("Target", eventId), false);
             } else if (listener.type() == CustomUIEventBindingType.MouseExited) {
                 HyUIPlugin.getLog().logFinest("Adding MouseExited event binding for " + selector);
                 events.addEventBinding(CustomUIEventBindingType.MouseExited, selector,
                         EventData.of("Action", UIEventActions.MOUSE_EXITED)
-                            .append("Target", eventId), false);
+                                .append("Target", eventId), false);
             }
         });
     }