Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-17 04:41:31 +01:00
Code Issues Projects Releases Wiki Activity

Fix reflective access warnings

Browse Source
This commit is contained in:
fullwall 2021-04-14 15:03:39 +08:00
parent ca421b9cef
commit 3a9e538c00
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/src/main/java/net/citizensnpcs/commands/AdminCommands.java
View File

@ -54,7 +54,6 @@ public class AdminCommands {
} }
Messaging.sendTr(sender, Messages.CITIZENS_RELOADING); Messaging.sendTr(sender, Messages.CITIZENS_RELOADING);
try { try {
plugin.reload(); plugin.reload();
Messaging.sendTr(sender, Messages.CITIZENS_RELOADED); Messaging.sendTr(sender, Messages.CITIZENS_RELOADED);
} catch (NPCLoadException ex) { } catch (NPCLoadException ex) {

15
main/src/main/java/net/citizensnpcs/util/NMS.java
View File

@ -291,15 +291,16 @@ public class NMS {
return BRIDGE.getYaw(entity); return BRIDGE.getYaw(entity);
} }
public static void giveReflectiveAccess(Class<?> clazz, Class<?> to) { public static void giveReflectiveAccess(Class<?> from, Class<?> to) {
try { try {
if (GET_MODULE == null) { if (GET_MODULE == null) {
Class<?> module = Class.forName("java.lang.Module"); Class<?> module = Class.forName("java.lang.Module");
GET_MODULE = Class.class.getMethod("getModule"); GET_MODULE = Class.class.getMethod("getModule");
ADD_OPENS = module.getMethod("addOpens", String.class, module); ADD_OPENS = module.getMethod("addOpens", String.class, module);
} }
ADD_OPENS.invoke(GET_MODULE.invoke(clazz), to.getPackage().getName(), GET_MODULE.invoke(to)); ADD_OPENS.invoke(GET_MODULE.invoke(from), from.getPackage().getName(), GET_MODULE.invoke(to));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
} }
} }
@ -316,7 +317,8 @@ public class NMS {
} }
public static void loadBridge(String rev) throws Exception { public static void loadBridge(String rev) throws Exception {
giveReflectiveAccess(Class.forName("net.minecraft.server.v" + rev + ".Entity"), NMS.class); Class<?> entity = Class.forName("net.minecraft.server.v" + rev + ".Entity");
giveReflectiveAccess(entity, NMS.class);
BRIDGE = (NMSBridge) Class.forName("net.citizensnpcs.nms.v" + rev + ".util.NMSImpl").getConstructor() BRIDGE = (NMSBridge) Class.forName("net.citizensnpcs.nms.v" + rev + ".util.NMSImpl").getConstructor()
.newInstance(); .newInstance();
} }
@ -509,9 +511,14 @@ public class NMS {
private static NMSBridge BRIDGE; private static NMSBridge BRIDGE;
private static Method GET_MODULE; private static Method GET_MODULE;
private static MethodHandles.Lookup LOOKUP = MethodHandles.lookup(); private static MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
private static Field MODIFIERS_FIELD = NMS.getField(Field.class, "modifiers", false); private static Field MODIFIERS_FIELD;
private static Object UNSAFE; private static Object UNSAFE;
private static MethodHandle UNSAFE_FIELD_OFFSET; private static MethodHandle UNSAFE_FIELD_OFFSET;
private static MethodHandle UNSAFE_PUT_OBJECT; private static MethodHandle UNSAFE_PUT_OBJECT;
private static MethodHandle UNSAFE_STATIC_FIELD_OFFSET; private static MethodHandle UNSAFE_STATIC_FIELD_OFFSET;
static {
giveReflectiveAccess(Field.class, NMS.class);
MODIFIERS_FIELD = NMS.getField(Field.class, "modifiers", false);
}
} }