Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-11-14 19:34:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove deprecations here and any reflection usage

Browse source 
Methods were less than a day old
This commit is contained in:
RednedEpic 2021-11-12 23:06:14 -06:00
parent e295601d7c
commit 98d9d91ca4
1 changed files with 0 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/main/java/com/github/steveice10/packetlib/packet/PacketProtocol.java
View file

@ -6,8 +6,6 @@ import com.github.steveice10.packetlib.crypt.PacketEncryption;
import com.github.steveice10.packetlib.io.NetInput;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.Map;
@ -67,21 +65,6 @@ public abstract class PacketProtocol {
this.outgoingIds.clear();
}
/**
* Registers a packet to this protocol as both incoming and outgoing.
*
* @param id Id to register the packet to.
* @param packet Packet to register.
* @throws IllegalArgumentException If the packet fails a test creation when being registered as incoming.
*
* @deprecated replaced with {@link #register(int, Class, PacketFactory)}
*/
@Deprecated
public final void register(int id, Class<? extends Packet> packet) {
this.registerIncoming(id, packet);
this.registerOutgoing(id, packet);
}
/**
* Registers a packet to this protocol as both incoming and outgoing.
*
@ -95,26 +78,6 @@ public abstract class PacketProtocol {
this.registerOutgoing(id, packet, factory);
}
/**
* Registers an incoming packet to this protocol.
*
* @param id Id to register the packet to.
* @param packet Packet to register.
* @throws IllegalArgumentException If the packet fails a test creation.
*
* @deprecated replaced with {@link #registerIncoming(int, Class, PacketFactory)}
*/
@Deprecated
public final <T extends Packet> void registerIncoming(int id, Class<T> packet) {
Constructor<T> constructor;
try {
constructor = packet.getConstructor(NetInput.class);
} catch (NoSuchMethodException e) {
throw new IllegalArgumentException("Packet does not have a constructor that takes in NetInput!");
}
this.registerIncoming(id, packet, (input) -> this.constructPacketWithReflection(constructor, id, input));
}
/**
* Registers an incoming packet to this protocol.
*
@ -127,26 +90,6 @@ public abstract class PacketProtocol {
this.incoming.put(id, new PacketDefinition<>(id, packet, factory));
}
/**
* Registers an outgoing packet to this protocol.
*
* @param id Id to register the packet to.
* @param packet Packet to register.
*
* @deprecated replaced with {@link #registerOutgoing(int, Class, PacketFactory)}
*/
@Deprecated
public final <T extends Packet> void registerOutgoing(int id, Class<T> packet) {
Constructor<T> constructor;
try {
constructor = packet.getConstructor(NetInput.class);
} catch (NoSuchMethodException e) {
throw new IllegalArgumentException("Packet does not have a constructor that takes in NetInput!");
}
this.registerOutgoing(id, packet, input -> this.constructPacketWithReflection(constructor, id, input));
}
/**
* Registers an outgoing packet to this protocol.
*
@ -238,17 +181,4 @@ public abstract class PacketProtocol {
return definition.getPacketClass();
}
private <T extends Packet> T constructPacketWithReflection(Constructor<T> constructor, int id, NetInput in) throws IOException {
try {
return constructor.newInstance(in);
} catch (InstantiationException | IllegalAccessException e) {
throw new IllegalStateException("Packet \"" + id + ", " + constructor.getDeclaringClass().getName() + "\" could not be instantiated.");
} catch (InvocationTargetException e) {
if (e.getCause() instanceof IOException) {
throw (IOException) e.getCause();
}
throw new IllegalStateException("Failed to instantiate packet \"" + id + ", " + constructor.getDeclaringClass().getName() + "\".", e);
}
}
}