Fix merge and build #5
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
* Remove contacts from AsyncManager * Move contacts command * WIP * Deprecate TopicPaginator * Create ComponentPaginator.java * Update I18nSupport.java * Switch to component paginator * Clean up * Add page commands * Update ContactsCommand.java * WIP * Finish rewriting contracts * Add events * Add new contact notification * Fix various bugs * Update ComponentPaginator.java * Make getCraftsInWorld async safe * Update ContactsSign.java * Fix paginator length * Temporary sign patch * Update all signs on rotation * Remove contacts of sinking crafts * Update SinkingCraftImpl.java * Remove subcrafts from contacts and fix possible deadlock * Update CraftReportCommand.java * Update buildlogic.java-conventions.gradle.kts
* add API for typesafe craftdatatags * add implementations * forgot set method * allow datatags on subcrafts * use Function<Craft, T> instead of simple supplier * Update CraftDataTagContainer.java * remove unneded interface * Update CruiseOnPilotSubCraft.java * Update SinkingCraftImpl.java * Update SubCraftImpl.java * Update SubcraftRotateCraft.java
* Rewrite contacts for new data tag system * Switch recent contacts to new system * Remove old interface
* Stat rewrite * More WIP * WIP * Clean up * Update buildlogic.java-conventions.gradle.kts * Update StatusManager.java * Update StatusManager.java * Update Movecraft.java * Call event as an effect * Fix race condition in WorldManager * Fix multiple status updates * Fix speed
* add uuid to craft map * implement necessary changes in craft implementations * add access method and listen to assembly and disassembly to add or remove the hints * add special case for subcrafts. if they have a parent, re-add the UUID of the parent! * register listener * be persistant, use TileState, don't limit to signs Also i need this for dispensers in movecraft combat * use in bounds, that is faster and should be reliable enough here * don't forget to update the tile entity! * move from initializer to constructor * rename listener and add separate listener for release * add mark and unmark methods on craft * organize imports * fix missing imports * Status imports
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 fixes the merge and build issues. It also currently takes a stab at handling the parent craft problem, but I want a cleaner method.