trueog/PacketEvents
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed constants properly

Browse Source
This commit is contained in:
terrarier2111 committed 2020-11-30 14:43:51 +01:00
1 parent 79c07642a2
commit 05a981de6e
3 files changed
+67 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/io/github/retrooper/packetevents/packettype/PacketTypeClasses.java
+51 -51
View File
@@ -72,7 +72,7 @@ public class PacketTypeClasses {
}
public static class Client {
private static final String c = "PacketPlayIn";
private static final String PREFIX = "PacketPlayIn";
public static Class<?> FLYING, POSITION, POSITION_LOOK, LOOK, CLIENT_COMMAND,
TRANSACTION, BLOCK_DIG, ENTITY_ACTION, USE_ENTITY,
WINDOW_CLICK, STEER_VEHICLE, CUSTOM_PAYLOAD, ARM_ANIMATION,
@@ -89,70 +89,70 @@ public class PacketTypeClasses {
* Initiate all server-bound packet classes.
*/
public static void load() {
FLYING = NMSUtils.getNMSClassWithoutException(c + "Flying");
FLYING = NMSUtils.getNMSClassWithoutException(PREFIX + "Flying");
try {
POSITION = NMSUtils.getNMSClass(c + "Position");
POSITION_LOOK = NMSUtils.getNMSClass(c + "PositionLook");
LOOK = NMSUtils.getNMSClass(c + "Look");
POSITION = NMSUtils.getNMSClass(PREFIX + "Position");
POSITION_LOOK = NMSUtils.getNMSClass(PREFIX + "PositionLook");
LOOK = NMSUtils.getNMSClass(PREFIX + "Look");
} catch (ClassNotFoundException e) {
POSITION = SubclassUtil.getSubClass(FLYING, c + "Position");
POSITION_LOOK = SubclassUtil.getSubClass(FLYING, c + "PositionLook");
LOOK = SubclassUtil.getSubClass(FLYING, c + "Look");
POSITION = SubclassUtil.getSubClass(FLYING, PREFIX + "Position");
POSITION_LOOK = SubclassUtil.getSubClass(FLYING, PREFIX + "PositionLook");
LOOK = SubclassUtil.getSubClass(FLYING, PREFIX + "Look");
}
try {
SETTINGS = NMSUtils.getNMSClass(c + "Settings");
ENCHANT_ITEM = NMSUtils.getNMSClass(c + "EnchantItem");
SETTINGS = NMSUtils.getNMSClass(PREFIX + "Settings");
ENCHANT_ITEM = NMSUtils.getNMSClass(PREFIX + "EnchantItem");
CLIENT_COMMAND = NMSUtils.getNMSClass(c + "ClientCommand");
TRANSACTION = NMSUtils.getNMSClass(c + "Transaction");
BLOCK_DIG = NMSUtils.getNMSClass(c + "BlockDig");
ENTITY_ACTION = NMSUtils.getNMSClass(c + "EntityAction");
USE_ENTITY = NMSUtils.getNMSClass(c + "UseEntity");
WINDOW_CLICK = NMSUtils.getNMSClass(c + "WindowClick");
STEER_VEHICLE = NMSUtils.getNMSClass(c + "SteerVehicle");
CUSTOM_PAYLOAD = NMSUtils.getNMSClass(c + "CustomPayload");
ARM_ANIMATION = NMSUtils.getNMSClass(c + "ArmAnimation");
ABILITIES = NMSUtils.getNMSClass(c + "Abilities");
HELD_ITEM_SLOT = NMSUtils.getNMSClass(c + "HeldItemSlot");
CLOSE_WINDOW = NMSUtils.getNMSClass(c + "CloseWindow");
TAB_COMPLETE = NMSUtils.getNMSClass(c + "TabComplete");
CHAT = NMSUtils.getNMSClass(c + "Chat");
SET_CREATIVE_SLOT = NMSUtils.getNMSClass(c + "SetCreativeSlot");
KEEP_ALIVE = NMSUtils.getNMSClass(c + "KeepAlive");
UPDATE_SIGN = NMSUtils.getNMSClassWithoutException(c + "UpdateSign");
CLIENT_COMMAND = NMSUtils.getNMSClass(PREFIX + "ClientCommand");
TRANSACTION = NMSUtils.getNMSClass(PREFIX + "Transaction");
BLOCK_DIG = NMSUtils.getNMSClass(PREFIX + "BlockDig");
ENTITY_ACTION = NMSUtils.getNMSClass(PREFIX + "EntityAction");
USE_ENTITY = NMSUtils.getNMSClass(PREFIX + "UseEntity");
WINDOW_CLICK = NMSUtils.getNMSClass(PREFIX + "WindowClick");
STEER_VEHICLE = NMSUtils.getNMSClass(PREFIX + "SteerVehicle");
CUSTOM_PAYLOAD = NMSUtils.getNMSClass(PREFIX + "CustomPayload");
ARM_ANIMATION = NMSUtils.getNMSClass(PREFIX + "ArmAnimation");
ABILITIES = NMSUtils.getNMSClass(PREFIX + "Abilities");
HELD_ITEM_SLOT = NMSUtils.getNMSClass(PREFIX + "HeldItemSlot");
CLOSE_WINDOW = NMSUtils.getNMSClass(PREFIX + "CloseWindow");
TAB_COMPLETE = NMSUtils.getNMSClass(PREFIX + "TabComplete");
CHAT = NMSUtils.getNMSClass(PREFIX + "Chat");
SET_CREATIVE_SLOT = NMSUtils.getNMSClass(PREFIX + "SetCreativeSlot");
KEEP_ALIVE = NMSUtils.getNMSClass(PREFIX + "KeepAlive");
UPDATE_SIGN = NMSUtils.getNMSClassWithoutException(PREFIX + "UpdateSign");
TELEPORT_ACCEPT = NMSUtils.getNMSClassWithoutException(c + "TeleportAccept");
TILE_NBT_QUERY = NMSUtils.getNMSClassWithoutException(c + "TileNBTQuery");
DIFFICULTY_CHANGE = NMSUtils.getNMSClassWithoutException(c + "DifficultyChange");
B_EDIT = NMSUtils.getNMSClassWithoutException(c + "BEdit");
ENTITY_NBT_QUERY = NMSUtils.getNMSClassWithoutException(c + "EntityNBTQuery");
JIGSAW_GENERATE = NMSUtils.getNMSClassWithoutException(c + "JigsawGenerate");
DIFFICULTY_LOCK = NMSUtils.getNMSClassWithoutException(c + "DifficultyLock");
VEHICLE_MOVE = NMSUtils.getNMSClassWithoutException(c + "VehicleMove");
BOAT_MOVE = NMSUtils.getNMSClassWithoutException(c + "BoatMove");
PICK_ITEM = NMSUtils.getNMSClassWithoutException(c + "PickItem");
AUTO_RECIPE = NMSUtils.getNMSClassWithoutException(c + "AutoRecipe");
RECIPE_DISPLAYED = NMSUtils.getNMSClassWithoutException(c + "RecipeDisplayed");
ITEM_NAME = NMSUtils.getNMSClassWithoutException(c + "ItemName");
TELEPORT_ACCEPT = NMSUtils.getNMSClassWithoutException(PREFIX + "TeleportAccept");
TILE_NBT_QUERY = NMSUtils.getNMSClassWithoutException(PREFIX + "TileNBTQuery");
DIFFICULTY_CHANGE = NMSUtils.getNMSClassWithoutException(PREFIX + "DifficultyChange");
B_EDIT = NMSUtils.getNMSClassWithoutException(PREFIX + "BEdit");
ENTITY_NBT_QUERY = NMSUtils.getNMSClassWithoutException(PREFIX + "EntityNBTQuery");
JIGSAW_GENERATE = NMSUtils.getNMSClassWithoutException(PREFIX + "JigsawGenerate");
DIFFICULTY_LOCK = NMSUtils.getNMSClassWithoutException(PREFIX + "DifficultyLock");
VEHICLE_MOVE = NMSUtils.getNMSClassWithoutException(PREFIX + "VehicleMove");
BOAT_MOVE = NMSUtils.getNMSClassWithoutException(PREFIX + "BoatMove");
PICK_ITEM = NMSUtils.getNMSClassWithoutException(PREFIX + "PickItem");
AUTO_RECIPE = NMSUtils.getNMSClassWithoutException(PREFIX + "AutoRecipe");
RECIPE_DISPLAYED = NMSUtils.getNMSClassWithoutException(PREFIX + "RecipeDisplayed");
ITEM_NAME = NMSUtils.getNMSClassWithoutException(PREFIX + "ItemName");
//1.8+
RESOURCE_PACK_STATUS = NMSUtils.getNMSClassWithoutException(c + "ResourcePackStatus");
RESOURCE_PACK_STATUS = NMSUtils.getNMSClassWithoutException(PREFIX + "ResourcePackStatus");
ADVANCEMENTS = NMSUtils.getNMSClassWithoutException(c + "Advancements");
TR_SEL = NMSUtils.getNMSClassWithoutException(c + "TrSel");
BEACON = NMSUtils.getNMSClassWithoutException(c + "Beacon");
SET_COMMAND_BLOCK = NMSUtils.getNMSClassWithoutException(c + "SetCommandBlock");
SET_COMMAND_MINECART = NMSUtils.getNMSClassWithoutException(c + "SetCommandMinecart");
SET_JIGSAW = NMSUtils.getNMSClassWithoutException(c + "SetJigsaw");
STRUCT = NMSUtils.getNMSClassWithoutException(c + "Struct");
SPECTATE = NMSUtils.getNMSClassWithoutException(c + "Spectate");
ADVANCEMENTS = NMSUtils.getNMSClassWithoutException(PREFIX + "Advancements");
TR_SEL = NMSUtils.getNMSClassWithoutException(PREFIX + "TrSel");
BEACON = NMSUtils.getNMSClassWithoutException(PREFIX + "Beacon");
SET_COMMAND_BLOCK = NMSUtils.getNMSClassWithoutException(PREFIX + "SetCommandBlock");
SET_COMMAND_MINECART = NMSUtils.getNMSClassWithoutException(PREFIX + "SetCommandMinecart");
SET_JIGSAW = NMSUtils.getNMSClassWithoutException(PREFIX + "SetJigsaw");
STRUCT = NMSUtils.getNMSClassWithoutException(PREFIX + "Struct");
SPECTATE = NMSUtils.getNMSClassWithoutException(PREFIX + "Spectate");
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
try {
BLOCK_PLACE = NMSUtils.getNMSClass(c + "BlockPlace");
USE_ITEM = NMSUtils.getNMSClass(c + "UseItem");
BLOCK_PLACE = NMSUtils.getNMSClass(PREFIX + "BlockPlace");
USE_ITEM = NMSUtils.getNMSClass(PREFIX + "UseItem");
} catch (ClassNotFoundException ignored) {
}
src/main/java/io/github/retrooper/packetevents/packetwrappers/WrappedPacket.java
+14 -14
View File
@@ -66,7 +66,7 @@ import java.util.List;
import java.util.Map;
public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
private static final Map<Class<?>, Map<Class<?>, Field[]>> fieldCache = new HashMap<>();
private static final Map<Class<?>, Map<Class<?>, Field[]>> FIELD_CACHE = new HashMap<>();
public static ServerVersion version;
protected Object packet;
private Class<?> packetClass;
@@ -88,7 +88,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
this.packetClass = packetClass;
if (!fieldCache.containsKey(packetClass)) {
if (!FIELD_CACHE.containsKey(packetClass)) {
final Field[] declaredFields = packetClass.getDeclaredFields();
for (Field f : declaredFields) {
f.setAccessible(true);
@@ -133,7 +133,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
map.put(float[].class, floatArrayFields.toArray(tmp));
map.put(double[].class, doubleArrayFields.toArray(tmp));
map.put(String[].class, stringArrayFields.toArray(tmp));
fieldCache.put(packetClass, map);
FIELD_CACHE.put(packetClass, map);
}
this.packet = packet;
setup();
@@ -220,7 +220,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
@Override
public boolean[] readBooleanArray(int index) {
Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
Map<Class<?>, Field[]> cached = FIELD_CACHE.get(packetClass);
if (cached != null) {
try {
return (boolean[]) cached.get(boolean[].class)[index].get(packet);
@@ -246,7 +246,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
@Override
public byte[] readByteArray(int index) {
Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
Map<Class<?>, Field[]> cached = FIELD_CACHE.get(packetClass);
if (cached != null) {
try {
return (byte[]) cached.get(byte[].class)[index].get(packet);
@@ -272,7 +272,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
@Override
public short[] readShortArray(int index) {
Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
Map<Class<?>, Field[]> cached = FIELD_CACHE.get(packetClass);
if (cached != null) {
try {
return (short[]) cached.get(short[].class)[index].get(packet);
@@ -298,7 +298,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
@Override
public int[] readIntArray(int index) {
Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
Map<Class<?>, Field[]> cached = FIELD_CACHE.get(packetClass);
if (cached != null) {
try {
return (int[]) cached.get(int[].class)[index].get(packet);
@@ -324,7 +324,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
@Override
public long[] readLongArray(int index) {
Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
Map<Class<?>, Field[]> cached = FIELD_CACHE.get(packetClass);
if (cached != null) {
try {
return (long[]) cached.get(long[].class)[index].get(packet);
@@ -350,7 +350,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
@Override
public float[] readFloatArray(int index) {
Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
Map<Class<?>, Field[]> cached = FIELD_CACHE.get(packetClass);
if (cached != null) {
try {
return (float[]) cached.get(float[].class)[index].get(packet);
@@ -376,7 +376,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
@Override
public double[] readDoubleArray(int index) {
Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
Map<Class<?>, Field[]> cached = FIELD_CACHE.get(packetClass);
if (cached != null) {
try {
return (double[]) cached.get(double[].class)[index].get(packet);
@@ -402,7 +402,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
@Override
public String[] readStringArray(int index) {
Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
Map<Class<?>, Field[]> cached = FIELD_CACHE.get(packetClass);
if (cached != null) {
try {
Object[] array = (Object[]) cached.get(String[].class)[index].get(packet);
@@ -442,7 +442,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
}
public Object readObject(int index, Class<?> type) {
Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
Map<Class<?>, Field[]> cached = FIELD_CACHE.get(packetClass);
if (cached != null) {
Field[] cachedFields = cached.get(type);
if (cachedFields == null) {
@@ -470,7 +470,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
}
public boolean doesObjectExist(int index, Class<?> type) {
Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
Map<Class<?>, Field[]> cached = FIELD_CACHE.get(packetClass);
if (cached != null) {
Field[] cachedFields = cached.get(type);
if (cachedFields == null) {
@@ -577,7 +577,7 @@ public class WrappedPacket implements WrapperPacketReader, WrapperPacketWriter {
}
private Field getField(Class<?> type, int index) {
Map<Class<?>, Field[]> cached = fieldCache.get(packetClass);
Map<Class<?>, Field[]> cached = FIELD_CACHE.get(packetClass);
if (cached == null) {
return null;
}
src/main/java/io/github/retrooper/packetevents/utils/server/ServerVersion.java
+2 -2
View File
@@ -40,7 +40,7 @@ public enum ServerVersion {
v_1_14_3((short) 490), v_1_14_4((short) 498), v_1_15((short) 573), v_1_15_1((short) 575), v_1_15_2((short) 578),
v_1_16((short) 735), v_1_16_1((short) 736), v_1_16_2((short) 751), v_1_16_3((short) 753), v_1_16_4((short) 754), ERROR((short) -1);
private static final String nmsVersionSuffix = Bukkit.getServer().getClass().getPackage().getName()
private static final String NMS_VERSION_SUFFIX = Bukkit.getServer().getClass().getPackage().getName()
.replace(".", ",").split(",")[3];
public static ServerVersion[] reversedValues = new ServerVersion[values().length];
private static ServerVersion cachedVersion;
@@ -93,7 +93,7 @@ public enum ServerVersion {
}
public static String getNmsSuffix() {
return nmsVersionSuffix;
return NMS_VERSION_SUFFIX;
}
public static String getNMSDirectory() {