Skip to content

More deobfuscation, renaming, clean-up#136

Merged
PhilippvK merged 8 commits intoPhilippvK:masterfrom
StenAL:features
Oct 27, 2025
Merged

More deobfuscation, renaming, clean-up#136
PhilippvK merged 8 commits intoPhilippvK:masterfrom
StenAL:features

Conversation

@StenAL
Copy link

@StenAL StenAL commented Oct 15, 2025

This PR includes the following changes:

  • A lot classes are renamed to more intuitive names
  • Some deobfuscation
  • Converting some code to more idiomatic Java use like using enums instead of integer constants and using generics instead of just Object
  • Simplifying audio system startup by loading all sound clips in the main thread at boot time

StenAL added 4 commits April 10, 2025 20:33
All the GUI components support using colors so this prefix does not add
any clarity and only makes class names longer.
MultiColumnSelectableList is a mouthful but it is necessary to
distinguish the class from the SeletableGroupList.
This makes it clear what distinguishes the class from
MultiColumnSelectableList, the GroupList can have entries grouped into
categories and only supports two columns instead an arbitrary amount.
Instead of using int constants and doing special logic in
MultiColumnSelectableList, the sort order function can be stored inside
the enum.
@@ -196,9 +210,9 @@ public void actionPerformed(ActionEvent evt) {
.getSelectedIndex() /*+ (isUsingCustomServer ? ("\t" + this.choicerTrackCategory.getSelectedIndex()) : "")*/);
} else {
if (var2 == this.buttonStartChampionship) {
Copy link
Owner

Choose a reason for hiding this comment

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

Why not deobfuscase var2, too?

I guess that would be eventSource or similar.

Copy link
Author

Choose a reason for hiding this comment

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

Fixed.

return var1 == null ? null : (String) var1.getData();
private TrackSet getSelectedTrackSet() {
MultiColumnListItem<TrackSet> var1 = this.trackSetList.getSelectedItem();
return var1 == null ? null : var1.getData();
Copy link
Owner

Choose a reason for hiding this comment

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

Deobfuscate var1

Copy link
Author

Choose a reason for hiding this comment

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

Fixed, renammed to item.

Previously, it was just holding Objects and relied on casting.
Only for choicer with 255 autotransformed into spinner, not used in
practice
@PhilippvK PhilippvK merged commit b74be24 into PhilippvK:master Oct 27, 2025
2 checks passed
@PhilippvK
Copy link
Owner

Thanks @StenAL!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants