Skip to content
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.

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

upstream #1

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
7c3a572
Add type annotation support and mapping info in jd gen (#6)
liach Dec 23, 2020
3276281
Release via github actions
modmuss50 Dec 23, 2020
54e8ec2
Add checkVersion task
modmuss50 Dec 23, 2020
9abf2a8
Make gradlew executable
modmuss50 Dec 23, 2020
757d21c
Mixin selector go brr
i509VCB Dec 23, 2020
4c1c8b9
Bump version, thanks i509vcb
liach Dec 23, 2020
9b7e91c
Make mappings table match javadoc style and remove deprecated attribu…
altrisi Dec 24, 2020
982f4a0
Copy the mapping table items on click (#9)
altrisi Dec 24, 2020
01e9d6a
0.2.2
liach Dec 24, 2020
9ca22d4
Move the copy on click script to yarn
liach Jan 8, 2021
c3c3025
Put the copy on click and jd header bakc to mappingpoet. let yarn pol…
liach Jan 10, 2021
1d04eda
0.2.5: Use builtin stylesheet (edited from that for fabricmc.net)
liach Jan 20, 2021
527ce06
typo
liach Jan 20, 2021
ba8e7f6
Fixes #12
liach Jan 20, 2021
ccf6adf
This appears to fix #13
liach Jan 20, 2021
cbbcdcc
Fixes #14
liach Feb 22, 2021
947b6a6
Fixes #21, tries to fix #20
liach Apr 1, 2021
8c5d438
Better char literals
liach Apr 1, 2021
02a53b5
Update dependencies
liach May 14, 2021
94c1480
Fix redundant public modifier for inner classes, migrate to modern java
liach May 14, 2021
35ee303
Forgot to bump this
liach May 14, 2021
7f47cd7
So we never published the readme
liach May 14, 2021
24d0ec7
Update gradle, use forked javapoet
liach Sep 18, 2021
d6765ad
Preliminary work on getting records and sealed classes right
liach Sep 18, 2021
512c27e
It works. Bump to 0.2.9, don't expose the github dependency (requires
liach Sep 19, 2021
e871a21
Consider package private final fields in record as components for pro…
liach Sep 23, 2021
03eb545
Build against fabric's javapoet fork
modmuss50 Oct 27, 2021
56ddd7f
Remove default modifier from private interface methods.
modmuss50 Oct 27, 2021
e87bc5c
Skip over anonymous records to fix generation failure.
modmuss50 Oct 27, 2021
f4b8811
Remove github token from actions.
modmuss50 Oct 27, 2021
15aeb4c
This looks like why it was problematic
liach Nov 17, 2021
9c30604
Add taglet for putting up record stripping warnings
liach Nov 18, 2021
9ca92a1
license
liach Nov 18, 2021
1fda8f9
Revert "license"
liach Nov 23, 2021
93a57cf
Do not dump local class by checking EnclosingMethod attribute
liach Mar 20, 2022
bed78ea
Update gradle, bump version
liach Mar 20, 2022
ddd25e1
Bump version
modmuss50 Oct 20, 2022
4a8d35d
0.4.0
liach May 5, 2023
3af9804
Update Gradle and github actions
modmuss50 May 20, 2023
37aa1f2
Update docker image for build
modmuss50 May 20, 2023
f35cb73
Dont use gradle toolchains.
modmuss50 May 20, 2023
6c09b18
Update ASM
modmuss50 Mar 27, 2024
eef318f
Improve debug output, update javapoet (#32)
sfPlayer1 May 15, 2024
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
Prev Previous commit
Next Next commit
This looks like why it was problematic
Signed-off-by: liach <[email protected]>
liach committed Nov 17, 2021
commit 15aeb4c52b3de1ab5610a98ee7d5992d248605ae
12 changes: 6 additions & 6 deletions src/main/java/net/fabricmc/mappingpoet/ClassBuilder.java
Original file line number Diff line number Diff line change
@@ -324,22 +324,22 @@ public void addInnerClass(ClassBuilder classBuilder) {
if (classNode.innerClasses != null) {
for (InnerClassNode node : classNode.innerClasses) {
if (node.name.equals(classBuilder.classNode.name)) {
if (node.outerName == null && classBuilder.recordClass) {
// Inline anonymous record.
// TODO look into moving this into the method that defines it.
return;
}

innerClassNode = node;
break;
}
}
}

if (innerClassNode == null) {
// fallback
classBuilder.builder.addModifiers(javax.lang.model.element.Modifier.PUBLIC);
classBuilder.builder.addModifiers(javax.lang.model.element.Modifier.STATIC);
} else {
if (innerClassNode.outerName == null) {
// skip local classes and records, which have null outerName
return;
}

classBuilder.builder.modifiers.remove(javax.lang.model.element.Modifier.PUBLIC); // this modifier may come from class access
classBuilder.builder.addModifiers(new ModifierBuilder(innerClassNode.access)
.checkUnseal(classBuilder.classNode, sealChecker)