Add general parameter naming

Author: JoJoDeveloping

src/main/java/de/oceanlabs/mcp/mcinjector/MCInjector.java

@@ -30,7 +30,8 @@ public class MCInjector
     private Path fileIn, fileOut;
     private Path excIn, excOut;
     private Path accIn, accOut;
-    private Path ctrIn, ctrOut;
+    private Path ctrIn;
+    private Path prmIn, prmOut;
     private LVTNaming lvt;
 
     public MCInjector(Path fileIn, Path fileOut)
@@ -104,9 +105,15 @@ public MCInjector constructors(Path ctrs)
         return this;
     }
 
-    public MCInjector constructorsOut(Path out)
+    public MCInjector parameters(Path ctrs)
     {
-        this.ctrOut = out;
+        this.prmIn = ctrs;
+        return this;
+    }
+
+    public MCInjector parametersOut(Path out)
+    {
+        this.prmOut = out;
         return this;
     }
 
@@ -121,8 +128,9 @@ public void process() throws IOException
     {
         MCInjectorImpl.process(fileIn, fileOut,
                                accIn, accOut,
-                               ctrIn, ctrOut,
+                               ctrIn,
                                excIn, excOut,
+                               prmIn, prmOut,
                                lvt);
     }
 
@@ -174,7 +182,9 @@ public static void main(String[] args) throws Exception
         OptionSpec<Path>      acc    = parser.accepts("acc")   .withRequiredArg().withValuesConvertedBy(PATH_ARG);
         OptionSpec<Path>      accOut = parser.accepts("accOut").withRequiredArg().withValuesConvertedBy(PATH_ARG);
         OptionSpec<Path>      ctr    = parser.accepts("ctr")   .withRequiredArg().withValuesConvertedBy(PATH_ARG);
-        OptionSpec<Path>      ctrOut = parser.accepts("ctrOut").withRequiredArg().withValuesConvertedBy(PATH_ARG);
+        OptionSpec<Path>      ctrOut = parser.accepts("ctrOut").withRequiredArg().withValuesConvertedBy(PATH_ARG).describedAs("legacy, can't be used anymore");
+        OptionSpec<Path>      prm    = parser.accepts("prm")   .withRequiredArg().withValuesConvertedBy(PATH_ARG);
+        OptionSpec<Path>      prmOut = parser.accepts("prmOut").withRequiredArg().withValuesConvertedBy(PATH_ARG);
         OptionSpec<Level>     logLvl = parser.accepts("level") .withRequiredArg().withValuesConvertedBy(LEVEL_ARG).defaultsTo(Level.INFO);
         OptionSpec<LVTNaming> lvt    = parser.accepts("lvt").withRequiredArg().ofType(LVTNaming.class).defaultsTo(LVTNaming.STRIP);
 
@@ -192,6 +202,11 @@ else if (o.has(ver))
                 System.out.println(VERSION);
                 return;
             }
+            else if (o.has(ctrOut))
+            {
+                System.out.println("ctrOut is using the legacy format and is no longer supported!");
+                return;
+            }
 
             MCInjector.LOG.setUseParentHandlers(false);
             MCInjector.LOG.setLevel(o.valueOf(logLvl));
@@ -205,7 +220,8 @@ else if (o.has(ver))
             LOG.info("Access:       " + o.valueOf(acc));
             LOG.info("              " + o.valueOf(accOut));
             LOG.info("Constructors: " + o.valueOf(ctr));
-            LOG.info("              " + o.valueOf(ctrOut));
+            LOG.info("Extra Params: " + o.valueOf(prm));
+            LOG.info("              " + o.valueOf(prmOut));
             LOG.info("LVT:          " + o.valueOf(lvt));
 
             try
@@ -219,7 +235,8 @@ else if (o.has(ver))
                     .access(o.valueOf(acc))
                     .accessOut(o.valueOf(accOut))
                     .constructors(o.valueOf(ctr))
-                    .constructorsOut(o.valueOf(ctrOut))
+                    .parameters(o.valueOf(prm))
+                    .parametersOut(o.valueOf(prmOut))
                     .process();
             }
             catch (Exception e)

src/main/java/de/oceanlabs/mcp/mcinjector/MCInjectorImpl.java

@@ -32,7 +32,7 @@
 import de.oceanlabs.mcp.mcinjector.adaptors.InnerClassInitAdder;
 import de.oceanlabs.mcp.mcinjector.adaptors.ParameterAnnotationFixer;
 import de.oceanlabs.mcp.mcinjector.data.Access;
-import de.oceanlabs.mcp.mcinjector.data.Constructors;
+import de.oceanlabs.mcp.mcinjector.data.Parameters;
 import de.oceanlabs.mcp.mcinjector.data.Exceptions;
 import de.oceanlabs.mcp.mcinjector.lvt.LVTFernflower;
 import de.oceanlabs.mcp.mcinjector.lvt.LVTLvt;
@@ -47,15 +47,18 @@ public class MCInjectorImpl
     static void process(
             Path in, Path out,
             Path accIn, Path accOut,
-            Path ctrIn, Path ctrOut,
+            Path ctrIn,
             Path excIn, Path excOut,
+            Path prmIn, Path prmOut,
             LVTNaming naming)
         throws IOException
     {
         if (accIn != null)
             Access.INSTANCE.load(accIn);
+        if (prmIn != null)
+            Parameters.INSTANCE.load(prmIn);
         if (ctrIn != null)
-            Constructors.INSTANCE.load(ctrIn);
+            Parameters.INSTANCE.loadLegacy(ctrIn);
         if (excIn != null)
             Exceptions.INSTANCE.load(excIn);
 
@@ -69,8 +72,8 @@ static void process(
 
         if (accOut != null)
             Access.INSTANCE.dump(accOut);
-        if (ctrOut != null)
-            Constructors.INSTANCE.dump(ctrOut);
+        if (prmOut != null)
+            Parameters.INSTANCE.dump(prmOut);
         if (excOut != null)
             Exceptions.INSTANCE.dump(excOut);
 

src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/ApplyMap.java

@@ -10,6 +10,7 @@
 import java.util.Set;
 import java.util.logging.Level;
 
+import de.oceanlabs.mcp.mcinjector.data.Parameters;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
@@ -21,12 +22,12 @@
 
 import de.oceanlabs.mcp.mcinjector.MCInjector;
 import de.oceanlabs.mcp.mcinjector.MCInjectorImpl;
-import de.oceanlabs.mcp.mcinjector.data.Constructors;
 import de.oceanlabs.mcp.mcinjector.data.Exceptions;
 
 public class ApplyMap extends ClassVisitor
 {
     String className;
+    boolean isEnum;
     MCInjectorImpl injector;
 
     public ApplyMap(MCInjectorImpl injector, ClassVisitor cn)
@@ -39,6 +40,7 @@ public ApplyMap(MCInjectorImpl injector, ClassVisitor cn)
     public void visit(int version, int access, String name, String signature, String superName, String[] interfaces)
     {
         this.className = name;
+        isEnum = (access & Opcodes.ACC_ENUM) != 0;
         super.visit(version, access, name, signature, superName, interfaces);
     }
 
@@ -95,9 +97,11 @@ private void processLVT(String cls, String name, String desc, MethodNode mn)
     {
         List<String> params = new ArrayList<>();
         List<Type> types = new ArrayList<>();
+        boolean isStatic = true;
 
         if ((mn.access & Opcodes.ACC_STATIC) == 0)
         {
+            isStatic = false;
             types.add(Type.getType("L" + cls + ";"));
             params.add(0, "this");
         }
@@ -109,11 +113,12 @@ private void processLVT(String cls, String name, String desc, MethodNode mn)
             return;
 
         MCInjector.LOG.fine("    Generating map:");
-        String nameFormat = "p_" + name + "_%d_";
+        String nameFormat = null;
         if (name.matches("func_\\d+_.+")) // A srg name method params are just p_MethodID_ParamIndex_
             nameFormat = "p_" + name.substring(5, name.indexOf('_', 5)) + "_%s_";
-        else if (name.equals("<init>")) // Every constructor is given a unique ID, try to load the ID from the map, if none is found assign a new one
-            nameFormat = "p_i" + Constructors.INSTANCE.getID(className, desc, types.size() > 1) + "_%s_";
+        else if(!isSynthetic(mn))
+            nameFormat = "p_" + Parameters.INSTANCE.getName(className, name, desc, types.size() > params.size(), isStatic) + "_%s_"; //assign new name only if there are names remaining
+        else nameFormat = "p_%s_"; //don't really care about synthetics
 
         for (int x = params.size(), y = x; x < types.size(); x++)
         {
@@ -190,4 +195,18 @@ else if (tmp.getType() != AbstractInsnNode.LABEL)
 
         Collections.sort(mn.localVariables, (o1, o2) -> o1.index < o2.index ? -1 : (o1.index == o2.index ? 0 : 1));
     }
+
+    private boolean isSynthetic(MethodNode mn){
+        if ((mn.access & Opcodes.ACC_SYNTHETIC) != 0) return true;
+
+        //check for special case pursuant to JLS 13.1.7
+        //which specifies that are the one and only proper methods that may be generated and not be marked synthetic
+        if (isEnum && (mn.access & Opcodes.ACC_STATIC) != 0) {
+            if ("valueOf".equals(mn.name) && mn.desc.equals("(Ljava/lang/String;)L" + className + ";"))
+                return true;
+            if("values".equals(mn.name) && mn.desc.equals("()[L" + className + ";"))
+                return true;
+        }
+        return false;
+    }
 }