Mirrors/Velocity
1
0
Fork 1
mirror of https://github.com/PaperMC/Velocity.git synced 2026-02-17 14:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Manually merge in conflicting 2.0.0 changes into the 1.1.0 merge.

Browse Source
This commit is contained in:
Andrew Steinborn
2020-10-28 20:36:22 -04:00
parent e21cd77ae7
commit 8dd83193c8
3 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/main/java/com/velocitypowered/api/proxy/messages/MinecraftChannelIdentifier.java
View File

@@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import java.util.Objects;
import java.util.regex.Pattern;
import net.kyori.minecraft.Key;
import org.checkerframework.checker.nullness.qual.Nullable;
/**
@@ -70,16 +69,6 @@ public final class MinecraftChannelIdentifier implements ChannelIdentifier {
return create(namespace, name);
}
/**
* Creates an channel identifier from the specified Minecraft identifier.
*
* @param key the Minecraft key to use
* @return a new channel identifier
*/
public static MinecraftChannelIdentifier from(Key key) {
return create(key.namespace(), key.value());
}
public String getNamespace() {
return namespace;
}
@@ -88,10 +77,6 @@ public final class MinecraftChannelIdentifier implements ChannelIdentifier {
return name;
}
public Key asKey() {
return Key.of(namespace, name);
}
@Override
public String toString() {
return namespace + ":" + name + " (modern)";