GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00
Code Issues Releases Activity

Spigot and Bungee console should no longer print json

Browse Source
This commit is contained in:
Tim203
2021-02-16 18:48:40 +01:00
parent f149e94964
commit 06edd573db
7 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bungee/pom.xml
View File

@@ -43,7 +43,12 @@
<dependency>
<groupId>net.kyori</groupId>
<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>
<!-- the following common dependencies are already present on the platform -->
<dependency>

9
bungee/src/main/java/org/geysermc/floodgate/util/BungeeUserAudience.java
View File

@@ -32,6 +32,7 @@ import net.kyori.adventure.audience.ForwardingAudience;
import net.kyori.adventure.audience.MessageType;
import net.kyori.adventure.identity.Identity;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.md_5.bungee.api.CommandSender;
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) {
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

4
common/pom.xml
View File

@@ -99,6 +99,10 @@
<name>Minecraft Libraries</name>
<url>https://libraries.minecraft.net</url>
</repository>
<repository>
<id>paper repo</id>
<url>https://papermc.io/repo/repository/maven-public/</url>
</repository>
</repositories>
<build>

15
common/src/main/java/org/geysermc/floodgate/player/UserAudienceArgument.java
View File

@@ -47,12 +47,9 @@ public final class UserAudienceArgument extends CommandArgument<UserAudience, Us
final String name,
final boolean allowUuid,
final boolean allowOffline,
final PlayerType limitTo
) {
return new UserAudienceArgument(
name,
new UserAudienceParser(allowUuid, allowOffline, limitTo)
);
final PlayerType limitTo) {
return new UserAudienceArgument(name,
new UserAudienceParser(allowUuid, allowOffline, limitTo));
}
public static UserAudienceArgument of(
@@ -95,8 +92,7 @@ public final class UserAudienceArgument extends CommandArgument<UserAudience, Us
@Override
public @NonNull ArgumentParseResult<UserAudience> parse(
final @NonNull CommandContext<@NonNull UserAudience> commandContext,
final @NonNull Queue<@NonNull String> inputQueue
) {
final @NonNull Queue<@NonNull String> inputQueue) {
CommandUtil commandUtil = commandContext.get("CommandUtil");
final String input = inputQueue.peek();
@@ -153,8 +149,7 @@ public final class UserAudienceArgument extends CommandArgument<UserAudience, Us
@Override
public @NonNull List<String> suggestions(
final @NonNull CommandContext<UserAudience> commandContext,
final @NonNull String input
) {
final @NonNull String input) {
final CommandUtil commandUtil = commandContext.get("CommandUtil");
final String trimmedInput = input.trim();

2
pom.xml
View File

@@ -63,7 +63,7 @@
<bungee.version>1.15-SNAPSHOT</bungee.version>
<velocity.version>1.1.0</velocity.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>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

4
spigot/pom.xml
View File

@@ -57,8 +57,8 @@
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>${adventure.version}</version>
<artifactId>adventure-text-serializer-craftbukkit</artifactId>
<version>${adventure-serializer.version}</version>
</dependency>
<!-- the following common dependencies are already present on the platform -->
<dependency>

16
spigot/src/main/java/org/geysermc/floodgate/util/SpigotUserAudience.java
View File

@@ -25,6 +25,8 @@
package org.geysermc.floodgate.util;
import static net.kyori.adventure.text.serializer.craftbukkit.BukkitComponentSerializer.legacy;
import java.util.UUID;
import lombok.RequiredArgsConstructor;
import net.kyori.adventure.audience.Audience;
@@ -73,8 +75,10 @@ public class SpigotUserAudience implements UserAudience, ForwardingAudience.Sing
}
@Override
public void sendMessage(@NonNull Identity source, @NonNull Component message,
@NonNull MessageType type) {
public void sendMessage(
@NonNull Identity source,
@NonNull Component message,
@NonNull MessageType type) {
this.source.sendMessage(GsonComponentSerializer.gson().serialize(message));
}
@@ -106,6 +110,14 @@ public class SpigotUserAudience implements UserAudience, ForwardingAudience.Sing
public SpigotConsoleAudience(CommandSender source, CommandUtil 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