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.

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

Jump to bottom

2.0 API and impl changes for name proposal #168

Merged
merged 11 commits into from
Dec 21, 2023
Merged

2.0 API and impl changes for name proposal #168

merged 11 commits into from
Dec 21, 2023

Conversation

IotaBread
Copy link
Member

Still a work in progress. MergedEntryMappingTree isn't finished yet, but its meant to replace the mergedNames tree in EntryRemapper so both of its underlying trees are updated accordingly. It will need testing to ensure the tree works as intended and doesn't break other features

@IotaBread IotaBread added enhancement New feature or request backend affects the enigma backend wip in progress labels Dec 7, 2023
@IotaBread IotaBread mentioned this pull request Dec 7, 2023
Merged
@ix0rai ix0rai added this to the 2.0.0 milestone Dec 18, 2023
@IotaBread IotaBread marked this pull request as ready for review December 21, 2023 01:31
ix0rai
ix0rai reviewed Dec 21, 2023
View reviewed changes
Copy link
Member

@ix0rai ix0rai left a comment

Choose a reason for hiding this comment

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

fantastic! just javadoc nitpicks

enigma/src/main/java/org/quiltmc/enigma/api/translation/representation/entry/Entry.java Outdated Show resolved Hide resolved
enigma/src/main/java/org/quiltmc/enigma/api/translation/representation/entry/Entry.java Outdated Show resolved Hide resolved
enigma/src/main/java/org/quiltmc/enigma/api/translation/representation/entry/Entry.java Outdated Show resolved Hide resolved
enigma/src/main/java/org/quiltmc/enigma/api/translation/representation/entry/MethodEntry.java Outdated Show resolved Hide resolved
enigma/src/main/java/org/quiltmc/enigma/api/translation/representation/entry/MethodEntry.java Outdated Show resolved Hide resolved
enigma/src/main/java/org/quiltmc/enigma/api/translation/representation/entry/Entry.java Outdated Show resolved Hide resolved
@ix0rai ix0rai merged commit c7e56d4 into QuiltMC:develop/2.0 Dec 21, 2023
2 checks passed
@IotaBread IotaBread mentioned this pull request Dec 21, 2023
Open
@IotaBread IotaBread deleted the 2.0/remove-proposed-names branch December 21, 2023 19:27
ix0rai added a commit that referenced this pull request Dec 28, 2023
@ix0rai @IotaBread
enigma 2.0 (#170)
0f0f4cc 
* Bump to 2.0

* allow either slashes or dots in package filter

* fix mapping validator adding far too many class siblings

(cherry picked from commit 92dab41)

* fix checkstyle

* fix drop invalid mappings command dropping every mapping (oops)

* bump version to 1.8.9

* methods could conflict with themselves lol

(cherry picked from commit 313cb08)

* fix drop invalid mappings command dropping every mapping (oops)

(cherry picked from commit 8b6f9fa)
(cherry picked from commit a2763ad)

* remove access modifier editing (#135)

* remove access modifiers - probably broken edition

* fix checkstyle

* ZACCESS

* fix class parsing for enigma format

* oops

* remove tiny v1 and improve commands to use automatic format detection (#138)

* bye

* fix command descs

* Update enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java

Co-authored-by: Iota <[email protected]>

---------

Co-authored-by: Iota <[email protected]>

* improve command help (#142)

* improve command help

* add help command, simplify arg parsing

* add descriptions for most commands (still need help), move stuff to abstract methods

* suggestions from @IotaBread

Co-authored-by: Iota <[email protected]>

* address remaining comments

---------

Co-authored-by: Iota <[email protected]>

* rough version of obf entry navigator

* Revert "rough version of obf entry navigator"

This reverts commit ae662f9.

* better highlight box sizes: fix overlap (#148)

* decrease box highlight size by 2 pixels

* update box highlight size to no longer overlap other characters

* stats rework (#152)

* wip fixing stat perf

* wip wip

* fix bugs

* refactors

* working!

* working better!

* wip packages

* woag package stats real

* imports oops

* bye useless code

* reimplement filter

* reimplement graph and add class data recursively

* check the style baybee

* add progress listening

* docs

* fix oops

* public static gson

* add "move package" option to context menu (#151)

* add "move package" context option

* fix style

* entry navigator (#146)

* obf entry navigator

* fix checkstyle

* add support for different token types

* put navigator in tabs

* fix checkstyle

* overlay navigator on code

* add keybinds and remove background for navigator panel

* 2.0/syntaxpane replacement (#150)

* start moving away from sciss syntaxpane

* hardcode configuration stuff

* fix more nonsense

* new jflex, fix some nonsense

* fix checkstyle, remove nonsense, fix scaling

* fix gradle

* move onto "syntaxpain" library

* improve quick find dialog

* use chevrons on navigator panel

* Update .gitignore

* Update build.gradle

* update syntaxpain

* rename package to `org.quiltmc.enigma` (#153)

* rename package to `org.quiltmc.enigma`

* thanks intellij very cool

* dlete unused inport

* delete unused inport part 2

* fix tests

* fix issues

* fix plural package names, move some enigma-swing things around

* commit you fools

* toss everything deprecated (#155)

* remove deprecations

* remove deprecated `getSource` method

* Revert "remove deprecated `getSource` method"

This reverts commit a8dba3f.

* rename `getSource` to `getUndocumentedSource`

* thanks automatic overload renaming!

* Api/impl separation (#154)

* Move classes which clearly are either api or impl

* Finish api/impl separation

* Move `Decompilers` to api

* add mappings indexing (#156)

* add mappings indexing

* add package name index

* add reindexing

* add translations

* clean up mappings indexing, implement @IotaBread's suggestion

* implement new system for getting indexers onto JarIndex

* fix commands

* implement some changes from Fabric upstream, with permission from @YanisBft

- index more class references (#531)
- fix documenting constructors (#530)
- search dialog improvements (#529)

* fixes (#157)

- fix wrong order of indexers being run
- fix renaming packages creating warnings

* Allow using json lists for service args (#158)

* Allow using json lists for service args

* Fix checkstyle error

* fix untranslated `tiny_v2.loading` string

* redo name proposal (#163)

* rework interface

* work

* work

* somewhat functional

* fix and improve server stuff

* check the style

* fix rare npe due to mishandling of flatlaf

* misc

* restore old save/load behaviour

* fully working I think :D

* fix checkstyle

* port enigma-cli

* delete recaf (it broke and I'm lazy)

* fix

* error handling for invalid token types

* fix navigator issues

* clarify javadoc

* priority

* fix npe

* store proposed mappings separately

* store proposed mappings separately

* add a test for service ordering

* malformed json test

* resolve easy comments

* fix potential crash

* add more tests

* resolve todo (it didn't actually need fixing after some other changes I made)

* fix test

* put overall stats in stats dialog (#166)

* add `getId` method to `EnigmaService` (#164)

* rework interface

* work

* work

* somewhat functional

* fix and improve server stuff

* check the style

* fix rare npe due to mishandling of flatlaf

* misc

* restore old save/load behaviour

* fully working I think :D

* fix checkstyle

* port enigma-cli

* delete recaf (it broke and I'm lazy)

* fix

* error handling for invalid token types

* fix navigator issues

* clarify javadoc

* priority

* fix npe

* store proposed mappings separately

* store proposed mappings separately

* add a test for service ordering

* malformed json test

* start moving plugin ID into plugin code

* fix error

* finish

* fix

* lol

* resolve comments

* address review from iota

* check the style

* move to quilt config (#167)

* toss current config stuff

* wip migrating config to quilt-config

* more work

* wip stuff

* grinding

* progress

* progress 2!

* fix checkstyle

* progress

* qconf 1.1.0

* nearly working

* [mad scientist voice] it boots!

* check the style

* some refactors

* more reorg

* tentative update to new qconf

* cleanups

* laf stuff

* strip out some pointless laf stuff

* fix divider states

* save docker selections

* reimplement default non-bold font

* fix some stuff being ignored

* update qconf version

* add some comments

* 2.0 API and impl changes for name proposal (#168)

* Add a getParameters method in MethodEntry

* Partial MergedEntryMappingTree implementation

* Fix checkstyle errors

* migrate EntryRemapper to MergedEntryMappingTree

* Add a dialog to test mapping trees

* It works??

* Fix broken test

* Fixes for Mark as deobf/obf

* Fix close button in print mapping tree dialog

* Apply suggestions from code review

Co-authored-by: ix0rai <[email protected]>

---------

Co-authored-by: ix0rai <[email protected]>

* merge

* Keep JAR_PROPOSED mappings separate from other proposals (#169)

* Keep JAR_PROPOSED mappings separate from other proposals

* Fix wording of a javadoc

* bump qconf

* re-add a util method that shouldn't have been tossed, fix a crash

* bye

* final config polish

* non-breaking improvements to docker config

* they used to call me ./gradlew checkstyleMain checkstyleTest back in college

* Upgrade ASM

* fix entry navigator misreporting token types

* fix deobf outline alpha

* properly scale fonts

* add missing translations

---------

Co-authored-by: ByMartrixx <[email protected]>
Co-authored-by: Iota <[email protected]>
Co-authored-by: IotaBread <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ix0rai ix0rai ix0rai left review comments

Assignees
No one assigned
Labels
backend affects the enigma backend enhancement New feature or request wip in progress
Projects
None yet
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@IotaBread @ix0rai