From 3000895130821a450fb18c75d36d1c6218047be6 Mon Sep 17 00:00:00 2001 From: zaaarf Date: Sun, 27 Aug 2023 09:51:03 +0200 Subject: fix: forgot the descriptor in a few places --- src/main/java/ftbsc/lll/mapper/impl/MultiMapper.java | 2 +- src/main/java/ftbsc/lll/mapper/tools/data/ClassData.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ftbsc/lll/mapper/impl/MultiMapper.java b/src/main/java/ftbsc/lll/mapper/impl/MultiMapper.java index f0af490..7eeb0d5 100644 --- a/src/main/java/ftbsc/lll/mapper/impl/MultiMapper.java +++ b/src/main/java/ftbsc/lll/mapper/impl/MultiMapper.java @@ -51,7 +51,7 @@ public class MultiMapper extends AbstractMapper { data.getFields().forEach((fieldName, fieldData) -> { for(int i = 1; i < mapperList.size(); i++) fieldData = mapperList.get(i).getFieldData(fieldData.parentClass.nameMapped, fieldData.nameMapped); - sumData.addField(fieldName, fieldData.nameMapped); + sumData.addField(fieldName, fieldData.nameMapped, fieldData.descriptor); }); this.mappings.put(sumData.name, sumData); diff --git a/src/main/java/ftbsc/lll/mapper/tools/data/ClassData.java b/src/main/java/ftbsc/lll/mapper/tools/data/ClassData.java index 4bd0af0..784d0e0 100644 --- a/src/main/java/ftbsc/lll/mapper/tools/data/ClassData.java +++ b/src/main/java/ftbsc/lll/mapper/tools/data/ClassData.java @@ -89,7 +89,7 @@ public class ClassData { ClassData reverse = new ClassData(this.nameMapped, this.name); this.methods.forEach((signature, data) -> reverse.addMethod(nameMapped, signature.name, MappingUtils.mapMethodDescriptor(signature.descriptor, mapper, false))); - this.fields.forEach((name, data) -> reverse.addField(data.nameMapped, name)); + this.fields.forEach((name, data) -> reverse.addField(data.nameMapped, name, data.descriptor)); return reverse; } -- cgit v1.2.3-56-ga3b1