SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up LibVersion and added V1_7_6

Browse Source
This commit is contained in:
libraryaddict 2014-07-26 11:08:26 +12:00
parent 4c85f6c319
commit f81e7bba6b
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/me/libraryaddict/disguise/utilities/ReflectionManager.java
View File

@ -29,23 +29,15 @@ import com.comphenix.protocol.wrappers.WrappedGameProfile;
public class ReflectionManager { public class ReflectionManager {
public enum LibVersion { public enum LibVersion {
V1_6, V1_7; V1_6, V1_7, V1_7_6;
private static LibVersion currentVersion = LibVersion.V1_7; private static LibVersion currentVersion = LibVersion.V1_7;
static { static {
if (getBukkitVersion().startsWith("v1_")) { String mcVersion = Bukkit.getVersion().split("MC: ")[1].replace(")", "");
try { if (mcVersion.startsWith("1.")) {
int version = Integer.parseInt(getBukkitVersion().split("_")[1]); if (mcVersion.compareTo("1.7") < 0) {
if (version == 7) {
currentVersion = LibVersion.V1_7;
} else {
if (version < 7) {
currentVersion = LibVersion.V1_6; currentVersion = LibVersion.V1_6;
} else { } else {
currentVersion = LibVersion.V1_7; currentVersion = mcVersion.compareTo("1.7.6") < 0 ? LibVersion.V1_7 : LibVersion.V1_7_6;
}
}
} catch (Exception ex) {
ex.printStackTrace();
} }
} }
} }
@ -59,7 +51,11 @@ public class ReflectionManager {
} }
public static boolean is1_7() { public static boolean is1_7() {
return getGameVersion() == V1_7; return is1_7_6() || getGameVersion() == V1_7;
}
public static boolean is1_7_6() {
return getGameVersion() == V1_7_6;
} }
} }
@ -82,7 +78,8 @@ public class ReflectionManager {
*/ */
private static Map<String, Map<String, Map<String, String>>> ForgeMethodMappings; private static Map<String, Map<String, Map<String, String>>> ForgeMethodMappings;
private static final Method ihmGet; private static final Method ihmGet;
private static final boolean isForge = Bukkit.getServer().getName().contains("Cauldron") || Bukkit.getServer().getName().contains("MCPC-Plus"); private static final boolean isForge = Bukkit.getServer().getName().contains("Cauldron")
|| Bukkit.getServer().getName().contains("MCPC-Plus");
private static final Field pingField; private static final Field pingField;
private static Map<Class<?>, String> primitiveTypes; private static Map<Class<?>, String> primitiveTypes;
private static final Field trackerField; private static final Field trackerField;