Skip to content

Commit 3298f2b

Browse files
committed
1.1.7
1 parent caf9243 commit 3298f2b

File tree

8 files changed

+25
-2
lines changed

8 files changed

+25
-2
lines changed
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'java'
22

33
group = 'dev.manere'
4-
version = '1.1.6'
4+
version = '1.1.7'
55

66
repositories {
77
mavenCentral()

src/main/java/dev/manere/commands/BasicCommandNode.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.manere.commands;
22

3+
import dev.manere.commands.api.CommandAPI;
34
import dev.manere.commands.argument.CommandArgument;
45
import org.bukkit.command.CommandSender;
56
import org.jetbrains.annotations.NotNull;
@@ -39,4 +40,12 @@ default Collection<?> getChildren() {
3940
default void configure(final @NotNull CommandNode node) {}
4041

4142
void execute(final @NotNull CommandContext<? extends CommandSender> context);
43+
44+
default void register() {
45+
CommandAPI.getInstance().ifPresent(this::register);
46+
}
47+
48+
default void register(final @NotNull CommandAPI api) {
49+
api.register(this);
50+
}
4251
}

src/main/java/dev/manere/commands/CommandContext.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import dev.manere.commands.argument.SingleCommandArgument;
77
import io.papermc.paper.command.brigadier.CommandSourceStack;
88
import org.bukkit.command.CommandSender;
9+
import org.bukkit.entity.Player;
910
import org.jetbrains.annotations.ApiStatus;
1011
import org.jetbrains.annotations.NotNull;
1112
import org.jetbrains.annotations.Nullable;
@@ -30,6 +31,11 @@ public CommandContext(final @NotNull S source, final @NotNull CommandNode node,
3031
this.stack = stack;
3132
}
3233

34+
@NotNull
35+
public Optional<Player> getAsPlayer() {
36+
return getSource() instanceof Player player ? Optional.of(player) : Optional.empty();
37+
}
38+
3339
@NotNull
3440
public S getSource() {
3541
return source;

src/main/java/dev/manere/commands/CommandNode.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dev.manere.commands;
22

33
import com.google.errorprone.annotations.CanIgnoreReturnValue;
4+
import dev.manere.commands.api.CommandAPI;
45
import dev.manere.commands.argument.CommandArgument;
56
import org.bukkit.command.CommandSender;
67
import org.bukkit.entity.Player;
@@ -305,4 +306,12 @@ public String toString() {
305306
+ ", description = " + description
306307
+ "]";
307308
}
309+
310+
public void register() {
311+
CommandAPI.getInstance().ifPresent(this::register);
312+
}
313+
314+
public void register(final @NotNull CommandAPI api) {
315+
api.register(this);
316+
}
308317
}

src/main/java/dev/manere/commands/api/CommandAPI.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import dev.manere.commands.BasicCommandNode;
66
import dev.manere.commands.CommandNode;
77
import dev.manere.commands.argument.CommandArgument;
8-
import io.papermc.paper.brigadier.PaperBrigadier;
98
import io.papermc.paper.command.brigadier.CommandSourceStack;
109
import io.papermc.paper.command.brigadier.Commands;
1110
import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;

0 commit comments

Comments
 (0)