Skip to content

Commit d273f5e

Browse files
mbaxmbax
committed
Some more translations for list command
1 parent 7ab5a0f commit d273f5e

6 files changed

Lines changed: 96 additions & 27 deletions

File tree

‎bukkit/src/main/java/dev/kitteh/factions/command/defaults/CmdList.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.kitteh.factions.command.defaults;
22

3+
import dev.kitteh.factions.FactionsPlugin;
34
import dev.kitteh.factions.command.Cmd;
45
import dev.kitteh.factions.command.Sender;
56
import dev.kitteh.factions.command.defaults.list.CmdListBans;
@@ -16,7 +17,8 @@ public class CmdList implements Cmd {
1617
@Override
1718
public TriConsumer<CommandManager<Sender>, Command.Builder<Sender>, MinecraftHelp<Sender>> consumer() {
1819
return (manager, builder, help) -> {
19-
Command.Builder<Sender> listBuilder = builder.literal("list");
20+
var tl = FactionsPlugin.instance().tl().commands().list();
21+
Command.Builder<Sender> listBuilder = builder.literal(tl.getFirstAlias(), tl.getSecondaryAliases());
2022

2123
new CmdListBans().consumer().accept(manager, listBuilder, help);
2224
new CmdListClaims().consumer().accept(manager, listBuilder, help);

‎bukkit/src/main/java/dev/kitteh/factions/command/defaults/list/CmdListBans.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import dev.kitteh.factions.FPlayer;
44
import dev.kitteh.factions.FPlayers;
55
import dev.kitteh.factions.Faction;
6+
import dev.kitteh.factions.FactionsPlugin;
67
import dev.kitteh.factions.command.Cloudy;
78
import dev.kitteh.factions.command.Cmd;
89
import dev.kitteh.factions.command.FactionParser;
@@ -22,13 +23,16 @@
2223
public class CmdListBans implements Cmd {
2324
@Override
2425
public TriConsumer<CommandManager<Sender>, Command.Builder<Sender>, MinecraftHelp<Sender>> consumer() {
25-
return (manager, builder, help) -> manager.command(
26-
builder.literal("banlist")
27-
.commandDescription(Cloudy.desc(TL.COMMAND_BANLIST_DESCRIPTION))
28-
.permission(builder.commandPermission().and(Cloudy.hasPermission(Permission.BAN).and(Cloudy.hasFaction())))
29-
.optional("faction", FactionParser.of(FactionParser.Include.SELF))
30-
.handler(this::handle)
31-
);
26+
return (manager, builder, help) -> {
27+
var tl = FactionsPlugin.instance().tl().commands().list().bans();
28+
manager.command(
29+
builder.literal(tl.getFirstAlias(), tl.getSecondaryAliases())
30+
.commandDescription(Cloudy.desc(TL.COMMAND_BANLIST_DESCRIPTION))
31+
.permission(builder.commandPermission().and(Cloudy.hasPermission(Permission.BAN).and(Cloudy.hasFaction())))
32+
.optional("faction", FactionParser.of(FactionParser.Include.SELF))
33+
.handler(this::handle)
34+
);
35+
};
3236
}
3337

3438
private void handle(CommandContext<Sender> context) {

‎bukkit/src/main/java/dev/kitteh/factions/command/defaults/list/CmdListClaims.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import dev.kitteh.factions.FLocation;
55
import dev.kitteh.factions.FPlayer;
66
import dev.kitteh.factions.Faction;
7+
import dev.kitteh.factions.FactionsPlugin;
78
import dev.kitteh.factions.command.Cloudy;
89
import dev.kitteh.factions.command.Cmd;
910
import dev.kitteh.factions.command.FactionParser;
@@ -33,18 +34,21 @@
3334
public class CmdListClaims implements Cmd {
3435
@Override
3536
public TriConsumer<CommandManager<Sender>, Command.Builder<Sender>, MinecraftHelp<Sender>> consumer() {
36-
return (manager, builder, help) -> manager.command(
37-
builder.literal("claims")
38-
.commandDescription(Cloudy.desc(TL.COMMAND_LISTCLAIMS_DESCRIPTION))
39-
.permission(builder.commandPermission().and(Cloudy.hasPermission(Permission.LISTCLAIMS).and(Cloudy.hasSelfFactionPerms(PermissibleActions.LISTCLAIMS))))
40-
.flag(manager.flagBuilder("world").withComponent(StringParser.stringParser()))
41-
.flag(
42-
manager.flagBuilder("faction")
43-
.withComponent(FactionParser.of(FactionParser.Include.SELF))
44-
.withPermission(Cloudy.hasPermission(Permission.LISTCLAIMS_OTHER))
45-
)
46-
.handler(this::handle)
47-
);
37+
return (manager, builder, help) -> {
38+
var tl = FactionsPlugin.instance().tl().commands().list().claims();
39+
manager.command(
40+
builder.literal(tl.getFirstAlias(), tl.getSecondaryAliases())
41+
.commandDescription(Cloudy.desc(TL.COMMAND_LISTCLAIMS_DESCRIPTION))
42+
.permission(builder.commandPermission().and(Cloudy.hasPermission(Permission.LISTCLAIMS).and(Cloudy.hasSelfFactionPerms(PermissibleActions.LISTCLAIMS))))
43+
.flag(manager.flagBuilder("world").withComponent(StringParser.stringParser()))
44+
.flag(
45+
manager.flagBuilder("faction")
46+
.withComponent(FactionParser.of(FactionParser.Include.SELF))
47+
.withPermission(Cloudy.hasPermission(Permission.LISTCLAIMS_OTHER))
48+
)
49+
.handler(this::handle)
50+
);
51+
};
4852
}
4953

5054
private void handle(CommandContext<Sender> context) {

‎bukkit/src/main/java/dev/kitteh/factions/command/defaults/list/CmdListFactions.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import dev.kitteh.factions.command.Cmd;
99
import dev.kitteh.factions.command.Sender;
1010
import dev.kitteh.factions.plugin.AbstractFactionsPlugin;
11-
import dev.kitteh.factions.tag.Tag;
1211
import dev.kitteh.factions.util.Permission;
1312
import dev.kitteh.factions.util.TL;
1413
import dev.kitteh.factions.util.TextUtil;

‎bukkit/src/main/java/dev/kitteh/factions/command/defaults/list/CmdListInvites.java‎

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

33
import dev.kitteh.factions.FPlayer;
44
import dev.kitteh.factions.FPlayers;
5+
import dev.kitteh.factions.FactionsPlugin;
56
import dev.kitteh.factions.command.Cloudy;
67
import dev.kitteh.factions.command.Cmd;
78
import dev.kitteh.factions.command.Sender;
@@ -23,12 +24,15 @@
2324
public class CmdListInvites implements Cmd {
2425
@Override
2526
public TriConsumer<CommandManager<Sender>, Command.Builder<Sender>, MinecraftHelp<Sender>> consumer() {
26-
return (manager, builder, help) -> manager.command(
27-
builder.literal("invites")
28-
.commandDescription(Cloudy.desc(TL.COMMAND_SHOWINVITES_DESCRIPTION))
29-
.permission(builder.commandPermission().and(Cloudy.hasPermission(Permission.SHOW_INVITES).and(Cloudy.hasFaction())))
30-
.handler(this::handle)
31-
);
27+
return (manager, builder, help) -> {
28+
var tl = FactionsPlugin.instance().tl().commands().list().invites();
29+
manager.command(
30+
builder.literal(tl.getFirstAlias(), tl.getSecondaryAliases())
31+
.commandDescription(Cloudy.desc(TL.COMMAND_SHOWINVITES_DESCRIPTION))
32+
.permission(builder.commandPermission().and(Cloudy.hasPermission(Permission.SHOW_INVITES).and(Cloudy.hasFaction())))
33+
.handler(this::handle)
34+
);
35+
};
3236
}
3337

3438
private void handle(CommandContext<Sender> context) {

‎bukkit/src/main/java/dev/kitteh/factions/config/file/TranslationsConfig.java‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,57 @@ public String getNotFound() {
8484
}
8585
}
8686

87+
public static class ListCmd extends AbsCommand {
88+
public ListCmd() {
89+
super("list");
90+
}
91+
92+
public static class ListBans extends AbsCommand {
93+
public ListBans() {
94+
super("bans");
95+
}
96+
}
97+
98+
public static class ListClaims extends AbsCommand {
99+
public ListClaims() {
100+
super("claims");
101+
}
102+
}
103+
104+
public static class ListFactions extends AbsCommand {
105+
public ListFactions() {
106+
super("factions");
107+
}
108+
}
109+
110+
public static class ListInvites extends AbsCommand {
111+
public ListInvites() {
112+
super("invites");
113+
}
114+
}
115+
116+
private ListBans bans = new ListBans();
117+
private ListClaims claims = new ListClaims();
118+
private ListFactions factions = new ListFactions();
119+
private ListInvites invites = new ListInvites();
120+
121+
public ListBans bans() {
122+
return bans;
123+
}
124+
125+
public ListClaims claims() {
126+
return claims;
127+
}
128+
129+
public ListFactions factions() {
130+
return factions;
131+
}
132+
133+
public ListInvites invites() {
134+
return invites;
135+
}
136+
}
137+
87138
public static class Set extends AbsCommand {
88139
public Set() {
89140
super("set");
@@ -920,6 +971,7 @@ public Set set() {
920971

921972
private Chat chat = new Chat();
922973
private Confirm confirm = new Confirm();
974+
private ListCmd list = new ListCmd();
923975
private Set set = new Set();
924976
private Show show = new Show();
925977
private Permissions permissions = new Permissions();
@@ -938,6 +990,10 @@ public Confirm confirm() {
938990
return confirm;
939991
}
940992

993+
public ListCmd list() {
994+
return list;
995+
}
996+
941997
public Set set() {
942998
return set;
943999
}

0 commit comments

Comments
 (0)