Skip to content

Make the V1 Reader Empty Value Aware #7

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

Open
calmilamsy wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Make the V1 Reader Empty Value Aware #7

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b893213
Support merged stuff
calmilamsy Feb 25, 2022
a3db38f
Nulls, woops
calmilamsy Feb 25, 2022
4db34f0
Ahaha, woops
calmilamsy Feb 25, 2022
2d844f1
More null fixes
calmilamsy Feb 26, 2022
bbe9767
License date
calmilamsy Mar 11, 2022
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
35 changes: 24 additions & 11 deletions src/main/java/net/fabricmc/lorenztiny/TinyMappingsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -72,22 +72,35 @@ 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);
Copy link

@Player3324 Player3324 Aug 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe these "from" names can be null too? With custom namespaces they are not necessarily in the mandatory populated NS column.

if (fieldNameTo != null) {
mapping.getOrCreateFieldMapping(fieldNameFrom, field.getDesc(this.from))
.setDeobfuscatedName(fieldNameTo);
}
}

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 methodNameTo = method.getName(this.to);
final String methodNameFrom = method.getName(this.from);
if (methodNameTo != null) {
final MethodMapping methodmapping = mapping
.getOrCreateMethodMapping(methodNameFrom, method.getDesc(this.from))
.setDeobfuscatedName(methodNameTo);

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));
}
}
}
}
Expand Down