summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/cuchaz/enigma/json/JsonConstructor.java12
-rw-r--r--src/main/java/cuchaz/enigma/mapping/MappingsReader.java6
2 files changed, 18 insertions, 0 deletions
diff --git a/src/main/java/cuchaz/enigma/json/JsonConstructor.java b/src/main/java/cuchaz/enigma/json/JsonConstructor.java
index 82307ae2..cfac372a 100644
--- a/src/main/java/cuchaz/enigma/json/JsonConstructor.java
+++ b/src/main/java/cuchaz/enigma/json/JsonConstructor.java
@@ -12,4 +12,16 @@ public class JsonConstructor {
12 this.args = args; 12 this.args = args;
13 this.statics = statics; 13 this.statics = statics;
14 } 14 }
15
16 public String getSignature() {
17 return signature;
18 }
19
20 public List<JsonArgument> getArgs() {
21 return args;
22 }
23
24 public boolean isStatics() {
25 return statics;
26 }
15} 27}
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsReader.java b/src/main/java/cuchaz/enigma/mapping/MappingsReader.java
index c790eed6..ccbbf8d9 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsReader.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsReader.java
@@ -62,6 +62,12 @@ public class MappingsReader {
62 } 62 }
63 jsonClass.getField().forEach(jsonField -> classMapping.addFieldMapping(readField(jsonField.getObf(), jsonField.getName(), jsonField.getType()))); 63 jsonClass.getField().forEach(jsonField -> classMapping.addFieldMapping(readField(jsonField.getObf(), jsonField.getName(), jsonField.getType())));
64 64
65 jsonClass.getConstructors().forEach(jsonConstructor -> {
66 MethodMapping methodMapping = readMethod(jsonConstructor.isStatics() ? "<clinit>" : "<init>", null, jsonConstructor.getSignature());
67 jsonConstructor.getArgs().forEach(jsonArgument -> methodMapping.addArgumentMapping(readArgument(jsonArgument.getIndex(), jsonArgument.getName())));
68 classMapping.addMethodMapping(methodMapping);
69 });
70
65 jsonClass.getMethod().forEach(jsonMethod -> { 71 jsonClass.getMethod().forEach(jsonMethod -> {
66 MethodMapping methodMapping = readMethod(jsonMethod.getObf(), jsonMethod.getName(), jsonMethod.getSignature()); 72 MethodMapping methodMapping = readMethod(jsonMethod.getObf(), jsonMethod.getName(), jsonMethod.getSignature());
67 jsonMethod.getArgs().forEach(jsonArgument -> methodMapping.addArgumentMapping(readArgument(jsonArgument.getIndex(), jsonArgument.getName()))); 73 jsonMethod.getArgs().forEach(jsonArgument -> methodMapping.addArgumentMapping(readArgument(jsonArgument.getIndex(), jsonArgument.getName())));