From 9e07ca678dd53442e6cea46e1e324e9076c07ea5 Mon Sep 17 00:00:00 2001 From: YoungerMax <60242131+YoungerMax@users.noreply.github.com> Date: Sun, 7 Apr 2024 10:45:32 -0400 Subject: [PATCH] Update Tiny Remapper to 0.9.0 --- com.pocolifo.jarremapper.extensions/build.gradle | 2 +- .../pocolifo/jarremapper/mapping/ClassMapping.java | 12 ++++++------ .../pocolifo/jarremapper/mapping/MethodMapping.java | 7 ++++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/com.pocolifo.jarremapper.extensions/build.gradle b/com.pocolifo.jarremapper.extensions/build.gradle index 96cd12c..d2e7b6c 100644 --- 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 index 5718c7d..7c20709 100644 --- 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,14 +6,8 @@ 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 fieldMappings = new ArrayList<>(); @@ -21,6 +15,12 @@ public ClassMapping(String fromClassName, String toClassName, JarMapping parentJ // method mappings inside this class public final List 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 index 2e456fb..a0f0c49 100644 --- 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 exceptions = new ArrayList<>(); + public final List 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 exceptions = new ArrayList<>(); - public List parameterNames = new ArrayList<>(); - @Override public String toString() { return this.fromMethodName + " " + this.fromMethodDescriptor + " | " + this.toMethodName + " " +