From 1d285db1aa5f64588069aa9c897c69558d26a186 Mon Sep 17 00:00:00 2001 From: chickeneer Date: Tue, 28 Jan 2025 19:01:41 -0600 Subject: [PATCH] Allow extension of module specific context classes I am uncertain whether this is an api feature we want to 'advertise', but I do not see a compelling reason we need to block extending the classes. --- .../java/co/aikar/commands/BukkitCommandCompletionContext.java | 2 +- .../java/co/aikar/commands/BukkitCommandExecutionContext.java | 2 +- .../src/main/java/co/aikar/commands/BukkitConditionContext.java | 2 +- .../java/co/aikar/commands/BungeeCommandCompletionContext.java | 2 +- .../java/co/aikar/commands/BungeeCommandExecutionContext.java | 2 +- .../src/main/java/co/aikar/commands/BungeeConditionContext.java | 2 +- .../main/java/co/aikar/commands/JDACommandExecutionContext.java | 2 +- jda5/src/main/java/co/aikar/commands/JDAConditionContext.java | 2 +- .../java/co/aikar/commands/SpongeCommandCompletionContext.java | 2 +- .../java/co/aikar/commands/SpongeCommandExecutionContext.java | 2 +- .../src/main/java/co/aikar/commands/SpongeConditionContext.java | 2 +- .../co/aikar/commands/VelocityCommandCompletionContext.java | 2 +- .../java/co/aikar/commands/VelocityCommandExecutionContext.java | 2 +- .../main/java/co/aikar/commands/VelocityConditionContext.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitCommandCompletionContext.java b/bukkit/src/main/java/co/aikar/commands/BukkitCommandCompletionContext.java index fdd9cb435..f4b4ff95c 100644 --- a/bukkit/src/main/java/co/aikar/commands/BukkitCommandCompletionContext.java +++ b/bukkit/src/main/java/co/aikar/commands/BukkitCommandCompletionContext.java @@ -27,7 +27,7 @@ import org.bukkit.entity.Player; public class BukkitCommandCompletionContext extends CommandCompletionContext { - BukkitCommandCompletionContext(RegisteredCommand command, BukkitCommandIssuer issuer, String input, String config, String[] args) { + protected BukkitCommandCompletionContext(RegisteredCommand command, BukkitCommandIssuer issuer, String input, String config, String[] args) { super(command, issuer, input, config, args); } diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitCommandExecutionContext.java b/bukkit/src/main/java/co/aikar/commands/BukkitCommandExecutionContext.java index 284bf34dc..7a20b48ce 100644 --- a/bukkit/src/main/java/co/aikar/commands/BukkitCommandExecutionContext.java +++ b/bukkit/src/main/java/co/aikar/commands/BukkitCommandExecutionContext.java @@ -30,7 +30,7 @@ import java.util.Map; public class BukkitCommandExecutionContext extends CommandExecutionContext { - BukkitCommandExecutionContext(RegisteredCommand cmd, CommandParameter param, BukkitCommandIssuer sender, List args, + protected BukkitCommandExecutionContext(RegisteredCommand cmd, CommandParameter param, BukkitCommandIssuer sender, List args, int index, Map passedArgs) { super(cmd, param, sender, args, index, passedArgs); } diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitConditionContext.java b/bukkit/src/main/java/co/aikar/commands/BukkitConditionContext.java index 377d20c35..50f2147bb 100644 --- a/bukkit/src/main/java/co/aikar/commands/BukkitConditionContext.java +++ b/bukkit/src/main/java/co/aikar/commands/BukkitConditionContext.java @@ -27,7 +27,7 @@ import org.bukkit.entity.Player; public class BukkitConditionContext extends ConditionContext { - BukkitConditionContext(BukkitCommandIssuer issuer, String config) { + protected BukkitConditionContext(BukkitCommandIssuer issuer, String config) { super(issuer, config); } diff --git a/bungee/src/main/java/co/aikar/commands/BungeeCommandCompletionContext.java b/bungee/src/main/java/co/aikar/commands/BungeeCommandCompletionContext.java index d3db7ea3a..eae3d31f7 100644 --- a/bungee/src/main/java/co/aikar/commands/BungeeCommandCompletionContext.java +++ b/bungee/src/main/java/co/aikar/commands/BungeeCommandCompletionContext.java @@ -28,7 +28,7 @@ public class BungeeCommandCompletionContext extends CommandCompletionContext { - BungeeCommandCompletionContext(RegisteredCommand command, BungeeCommandIssuer issuer, String input, String config, String[] args) { + protected BungeeCommandCompletionContext(RegisteredCommand command, BungeeCommandIssuer issuer, String input, String config, String[] args) { super(command, issuer, input, config, args); } diff --git a/bungee/src/main/java/co/aikar/commands/BungeeCommandExecutionContext.java b/bungee/src/main/java/co/aikar/commands/BungeeCommandExecutionContext.java index 698935da4..c4b2e49e9 100644 --- a/bungee/src/main/java/co/aikar/commands/BungeeCommandExecutionContext.java +++ b/bungee/src/main/java/co/aikar/commands/BungeeCommandExecutionContext.java @@ -31,7 +31,7 @@ public class BungeeCommandExecutionContext extends CommandExecutionContext { - BungeeCommandExecutionContext(RegisteredCommand cmd, CommandParameter param, BungeeCommandIssuer sender, List args, int index, Map passedArgs) { + protected BungeeCommandExecutionContext(RegisteredCommand cmd, CommandParameter param, BungeeCommandIssuer sender, List args, int index, Map passedArgs) { super(cmd, param, sender, args, index, passedArgs); } diff --git a/bungee/src/main/java/co/aikar/commands/BungeeConditionContext.java b/bungee/src/main/java/co/aikar/commands/BungeeConditionContext.java index a0e5fd50d..102318762 100644 --- a/bungee/src/main/java/co/aikar/commands/BungeeConditionContext.java +++ b/bungee/src/main/java/co/aikar/commands/BungeeConditionContext.java @@ -4,7 +4,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer; public class BungeeConditionContext extends ConditionContext { - BungeeConditionContext(BungeeCommandIssuer issuer, String config) { + protected BungeeConditionContext(BungeeCommandIssuer issuer, String config) { super(issuer, config); } diff --git a/jda5/src/main/java/co/aikar/commands/JDACommandExecutionContext.java b/jda5/src/main/java/co/aikar/commands/JDACommandExecutionContext.java index e9d4612b3..9a1e3002a 100644 --- a/jda5/src/main/java/co/aikar/commands/JDACommandExecutionContext.java +++ b/jda5/src/main/java/co/aikar/commands/JDACommandExecutionContext.java @@ -4,7 +4,7 @@ import java.util.Map; public class JDACommandExecutionContext extends CommandExecutionContext { - JDACommandExecutionContext(RegisteredCommand cmd, CommandParameter param, JDACommandEvent sender, List args, int index, Map passedArgs) { + protected JDACommandExecutionContext(RegisteredCommand cmd, CommandParameter param, JDACommandEvent sender, List args, int index, Map passedArgs) { super(cmd, param, sender, args, index, passedArgs); } } diff --git a/jda5/src/main/java/co/aikar/commands/JDAConditionContext.java b/jda5/src/main/java/co/aikar/commands/JDAConditionContext.java index adf3f003c..dcfb89d83 100644 --- a/jda5/src/main/java/co/aikar/commands/JDAConditionContext.java +++ b/jda5/src/main/java/co/aikar/commands/JDAConditionContext.java @@ -1,7 +1,7 @@ package co.aikar.commands; public class JDAConditionContext extends ConditionContext { - JDAConditionContext(JDACommandEvent issuer, String config) { + protected JDAConditionContext(JDACommandEvent issuer, String config) { super(issuer, config); } } diff --git a/sponge10/src/main/java/co/aikar/commands/SpongeCommandCompletionContext.java b/sponge10/src/main/java/co/aikar/commands/SpongeCommandCompletionContext.java index d728b053c..91394acf3 100644 --- a/sponge10/src/main/java/co/aikar/commands/SpongeCommandCompletionContext.java +++ b/sponge10/src/main/java/co/aikar/commands/SpongeCommandCompletionContext.java @@ -28,7 +28,7 @@ @SuppressWarnings("WeakerAccess") public class SpongeCommandCompletionContext extends CommandCompletionContext { - SpongeCommandCompletionContext(final RegisteredCommand command, final SpongeCommandIssuer issuer, final String input, final String config, final String[] args) { + protected SpongeCommandCompletionContext(final RegisteredCommand command, final SpongeCommandIssuer issuer, final String input, final String config, final String[] args) { super(command, issuer, input, config, args); } diff --git a/sponge10/src/main/java/co/aikar/commands/SpongeCommandExecutionContext.java b/sponge10/src/main/java/co/aikar/commands/SpongeCommandExecutionContext.java index b3e97f1ca..0c2406ec5 100644 --- a/sponge10/src/main/java/co/aikar/commands/SpongeCommandExecutionContext.java +++ b/sponge10/src/main/java/co/aikar/commands/SpongeCommandExecutionContext.java @@ -30,7 +30,7 @@ public class SpongeCommandExecutionContext extends CommandExecutionContext { - SpongeCommandExecutionContext(RegisteredCommand cmd, CommandParameter param, SpongeCommandIssuer sender, List args, + protected SpongeCommandExecutionContext(RegisteredCommand cmd, CommandParameter param, SpongeCommandIssuer sender, List args, int index, Map passedArgs) { super(cmd, param, sender, args, index, passedArgs); } diff --git a/sponge10/src/main/java/co/aikar/commands/SpongeConditionContext.java b/sponge10/src/main/java/co/aikar/commands/SpongeConditionContext.java index 7548625a6..fba09f538 100644 --- a/sponge10/src/main/java/co/aikar/commands/SpongeConditionContext.java +++ b/sponge10/src/main/java/co/aikar/commands/SpongeConditionContext.java @@ -3,7 +3,7 @@ import org.spongepowered.api.entity.living.player.Player; public class SpongeConditionContext extends ConditionContext { - SpongeConditionContext(SpongeCommandIssuer issuer, String config) { + protected SpongeConditionContext(SpongeCommandIssuer issuer, String config) { super(issuer, config); } diff --git a/velocity/src/main/java/co/aikar/commands/VelocityCommandCompletionContext.java b/velocity/src/main/java/co/aikar/commands/VelocityCommandCompletionContext.java index 041351f02..338be24f5 100644 --- a/velocity/src/main/java/co/aikar/commands/VelocityCommandCompletionContext.java +++ b/velocity/src/main/java/co/aikar/commands/VelocityCommandCompletionContext.java @@ -28,7 +28,7 @@ public class VelocityCommandCompletionContext extends CommandCompletionContext { - VelocityCommandCompletionContext(RegisteredCommand command, VelocityCommandIssuer issuer, String input, String config, String[] args) { + protected VelocityCommandCompletionContext(RegisteredCommand command, VelocityCommandIssuer issuer, String input, String config, String[] args) { super(command, issuer, input, config, args); } diff --git a/velocity/src/main/java/co/aikar/commands/VelocityCommandExecutionContext.java b/velocity/src/main/java/co/aikar/commands/VelocityCommandExecutionContext.java index f4492c9ff..8fc7b04b2 100644 --- a/velocity/src/main/java/co/aikar/commands/VelocityCommandExecutionContext.java +++ b/velocity/src/main/java/co/aikar/commands/VelocityCommandExecutionContext.java @@ -8,7 +8,7 @@ public class VelocityCommandExecutionContext extends CommandExecutionContext { - VelocityCommandExecutionContext(RegisteredCommand cmd, CommandParameter param, VelocityCommandIssuer sender, List args, int index, Map passedArgs) { + protected VelocityCommandExecutionContext(RegisteredCommand cmd, CommandParameter param, VelocityCommandIssuer sender, List args, int index, Map passedArgs) { super(cmd, param, sender, args, index, passedArgs); } diff --git a/velocity/src/main/java/co/aikar/commands/VelocityConditionContext.java b/velocity/src/main/java/co/aikar/commands/VelocityConditionContext.java index 12b145b2f..6125b3da7 100644 --- a/velocity/src/main/java/co/aikar/commands/VelocityConditionContext.java +++ b/velocity/src/main/java/co/aikar/commands/VelocityConditionContext.java @@ -4,7 +4,7 @@ import com.velocitypowered.api.proxy.Player; public class VelocityConditionContext extends ConditionContext { - VelocityConditionContext(VelocityCommandIssuer issuer, String config) { + protected VelocityConditionContext(VelocityCommandIssuer issuer, String config) { super(issuer, config); }