Move torch variations into tile data #555
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
ChristofferHolmesland
requested changes
Aug 16, 2023
ChristofferHolmesland
previously approved these changes
Nov 10, 2023
Makkkkus
approved these changes
Nov 10, 2023
|
Please fix conflicts. |
Makkkkus
requested changes
Feb 12, 2024
|
The code to load torch is not removed, so it is not affected. |
|
Conflicts resolved. |
Yes, but then it tries to load the tourch with a the old name on new saves. That will cause an error. |
|
Yes. And I fixed that error in the latest commit recently. |
# Conflicts: # src/client/java/minicraft/level/tile/Tile.java # src/client/java/minicraft/level/tile/Tiles.java # src/client/java/minicraft/level/tile/TorchTile.java
Merged
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.
Using duplications in the main method is not a great idea, so this changes torch tile variations into handling the tile data instead.
When #437 is merged,(outdated)TileModelcan be used to mergeTorchIteminto a generalTileIteminstance.TorchItemis merged toTileItemwith the advanced feature fromTileModel. Tile sprite connection fields are converted to methods to suit the changes.