Merge pull request #213 from embeddedt/forge-1.7.10

Align 1.7.10 with Spark 1.9

1 files changed, 65 insertions, 0 deletions

diff --git a/spark-minestom/src/main/java/me/lucko/spark/minestom/MinestomCommandSender.java b/spark-minestom/src/main/java/me/lucko/spark/minestom/MinestomCommandSender.java
new file mode 100644
index 0000000..da46224
--- /dev/null
+++ b/spark-minestom/src/main/java/me/lucko/spark/minestom/MinestomCommandSender.java
@@ -0,0 +1,65 @@
+/*
+ * This file is part of spark.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.lucko.spark.minestom;
+
+import me.lucko.spark.common.command.sender.AbstractCommandSender;
+
+import net.kyori.adventure.text.Component;
+import net.minestom.server.command.CommandSender;
+import net.minestom.server.command.ConsoleSender;
+import net.minestom.server.entity.Player;
+
+import java.util.UUID;
+
+public class MinestomCommandSender extends AbstractCommandSender<CommandSender> {
+    public MinestomCommandSender(CommandSender delegate) {
+        super(delegate);
+    }
+
+    @Override
+    public String getName() {
+        if (this.delegate instanceof Player player) {
+            return player.getUsername();
+        } else if (this.delegate instanceof ConsoleSender) {
+            return "Console";
+         }else {
+            return "unknown:" + this.delegate.getClass().getSimpleName();
+        }
+    }
+
+    @Override
+    public UUID getUniqueId() {
+        if (super.delegate instanceof Player player) {
+            return player.getUuid();
+        }
+        return null;
+    }
+
+    @Override
+    public void sendMessage(Component message) {
+        this.delegate.sendMessage(message);
+    }
+
+    @Override
+    public boolean hasPermission(String permission) {
+        return this.delegate.hasPermission(permission);
+    }
+}