From b89321332ed8a8868503a9f224265ac29ef11dca Mon Sep 17 00:00:00 2001 From: calmilamsy Date: Fri, 25 Feb 2022 17:57:49 +0000 Subject: [PATCH 1/5] Support merged stuff --- .../lorenztiny/TinyMappingsReader.java | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java b/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java index 238fbc7..b31a163 100644 --- a/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java +++ b/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java @@ -72,22 +72,32 @@ public TinyMappingsReader(final MappingTree tree, final String from, final Strin @Override public MappingSet read(final MappingSet mappings) { for (final MappingTree.ClassMapping klass : this.tree.getClasses()) { + final String className = klass.getName(this.to); + if (className.isEmpty()) { + continue; + } final ClassMapping mapping = mappings.getOrCreateClassMapping(klass.getName(this.from)) - .setDeobfuscatedName(klass.getName(this.to)); + .setDeobfuscatedName(className); for (final MappingTree.FieldMapping field : klass.getFields()) { - mapping.getOrCreateFieldMapping(field.getName(this.from), field.getDesc(this.from)) - .setDeobfuscatedName(field.getName(this.to)); + final String fieldName = field.getName(this.to); + if (!fieldName.isEmpty()) { + mapping.getOrCreateFieldMapping(field.getName(this.from), field.getDesc(this.from)) + .setDeobfuscatedName(fieldName); + } } for (final MappingTree.MethodMapping method : klass.getMethods()) { - final MethodMapping methodmapping = mapping - .getOrCreateMethodMapping(method.getName(this.from), method.getDesc(this.from)) - .setDeobfuscatedName(method.getName(this.to)); + final String methodName = method.getName(this.to); + if (!methodName.isEmpty()) { + final MethodMapping methodmapping = mapping + .getOrCreateMethodMapping(method.getName(this.from), method.getDesc(this.from)) + .setDeobfuscatedName(methodName); - for (final MappingTree.MethodArgMapping param : method.getArgs()) { - methodmapping.getOrCreateParameterMapping(param.getArgPosition()) - .setDeobfuscatedName(param.getName(this.to)); + for (final MappingTree.MethodArgMapping param : method.getArgs()) { + methodmapping.getOrCreateParameterMapping(param.getArgPosition()) + .setDeobfuscatedName(param.getName(this.to)); + } } } } From a3db38f7d14f77f424bec1b8b30efdc9a40bd2c1 Mon Sep 17 00:00:00 2001 From: calmilamsy Date: Fri, 25 Feb 2022 18:00:55 +0000 Subject: [PATCH 2/5] Nulls, woops --- .../java/net/fabricmc/lorenztiny/TinyMappingsReader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java b/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java index b31a163..0932cd6 100644 --- a/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java +++ b/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java @@ -73,7 +73,7 @@ public TinyMappingsReader(final MappingTree tree, final String from, final Strin public MappingSet read(final MappingSet mappings) { for (final MappingTree.ClassMapping klass : this.tree.getClasses()) { final String className = klass.getName(this.to); - if (className.isEmpty()) { + if (className != null) { continue; } final ClassMapping mapping = mappings.getOrCreateClassMapping(klass.getName(this.from)) @@ -81,7 +81,7 @@ public MappingSet read(final MappingSet mappings) { for (final MappingTree.FieldMapping field : klass.getFields()) { final String fieldName = field.getName(this.to); - if (!fieldName.isEmpty()) { + if (fieldName != null) { mapping.getOrCreateFieldMapping(field.getName(this.from), field.getDesc(this.from)) .setDeobfuscatedName(fieldName); } @@ -89,7 +89,7 @@ public MappingSet read(final MappingSet mappings) { for (final MappingTree.MethodMapping method : klass.getMethods()) { final String methodName = method.getName(this.to); - if (!methodName.isEmpty()) { + if (methodName != null) { final MethodMapping methodmapping = mapping .getOrCreateMethodMapping(method.getName(this.from), method.getDesc(this.from)) .setDeobfuscatedName(methodName); From 4db34f0c4682c80e97a1e698f30d60b85522f5a9 Mon Sep 17 00:00:00 2001 From: calmilamsy Date: Fri, 25 Feb 2022 18:02:32 +0000 Subject: [PATCH 3/5] Ahaha, woops --- src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java b/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java index 0932cd6..afc8c74 100644 --- a/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java +++ b/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java @@ -73,7 +73,7 @@ public TinyMappingsReader(final MappingTree tree, final String from, final Strin public MappingSet read(final MappingSet mappings) { for (final MappingTree.ClassMapping klass : this.tree.getClasses()) { final String className = klass.getName(this.to); - if (className != null) { + if (className == null) { continue; } final ClassMapping mapping = mappings.getOrCreateClassMapping(klass.getName(this.from)) From 2d844f12932c7b802f3bc101e2d6b1672ce0871f Mon Sep 17 00:00:00 2001 From: calmilamsy Date: Sat, 26 Feb 2022 16:33:16 +0000 Subject: [PATCH 4/5] More null fixes --- .../lorenztiny/TinyMappingsReader.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java b/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java index afc8c74..048cbfb 100644 --- a/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java +++ b/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java @@ -72,27 +72,30 @@ public TinyMappingsReader(final MappingTree tree, final String from, final Strin @Override public MappingSet read(final MappingSet mappings) { for (final MappingTree.ClassMapping klass : this.tree.getClasses()) { - final String className = klass.getName(this.to); - if (className == null) { + final String classNameTo = klass.getName(this.to); + final String classNameFrom = klass.getName(this.from); + if (classNameTo == null || classNameFrom == null) { continue; } - final ClassMapping mapping = mappings.getOrCreateClassMapping(klass.getName(this.from)) - .setDeobfuscatedName(className); + final ClassMapping mapping = mappings.getOrCreateClassMapping(classNameFrom) + .setDeobfuscatedName(classNameTo); for (final MappingTree.FieldMapping field : klass.getFields()) { - final String fieldName = field.getName(this.to); - if (fieldName != null) { - mapping.getOrCreateFieldMapping(field.getName(this.from), field.getDesc(this.from)) - .setDeobfuscatedName(fieldName); + final String fieldNameTo = field.getName(this.to); + final String fieldNameFrom = field.getName(this.from); + if (fieldNameTo != null) { + mapping.getOrCreateFieldMapping(fieldNameFrom, field.getDesc(this.from)) + .setDeobfuscatedName(fieldNameTo); } } for (final MappingTree.MethodMapping method : klass.getMethods()) { - final String methodName = method.getName(this.to); - if (methodName != null) { + final String methodNameTo = method.getName(this.to); + final String methodNameFrom = method.getName(this.from); + if (methodNameTo != null) { final MethodMapping methodmapping = mapping - .getOrCreateMethodMapping(method.getName(this.from), method.getDesc(this.from)) - .setDeobfuscatedName(methodName); + .getOrCreateMethodMapping(methodNameFrom, method.getDesc(this.from)) + .setDeobfuscatedName(methodNameTo); for (final MappingTree.MethodArgMapping param : method.getArgs()) { methodmapping.getOrCreateParameterMapping(param.getArgPosition()) From bbe97671f5b4ee6f40d715bb6abf6b9b11c082e6 Mon Sep 17 00:00:00 2001 From: calmilamsy Date: Fri, 11 Mar 2022 15:29:47 +0000 Subject: [PATCH 5/5] License date --- src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java b/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java index 048cbfb..4a85f87 100644 --- a/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java +++ b/src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java @@ -1,7 +1,7 @@ /* * This file is part of lorenz-tiny, licensed under the MIT License (MIT). * - * Copyright (c) 2020 FabricMC + * Copyright (c) 2020, 2022 FabricMC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal