Compare commits

..
16 Commits
8 changed files with 72 additions and 37 deletions

No files matched your search

+1 -1
View File
@@ -6,7 +6,7 @@
<groupId>io.github.retrooper</groupId>
<artifactId>packetevents</artifactId>
<version>1.5.5</version>
<version>1.5.7</version>
<packaging>jar</packaging>
<name>packetevents</name>
@@ -42,16 +42,6 @@ public final class PacketEventsAPI {
return playerUtils;
}
/**
* Use {@link #getPlayerUtils()}
*
* @return
*/
@Deprecated
public PlayerUtils getPlayerUtilities() {
return playerUtils;
}
/**
* Get all utilities to do with the server
*
@@ -61,15 +51,6 @@ public final class PacketEventsAPI {
return serverUtils;
}
/**
* Please use {@link #getServerUtils()}
*
* @return
*/
@Deprecated
public ServerUtils getServerUtilities() {
return serverUtils;
}
/**
* Get the event manager
@@ -23,8 +23,6 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {
break;
}
}
} else {
enumPlayerActionClass = NMSUtils.getNMSClass("EnumPlayerAction");
}
} catch (ClassNotFoundException e) {
e.printStackTrace();
@@ -55,7 +53,7 @@ public final class WrappedPacketInEntityAction extends WrappedPacket {
//1.7.10
if (version.isLowerThan(ServerVersion.v_1_8)) {
animationIndex = Reflection.getField(entityActionClass, int.class, 1).getInt(packet);
animationIndex = Reflection.getField(entityActionClass, int.class, 1).getInt(packet); // TODO: += if packetdataserializer.version < 16
} else {
final Object enumObj = Reflection.getField(entityActionClass, enumPlayerActionClass, 0).get(packet);
final String enumValue = enumObj.toString();
@@ -1,5 +1,7 @@
package io.github.retrooper.packetevents.reflectionutils.fielddata;
import java.util.Objects;
public class FieldWithIndex {
private final Class<?> cls;
private final int index;
@@ -16,4 +18,19 @@ public class FieldWithIndex {
public int getIndex() {
return index;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FieldWithIndex that = (FieldWithIndex) o;
return index == that.index &&
Objects.equals(cls, that.cls);
}
@Override
public int hashCode() {
return Objects.hash(cls, index);
}
}
@@ -1,5 +1,7 @@
package io.github.retrooper.packetevents.reflectionutils.fielddata;
import java.util.Objects;
public class FieldWithName {
private final Class<?> cls;
@@ -17,4 +19,19 @@ public class FieldWithName {
public String getName() {
return name;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FieldWithName that = (FieldWithName) o;
return name.equals(that.name) &&
Objects.equals(cls, that.cls);
}
@Override
public int hashCode() {
return Objects.hash(cls, name);
}
}
@@ -1,5 +1,7 @@
package io.github.retrooper.packetevents.reflectionutils.fielddata;
import java.util.Objects;
public class FieldWithTypeAndIndex {
private final Class<?> cls, type;
private final int index;
@@ -21,4 +23,20 @@ public class FieldWithTypeAndIndex {
public int getIndex() {
return index;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FieldWithTypeAndIndex that = (FieldWithTypeAndIndex) o;
return index == that.index &&
Objects.equals(cls, that.cls) &&
Objects.equals(type, that.type);
}
@Override
public int hashCode() {
return Objects.hash(cls, type, index);
}
}
@@ -1,5 +1,7 @@
package io.github.retrooper.packetevents.reflectionutils.methoddata;
import java.util.Objects;
public class MethodWithIndexAndParams {
private final Class<?> cls;
private final int index;
@@ -22,4 +24,20 @@ public class MethodWithIndexAndParams {
public Class<?>[] getParams() {
return params;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
MethodWithIndexAndParams that = (MethodWithIndexAndParams) o;
return index == that.index &&
Objects.equals(cls, that.cls) &&
Objects.equals(params, that.params);
}
@Override
public int hashCode() {
return Objects.hash(cls, params, index);
}
}
@@ -7,20 +7,6 @@ import io.github.retrooper.packetevents.utils.NMSUtils;
import java.lang.reflect.InvocationTargetException;
public final class ServerUtils {
@Deprecated
public ServerVersion getServerVersion() {
return getVersion();
}
@Deprecated
public double[] getRecentServerTPS() {
return getRecentTPS();
}
@Deprecated
public double getCurrentServerTPS() {
return getCurrentTPS();
}
public ServerVersion getVersion() {
return ServerVersion.getVersion();