Format code

This commit is contained in:
2026-05-17 10:08:06 +02:00
parent d110df924e
commit 5125453406
152 changed files with 752 additions and 814 deletions
@@ -86,10 +86,11 @@ public interface Chatter {
default <T> T withPlayerOrOffline(Function<Player, T> withPlayer, Supplier<T> withOffline) {
Player player = getPlayer();
if (player == null)
if (player == null) {
return withOffline.get();
else
} else {
return withPlayer.apply(player);
}
}
default void withPlayerOrOffline(Consumer<Player> withPlayer, Runnable withOffline) {
@@ -128,10 +129,12 @@ public interface Chatter {
default void send(boolean prefixed, Message onHover, ClickEvent onClick, Message message) {
Component msg = parse(prefixed, message);
if (onHover != null)
if (onHover != null) {
msg = msg.hoverEvent(HoverEvent.showText(parse(false, onHover)));
if (onClick != null)
}
if (onClick != null) {
msg = msg.clickEvent(onClick);
}
sendMessage(msg);
}
@@ -167,8 +170,9 @@ public interface Chatter {
Locale locale = getLocale();
ResourceBundle resourceBundle = SteamwarResourceBundle.getResourceBundle(locale);
String pattern = "";
if (prefixed)
if (prefixed) {
pattern = resourceBundle.getObject("PREFIX") + " ";
}
pattern += (String) resourceBundle.getObject(message.format());
MessageFormat format = new MessageFormat(pattern, locale);
@@ -200,8 +204,7 @@ public interface Chatter {
}
static Chatter of(CommandSource sender) {
if (sender instanceof Player player)
return of(player);
if (sender instanceof Player player) return of(player);
//Console
return new PlayerlessChatter() {
@@ -232,8 +235,7 @@ public interface Chatter {
static Chatter of(UUID uuid, boolean playerlessChatShown) {
Player player = VelocityCore.getProxy().getPlayer(uuid).orElse(null);
if (player != null)
return Chatter.of(player);
if (player != null) return Chatter.of(player);
return new PlayerlessChatter() {
@Override
@@ -46,8 +46,7 @@ public class PlayerChatter implements Chatter {
@Override
public boolean chatShown() {
if (!player.hasSentPlayerSettings())
return false;
if (!player.hasSentPlayerSettings()) return false;
return player.getPlayerSettings().getChatMode() == PlayerSettings.ChatMode.SHOWN;
}
@@ -36,8 +36,7 @@ public class SteamwarResourceBundle extends PropertyResourceBundle {
private static synchronized ResourceBundle getResourceBundle(String locale, ResourceBundle parent) {
return bundles.computeIfAbsent(locale, locale1 -> {
InputStream inputStream = Message.class.getResourceAsStream(BASE_PATH + ("".equals(locale) ? "" : "_" + locale) + ".properties");
if (inputStream == null)
return parent;
if (inputStream == null) return parent;
try {
return new SteamwarResourceBundle(inputStream, parent);
} catch (IOException e) {