From 4b161f23f43697189579c32a49ea469ff20a2e20 Mon Sep 17 00:00:00 2001
From: YTG1234 <54103478+YTG1234@users.noreply.github.com>
Date: Fri, 6 Nov 2020 14:07:44 +0200
Subject: [PATCH 01/19] Some cursed code, didn't test this yet

---
 .../kotlin/me/gserv/fabrikommander/Common.kt  |  3 ++
 .../fabrikommander/commands/SetHomeCommand.kt |  1 -
 .../fabrikommander/commands/TpaCommand.kt     | 25 ++++++++++
 .../gserv/fabrikommander/data/TpaRequest.kt   | 47 +++++++++++++++++++
 .../me/gserv/fabrikommander/utils/Text.kt     |  2 +-
 5 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
 create mode 100644 src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt

diff --git a/src/main/kotlin/me/gserv/fabrikommander/Common.kt b/src/main/kotlin/me/gserv/fabrikommander/Common.kt
index 7fd641f..e71b949 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/Common.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/Common.kt
@@ -27,6 +27,9 @@ object Common : ModInitializer {
         HomesCommand(dispatcher).register()
         SetHomeCommand(dispatcher).register()
 
+        // Teleport commands
+        TpaCommand(dispatcher).register()
+
         // Misc comands
         PingCommand(dispatcher).register()
     }
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/SetHomeCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/SetHomeCommand.kt
index 1ff3252..846fbf0 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/SetHomeCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/SetHomeCommand.kt
@@ -5,7 +5,6 @@ import me.gserv.fabrikommander.data.PlayerDataManager
 import me.gserv.fabrikommander.data.spec.Home
 import me.gserv.fabrikommander.utils.*
 import net.minecraft.server.command.CommandManager
-import net.minecraft.text.LiteralText
 
 class SetHomeCommand(val dispatcher: Dispatcher) {
     fun register() {
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
new file mode 100644
index 0000000..c6e3bc5
--- /dev/null
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
@@ -0,0 +1,25 @@
+package me.gserv.fabrikommander.commands
+
+import me.gserv.fabrikommander.data.TpaRequest
+import me.gserv.fabrikommander.utils.Context
+import me.gserv.fabrikommander.utils.Dispatcher
+import net.minecraft.command.argument.EntityArgumentType
+import net.minecraft.server.command.CommandManager.*
+
+class TpaCommand(val dispatcher: Dispatcher) {
+    fun register() {
+        dispatcher.register(
+            literal("tpa").then(
+                argument("target", EntityArgumentType.player()).executes(this::tpaCommand)
+            )
+        )
+    }
+
+    fun tpaCommand(context: Context): Int {
+        val target = EntityArgumentType.getPlayer(context, "target")
+        val source = context.source.player
+        val request = TpaRequest(source = source, target = target, tpaHere = false)
+        request.notifyTarget()
+        return 1
+    }
+}
diff --git a/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt b/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt
new file mode 100644
index 0000000..416f2f8
--- /dev/null
+++ b/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt
@@ -0,0 +1,47 @@
+package me.gserv.fabrikommander.data
+
+import me.gserv.fabrikommander.utils.*
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.text.ClickEvent
+import net.minecraft.text.HoverEvent
+import net.minecraft.text.MutableText
+import net.minecraft.util.Util
+
+class TpaRequest(
+    val source: ServerPlayerEntity,
+    val target: ServerPlayerEntity,
+    val availableForTicks: Int = 6000,
+    val tpaHere: Boolean
+) {
+    fun apply() {
+        if (tpaHere) target.teleport(source.serverWorld, source.x, source.y, source.z, source.yaw, source.pitch)
+        source.teleport(target.serverWorld, target.x, target.y, target.z, target.yaw, target.pitch)
+    }
+
+    fun notifyTarget() {
+        // Message will be configurable later
+        val message = click(
+            hover(
+                aqua(source.displayName as MutableText) + yellow(
+                    "has requested" + when (tpaHere) {
+                        true -> "you"
+                        false -> "to"
+                    } + "teleport to" + when (tpaHere) { // Will change to one when later, for now it's two
+                        true -> "them"
+                        false -> "you"
+                    } + "."
+                ),
+                HoverEvent(
+                    HoverEvent.Action.SHOW_TEXT,
+                    yellow("Click to teleport!")
+                )
+            ),
+            ClickEvent(
+                ClickEvent.Action.RUN_COMMAND,
+                "/tpaccept " + source.name // Command not implemented yet
+            )
+        )
+
+        target.sendSystemMessage(message, Util.NIL_UUID)
+    }
+}
diff --git a/src/main/kotlin/me/gserv/fabrikommander/utils/Text.kt b/src/main/kotlin/me/gserv/fabrikommander/utils/Text.kt
index b7839e8..ecaa1d6 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/utils/Text.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/utils/Text.kt
@@ -60,5 +60,5 @@ fun hover(text: MutableText, event: HoverEvent) = text.setStyle(text.style.withH
 // endregion
 
 // region: Operators
-operator fun MutableText.plus(other: MutableText): MutableText = this.append(other)
+operator fun MutableText.plus(other: Text): MutableText = this.append(other)
 // endregion

From 0d86457b4d5a5d0a0c1cc10033e5b579e72c8acc Mon Sep 17 00:00:00 2001
From: YTG1234 <54103478+YTG1234@users.noreply.github.com>
Date: Fri, 6 Nov 2020 14:32:58 +0200
Subject: [PATCH 02/19] Cleaned up message, added /tpahere

---
 .../fabrikommander/commands/TpaCommand.kt     | 19 +++++++++++++++----
 .../gserv/fabrikommander/data/TpaRequest.kt   |  8 ++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
index c6e3bc5..8a62d0f 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
@@ -4,21 +4,32 @@ import me.gserv.fabrikommander.data.TpaRequest
 import me.gserv.fabrikommander.utils.Context
 import me.gserv.fabrikommander.utils.Dispatcher
 import net.minecraft.command.argument.EntityArgumentType
-import net.minecraft.server.command.CommandManager.*
+import net.minecraft.server.command.CommandManager.argument
+import net.minecraft.server.command.CommandManager.literal
 
 class TpaCommand(val dispatcher: Dispatcher) {
     fun register() {
         dispatcher.register(
             literal("tpa").then(
-                argument("target", EntityArgumentType.player()).executes(this::tpaCommand)
+                argument("target", EntityArgumentType.player()).executes {
+                    tpaCommand(it, false)
+                }
+            )
+        )
+
+        dispatcher.register(
+            literal("tpahere").then(
+                argument("target", EntityArgumentType.player()).executes {
+                    tpaCommand(it, true)
+                }
             )
         )
     }
 
-    fun tpaCommand(context: Context): Int {
+    fun tpaCommand(context: Context, tpaHere: Boolean): Int {
         val target = EntityArgumentType.getPlayer(context, "target")
         val source = context.source.player
-        val request = TpaRequest(source = source, target = target, tpaHere = false)
+        val request = TpaRequest(source = source, target = target, tpaHere = tpaHere)
         request.notifyTarget()
         return 1
     }
diff --git a/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt b/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt
index 416f2f8..3a70c22 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt
@@ -22,11 +22,11 @@ class TpaRequest(
         // Message will be configurable later
         val message = click(
             hover(
-                aqua(source.displayName as MutableText) + yellow(
-                    "has requested" + when (tpaHere) {
+                source.displayName as MutableText + yellow(
+                    " has requested " + when (tpaHere) {
                         true -> "you"
                         false -> "to"
-                    } + "teleport to" + when (tpaHere) { // Will change to one when later, for now it's two
+                    } + " teleport to " + when (tpaHere) { // Will change to one when later, for now it's two
                         true -> "them"
                         false -> "you"
                     } + "."
@@ -38,7 +38,7 @@ class TpaRequest(
             ),
             ClickEvent(
                 ClickEvent.Action.RUN_COMMAND,
-                "/tpaccept " + source.name // Command not implemented yet
+                "/tpaccept " + source.uuidAsString // Command not implemented yet
             )
         )
 

From 52ba230ba09257d7dd58a40c8d3400410f9d5cc1 Mon Sep 17 00:00:00 2001
From: YTG1234 <54103478+YTG1234@users.noreply.github.com>
Date: Fri, 6 Nov 2020 14:55:30 +0200
Subject: [PATCH 03/19] Implement requested changes

---
 .../kotlin/me/gserv/fabrikommander/Common.kt  |  1 +
 .../fabrikommander/commands/TpaCommand.kt     | 16 ++-----
 .../fabrikommander/commands/TpaHereCommand.kt | 26 ++++++++++
 .../gserv/fabrikommander/data/TpaRequest.kt   | 47 ++++++++++++-------
 4 files changed, 60 insertions(+), 30 deletions(-)
 create mode 100644 src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt

diff --git a/src/main/kotlin/me/gserv/fabrikommander/Common.kt b/src/main/kotlin/me/gserv/fabrikommander/Common.kt
index e71b949..d0fc6ad 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/Common.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/Common.kt
@@ -29,6 +29,7 @@ object Common : ModInitializer {
 
         // Teleport commands
         TpaCommand(dispatcher).register()
+        TpaHereCommand(dispatcher).register()
 
         // Misc comands
         PingCommand(dispatcher).register()
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
index 8a62d0f..121a1c3 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
@@ -11,25 +11,15 @@ class TpaCommand(val dispatcher: Dispatcher) {
     fun register() {
         dispatcher.register(
             literal("tpa").then(
-                argument("target", EntityArgumentType.player()).executes {
-                    tpaCommand(it, false)
-                }
-            )
-        )
-
-        dispatcher.register(
-            literal("tpahere").then(
-                argument("target", EntityArgumentType.player()).executes {
-                    tpaCommand(it, true)
-                }
+                argument("target", EntityArgumentType.player()).executes(this::tpaCommand)
             )
         )
     }
 
-    fun tpaCommand(context: Context, tpaHere: Boolean): Int {
+    fun tpaCommand(context: Context): Int {
         val target = EntityArgumentType.getPlayer(context, "target")
         val source = context.source.player
-        val request = TpaRequest(source = source, target = target, tpaHere = tpaHere)
+        val request = TpaRequest(source = source, target = target, tpaHere = false)
         request.notifyTarget()
         return 1
     }
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
new file mode 100644
index 0000000..1d63fb7
--- /dev/null
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
@@ -0,0 +1,26 @@
+package me.gserv.fabrikommander.commands
+
+import me.gserv.fabrikommander.data.TpaRequest
+import me.gserv.fabrikommander.utils.Context
+import me.gserv.fabrikommander.utils.Dispatcher
+import net.minecraft.command.argument.EntityArgumentType
+import net.minecraft.server.command.CommandManager.argument
+import net.minecraft.server.command.CommandManager.literal
+
+class TpaHereCommand(val dispatcher: Dispatcher) {
+    fun register() {
+        dispatcher.register(
+            literal("tpahere").then(
+                argument("target", EntityArgumentType.player()).executes(this::tpaHereCommand)
+            )
+        )
+    }
+
+    fun tpaHereCommand(context: Context): Int {
+        val target = EntityArgumentType.getPlayer(context, "target")
+        val source = context.source.player
+        val request = TpaRequest(source = source, target = target, tpaHere = true)
+        request.notifyTarget()
+        return 1
+    }
+}
diff --git a/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt b/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt
index 3a70c22..35eb413 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt
@@ -20,27 +20,40 @@ class TpaRequest(
 
     fun notifyTarget() {
         // Message will be configurable later
-        val message = click(
-            hover(
-                source.displayName as MutableText + yellow(
-                    " has requested " + when (tpaHere) {
-                        true -> "you"
-                        false -> "to"
-                    } + " teleport to " + when (tpaHere) { // Will change to one when later, for now it's two
-                        true -> "them"
-                        false -> "you"
-                    } + "."
+        val message =
+            source.displayName as MutableText + yellow(
+                " has requested " + when (tpaHere) {
+                    true -> "you"
+                    false -> "to"
+                } + " teleport to " + when (tpaHere) { // Will change to one when later, for now it's two
+                    true -> "them"
+                    false -> "you"
+                }
+            ) + reset(". [") + click(
+                hover(
+                    aqua("Accept"),
+                    HoverEvent(
+                        HoverEvent.Action.SHOW_TEXT,
+                        green("Click here to accept the request.")
+                    )
+                ),
+                ClickEvent(
+                    ClickEvent.Action.RUN_COMMAND,
+                    "/tpaccept " + source.uuidAsString // There can be multiple active requests
+                )
+            ) + reset(" / ") + hover(
+                click(
+                    aqua("Deny"),
+                    ClickEvent(
+                        ClickEvent.Action.RUN_COMMAND,
+                        "/tpdeny " + source.uuidAsString // There can be multiple active requests
+                    )
                 ),
                 HoverEvent(
                     HoverEvent.Action.SHOW_TEXT,
-                    yellow("Click to teleport!")
+                    red("Click here to deny the request.")
                 )
-            ),
-            ClickEvent(
-                ClickEvent.Action.RUN_COMMAND,
-                "/tpaccept " + source.uuidAsString // Command not implemented yet
-            )
-        )
+            ) + reset("]")
 
         target.sendSystemMessage(message, Util.NIL_UUID)
     }

From 5d3731029c3a70394ca929501e41c532cd36b278 Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Sat, 7 Nov 2020 14:57:57 +0200
Subject: [PATCH 04/19] I'm surprised this actually works

---
 .../kotlin/me/gserv/fabrikommander/Common.kt  |  1 +
 .../fabrikommander/commands/TpaCommand.kt     |  4 +--
 .../fabrikommander/commands/TpaHereCommand.kt |  4 +--
 .../commands/TpacceptCommand.kt               | 34 ++++++++++++++++++
 .../{TpaRequest.kt => TeleportRequest.kt}     | 35 ++++++++++++++-----
 5 files changed, 65 insertions(+), 13 deletions(-)
 create mode 100644 src/main/kotlin/me/gserv/fabrikommander/commands/TpacceptCommand.kt
 rename src/main/kotlin/me/gserv/fabrikommander/data/{TpaRequest.kt => TeleportRequest.kt} (57%)

diff --git a/src/main/kotlin/me/gserv/fabrikommander/Common.kt b/src/main/kotlin/me/gserv/fabrikommander/Common.kt
index d0fc6ad..a9d6c4f 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/Common.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/Common.kt
@@ -30,6 +30,7 @@ object Common : ModInitializer {
         // Teleport commands
         TpaCommand(dispatcher).register()
         TpaHereCommand(dispatcher).register()
+        TpacceptCommand(dispatcher).register()
 
         // Misc comands
         PingCommand(dispatcher).register()
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
index 121a1c3..7bf5720 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
@@ -1,6 +1,6 @@
 package me.gserv.fabrikommander.commands
 
-import me.gserv.fabrikommander.data.TpaRequest
+import me.gserv.fabrikommander.data.TeleportRequest
 import me.gserv.fabrikommander.utils.Context
 import me.gserv.fabrikommander.utils.Dispatcher
 import net.minecraft.command.argument.EntityArgumentType
@@ -19,7 +19,7 @@ class TpaCommand(val dispatcher: Dispatcher) {
     fun tpaCommand(context: Context): Int {
         val target = EntityArgumentType.getPlayer(context, "target")
         val source = context.source.player
-        val request = TpaRequest(source = source, target = target, tpaHere = false)
+        val request = TeleportRequest(source = source, target = target, inverted = false)
         request.notifyTarget()
         return 1
     }
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
index 1d63fb7..bb31146 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
@@ -1,6 +1,6 @@
 package me.gserv.fabrikommander.commands
 
-import me.gserv.fabrikommander.data.TpaRequest
+import me.gserv.fabrikommander.data.TeleportRequest
 import me.gserv.fabrikommander.utils.Context
 import me.gserv.fabrikommander.utils.Dispatcher
 import net.minecraft.command.argument.EntityArgumentType
@@ -19,7 +19,7 @@ class TpaHereCommand(val dispatcher: Dispatcher) {
     fun tpaHereCommand(context: Context): Int {
         val target = EntityArgumentType.getPlayer(context, "target")
         val source = context.source.player
-        val request = TpaRequest(source = source, target = target, tpaHere = true)
+        val request = TeleportRequest(source = source, target = target, inverted = true)
         request.notifyTarget()
         return 1
     }
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpacceptCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpacceptCommand.kt
new file mode 100644
index 0000000..6e24cc0
--- /dev/null
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpacceptCommand.kt
@@ -0,0 +1,34 @@
+package me.gserv.fabrikommander.commands
+
+import me.gserv.fabrikommander.data.TeleportRequest
+import me.gserv.fabrikommander.utils.Context
+import me.gserv.fabrikommander.utils.Dispatcher
+import me.gserv.fabrikommander.utils.plus
+import me.gserv.fabrikommander.utils.red
+import net.minecraft.command.argument.EntityArgumentType
+import net.minecraft.server.command.CommandManager.argument
+import net.minecraft.server.command.CommandManager.literal
+
+// I'm not sure how I should capitalise this
+class TpacceptCommand(val dispatcher: Dispatcher) {
+    fun register() {
+        dispatcher.register(
+            literal("tpaccept").then(
+                argument("source", EntityArgumentType.player()).executes(this::tpacceptCommand)
+            )
+        )
+    }
+
+    fun tpacceptCommand(context: Context): Int {
+        val source = EntityArgumentType.getPlayer(context, "source")
+        if (TeleportRequest.ACTIVE_REQUESTS[source.uuidAsString + context.source.player.uuidAsString] == null) {
+            context.source.sendError(
+                red("No active teleport request from ") + source.displayName
+            )
+            return 0
+        }
+        TeleportRequest.ACTIVE_REQUESTS[source.uuidAsString + context.source.player.uuidAsString]!!.apply()
+        TeleportRequest.ACTIVE_REQUESTS.remove(source.uuidAsString + context.source.player.uuidAsString)
+        return 1
+    }
+}
diff --git a/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt b/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt
similarity index 57%
rename from src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt
rename to src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt
index 35eb413..1449e3a 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/data/TpaRequest.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt
@@ -1,20 +1,37 @@
 package me.gserv.fabrikommander.data
 
-import me.gserv.fabrikommander.utils.*
+import me.gserv.fabrikommander.utils.aqua
+import me.gserv.fabrikommander.utils.click
+import me.gserv.fabrikommander.utils.green
+import me.gserv.fabrikommander.utils.hover
+import me.gserv.fabrikommander.utils.plus
+import me.gserv.fabrikommander.utils.red
+import me.gserv.fabrikommander.utils.reset
+import me.gserv.fabrikommander.utils.yellow
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.text.ClickEvent
 import net.minecraft.text.HoverEvent
 import net.minecraft.text.MutableText
 import net.minecraft.util.Util
 
-class TpaRequest(
+class TeleportRequest(
     val source: ServerPlayerEntity,
     val target: ServerPlayerEntity,
-    val availableForTicks: Int = 6000,
-    val tpaHere: Boolean
+    val inverted: Boolean
 ) {
+    companion object {
+        @JvmStatic
+        val ACTIVE_REQUESTS = hashMapOf<String, TeleportRequest>()
+    }
+
+    init {
+        // I should come up with a better system but I want to make sure that there can't be two teleport requests with the same source and target.
+        val id = source.uuidAsString + target.uuidAsString
+        ACTIVE_REQUESTS[id] = this
+    }
+
     fun apply() {
-        if (tpaHere) target.teleport(source.serverWorld, source.x, source.y, source.z, source.yaw, source.pitch)
+        if (inverted) target.teleport(source.serverWorld, source.x, source.y, source.z, source.yaw, source.pitch)
         source.teleport(target.serverWorld, target.x, target.y, target.z, target.yaw, target.pitch)
     }
 
@@ -22,10 +39,10 @@ class TpaRequest(
         // Message will be configurable later
         val message =
             source.displayName as MutableText + yellow(
-                " has requested " + when (tpaHere) {
+                " has requested " + when (inverted) {
                     true -> "you"
                     false -> "to"
-                } + " teleport to " + when (tpaHere) { // Will change to one when later, for now it's two
+                } + " teleport to " + when (inverted) { // Will change to one when later, for now it's two
                     true -> "them"
                     false -> "you"
                 }
@@ -39,14 +56,14 @@ class TpaRequest(
                 ),
                 ClickEvent(
                     ClickEvent.Action.RUN_COMMAND,
-                    "/tpaccept " + source.uuidAsString // There can be multiple active requests
+                    "/tpaccept " + source.entityName // There can be multiple active requests
                 )
             ) + reset(" / ") + hover(
                 click(
                     aqua("Deny"),
                     ClickEvent(
                         ClickEvent.Action.RUN_COMMAND,
-                        "/tpdeny " + source.uuidAsString // There can be multiple active requests
+                        "/tpdeny " + source.entityName // There can be multiple active requests
                     )
                 ),
                 HoverEvent(

From 08d901016498e9cb43a6de7fa15cc84b51d376c1 Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Sat, 7 Nov 2020 15:02:36 +0200
Subject: [PATCH 05/19] Fixed a minor error

---
 src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt b/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt
index 1449e3a..fd82ecb 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt
@@ -38,7 +38,7 @@ class TeleportRequest(
     fun notifyTarget() {
         // Message will be configurable later
         val message =
-            source.displayName as MutableText + yellow(
+            reset("") + source.displayName as MutableText + yellow( // reset("") used to make the vanilla click event for player names not apply to the whole message
                 " has requested " + when (inverted) {
                     true -> "you"
                     false -> "to"

From 934f944ee81a5c1ff9419dc283c216cbf603985e Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Sat, 7 Nov 2020 15:50:19 +0200
Subject: [PATCH 06/19] Implement cancelling and denying

---
 .../kotlin/me/gserv/fabrikommander/Common.kt  |  4 +-
 ...{TpacceptCommand.kt => TpAcceptCommand.kt} |  6 +--
 .../commands/TpCancelCommand.kt               | 36 ++++++++++++++++++
 .../fabrikommander/commands/TpDenyCommand.kt  | 37 +++++++++++++++++++
 4 files changed, 79 insertions(+), 4 deletions(-)
 rename src/main/kotlin/me/gserv/fabrikommander/commands/{TpacceptCommand.kt => TpAcceptCommand.kt} (90%)
 create mode 100644 src/main/kotlin/me/gserv/fabrikommander/commands/TpCancelCommand.kt
 create mode 100644 src/main/kotlin/me/gserv/fabrikommander/commands/TpDenyCommand.kt

diff --git a/src/main/kotlin/me/gserv/fabrikommander/Common.kt b/src/main/kotlin/me/gserv/fabrikommander/Common.kt
index a9d6c4f..a41f336 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/Common.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/Common.kt
@@ -30,7 +30,9 @@ object Common : ModInitializer {
         // Teleport commands
         TpaCommand(dispatcher).register()
         TpaHereCommand(dispatcher).register()
-        TpacceptCommand(dispatcher).register()
+        TpAcceptCommand(dispatcher).register()
+        TpCancelCommand(dispatcher).register()
+        TpDenyCommand(dispatcher).register()
 
         // Misc comands
         PingCommand(dispatcher).register()
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpacceptCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpAcceptCommand.kt
similarity index 90%
rename from src/main/kotlin/me/gserv/fabrikommander/commands/TpacceptCommand.kt
rename to src/main/kotlin/me/gserv/fabrikommander/commands/TpAcceptCommand.kt
index 6e24cc0..4c6d6a6 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpacceptCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpAcceptCommand.kt
@@ -10,16 +10,16 @@ import net.minecraft.server.command.CommandManager.argument
 import net.minecraft.server.command.CommandManager.literal
 
 // I'm not sure how I should capitalise this
-class TpacceptCommand(val dispatcher: Dispatcher) {
+class TpAcceptCommand(val dispatcher: Dispatcher) {
     fun register() {
         dispatcher.register(
             literal("tpaccept").then(
-                argument("source", EntityArgumentType.player()).executes(this::tpacceptCommand)
+                argument("source", EntityArgumentType.player()).executes(this::tpAcceptCommand)
             )
         )
     }
 
-    fun tpacceptCommand(context: Context): Int {
+    fun tpAcceptCommand(context: Context): Int {
         val source = EntityArgumentType.getPlayer(context, "source")
         if (TeleportRequest.ACTIVE_REQUESTS[source.uuidAsString + context.source.player.uuidAsString] == null) {
             context.source.sendError(
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpCancelCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpCancelCommand.kt
new file mode 100644
index 0000000..4e26eef
--- /dev/null
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpCancelCommand.kt
@@ -0,0 +1,36 @@
+package me.gserv.fabrikommander.commands
+
+import me.gserv.fabrikommander.data.TeleportRequest
+import me.gserv.fabrikommander.utils.Context
+import me.gserv.fabrikommander.utils.Dispatcher
+import me.gserv.fabrikommander.utils.aqua
+import me.gserv.fabrikommander.utils.plus
+import me.gserv.fabrikommander.utils.red
+import net.minecraft.command.argument.EntityArgumentType
+import net.minecraft.server.command.CommandManager.argument
+import net.minecraft.server.command.CommandManager.literal
+
+class TpCancelCommand(val dispatcher: Dispatcher) {
+    fun register() {
+        dispatcher.register(
+            literal("tpcancel").then(
+                argument("target", EntityArgumentType.player()).executes(this::tpCancelCommand)
+            )
+        )
+    }
+
+    fun tpCancelCommand(context: Context): Int {
+        val target = EntityArgumentType.getPlayer(context, "target")
+        if (TeleportRequest.ACTIVE_REQUESTS[context.source.player.uuidAsString + target.uuidAsString] == null) {
+            context.source.sendError(
+                red("No active teleport request to ") + target.displayName
+            )
+            return 0
+        }
+        TeleportRequest.ACTIVE_REQUESTS.remove(context.source.player.uuidAsString + target.uuidAsString)
+        context.source.sendFeedback(aqua(
+            "Teleport request to "
+        ) + target.displayName + aqua(" was cancelled."), true)
+        return 1
+    }
+}
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpDenyCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpDenyCommand.kt
new file mode 100644
index 0000000..90c6729
--- /dev/null
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpDenyCommand.kt
@@ -0,0 +1,37 @@
+package me.gserv.fabrikommander.commands
+
+import me.gserv.fabrikommander.data.TeleportRequest
+import me.gserv.fabrikommander.utils.Context
+import me.gserv.fabrikommander.utils.Dispatcher
+import me.gserv.fabrikommander.utils.aqua
+import me.gserv.fabrikommander.utils.plus
+import me.gserv.fabrikommander.utils.red
+import net.minecraft.command.argument.EntityArgumentType
+import net.minecraft.server.command.CommandManager.argument
+import net.minecraft.server.command.CommandManager.literal
+
+class TpDenyCommand(val dispatcher: Dispatcher) {
+    fun register() {
+        dispatcher.register(
+            literal("tpdeny").then(
+                argument("source", EntityArgumentType.player()).executes(this::tpDenyCommand)
+            )
+        )
+    }
+
+    fun tpDenyCommand(context: Context): Int {
+        val source = EntityArgumentType.getPlayer(context, "source")
+        if (TeleportRequest.ACTIVE_REQUESTS[source.uuidAsString + context.source.player.uuidAsString] == null) {
+            context.source.sendError(
+                red("No active teleport request from ") + source.displayName
+            )
+            return 0
+        }
+        TeleportRequest.ACTIVE_REQUESTS.remove(source.uuidAsString + context.source.player.uuidAsString)
+        context.source.sendFeedback(
+            aqua("Teleport request from ") + source.displayName + aqua(" was denied"),
+            true
+        )
+        return 1
+    }
+}

From 84d88d722bbda3892f9b2c01c08e48ae9d6e8ad1 Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Sat, 7 Nov 2020 16:06:31 +0200
Subject: [PATCH 07/19] Added more messages

---
 .../fabrikommander/commands/TpAcceptCommand.kt |  6 ++++--
 .../fabrikommander/commands/TpCancelCommand.kt |  1 +
 .../fabrikommander/commands/TpDenyCommand.kt   |  1 +
 .../fabrikommander/commands/TpaCommand.kt      |  8 +++++++-
 .../fabrikommander/commands/TpaHereCommand.kt  |  8 +++++++-
 .../fabrikommander/data/TeleportRequest.kt     | 18 +++++++++++++++++-
 6 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpAcceptCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpAcceptCommand.kt
index 4c6d6a6..bda4f5f 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpAcceptCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpAcceptCommand.kt
@@ -21,13 +21,15 @@ class TpAcceptCommand(val dispatcher: Dispatcher) {
 
     fun tpAcceptCommand(context: Context): Int {
         val source = EntityArgumentType.getPlayer(context, "source")
-        if (TeleportRequest.ACTIVE_REQUESTS[source.uuidAsString + context.source.player.uuidAsString] == null) {
+        val request = TeleportRequest.ACTIVE_REQUESTS[source.uuidAsString + context.source.player.uuidAsString]
+        if (request == null) {
             context.source.sendError(
                 red("No active teleport request from ") + source.displayName
             )
             return 0
         }
-        TeleportRequest.ACTIVE_REQUESTS[source.uuidAsString + context.source.player.uuidAsString]!!.apply()
+        request.apply()
+        request.notifySourceOfAccept()
         TeleportRequest.ACTIVE_REQUESTS.remove(source.uuidAsString + context.source.player.uuidAsString)
         return 1
     }
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpCancelCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpCancelCommand.kt
index 4e26eef..6ec9be5 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpCancelCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpCancelCommand.kt
@@ -27,6 +27,7 @@ class TpCancelCommand(val dispatcher: Dispatcher) {
             )
             return 0
         }
+        TeleportRequest.ACTIVE_REQUESTS[context.source.player.uuidAsString + target.uuidAsString]!!.notifyTargetOfCancel()
         TeleportRequest.ACTIVE_REQUESTS.remove(context.source.player.uuidAsString + target.uuidAsString)
         context.source.sendFeedback(aqua(
             "Teleport request to "
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpDenyCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpDenyCommand.kt
index 90c6729..6a0d07b 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpDenyCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpDenyCommand.kt
@@ -27,6 +27,7 @@ class TpDenyCommand(val dispatcher: Dispatcher) {
             )
             return 0
         }
+        TeleportRequest.ACTIVE_REQUESTS[source.uuidAsString + context.source.player.uuidAsString]!!.notifySourceOfDeny()
         TeleportRequest.ACTIVE_REQUESTS.remove(source.uuidAsString + context.source.player.uuidAsString)
         context.source.sendFeedback(
             aqua("Teleport request from ") + source.displayName + aqua(" was denied"),
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
index 7bf5720..3243ee7 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
@@ -3,6 +3,8 @@ package me.gserv.fabrikommander.commands
 import me.gserv.fabrikommander.data.TeleportRequest
 import me.gserv.fabrikommander.utils.Context
 import me.gserv.fabrikommander.utils.Dispatcher
+import me.gserv.fabrikommander.utils.aqua
+import me.gserv.fabrikommander.utils.plus
 import net.minecraft.command.argument.EntityArgumentType
 import net.minecraft.server.command.CommandManager.argument
 import net.minecraft.server.command.CommandManager.literal
@@ -20,7 +22,11 @@ class TpaCommand(val dispatcher: Dispatcher) {
         val target = EntityArgumentType.getPlayer(context, "target")
         val source = context.source.player
         val request = TeleportRequest(source = source, target = target, inverted = false)
-        request.notifyTarget()
+        request.notifyTargetOfRequest()
+        context.source.sendFeedback(
+            aqua("Teleport request sent to ") + target.displayName,
+            true
+        )
         return 1
     }
 }
diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
index bb31146..1bc4f43 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
@@ -3,6 +3,8 @@ package me.gserv.fabrikommander.commands
 import me.gserv.fabrikommander.data.TeleportRequest
 import me.gserv.fabrikommander.utils.Context
 import me.gserv.fabrikommander.utils.Dispatcher
+import me.gserv.fabrikommander.utils.aqua
+import me.gserv.fabrikommander.utils.plus
 import net.minecraft.command.argument.EntityArgumentType
 import net.minecraft.server.command.CommandManager.argument
 import net.minecraft.server.command.CommandManager.literal
@@ -20,7 +22,11 @@ class TpaHereCommand(val dispatcher: Dispatcher) {
         val target = EntityArgumentType.getPlayer(context, "target")
         val source = context.source.player
         val request = TeleportRequest(source = source, target = target, inverted = true)
-        request.notifyTarget()
+        request.notifyTargetOfRequest()
+        context.source.sendFeedback(
+            aqua("Teleport request sent to ") + target.displayName,
+            true
+        )
         return 1
     }
 }
diff --git a/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt b/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt
index fd82ecb..fc0bfc6 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt
@@ -35,7 +35,18 @@ class TeleportRequest(
         source.teleport(target.serverWorld, target.x, target.y, target.z, target.yaw, target.pitch)
     }
 
-    fun notifyTarget() {
+    fun notifySourceOfAccept() {
+        val message =
+            reset("") + target.displayName + aqua(" has accepted your teleport request")
+        source.sendSystemMessage(message, Util.NIL_UUID)
+    }
+
+    fun notifySourceOfDeny() {
+        val message = reset("") + target.displayName + aqua(" has denied your teleport request")
+        source.sendSystemMessage(message, Util.NIL_UUID)
+    }
+
+    fun notifyTargetOfRequest() {
         // Message will be configurable later
         val message =
             reset("") + source.displayName as MutableText + yellow( // reset("") used to make the vanilla click event for player names not apply to the whole message
@@ -74,4 +85,9 @@ class TeleportRequest(
 
         target.sendSystemMessage(message, Util.NIL_UUID)
     }
+
+    fun notifyTargetOfCancel() {
+        val message = reset("") + source.displayName + aqua(" has cancelled their teleport request.")
+        target.sendSystemMessage(message, Util.NIL_UUID)
+    }
 }

From 3195fcca76d5a52f262a6142d7c79964dbefb18a Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Fri, 4 Dec 2020 12:49:59 +0200
Subject: [PATCH 08/19] Updated things

---
 .DS_Store                                | Bin 0 -> 8196 bytes
 gradle.properties                        |   6 +--
 gradle/wrapper/gradle-wrapper.jar        | Bin 58694 -> 58910 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |  53 ++++++++++++++---------
 gradlew.bat                              |  22 +++++++++-
 6 files changed, 58 insertions(+), 25 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ac366a124a66330ab9b9631e6cb098e00bf57dc6
GIT binary patch
literal 8196
zcmeHM%Sr<=6uoik1AHK^x(v7%{ew{}x_2WYsBOg-S}SUo!u*a)!4D9>z@1xH{(wK=
zxk(&z+evXHiZ_s)G56k_(=&BqMj|p>!}bPIorvbp8JFiVR5XrrA8S)##sUrMsdv7y
z-x~BU$1-(79Z(0<0d+tfPzQdC1K6{<%_a7IAJtJEPzU~{1N?lj=!|*5!lQe1U~oqO
zU=7o*;d+@bfHq(ru<(con(?JTUuwb;!}xN{+mM$BEIj&hGU4!H0<#Gx6yw;jzIEwj
za*sNy1M0xI0~S*?TBCF7(v3L3XSXkLtUqWpn!Q02bNs7z^l<;QDdX*l@yky1ZeZ~l
zr8N7=OC1_gQ?Qe{8_!5+7+I%3s8lkNCG_}*j?cKFQ)*L>&SE`TYihOBQ)W!m6J<@%
zQ)b0_vW|O&G7W#a&~iqnu@<7^cW8;C2^}J%QbUvx^OIQz0T`ONFI{-i7W|9byE2;O
zFY6QcBw`T!E04@SgKuT&k5E8wOQZ3G2C+s$g~$;){AQCu#gHz9f`k476og2EyNp(P
zAEJWqu)v~N^%{&V!Dn9gz9LCJSC{ydVO7DGx%<qVRgFKrMQ6+d79O237<B)KAKKJ`
zzvw{bMc4WKzmtCd{}(@+YE}o-fp0osYK{HI7LwhrUQxumyhT4j=f-)3M^}PD{2_p!
d%YPW++9H)}@_>a$%%JIu0B3^^>cEdW@B#VU>G1#n

literal 0
HcmV?d00001

diff --git a/gradle.properties b/gradle.properties
index af76645..6d080e7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,11 +4,11 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# Check these on https://modmuss50.me/fabric.html
 	minecraft_version=1.16.4
-	yarn_mappings=1.16.4+build.6
-	loader_version=0.10.6+build.214
+	yarn_mappings=1.16.4+build.7
+	loader_version=0.10.8
 
 	#Fabric api
-	fabric_version=0.25.1+build.416-1.16
+	fabric_version=0.27.1+1.16
 
 	loom_version=0.5-SNAPSHOT
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 490fda8577df6c95960ba7077c43220e5bb2c0d9..62d4c053550b91381bbd28b1afc82d634bf73a8a 100644
GIT binary patch
delta 6447
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
Xd0iPaGX_wOF#=p0c#ocs{}cZodb%%W

delta 6107
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
F{|nTN-B$nr

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 186b715..be52383 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index cccdd3d..fbd7c51 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index f955316..5093609 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

From f46383be3dcf5c65ec638383ffbcd54091219c78 Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Fri, 4 Dec 2020 13:03:23 +0200
Subject: [PATCH 09/19] long overdue tbh

---
 .../kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt b/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt
index fc0bfc6..80b868d 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/data/TeleportRequest.kt
@@ -51,11 +51,8 @@ class TeleportRequest(
         val message =
             reset("") + source.displayName as MutableText + yellow( // reset("") used to make the vanilla click event for player names not apply to the whole message
                 " has requested " + when (inverted) {
-                    true -> "you"
-                    false -> "to"
-                } + " teleport to " + when (inverted) { // Will change to one when later, for now it's two
-                    true -> "them"
-                    false -> "you"
+                    true -> "you teleport to them"
+                    false -> "to teleport to you"
                 }
             ) + reset(". [") + click(
                 hover(

From fe59f288e51be33036a004940d3341c2d397a636 Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Sat, 12 Dec 2020 14:29:13 +0200
Subject: [PATCH 10/19] update FAPI

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 1e7fbee..5c6aaf8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.10.8
 
 	#Fabric api
-	fabric_version=0.27.1+1.16
+	fabric_version=0.28.0+1.16
 
 	loom_version=0.5-SNAPSHOT
 

From 34af585f13fbd207979eda19133ae6e54407eb0b Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Sat, 12 Dec 2020 17:36:14 +0200
Subject: [PATCH 11/19] Update FAPI

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 5c6aaf8..8314c60 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.10.8
 
 	#Fabric api
-	fabric_version=0.28.0+1.16
+	fabric_version=0.28.1+1.16
 
 	loom_version=0.5-SNAPSHOT
 

From 6b1aaba79d82686ed767bc5f41fab29daef7d147 Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Sun, 13 Dec 2020 11:23:18 +0200
Subject: [PATCH 12/19] updated things

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 58910 -> 59203 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 +-
 gradlew.bat                              |  21 +++------------------
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c053550b91381bbd28b1afc82d634bf73a8a..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644
GIT binary patch
delta 6656
zcmY+Ibx_pN*Z*PZ4(U#j1qtbvrOTyO8fghZ8kYJfEe%U|$dV!@ASKczEZq$fg48M@
z;LnHO_j#Uq?%bL4dY^md%$$4Y+&@nKC|1uHR&59YNhubGh72|a#ylPdh9V+akp|I;
zPk^W-a00GrFMkz_NSADdv2G2-i6rb=cB_@WnG(**4ZO$=96R=t|NZ@|0_z&q3GwO^
ziUFcuj$a9QaZ3j?xt`5#q`sT-ufrtBP0nt3IA&dr*+VCsBzBVW?vZ6eZr0oD%t33z
zm~-5IVsjy(F>;S~Pm@bxX85>Z*@(QL6i3JQc?1ryQFcC@X<g1opq2_}qf2n}bDuZ!
zWKPTwxVBuNP19Vh!S06D1kwi8IR?%Q_tS6CMlcH1GHnzzTF6L#bC>^2^mZWhFv|v?
z49>l|nA&XNQ6#OvccUTyBMB*WO#NA;FW5|eE_K6dtVYP2G?uUZ09!`Iq1IF2gA(aS
zLu@G^cQJmh=x?-YsYa@E6QnE5+1@ds&0f#OQRDl^GnIT_m84G5<dL|9;ap-%@DK)Z
zJXsEXvC4R9p`vBWj#UC!X4t9*FN2~aT(@1kpVpb4hs(&XgSwrc&@$a1G{BRj>XY%W
z;Ck6bk^Oeu*Ma-XmxI5GjqzWNbJMsQF4)WfMZEA{oxW0E32e)*JfG}3otPishIQBw
zkBe6N#4pKPN>q1<c_S*OgJu!sX3Z+i&!nPIcOY>R6G1@5&(u#5yPEToMBB6_oEK|q
z@(i5j!?;NNCv~=HvW%zF&1yWBq(nJa_#``G&SRmQvE|jePUPs{J!$TacM|e}Fsceb
zx+76|mDp6@w>)^DIl{8?)6XYNRU|2plG8Jy&7(^9SdOWNKKJK&>0!z6XiN4J*Jkao
z=E1y5x-XDC==Ub+8fLb#OW&{2ww{h^xlJFYAMOUd)}Xg@j?ak{7Kno6?9S~F?|6Df
zHo|ijXX~`Sp;Vf!nR;m%vUhq>zvlRXsL0u*Tt?F#yR}3tF0#of{(UjitqST|!{aBA
zicWh+URU}Jnc*sg9iMkf0pggpd?3TI*C-q<w(&M(m~}<+ea%u!x4kn@vQlH&LiI*R
zB7X4OuQk^>$2QOdCC7rV+CHBmjS3O%a3VeZ$ZSs5ubJuJp%e%$LHgrj0niYjX;4kt
z&2~j%@q3MO)-QGCA{>o%eZu){ou^MgC6~Z8Y=tc!qF=|TOlG3wJXbaLYr-;$Ch=2J
z_UcE59Xzq&h0LsjLrcZrQSa}#=<pCCwP+K`qAyWcDPE8l5gLuQQOCvX;roV=GVrSE
zRN);#vB=RiA;a;S-a3{ts<IR~#XeBK(^k2SU^wSX*pR6ItHBeZh6`9>0~Lk|4?e4M
z6d;v->NCC1oMti)RRc`Ys0?JXQjsZ@VdCy%Z)TptCrI>0Tte$pR!@yJesoU2dtyuW
z7iFsE8)CkbiJP+OP28;(%?!9WddQZcAid@R@`*e%3W65$g9ee`zvwb(VPO+uVBq6p
z{QDR%CR(2z@?&9Obm3xPi2lzvfip`7q`_7UDD|lRS}4=bsl3xQIOi0@GSvMuDQX}*
z4B^(DI<${qUhcLqO`itJU;e<%%iS+R3I^_xIV1O%sp*x~;-dn`<aYhWZu1&;ElKY}
zZm_NJ1y%e}JjMBfENCOnH*9mb%EUJ6T{;w?3xbxNE?0r$=$2S(JXNNaff+pj)0X3>
zt$8>RnSUh#rU3{-47067W^WNwTdq-t$-U>Hj%<yt<n{U-FV<(AG&gDIp@t66wM-#N
zJ0?<X`&{ENL@S2=a5R+rxyBKhousp3mE<6*BMfnp%7NjFkWa)L3fT`1HBv5%ZfmOw
zhfZB1(`R?=E{3p6h;?}T;`D(_q#Ku3P-Ts<H#|7m=*&#2oY&#Ro7~>r!GD!gLa;kV
zW5g6pCqV+!q8L<UGl1?nMLH9G$%I9J5pf%SH`n0VUkU3HRVup}<-k>g<GGq)5g+Yh
z(D%0Fi%@DB?*x0Zd<NwfgyV{8`bVpQShO;~J|KWnPzdo^lb#dD?*K6EooR1<VJ_v<
zIDNbrd-Z5*%cthuAR2mSEPE16Kl1(GUID!8pTq5|-JJ!w8cUSAz)I_XJ9(9qPII5A
z{m8ntai8GtO_h-1);fteB7SYUuxchvIWXzRs-%D3CKzg49@qap!-y_GAiFu7J2<V+
zI9$85dJyuc!h2k|X8>rI49(}fIc5K_`FLV4_E#XZ6{<>w8wzc%V9k!!Byg5-0W<bB
zR4jcLpMe)Gr+Qyft>Y+J?1*z%9~Aj4WQr1Jsn2(G!U8fFpi(wsy@JLg^d+IB0kl89
z0@Ssqf!L9JjYKK$J=978+NO*5^C)GPH2a%4hm$HROjM|N3g9ch9kDLh*nlwqy{mVM
z`P(l#>3NnK%#O8tSb(VmZrG+`dRD#=Cc1P%(y5<uj@qeNQCeA+H|Gn!g_|!%1V&w&
zuh#8(%DbZdv0kum$}C@EvW671;^A-6ZeF^cq90@k<+emVi}AFjw0JMveLbO*9WV0O
z&|{@C`c`onN9UkF9-_#}<r?8uJJmMfj{j(TBRk{Sx^)QATI}<bZ@pbg#5I&#ETmpi
zdutUe8}E>S?*Hj5E{vg&Eiw!YV>S#7_WRDVoFxT5m=gFi4)}y5V%KT8!xbsH_rmR&
zsmM?%J}K$1l8d?2+m(}2c}-G`x>CY%Y&QBJRC$sKM}zN<9{IlF@yJEG<^0={$+`Hc
zDodJ)gCADJ_bD#am(c2ojXKb|j+ENJ#58PAA&pZXufrFzBwnuuo+khfMgd!DMlU#v
z9|JelQO~E2;d^w!RZJbt%IANIudpKSP)cssoWhq)>({nvcfCr0=9=FAIMuZm8Eo=}
z|DND}8_PB5HqG(QwDvaM@orYBZ9kCkHV*<E7fD~^kv%Rt4%{0-C)!*WD4&mmZ)2k@
z-vh9{wcc~riJLaZRf=zb|DG1QfaO{cxPCox1C=uT`?QobU{6i7M5tnvWwDprp6hO!
z9Olm3CW}@PFjzRUj)1AJdn)o8&6l`GL^Vw`8_u3=Yfczem_N=JgXn+gw#@t%tK48L
zs-<kelU-VD@{pmRdxYAu=uDIBXxH>rxKTy>q7n~0emErUwLbhq;VN<2nKT&*a2Ajz
z;lKBzU2i8KLV`d)Y&ae)!HcGk$dO}Or%8KF@kE@jU1h@zwpw{6p4ME|uC$Za-ERR2
ztQvL&uOZLe(k{w_+J^ng+l}~N8MP>F1Z$fLu}D-WWaeu#XduP@#8JpmH(X>rIL)k3
zyXN<rev&d&<2WhaHMotlzr4K)q{=z;9yuB}>yTIB1(IH%S&pQ{rWaTVfB$~-;RnlY
z^(y7mR>@=brI>!TrA)BQsQ={b*6$=1Eqbuu6IdhJ&$YD$08AwtNr9*J?%-WT<;O1<
zPl1<@yeqfZ>@s4azqTf<=I4(kU^+^Qkstm%WM-0_VLm({jFc8`5Df2Q1Y9zMZu0^!
zsO_yh2Sz9K>Jq6fkYbBZocEJ6C!SdEzYDki<UOQeTxqpjlE|pdf{rBSqZixK7JCQ3
za};>EtNJs{?!tA#e|oiN+VaaAobwKef_kUup&4scD?1+}Q8)DaekkMYn-FOS{J%NY
za^mmJ^n`t*1p@hF*gl#L+5wr40*(ub4J#L|@oCl~@|4UvCjHBYDQ<!vXtmSW&BzM&
zXCI8YO-Gl|ywfX4W|TNg|9V$g!tLC2nAlHTp*X=wVa=dll|;=;C!FFd`g5-mY#xif
zCrc|%X+s(7QZF6mu~fSmKun~s(X%MyENK#tU+^qGE_(Wr)GBG;=``T~g*~piR>v&S
zhyGMAkRO^tF_dyi&XM)4mQ;k>kj?Rg<j^$zwJ$9puUmM8UTsnl8o98aL@#eUk2T@Z
zqrD)t_0=dw*ucUqtb<o3xt;=7iFLqRgUUI5+ac`qMuWQ|kuL1{tAxL;i&U#0PcS3M
zz)XghN!?Liqk700FA&h+RC8`bO%6eLm?;=pd1*#hD4`dB*@?<Zh=@~@+ywEwqdE!q
zvgJyQHWiY$0fC@DG;IIOj`<tUPDWmHNSP9Ub5<phX&5{ZKNNnzZka#ulAcr8(Pe1#
z?F$huuXLj!;t!DOL%CownzwD5sHR`0d9Bp3gf-l7^DCB=I2quKZskc8$|SoP!V#2_
z`*g51(;1U&!%(|9{%bDJEKTC`ji%DwO-jZY?C@uqG`?Gp$$3WJI(Y=^5wIvSKG~%3
z@HVu=CGDCWd$!}~CX)4b(^Di1y6h66Cz_v>Ro@-?==oD+ns*>bf@&fPXF|4U0&ib2
zo~1ZdmCPWf!W9#sGP@9X$;Rc`tjbz^&JY}z{}j9bl?;VC{x)TfQH$D^WowKL&4Zx@
zdSn+QV7H(e0xRfN6aBfH)Q=@weoD?dvu6^ZS)zqb>GwMmIuS8zJfaMUQx9>%k~w34
z3}_B2Jj~u=SnJ~vZPj*)UoDi_FtT=UAb#J^b4B%R6z3H%cj-1OCjU5F$ky>By1zsg
z>2A0ccp29(Y<;my|J_g-r{1I@+*O$>!R3`_sFNP4e}LD1e1mM&SA`;;TR0I`_hESV
zh4U*9ecK$0=lYk`{SR_cm$}iS*?yQR(}T-5ub?Wn^#RTe*^1~y<L@mmwlq4SqQ^?7
zf7HAsMJ5k`W|1diAqpM5uUc8t@?WSh02mK$-Z;uXYCkL7ljF*c65*4_UK4l|`X<eU
z^N$DksrBl1@$Dq}7uV|tt!bh+5FU%NxvXKkJEx$0R%>a%`!xWq-F*WH@%nnZTNREA
z3eUX2uM9b_w!Zo$nVTotEtzuL(88N)H~v_G=89|(@IFz~Wq6ME);z(!2^PkR2B&kE
zxR)xV8PE|Hszyjp#jNf=ZIQ7JR~4Ls#Vd@mPF(7R5VO$akUq8JM+sn>ZVg<OsE?Y=
zt3-TLl#CZV8ORMEf6*q;Tnxr)!*Y1IoRA-M0=p!LFW64(0m88U<oG$?P$^h+WmvS9
z<8z1rS2(}S*O&eI-K7~4v48J3xj`QiGpU_a%TBpGAh&v{?J_XalWixRT<}`uCL0Y^
zKB~jnq|v$FLLNbplmri)IYLkmF%#~TlvYmKBn(<H%e+PW4UN<fy-v)zu0$9B2*z9N
zy)F~H8nKt#UG6>(lJZ)5qjqdw(*7tuwjY#0tx+|!sTz9yV~%HOdrb#!5w9>*0LrCS
z%wF$Yc6~hqVQZzoC^D<(-h0aOtk}kn<<*x<A9mKbP59xJ&kBtE?yc}h?x49=29=z5
z7U|zFE0ulr4;2`B6lrT?x-kUP7ZGRtFHk!A!-sdf?I?Ik<PlR?wDIbv!Z*<2aw=!Q
zhp0EM%B4Q)?vQ#>F61HQr<5}efY{zXXA+PaJG7vT&{Oz(@Uu!V#Fp9%Ht!~@;6AcD
z$lvlPu&yd(YnAHfpN51*<LyqPo5!UzBh2tI#n2^qu<jx|_m5<z4nj-b!Mswq8*jU5
zY#>)JN0aYw9gGk{NE7!O<M2UZbF4L>qu4rBp}F30669;{zcH-a7w9KSpDQPIE_f9T
zit<e72SXx52%a0m4sGH(B<|=w6Y(ybW4-qB1uqEWI&~veyng0KkrFJ}KX^W^s?U3(
zs2i~8*TWIIbmEyPwvm}db!=_(gmmKD@xJOY(~YawWggKL<fbxDMw@}=8IlRmRv$>?
zJSjTKWbe{f{9BmSDAFO1(K0oqB4578tU<q-Ne=5=n^YUvA(1)FPw|uIz68u3R{NH`
zK^uEMleb&(=C`d@mZz8w`l4ZDh7>0(oRBE^28X>xDA!1C&VJEiYak4_ZTM*7M`hv_
zw3;2ndv3X$zT!wa7TrId{gNE`Vxf}j5wsyX+;Kn<^$EJT`NzznjyYx=pYMkZjizEU
zb;Gg8Pl_pqxg)9P)C)Hxh_-mQ;u-I_Ol>d^>q08zFF!>Z3j1-HmuME_TGZ*Ev;O0O
z%e(edJfV<6t3&FKwtInnj9EeQhq9;o5oLJoiKwWF5bP2~Feh#P4oN()JT0pdq!9x*
ze3D-1%AV#{G=Op$6q?*Z>s{qFn}cl@9#m@DK_Bs@fdwSN`Qe18_WnveRB583mdMG-
z?<3pJC!YljOnO8=M=|Cg)jw;4>4sna`uI>Kh&F20jNOk9HX&}Ry|mHJ+?emHnbYLJ
zwfkx@slh31+3nq-9G5FVDQBHWWY}&hJ-fpDf!lQdmw8dlTt#=)20X74S>c&kR(?PT
zBg)Y%)q&|hW1K;`nJPAGF*c3{3`FvrhD9=Ld{3M*K&5$jRhXNsq$0CLXINax1AmXX
ziF39vkNtcK6i^+G^AEY!WalGazOQ$_#tx?BQ{YY$&V&42sICVl8@AI6yv;sGnT;@f
zL=}rZcJqNwrEEA=GDdEe8Z=f9>^?($oS8xGdFf1eUWTYtZF<3tu2V%noPBnd=thZ+
zO&xoc?jvXG7Xt!RTw#5VN50UjgqSntw9Y35*~pxz=8OzkXg{@S2J%+{l3Q>B_qbnl
z20Deb7JM&ZSp`%X>xWpb>FF8q7Nq&4#a1}A-(-!aMDmVbz05D!NpUzVe{~72h%cOh
zwQFNai2a$K<lb>|hFgDk(oPF_tuf{BV!=m0*xqSzGAJ(~XUh8rk#{YOg0ReK>4eJl
z;-~u5v$}DM)#vER>F)-}y(X6rGkp<{AkiPM7rFgAV^)FUX8XmCKKaWlS4;MSEagj$
z#pvH`vLX1q{&eOm>htnk4hmv=_)ao!MCp}9ql5yfre&Py!~hBAGNBa}PH&J8K=~<%
z&?!J-QaH|0bq_uo6rt*r-M>d7jm1cbW^T>s)S?L{<LgYs4$0}?XO8K~#{O6m2!CM0
z#Fo>n8v`^?VIPA+qi^6e@cM|5boqEO!p1e|_{7U3Yl6K?0xMN1bbjf0@$TE-T))w>
zFe?E?g$PUT-)AJ(PS^By^D^Ed!K5iv$*_eW<?$gk^ph*&Zkhdaw3i_v<GhJk|I!}L
zHQc`<CTEX!k2X24SiMt&T15AG1<E<Xmk*5-0d$t5VhMvaiUj$*^^Hdbo{kaE2oCn8
z{P^BVPxp~(2kY{iRU!^zTe}Wo#z|<Ai`g_yW$S+T2Im{GIGmFiK2shuu14CmOr}6Y
z=bVpR=^=4i>~VA(I3~UMy*ZcgVu0$XZC*_0PgDmUL)qTCn927LD~p$yXR_GCJ&iQ;
z4*`%l-dC5pALH!y*nmhdHRh02QjW1vZL4ySucz*w3f|#`=u@@YvMV1?i!&DIa2+S<
z8z!gvN3FV4I;%fl;ruFeV{jKjI~?GlgkmG<!$YWAS;7KYqqu1ud246Lh<veb9iZ`Y
zQshertU5W-2yEW32YKEq9B9NDHt!WC3}CB|^}1WeMrQ0g_ZKjQ=}R~Wbh!pQNl&h9
zA3+TUWpuB>BuJ<7vY|l3xMOc?S@Q#C(zo*m&JLrjT2rU9PYOniB8O~yO5<1CCcQz#
z17B2m1Z{R!Y)UO#CU-Y&mOlv4*Gz%rC_YkRcO)jTUEWHDvv!GWmEihE>OKPx1J?Av
z8J{-#7NsT>>R#*7**=QL)1@IR77G9JGZZiVt!=jD+i(oRV;I`JkiTSZkAXuHm-VG1
z+2-LD!!2dNEk@1@Rp|C$MD9mH^)H*G*wI(i*Rc6Vvdik+BDycYQ*=0JA3dxxha|Zg
zCIW1Ye-DdpMGTEwbA^6hVC<(@0FL4dkDOYcxxC5c%MJQ^)zpA%>>~Q|Y=@)XW!px;
z_Fx+xOo7>sz4QX|Ef~igE+uFnzFWP<-#||*V0`0p7E*+n5+awuOWmvR{-M*chIXgo
zYiZvQMond#{F8+4Zh_;>MsaZUuhp=onH@P!7W>sq|CWv|u}Wg0vo&f4UtmLzhCwwu
zJaR=IO;sQxS}h(K>9VZjnED+>9rGgB3ks+AwTy_EYH{oc)mo`451n&YH%A1@WC{;1
z<S^oOzaAWP#P5AQ+yVE{zDZxsAshHBu`Sn^2)=$8V4u{G7s4nfAql8C-&rsbhL619
zT{pccX^Z(hBgxhK7sr@H2<zfTupxqNt`Ymc=JN=v85hF;oxmYxW{jEs&)DGKi0;4F
z`?t{)h-7k3gy1|mB50NYRLPDgViQ4(%z{DL9EfCgF$Dh{7*xdjFNhl9I;RY>=fB6n
zIYp46_&u`COM&Di?$P}pPAlAF*Ss<)2Xc?=@_2|EMO?(A1u!Vc=-%bDAP#zDiYQvJ
z0}+}3GaLxsMIlh6?f=iRs0K=RyvMOcWl*xqe-IBLv?K{S^hP)@K|$I+h_)pdD9r~!
zxhw<f^+7<FEkIEJe}*3M!jB8_V;Ky>2u66+F(E`&6hY}B_qe>wil|#*0R0B;<@E?L
zVrhXKfwRg0l8r>LuNs1QqW&39ME0sOXe8zycivGVqUOjEWpU)h|9fwp@d(8=M-WxY
zeazSz6x5e`k821fgylLIbdqx~Kdh^Oj`Q!4v<MeLmQVBVlpLY7!2m)R{l`s%7~UjD
zl>c*Km)^Tr-qRxPHozdvvU^#xNsKVr6aw8={70&S4y*5xeoF@Q^y596*09`XF56-N
z1=Rm5?-An178o?$ix}y7gizQ9gEmGHF5AW+92DYaOcwEHnjAr~!vI>CK%h`E_tO8L
Yte!%o?r4GTrVtxD61Ym!|5fq-1K$0e!T<mO

delta 6475
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index be52383..4d9ca16 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c51..4f906e0 100755
--- a/gradlew
+++ b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 5093609..107acd3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

From 03fb55640da2be1d75d0b8bcf92681d84282ecaa Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:42:38 +0200
Subject: [PATCH 13/19] Update
 src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt

Co-authored-by: SpaceClouds42 <71787666+SpaceClouds42@users.noreply.github.com>
---
 .../kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
index 3243ee7..44b829f 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
@@ -5,6 +5,10 @@ import me.gserv.fabrikommander.utils.Context
 import me.gserv.fabrikommander.utils.Dispatcher
 import me.gserv.fabrikommander.utils.aqua
 import me.gserv.fabrikommander.utils.plus
+import me.gserv.fabrikommander.utils.red
+import me.gserv.fabrikommander.utils.hover
+import me.gserv.fabrikommander.utils.click
+import me.gserv.fabrikommander.utils.reset
 import net.minecraft.command.argument.EntityArgumentType
 import net.minecraft.server.command.CommandManager.argument
 import net.minecraft.server.command.CommandManager.literal

From f5b41d58b5dc511aa2b2550b33182fdf76ce09cd Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:42:46 +0200
Subject: [PATCH 14/19] Update
 src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt

Co-authored-by: SpaceClouds42 <71787666+SpaceClouds42@users.noreply.github.com>
---
 .../gserv/fabrikommander/commands/TpaCommand.kt   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
index 44b829f..ad65a47 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
@@ -28,7 +28,20 @@ class TpaCommand(val dispatcher: Dispatcher) {
         val request = TeleportRequest(source = source, target = target, inverted = false)
         request.notifyTargetOfRequest()
         context.source.sendFeedback(
-            aqua("Teleport request sent to ") + target.displayName,
+            aqua("Teleport request sent to ") + target.displayName + 
+            reset(" [") + hover(
+                click(
+                    red("Cancel"),
+                    ClickEvent(
+                        ClickEvent.Action.RUN_COMMAND,
+                        "/tpcancel " + target.entityName // There can be multiple active requests
+                    )
+                ),
+                HoverEvent(
+                    HoverEvent.Action.SHOW_TEXT,
+                    red("Click here to cancel the request.")
+                )
+            ) + reset("]"),
             true
         )
         return 1

From 0d7a47ac9a81e8ae7620b75d1585f00dbd905cc6 Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:44:22 +0200
Subject: [PATCH 15/19] Update
 src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt

Co-authored-by: SpaceClouds42 <71787666+SpaceClouds42@users.noreply.github.com>
---
 .../kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
index 1bc4f43..26ae846 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
@@ -5,6 +5,10 @@ import me.gserv.fabrikommander.utils.Context
 import me.gserv.fabrikommander.utils.Dispatcher
 import me.gserv.fabrikommander.utils.aqua
 import me.gserv.fabrikommander.utils.plus
+import me.gserv.fabrikommander.utils.red
+import me.gserv.fabrikommander.utils.hover
+import me.gserv.fabrikommander.utils.click
+import me.gserv.fabrikommander.utils.reset
 import net.minecraft.command.argument.EntityArgumentType
 import net.minecraft.server.command.CommandManager.argument
 import net.minecraft.server.command.CommandManager.literal

From 441fb0dee4913588ff9271e2782f426022727712 Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:44:31 +0200
Subject: [PATCH 16/19] Update
 src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt

Co-authored-by: SpaceClouds42 <71787666+SpaceClouds42@users.noreply.github.com>
---
 .../fabrikommander/commands/TpaHereCommand.kt     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
index 26ae846..22907d9 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
@@ -28,7 +28,20 @@ class TpaHereCommand(val dispatcher: Dispatcher) {
         val request = TeleportRequest(source = source, target = target, inverted = true)
         request.notifyTargetOfRequest()
         context.source.sendFeedback(
-            aqua("Teleport request sent to ") + target.displayName,
+            aqua("Teleport request sent to ") + target.displayName + 
+            reset(" [") + hover(
+                click(
+                    red("Cancel"),
+                    ClickEvent(
+                        ClickEvent.Action.RUN_COMMAND,
+                        "/tpcancel " + target.entityName // There can be multiple active requests
+                    )
+                ),
+                HoverEvent(
+                    HoverEvent.Action.SHOW_TEXT,
+                    red("Click here to cancel the request.")
+                )
+            ) + reset("]"),
             true
         )
         return 1

From 72f7a03071a69241b7b42afce8d096dcf86cea0d Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:51:23 +0200
Subject: [PATCH 17/19] Update
 src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt

Co-authored-by: SpaceClouds42 <71787666+SpaceClouds42@users.noreply.github.com>
---
 src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
index ad65a47..8aa5cc2 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaCommand.kt
@@ -11,6 +11,8 @@ import me.gserv.fabrikommander.utils.click
 import me.gserv.fabrikommander.utils.reset
 import net.minecraft.command.argument.EntityArgumentType
 import net.minecraft.server.command.CommandManager.argument
+import net.minecraft.text.ClickEvent
+import net.minecraft.text.HoverEvent
 import net.minecraft.server.command.CommandManager.literal
 
 class TpaCommand(val dispatcher: Dispatcher) {

From 243f450512b246deecc6e3a9e35d4d7e65868096 Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:51:31 +0200
Subject: [PATCH 18/19] Update
 src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt

Co-authored-by: SpaceClouds42 <71787666+SpaceClouds42@users.noreply.github.com>
---
 .../kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
index 22907d9..121a99c 100644
--- a/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
+++ b/src/main/kotlin/me/gserv/fabrikommander/commands/TpaHereCommand.kt
@@ -11,6 +11,8 @@ import me.gserv.fabrikommander.utils.click
 import me.gserv.fabrikommander.utils.reset
 import net.minecraft.command.argument.EntityArgumentType
 import net.minecraft.server.command.CommandManager.argument
+import net.minecraft.text.ClickEvent
+import net.minecraft.text.HoverEvent
 import net.minecraft.server.command.CommandManager.literal
 
 class TpaHereCommand(val dispatcher: Dispatcher) {

From 5d9cd14c5d8240074b45b36c7af18efe000610be Mon Sep 17 00:00:00 2001
From: YTG123 <54103478+YTG1234@users.noreply.github.com>
Date: Sun, 20 Dec 2020 08:59:28 +0200
Subject: [PATCH 19/19] update the fapi

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 8314c60..cb73de4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.10.8
 
 	#Fabric api
-	fabric_version=0.28.1+1.16
+	fabric_version=0.28.3+1.16
 
 	loom_version=0.5-SNAPSHOT