Merged
Conversation
Signed-off-by: Tim <tim@heidler.eu.org>
…ure/#47 # Conflicts: # src/main/java/de/theidler/create_mobile_packages/index/CMPMenuTypes.java # src/main/java/de/theidler/create_mobile_packages/index/CMPPackets.java # src/main/resources/assets/create_mobile_packages/lang/en_us.json
This reverts commit 196c25a.
…ackage a MobilePackager or a Package
…' into mc1.20.1/feature/better-networks
Update src/main/java/de/theidler/create_mobile_packages/robo/PlayerTarget.java Update src/main/java/de/theidler/create_mobile_packages/compat/jade/BeePortComponentProvider.java Update src/main/java/de/theidler/create_mobile_packages/network_settings/AddPlayerToNetworkPackage.java Update src/main/java/de/theidler/create_mobile_packages/network_settings/RemovePlayerFromNetworkPackage.java Update src/main/java/de/theidler/create_mobile_packages/network_settings/ModifyNetworkLockStatePackage.java Update src/main/java/de/theidler/create_mobile_packages/network_settings/SetNetworkNamePackage.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…ork targeting. if Bee can't find a valid target, it will first try returning to the port it came from. if not possible, it will fly to the closest port within the network that can accept it.
Better Networks
* New translations en_us.json (German) * New translations en_us.json (Portuguese, Brazilian) * New translations en_us.json (French) * New translations en_us.json (Japanese) * New translations en_us.json (Polish) * New translations en_us.json (Russian) * New translations en_us.json (Swedish) * New translations en_us.json (Chinese Simplified) * New translations en_us.json (French) * New translations en_us.json (French) * New translations en_us.json (Portuguese, Brazilian) * New translations en_us.json (Chinese Simplified) * New translations en_us.json (Chinese Simplified) * New translations en_us.json (French) * New translations en_us.json (Chinese Simplified) * New translations en_us.json (Japanese) * New translations en_us.json (German) * New translations en_us.json (German) * New translations en_us.json (Russian) * New translations en_us.json (Russian) * New translations en_us.json (German) * New translations en_us.json (Russian) * New translations en_us.json (French) * New translations en_us.json (Japanese) * New translations en_us.json (Polish) * New translations en_us.json (Swedish) * New translations en_us.json (Chinese Simplified) * New translations en_us.json (Portuguese, Brazilian) * New translations en_us.json (German) * New translations en_us.json (Russian) * New translations en_us.json (French) * New translations en_us.json (Japanese) * New translations en_us.json (Polish) * New translations en_us.json (Swedish) * New translations en_us.json (Chinese Simplified) * New translations en_us.json (Portuguese, Brazilian) * New translations en_us.json (German) * New translations en_us.json (German) * New translations en_us.json (Russian) * New translations en_us.json (French) * New translations en_us.json (Japanese) * New translations en_us.json (Polish) * New translations en_us.json (Swedish) * New translations en_us.json (Chinese Simplified) * New translations en_us.json (Portuguese, Brazilian)
…ing on text change
…tent entity behavior and type usage.
…ork ownership checks in NetworkDataPacket
# Conflicts: # CHANGELOG.md # build.gradle # gradle.properties # src/main/java/de/theidler/create_mobile_packages/CreateMobilePackagesClient.java # src/main/java/de/theidler/create_mobile_packages/InputEvents.java # src/main/java/de/theidler/create_mobile_packages/blocks/bee_port/BeePortBlock.java # src/main/java/de/theidler/create_mobile_packages/blocks/bee_port/BeePortBlockEntity.java # src/main/java/de/theidler/create_mobile_packages/compat/Mods.java # src/main/java/de/theidler/create_mobile_packages/compat/emi/CMPEMI.java # src/main/java/de/theidler/create_mobile_packages/compat/jei/CMPJEIGuiHandler.java # src/main/java/de/theidler/create_mobile_packages/compat/jei/DroneControllerTransferHandler.java # src/main/java/de/theidler/create_mobile_packages/entities/RoboBeeEntity.java # src/main/java/de/theidler/create_mobile_packages/index/CMPPackets.java # src/main/java/de/theidler/create_mobile_packages/items/mobile_packager/ConfirmEditMenuPacket.java # src/main/java/de/theidler/create_mobile_packages/items/mobile_packager/MobilePackagerEditScreen.java # src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/ClientScreenStorage.java # src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/GenericStackListPacket.java # src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/PortableStockTickerMenu.java # src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/PortableStockTickerScreen.java # src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/RequestStockUpdate.java # src/main/java/de/theidler/create_mobile_packages/robo/PlayerTarget.java # src/main/java/de/theidler/create_mobile_packages/robo/VirtualRobo.java # src/main/resources/META-INF/mods.toml # src/main/resources/data/create_mobile_packages/recipe/bee_port_clear.json # src/main/resources/data/create_mobile_packages/recipe/robo_bee_clear.json
Contributor
There was a problem hiding this comment.
Pull request overview
Release prep for v0.6.0 (MC 1.21.1), introducing logistics-network-aware robo delivery plus new client UI/features and updated mod dependencies/tooling.
Changes:
- Add logistics network extensions (mixin + packets + client storage/UI) and integrate with Bee Port + Robo behavior/ETA toasts.
- Introduce Mobile Packager item (GUIs + menus + packets) and Curios/Jade/EMI compatibility.
- Bump dependency versions (NeoForge/Create/etc.) and update release docs + CI (migrate from Jenkinsfile to GitHub Actions).
Reviewed changes
Copilot reviewed 124 out of 129 changed files in this pull request and generated 13 comments.
Show a summary per file
| File | Description |
|---|---|
| src/main/templates/META-INF/neoforge.mods.toml | Enables mixin config; bumps Create dependency range. |
| src/main/resources/data/curios/tags/item/body.json | Adds Curios tag for portable stock ticker. |
| src/main/resources/data/create_mobile_packages/recipe/mobile_packager.json | Adds crafting recipe for Mobile Packager. |
| src/main/resources/data/create_mobile_packages/curios/entities/players.json | Curios entity slot config for players. |
| src/main/resources/create_mobile_packages.mixins.json | Adds mixin configuration for LogisticsNetwork. |
| src/main/resources/assets/create_mobile_packages/textures/item/mobile_packager.png | Adds Mobile Packager item texture. |
| src/main/resources/assets/create_mobile_packages/textures/gui/player_networks.png | Adds player networks GUI texture sheet. |
| src/main/resources/assets/create_mobile_packages/textures/block/bee_port_open.png | Adds Bee Port open texture. |
| src/main/resources/assets/create_mobile_packages/textures/block/bee_port.png | Adds Bee Port texture. |
| src/main/resources/assets/create_mobile_packages/models/item/mobile_packager.json | Adds Mobile Packager item model. |
| src/main/resources/assets/create_mobile_packages/lang/zh_cn.json | Updates/extends translations (toasts, network UI, Mobile Packager). |
| src/main/resources/assets/create_mobile_packages/lang/sv_se.json | Updates/extends translations (toasts, network UI, Mobile Packager). |
| src/main/resources/assets/create_mobile_packages/lang/ru_ru.json | Updates/extends translations (toasts, network UI, Mobile Packager). |
| src/main/resources/assets/create_mobile_packages/lang/pt_br.json | Updates/extends translations (toasts, network UI, Mobile Packager). |
| src/main/resources/assets/create_mobile_packages/lang/pl_pl.json | Updates/extends translations (toasts, network UI, Mobile Packager). |
| src/main/resources/assets/create_mobile_packages/lang/ja_jp.json | Major translation refresh + adds new keys. |
| src/main/resources/assets/create_mobile_packages/lang/fr_fr.json | Translation fixes + adds new keys. |
| src/main/resources/assets/create_mobile_packages/lang/en_us.json | Adds new keys for toasts/network UI/Mobile Packager. |
| src/main/resources/assets/create_mobile_packages/lang/de_de.json | Adds new keys for toasts/network UI/Mobile Packager. |
| src/main/java/de/theidler/create_mobile_packages/toast/types/SimpleToast.java | Adds a simple custom toast type w/ icon + serialization. |
| src/main/java/de/theidler/create_mobile_packages/toast/types/PackageToast.java | Adds package toast w/ item list rendering + serialization. |
| src/main/java/de/theidler/create_mobile_packages/toast/ToastOverlayRenderer.java | Adds client overlay renderer for custom toast stack. |
| src/main/java/de/theidler/create_mobile_packages/toast/Toast.java | Adds toast base class + registry + StreamCodec. |
| src/main/java/de/theidler/create_mobile_packages/toast/ShowToastOnClientPacket.java | Adds clientbound packet to display a toast. |
| src/main/java/de/theidler/create_mobile_packages/toast/RemoveToastOnClientPacket.java | Adds clientbound packet to remove a toast by UUID. |
| src/main/java/de/theidler/create_mobile_packages/toast/RemoveAllToastsOnClientPacket.java | Adds clientbound packet to clear all toasts. |
| src/main/java/de/theidler/create_mobile_packages/robo/RoboTarget.java | Introduces target abstraction for robos. |
| src/main/java/de/theidler/create_mobile_packages/robo/RoboManager.java | New SavedData-backed robo manager + request handling/ETA aggregation. |
| src/main/java/de/theidler/create_mobile_packages/robo/PlayerTarget.java | Adds player target resolution + ETA toast updates. |
| src/main/java/de/theidler/create_mobile_packages/robo/BlockPosTarget.java | Adds BlockPos target implementation. |
| src/main/java/de/theidler/create_mobile_packages/robo/BeePortBlockEntityTarget.java | Adds BeePort target implementation w/ lazy BE lookup + validity. |
| src/main/java/de/theidler/create_mobile_packages/network_settings/SetNetworkNamePackage.java | Serverbound packet: set network name (owner-only). |
| src/main/java/de/theidler/create_mobile_packages/network_settings/RequestPlayerNetworksPacket.java | Serverbound request: push all player networks + clear stale ones. |
| src/main/java/de/theidler/create_mobile_packages/network_settings/RequestNetworkDataPacket.java | Serverbound request: return a network’s details (with fallback). |
| src/main/java/de/theidler/create_mobile_packages/network_settings/RemovePlayerFromNetworkPackage.java | Serverbound packet: owner removes others / player removes self. |
| src/main/java/de/theidler/create_mobile_packages/network_settings/NetworkSettingsHelper.java | Helper for opening network settings screen from UI. |
| src/main/java/de/theidler/create_mobile_packages/network_settings/NetworkHelper.java | Helpers to access extended logistics network + player UUID set. |
| src/main/java/de/theidler/create_mobile_packages/network_settings/NetworkDataPacket.java | Clientbound packet: deliver network data to client cache. |
| src/main/java/de/theidler/create_mobile_packages/network_settings/ModifyNetworkLockStatePackage.java | Serverbound packet: lock/unlock network (owner-only). |
| src/main/java/de/theidler/create_mobile_packages/network_settings/ClientNetworkDataStorage.java | Client cache for network data + error messages. |
| src/main/java/de/theidler/create_mobile_packages/network_settings/ClearNetworksPacket.java | Clientbound packet: remove networks not in valid list. |
| src/main/java/de/theidler/create_mobile_packages/network_settings/AddPlayerToNetworkPackage.java | Serverbound packet: player adds self to network. |
| src/main/java/de/theidler/create_mobile_packages/mixin/LogisticsNetworkMixin.java | Mixin to persist/read network players + name via NBT. |
| src/main/java/de/theidler/create_mobile_packages/items/robo_bee/RoboBeeItem.java | Switches spawn logic to RoboManager/VirtualRobo + supports tuning. |
| src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/StockCheckingItem.java | Refactors request/summary retrieval + removes static frequency state. |
| src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/SendPackage.java | Updates API call signature to pass the tuned ItemStack. |
| src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/RequestStockUpdate.java | Makes stock update packet stateless + chunked responses. |
| src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/PortableStockTickerMenu.java | Adds offscreen player inventory slots for menu integrations. |
| src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/PortableStockTicker.java | Adds Curios PST lookup + adjusts usage behavior + API signature changes. |
| src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/OpenPortableStockTicker.java | Minor lambda naming cleanup. |
| src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/LogisticallyLinkedItem.java | Formatting + comment; keeps foil state based on tuning. |
| src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/GenericStackListPacket.java | Adds chunking flag to clientbound stack list packet. |
| src/main/java/de/theidler/create_mobile_packages/items/portable_stock_ticker/ClientScreenStorage.java | Adds chunk collection buffer + periodic stateless updates. |
| src/main/java/de/theidler/create_mobile_packages/items/mobile_packager/OpenEditMenuPacket.java | Serverbound packet to open edit menu with an original package. |
| src/main/java/de/theidler/create_mobile_packages/items/mobile_packager/MobilePackagerScreen.java | Adds Mobile Packager “select package” screen. |
| src/main/java/de/theidler/create_mobile_packages/items/mobile_packager/MobilePackagerMenu.java | Adds menu for inserting a package before editing. |
| src/main/java/de/theidler/create_mobile_packages/items/mobile_packager/MobilePackagerEditScreen.java | Adds package-edit screen with address box + confirm. |
| src/main/java/de/theidler/create_mobile_packages/items/mobile_packager/MobilePackagerEditMenu.java | Adds edit menu for package contents + result placement. |
| src/main/java/de/theidler/create_mobile_packages/items/mobile_packager/MobilePackagerEdit.java | Adds content holder for editing package contents/address. |
| src/main/java/de/theidler/create_mobile_packages/items/mobile_packager/MobilePackager.java | Adds the Mobile Packager item and menu opening behavior. |
| src/main/java/de/theidler/create_mobile_packages/items/mobile_packager/ConfirmEditMenuPacket.java | Serverbound confirm packet to apply address and close menu. |
| src/main/java/de/theidler/create_mobile_packages/index/ponder/CMPPonderPlugin.java | Adds @NotNull annotations + signature tightening. |
| src/main/java/de/theidler/create_mobile_packages/index/config/CMPServer.java | Adds @NotNull return annotation. |
| src/main/java/de/theidler/create_mobile_packages/index/config/CMPConfigs.java | Adjusts event subscriber annotation. |
| src/main/java/de/theidler/create_mobile_packages/index/config/CMPCommon.java | Adds @NotNull return annotation. |
| src/main/java/de/theidler/create_mobile_packages/index/config/CMPClient.java | Adds @NotNull return annotation. |
| src/main/java/de/theidler/create_mobile_packages/index/CMPToasts.java | Registers toast types for decoding. |
| src/main/java/de/theidler/create_mobile_packages/index/CMPPackets.java | Registers many new packets (toasts, network settings, menus). |
| src/main/java/de/theidler/create_mobile_packages/index/CMPMenuTypes.java | Registers Mobile Packager menus + minor lambda var rename. |
| src/main/java/de/theidler/create_mobile_packages/index/CMPKeys.java | Adds new keybind for networks screen + adjusts subscriber annotation. |
| src/main/java/de/theidler/create_mobile_packages/index/CMPItems.java | Registers Mobile Packager item; removes deprecated DroneController. |
| src/main/java/de/theidler/create_mobile_packages/index/CMPGuiTextures.java | Adds GUI texture enum for networks screen. |
| src/main/java/de/theidler/create_mobile_packages/index/CMPEntities.java | Adjusts Robo Bee entity category and persistence flags. |
| src/main/java/de/theidler/create_mobile_packages/index/CMPCommands.java | Adds admin commands for toast + robo cleanup. |
| src/main/java/de/theidler/create_mobile_packages/index/CMPBlocks.java | Bee Port item now uses LogisticallyLinkedBlockItem; removes deprecated Drone Port. |
| src/main/java/de/theidler/create_mobile_packages/index/CMPBlockEntities.java | Removes deprecated Drone Port block entity conversion code. |
| src/main/java/de/theidler/create_mobile_packages/entities/robo_entity/RoboBeeState.java | Introduces enum-based state machine. |
| src/main/java/de/theidler/create_mobile_packages/entities/robo_entity/RoboBeeBehaviorController.java | Implements simplified robo behavior controller. |
| src/main/java/de/theidler/create_mobile_packages/entities/render/DroneEntityRenderer.java | Minor cleanup + @NotNull + scale expression simplification. |
| src/main/java/de/theidler/create_mobile_packages/entities/models/RoboBeeModel.java | Adds @NotNull annotations + signature tightening. |
| src/main/java/de/theidler/create_mobile_packages/entities/RoboBeeEntity.java | Refactors constructor/empty creation to use linked UUID. |
| src/main/java/de/theidler/create_mobile_packages/compat/jei/DroneControllerTransferHandler.java | Updates JEI integration for new wrapper + minor cleanups. |
| src/main/java/de/theidler/create_mobile_packages/compat/jei/CMPJEIGuiHandler.java | Adds JEI GUI handler for extra areas + clickable ingredients. |
| src/main/java/de/theidler/create_mobile_packages/compat/jei/CMPJEI.java | Registers JEI GUI handler + annotations. |
| src/main/java/de/theidler/create_mobile_packages/compat/jade/JadePlugin.java | Adds Jade plugin registration. |
| src/main/java/de/theidler/create_mobile_packages/compat/jade/BeePortComponentProvider.java | Adds Jade tooltip/network display provider. |
| src/main/java/de/theidler/create_mobile_packages/compat/emi/CMPEMI.java | Adds EMI exclusion areas integration. |
| src/main/java/de/theidler/create_mobile_packages/compat/curios/Curios.java | Adds Curios PST lookup helper. |
| src/main/java/de/theidler/create_mobile_packages/compat/Mods.java | Expands mod-compat enum (JEI/EMI/CURIOS/JADE) + minor cleanup. |
| src/main/java/de/theidler/create_mobile_packages/blocks/bee_port/RoboRequest.java | Adds robo request model (PENDING/IN_PROGRESS/DONE/CANCELLED). |
| src/main/java/de/theidler/create_mobile_packages/blocks/bee_port/DronePortTracker.java | Adds lookup by logistics network id. |
| src/main/java/de/theidler/create_mobile_packages/blocks/bee_port/BeePortScreen.java | Adds network settings button to Bee Port UI. |
| src/main/java/de/theidler/create_mobile_packages/blocks/bee_port/BeePortMenu.java | Null-safe client BE lookup; ETA semantics tweak. |
| src/main/java/de/theidler/create_mobile_packages/blocks/bee_port/BeePortBlock.java | Adjusts item interaction + stores placer UUID on placement. |
| src/main/java/de/theidler/create_mobile_packages/InputEvents.java | Adds keybind to open player networks screen. |
| src/main/java/de/theidler/create_mobile_packages/IExtendedLogisticsNetwork.java | Defines extended logistics network interface. |
| src/main/java/de/theidler/create_mobile_packages/CreateMobilePackagesClient.java | Clears client network cache on level leave. |
| src/main/java/de/theidler/create_mobile_packages/CreateMobilePackages.java | Registers commands and toast registry; removes old RoboManager static. |
| src/main/java/de/theidler/create_mobile_packages/CommonEvents.java | Switches to SavedData RoboManager ticking; blocks robo dimension travel. |
| src/main/java/de/theidler/create_mobile_packages/CMPHelper.java | Adds helper utilities (ETA, closest port, address matching, vec NBT). |
| gradle.properties | Bumps mod version + NeoForge/Create/other deps; adds new compat deps. |
| build.gradle | Adds EMI/Curios/Jade repos + deps; mixin AP for non-IDE sync. |
| README.md | Updates minimum Create version notes; documents Mobile Packager. |
| Jenkinsfile | Removed Jenkins pipeline (migrated to GitHub Actions). |
| CHANGELOG.md | Adds v0.6.0 unreleased notes. |
| .github/workflows/build-and-deploy.yml | Adds GitHub Actions build + publish workflow. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
src/main/java/de/theidler/create_mobile_packages/network_settings/RequestNetworkDataPacket.java
Show resolved
Hide resolved
.../java/de/theidler/create_mobile_packages/items/mobile_packager/MobilePackagerEditScreen.java
Show resolved
Hide resolved
src/main/java/de/theidler/create_mobile_packages/toast/types/PackageToast.java
Show resolved
Hide resolved
src/main/java/de/theidler/create_mobile_packages/blocks/bee_port/BeePortBlock.java
Show resolved
Hide resolved
src/main/java/de/theidler/create_mobile_packages/robo/RoboManager.java
Outdated
Show resolved
Hide resolved
src/main/java/de/theidler/create_mobile_packages/robo/PlayerTarget.java
Outdated
Show resolved
Hide resolved
.../java/de/theidler/create_mobile_packages/entities/robo_entity/RoboBeeBehaviorController.java
Show resolved
Hide resolved
.../de/theidler/create_mobile_packages/items/portable_stock_ticker/PortableStockTickerMenu.java
Show resolved
Hide resolved
This file contains hidden or 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
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.
No description provided.