Simplify and clean up resource loading #132
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These were accidentally left over when deobfuscating the class.
This made me realize that this class just does standard XML parsing and can be removed in favor of Java's built-in XML-manipulation APIs.
Instead of using a custom parser, the built-in XML parser is more mature and tested. This enables removing ~500 lines of code that is no longer needed.
Since this repository only contains the golf game, there is no purpose to handle image loading in two separate ways. Instead all image loading now takes the same code path.
There was a lot duplicated and/or unused code in TextManager previously. Now the API surface is smaller and easier to reason about.
Since the assets are not fetched remotely, loading them from RAM is near-instant and does not need threading. This allows to simplify the TextManager code.
The code never tries to read any texts with quantities other than 1 so there is no need for the zero or plural translations. Without these cases, each LocalizationNode is essentially just a string and so the whole class can be removed and TextManager can directly work with strings instead.
This enables simplifying the code a bit.
PhilippvK
approved these changes
Jan 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains a series of fix-ups and simplifications for the resource loader classes
TextManager,ImageManager, andSoundManagersharedandgameresources is combined -- there is no need to distinguishsharedresources since this project is focused only on the Minigolf game.LocalizationNodeclass representing XML elements is removed. The codebase only tried to read thesingularsubelement in it and never accessedzeroorpluralso those translations have been removed along with the class. Now the XML translation just contain strings insidestrelements.getTextinTextManager) now use varargs instead of defining 6 different methods for each possible number of parametersThere is also a small bugfix included to remove debug colors I added to RoundedUpperCornersButton when deobfuscating it.