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

enigma 2.0 #170

Merged
merged 48 commits into from
Dec 28, 2023
Merged

enigma 2.0 #170

merged 48 commits into from
Dec 28, 2023

Conversation

ix0rai
Copy link
Member

@ix0rai ix0rai commented Dec 22, 2023

changelog coming soon:tm:

IotaBread and others added 30 commits July 27, 2023 19:20
(cherry picked from commit 8b6f9fa)
(cherry picked from commit a2763ad)
* remove access modifiers - probably broken edition

* fix checkstyle

* ZACCESS

* fix class parsing for enigma format

* oops
…#138)

* bye

* fix command descs

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

Co-authored-by: Iota <47987888+IotaBread@users.noreply.github.com>

---------

Co-authored-by: Iota <47987888+IotaBread@users.noreply.github.com>
* 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 <47987888+IotaBread@users.noreply.github.com>

* address remaining comments

---------

Co-authored-by: Iota <47987888+IotaBread@users.noreply.github.com>
# Conflicts:
#	build.gradle
* decrease box highlight size by 2 pixels

* update box highlight size to no longer overlap other characters
* 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" context option

* fix style
* 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
* 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`

* 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
* remove deprecations

* remove deprecated `getSource` method

* Revert "remove deprecated `getSource` method"

This reverts commit a8dba3f.

* rename `getSource` to `getUndocumentedSource`

* thanks automatic overload renaming!
* Move classes which clearly are either api or impl

* Finish api/impl separation

* Move `Decompilers` to api
* 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
…nisBft

- index more class references (#531)
- fix documenting constructors (#530)
- search dialog improvements (#529)
- fix wrong order of indexers being run
- fix renaming packages creating warnings
* Allow using json lists for service args

* Fix checkstyle error
* 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
ix0rai and others added 4 commits December 20, 2023 23:08
# Conflicts:
#	build.gradle
#	enigma/src/main/java/org/quiltmc/enigma/api/translation/mapping/serde/tinyv2/TinyV2Writer.java
#	enigma/src/test/java/org/quiltmc/enigma/TestEntryOrdering.java
#	enigma/src/test/java/org/quiltmc/enigma/translation/mapping/TestDeterministicWrite.java
* Keep JAR_PROPOSED mappings separate from other proposals

* Fix wording of a javadoc
@ix0rai ix0rai added documentation Improvements or additions to documentation enhancement New feature or request backend affects the enigma backend user interface affects the enigma ui server affects the enigma server refactor improvements that don't impact functionality removal removes functionality cli affects the enigma command-line interface labels Dec 22, 2023
@ix0rai ix0rai added this to the 2.0.0 milestone Dec 22, 2023
@ix0rai ix0rai merged commit 0f0f4cc into master Dec 28, 2023
4 checks passed
@ix0rai ix0rai deleted the develop/2.0 branch December 28, 2023 04:30
@ix0rai ix0rai restored the develop/2.0 branch December 28, 2023 04:31
@YanisBft
Copy link
Contributor

congrats, awesome work!

@IotaBread IotaBread deleted the develop/2.0 branch December 29, 2023 04:10
@ix0rai ix0rai restored the develop/2.0 branch January 2, 2024 23:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend affects the enigma backend cli affects the enigma command-line interface documentation Improvements or additions to documentation enhancement New feature or request refactor improvements that don't impact functionality removal removes functionality server affects the enigma server user interface affects the enigma ui
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants