Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-22 10:05:12 +01:00
Code Issues Projects Releases Wiki Activity

Fix Java 16 compatibility on Bukkit/Sponge 1.8 (#2438)

Browse Source
This commit is contained in:
MrMicky 2021-04-15 08:43:05 +02:00 committed by GitHub
parent 4df70de312
commit f1eef0294f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
common/src/main/java/us/myles/ViaVersion/util/ReflectionUtil.java
View File

@ -17,14 +17,13 @@
*/
package us.myles.ViaVersion.util;
import com.google.common.collect.Maps;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public class ReflectionUtil {
@ -38,10 +37,10 @@ public class ReflectionUtil {
return m.invoke(o);
}
public static <T> T getStatic(Class<?> clazz, String f, Class<T> t) throws NoSuchFieldException, IllegalAccessException {
public static <T> T getStatic(Class<?> clazz, String f, Class<T> type) throws NoSuchFieldException, IllegalAccessException {
Field field = clazz.getDeclaredField(f);
field.setAccessible(true);
return (T) field.get(null);
return type.cast(field.get(null));
}
public static void setStatic(Class<?> clazz, String f, Object value) throws NoSuchFieldException, IllegalAccessException {
@ -50,42 +49,40 @@ public class ReflectionUtil {
field.set(null, value);
}
public static <T> T getSuper(Object o, String f, Class<T> t) throws NoSuchFieldException, IllegalAccessException {
public static <T> T getSuper(Object o, String f, Class<T> type) throws NoSuchFieldException, IllegalAccessException {
Field field = o.getClass().getSuperclass().getDeclaredField(f);
field.setAccessible(true);
return (T) field.get(o);
return type.cast(field.get(o));
}
public static <T> T get(Object instance, Class<?> clazz, String f, Class<T> t) throws NoSuchFieldException, IllegalAccessException {
public static <T> T get(Object instance, Class<?> clazz, String f, Class<T> type) throws NoSuchFieldException, IllegalAccessException {
Field field = clazz.getDeclaredField(f);
field.setAccessible(true);
return (T) field.get(instance);
return type.cast(field.get(instance));
}
public static <T> T get(Object o, String f, Class<T> t) throws NoSuchFieldException, IllegalAccessException {
public static <T> T get(Object o, String f, Class<T> type) throws NoSuchFieldException, IllegalAccessException {
Field field = o.getClass().getDeclaredField(f);
field.setAccessible(true);
return (T) field.get(o);
return type.cast(field.get(o));
}
public static <T> T getPublic(Object o, String f, Class<T> t) throws NoSuchFieldException, IllegalAccessException {
public static <T> T getPublic(Object o, String f, Class<T> type) throws NoSuchFieldException, IllegalAccessException {
Field field = o.getClass().getField(f);
field.setAccessible(true);
return (T) field.get(o);
return type.cast(field.get(o));
}
public static void set(Object o, String f, Object value) throws NoSuchFieldException, IllegalAccessException {
Field field = o.getClass().getDeclaredField(f);
field.setAccessible(true);
field.set(o, value);
}
public static final class ClassReflection {
private final Class<?> handle;
private final Map<String, Field> fields = Maps.newConcurrentMap();
private final Map<String, Method> methods = Maps.newConcurrentMap();
private final Map<String, Field> fields = new ConcurrentHashMap<>();
private final Map<String, Method> methods = new ConcurrentHashMap<>();
public ClassReflection(Class<?> handle) {
this(handle, true);
@ -98,7 +95,7 @@ public class ReflectionUtil {
}
private void scanFields(Class<?> host, boolean recursive) {
if (host.getSuperclass() != null && recursive) {
if (recursive && host.getSuperclass() != null && host.getSuperclass() != Object.class) {
scanFields(host.getSuperclass(), true);
}
@ -109,7 +106,7 @@ public class ReflectionUtil {
}
private void scanMethods(Class<?> host, boolean recursive) {
if (host.getSuperclass() != null && recursive) {
if (recursive && host.getSuperclass() != null && host.getSuperclass() != Object.class) {
scanMethods(host.getSuperclass(), true);
}
@ -119,8 +116,8 @@ public class ReflectionUtil {
}
}
public Object newInstance() throws IllegalAccessException, InstantiationException {
return handle.newInstance();
public Object newInstance() throws ReflectiveOperationException {
return handle.getConstructor().newInstance();
}
public Field getField(String name) {