Skip to content

Commit 21e04e9

Browse files
committed
code quality fixes
1 parent 2cc5d1a commit 21e04e9

File tree

3 files changed

+29
-10
lines changed

3 files changed

+29
-10
lines changed

src/main/java/pro/cloudnode/smp/smpcore/Configuration.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ public int joinRequestExpireMinutes() {
5454
throw new IllegalStateException("No relative time format for ChronoUnit " + unit);
5555
}
5656
}));
57-
return MiniMessage.miniMessage()
58-
.deserialize(formatString, Formatter.number("t", t), Formatter.choice("format", Math.abs(t.doubleValue())));
57+
return MiniMessage.miniMessage().deserialize(formatString,
58+
Formatter.number("t", t),
59+
Formatter.choice("format", Math.abs(t.doubleValue()))
60+
);
5961
}
6062

6163
public @NotNull Component relativeTimeFuture(final @NotNull Component relativeTime) {
@@ -70,10 +72,15 @@ public int joinRequestExpireMinutes() {
7072

7173
public @NotNull Component relativeTimeDuration(final @NotNull Component duration) {
7274
return MiniMessage.miniMessage()
73-
.deserialize(Objects.requireNonNull(config.getString("relative-time.duration")), Placeholder.component("t", duration));
75+
.deserialize(
76+
Objects.requireNonNull(config.getString("relative-time.duration")),
77+
Placeholder.component("t", duration)
78+
);
7479
}
7580

7681
public @NotNull Component relativeTimeDurationIndefinite() {
77-
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("relative-time.duration-indefinite")));
82+
return MiniMessage.miniMessage().deserialize(
83+
Objects.requireNonNull(config.getString("relative-time.duration-indefinite"))
84+
);
7885
}
7986
}

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.TimeZone;
2626
import java.util.stream.Collectors;
2727

28-
public class Messages extends BaseConfig {
28+
public final class Messages extends BaseConfig {
2929

3030
public Messages() {
3131
super("messages.yml");
@@ -65,7 +65,10 @@ public Messages() {
6565
return MiniMessage.miniMessage()
6666
.deserialize(
6767
Objects.requireNonNull(config.getString("banned-player")),
68-
Placeholder.unparsed("player", Optional.ofNullable(player.getName()).orElse(player.getUniqueId().toString())),
68+
Placeholder.unparsed("player",
69+
Optional.ofNullable(player.getName())
70+
.orElse(player.getUniqueId().toString())
71+
),
6972
Placeholder.component("duration", formatDuration(duration))
7073
);
7174
}
@@ -74,7 +77,10 @@ public Messages() {
7477
return MiniMessage.miniMessage()
7578
.deserialize(
7679
Objects.requireNonNull(config.getString("banned-member")),
77-
Placeholder.unparsed("player", Optional.ofNullable(member.player().getName()).orElse(member.player().getUniqueId().toString())),
80+
Placeholder.unparsed("player",
81+
Optional.ofNullable(member.player().getName())
82+
.orElse(member.player().getUniqueId().toString())
83+
),
7884
Placeholder.component("duration", formatDuration(duration))
7985
);
8086
}
@@ -86,7 +92,10 @@ public Messages() {
8692
return MiniMessage.miniMessage()
8793
.deserialize(
8894
Objects.requireNonNull(config.getString("banned-member-chain")),
89-
Placeholder.unparsed("player", Optional.ofNullable(member.player().getName()).orElse(member.player().getUniqueId().toString())),
95+
Placeholder.unparsed("player",
96+
Optional.ofNullable(member.player().getName())
97+
.orElse(member.player().getUniqueId().toString())
98+
),
9099
Placeholder.unparsed("n-alt", String.valueOf(alts.size())),
91100
Placeholder.unparsed("alts", altsString),
92101
Placeholder.component("duration", formatDuration(duration))

src/main/java/pro/cloudnode/smp/smpcore/command/BanCommand.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public final class BanCommand extends Command {
2828
public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNull String @NotNull [] args) {
2929
if (!sender.hasPermission(Permission.BAN))
3030
return sendMessage(sender, SMPCore.messages().errorNoPermission());
31-
if (args.length < 1) return sendMessage(sender, SMPCore.messages().usage(label, "<username> [duration] [reason]"));
31+
if (args.length < 1)
32+
return sendMessage(sender, SMPCore.messages().usage(label, "<username> [duration] [reason]"));
3233

3334
final @Nullable String durationArg = args.length > 1 ? args[1] : null;
3435
@Nullable Duration duration = null;
@@ -42,7 +43,9 @@ public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNul
4243

4344
final @Nullable Date banExpiry = duration == null ? null : Date.from(Instant.now().plus(duration));
4445

45-
final @Nullable String reason = args.length > 1 ? String.join(" ", Arrays.copyOfRange(args, duration == null ? 1 : 2, args.length)) : null;
46+
final @Nullable String reason = args.length > 1
47+
? String.join(" ", Arrays.copyOfRange(args, duration == null ? 1 : 2, args.length))
48+
: null;
4649
final @NotNull NamespacedKey banSource;
4750
if (sender instanceof final @NotNull Player player)
4851
banSource = new NamespacedKey(SMPCore.getInstance(), "player/" + player.getUniqueId());

0 commit comments

Comments
 (0)