enigma 2.0 (#170)

* 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]>

CHANGES.md

@@ -8,11 +8,11 @@ We'll only be cataloguing major changes, since there are countless bug fixes to
 
 - added multiplayer support
 - reworked gradle setup
+- changed package from `cuchaz.enigma` to `org.quiltmc.enigma`
 
 ### enigma
 
 - implemented support for new mapping formats, such as enigma's directory format and fabric's tiny
-- implemented support for remapping local variables
 - ported to an ASM backend
 - piles of minor optimisations
 - index references of fields and methods

README.md

@@ -26,4 +26,4 @@ Pre-compiled jars can be found on the [Quilt maven](https://maven.quiltmc.org/re
 
 ### On the command line
 
-`java -cp enigma.jar cuchaz.enigma.command.Main`
+`java -cp enigma.jar org.quiltmc.enigma.command.Main`

build.gradle

@@ -40,7 +40,7 @@ subprojects {
 	}
 
 	group = 'org.quiltmc'
-	version = '1.9.1'
+	version = '2.0.0'
 
 	var ENV = System.getenv()
 	version = version + (ENV.GITHUB_ACTIONS ? (ENV.SNAPSHOTS_URL ? "-SNAPSHOT" : "") : "+local")

config/checkstyle/checkstyle.xml

@@ -51,7 +51,7 @@
 
         <!-- Ensure all imports are ship shape -->
         <module name="AvoidStarImport">
-            <property name="excludes" value="org.hamcrest.Matchers,cuchaz.enigma.TestEntryFactory"/>
+            <property name="excludes" value="org.hamcrest.Matchers,org.quiltmc.enigma.TestEntryFactory"/>
         </module>
         <module name="IllegalImport"/>
         <module name="RedundantImport"/>

enigma-cli/build.gradle

@@ -5,11 +5,11 @@ plugins {
 }
 
 dependencies {
-	implementation project(':enigma')
+	shadow(implementation project(':enigma'))
 	testImplementation(testFixtures(project(':enigma')))
 }
 
-mainClassName = 'cuchaz.enigma.command.Main'
+mainClassName = 'org.quiltmc.enigma.command.Main'
 
 jar.manifest.attributes 'Main-Class': mainClassName