Format code

This commit is contained in:
2026-05-16 23:08:09 +02:00
parent 81dd8045f2
commit d110df924e
562 changed files with 11025 additions and 10059 deletions
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -77,27 +77,33 @@ public interface Chatter {
SteamwarUser user();
Locale getLocale();
boolean chatShown();
void sendMessage(Component msg);
Player getPlayer();
default <T> T withPlayerOrOffline(Function<Player, T> withPlayer, Supplier<T> withOffline) {
Player player = getPlayer();
if(player == null)
if (player == null)
return withOffline.get();
else
return withPlayer.apply(player);
}
default void withPlayerOrOffline(Consumer<Player> withPlayer, Runnable withOffline) {
Player player = getPlayer();
if(player == null) {
if (player == null) {
withOffline.run();
} else {
withPlayer.accept(player);
}
}
default void withPlayer(Consumer<Player> function) {
withPlayerOrOffline(function, () -> {});
withPlayerOrOffline(function, () -> {
});
}
default void system(String format, Object... params) {
@@ -122,9 +128,9 @@ 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);
}
@@ -161,24 +167,24 @@ 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());
pattern += (String) resourceBundle.getObject(message.format());
MessageFormat format = new MessageFormat(pattern, locale);
Object[] params = message.params();
for (int i = 0; i < params.length; i++) {
if(params[i] instanceof Message msg) {
if (params[i] instanceof Message msg) {
params[i] = parseToLegacy(msg);
} else if(params[i] instanceof Date date) {
} else if (params[i] instanceof Date date) {
params[i] = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, locale).format(date);
} else if(params[i] instanceof SteamwarUser user) {
} else if (params[i] instanceof SteamwarUser user) {
params[i] = user.getUserName();
} else if(params[i] instanceof Player player) {
} else if (params[i] instanceof Player player) {
params[i] = player.getUsername();
} else if(params[i] instanceof Chatter chatter) {
} else if (params[i] instanceof Chatter chatter) {
params[i] = chatter.user().getUserName();
} else if(params[i] instanceof Function func) {
} else if (params[i] instanceof Function func) {
params[i] = func.apply(this);
}
}
@@ -194,7 +200,7 @@ public interface Chatter {
}
static Chatter of(CommandSource sender) {
if(sender instanceof Player player)
if (sender instanceof Player player)
return of(player);
//Console
@@ -226,7 +232,7 @@ public interface Chatter {
static Chatter of(UUID uuid, boolean playerlessChatShown) {
Player player = VelocityCore.getProxy().getPlayer(uuid).orElse(null);
if(player != null)
if (player != null)
return Chatter.of(player);
return new PlayerlessChatter() {
@@ -47,7 +47,7 @@ public class ChatterGroup extends Chatter.PlayerlessChatter {
@Override
public void send(boolean prefixed, Message onHover, ClickEvent onClick, Message message) {
for(Chatter sender : chatters)
for (Chatter sender : chatters)
sender.send(prefixed, onHover, onClick, message);
}
@@ -19,4 +19,5 @@
package de.steamwar.messages;
public record Message(String format, Object... params) { }
public record Message(String format, Object... params) {
}
@@ -46,7 +46,7 @@ public class PlayerChatter implements Chatter {
@Override
public boolean chatShown() {
if(!player.hasSentPlayerSettings())
if (!player.hasSentPlayerSettings())
return false;
return player.getPlayerSettings().getChatMode() == PlayerSettings.ChatMode.SHOWN;
@@ -30,13 +30,13 @@ public class SteamwarResourceBundle extends PropertyResourceBundle {
private static final Map<String, ResourceBundle> bundles = new HashMap<>();
public static ResourceBundle getResourceBundle(Locale locale) {
return getResourceBundle(locale.toString(), getResourceBundle(locale.getLanguage(), getResourceBundle( "", null)));
return getResourceBundle(locale.toString(), getResourceBundle(locale.getLanguage(), getResourceBundle("", null)));
}
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)
if (inputStream == null)
return parent;
try {
return new SteamwarResourceBundle(inputStream, parent);