From 6916af5c10464535e85c57474000de9fb18c897e Mon Sep 17 00:00:00 2001
From: Witherking25 <aaronkoonce25@gmail.com>
Date: Tue, 1 Mar 2022 08:46:03 -0600
Subject: [PATCH] Add ExpectPlatform Classes

---
 .../transformers/TransformExpectPlatform.java | 46 +++++++++++++++----
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/main/java/dev/architectury/transformer/transformers/TransformExpectPlatform.java b/src/main/java/dev/architectury/transformer/transformers/TransformExpectPlatform.java
index 6ef41b0..b37ad2e 100644
--- a/src/main/java/dev/architectury/transformer/transformers/TransformExpectPlatform.java
+++ b/src/main/java/dev/architectury/transformer/transformers/TransformExpectPlatform.java
@@ -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;
 
@@ -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;
             
@@ -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 + "/" +