PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: PandacubeFr:276f5b2dc18b7602b8277ea79f3852d7c02df91a
Branches Tags
PandacubeFr:master
PandacubeFr:medrias
..
compare: PandacubeFr:ee023b5d2c6010ef0e2144668fbf1accf76d6ab0
Branches Tags
PandacubeFr:master
PandacubeFr:medrias

No commits in common. "276f5b2dc18b7602b8277ea79f3852d7c02df91a" and "ee023b5d2c6010ef0e2144668fbf1accf76d6ab0" have entirely different histories.
276f5b2dc1 ... ee023b5d2c

2 changed files with 12 additions and 67 deletions
Show Stats Expand all files Collapse all files

46
pandalib-paper/src/main/java/fr/pandacube/lib/paper/commands/PaperBrigadierCommand.java
View File

@ -73,13 +73,13 @@ public abstract class PaperBrigadierCommand extends BrigadierCommand<CommandSour
RootCommandNode<CommandSourceStack> wrappedRoot = vanillaPaperDispatcher.getRoot(); RootCommandNode<CommandSourceStack> wrappedRoot = vanillaPaperDispatcher.getRoot();
ReflectClass<?> apiMirrorRootNodeClass = Reflect.ofClassOfInstance(wrappedRoot); ReflectClass<?> apiMirrorRootNodeClass = Reflect.ofClassOfInstance(wrappedRoot);
try { try {
RootCommandNode<?> unwrappedRoot = ((CommandDispatcher<?>) apiMirrorRootNodeClass.method("getDispatcher").invoke(wrappedRoot)).getRoot(); RootCommandNode<?> actualRoot = ((CommandDispatcher<?>) apiMirrorRootNodeClass.method("getDispatcher").invoke(wrappedRoot)).getRoot();
Reflect.ofClass(CommandNode.class).field("unwrappedCached").setValue(wrappedRoot, unwrappedRoot); Reflect.ofClass(CommandNode.class).field("unwrappedCached").setValue(wrappedRoot, actualRoot);
Reflect.ofClass(CommandNode.class).field("wrappedCached").setValue(unwrappedRoot, wrappedRoot); Reflect.ofClass(CommandNode.class).field("wrappedCached").setValue(actualRoot, wrappedRoot);
} catch (InvocationTargetException|IllegalAccessException|NoSuchMethodException|NoSuchFieldException e) { } catch (InvocationTargetException|IllegalAccessException|NoSuchMethodException|NoSuchFieldException e) {
Log.severe("Unable to trick the Paper/Brigadier unwrapper to properly handle commands redirecting to root command node.", e); Log.severe("Unable to trick the Paper/Brigadier unwrapper to properly handle redirecting to root command node.", e);
} }
} }
} }
@ -183,7 +183,6 @@ public abstract class PaperBrigadierCommand extends BrigadierCommand<CommandSour
} }
registeredAliases = new HashSet<>(event.registrar().register(commandNode, description, List.of(aliases))); registeredAliases = new HashSet<>(event.registrar().register(commandNode, description, List.of(aliases)));
doPostRegistrationFixes();
if (registrationPolicy == RegistrationPolicy.ALL) { if (registrationPolicy == RegistrationPolicy.ALL) {
// enforce registration of aliases // enforce registration of aliases
@ -234,43 +233,6 @@ public abstract class PaperBrigadierCommand extends BrigadierCommand<CommandSour
} }
private void doPostRegistrationFixes() {
postRegistrationFixNode(new HashSet<>(), commandNode);
}
private void postRegistrationFixNode(Set<CommandNode<CommandSourceStack>> fixedNodes, CommandNode<CommandSourceStack> originalNode) {
if (originalNode instanceof RootCommandNode)
return;
if (fixedNodes.contains(originalNode))
return;
fixedNodes.add(originalNode);
if (originalNode.getRedirect() != null) {
try {
ReflectClass<CommandNode> cmdNodeClass = Reflect.ofClass(CommandNode.class);
CommandNode<CommandSourceStack> unwrappedNode = (CommandNode<CommandSourceStack>) cmdNodeClass.field("unwrappedCached").getValue(originalNode);
if (unwrappedNode != null) {
cmdNodeClass.field("modifier").setValue(unwrappedNode, cmdNodeClass.field("modifier").getValue(originalNode));
cmdNodeClass.field("forks").setValue(unwrappedNode, cmdNodeClass.field("forks").getValue(originalNode));
}
} catch (IllegalAccessException | NoSuchFieldException e) {
throw new RuntimeException(e);
}
postRegistrationFixNode(fixedNodes, originalNode.getRedirect());
}
else {
try {
for (CommandNode<CommandSourceStack> child : originalNode.getChildren())
postRegistrationFixNode(fixedNodes, child);
} catch (UnsupportedOperationException ignored) {
// in case getChildren is not possible (vanilla commands are wrapped by Paper API)
}
}
}
private static LiteralCommandNode<CommandSourceStack> getAliasNode(CommandNode<CommandSourceStack> commandNode, String alias) { private static LiteralCommandNode<CommandSourceStack> getAliasNode(CommandNode<CommandSourceStack> commandNode, String alias) {
return LiteralArgumentBuilder.<CommandSourceStack>literal(alias) return LiteralArgumentBuilder.<CommandSourceStack>literal(alias)
.requires(commandNode.getRequirement()) .requires(commandNode.getRequirement())

33
pandalib-reflect/src/main/java/fr/pandacube/lib/reflect/ReflectField.java
View File

@ -9,7 +9,7 @@ import java.lang.reflect.Modifier;
*/ */
public final class ReflectField<T> extends ReflectMember<T, String, Field, NoSuchFieldException> { public final class ReflectField<T> extends ReflectMember<T, String, Field, NoSuchFieldException> {
/* Those fields are used to modify the value of a final variable. Depending on the current Java version, /* Those fields are used to modify the value of a static variable. Depending on the current Java version,
* one of them will be used for this purpose. * one of them will be used for this purpose.
*/ */
private static sun.misc.Unsafe sunMiscUnsafeInstance; private static sun.misc.Unsafe sunMiscUnsafeInstance;
@ -122,30 +122,13 @@ public final class ReflectField<T> extends ReflectMember<T, String, Field, NoSuc
// if the field is final, we have to do some unsafe stuff :/ // if the field is final, we have to do some unsafe stuff :/
if (sunMiscUnsafeInstance != null) { // Java >= 16 if (sunMiscUnsafeInstance != null) { // Java >= 16
// set the value of the field, directly in the memory // set the value of the field, directly in the memory
Object unsafeObjInstance = Modifier.isStatic(realModifiers) if (Modifier.isStatic(realModifiers)) {
? sunMiscUnsafeInstance.staticFieldBase(f) long offset = sunMiscUnsafeInstance.staticFieldOffset(f);
: instance; sunMiscUnsafeInstance.putObject(sunMiscUnsafeInstance.staticFieldBase(f), offset, value);
long offset = Modifier.isStatic(realModifiers) } else {
? sunMiscUnsafeInstance.staticFieldOffset(f) long offset = sunMiscUnsafeInstance.objectFieldOffset(f);
: sunMiscUnsafeInstance.objectFieldOffset(f); sunMiscUnsafeInstance.putObject(instance, offset, value);
if (char.class.isAssignableFrom(f.getType())) }
sunMiscUnsafeInstance.putChar(unsafeObjInstance, offset, (char)value);
else if (byte.class.isAssignableFrom(f.getType()))
sunMiscUnsafeInstance.putByte(unsafeObjInstance, offset, (byte)value);
else if (short.class.isAssignableFrom(f.getType()))
sunMiscUnsafeInstance.putShort(unsafeObjInstance, offset, (short)value);
else if (int.class.isAssignableFrom(f.getType()))
sunMiscUnsafeInstance.putInt(unsafeObjInstance, offset, (int)value);
else if (long.class.isAssignableFrom(f.getType()))
sunMiscUnsafeInstance.putLong(unsafeObjInstance, offset, (long)value);
else if (boolean.class.isAssignableFrom(f.getType()))
sunMiscUnsafeInstance.putBoolean(unsafeObjInstance, offset, (boolean)value);
else if (float.class.isAssignableFrom(f.getType()))
sunMiscUnsafeInstance.putFloat(unsafeObjInstance, offset, (float)value);
else if (double.class.isAssignableFrom(f.getType()))
sunMiscUnsafeInstance.putDouble(unsafeObjInstance, offset, (double)value);
else
sunMiscUnsafeInstance.putObject(unsafeObjInstance, offset, value);
} else { // Java < 16 } else { // Java < 16
// change the modifier in the Field instance so the method #set(instance, value) doesn't throw an exception // change the modifier in the Field instance so the method #set(instance, value) doesn't throw an exception
try { try {