mirror of
https://github.com/GeyserMC/Floodgate.git
synced 2025-12-21 07:49:18 +00:00
Spigot and Bungee console should no longer print json
This commit is contained in:
@@ -43,7 +43,12 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.kyori</groupId>
|
<groupId>net.kyori</groupId>
|
||||||
<artifactId>adventure-text-serializer-gson</artifactId>
|
<artifactId>adventure-text-serializer-gson</artifactId>
|
||||||
<version>${adventure.version}</version>
|
<version>${adventure-serializer.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.kyori</groupId>
|
||||||
|
<artifactId>adventure-text-serializer-bungeecord</artifactId>
|
||||||
|
<version>${adventure-serializer.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- the following common dependencies are already present on the platform -->
|
<!-- the following common dependencies are already present on the platform -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ import net.kyori.adventure.audience.ForwardingAudience;
|
|||||||
import net.kyori.adventure.audience.MessageType;
|
import net.kyori.adventure.audience.MessageType;
|
||||||
import net.kyori.adventure.identity.Identity;
|
import net.kyori.adventure.identity.Identity;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
|
import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
|
||||||
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
|
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
|
||||||
import net.md_5.bungee.api.CommandSender;
|
import net.md_5.bungee.api.CommandSender;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
@@ -106,6 +107,14 @@ public class BungeeUserAudience implements UserAudience, ForwardingAudience.Sing
|
|||||||
public BungeeConsoleAudience(CommandSender source, CommandUtil commandUtil) {
|
public BungeeConsoleAudience(CommandSender source, CommandUtil commandUtil) {
|
||||||
super(new UUID(0, 0), "en_us", source, commandUtil);
|
super(new UUID(0, 0), "en_us", source, commandUtil);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void sendMessage(
|
||||||
|
@NonNull Identity source,
|
||||||
|
@NonNull Component message,
|
||||||
|
@NonNull MessageType type) {
|
||||||
|
source().sendMessage(BungeeComponentSerializer.get().serialize(message));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class BungeePlayerAudience extends BungeeUserAudience
|
public static final class BungeePlayerAudience extends BungeeUserAudience
|
||||||
|
|||||||
@@ -99,6 +99,10 @@
|
|||||||
<name>Minecraft Libraries</name>
|
<name>Minecraft Libraries</name>
|
||||||
<url>https://libraries.minecraft.net</url>
|
<url>https://libraries.minecraft.net</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>paper repo</id>
|
||||||
|
<url>https://papermc.io/repo/repository/maven-public/</url>
|
||||||
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
@@ -47,12 +47,9 @@ public final class UserAudienceArgument extends CommandArgument<UserAudience, Us
|
|||||||
final String name,
|
final String name,
|
||||||
final boolean allowUuid,
|
final boolean allowUuid,
|
||||||
final boolean allowOffline,
|
final boolean allowOffline,
|
||||||
final PlayerType limitTo
|
final PlayerType limitTo) {
|
||||||
) {
|
return new UserAudienceArgument(name,
|
||||||
return new UserAudienceArgument(
|
new UserAudienceParser(allowUuid, allowOffline, limitTo));
|
||||||
name,
|
|
||||||
new UserAudienceParser(allowUuid, allowOffline, limitTo)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static UserAudienceArgument of(
|
public static UserAudienceArgument of(
|
||||||
@@ -95,8 +92,7 @@ public final class UserAudienceArgument extends CommandArgument<UserAudience, Us
|
|||||||
@Override
|
@Override
|
||||||
public @NonNull ArgumentParseResult<UserAudience> parse(
|
public @NonNull ArgumentParseResult<UserAudience> parse(
|
||||||
final @NonNull CommandContext<@NonNull UserAudience> commandContext,
|
final @NonNull CommandContext<@NonNull UserAudience> commandContext,
|
||||||
final @NonNull Queue<@NonNull String> inputQueue
|
final @NonNull Queue<@NonNull String> inputQueue) {
|
||||||
) {
|
|
||||||
CommandUtil commandUtil = commandContext.get("CommandUtil");
|
CommandUtil commandUtil = commandContext.get("CommandUtil");
|
||||||
|
|
||||||
final String input = inputQueue.peek();
|
final String input = inputQueue.peek();
|
||||||
@@ -153,8 +149,7 @@ public final class UserAudienceArgument extends CommandArgument<UserAudience, Us
|
|||||||
@Override
|
@Override
|
||||||
public @NonNull List<String> suggestions(
|
public @NonNull List<String> suggestions(
|
||||||
final @NonNull CommandContext<UserAudience> commandContext,
|
final @NonNull CommandContext<UserAudience> commandContext,
|
||||||
final @NonNull String input
|
final @NonNull String input) {
|
||||||
) {
|
|
||||||
final CommandUtil commandUtil = commandContext.get("CommandUtil");
|
final CommandUtil commandUtil = commandContext.get("CommandUtil");
|
||||||
final String trimmedInput = input.trim();
|
final String trimmedInput = input.trim();
|
||||||
|
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@@ -63,7 +63,7 @@
|
|||||||
<bungee.version>1.15-SNAPSHOT</bungee.version>
|
<bungee.version>1.15-SNAPSHOT</bungee.version>
|
||||||
<velocity.version>1.1.0</velocity.version>
|
<velocity.version>1.1.0</velocity.version>
|
||||||
<cloud.version>1.3.0</cloud.version>
|
<cloud.version>1.3.0</cloud.version>
|
||||||
<adventure.version>4.3.0</adventure.version>
|
<adventure-serializer.version>4.0.0-SNAPSHOT</adventure-serializer.version>
|
||||||
|
|
||||||
<outputName>floodgate-${project.name}</outputName>
|
<outputName>floodgate-${project.name}</outputName>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
|||||||
@@ -57,8 +57,8 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.kyori</groupId>
|
<groupId>net.kyori</groupId>
|
||||||
<artifactId>adventure-text-serializer-gson</artifactId>
|
<artifactId>adventure-text-serializer-craftbukkit</artifactId>
|
||||||
<version>${adventure.version}</version>
|
<version>${adventure-serializer.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- the following common dependencies are already present on the platform -->
|
<!-- the following common dependencies are already present on the platform -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@@ -25,6 +25,8 @@
|
|||||||
|
|
||||||
package org.geysermc.floodgate.util;
|
package org.geysermc.floodgate.util;
|
||||||
|
|
||||||
|
import static net.kyori.adventure.text.serializer.craftbukkit.BukkitComponentSerializer.legacy;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import net.kyori.adventure.audience.Audience;
|
import net.kyori.adventure.audience.Audience;
|
||||||
@@ -73,7 +75,9 @@ public class SpigotUserAudience implements UserAudience, ForwardingAudience.Sing
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void sendMessage(@NonNull Identity source, @NonNull Component message,
|
public void sendMessage(
|
||||||
|
@NonNull Identity source,
|
||||||
|
@NonNull Component message,
|
||||||
@NonNull MessageType type) {
|
@NonNull MessageType type) {
|
||||||
this.source.sendMessage(GsonComponentSerializer.gson().serialize(message));
|
this.source.sendMessage(GsonComponentSerializer.gson().serialize(message));
|
||||||
}
|
}
|
||||||
@@ -106,6 +110,14 @@ public class SpigotUserAudience implements UserAudience, ForwardingAudience.Sing
|
|||||||
public SpigotConsoleAudience(CommandSender source, CommandUtil commandUtil) {
|
public SpigotConsoleAudience(CommandSender source, CommandUtil commandUtil) {
|
||||||
super(new UUID(0, 0), "en_us", source, commandUtil);
|
super(new UUID(0, 0), "en_us", source, commandUtil);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void sendMessage(
|
||||||
|
@NonNull Identity source,
|
||||||
|
@NonNull Component message,
|
||||||
|
@NonNull MessageType type) {
|
||||||
|
source().sendMessage(legacy().serialize(message));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class SpigotPlayerAudience extends SpigotUserAudience
|
public static final class SpigotPlayerAudience extends SpigotUserAudience
|
||||||
|
|||||||
Reference in New Issue
Block a user