geforkt von Mirrors/Velocity
Fix compile error
While we're at it, change the newly-introduced shutdown API to use a generic Adventure component instead.
Dieser Commit ist enthalten in:
Ursprung
fe0d31b0f0
Commit
764c8ed3e5
@ -18,8 +18,6 @@ import java.util.Collection;
|
|||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import net.kyori.adventure.audience.Audience;
|
import net.kyori.adventure.audience.Audience;
|
||||||
import net.kyori.adventure.text.Component;
|
|
||||||
import net.kyori.adventure.text.TextComponent;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -32,7 +30,7 @@ public interface ProxyServer extends Audience {
|
|||||||
*
|
*
|
||||||
* @param reason message to kick online players with
|
* @param reason message to kick online players with
|
||||||
*/
|
*/
|
||||||
void shutdown(TextComponent reason);
|
void shutdown(net.kyori.adventure.text.Component reason);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Shuts down the proxy, kicking players with the default reason.
|
* Shuts down the proxy, kicking players with the default reason.
|
||||||
|
@ -76,9 +76,9 @@ import java.util.function.IntFunction;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import net.kyori.adventure.audience.Audience;
|
import net.kyori.adventure.audience.Audience;
|
||||||
import net.kyori.adventure.audience.ForwardingAudience;
|
import net.kyori.adventure.audience.ForwardingAudience;
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.TextComponent;
|
import net.kyori.adventure.text.TextComponent;
|
||||||
import net.kyori.adventure.text.TranslatableComponent;
|
import net.kyori.adventure.text.TranslatableComponent;
|
||||||
import net.kyori.text.Component;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.asynchttpclient.AsyncHttpClient;
|
import org.asynchttpclient.AsyncHttpClient;
|
||||||
@ -168,7 +168,7 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull BossBar createBossBar(
|
public @NonNull BossBar createBossBar(
|
||||||
@NonNull Component title,
|
net.kyori.text.@NonNull Component title,
|
||||||
@NonNull BossBarColor color,
|
@NonNull BossBarColor color,
|
||||||
@NonNull BossBarOverlay overlay,
|
@NonNull BossBarOverlay overlay,
|
||||||
float progress) {
|
float progress) {
|
||||||
@ -392,7 +392,7 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
|
|||||||
* @param explicitExit whether the user explicitly shut down the proxy
|
* @param explicitExit whether the user explicitly shut down the proxy
|
||||||
* @param reason message to kick online players with
|
* @param reason message to kick online players with
|
||||||
*/
|
*/
|
||||||
public void shutdown(boolean explicitExit, TextComponent reason) {
|
public void shutdown(boolean explicitExit, Component reason) {
|
||||||
if (eventManager == null || pluginManager == null || cm == null || scheduler == null) {
|
if (eventManager == null || pluginManager == null || cm == null || scheduler == null) {
|
||||||
throw new AssertionError();
|
throw new AssertionError();
|
||||||
}
|
}
|
||||||
@ -461,7 +461,7 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calls {@link #shutdown(boolean, TextComponent)} with the default reason "Proxy shutting down."
|
* Calls {@link #shutdown(boolean, Component)} with the default reason "Proxy shutting down."
|
||||||
*
|
*
|
||||||
* @param explicitExit whether the user explicitly shut down the proxy
|
* @param explicitExit whether the user explicitly shut down the proxy
|
||||||
*/
|
*/
|
||||||
@ -470,7 +470,7 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void shutdown(TextComponent reason) {
|
public void shutdown(Component reason) {
|
||||||
shutdown(true, reason);
|
shutdown(true, reason);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -554,7 +554,7 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void broadcast(Component component) {
|
public void broadcast(net.kyori.text.Component component) {
|
||||||
Preconditions.checkNotNull(component, "component");
|
Preconditions.checkNotNull(component, "component");
|
||||||
Chat chat = Chat.createClientbound(component);
|
Chat chat = Chat.createClientbound(component);
|
||||||
for (ConnectedPlayer player : connectionsByUuid.values()) {
|
for (ConnectedPlayer player : connectionsByUuid.values()) {
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren