Simplify packet registry

Author: dmulloy2

src/main/java/com/comphenix/protocol/PacketType.java

@@ -187,7 +187,7 @@ public static class Server extends PacketTypeEnum {
 			public static final PacketType UPDATE_HEALTH =                new PacketType(PROTOCOL, SENDER, 0x52, "UpdateHealth", "SPacketUpdateHealth");
 			public static final PacketType SCOREBOARD_OBJECTIVE =         new PacketType(PROTOCOL, SENDER, 0x53, "ScoreboardObjective", "SPacketScoreboardObjective");
 			public static final PacketType MOUNT =                        new PacketType(PROTOCOL, SENDER, 0x54, "Mount", "SPacketSetPassengers");
-			public static final PacketType SCOREBOARD_TEAM =              new PacketType(PROTOCOL, SENDER, 0x55, "ScoreboardTeam$b", "ScoreboardTeam", "SPacketTeams");
+			public static final PacketType SCOREBOARD_TEAM =              new PacketType(PROTOCOL, SENDER, 0x55, "ScoreboardTeam", "SPacketTeams");
 			public static final PacketType SCOREBOARD_SCORE =             new PacketType(PROTOCOL, SENDER, 0x56, "ScoreboardScore", "SPacketUpdateScore");
 			public static final PacketType SET_SUBTITLE_TEXT =            new PacketType(PROTOCOL, SENDER, 0x57, "SetSubtitleText");
 			public static final PacketType UPDATE_TIME =                  new PacketType(PROTOCOL, SENDER, 0x58, "UpdateTime", "SPacketTimeUpdate");
@@ -647,7 +647,7 @@ public String getMojangName() {
 	/**
 	 * Protocol version of all the current IDs.
 	 */
-	private static final MinecraftVersion PROTOCOL_VERSION = MinecraftVersion.NETHER_UPDATE;
+	private static final MinecraftVersion PROTOCOL_VERSION = MinecraftVersion.CAVES_CLIFFS_1;
 
 	private final Protocol protocol;
 	private final Sender sender;
@@ -935,7 +935,9 @@ public static Collection<PacketType> fromName(String name) {
 	 * Determine if a given class represents a packet class.
 	 * @param packetClass - the class to lookup.
 	 * @return TRUE if this is a packet class, FALSE otherwise.
+	 * @deprecated Doesn't really have a purpose
 	 */
+	@Deprecated
 	public static boolean hasClass(Class<?> packetClass) {
 		return PacketRegistry.getPacketType(packetClass) != null;
 	}
@@ -1090,11 +1092,7 @@ public List<String> getClassNames() {
 	 * @return The packet class, or NULL if not found.
 	 */
 	public Class<?> getPacketClass() {
-		try {
-			return PacketRegistry.getPacketClassFromType(this);
-		} catch (Exception e) {
-			return null;
-		}
+		return PacketRegistry.tryGetPacketClass(this).orElse(null);
 	}
 
 	// Only used by Enum processor

src/main/java/com/comphenix/protocol/PacketTypeEnum.java

@@ -110,22 +110,6 @@ public boolean registerMember(PacketType instance, String name) {
 	public boolean hasMember(PacketType member) {
 		return members.contains(member);
 	}
-	
-	/**
-	 * Retrieve a member by name,
-	 * @param name - name of member to retrieve.
-	 * @return The member, or NULL if not found.
-	 * @deprecated Don't use this
-	 */
-	@Deprecated
-	public PacketType valueOf(String name) {
-		for (PacketType member : members) {
-			if (member.name().equals(name))
-				return member;
-		}
-
-		return null;
-	}
 
 	/**
 	 * Retrieve every registered member.

src/main/java/com/comphenix/protocol/concurrency/PacketTypeSet.java

@@ -32,11 +32,11 @@ public PacketTypeSet(Collection<? extends PacketType> values) {
 	 * @param type - the type to add.
 	 */
 	public synchronized void addType(PacketType type) {
-		Class<?> packetClass = getPacketClass(type);
+		Class<?> packetClass = type.getPacketClass();
 		types.add(Preconditions.checkNotNull(type, "type cannot be NULL."));
 
 		if (packetClass != null) {
-			classes.add(getPacketClass(type));
+			classes.add(type.getPacketClass());
 		}
 	}
 
@@ -55,11 +55,11 @@ public synchronized void addAll(Iterable<? extends PacketType> types) {
 	 * @param type - the type to remove.
 	 */
 	public synchronized void removeType(PacketType type) {
-		Class<?> packetClass = getPacketClass(type);
+		Class<?> packetClass = type.getPacketClass();
 		types.remove(Preconditions.checkNotNull(type, "type cannot be NULL."));
 
 		if (packetClass != null) {
-			classes.remove(getPacketClass(type));
+			classes.remove(packetClass);
 		}
 	}
 
@@ -72,16 +72,7 @@ public synchronized void removeAll(Iterable<? extends PacketType> types) {
 			removeType(type);
 		}
 	}
-	
-	/**
-	 * Retrieve the packet class associated with a particular type.
-	 * @param type - the packet type.
-	 * @return The associated packet type.
-	 */
-	protected Class<?> getPacketClass(PacketType type) {
-		return PacketRegistry.getPacketClassFromType(type);
-	}
-	
+
 	/**
 	 * Determine if the given packet type exists in the set.
 	 * @param type - the type to find.

src/main/java/com/comphenix/protocol/injector/ListenerInvoker.java

@@ -39,14 +39,6 @@ public interface ListenerInvoker {
 	 */
 	void invokePacketSending(PacketEvent event);
 
-	/**
-	 * Retrieve the associated ID of a packet.
-	 * @param packet - the packet.
-	 * @return The packet ID.
-	 */
-	@Deprecated
-	int getPacketID(Object packet);
-
 	/**
 	 * Retrieve the associated type of a packet.
 	 * @param packet - the packet.

src/main/java/com/comphenix/protocol/injector/PacketConstructor.java

@@ -20,6 +20,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
+import java.util.Optional;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.error.RethrowErrorReporter;
@@ -146,13 +147,11 @@ public PacketConstructor withPacket(PacketType type, Object[] values) {
 				types[i] = Object.class;
 			}
 		}
-		Class<?> packetType = PacketRegistry.getPacketClassFromType(type, true);
-		
-		if (packetType == null)
-			throw new IllegalArgumentException("Could not find a packet by the type " + type);
-		
+
+		Class<?> packetClass = PacketRegistry.getPacketClassFromType(type);
+
 		// Find the correct constructor
-		for (Constructor<?> constructor : packetType.getConstructors()) {
+		for (Constructor<?> constructor : packetClass.getConstructors()) {
 			Class<?>[] params = constructor.getParameterTypes();
 
 			if (isCompatible(types, params)) {

src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java

@@ -979,12 +979,6 @@ private int getPhaseLoginCount() {
 		return phaseLoginCount.get();
 	}
 
-	@Override
-	@Deprecated
-	public int getPacketID(Object packet) {
-		return PacketRegistry.getPacketID(packet.getClass());
-	}
-
 	@Override
 	public PacketType getPacketType(Object packet) {
 		if (packet == null)

src/main/java/com/comphenix/protocol/injector/StructureCache.java

@@ -92,11 +92,7 @@ public static Object newPacket(Class<?> clazz) {
 	 * @return Created packet.
 	 */
 	public static Object newPacket(PacketType type) {
-		Class<?> clazz = PacketRegistry.getPacketClassFromType(type, true);
-		if (clazz != null) {
-			return newPacket(clazz);
-		}
-		throw new IllegalArgumentException("Cannot find associated packet class: " + type);
+		return newPacket(PacketRegistry.getPacketClassFromType(type));
 	}
 
 	/**
@@ -146,7 +142,7 @@ public static StructureModifier<Object> getStructure(final PacketType type, bool
 		if (result == null) {
 			// Use the vanilla class definition
 			final StructureModifier<Object> value = new StructureModifier<>(
-					PacketRegistry.getPacketClassFromType(type, true), MinecraftReflection.getPacketClass(), true);
+					PacketRegistry.getPacketClassFromType(type), MinecraftReflection.getPacketClass(), true);
 
 			result = structureModifiers.putIfAbsent(type, value);