Skip to content

Commit 29745a0

Browse files
committed
fix!: remove multilanguageplugin.* permissions
Fixes #207
1 parent 772ca7c commit 29745a0

File tree

10 files changed

+27
-47
lines changed

10 files changed

+27
-47
lines changed

core/src/main/java/com/rexcantor64/triton/commands/GetFlagCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void handleCommand(CommandEvent event) throws NoPermissionException, Play
2828

2929
@Override
3030
public List<String> handleTabCompletion(CommandEvent event) throws NoPermissionException {
31-
event.getSender().assertPermission("triton.getflag", "multilanguageplugin.getflag");
31+
event.getSender().assertPermission("triton.getflag");
3232

3333
if (event.getArgs().length != 1) return Collections.emptyList();
3434

core/src/main/java/com/rexcantor64/triton/commands/HelpCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class HelpCommand implements Command {
1818

1919
@Override
2020
public void handleCommand(CommandEvent event) throws NoPermissionException {
21-
event.getSender().assertPermission("triton.help", "multilanguageplugin.help");
21+
event.getSender().assertPermission("triton.help");
2222

2323
for (val str : Triton.get().getMessagesConfig().getMessageList("help.menu")) {
2424
if (str.equalsIgnoreCase("%1")) {

core/src/main/java/com/rexcantor64/triton/commands/ReloadCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void handleCommand(CommandEvent event) throws NoPermissionException {
1818
val sender = event.getSender();
1919
val isProxy = event.getPlatform().isProxy();
2020

21-
sender.assertPermission("triton.reload", "multilanguageplugin.reload");
21+
sender.assertPermission("triton.reload");
2222

2323
if (isProxy) {
2424
val action = event.getArgs().length >= 1 && sender.getUUID() != null ? event.getArgs()[0] : "bungee";

core/src/main/java/com/rexcantor64/triton/commands/SetLanguageCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void handleCommand(CommandEvent event) throws NoPermissionException {
2020
val sender = event.getSender();
2121
val args = event.getArgs();
2222

23-
sender.assertPermission("triton.setlanguage", "multilanguageplugin.setlanguage");
23+
sender.assertPermission("triton.setlanguage");
2424

2525
if (args.length == 0) {
2626
sender.sendMessageFormatted("help.setlanguage", event.getLabel());
@@ -31,7 +31,7 @@ public void handleCommand(CommandEvent event) throws NoPermissionException {
3131
val langName = args[0];
3232

3333
if (args.length >= 2) {
34-
sender.assertPermission("triton.setlanguage.others", "multilanguageplugin.setlanguage.others");
34+
sender.assertPermission("triton.setlanguage.others");
3535

3636
target = Triton.get().getPlayerUUIDFromString(args[1]);
3737

@@ -73,7 +73,7 @@ public void handleCommand(CommandEvent event) throws NoPermissionException {
7373
@Override
7474
public List<String> handleTabCompletion(CommandEvent event) throws NoPermissionException {
7575
val sender = event.getSender();
76-
sender.assertPermission("triton.setlanguage", "multilanguageplugin.setlanguage");
76+
sender.assertPermission("triton.setlanguage");
7777

7878
if (event.getArgs().length == 1) {
7979
return Triton.get().getLanguageManager().getAllLanguages().stream().map(Language::getName)

core/src/main/java/com/rexcantor64/triton/commands/handler/Sender.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.rexcantor64.triton.commands.handler.exceptions.NoPermissionException;
44
import net.kyori.adventure.text.Component;
5+
import org.jetbrains.annotations.NotNull;
56

67
import java.util.UUID;
78

@@ -13,9 +14,9 @@ public interface Sender {
1314

1415
void sendMessageFormatted(String code, Object... args);
1516

16-
void assertPermission(String... permissions) throws NoPermissionException;
17+
void assertPermission(@NotNull String permission) throws NoPermissionException;
1718

18-
boolean hasPermission(String permission);
19+
boolean hasPermission(@NotNull String permission);
1920

2021
UUID getUUID();
2122

triton-bungeecord/src/main/java/com/rexcantor64/triton/bungeecord/commands/handler/BungeeSender.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
import com.rexcantor64.triton.Triton;
44
import com.rexcantor64.triton.bungeecord.utils.BaseComponentUtils;
5-
import com.rexcantor64.triton.commands.handler.exceptions.NoPermissionException;
65
import com.rexcantor64.triton.commands.handler.Sender;
6+
import com.rexcantor64.triton.commands.handler.exceptions.NoPermissionException;
77
import lombok.AllArgsConstructor;
8-
import lombok.val;
98
import net.kyori.adventure.text.Component;
109
import net.md_5.bungee.api.ChatColor;
1110
import net.md_5.bungee.api.CommandSender;
1211
import net.md_5.bungee.api.chat.TextComponent;
1312
import net.md_5.bungee.api.connection.ProxiedPlayer;
13+
import org.jetbrains.annotations.NotNull;
1414

1515
import java.util.UUID;
1616

@@ -34,21 +34,14 @@ public void sendMessageFormatted(String code, Object... args) {
3434
}
3535

3636
@Override
37-
public void assertPermission(String... permissions) throws NoPermissionException {
38-
if (permissions.length == 0) {
39-
throw new NoPermissionException("");
40-
}
41-
42-
for (val permission : permissions) {
43-
if (hasPermission(permission)) {
44-
return;
45-
}
37+
public void assertPermission(@NotNull String permission) throws NoPermissionException {
38+
if (!hasPermission(permission)) {
39+
throw new NoPermissionException(permission);
4640
}
47-
throw new NoPermissionException(permissions[0]);
4841
}
4942

5043
@Override
51-
public boolean hasPermission(String permission) {
44+
public boolean hasPermission(@NotNull String permission) {
5245
return handler.hasPermission(permission);
5346
}
5447

triton-spigot/src/main/java/com/rexcantor64/triton/spigot/commands/GetFlagCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void handleCommand(CommandEvent event) throws NoPermissionException, Play
1919
val sender = event.getSender();
2020
val uuid = sender.getUUID();
2121

22-
sender.assertPermission("triton.getflag", "multilanguageplugin.getflag");
22+
sender.assertPermission("triton.getflag");
2323

2424
if (event.getArgs().length == 0) {
2525
sender.sendMessageFormatted("help.getflag", event.getLabel());

triton-spigot/src/main/java/com/rexcantor64/triton/spigot/commands/OpenSelectorCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void handleCommand(CommandEvent event) throws NoPermissionException, Play
1616
val sender = event.getSender();
1717
val uuid = sender.getUUID();
1818

19-
sender.assertPermission("triton.openselector", "multilanguageplugin.openselector");
19+
sender.assertPermission("triton.openselector");
2020

2121
SpigotTriton.asSpigot().openLanguagesSelectionGUI(Triton.get().getPlayerManager().get(uuid));
2222
}

triton-spigot/src/main/java/com/rexcantor64/triton/spigot/commands/handler/SpigotSender.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
import com.rexcantor64.triton.commands.handler.Sender;
55
import com.rexcantor64.triton.commands.handler.exceptions.NoPermissionException;
66
import com.rexcantor64.triton.spigot.utils.BaseComponentUtils;
7-
import com.rexcantor64.triton.utils.ComponentUtils;
87
import lombok.AllArgsConstructor;
9-
import lombok.val;
108
import net.kyori.adventure.text.Component;
119
import net.md_5.bungee.api.ChatColor;
1210
import org.bukkit.command.CommandSender;
1311
import org.bukkit.entity.Player;
12+
import org.jetbrains.annotations.NotNull;
1413

1514
import java.util.UUID;
1615

@@ -34,21 +33,14 @@ public void sendMessageFormatted(String code, Object... args) {
3433
}
3534

3635
@Override
37-
public void assertPermission(String... permissions) throws NoPermissionException {
38-
if (permissions.length == 0) {
39-
throw new NoPermissionException("");
36+
public void assertPermission(@NotNull String permission) throws NoPermissionException {
37+
if (!hasPermission(permission)) {
38+
throw new NoPermissionException(permission);
4039
}
41-
42-
for (val permission : permissions) {
43-
if (hasPermission(permission)) {
44-
return;
45-
}
46-
}
47-
throw new NoPermissionException(permissions[0]);
4840
}
4941

5042
@Override
51-
public boolean hasPermission(String permission) {
43+
public boolean hasPermission(@NotNull String permission) {
5244
return handler.hasPermission(permission);
5345
}
5446

triton-velocity/src/main/java/com/rexcantor64/triton/velocity/commands/handler/VelocitySender.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import lombok.val;
1010
import net.kyori.adventure.text.Component;
1111
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
12+
import org.jetbrains.annotations.NotNull;
1213

1314
import java.util.UUID;
1415

@@ -34,21 +35,14 @@ public void sendMessageFormatted(String code, Object... args) {
3435
}
3536

3637
@Override
37-
public void assertPermission(String... permissions) throws NoPermissionException {
38-
if (permissions.length == 0) {
39-
throw new NoPermissionException("");
38+
public void assertPermission(@NotNull String permission) throws NoPermissionException {
39+
if (!hasPermission(permission)) {
40+
throw new NoPermissionException(permission);
4041
}
41-
42-
for (val permission : permissions) {
43-
if (hasPermission(permission)) {
44-
return;
45-
}
46-
}
47-
throw new NoPermissionException(permissions[0]);
4842
}
4943

5044
@Override
51-
public boolean hasPermission(String permission) {
45+
public boolean hasPermission(@NotNull String permission) {
5246
return handler.hasPermission(permission);
5347
}
5448

0 commit comments

Comments
 (0)