Skip to content

Commit 533f622

Browse files
zefir-gitzefir-git
committed
use "citizen" for more clarity when referring to nation membership
1 parent b50d2e4 commit 533f622

File tree

6 files changed

+78
-78
lines changed

6 files changed

+78
-78
lines changed

‎src/main/java/pro/cloudnode/smp/smpcore/Messages.java‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,15 @@ public Messages() {
184184
.toLocalDateTime()), Placeholder.unparsed("day", String.valueOf(day)), Placeholder.unparsed("day", String.valueOf(day)), Formatter.choice("day-format", day));
185185
}
186186

187-
public @NotNull Component nationMembersStatus(final @NotNull Member member) {
187+
public @NotNull Component nationCitizensStatus(final @NotNull Member member) {
188188
return MiniMessage.miniMessage()
189-
.deserialize(Objects.requireNonNull(config.getString(member.isActive() ? "nation.members.status.active" : "nation.members.status.inactive")));
189+
.deserialize(Objects.requireNonNull(config.getString(member.isActive() ? "nation.citizens.status.active" : "nation.citizens.status.inactive")));
190190
}
191191

192-
public @NotNull Component nationMembersList(final @NotNull Nation nation, final @NotNull Permissible sender) {
193-
final @NotNull HashSet<@NotNull Member> members = nation.members();
192+
public @NotNull Component nationCitizensList(final @NotNull Nation nation, final @NotNull Permissible sender) {
193+
final @NotNull HashSet<@NotNull Member> members = nation.citizens();
194194
final @NotNull Component header = MiniMessage.miniMessage()
195-
.deserialize(Objects.requireNonNull(config.getString("nation.members.list.header"))
195+
.deserialize(Objects.requireNonNull(config.getString("nation.citizens.list.header"))
196196
.replaceAll("<color>", "<#" + nation.color + ">")
197197
.replaceAll("</color>", "</#" + nation.color + ">"),
198198
Placeholder.unparsed("nation-name", nation.name),
@@ -204,16 +204,16 @@ public Messages() {
204204
final @NotNull List<@NotNull Component> list = new ArrayList<>();
205205

206206
final @NotNull Member leader = members.stream().filter(m -> m.uuid.equals(nation.leaderUUID)).findFirst().orElseThrow(IllegalStateException::new);
207-
list.add(nationMembersListEntry(nation, leader, sender));
207+
list.add(nationCitizensListEntry(nation, leader, sender));
208208

209209
final @NotNull Member vice = members.stream().filter(m -> m.uuid.equals(nation.viceLeaderUUID)).findFirst().orElseThrow(IllegalStateException::new);
210210
if (!vice.uuid.equals(leader.uuid))
211-
list.add(nationMembersListEntry(nation, vice, sender));
211+
list.add(nationCitizensListEntry(nation, vice, sender));
212212

213-
final @NotNull List<@NotNull Component> citizens = members.stream().filter(m -> !m.uuid.equals(leader.uuid) && !m.uuid.equals(vice.uuid) && m.isActive()).map(m -> nationMembersListEntry(nation, m, sender)).toList();
213+
final @NotNull List<@NotNull Component> citizens = members.stream().filter(m -> !m.uuid.equals(leader.uuid) && !m.uuid.equals(vice.uuid) && m.isActive()).map(m -> nationCitizensListEntry(nation, m, sender)).toList();
214214
list.addAll(citizens);
215215

216-
final @NotNull List<@NotNull Component> inactive = members.stream().filter(m -> !m.uuid.equals(leader.uuid) && !m.uuid.equals(vice.uuid) && !m.isActive()).map(m -> nationMembersListEntry(nation, m, sender)).toList();
216+
final @NotNull List<@NotNull Component> inactive = members.stream().filter(m -> !m.uuid.equals(leader.uuid) && !m.uuid.equals(vice.uuid) && !m.isActive()).map(m -> nationCitizensListEntry(nation, m, sender)).toList();
217217
list.addAll(inactive);
218218

219219
final @NotNull TextComponent.Builder listComponent = Component.text();
@@ -225,78 +225,78 @@ public Messages() {
225225
return Component.text().append(header).append(Component.newline()).append(listComponent.build()).build();
226226
}
227227

228-
private @NotNull Component nationMembersListEntry(final @NotNull Nation nation, final @NotNull Member member, final @NotNull Permissible sender) {
228+
private @NotNull Component nationCitizensListEntry(final @NotNull Nation nation, final @NotNull Member member, final @NotNull Permissible sender) {
229229
if (member.uuid.equals(nation.leaderUUID)) {
230230
return MiniMessage.miniMessage()
231-
.deserialize(Objects.requireNonNull(config.getString("nation.members.list.entry.leader"))
231+
.deserialize(Objects.requireNonNull(config.getString("nation.citizens.list.entry.leader"))
232232
.replaceAll("<color>", "<#" + nation.color + ">")
233233
.replaceAll("</color>", "</#" + nation.color + ">")
234234
.replaceAll("<member-name>", Optional.ofNullable(member.player().getName()).orElse(member.uuid.toString())),
235-
Placeholder.component("member-status", nationMembersStatus(member)),
236-
Placeholder.component("buttons", nationMembersListButtons(nation, member, sender))
235+
Placeholder.component("member-status", nationCitizensStatus(member)),
236+
Placeholder.component("buttons", nationCitizensListButtons(nation, member, sender))
237237
);
238238
}
239239
if (member.uuid.equals(nation.viceLeaderUUID)) {
240240
return MiniMessage.miniMessage()
241-
.deserialize(Objects.requireNonNull(config.getString("nation.members.list.entry.vice"))
241+
.deserialize(Objects.requireNonNull(config.getString("nation.citizens.list.entry.vice"))
242242
.replaceAll("<color>", "<#" + nation.color + ">")
243243
.replaceAll("</color>", "</#" + nation.color + ">")
244244
.replaceAll("<member-name>", Optional.ofNullable(member.player().getName()).orElse(member.uuid.toString())),
245-
Placeholder.component("member-status", nationMembersStatus(member)),
246-
Placeholder.component("buttons", nationMembersListButtons(nation, member, sender))
245+
Placeholder.component("member-status", nationCitizensStatus(member)),
246+
Placeholder.component("buttons", nationCitizensListButtons(nation, member, sender))
247247
);
248248
}
249249
if (member.isActive()) {
250250
return MiniMessage.miniMessage()
251-
.deserialize(Objects.requireNonNull(config.getString("nation.members.list.entry.citizen"))
251+
.deserialize(Objects.requireNonNull(config.getString("nation.citizens.list.entry.citizen"))
252252
.replaceAll("<color>", "<#" + nation.color + ">")
253253
.replaceAll("</color>", "</#" + nation.color + ">")
254254
.replaceAll("<member-name>", Optional.ofNullable(member.player().getName()).orElse(member.uuid.toString())),
255-
Placeholder.component("member-status", nationMembersStatus(member)),
256-
Placeholder.component("buttons", nationMembersListButtons(nation, member, sender))
255+
Placeholder.component("member-status", nationCitizensStatus(member)),
256+
Placeholder.component("buttons", nationCitizensListButtons(nation, member, sender))
257257
);
258258
}
259259
return MiniMessage.miniMessage()
260-
.deserialize(Objects.requireNonNull(config.getString("nation.members.list.entry.inactive-citizen"))
260+
.deserialize(Objects.requireNonNull(config.getString("nation.citizens.list.entry.inactive-citizen"))
261261
.replaceAll("<color>", "<#" + nation.color + ">")
262262
.replaceAll("</color>", "</#" + nation.color + ">")
263263
.replaceAll("<member-name>", Optional.ofNullable(member.player().getName()).orElse(member.uuid.toString())),
264-
Placeholder.component("member-status", nationMembersStatus(member)),
265-
Placeholder.component("buttons", nationMembersListButtons(nation, member, sender))
264+
Placeholder.component("member-status", nationCitizensStatus(member)),
265+
Placeholder.component("buttons", nationCitizensListButtons(nation, member, sender))
266266
);
267267
}
268268

269-
private @NotNull Component nationMembersListButtons(final @NotNull Nation nation, final @NotNull Member member, final @NotNull Permissible sender) {
269+
private @NotNull Component nationCitizensListButtons(final @NotNull Nation nation, final @NotNull Member member, final @NotNull Permissible sender) {
270270
final @NotNull List<@NotNull Component> buttons = new ArrayList<>();
271-
if (sender.hasPermission(Permission.NATION_MEMBERS_KICK) && !(member.uuid.equals(nation.leaderUUID) || member.uuid.equals(nation.viceLeaderUUID)))
272-
buttons.add(nationMembersListButton("kick", nation, member));
271+
if (sender.hasPermission(Permission.NATION_CITIZENS_KICK) && !(member.uuid.equals(nation.leaderUUID) || member.uuid.equals(nation.viceLeaderUUID)))
272+
buttons.add(nationCitizensListButton("kick", nation, member));
273273
if (sender.hasPermission(Permission.NATION_VICE_DEMOTE) && member.uuid.equals(nation.viceLeaderUUID) && !member.uuid.equals(nation.leaderUUID))
274-
buttons.add(nationMembersListButton("demote", nation, member));
274+
buttons.add(nationCitizensListButton("demote", nation, member));
275275
if (sender.hasPermission(Permission.NATION_VICE_PROMOTE) && nation.viceLeaderUUID.equals(nation.leaderUUID) && !(member.uuid.equals(nation.leaderUUID) || member.uuid.equals(nation.viceLeaderUUID)) && member.isActive())
276-
buttons.add(nationMembersListButton("promote", nation, member));
276+
buttons.add(nationCitizensListButton("promote", nation, member));
277277

278278
final @NotNull TextComponent.Builder buttonsComponent = Component.text();
279-
if (!buttons.isEmpty()) buttonsComponent.append(MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("nation.members.list.buttons.prefix"))));
279+
if (!buttons.isEmpty()) buttonsComponent.append(MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("nation.citizens.list.buttons.prefix"))));
280280
for (int i = 0; i < buttons.size(); i++) {
281281
buttonsComponent.append(buttons.get(i));
282-
if (i + 1 < buttons.size()) buttonsComponent.append(MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("nation.members.list.buttons.separator"))));
282+
if (i + 1 < buttons.size()) buttonsComponent.append(MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("nation.citizens.list.buttons.separator"))));
283283
}
284-
if (!buttons.isEmpty()) buttonsComponent.append(MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("nation.members.list.buttons.suffix"))));
284+
if (!buttons.isEmpty()) buttonsComponent.append(MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("nation.citizens.list.buttons.suffix"))));
285285

286286
return Component.text().append(buttonsComponent.build()).build();
287287
}
288288

289-
private @NotNull Component nationMembersListButton(final @NotNull String button, final @NotNull Nation nation, final @NotNull Member member) {
289+
private @NotNull Component nationCitizensListButton(final @NotNull String button, final @NotNull Nation nation, final @NotNull Member member) {
290290
return MiniMessage.miniMessage()
291-
.deserialize(Objects.requireNonNull(config.getString("nation.members.list.buttons." + button))
291+
.deserialize(Objects.requireNonNull(config.getString("nation.citizens.list.buttons." + button))
292292
.replaceAll("<color>", "<#" + nation.color + ">")
293293
.replaceAll("</color>", "</#" + nation.color + ">")
294294
.replaceAll("<member-name>", Optional.ofNullable(member.player().getName()).orElse(member.uuid.toString())));
295295
}
296296

297-
public @NotNull Component nationMembersKicked(final @NotNull Member member) {
297+
public @NotNull Component nationCitizensKicked(final @NotNull Member member) {
298298
return MiniMessage.miniMessage()
299-
.deserialize(Objects.requireNonNull(config.getString("nation.members.kicked")), Placeholder.unparsed("player", Optional
299+
.deserialize(Objects.requireNonNull(config.getString("nation.citizens.kicked")), Placeholder.unparsed("player", Optional
300300
.ofNullable(member.player().getName()).orElse(member.uuid.toString())));
301301
}
302302

@@ -374,12 +374,12 @@ public Messages() {
374374
.deserialize(Objects.requireNonNull(config.getString("error.command-on-staff")), Placeholder.unparsed("command", label));
375375
}
376376

377-
public @NotNull Component errorNotInNation() {
378-
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.not-in-nation")));
377+
public @NotNull Component errorNotCitizenYou() {
378+
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.not-citizen-you")));
379379
}
380380

381-
public @NotNull Component errorMemberNotInNation(final @NotNull Member member) {
382-
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.member-not-in-nation")), Placeholder
381+
public @NotNull Component errorNotCitizen(final @NotNull Member member) {
382+
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.not-citizen")), Placeholder
383383
.unparsed("player", Optional
384384
.ofNullable(member.player().getName()).orElse(member.player().getUniqueId().toString())));
385385
}

‎src/main/java/pro/cloudnode/smp/smpcore/Nation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public Nation(final @NotNull String id, final @NotNull String name, final @NotNu
9191
this.bank = bank;
9292
}
9393

94-
public @NotNull HashSet<@NotNull Member> members() {
94+
public @NotNull HashSet<@NotNull Member> citizens() {
9595
return Member.get(this);
9696
}
9797

@@ -104,7 +104,7 @@ public Nation(final @NotNull String id, final @NotNull String name, final @NotNu
104104
team.setOption(Team.Option.DEATH_MESSAGE_VISIBILITY, Team.OptionStatus.FOR_OWN_TEAM);
105105
team.displayName(Component.text(shortName).color(TextColor.color(Integer.decode("0x" + color))).hoverEvent(HoverEvent.showText(Component.text(name))));
106106
team.prefix(Component.text(shortName + " ").color(TextColor.color(Integer.decode("0x" + color))).hoverEvent(HoverEvent.showText(Component.text(name))));
107-
for (final @NotNull Member member : members()) try {
107+
for (final @NotNull Member member : citizens()) try {
108108
team.addPlayer(member.player());
109109
}
110110
catch (final @NotNull IllegalArgumentException ignored) {}

‎src/main/java/pro/cloudnode/smp/smpcore/Permission.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,24 @@ public final class Permission {
6363
public static @NotNull String NATION = "smpcore.nation";
6464

6565
/**
66-
* List the members of your nation
66+
* List the citizens of your nation
6767
*/
68-
public static @NotNull String NATION_MEMBERS_LIST = "smpcore.nation.members.list";
68+
public static @NotNull String NATION_CITIZENS_LIST = "smpcore.nation.citizens.list";
6969

7070
/**
7171
* List the member of any nation
7272
*/
73-
public static @NotNull String NATION_MEMBERS_LIST_OTHER = "smpcore.nation.members.list.other";
73+
public static @NotNull String NATION_CITIZENS_LIST_OTHER = "smpcore.nation.citizens.list.other";
7474

7575
/**
76-
* Kick members of your nation
76+
* Kick citizens of your nation
7777
*/
78-
public static @NotNull String NATION_MEMBERS_KICK = "smpcore.nation.members.kick";
78+
public static @NotNull String NATION_CITIZENS_KICK = "smpcore.nation.citizens.kick";
7979

8080
/**
81-
* Kick members of any nation
81+
* Kick citizens of any nation
8282
*/
83-
public static @NotNull String NATION_MEMBERS_KICK_OTHER = "smpcore.nation.members.kick.other";
83+
public static @NotNull String NATION_CITIZENS_KICK_OTHER = "smpcore.nation.citizens.kick.other";
8484

8585
/**
8686
* Appoint nation citizen as vice-leader

‎src/main/java/pro/cloudnode/smp/smpcore/Rest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private void e404 (final @NotNull io.javalin.http.Context ctx) {
5353
obj.addProperty("color", nation.color);
5454
obj.addProperty("leader", nation.leaderUUID.toString());
5555
obj.addProperty("viceLeader", nation.viceLeaderUUID.toString());
56-
obj.addProperty("members", nation.members().size());
56+
obj.addProperty("members", nation.citizens().size());
5757
obj.addProperty("founded", nation.founded.getTime());
5858
obj.addProperty("foundedGameTicks", nation.foundedTicks);
5959
obj.addProperty("foundedGameDate", SMPCore.gameTime(nation.foundedTicks).getTime());
@@ -186,7 +186,7 @@ public Rest(final int port) {
186186
switch (include) {
187187
case "members" -> {
188188
final @NotNull JsonArray arr = new JsonArray();
189-
final @NotNull HashSet<@NotNull Member> members = nation.get().members();
189+
final @NotNull HashSet<@NotNull Member> members = nation.get().citizens();
190190
for (final @NotNull Member member : members)
191191
arr.add(getMemberObject(member));
192192
obj.add("members", arr);

0 commit comments

Comments
 (0)