Update Tiny Remapper to 0.9.0

pocolifo · Apr 7, 2024 · 9e07ca6 · 9e07ca6
1 parent fe00844
commit 9e07ca6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/com.pocolifo.jarremapper.extensions/build.gradle b/com.pocolifo.jarremapper.extensions/build.gradle
@@ -18,7 +18,7 @@ repositories {
 
 dependencies {
     implementation project(':com.pocolifo.jarremapper')
-    implementation 'net.fabricmc:tiny-remapper:0.8.6'
+    implementation 'net.fabricmc:tiny-remapper:0.9.0'
     implementation 'net.md-5:SpecialSource:1.11.0'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'

diff --git a/com.pocolifo.jarremapper/src/main/java/com/pocolifo/jarremapper/mapping/ClassMapping.java b/com.pocolifo.jarremapper/src/main/java/com/pocolifo/jarremapper/mapping/ClassMapping.java
@@ -6,21 +6,21 @@
 public class ClassMapping {
     public final String fromClassName;
     public final String toClassName;
-
     public final JarMapping parentJar;
 
-    public ClassMapping(String fromClassName, String toClassName, JarMapping parentJar) {
-        this.fromClassName = fromClassName;
-        this.toClassName = toClassName;
-        this.parentJar = parentJar;
-    }
 
     // field mappings inside this class
     public final List<FieldMapping> fieldMappings = new ArrayList<>();
 
     // method mappings inside this class
     public final List<MethodMapping> methodMappings = new ArrayList<>();
 
+    public ClassMapping(String fromClassName, String toClassName, JarMapping parentJar) {
+        this.fromClassName = fromClassName;
+        this.toClassName = toClassName;
+        this.parentJar = parentJar;
+    }
+
     public MethodMapping getMethodByFromName(String fromName, String fromDesc) {
         for (MethodMapping methodMapping : this.methodMappings) {
             if (methodMapping.fromMethodName.equals(fromName)) {

diff --git a/com.pocolifo.jarremapper/src/main/java/com/pocolifo/jarremapper/mapping/MethodMapping.java b/com.pocolifo.jarremapper/src/main/java/com/pocolifo/jarremapper/mapping/MethodMapping.java
@@ -1,6 +1,7 @@
 package com.pocolifo.jarremapper.mapping;
 
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
 public class MethodMapping {
@@ -10,6 +11,9 @@ public class MethodMapping {
     public final String toMethodDescriptor;
     public final ClassMapping parentClass;
 
+    public final List<String> exceptions = new ArrayList<>();
+    public final List<String> parameterNames = new LinkedList<>();
+
     public MethodMapping(String fromMethodName, String fromMethodDescriptor, String toMethodName,
                          String toMethodDescriptor, ClassMapping parentClass) {
         this.fromMethodName = fromMethodName;
@@ -19,9 +23,6 @@ public MethodMapping(String fromMethodName, String fromMethodDescriptor, String
         this.parentClass = parentClass;
     }
 
-    public List<String> exceptions = new ArrayList<>();
-    public List<String> parameterNames = new ArrayList<>();
-
     @Override
     public String toString() {
         return this.fromMethodName + " " + this.fromMethodDescriptor + " | " + this.toMethodName + " " +