Support for item polys and a bunch of refactoring #2
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
# Conflicts: # src/main/java/nl/theepicblock/polyconfig/PolyConfig.java # src/main/java/nl/theepicblock/polyconfig/block/BlockNodeParser.java # src/main/java/nl/theepicblock/polyconfig/block/BlockStateSubgroup.java # src/main/java/nl/theepicblock/polyconfig/entity/EntityNodeParser.java
BlockGroup seems to be unused now
|
Merged the changes from Since |
|
Resolved the mere conflict: I already fixed the upstream bug, but moved the code to a different class, so it resulted in a small merge conflict. Still patiently waiting for your feedback :) |
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 was created in the intention of implementing support for the item poly syntax as it can be seen in the README.
During the implementation, I refactored a bunch of the existing code so that it subjectively has a nicer structure.
For example, I made the entries, which were previously inner record classes of the parsers, their own classes (to be able to extend from a common super class).
The parsers are now inner classes of the entries and also have a common super class.
These common super classes unify some duplicated code that would have been present in block, item and entity polys.
I also noticed that the code indentation of the
PolyConfigclass used tabs where every other class used spaces, so I changed that too.Since there didn't seem to be a clear concept of item groups yet (in the sense of polys), I decided to create an own enum from some cases seen in PolyMC's
ItemPolyGenerator.I hope that this is at least somewhat useful, even if the changes might not be in your spirit :)