From 84171658bd3fb0f73e971183ff2dd119f3fff48e Mon Sep 17 00:00:00 2001 From: lclc98 Date: Thu, 30 Jun 2016 14:09:56 +1000 Subject: Fixed Constructor loading --- src/main/java/cuchaz/enigma/json/JsonConstructor.java | 12 ++++++++++++ src/main/java/cuchaz/enigma/mapping/MappingsReader.java | 6 ++++++ 2 files changed, 18 insertions(+) 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 { this.args = args; this.statics = statics; } + + public String getSignature() { + return signature; + } + + public List getArgs() { + return args; + } + + public boolean isStatics() { + return statics; + } } 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 { } jsonClass.getField().forEach(jsonField -> classMapping.addFieldMapping(readField(jsonField.getObf(), jsonField.getName(), jsonField.getType()))); + jsonClass.getConstructors().forEach(jsonConstructor -> { + MethodMapping methodMapping = readMethod(jsonConstructor.isStatics() ? "" : "", null, jsonConstructor.getSignature()); + jsonConstructor.getArgs().forEach(jsonArgument -> methodMapping.addArgumentMapping(readArgument(jsonArgument.getIndex(), jsonArgument.getName()))); + classMapping.addMethodMapping(methodMapping); + }); + jsonClass.getMethod().forEach(jsonMethod -> { MethodMapping methodMapping = readMethod(jsonMethod.getObf(), jsonMethod.getName(), jsonMethod.getSignature()); jsonMethod.getArgs().forEach(jsonArgument -> methodMapping.addArgumentMapping(readArgument(jsonArgument.getIndex(), jsonArgument.getName()))); -- cgit v1.2.3