diff options
Diffstat (limited to 'src/main/java/moe/nea')
6 files changed, 521 insertions, 288 deletions
diff --git a/src/main/java/moe/nea/modernjava/launch/live/FCPFixTweaker.java b/src/main/java/moe/nea/modernjava/launch/live/FCPFixTweaker.java index 0fe2285..826e765 100644 --- a/src/main/java/moe/nea/modernjava/launch/live/FCPFixTweaker.java +++ b/src/main/java/moe/nea/modernjava/launch/live/FCPFixTweaker.java @@ -1,6 +1,6 @@ package moe.nea.modernjava.launch.live; -import moe.nea.modernjava.launch.transform.TransObjectHolderRef; +import moe.nea.modernjava.launch.transform.PatchObjectHolderRef; import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.LaunchClassLoader; @@ -8,27 +8,27 @@ import java.io.File; import java.util.List; /** - * Tweaker class to inject {@link TransObjectHolderRef} + * Tweaker class to inject {@link PatchObjectHolderRef} */ public class FCPFixTweaker implements ITweaker { - @Override - public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) { - } + @Override + public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) { + } - @Override - public void injectIntoClassLoader(LaunchClassLoader classLoader) { - classLoader.addClassLoaderExclusion("moe.nea.modernjava."); - classLoader.addClassLoaderExclusion("kotlin."); - classLoader.registerTransformer("moe.nea.modernjava.launch.transform.TransObjectHolderRef"); - } + @Override + public void injectIntoClassLoader(LaunchClassLoader classLoader) { + classLoader.addClassLoaderExclusion("moe.nea.modernjava."); + classLoader.addClassLoaderExclusion("kotlin."); + classLoader.registerTransformer("moe.nea.modernjava.launch.transform.PatchObjectHolderRef"); + } - @Override - public String getLaunchTarget() { - return null; - } + @Override + public String getLaunchTarget() { + return null; + } - @Override - public String[] getLaunchArguments() { - return new String[0]; - } + @Override + public String[] getLaunchArguments() { + return new String[0]; + } } diff --git a/src/main/java/moe/nea/modernjava/launch/relaunch/FCPRelauncher.java b/src/main/java/moe/nea/modernjava/launch/relaunch/FCPRelauncher.java index 3e13806..70002b5 100644 --- a/src/main/java/moe/nea/modernjava/launch/relaunch/FCPRelauncher.java +++ b/src/main/java/moe/nea/modernjava/launch/relaunch/FCPRelauncher.java @@ -1,5 +1,6 @@ package moe.nea.modernjava.launch.relaunch; +import moe.nea.modernjava.launch.FCPEntryPoint; import moe.nea.modernjava.launch.util.PropertyNames; import moe.nea.modernjava.launch.util.TextIoUtils; import moe.nea.modernjava.launch.util.WellKnownBlackboard; @@ -14,126 +15,166 @@ import java.io.OutputStream; import java.lang.management.ManagementFactory; import java.nio.file.Files; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Enumeration; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipException; +import java.util.zip.ZipFile; public class FCPRelauncher { - /** - * @return the original arguments, as passed to the main method. - */ - public static List<String> getOriginalArguments() { - List<String> originalArgs = new ArrayList<>(); - - // Provided by FML - // This is highly processed so there might be some arguments that become lost, but almost everything should be in here. - // Namely non -- arguments get lost. I don't know any of these arguments that the vanilla launcher uses, so it should be fine? - // Also, some tweakers are missing. But we can fix this. - Map<String, String> launchArgs = WellKnownBlackboard.launchArgs(); - if ("UnknownFMLProfile".equals(launchArgs.get("--version"))) { - launchArgs.remove("--version"); - } - for (Map.Entry<String, String> argument : launchArgs.entrySet()) { - originalArgs.add(argument.getKey()); - originalArgs.add(argument.getValue()); - } - - - originalArgs.add("--tweakClass"); - originalArgs.add(FMLTweaker.class.getName()); - System.out.println("Reconstructed original minecraft arguments: " + originalArgs); - return originalArgs; - } - - public static File findJavaLauncher() { - JavaScanner javaScanner = new JavaScanner(); - javaScanner.scanDefaultPaths(); - javaScanner.prettyPrint(); - JavaScanner.LocalJavaVersion candidate = javaScanner.findCandidate(); - if (candidate == null) { - System.err.println("Looks like we couldn't find a java candidate. Either install one, or if you have one" + - " and we just cannot find it, specify -D" + PropertyNames.JAVA_SCAN_PATH + "=<java home here>." + - " We need a Java 16 JDK. Exiting now."); - IAMFML.shutdown(1); - throw new RuntimeException(); - } - System.out.println("Choosing Java Candidate:\n" + candidate.prettyPrint()); - return candidate.getJavaBinary(); - } - - public static File findAgentJar() { - try { - File file = File.createTempFile("mjr-agent", ".jar"); - try (InputStream is = FCPRelauncher.class.getResourceAsStream("/agent/agent.jar"); - OutputStream os = Files.newOutputStream(file.toPath())) { - assert is != null; - IOUtils.copy(is, os); - } - return file; - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public static void relaunch() { - - List<String> originalArgs = getOriginalArguments(); - - File modernJavaPath = findJavaLauncher(); - System.out.println("Located modern minecraft at: " + modernJavaPath); - - File agentFile = findAgentJar(); - System.out.println("Located agent jar at: " + agentFile); - - - ProcessBuilder processBuilder = new ProcessBuilder(); - processBuilder.inheritIO(); - processBuilder.directory(null); - - - List<String> moduleOpens = new ArrayList<>(); - moduleOpens.add("java.base/java.util=ALL-UNNAMED"); - moduleOpens.add("java.base/jdk.internal.loader=ALL-UNNAMED"); - moduleOpens.add("java.base/java.lang.reflect=ALL-UNNAMED"); - - - List<String> fullCommandLine = new ArrayList<>(); - fullCommandLine.add(modernJavaPath.getAbsolutePath()); - fullCommandLine.addAll(ManagementFactory.getRuntimeMXBean().getInputArguments()); - fullCommandLine.add("-D" + PropertyNames.HAS_RELAUNCHED + "=true"); - fullCommandLine.add("-D" + PropertyNames.RELAUNCH_CLASSPATH + "=" + agentFile.getAbsolutePath() + File.pathSeparator + ManagementFactory.getRuntimeMXBean().getClassPath()); - fullCommandLine.add("--illegal-access=permit"); - for (String open : moduleOpens) { - fullCommandLine.add("--add-opens"); - fullCommandLine.add(open); - } - if (System.getProperty(PropertyNames.DEBUG_PORT) != null) - fullCommandLine.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:" + System.getProperty(PropertyNames.DEBUG_PORT)); - fullCommandLine.add("-javaagent:" + agentFile.getAbsolutePath()); - fullCommandLine.add("--add-modules=ALL-MODULE-PATH,ALL-SYSTEM,ALL-DEFAULT,java.sql"); - fullCommandLine.add("-Xbootclasspath/a:" + agentFile.getAbsolutePath()); - fullCommandLine.add("moe.nea.modernjava.agent.RelaunchEntryPoint"); - fullCommandLine.addAll(originalArgs); - - System.out.println("Full relaunch commandline: " + fullCommandLine); - - - processBuilder.command(fullCommandLine); - int exitCode; - try { - try { - Process process = processBuilder.start(); - exitCode = process.waitFor(); - } finally { - TextIoUtils.flushStdIO(); - } - } catch (IOException | InterruptedException e) { - throw new RuntimeException("Failed to relaunch with old java version", e); - } - - - System.out.println("Exiting outer relaunch layer"); - IAMFML.shutdown(exitCode); - } + /** + * @return the original arguments, as passed to the main method. + */ + public static List<String> getOriginalArguments() { + List<String> originalArgs = new ArrayList<>(); + + // Provided by FML + // This is highly processed so there might be some arguments that become lost, but almost everything should be in here. + // Namely non -- arguments get lost. I don't know any of these arguments that the vanilla launcher uses, so it should be fine? + // Also, some tweakers are missing. But we can fix this. + Map<String, String> launchArgs = WellKnownBlackboard.launchArgs(); + if ("UnknownFMLProfile".equals(launchArgs.get("--version"))) { + launchArgs.remove("--version"); + } + for (Map.Entry<String, String> argument : launchArgs.entrySet()) { + originalArgs.add(argument.getKey()); + originalArgs.add(argument.getValue()); + } + + + originalArgs.add("--tweakClass"); + originalArgs.add(FMLTweaker.class.getName()); + System.out.println("Reconstructed original minecraft arguments: " + originalArgs); + return originalArgs; + } + + public static File findJavaLauncher() { + JavaScanner javaScanner = new JavaScanner(); + javaScanner.scanDefaultPaths(); + javaScanner.prettyPrint(); + JavaScanner.LocalJavaVersion candidate = javaScanner.findCandidate(); + if (candidate == null) { + System.err.println("Looks like we couldn't find a java candidate. Either install one, or if you have one" + + " and we just cannot find it, specify -D" + PropertyNames.JAVA_SCAN_PATH + "=<java home here>." + + " We need a Java 16 JDK. Exiting now."); + IAMFML.shutdown(1); + throw new RuntimeException(); + } + System.out.println("Choosing Java Candidate:\n" + candidate.prettyPrint()); + return candidate.getJavaBinary(); + } + + public static File copyResource(String name, String resourcePath) { + try { + File file = File.createTempFile(name, ".jar"); + try (InputStream is = FCPRelauncher.class.getResourceAsStream(resourcePath); + OutputStream os = Files.newOutputStream(file.toPath())) { + assert is != null; + IOUtils.copy(is, os); + } + return file; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public static File findAgentJar() { + return copyResource("mjr-agent", "/agent/agent.jar"); + } + + public static void relaunch() { + + List<String> originalArgs = getOriginalArguments(); + + File modernJavaPath = findJavaLauncher(); + System.out.println("Located modern minecraft at: " + modernJavaPath); + + File agentFile = findAgentJar(); + System.out.println("Located agent jar at: " + agentFile); + + + ProcessBuilder processBuilder = new ProcessBuilder(); + processBuilder.inheritIO(); + processBuilder.directory(null); + + + List<String> moduleOpens = new ArrayList<>(); + moduleOpens.add("java.base/java.util=ALL-UNNAMED"); + moduleOpens.add("java.base/jdk.internal.loader=ALL-UNNAMED"); + moduleOpens.add("java.base/java.lang.reflect=ALL-UNNAMED"); + + + List<String> fullCommandLine = new ArrayList<>(); + fullCommandLine.add(modernJavaPath.getAbsolutePath()); + fullCommandLine.addAll(ManagementFactory.getRuntimeMXBean().getInputArguments()); + fullCommandLine.add("-D" + PropertyNames.HAS_RELAUNCHED + "=true"); + fullCommandLine.add("-D" + PropertyNames.RELAUNCH_CLASSPATH + "=" + createClassPath(agentFile)); + fullCommandLine.add("--illegal-access=permit"); + for (String open : moduleOpens) { + fullCommandLine.add("--add-opens"); + fullCommandLine.add(open); + } + if (System.getProperty(PropertyNames.DEBUG_PORT) != null) + fullCommandLine.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:" + System.getProperty(PropertyNames.DEBUG_PORT)); + fullCommandLine.add("-Xbootclasspath/a:" + agentFile.getAbsolutePath()); + fullCommandLine.add("-Xbootclasspath/a:" + extractExtraDependencies().stream().map(File::getAbsolutePath).collect(Collectors.joining(File.pathSeparator))); + fullCommandLine.add("-javaagent:" + agentFile.getAbsolutePath()); + fullCommandLine.add("--add-modules=ALL-MODULE-PATH,ALL-SYSTEM,ALL-DEFAULT,java.sql"); + fullCommandLine.add("moe.nea.modernjava.agent.RelaunchEntryPoint"); + fullCommandLine.addAll(originalArgs); + + System.out.println("Full relaunch commandline: " + fullCommandLine); + + + processBuilder.command(fullCommandLine); + int exitCode; + try { + try { + Process process = processBuilder.start(); + exitCode = process.waitFor(); + } finally { + TextIoUtils.flushStdIO(); + } + } catch (IOException | InterruptedException e) { + throw new RuntimeException("Failed to relaunch with old java version", e); + } + + + System.out.println("Exiting outer relaunch layer"); + IAMFML.shutdown(exitCode); + } + + private static String createClassPath(File agentFile) { + List<String> classPath = new ArrayList<>(); + classPath.addAll(Arrays.asList(ManagementFactory.getRuntimeMXBean().getClassPath().split(File.pathSeparator))); + classPath.removeIf(it -> it.matches("[/\\\\]asm-[^/\\\\]+-5\\.[^/\\\\]+\\.jar")); + classPath.add(0, agentFile.getAbsolutePath()); + return String.join(File.pathSeparator, classPath); + } + + public static List<File> extractExtraDependencies() { + try (ZipFile zipFile = new ZipFile(getCurrentJarFile())) { + List<File> extractedResources = new ArrayList<>(); + Enumeration<? extends ZipEntry> entries = zipFile.entries(); + while (entries.hasMoreElements()) { + ZipEntry entry = entries.nextElement(); + if (!entry.getName().startsWith("deps/")) continue; + if (!entry.getName().endsWith(".jar")) continue; + String[] split = entry.getName().split("/"); + extractedResources.add(copyResource(split[split.length - 1].split("\\.")[0], "/" + entry.getName())); + } + return extractedResources; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public static File getCurrentJarFile() { + return new File(FCPEntryPoint.fileUri); + } } diff --git a/src/main/java/moe/nea/modernjava/launch/relaunch/JavaScanner.java b/src/main/java/moe/nea/modernjava/launch/relaunch/JavaScanner.java index 0003097..e50e5d4 100644 --- a/src/main/java/moe/nea/modernjava/launch/relaunch/JavaScanner.java +++ b/src/main/java/moe/nea/modernjava/launch/relaunch/JavaScanner.java @@ -11,127 +11,129 @@ import java.util.List; public class JavaScanner { - public static final String JAVA_BINARY_PATH = "bin/java" + (SystemUtils.IS_OS_WINDOWS ? ".exe" : ""); - public static final String JAVA_COMPILER_PATH = "bin/javac" + (SystemUtils.IS_OS_WINDOWS ? ".exe" : ""); - - public boolean isJavaHome(File potential) { - if (new File(potential, JAVA_BINARY_PATH).exists()) { - return true; - } - return false; - } - - private List<LocalJavaVersion> versionList = new ArrayList<>(); - - public void scanDirectory(File file) { - scanDirectory(file, 1); - } - - public void scanDirectory(File file, int depthLimit) { - if (depthLimit < 0) return; - if (isJavaHome(file)) { - versionList.add(new LocalJavaVersion(file)); - } else { - for (File listFile : file.listFiles()) { - if (listFile.isDirectory()) { - scanDirectory(listFile, depthLimit - 1); - } - } - } - } - - public void prettyPrint() { - String s = "Fun fact these are the found Java Runtime Environments:\n"; - for (LocalJavaVersion localJavaVersion : versionList) { - s += localJavaVersion.prettyPrint(); - } - System.out.println(s); - } - - public void scanDefaultPaths() { - File home = new File(System.getProperty("user.home")); - scanDirectory(new File(home, ".sdkman/candidates/java")); - scanDirectory(new File(home, ".jdks")); - scanDirectory(new File("/usr"), 0); - String[] paths = System.getProperty(PropertyNames.JAVA_SCAN_PATH, "").split(File.pathSeparator); - for (String path : paths) { - if (!path.isEmpty()) { - scanDirectory(new File(path).getParentFile(), 3); - } - } - } - - public LocalJavaVersion findCandidate() { - LocalJavaVersion bestFit = null; - for (LocalJavaVersion localJavaVersion : versionList) { - if (localJavaVersion.isJdk() && localJavaVersion.getMajorVersion() == 16) { - bestFit = localJavaVersion; - } - } - return bestFit; - } - - public static class LocalJavaVersion { - private final File javaHome; - private String versionString; - - public LocalJavaVersion(File javaHome) { - this.javaHome = javaHome; - } - - public File getJavaHome() { - return javaHome; - } - - public File getJavaBinary() { - return new File(javaHome, JAVA_BINARY_PATH); - } - - public boolean isJdk() { - return new File(javaHome, JAVA_COMPILER_PATH).exists(); - } - - public String getVersionString() { - if (versionString == null) { - ProcessBuilder processBuilder = new ProcessBuilder(); - processBuilder.command(getJavaBinary().getAbsolutePath(), "-version"); - processBuilder.redirectInput(ProcessBuilder.Redirect.PIPE); - processBuilder.redirectOutput(ProcessBuilder.Redirect.PIPE); - processBuilder.redirectError(ProcessBuilder.Redirect.PIPE); - try { - Process process = processBuilder.start(); - process.waitFor(); - versionString = IOUtils.toString(process.getInputStream()) + IOUtils.toString(process.getErrorStream()); - } catch (Exception e) { - e.printStackTrace(); - versionString = "<invalid>"; - } - } - return versionString; - } - - public String prettyPrint() { - return javaHome.getAbsolutePath() + ":\n" - + "\tJava Binary: " + getJavaBinary().getAbsolutePath() + "\n" - + "\tMajor Version: " + getMajorVersion() + "\n" - + "\tFull Version: " + getVersion() + "\n" - + "\tIs Jdk: " + isJdk() + "\n" - ; - } - - public String getVersion() { - String v = getVersionString(); - String[] s = v.split("\""); - if (s.length < 2) return null; - return s[1]; - } - - public int getMajorVersion() { - try { - return Integer.parseInt(getVersion().split("\\.")[0]); - } catch (Exception e) { - return -1; - } - } - } + public static final String JAVA_BINARY_PATH = "bin/java" + (SystemUtils.IS_OS_WINDOWS ? ".exe" : ""); + public static final String JAVA_COMPILER_PATH = "bin/javac" + (SystemUtils.IS_OS_WINDOWS ? ".exe" : ""); + + public boolean isJavaHome(File potential) { + if (new File(potential, JAVA_BINARY_PATH).exists()) { + return true; + } + return false; + } + + private List<LocalJavaVersion> versionList = new ArrayList<>(); + + public void scanDirectory(File file) { + scanDirectory(file, 1); + } + + public void scanDirectory(File file, int depthLimit) { + if (depthLimit < 0) return; + if (isJavaHome(file)) { + versionList.add(new LocalJavaVersion(file)); + } else { + File[] files = file.listFiles(); + if (files == null) return; + for (File listFile : files) { + if (listFile.isDirectory()) { + scanDirectory(listFile, depthLimit - 1); + } + } + } + } + + public void prettyPrint() { + String s = "Fun fact these are the found Java Runtime Environments:\n"; + for (LocalJavaVersion localJavaVersion : versionList) { + s += localJavaVersion.prettyPrint(); + } + System.out.println(s); + } + + public void scanDefaultPaths() { + File home = new File(System.getProperty("user.home")); + scanDirectory(new File(home, ".sdkman/candidates/java")); + scanDirectory(new File(home, ".jdks")); + scanDirectory(new File("/usr"), 0); + String[] paths = System.getProperty(PropertyNames.JAVA_SCAN_PATH, "").split(File.pathSeparator); + for (String path : paths) { + if (!path.isEmpty()) { + scanDirectory(new File(path).getParentFile(), 3); + } + } + } + + public LocalJavaVersion findCandidate() { + LocalJavaVersion bestFit = null; + for (LocalJavaVersion localJavaVersion : versionList) { + if (localJavaVersion.isJdk() && localJavaVersion.getMajorVersion() == 16) { + bestFit = localJavaVersion; + } + } + return bestFit; + } + + public static class LocalJavaVersion { + private final File javaHome; + private String versionString; + + public LocalJavaVersion(File javaHome) { + this.javaHome = javaHome; + } + + public File getJavaHome() { + return javaHome; + } + + public File getJavaBinary() { + return new File(javaHome, JAVA_BINARY_PATH); + } + + public boolean isJdk() { + return new File(javaHome, JAVA_COMPILER_PATH).exists(); + } + + public String getVersionString() { + if (versionString == null) { + ProcessBuilder processBuilder = new ProcessBuilder(); + processBuilder.command(getJavaBinary().getAbsolutePath(), "-version"); + processBuilder.redirectInput(ProcessBuilder.Redirect.PIPE); + processBuilder.redirectOutput(ProcessBuilder.Redirect.PIPE); + processBuilder.redirectError(ProcessBuilder.Redirect.PIPE); + try { + Process process = processBuilder.start(); + process.waitFor(); + versionString = IOUtils.toString(process.getInputStream()) + IOUtils.toString(process.getErrorStream()); + } catch (Exception e) { + e.printStackTrace(); + versionString = "<invalid>"; + } + } + return versionString; + } + + public String prettyPrint() { + return javaHome.getAbsolutePath() + ":\n" + + "\tJava Binary: " + getJavaBinary().getAbsolutePath() + "\n" + + "\tMajor Version: " + getMajorVersion() + "\n" + + "\tFull Version: " + getVersion() + "\n" + + "\tIs Jdk: " + isJdk() + "\n" + ; + } + + public String getVersion() { + String v = getVersionString(); + String[] s = v.split("\""); + if (s.length < 2) return null; + return s[1]; + } + + public int getMajorVersion() { + try { + return Integer.parseInt(getVersion().split("\\.")[0]); + } catch (Exception e) { + return -1; + } + } + } } diff --git a/src/main/java/moe/nea/modernjava/launch/transform/BasePatch.java b/src/main/java/moe/nea/modernjava/launch/transform/BasePatch.java new file mode 100644 index 0000000..1ef494c --- /dev/null +++ b/src/main/java/moe/nea/modernjava/launch/transform/BasePatch.java @@ -0,0 +1,90 @@ +package moe.nea.modernjava.launch.transform; + +import net.minecraft.launchwrapper.IClassTransformer; +import org.jetbrains.annotations.NotNull; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.InsnList; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.util.Printer; +import org.objectweb.asm.util.Textifier; +import org.objectweb.asm.util.TraceMethodVisitor; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +public abstract class BasePatch implements IClassTransformer { + protected abstract String getTargetedName(); + + protected Type getTargetedType() { + return getClassType(getTargetedName()); + } + + protected abstract ClassNode transform(ClassNode classNode); + + @Override + public byte[] transform(String name, String transformedName, byte[] basicClass) { + if (basicClass == null) return null; + if (!getTargetedName().equals(name)) return basicClass; + ClassNode node = new ClassNode(); + ClassReader reader = new ClassReader(basicClass); + reader.accept(node, 0); + ClassNode processedNode = transform(node); + ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); + processedNode.accept(writer); + return writer.toByteArray(); + } + + protected Iterable<AbstractInsnNode> iterableInstructions(InsnList insns) { + return new Iterable<AbstractInsnNode>() { + @NotNull + @Override + public Iterator<AbstractInsnNode> iterator() { + return insns.iterator(); + } + }; + } + + private Printer printer = new Textifier(); + private TraceMethodVisitor traceMethodVisitor = new TraceMethodVisitor(printer); + + protected String debugInsn(AbstractInsnNode insnNode) { + insnNode.accept(traceMethodVisitor); + StringWriter sw = new StringWriter(); + printer.print(new PrintWriter(sw)); + printer.getText().clear(); + return sw.toString(); + } + + protected List<String> debugInsnList(InsnList list) { + List<String> strings = new ArrayList<>(); + for (AbstractInsnNode node : iterableInstructions(list)) { + strings.add(debugInsn(node)); + } + return strings; + } + + protected Type getClassType(String plainName) { + return Type.getObjectType(plainName.replace('.', '/')); + } + + protected static MethodNode findMethod(ClassNode node, String name, Type desc) { + System.out.println("Searching for " + name + " " + desc.getDescriptor()); + for (MethodNode method : node.methods) { + System.out.println(" - Candidate: " + method.name + " " + method.desc); + if (name.equals(method.name) && desc.getDescriptor().equals(method.desc)) { + System.out.println("Found method"); + return method; + } + } + System.out.println("Could not find method."); + return null; + } + +} diff --git a/src/main/java/moe/nea/modernjava/launch/transform/PatchObjectHolderRef.java b/src/main/java/moe/nea/modernjava/launch/transform/PatchObjectHolderRef.java new file mode 100644 index 0000000..baef356 --- /dev/null +++ b/src/main/java/moe/nea/modernjava/launch/transform/PatchObjectHolderRef.java @@ -0,0 +1,100 @@ +package moe.nea.modernjava.launch.transform; + + +import org.jetbrains.annotations.NotNull; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.InsnList; +import org.objectweb.asm.tree.InsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.VarInsnNode; + +import java.lang.reflect.Field; + +public class PatchObjectHolderRef extends BasePatch { + @Override + protected String getTargetedName() { + return "net.minecraftforge.fml.common.registry.ObjectHolderRef"; + } + + @Override + protected ClassNode transform(ClassNode classNode) { + patchFindWriteable(classNode); + patchApply(classNode); + return classNode; + } + + private void patchApply(ClassNode classNode) { + MethodNode apply = findMethod( + classNode, "apply", + Type.getMethodType(Type.VOID_TYPE) + ); + assert apply != null; + + InsnList insns = apply.instructions; + + AbstractInsnNode start = null, end = null; + int c = 0; + for (AbstractInsnNode instruction : iterableInstructions(insns)) { + if (instruction instanceof FieldInsnNode && instruction.getOpcode() == Opcodes.GETSTATIC && ((FieldInsnNode) instruction).name.equals("newFieldAccessor")) { + start = instruction; + } + if (instruction.getOpcode() == Opcodes.INVOKEVIRTUAL && start != null) { + c++; + if (c == 2) { + end = instruction.getNext(); + break; + } + } + } + AbstractInsnNode trueStart = start; + { + InsnList insertion = new InsnList(); + insertion.add(new VarInsnNode(Opcodes.ALOAD, 0)); + insertion.add(new FieldInsnNode(Opcodes.GETFIELD, "net/minecraftforge/fml/common/registry/ObjectHolderRef", "field", "Ljava/lang/reflect/Field;")); + insertion.add(new VarInsnNode(Opcodes.ALOAD, 1)); + insertion.add(new MethodInsnNode(Opcodes.INVOKESTATIC, + "moe/nea/modernjava/launch/util/ObjectHolderRefCompanion", + "doFieldWrite", + "(Ljava/lang/reflect/Field;Ljava/lang/Object;)V", + false)); + insertion.add(new InsnNode(Opcodes.RETURN)); + insns.insertBefore(trueStart, insertion); + } + apply.maxLocals = 0; + AbstractInsnNode toRemove = start; + while (true) { + AbstractInsnNode next = toRemove.getNext(); + insns.remove(toRemove); + if (end == toRemove) + break; + toRemove = next; + } + } + + Type companionType = getClassType("moe.nea.modernjava.launch.util.ObjectHolderRefCompanion"); + + private void patchFindWriteable(ClassNode classNode) { + MethodNode makeWriteable = findMethod( + classNode, "makeWritable", + Type.getMethodType(Type.VOID_TYPE, Type.getType(Field.class)) + ); + assert makeWriteable != null; + makeWriteable.tryCatchBlocks.clear(); + InsnList insns = makeWriteable.instructions; + insns.clear(); + insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); + insns.add(new MethodInsnNode( + Opcodes.INVOKESTATIC, + companionType.getInternalName(), + "makeFieldWritable", + Type.getMethodType(Type.VOID_TYPE, Type.getType(Field.class)).getDescriptor(), + false + )); + insns.add(new InsnNode(Opcodes.RETURN)); + } +} diff --git a/src/main/java/moe/nea/modernjava/launch/util/ObjectHolderRefCompanion.java b/src/main/java/moe/nea/modernjava/launch/util/ObjectHolderRefCompanion.java index 15f9450..3b31b4e 100644 --- a/src/main/java/moe/nea/modernjava/launch/util/ObjectHolderRefCompanion.java +++ b/src/main/java/moe/nea/modernjava/launch/util/ObjectHolderRefCompanion.java @@ -1,44 +1,44 @@ package moe.nea.modernjava.launch.util; -import moe.nea.modernjava.launch.transform.TransObjectHolderRef; +import moe.nea.modernjava.launch.transform.PatchObjectHolderRef; import sun.misc.Unsafe; import java.lang.reflect.Field; /** - * A companion to my transformations from {@link TransObjectHolderRef} to avoid + * A companion to my transformations from {@link PatchObjectHolderRef} to avoid * having to write all of this out in bytecode. */ public class ObjectHolderRefCompanion { - private static Unsafe unsafe; + private static Unsafe unsafe; - static { - try { - final Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe"); - unsafeField.setAccessible(true); - unsafe = (Unsafe) unsafeField.get(null); - } catch (Exception ex) { - ex.printStackTrace(); - } - } + static { + try { + final Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe"); + unsafeField.setAccessible(true); + unsafe = (Unsafe) unsafeField.get(null); + } catch (Exception ex) { + ex.printStackTrace(); + } + } - /** - * A noop to have a jump target for the reflection factories. - */ - public static void makeFieldWritable(Field f) { - String s = "Doing nothing. We will use unsafe to set the value instead, if possible"; - } + /** + * A noop to have a jump target for the reflection factories. + */ + public static void makeFieldWritable(Field f) { + String s = "Doing nothing. We will use unsafe to set the value instead, if possible"; + } - /** - * Write a value to a static final field. - */ - public static void doFieldWrite(Field field, Object object) throws IllegalAccessException { - if (unsafe == null) { - field.set(null, object); - } else { - Object o = unsafe.staticFieldBase(field); - long l = unsafe.staticFieldOffset(field); - unsafe.putObject(o, l, object); - } - } + /** + * Write a value to a static final field. + */ + public static void doFieldWrite(Field field, Object object) throws IllegalAccessException { + if (unsafe == null) { + field.set(null, object); + } else { + Object o = unsafe.staticFieldBase(field); + long l = unsafe.staticFieldOffset(field); + unsafe.putObject(o, l, object); + } + } } |