1.21.5 and delay action type.

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.9-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -4,17 +4,18 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
-loader_version=0.16.10
+
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
+loader_version=0.16.14
 
 # Fabric API
-fabric_version=0.115.1+1.21.4
+fabric_version=0.124.0+1.21.5
 
 # Mod Properties
-mod_version=1.2.6
+mod_version=1.2.7
 maven_group=xyz.imcodist.quickmenu
 archives_base_name=quick-menu
 
 # owo-lib
-owo_version=0.12.20+1.21.4
+owo_version=0.12.21+1.21.5

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/xyz/imcodist/quickmenu/QuickMenu.java

@@ -3,10 +3,8 @@
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.util.InputUtil;
-import xyz.imcodist.quickmenu.other.ActionButtonDataHandler;
-import xyz.imcodist.quickmenu.other.KeybindHandler;
+import xyz.imcodist.quickmenu.other.*;
 import xyz.imcodist.quickmenu.other.ModConfig;
-import xyz.imcodist.quickmenu.other.ModKeybindings;
 import xyz.imcodist.quickmenu.ui.MainUI;
 
 public class QuickMenu implements ModInitializer {
@@ -20,8 +18,10 @@ public void onInitialize() {
         ModKeybindings.initialize();
         ActionButtonDataHandler.initialize();
 
+//        ClientTickEvents.START_CLIENT_TICK.register(ActionButtonDelayHandler.INSTANCE);
         // On the end of each tick check to see if a keybind has been pressed.
         ClientTickEvents.END_CLIENT_TICK.register((client) -> {
+            ActionButtonDelayHandler.INSTANCE.doDelayChecks();
             // Check for menu open keybind.
             if (ModKeybindings.menuOpenKeybinding.isPressed()) {
                 if (!menuKeyPressed) {

src/main/java/xyz/imcodist/quickmenu/data/ActionButtonData.java

@@ -11,7 +11,9 @@
 import xyz.imcodist.quickmenu.QuickMenu;
 import xyz.imcodist.quickmenu.data.command_actions.BaseActionData;
 import xyz.imcodist.quickmenu.data.command_actions.CommandActionData;
+import xyz.imcodist.quickmenu.data.command_actions.DelayActionData;
 import xyz.imcodist.quickmenu.data.command_actions.KeybindActionData;
+import xyz.imcodist.quickmenu.other.ActionButtonDelayHandler;
 import xyz.imcodist.quickmenu.other.ModConfigModel;
 
 import java.util.ArrayList;
@@ -95,6 +97,11 @@ private static BaseActionData getActionDataType(String type, String value) {
                 keybindActionData.keybindTranslationKey = value;
                 return keybindActionData;
             }
+            case "delay" -> {
+                var delayAction = new DelayActionData();
+                delayAction.ticks = Math.max(0, Long.parseLong(value));
+                return delayAction;
+            }
         }
 
         return null;
@@ -119,9 +126,55 @@ public void run(boolean isKeybind) {
                 client.player.sendMessage(Text.of("Ran action \"" + name + "\""), true);
             }
         }
+//        MinecraftClient.getInstance()
 
         // Run the buttons action.
-        actions.forEach(BaseActionData::run);
+//        actions.forEach(BaseActionData::run);
+        new ActionButtonDataContext(new ArrayList<>(actions), 0).run();
+    }
+
+    public static class ActionButtonDataContext {
+
+        private final List<BaseActionData> actions;
+        private long delay;
+
+        public ActionButtonDataContext(
+            List<BaseActionData> actions,
+            long delay
+        ) {
+            this.actions = actions;
+            this.delay = delay;
+        }
+
+        public void run() {
+            for (var idx = 0; idx < actions.size(); idx++) {
+                var action = actions.get(idx);
+                var nextDelay = action.run();
+                if (nextDelay > 0) {
+                    // TODO : Envelope the remaining actions in a timer.
+                    var nextSet = new ActionButtonDataContext(actions.subList(idx + 1, actions.size()), nextDelay);
+                    // TODO - Create a timer construct that listens
+                    ActionButtonDelayHandler.INSTANCE.add(nextSet);
+                    return;
+                }
+            }
+        }
+
+        public long getDelay() {
+            return delay;
+        }
+
+        public void decrementDelay()
+        {
+            delay = Math.max(0, delay - 1);
+        }
+
+        public boolean isReady()
+        {
+            return delay == 0;
+        }
+
+
     }
 
     public static class CustomModelDataValues {

src/main/java/xyz/imcodist/quickmenu/data/command_actions/BaseActionData.java

@@ -13,5 +13,7 @@ public String getString() {
         return "uh oh why are you seeing this";
     }
 
-    public void run() {}
+    public long run() {
+        return 0;
+    }
 }

src/main/java/xyz/imcodist/quickmenu/data/command_actions/CommandActionData.java

@@ -23,12 +23,12 @@ public String getString() {
     }
 
     @Override
-    public void run() {
+    public long run() {
         MinecraftClient client = MinecraftClient.getInstance();
-        if (client == null) return;
+        if (client == null) return 0;
 
         ClientPlayerEntity player = client.player;
-        if (player == null) return;
+        if (player == null) return 0;
 
         // Run the command.
         String commandToRun = command;
@@ -44,5 +44,6 @@ public void run() {
                 player.networkHandler.sendChatMessage(commandToRun);
             }
         }
+        return 0;
     }
 }

src/main/java/xyz/imcodist/quickmenu/data/command_actions/DelayActionData.java

@@ -0,0 +1,31 @@
+package xyz.imcodist.quickmenu.data.command_actions;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayerEntity;
+
+public class DelayActionData extends BaseActionData {
+
+    public long ticks = 20;
+
+    @Override
+    public String getJsonType() {
+        return "delay";
+    }
+    @Override
+    public String getJsonValue() {
+        return String.format("%s", ticks);
+    }
+
+    @Override
+    public String getTypeString() { return "DLY"; }
+    @Override
+    public String getString() {
+        return String.format("%s", ticks);
+    }
+
+    @Override
+    public long run() {
+        // TODO - rework this function to allow delays
+        return ticks;
+    }
+}

src/main/java/xyz/imcodist/quickmenu/data/command_actions/KeybindActionData.java

@@ -23,7 +23,8 @@ public String getString() {
     }
 
     @Override
-    public void run() {
+    public long run() {
         KeybindHandler.pressKey(keybindTranslationKey);
+        return 0;
     }
 }

src/main/java/xyz/imcodist/quickmenu/other/ActionButtonDelayHandler.java

@@ -0,0 +1,36 @@
+package xyz.imcodist.quickmenu.other;
+
+import net.minecraft.client.MinecraftClient;
+import xyz.imcodist.quickmenu.data.ActionButtonData;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ActionButtonDelayHandler {
+
+    public static final ActionButtonDelayHandler INSTANCE = new ActionButtonDelayHandler();
+
+    private final List<ActionButtonData.ActionButtonDataContext> delayedActions = new ArrayList<>();
+
+    private final List<ActionButtonData.ActionButtonDataContext> actionsInbox = new ArrayList<>();
+
+    public void add(ActionButtonData.ActionButtonDataContext context){
+        actionsInbox.add(context);
+    }
+
+
+    public void doDelayChecks() {
+        for(var it = delayedActions.iterator(); it.hasNext();){
+            var action = it.next();
+            action.decrementDelay();
+            if(action.isReady()){
+                action.run();
+                it.remove();
+            }
+        }
+        if(!actionsInbox.isEmpty()) {
+            delayedActions.addAll(actionsInbox);
+            actionsInbox.clear();
+        }
+    }
+}