Implement identity return command, visibility action and more.

ixnoahlive · Jun 7, 2024 · 9a4d327 · 9a4d327
1 parent b7fd371
commit 9a4d327
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 16 deletions.
diff --git a/src/main/kotlin/live/ixnoah/tapactions/TapActions.kt b/src/main/kotlin/live/ixnoah/tapactions/TapActions.kt
@@ -2,7 +2,8 @@ package live.ixnoah.tapactions
 
 import live.ixnoah.tapactions.actions.GeneralActions
 import live.ixnoah.tapactions.actions.HudActions
-import live.ixnoah.tapactions.commands.CreateCommand
+import live.ixnoah.tapactions.commands.CreateActionCommand
+import live.ixnoah.tapactions.events.ClientTick
 import live.ixnoah.tapactions.events.WorldLoad
 import net.minecraft.client.Minecraft
 import net.minecraftforge.client.ClientCommandHandler
@@ -26,13 +27,14 @@ class TapActions {
             throw java.lang.RuntimeException(e)
         }
         // Commands
-        ClientCommandHandler.instance.registerCommand(CreateCommand())
+        ClientCommandHandler.instance.registerCommand(CreateActionCommand())
 
         // Events
         MinecraftForge.EVENT_BUS.register(WorldLoad())
+        MinecraftForge.EVENT_BUS.register(ClientTick())
 
         // Deploy actions
-        GeneralActions().deploy()
-        HudActions().deploy()
+        GeneralActions.deploy()
+        HudActions.deploy()
     }
 }
diff --git a/src/main/kotlin/live/ixnoah/tapactions/actions/GeneralActions.kt b/src/main/kotlin/live/ixnoah/tapactions/actions/GeneralActions.kt
@@ -1,21 +1,39 @@
 package live.ixnoah.tapactions.actions
 
+import CommandQueue
 import live.ixnoah.tapactions.ActionManager
 import live.ixnoah.tapactions.wrappers.Scoreboard
 
-class GeneralActions {
+object GeneralActions {
     private val nameRegex = Regex("^[0-9A-z '\"!@#\$%^*?]{0,20}\$")
+    var hasStatedIdentity = false
 
-    /** This can be used to show the identity of a house, like name, links & description! :D */
+    /** This can be used to show the identity of a house, like name, links & description! */
     private val actionIdentity = { params : MutableMap<String, String> ->
-        val paramName = params["name"] ?: "Housing"
+        if (!hasStatedIdentity) {
+            hasStatedIdentity = true
+            val paramName = params["name"] ?: "Housing"
 
-        if (nameRegex.containsMatchIn(paramName)) {
-            Scoreboard.setTitle("§e§l" + paramName.uppercase())
+            if (nameRegex.containsMatchIn(paramName)) {
+                Scoreboard.setTitle("§e§l" + paramName.uppercase())
+            }
+
+            if (params["run"] !== null) {
+                CommandQueue.pushCommand("house:${params["run"]}")
+            }
+        }
+    }
+
+    private val actionVisibility = { params : MutableMap<String, String> ->
+        val paramVis : Int? = params["max"]?.toIntOrNull()
+
+        if (paramVis !== null) {
+            CommandQueue.pushCommand("visibility $paramVis")
         }
     }
 
     fun deploy() {
         ActionManager.registerAction("tap:identity", actionIdentity)
+        ActionManager.registerAction("tap:visibility", actionVisibility)
     }
 }
diff --git a/src/main/kotlin/live/ixnoah/tapactions/actions/HudActions.kt b/src/main/kotlin/live/ixnoah/tapactions/actions/HudActions.kt
@@ -3,7 +3,7 @@ package live.ixnoah.tapactions.actions
 import live.ixnoah.tapactions.ActionManager
 import net.minecraft.entity.boss.BossStatus
 
-class HudActions {
+object HudActions {
     private val actionBossbar = { params : MutableMap<String, String> ->
         if (params["no-clear"] == null) {
             BossStatus.statusBarTime = Int.MAX_VALUE

diff --git a/src/main/kotlin/live/ixnoah/tapactions/commands/CommandQueue.kt b/src/main/kotlin/live/ixnoah/tapactions/commands/CommandQueue.kt
@@ -11,9 +11,13 @@ object CommandQueue {
         if (queue.size == 0) return
 
         val command = queue.first()
-        queue.drop(1)
+        queue = queue.drop(1).toMutableList()
 
-        Minecraft.getMinecraft().thePlayer.sendChatMessage("/" + command)
+        Minecraft.getMinecraft().thePlayer.sendChatMessage("/$command")
+    }
+
+    fun onTick(tick: Int) {
+        if (tick == 1) runNextCommand()
     }
 
     fun clearQueue() {

diff --git a/...noah/tapactions/commands/CreateCommand.kt → ...apactions/commands/CreateActionCommand.kt b/...noah/tapactions/commands/CreateCommand.kt → ...apactions/commands/CreateActionCommand.kt
@@ -6,11 +6,15 @@ import net.minecraft.command.CommandException
 import net.minecraft.command.ICommandSender
 import net.minecraft.util.ChatComponentText
 
-class CreateCommand: CommandBase() {
+class CreateActionCommand: CommandBase() {
     private val splitter = " | "
 
     override fun getCommandName(): String {
-        return "createaction"
+        return "tap:createaction"
+    }
+
+    override fun getCommandAliases(): MutableList<String> {
+        return mutableListOf("createaction", "ca")
     }
 
     override fun getCommandUsage(sender: ICommandSender?): String {

diff --git a/src/main/kotlin/live/ixnoah/tapactions/events/ClientTick.kt b/src/main/kotlin/live/ixnoah/tapactions/events/ClientTick.kt
@@ -0,0 +1,17 @@
+package live.ixnoah.tapactions.events
+
+import CommandQueue
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent
+
+class ClientTick {
+    private var tick = 0;
+
+    @SubscribeEvent
+    fun onEvent(event: ClientTickEvent) {
+        if (tick > 20) tick = 0
+        tick += 1
+
+        CommandQueue.onTick(tick)
+    }
+}
diff --git a/src/main/kotlin/live/ixnoah/tapactions/events/WorldLoad.kt b/src/main/kotlin/live/ixnoah/tapactions/events/WorldLoad.kt
@@ -1,7 +1,7 @@
 package live.ixnoah.tapactions.events
 
-import live.ixnoah.tapactions.commands.CommandQueue
-
+import CommandQueue
+import live.ixnoah.tapactions.actions.GeneralActions
 import net.minecraft.client.Minecraft
 import net.minecraft.entity.boss.BossStatus
 import net.minecraftforge.event.entity.EntityJoinWorldEvent
@@ -14,5 +14,6 @@ class WorldLoad {
 
         BossStatus.statusBarTime = 0 // clears the bossbar
         CommandQueue.clearQueue()
+        GeneralActions.hasStatedIdentity = false
     }
 }