Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-27 21:26:17 +01:00
Code Issues Projects Releases Wiki Activity

Fix a ClassNotFoundException with PlayerInfoData

Browse Source 
Fixes #59
This commit is contained in:
Dan Mulloy 2015-03-15 13:10:36 -04:00
parent ac14843d96
commit c7b9600c21
2 changed files with 49 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ProtocolLib/src/main/java/com/comphenix/protocol/utility/CachedPackage.java
View File

@ -2,16 +2,16 @@
* ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
* Copyright (C) 2012 Kristian S. Stangeland
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 2 of
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program;
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* You should have received a copy of the GNU General Public License along with this program;
* if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
*/
@ -67,13 +67,13 @@ class CachedPackage {
if (result == null) {
// Look up the class dynamically
result = source.loadClass(combine(packageName, className));
if (result == null)
throw new IllegalArgumentException("Source " + source + " returned NULL for " + className);
cache.put(className, result);
}
}
return result;
} catch (ClassNotFoundException e) {
throw new RuntimeException("Cannot find class " + className, e);
}

90
ProtocolLib/src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java
View File

@ -420,10 +420,8 @@ public class MinecraftReflection {
/**
* Determine if a given object is a ChunkPosition.
* @param obj - the object to test.
* @deprecated ChunkPosition no longer exists
* @return TRUE if it can, FALSE otherwise.
*/
@Deprecated
public static boolean isChunkPosition(Object obj) {
Class<?> chunkPosition = getChunkPositionClass();
return obj != null && chunkPosition != null && chunkPosition.isAssignableFrom(obj.getClass());
@ -567,16 +565,15 @@ public class MinecraftReflection {
return getMinecraftClass("EntityPlayer");
} catch (RuntimeException e) {
try {
// A fairly stable method
Method detect = FuzzyReflection.fromClass(getCraftBukkitClass("CraftServer")).
getMethodByName("detectListNameConflict");
// Grab CraftPlayer's handle
Method getHandle = FuzzyReflection
.fromClass(getCraftBukkitClass("entity.CraftPlayer"))
.getMethodByName("getHandle");
// EntityPlayer is then the first parameter
return detect.getParameterTypes()[0];
} catch (IllegalArgumentException ex) {
// Last resort
return fallbackMethodReturn("EntityPlayer", "entity.CraftPlayer", "getHandle");
// EntityPlayer is the return type
return setMinecraftClass("EntityPlayer", getHandle.getReturnType());
} catch (IllegalArgumentException e1) {
throw new RuntimeException("Could not find EntityPlayer class.", e1);
}
}
}
@ -609,7 +606,7 @@ public class MinecraftReflection {
*/
public static Class<?> getEntityClass() {
try {
return getMinecraftClass("Entity");
return getMinecraftClass("Entity");
} catch (RuntimeException e) {
return fallbackMethodReturn("Entity", "entity.CraftEntity", "getHandle");
}
@ -828,13 +825,14 @@ public class MinecraftReflection {
} catch (RuntimeException e) {
Class<?> serverPing = getServerPingClass();
// Find a server ping object
AbstractFuzzyMatcher<Class<?>> serverDataContract = FuzzyClassContract.newBuilder().
constructor(FuzzyMethodContract.newBuilder().parameterExactArray(String.class, int.class)).
build().
and(getMinecraftObjectMatcher());
for (Field field : FuzzyReflection.fromClass(serverPing, true).getFields()) {
Class<?> clazz = field.getType();
if (clazz.getName().contains("ServerData")) {
return setMinecraftClass("ServerData", clazz);
}
}
return setMinecraftClass("ServerPingServerData", getTypeFromField(serverPing, serverDataContract));
throw new IllegalStateException("Could not find ServerData class.");
}
}
@ -1172,30 +1170,27 @@ public class MinecraftReflection {
/**
* Retrieves the ChunkPosition class.
*
* @deprecated ChunkPosition no longer exists. Replaced by BlockPosition.
*
* @return The ChunkPosition class.
*/
@Deprecated
public static Class<?> getChunkPositionClass() {
try {
return getMinecraftClass("ChunkPosition");
} catch (RuntimeException e) {
return null;
// Class<?> normalChunkGenerator = getCraftBukkitClass("generator.NormalChunkGenerator");
//
// // ChunkPosition a(net.minecraft.server.World world, String string, int i, int i1, int i2) {
// FuzzyMethodContract selected = FuzzyMethodContract.newBuilder()
// .banModifier(Modifier.STATIC)
// .parameterMatches(getMinecraftObjectMatcher(), 0)
// .parameterExactType(String.class, 1)
// .parameterExactType(int.class, 2)
// .parameterExactType(int.class, 3)
// .parameterExactType(int.class, 4)
// .build();
//
// return setMinecraftClass("ChunkPosition",
// FuzzyReflection.fromClass(normalChunkGenerator).getMethod(selected).getReturnType());
Class<?> normalChunkGenerator = getCraftBukkitClass("generator.NormalChunkGenerator");
// ChunkPosition a(net.minecraft.server.World world, String string, int i, int i1, int i2) {
FuzzyMethodContract selected = FuzzyMethodContract.newBuilder()
.banModifier(Modifier.STATIC)
.parameterMatches(getMinecraftObjectMatcher(), 0)
.parameterExactType(String.class, 1)
.parameterExactType(int.class, 2)
.parameterExactType(int.class, 3)
.parameterExactType(int.class, 4)
.build();
return setMinecraftClass("ChunkPosition",
FuzzyReflection.fromClass(normalChunkGenerator).getMethod(selected).getReturnType());
}
}
@ -1223,8 +1218,8 @@ public class MinecraftReflection {
}
/**
* Retrieves the Vec3d class.
* @return The Vec3d class.
* Retrieves the Vec3D class.
* @return The Vec3D class.
*/
public static Class<?> getVec3DClass() {
try {
@ -1239,7 +1234,6 @@ public class MinecraftReflection {
* Retrieve the ChunkCoordinates class.
* @return The ChunkPosition class.
*/
@Deprecated
public static Class<?> getChunkCoordinatesClass() {
try {
return getMinecraftClass("ChunkCoordinates");
@ -1886,7 +1880,7 @@ public class MinecraftReflection {
* @return The PlayerInfoData class
*/
public static Class<?> getPlayerInfoDataClass() {
return getMinecraftClass("PlayerInfoData");
return getMinecraftClass("PacketPlayOutPlayerInfo$PlayerInfoData", "PlayerInfoData");
}
/**
@ -1936,8 +1930,7 @@ public class MinecraftReflection {
* @return Class object.
* @throws RuntimeException If we are unable to find the given class.
*/
@SuppressWarnings("rawtypes")
public static Class getCraftBukkitClass(String className) {
public static Class<?> getCraftBukkitClass(String className) {
if (craftbukkitPackage == null)
craftbukkitPackage = new CachedPackage(getCraftBukkitPackage(), getClassSource());
return craftbukkitPackage.getPackageClass(className);
@ -1990,6 +1983,7 @@ public class MinecraftReflection {
// Just use the default class loader
classSource = ClassSource.fromClassLoader();
}
return classSource;
}
@ -2004,7 +1998,7 @@ public class MinecraftReflection {
try {
// Try the main class first
return getMinecraftClass(className);
} catch (RuntimeException e1) {
} catch (RuntimeException e) {
Class<?> success = null;
// Try every alias too
@ -2012,8 +2006,8 @@ public class MinecraftReflection {
try {
success = getMinecraftClass(alias);
break;
} catch (RuntimeException e2) {
// Swallov
} catch (RuntimeException e1) {
// Just swallow it...
}
}
@ -2023,11 +2017,7 @@ public class MinecraftReflection {
return success;
} else {
// Hack failed
throw new RuntimeException(
String.format("Unable to find %s (%s)",
className,
Joiner.on(", ").join(aliases))
);
throw new RuntimeException(String.format("Unable to find %s (%s)", className, Joiner.on(", ").join(aliases)));
}
}
}