BynBang/OpenPrestige
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve launcher injection and hook reliability

Browse Source 
Find Fabric through the render thread's class loader and make bytecode transformations safer for launcher-provided class definitions. Improve hook reporting, process-picker refresh behavior, and self-destruct cleanup; document Dawn and Lunar 1.21.11 setup.
This commit is contained in:
bbldrizzy committed 2026-11-03 11:40:43 +00:00
1 parent 38ff6d387c
commit 036b24f2ae
12 files changed
+186 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/dev/zprestige/prestige/inject/Bootstrap.java
+56 -3
View File
@@ -6,14 +6,22 @@ import dev.zprestige.prestige.engine.EngineState;
import dev.zprestige.prestige.hooks.Definer;
import dev.zprestige.prestige.ui.mc.Entry;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.function.ToIntBiFunction;
import net.fabricmc.loader.api.FabricLoader;
import net.lenni0451.classtransform.TransformerManager;
import net.lenni0451.classtransform.utils.mappings.SuperMappingFiller;
import net.minecraft.client.MinecraftClient;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.FieldNode;
import org.objectweb.asm.tree.MethodNode;
/**
* Entry point of the injected payload. prestige_native.dll appends this jar to the Fabric (Knot) class path, registers the
@@ -41,11 +49,12 @@ public final class Bootstrap {
log("waiting for the Minecraft client");
waitForClient();
Report report = install(NativeBridge::classBytes, NativeBridge::redefine, nativeBatch());
log("hooks installed: " + report.redefined + " classes, " + report.moved + " handlers moved" + (report.failed.isEmpty() ? "" : ", FAILED " + report.failed));
log("hooks installed: " + report.redefined + " classes, " + report.moved + " handlers moved"
+ ", " + report.unchanged + " unchanged" + (report.failed.isEmpty() ? "" : ", FAILED " + report.failed));
if (report.redefined == 0) throw new IllegalStateException("no hooks installed");
// Some clients (Lunar) name a few classes and methods differently. Keep going with the hooks that did apply: a missing
// hook only disables the features behind it, while stopping here would leave the client without Prestige at all.
if (!report.failed.isEmpty()) {
if (report.redefined == 0) throw new IllegalStateException("could not hook " + report.failed);
log("continuing with " + report.redefined + " hooked classes; skipped " + report.failed);
}
log("initialising Prestige on the client thread");
@@ -67,7 +76,7 @@ public final class Bootstrap {
}
public static final class Report {
public int redefined, moved;
public int redefined, moved, unchanged;
public final List<String> failed = new ArrayList<>();
}
@@ -147,6 +156,26 @@ public final class Bootstrap {
}
long captured = System.nanoTime();
// Genesis can expose different class resources from the definitions installed in its JVM.
// Resolve inherited Yarn members using the actual superclass and interface declarations.
var mappings = manager.getMapper().getRemapper();
if (!mappings.isEmpty()) {
Map<Class<?>, ClassNode> declarations = new HashMap<>();
for (Class<?> type : types) {
if (type == null) continue;
try {
Set<ClassNode> parents = new LinkedHashSet<>();
collectParents(type.getSuperclass(), declarations, parents);
for (Class<?> iface : type.getInterfaces()) collectParents(iface, declarations, parents);
ClassNode target = new ClassNode();
target.name = Type.getInternalName(type);
SuperMappingFiller.fillSuperMembers(target, parents, mappings);
} catch (LinkageError e) {
log("could not inspect inherited mappings for " + type.getName() + ": " + e);
}
}
}
// 3. ClassTransform, one class at a time (its mapper is not thread-safe: running it on several threads corrupts its state).
// A result that is already in the disk cache skips the transformation, which is where nearly all of the time goes.
InPlaceTransformer.Result[] results = new InPlaceTransformer.Result[total];
@@ -167,6 +196,12 @@ public final class Bootstrap {
continue;
}
results[i] = transformer.transform(target, originals[i]);
if (results[i].target() == originals[i]) {
log("no bytecode changes for " + target);
report.unchanged++;
results[i] = null;
continue;
}
if (cache != null && results[i].helpers().isEmpty()) cache.put(target, originals[i], results[i].target());
} catch (Throwable t) {
fail(report, target, t);
@@ -211,6 +246,24 @@ public final class Bootstrap {
return report;
}
private static void collectParents(Class<?> type, Map<Class<?>, ClassNode> declarations, Set<ClassNode> parents) {
if (type == null || !type.getName().startsWith("net.minecraft.")) return;
ClassNode declaration = declarations.computeIfAbsent(type, parent -> {
ClassNode node = new ClassNode();
node.name = Type.getInternalName(parent);
for (var method : parent.getDeclaredMethods()) {
node.methods.add(new MethodNode(method.getModifiers(), method.getName(), Type.getMethodDescriptor(method), null, null));
}
for (var field : parent.getDeclaredFields()) {
node.fields.add(new FieldNode(field.getModifiers(), field.getName(), Type.getDescriptor(field.getType()), null, null));
}
return node;
});
if (!parents.add(declaration)) return;
collectParents(type.getSuperclass(), declarations, parents);
for (Class<?> iface : type.getInterfaces()) collectParents(iface, declarations, parents);
}
private static void fail(Report report, String target, Throwable t) {
report.failed.add(target);
log("hook failed for " + target + ": " + t);
src/main/java/dev/zprestige/prestige/inject/InPlaceTransformer.java
+43 -9
View File
@@ -4,6 +4,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -11,8 +12,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import net.lenni0451.classtransform.TransformerManager;
import net.lenni0451.classtransform.utils.ASMUtils;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.AbstractInsnNode;
@@ -48,7 +51,7 @@ public final class InPlaceTransformer {
/** @param dottedName runtime name of the target class, @param current the bytes of the class as currently loaded */
public Result transform(String dottedName, byte[] current) throws Exception {
byte[] out = manager.transform(dottedName, current, true);
byte[] out = manager.transform(dottedName, current, false);
if (out == null) throw new IllegalStateException("ClassTransform failed for " + dottedName);
ClassNode before = read(current);
ClassNode after = read(out);
@@ -63,9 +66,9 @@ public final class InPlaceTransformer {
before.methods.forEach(m -> existing.put(m.name + m.desc, m));
Map<String, MethodNode> moved = new LinkedHashMap<>();
for (MethodNode m : after.methods) if (!existing.containsKey(m.name + m.desc)) moved.put(m.name + m.desc, m);
if (moved.isEmpty()) return new Result(out, Map.of(), 0);
if (after.interfaces.size() != before.interfaces.size())
if (!after.interfaces.equals(before.interfaces))
throw new IllegalStateException(dottedName + ": transformer changed the interface list");
if (moved.isEmpty()) return new Result(writeTarget(current, before, after, existing), Map.of(), 0);
String helperName = HOOK_PACKAGE + "H" + (sequence.getAndIncrement()) + "_" + after.name.substring(after.name.lastIndexOf('/') + 1).replace('$', '_');
ClassNode helper = new ClassNode();
@@ -100,13 +103,44 @@ public final class InPlaceTransformer {
accessors.finish();
after.methods.removeIf(m -> moved.containsKey(m.name + m.desc));
ClassWriter targetWriter = new ClassWriter(0);
after.accept(targetWriter);
ClassWriter helperWriter = new ClassWriter(ClassWriter.COMPUTE_MAXS);
helper.accept(helperWriter);
Map<String, byte[]> helpers = new LinkedHashMap<>();
helpers.put(helperName.replace('/', '.'), helperWriter.toByteArray());
return new Result(targetWriter.toByteArray(), helpers, moved.size());
helpers.put(helperName.replace('/', '.'), ASMUtils.toBytes(helper, manager.getClassTree(), manager.getClassProvider()));
return new Result(writeTarget(current, before, after, existing), helpers, moved.size());
}
/**
* Recompute frames only in changed methods. Launchers can transform unrelated methods and
* supply valid frames for them even when their class resources are unavailable to ClassTransform.
*/
private byte[] writeTarget(byte[] current, ClassNode before, ClassNode after, Map<String, MethodNode> originals) {
List<MethodNode> changed = new ArrayList<>();
for (MethodNode method : after.methods) {
MethodNode original = originals.get(method.name + method.desc);
if (original == null) throw new IllegalStateException("Unexpected method " + method.name + method.desc);
if (!Arrays.equals(methodBytes(original), methodBytes(method))) changed.add(method);
}
if (changed.isEmpty()) return current;
after.methods = changed;
ClassNode computed = read(ASMUtils.toBytes(after, manager.getClassTree(), manager.getClassProvider()));
Map<String, MethodNode> replacements = new HashMap<>();
computed.methods.forEach(m -> replacements.put(m.name + m.desc, m));
before.methods.replaceAll(m -> replacements.getOrDefault(m.name + m.desc, m));
ClassWriter writer = new ClassWriter(new ClassReader(current), 0);
before.accept(writer);
return writer.toByteArray();
}
private static byte[] methodBytes(MethodNode method) {
ClassWriter writer = new ClassWriter(0);
writer.visit(Opcodes.V21, Opcodes.ACC_PUBLIC, "MethodComparison", null, "java/lang/Object", null);
MethodVisitor visitor = writer.visitMethod(method.access, method.name, method.desc, method.signature,
method.exceptions.toArray(String[]::new));
method.accept(new MethodVisitor(Opcodes.ASM9, visitor) {
@Override public void visitFrame(int type, int locals, Object[] local, int stackSize, Object[] stack) {}
@Override public void visitMaxs(int maxStack, int maxLocals) { super.visitMaxs(0, 0); }
});
writer.visitEnd();
return writer.toByteArray();
}
private static ClassNode read(byte[] bytes) {