Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-27 04:25:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #305 from HugoDaBosss/master

Browse Source 
Implement new protocol version registry
This commit is contained in:
Myles 2016-03-31 22:45:39 +01:00
commit ac8f7a00ae
5 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/us/myles/ViaVersion/api/protocol/ProtocolPipeline.java
View File

@ -82,11 +82,11 @@ public class ProtocolPipeline extends Protocol {
String packet = "UNKNOWN"; String packet = "UNKNOWN";
// For 1.8/1.9 server version, eventually we'll probably get an API for this... // For 1.8/1.9 server version, eventually we'll probably get an API for this...
if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.V1_8 && if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.v1_8.getId() &&
ProtocolRegistry.SERVER_PROTOCOL <= ProtocolVersion.V1_9_2) { ProtocolRegistry.SERVER_PROTOCOL <= ProtocolVersion.v1_9_2.getId()) {
PacketType type; PacketType type;
if (ProtocolRegistry.SERVER_PROTOCOL == ProtocolVersion.V1_8) { if (ProtocolRegistry.SERVER_PROTOCOL == ProtocolVersion.v1_8.getId()) {
if (direction == Direction.INCOMING) { if (direction == Direction.INCOMING) {
type = PacketType.findNewPacket(state, direction, originalID); type = PacketType.findNewPacket(state, direction, originalID);
} else { } else {

4
src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java
View File

@ -14,8 +14,8 @@ public class ProtocolRegistry {
static { static {
// Register built in protocols // Register built in protocols
registerProtocol(new Protocol1_9TO1_8(), Collections.singletonList(ProtocolVersion.V1_9), ProtocolVersion.V1_8); registerProtocol(new Protocol1_9TO1_8(), Collections.singletonList(ProtocolVersion.v1_9.getId()), ProtocolVersion.v1_8.getId());
registerProtocol(new Protocol1_9_1TO1_9(), Arrays.asList(ProtocolVersion.V1_9_1, ProtocolVersion.V1_9_2), ProtocolVersion.V1_9); registerProtocol(new Protocol1_9_1TO1_9(), Arrays.asList(ProtocolVersion.v1_9_1.getId(), ProtocolVersion.v1_9_2.getId()), ProtocolVersion.v1_9.getId());
} }
/** /**

47
src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
View File

@ -1,13 +1,46 @@
package us.myles.ViaVersion.api.protocol; package us.myles.ViaVersion.api.protocol;
import lombok.Data;
import lombok.NonNull;
import java.util.*;
@Data
public class ProtocolVersion { public class ProtocolVersion {
/* Defined protocol constants */ private static final Map<Integer, ProtocolVersion> versions = new HashMap<>();
public static final int V1_7_1 = 4;
public static final int V1_7_6 = 5;
public static final int V1_8 = 47; public static final ProtocolVersion v1_7_1;
public static final ProtocolVersion v1_7_6;
public static final ProtocolVersion v1_8;
public static final ProtocolVersion v1_9;
public static final ProtocolVersion v1_9_1;
public static final ProtocolVersion v1_9_2;
public static final int V1_9 = 107; private final int id;
public static final int V1_9_1 = 108; // used for 1.9.1 private final String name;
public static final int V1_9_2 = 109;
static {
register(v1_7_1 = new ProtocolVersion(4, "1.7-1.7.5"));
register(v1_7_6 = new ProtocolVersion(5, "1.7.6-1.7.10"));
register(v1_8 = new ProtocolVersion(47, "1.8.x"));
register(v1_9 = new ProtocolVersion(107, "1.9"));
register(v1_9_1 = new ProtocolVersion(108, "1.9.1"));
register(v1_9_2 = new ProtocolVersion(109, "1.9.2"));
}
public static void register(@NonNull ProtocolVersion protocol) {
versions.put(protocol.getId(), protocol);
}
public static boolean isRegistered(int id) {
return versions.containsKey(id);
}
public static ProtocolVersion getProtocol(int id) {
return versions.get(id);
}
public static List<ProtocolVersion> getProtocols() {
return Collections.unmodifiableList(new ArrayList<ProtocolVersion>(versions.values()));
}
} }

2
src/main/java/us/myles/ViaVersion/boss/ViaBossBar.java
View File

@ -154,7 +154,7 @@ public class ViaBossBar implements BossBar {
} }
private void sendPacket(UUID uuid, ByteBuf buf) { private void sendPacket(UUID uuid, ByteBuf buf) {
if (!ViaVersion.getInstance().isPorted(uuid) || !(ViaVersion.getInstance().getPlayerVersion(uuid) >= ProtocolVersion.V1_9)) { if (!ViaVersion.getInstance().isPorted(uuid) || !(ViaVersion.getInstance().getPlayerVersion(uuid) >= ProtocolVersion.v1_9.getId())) {
players.remove(uuid); players.remove(uuid);
return; return;
} }

3
src/main/java/us/myles/ViaVersion/commands/defaultsubs/ListSubCmd.java
View File

@ -5,6 +5,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import us.myles.ViaVersion.api.ViaVersion; import us.myles.ViaVersion.api.ViaVersion;
import us.myles.ViaVersion.api.command.ViaSubCommand; import us.myles.ViaVersion.api.command.ViaSubCommand;
import us.myles.ViaVersion.api.protocol.ProtocolVersion;
import java.util.*; import java.util.*;
@ -38,7 +39,7 @@ public class ListSubCmd extends ViaSubCommand {
Map<Integer, Set<String>> sorted = new TreeMap<>(playerVersions); Map<Integer, Set<String>> sorted = new TreeMap<>(playerVersions);
for (Map.Entry<Integer, Set<String>> entry : sorted.entrySet()) for (Map.Entry<Integer, Set<String>> entry : sorted.entrySet())
sender.sendMessage(String.format(color("&8[&6%s&8]: &b%s"), entry.getKey(), entry.getValue())); //TODO: Make versions like [1.8,1.9,1.9.1,1.9.2,etc] instead of protocol id sender.sendMessage(String.format(color("&8[&6%s&8]: &b%s"), ProtocolVersion.getProtocol(entry.getKey()).getName(), entry.getValue()));
sorted.clear(); sorted.clear();
return true; return true;