Skip to content

Commit 59276aa

Browse files
created default methods for CommandSource
1 parent 6023e6a commit 59276aa

File tree

2 files changed

+11
-22
lines changed

2 files changed

+11
-22
lines changed

src/main/java/com/datasiqn/commandcore/CommandCore.java

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.datasiqn.commandcore;
22

3-
import com.datasiqn.commandcore.argument.type.ArgumentType;
43
import com.datasiqn.commandcore.argument.Arguments;
4+
import com.datasiqn.commandcore.argument.type.ArgumentType;
55
import com.datasiqn.commandcore.command.Command;
6+
import com.datasiqn.commandcore.command.CommandContext;
67
import com.datasiqn.commandcore.command.CommandSource;
78
import com.datasiqn.commandcore.command.builder.ArgumentBuilder;
89
import com.datasiqn.commandcore.command.builder.CommandBuilder;
9-
import com.datasiqn.commandcore.command.CommandContext;
1010
import com.datasiqn.commandcore.managers.CommandManager;
1111
import com.datasiqn.resultapi.Result;
1212
import org.bukkit.Bukkit;
@@ -16,12 +16,10 @@
1616
import org.bukkit.command.PluginCommand;
1717
import org.bukkit.entity.Entity;
1818
import org.bukkit.entity.Player;
19-
import org.bukkit.permissions.Permission;
2019
import org.bukkit.plugin.Plugin;
2120
import org.bukkit.plugin.java.JavaPlugin;
2221
import org.jetbrains.annotations.Contract;
2322
import org.jetbrains.annotations.NotNull;
24-
import org.jetbrains.annotations.Nullable;
2523

2624
import java.lang.reflect.Constructor;
2725
import java.lang.reflect.Field;
@@ -244,21 +242,6 @@ public static CommandCore getInstance() {
244242
public @NotNull CommandSender getSender() {
245243
return sender;
246244
}
247-
248-
@Override
249-
public void sendMessage(@NotNull String @NotNull ... messages) {
250-
sender.sendMessage(messages);
251-
}
252-
253-
@Override
254-
public boolean hasPermission(@NotNull Permission permission) {
255-
return sender.hasPermission(permission);
256-
}
257-
258-
@Override
259-
public boolean hasPermission(@Nullable String permission) {
260-
return permission == null || sender.hasPermission(permission);
261-
}
262245
};
263246
}
264247
}

src/main/java/com/datasiqn/commandcore/command/CommandSource.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,24 @@ public interface CommandSource {
3838
* Sends the command source a message
3939
* @param messages The messages to send
4040
*/
41-
void sendMessage(@NotNull String @NotNull ... messages);
41+
default void sendMessage(@NotNull String @NotNull ... messages) {
42+
getSender().sendMessage(messages);
43+
}
4244

4345
/**
4446
* Gets whether the source of the command has a permission or not
4547
* @param permission The permission
4648
* @return {@code true} if the source has {@code permission}, {@code false} otherwise
4749
*/
48-
boolean hasPermission(@NotNull Permission permission);
50+
default boolean hasPermission(@NotNull Permission permission) {
51+
return getSender().hasPermission(permission);
52+
}
4953
/**
5054
* Gets whether the source of the command has a permission or not
5155
* @param permission The permission
5256
* @return {@code true} if the source has {@code permission}, {@code false} otherwise
5357
*/
54-
boolean hasPermission(@Nullable String permission);
58+
default boolean hasPermission(@Nullable String permission) {
59+
return permission == null || getSender().hasPermission(permission);
60+
}
5561
}

0 commit comments

Comments
 (0)