Skip to content

Member null checks for TinyMappingsReader #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Member null checks for TinyMappingsReader #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,34 @@ 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 ClassMapping<?, ?> mapping = mappings.getOrCreateClassMapping(klass.getName(this.from))
.setDeobfuscatedName(klass.getName(this.to));
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(classNameFrom)
.setDeobfuscatedName(classNameTo);

for (final MappingTree.FieldMapping field : klass.getFields()) {
mapping.getOrCreateFieldMapping(field.getName(this.from), field.getDesc(this.from))
.setDeobfuscatedName(field.getName(this.to));
final String fieldNameTo = field.getName(this.to);
final String fieldNameFrom = field.getName(this.from);

if (fieldNameTo == null || fieldNameFrom == null) continue;

mapping.getOrCreateFieldMapping(fieldNameFrom, field.getDesc(this.from))
.setDeobfuscatedName(fieldNameTo);
}

for (final MappingTree.MethodMapping method : klass.getMethods()) {
final String methodNameTo = method.getName(this.to);
final String methodNameFrom = method.getName(this.from);

if (methodNameTo == null || methodNameFrom == null) continue;

final MethodMapping methodmapping = mapping
.getOrCreateMethodMapping(method.getName(this.from), method.getDesc(this.from))
.setDeobfuscatedName(method.getName(this.to));
.getOrCreateMethodMapping(methodNameFrom, method.getDesc(this.from))
.setDeobfuscatedName(methodNameTo);

for (final MappingTree.MethodArgMapping param : method.getArgs()) {
methodmapping.getOrCreateParameterMapping(param.getArgPosition())
Expand Down