From dade5a801abb955e4a38c24fda9b217c51c0ce3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20Demirta=C5=9F?= Date: Tue, 27 Aug 2024 10:39:46 +0300 Subject: [PATCH 1/7] Update VelocityCommandManager.java --- .../incendo/cloud/velocity/VelocityCommandManager.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java index 6421df46..c6ecf116 100644 --- a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java +++ b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java @@ -30,6 +30,7 @@ import com.velocitypowered.api.event.player.ServerPreConnectEvent; import com.velocitypowered.api.plugin.PluginContainer; import com.velocitypowered.api.proxy.ProxyServer; +import java.util.logging.Level; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.apiguardian.api.API; @@ -170,11 +171,8 @@ public final boolean hasBrigadierManager() { private void registerDefaultExceptionHandlers() { this.registerDefaultExceptionHandlers( - triplet -> { - final CommandSource source = triplet.first().inject(CommandSource.class).orElseThrow(NullPointerException::new); - final String message = triplet.first().formatCaption(triplet.second(), triplet.third()); - source.sendMessage(Component.text(message, NamedTextColor.RED)); - }, + triplet -> this.senderMapper().reverse(triplet.first().sender()) + .sendMessage(Component.text(triplet.first().formatCaption(triplet.second(), triplet.third()), NamedTextColor.RED)), pair -> pair.second().printStackTrace() ); } From 40ccf03845b24d650818ba7fd1dc2075b36b2c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20Demirta=C5=9F?= Date: Tue, 27 Aug 2024 10:41:41 +0300 Subject: [PATCH 2/7] Update CloudburstCommandManager.java --- .../cloud/cloudburst/CloudburstCommandManager.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java b/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java index 803221fb..7f507f47 100644 --- a/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java +++ b/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java @@ -105,12 +105,8 @@ public final boolean isCommandRegistrationAllowed() { private void registerDefaultExceptionHandlers() { this.registerDefaultExceptionHandlers( - triplet -> { - final CommandSender commandSender = triplet.first().inject(CommandSender.class) - .orElseThrow(NullPointerException::new); - final String message = triplet.first().formatCaption(triplet.second(), triplet.third()); - commandSender.sendMessage(TextFormat.RED + message); - }, + triplet -> this.senderMapper().reverse(triplet.first().sender()) + .sendMessage(TextFormat.RED + triplet.first().formatCaption(triplet.second(), triplet.third())), pair -> this.owningPlugin().getLogger().error(pair.first(), pair.second()) ); } From dd5cff760ef168b0bef33dc0ce813098e9931d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20Demirta=C5=9F?= Date: Tue, 27 Aug 2024 10:47:12 +0300 Subject: [PATCH 3/7] simplify. --- .../cloud/cloudburst/CloudburstCommandManager.java | 7 +++++-- .../incendo/cloud/velocity/VelocityCommandManager.java | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java b/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java index 7f507f47..13f6273a 100644 --- a/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java +++ b/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java @@ -105,8 +105,11 @@ public final boolean isCommandRegistrationAllowed() { private void registerDefaultExceptionHandlers() { this.registerDefaultExceptionHandlers( - triplet -> this.senderMapper().reverse(triplet.first().sender()) - .sendMessage(TextFormat.RED + triplet.first().formatCaption(triplet.second(), triplet.third())), + triplet -> { + final CommandSender sender = this.senderMapper().reverse(triplet.first().sender()); + final String message = triplet.first().formatCaption(triplet.second(), triplet.third()); + sender.sendMessage(TextFormat.RED + message); + }, pair -> this.owningPlugin().getLogger().error(pair.first(), pair.second()) ); } diff --git a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java index c6ecf116..d7d96d97 100644 --- a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java +++ b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java @@ -32,6 +32,7 @@ import com.velocitypowered.api.proxy.ProxyServer; import java.util.logging.Level; import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; import org.apiguardian.api.API; import org.checkerframework.checker.nullness.qual.NonNull; @@ -171,8 +172,11 @@ public final boolean hasBrigadierManager() { private void registerDefaultExceptionHandlers() { this.registerDefaultExceptionHandlers( - triplet -> this.senderMapper().reverse(triplet.first().sender()) - .sendMessage(Component.text(triplet.first().formatCaption(triplet.second(), triplet.third()), NamedTextColor.RED)), + triplet -> { + final CommandSource sender = this.senderMapper().reverse(triplet.first().sender()); + final String message = triplet.first().formatCaption(triplet.second(), triplet.third()); + sender.sendMessage(Component.text(message, NamedTextColor.RED)); + }, pair -> pair.second().printStackTrace() ); } From 88b04e3804284be414eb1a4e0d2bbd371e6740ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20Demirta=C5=9F?= Date: Tue, 27 Aug 2024 10:47:30 +0300 Subject: [PATCH 4/7] simplify. --- .../incendo/cloud/cloudburst/CloudburstCommandManager.java | 4 ++-- .../org/incendo/cloud/velocity/VelocityCommandManager.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java b/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java index 13f6273a..d2a1d17d 100644 --- a/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java +++ b/cloud-cloudburst/src/main/java/org/incendo/cloud/cloudburst/CloudburstCommandManager.java @@ -106,9 +106,9 @@ public final boolean isCommandRegistrationAllowed() { private void registerDefaultExceptionHandlers() { this.registerDefaultExceptionHandlers( triplet -> { - final CommandSender sender = this.senderMapper().reverse(triplet.first().sender()); + final CommandSender commandSender = this.senderMapper().reverse(triplet.first().sender()); final String message = triplet.first().formatCaption(triplet.second(), triplet.third()); - sender.sendMessage(TextFormat.RED + message); + commandSender.sendMessage(TextFormat.RED + message); }, pair -> this.owningPlugin().getLogger().error(pair.first(), pair.second()) ); diff --git a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java index d7d96d97..1b9cfb7f 100644 --- a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java +++ b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java @@ -173,9 +173,9 @@ public final boolean hasBrigadierManager() { private void registerDefaultExceptionHandlers() { this.registerDefaultExceptionHandlers( triplet -> { - final CommandSource sender = this.senderMapper().reverse(triplet.first().sender()); + final CommandSource commandSender = this.senderMapper().reverse(triplet.first().sender()); final String message = triplet.first().formatCaption(triplet.second(), triplet.third()); - sender.sendMessage(Component.text(message, NamedTextColor.RED)); + commandSender.sendMessage(Component.text(message, NamedTextColor.RED)); }, pair -> pair.second().printStackTrace() ); From 746f4301cb490bb7493a8db426f6f3aa25833bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20Demirta=C5=9F?= Date: Tue, 27 Aug 2024 10:47:49 +0300 Subject: [PATCH 5/7] Update VelocityCommandManager.java --- .../org/incendo/cloud/velocity/VelocityCommandManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java index 1b9cfb7f..376749f4 100644 --- a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java +++ b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java @@ -173,9 +173,9 @@ public final boolean hasBrigadierManager() { private void registerDefaultExceptionHandlers() { this.registerDefaultExceptionHandlers( triplet -> { - final CommandSource commandSender = this.senderMapper().reverse(triplet.first().sender()); + final CommandSource source = this.senderMapper().reverse(triplet.first().sender()); final String message = triplet.first().formatCaption(triplet.second(), triplet.third()); - commandSender.sendMessage(Component.text(message, NamedTextColor.RED)); + source.sendMessage(Component.text(message, NamedTextColor.RED)); }, pair -> pair.second().printStackTrace() ); From 4632f8e02e32314091b9bc00af1048d22fb2af05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20Demirta=C5=9F?= Date: Tue, 27 Aug 2024 10:47:57 +0300 Subject: [PATCH 6/7] Update VelocityCommandManager.java --- .../java/org/incendo/cloud/velocity/VelocityCommandManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java index 376749f4..f3ab0db6 100644 --- a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java +++ b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java @@ -173,7 +173,7 @@ public final boolean hasBrigadierManager() { private void registerDefaultExceptionHandlers() { this.registerDefaultExceptionHandlers( triplet -> { - final CommandSource source = this.senderMapper().reverse(triplet.first().sender()); + final CommandSource source = this.senderMapper().reverse(triplet.first().sender()); final String message = triplet.first().formatCaption(triplet.second(), triplet.third()); source.sendMessage(Component.text(message, NamedTextColor.RED)); }, From b77af3907f54a10bf72f1c1e5fa2727817c1c023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20Demirta=C5=9F?= Date: Tue, 27 Aug 2024 10:50:57 +0300 Subject: [PATCH 7/7] Update VelocityCommandManager.java --- .../java/org/incendo/cloud/velocity/VelocityCommandManager.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java index f3ab0db6..a69c0c9e 100644 --- a/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java +++ b/cloud-velocity/src/main/java/org/incendo/cloud/velocity/VelocityCommandManager.java @@ -30,9 +30,7 @@ import com.velocitypowered.api.event.player.ServerPreConnectEvent; import com.velocitypowered.api.plugin.PluginContainer; import com.velocitypowered.api.proxy.ProxyServer; -import java.util.logging.Level; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; import org.apiguardian.api.API; import org.checkerframework.checker.nullness.qual.NonNull;