minimessage conversion
This commit is contained in:
Jake Potrebic
parent
c34a306393
commit
c946526ab1
27 changed files with 167 additions and 82 deletions
|
|
@ -404,17 +404,18 @@ index 0000000000000000000000000000000000000000..844275e8671c62633e370ae3d4e0738e
|
|||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..30633591ecd078997e7bb0dc937f8c5ddedaa3ab
|
||||
index 0000000000000000000000000000000000000000..5a808a09291da691cbee75a55f6aa1b70ac9f018
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||
@@ -0,0 +1,263 @@
|
||||
@@ -0,0 +1,264 @@
|
||||
+package io.papermc.paper.configuration;
|
||||
+
|
||||
+import co.aikar.timings.MinecraftTimings;
|
||||
+import co.aikar.timings.TimingsManager;
|
||||
+import com.destroystokyo.paper.io.chunk.ChunkTaskManager;
|
||||
+import io.papermc.paper.configuration.constraint.Constraint;
|
||||
+import io.papermc.paper.configuration.constraint.Constraints;
|
||||
+import net.kyori.adventure.text.Component;
|
||||
+import net.kyori.adventure.text.format.NamedTextColor;
|
||||
+import net.minecraft.network.protocol.Packet;
|
||||
+import net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket;
|
||||
+import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
|
@ -447,13 +448,13 @@ index 0000000000000000000000000000000000000000..30633591ecd078997e7bb0dc937f8c5d
|
|||
+ public Kick kick;
|
||||
+
|
||||
+ public class Kick extends ConfigurationPart {
|
||||
+ public String authenticationServersDown = ""; // TODO empty is fallback to translatable msg
|
||||
+ public String connectionThrottle = "Connection throttled! Please wait before reconnecting.";
|
||||
+ public String flyingPlayer = "Flying is not enabled on this server";
|
||||
+ public String flyingVehicle = "Flying is not enabled on this server";
|
||||
+ public Component authenticationServersDown = Component.translatable("multiplayer.disconnect.authservers_down");
|
||||
+ public Component connectionThrottle = Component.text("Connection throttled! Please wait before reconnecting.");
|
||||
+ public Component flyingPlayer = Component.translatable("multiplayer.disconnect.flying");
|
||||
+ public Component flyingVehicle = Component.translatable("multiplayer.disconnect.flying");
|
||||
+ }
|
||||
+
|
||||
+ public String noPermission = "&cI'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error.";
|
||||
+ public Component noPermission = Component.text("I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error.", NamedTextColor.RED);
|
||||
+ public boolean useDisplayNameInQuitMessage = false;
|
||||
+ }
|
||||
+
|
||||
|
|
@ -613,7 +614,7 @@ index 0000000000000000000000000000000000000000..30633591ecd078997e7bb0dc937f8c5d
|
|||
+ public PacketLimiter packetLimiter;
|
||||
+
|
||||
+ public class PacketLimiter extends ConfigurationPart {
|
||||
+ public String kickMessage = "&cSent too many packets"; // todo: minimessage
|
||||
+ public Component kickMessage = Component.translatable("disconnect.exceeded_packet_rate", NamedTextColor.RED);
|
||||
+ public PacketLimit allPackets = new PacketLimit(7.0, 500.0, PacketLimit.ViolateAction.KICK);
|
||||
+ public Map<Class<? extends Packet<?>>, PacketLimit> overrides = Map.of(ServerboundPlaceRecipePacket.class, new PacketLimit(4.0, 5.0, PacketLimit.ViolateAction.DROP));
|
||||
+
|
||||
|
|
@ -835,10 +836,10 @@ index 0000000000000000000000000000000000000000..69add4a7f1147015806bc9b63a8340d1
|
|||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..d25393aa10a02a74f500c520bfb2979428693177
|
||||
index 0000000000000000000000000000000000000000..214bc66788d1736d40202b794ab5f820e0ebe611
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
|
||||
@@ -0,0 +1,392 @@
|
||||
@@ -0,0 +1,394 @@
|
||||
+package io.papermc.paper.configuration;
|
||||
+
|
||||
+import com.google.common.base.Suppliers;
|
||||
|
|
@ -846,6 +847,7 @@ index 0000000000000000000000000000000000000000..d25393aa10a02a74f500c520bfb29794
|
|||
+import com.mojang.logging.LogUtils;
|
||||
+import io.leangen.geantyref.TypeToken;
|
||||
+import io.papermc.paper.configuration.legacy.RequiresSpigotInitialization;
|
||||
+import io.papermc.paper.configuration.serializer.ComponentSerializer;
|
||||
+import io.papermc.paper.configuration.serializer.EnumValueSerializer;
|
||||
+import io.papermc.paper.configuration.serializer.FastutilMapSerializer;
|
||||
+import io.papermc.paper.configuration.serializer.PacketClassSerializer;
|
||||
|
|
@ -971,6 +973,7 @@ index 0000000000000000000000000000000000000000..d25393aa10a02a74f500c520bfb29794
|
|||
+ return options.serializers(builder -> builder
|
||||
+ .register(MapSerializer.TYPE, new MapSerializer(false))
|
||||
+ .register(new EnumValueSerializer())
|
||||
+ .register(new ComponentSerializer())
|
||||
+ );
|
||||
+ }
|
||||
+
|
||||
|
|
@ -2006,6 +2009,38 @@ index 0000000000000000000000000000000000000000..4e3bcd7c478096384fcc643d48771ab9
|
|||
+import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
+import org.checkerframework.framework.qual.DefaultQualifier;
|
||||
\ No newline at end of file
|
||||
diff --git a/src/main/java/io/papermc/paper/configuration/serializer/ComponentSerializer.java b/src/main/java/io/papermc/paper/configuration/serializer/ComponentSerializer.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..9c339ef178ebc3b0251095f320e4a7a3656d3521
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/configuration/serializer/ComponentSerializer.java
|
||||
@@ -0,0 +1,26 @@
|
||||
+package io.papermc.paper.configuration.serializer;
|
||||
+
|
||||
+import net.kyori.adventure.text.Component;
|
||||
+import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
+import org.spongepowered.configurate.serialize.ScalarSerializer;
|
||||
+import org.spongepowered.configurate.serialize.SerializationException;
|
||||
+
|
||||
+import java.lang.reflect.Type;
|
||||
+import java.util.function.Predicate;
|
||||
+
|
||||
+public class ComponentSerializer extends ScalarSerializer<Component> {
|
||||
+
|
||||
+ public ComponentSerializer() {
|
||||
+ super(Component.class);
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public Component deserialize(Type type, Object obj) throws SerializationException {
|
||||
+ return MiniMessage.miniMessage().deserialize(obj.toString());
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ protected Object serialize(Component component, Predicate<Class<?>> typeSupported) {
|
||||
+ return MiniMessage.miniMessage().serialize(component);
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/configuration/serializer/EnumValueSerializer.java b/src/main/java/io/papermc/paper/configuration/serializer/EnumValueSerializer.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..2afb9268447792e3cdb46172b2050dbce066c59a
|
||||
|
|
@ -2693,18 +2728,23 @@ index 0000000000000000000000000000000000000000..0300fb1e09d41465e4a50bfdc987b957
|
|||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/configuration/transformation/global/LegacyPaperConfig.java b/src/main/java/io/papermc/paper/configuration/transformation/global/LegacyPaperConfig.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..9866cffcec3fdff4f9abc616d4374591d8d13860
|
||||
index 0000000000000000000000000000000000000000..55886e548d3b140c4fb14495f7265ea3e1c26fd0
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/configuration/transformation/global/LegacyPaperConfig.java
|
||||
@@ -0,0 +1,190 @@
|
||||
@@ -0,0 +1,236 @@
|
||||
+package io.papermc.paper.configuration.transformation.global;
|
||||
+
|
||||
+import com.mojang.logging.LogUtils;
|
||||
+import io.papermc.paper.configuration.Configuration;
|
||||
+import io.papermc.paper.configuration.serializer.PacketClassSerializer;
|
||||
+import io.papermc.paper.util.ObfHelper;
|
||||
+import net.kyori.adventure.text.Component;
|
||||
+import net.kyori.adventure.text.format.NamedTextColor;
|
||||
+import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
||||
+import net.minecraft.network.protocol.Packet;
|
||||
+import net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket;
|
||||
+import org.bukkit.ChatColor;
|
||||
+import org.bukkit.configuration.file.YamlConfiguration;
|
||||
+import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
+import org.slf4j.Logger;
|
||||
|
|
@ -2713,6 +2753,8 @@ index 0000000000000000000000000000000000000000..9866cffcec3fdff4f9abc616d4374591
|
|||
+import org.spongepowered.configurate.transformation.ConfigurationTransformation;
|
||||
+import org.spongepowered.configurate.transformation.TransformAction;
|
||||
+
|
||||
+import java.util.function.Predicate;
|
||||
+
|
||||
+import static org.spongepowered.configurate.NodePath.path;
|
||||
+
|
||||
+public final class LegacyPaperConfig {
|
||||
|
|
@ -2867,10 +2909,49 @@ index 0000000000000000000000000000000000000000..9866cffcec3fdff4f9abc616d4374591
|
|||
+
|
||||
+ moveFromRoot(builder, "proxy-protocol", "proxies");
|
||||
+
|
||||
+ miniMessageWithTranslatable(builder, String::isBlank, "multiplayer.disconnect.authservers_down", "messages", "kick", "authentication-servers-down");
|
||||
+ miniMessageWithTranslatable(builder, Predicate.isEqual("Flying is not enabled on this server"), "multiplayer.disconnect.flying", "messages", "kick", "flying-player");
|
||||
+ miniMessageWithTranslatable(builder, Predicate.isEqual("Flying is not enabled on this server"), "multiplayer.disconnect.flying", "messages", "kick", "flying-vehicle");
|
||||
+ miniMessage(builder, "messages", "kick", "connection-throttle");
|
||||
+ miniMessage(builder, "messages", "no-permission");
|
||||
+ miniMessageWithTranslatable(builder, Predicate.isEqual("&cSent too many packets"), Component.translatable("disconnect.exceeded_packet_rate", NamedTextColor.RED), "packet-limiter", "kick-message");
|
||||
+
|
||||
+ return builder.build();
|
||||
+ }
|
||||
+
|
||||
+ private static void moveFromRootToMisc(final ConfigurationTransformation.Builder builder, String key) {
|
||||
+ private static void miniMessageWithTranslatable(final ConfigurationTransformation.Builder builder, final Predicate<String> englishCheck, final String i18nKey, final String... strPath) {
|
||||
+ miniMessageWithTranslatable(builder, englishCheck, Component.translatable(i18nKey), strPath);
|
||||
+ }
|
||||
+ private static void miniMessageWithTranslatable(final ConfigurationTransformation.Builder builder, final Predicate<String> englishCheck, final Component component, final String... strPath) {
|
||||
+ builder.addAction(path((Object[]) strPath), (path, value) -> {
|
||||
+ final @Nullable Object val = value.raw();
|
||||
+ if (val != null) {
|
||||
+ final String strVal = val.toString();
|
||||
+ if (!englishCheck.test(strVal)) {
|
||||
+ value.set(miniMessage(strVal));
|
||||
+ return null;
|
||||
+ }
|
||||
+ }
|
||||
+ value.set(MiniMessage.miniMessage().serialize(component));
|
||||
+ return null;
|
||||
+ });
|
||||
+ }
|
||||
+
|
||||
+ private static void miniMessage(final ConfigurationTransformation.Builder builder, final String... strPath) {
|
||||
+ builder.addAction(path((Object[]) strPath), (path, value) -> {
|
||||
+ final @Nullable Object val = value.raw();
|
||||
+ if (val != null) {
|
||||
+ value.set(miniMessage(val.toString()));
|
||||
+ }
|
||||
+ return null;
|
||||
+ });
|
||||
+ }
|
||||
+
|
||||
+ private static String miniMessage(final String input) {
|
||||
+ return MiniMessage.miniMessage().serialize(LegacyComponentSerializer.legacySection().deserialize(ChatColor.translateAlternateColorCodes('&', input)));
|
||||
+ }
|
||||
+
|
||||
+ private static void moveFromRootToMisc(final ConfigurationTransformation.Builder builder, final String key) {
|
||||
+ moveFromRoot(builder, key, "misc");
|
||||
+ }
|
||||
+
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue