Skip to content

Add ExpectPlatform Classes #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KP2048 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add ExpectPlatform Classes #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 38 additions & 8 deletions src/main/java/dev/architectury/transformer/transformers/TransformExpectPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@
import dev.architectury.transformer.transformers.base.ClassEditTransformer;
import dev.architectury.transformer.transformers.base.edit.TransformerContext;
import dev.architectury.transformer.util.Logger;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
import org.objectweb.asm.*;
import org.objectweb.asm.tree.*;

import java.util.ArrayList;
import java.util.Objects;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;

import static dev.architectury.transformer.transformers.RemapInjectables.getUniqueIdentifier;

Expand Down Expand Up @@ -85,6 +83,20 @@ private byte[] buildPlatformMethodClass(String className) {
@Override
public ClassNode doEdit(String name, ClassNode node) {
if (!RemapInjectables.isInjectInjectables()) return node;
for (MethodNode method : node.methods) {
for (ListIterator<AbstractInsnNode> iterator = method.instructions.iterator(); iterator.hasNext(); ) {
AbstractInsnNode instruction = iterator.next();
if (instruction instanceof TypeInsnNode) {
TypeInsnNode typeInsn = (TypeInsnNode) instruction;
if (typeInsn.getOpcode() == Opcodes.NEW) {
String className = typeInsn.desc;
if (getClassNode(className).visibleAnnotations.stream().anyMatch(it -> Objects.equals(it.desc, RemapInjectables.EXPECT_PLATFORM) || Objects.equals(it.desc, RemapInjectables.EXPECT_PLATFORM_LEGACY) || Objects.equals(it.desc, RemapInjectables.EXPECT_PLATFORM_LEGACY2))) {
iterator.set(new TypeInsnNode(Opcodes.NEW, getPlatformClass(className)));
}
}
}
}
}
for (MethodNode method : node.methods) {
String platformMethodsClass = null;

Expand Down Expand Up @@ -123,10 +135,28 @@ public ClassNode doEdit(String name, ClassNode node) {

return node;
}

private static String getPlatformClass(String lookupClass) {

private static ClassNode getClassNode(String name) {
ClassNode node = new ClassNode();
try {
ClassReader reader = new ClassReader(Objects.requireNonNull(Class.forName(name.replace('/', '.')).getResourceAsStream(name + ".class")));
reader.accept(node, 0);
return node;
} catch (IOException | ClassNotFoundException e) {
e.printStackTrace();
}

throw new RuntimeException("Couldn't create ClassNode for class " + name);
}

private static String getPlatformName() {
String platform = System.getProperty(BuiltinProperties.PLATFORM_NAME);
Preconditions.checkNotNull(platform, BuiltinProperties.PLATFORM_NAME + " is not present!");
return platform;
}

private static String getPlatformClass(String lookupClass) {
String platform = getPlatformName();
String lookupType = lookupClass.replace("$", "") + "Impl";

return lookupType.substring(0, lookupType.lastIndexOf('/')) + "/" + platform + "/" +
Expand Down