Team-EnderIO/EnderIO
1
0
Fork 0
Code Issues 114 Pull requests 13 Projects Releases 79 Packages Wiki Activity Actions

Added Wireless Charger and range extension Antennas. #1017

Merged
CrazyPants merged 13 commits from AddWirelessCharger into dev/1.21.1 2025-05-06 20:07:04 +00:00
Conversation 25 Commits 13 Files changed 73 +1337 -147
CrazyPants commented 2025-02-27 09:09:36 +00:00 (Migrated from github.com)
Copy link

Description

  • Added Wireless Charger and range extension Antennas.
  • Removed duplicate range GUI code into common widget
  • fixed rotation on obelisks so Enderman head facing the correct way

Checklist

  • My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you).
  • I have made corresponding changes to the documentation.
  • My changes are ready for review from a contributor.

Summary by CodeRabbit

  • New Features

    • Introduced the Wireless Charger block, including new antenna variants, with full in-game GUI and configuration options.
    • Wireless Charger can charge items in player inventories within a configurable range, extendable with antenna blocks.
    • New recipes, models, and textures for Wireless Charger and antennas.
    • Added range control widgets and improved range display in related machine GUIs.

  • Configuration

    • Added new server and client configuration options for Wireless Charger energy, range, and visual range colour.

  • Bug Fixes

    • Improved handling of re-equip animations and block break resets for specific tools.

  • Refactor

    • Standardised range button creation across machine GUIs.
    • Centralised maximum range logic for relevant machines.

  • Documentation

    • Added new translation keys and improved language support for Wireless Charger features.

  • Chores

    • Updated build and property files to use the latest dependency naming conventions.
# Description - Added Wireless Charger and range extension Antennas. - Removed duplicate range GUI code into common widget - fixed rotation on obelisks so Enderman head facing the correct way <!-- For drafts, fill this in as you go; if you are leaving draft, make sure these are all complete. --> # Checklist - [x] My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you). - [x] I have made corresponding changes to the documentation. - [x] My changes are ready for review from a contributor. <!-- Thanks to: https://embeddedartistry.com/blog/2017/08/04/a-github-pull-request-template-for-your-projects/ for the building blocks of this template --> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced the Wireless Charger block, including new antenna variants, with full in-game GUI and configuration options. - Wireless Charger can charge items in player inventories within a configurable range, extendable with antenna blocks. - New recipes, models, and textures for Wireless Charger and antennas. - Added range control widgets and improved range display in related machine GUIs. - **Configuration** - Added new server and client configuration options for Wireless Charger energy, range, and visual range colour. - **Bug Fixes** - Improved handling of re-equip animations and block break resets for specific tools. - **Refactor** - Standardised range button creation across machine GUIs. - Centralised maximum range logic for relevant machines. - **Documentation** - Added new translation keys and improved language support for Wireless Charger features. - **Chores** - Updated build and property files to use the latest dependency naming conventions. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
ferriarnus (Migrated from github.com) requested changes 2025-03-01 10:09:46 +00:00
ferriarnus (Migrated from github.com) left a comment
Copy link

This seems good, but I think your IDE is formatting a bit too much stuff. I'm not sure where our editor config went, or maybe you need to try spotless to fix it @Rover656

This seems good, but I think your IDE is formatting a bit too much stuff. I'm not sure where our editor config went, or maybe you need to try spotless to fix it @Rover656
enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java
ferriarnus (Migrated from github.com) commented 2025-03-01 10:08:17 +00:00
Copy link

these seem good to have, just mention it in the commit as well?

these seem good to have, just mention it in the commit as well?
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java
@ -0,0 +22,4 @@
public WirelessChargerScreen(WirelessChargerMenu pMenu, Inventory pPlayerInventory, Component pTitle) {
super(pMenu, pPlayerInventory, pTitle);
imageWidth = WIDTH;
ferriarnus (Migrated from github.com) commented 2025-03-01 10:05:14 +00:00
Copy link

I think we have a different method to do this

I think we have a different method to do this
CrazyPants (Migrated from github.com) reviewed 2025-03-02 07:13:36 +00:00
enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java
CrazyPants (Migrated from github.com) commented 2025-03-02 07:13:36 +00:00
Copy link

How can I do this now? I don't think I can modify the commit message can I?

How can I do this now? I don't think I can modify the commit message can I?
CrazyPants (Migrated from github.com) reviewed 2025-03-02 07:15:11 +00:00
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java
@ -0,0 +22,4 @@
public WirelessChargerScreen(WirelessChargerMenu pMenu, Inventory pPlayerInventory, Component pTitle) {
super(pMenu, pPlayerInventory, pTitle);
imageWidth = WIDTH;
CrazyPants (Migrated from github.com) commented 2025-03-02 07:15:11 +00:00
Copy link

Sorry, no sure what you are referring to here.

Sorry, no sure what you are referring to here.
ferriarnus (Migrated from github.com) reviewed 2025-03-02 11:34:36 +00:00
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java
@ -0,0 +22,4 @@
public WirelessChargerScreen(WirelessChargerMenu pMenu, Inventory pPlayerInventory, Component pTitle) {
super(pMenu, pPlayerInventory, pTitle);
imageWidth = WIDTH;
ferriarnus (Migrated from github.com) commented 2025-03-02 11:34:36 +00:00
Copy link

Seems I was confused by the old design

Seems I was confused by the old design
ferriarnus (Migrated from github.com) reviewed 2025-03-02 11:35:32 +00:00
enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java
ferriarnus (Migrated from github.com) commented 2025-03-02 11:35:31 +00:00
Copy link

just in the description of the pr would be fine, it's a small thing

just in the description of the pr would be fine, it's a small thing
ferriarnus (Migrated from github.com) approved these changes 2025-03-02 11:40:38 +00:00
ferriarnus (Migrated from github.com) requested changes 2025-03-15 13:03:22 +00:00
ferriarnus (Migrated from github.com) left a comment
Copy link

Looks good and works perfectly, just some small things.

Looks good and works perfectly, just some small things.
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessAntennaBlock.java
@ -0,0 +1,22 @@
package com.enderio.machines.common.blocks.wireless_charger;
ferriarnus (Migrated from github.com) commented 2025-03-15 13:01:53 +00:00
Copy link

Using a blockstate property for this is interesting. I just wonder if components + attachments might be better?

Using a blockstate property for this is interesting. I just wonder if components + attachments might be better?
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessAntennaBlock.java
@ -0,0 +7,4 @@
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
public class WirelessAntennaBlock extends Block {
ferriarnus (Migrated from github.com) commented 2025-03-15 13:00:48 +00:00
Copy link

Just a small thing, but maybe give it a propper hitbox, not a full block

Just a small thing, but maybe give it a propper hitbox, not a full block
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java
@ -0,0 +1,238 @@
package com.enderio.machines.common.blocks.wireless_charger;
ferriarnus (Migrated from github.com) commented 2025-03-15 12:50:46 +00:00
Copy link

Hmm is this a different Nullable from what we normally use?

Hmm is this a different Nullable from what we normally use?
Rover656 (Migrated from github.com) reviewed 2025-03-16 20:22:57 +00:00
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java
@ -0,0 +1,238 @@
package com.enderio.machines.common.blocks.wireless_charger;
Rover656 (Migrated from github.com) commented 2025-03-16 20:22:57 +00:00
Copy link

Yes, we use the jetbrains annotations

Yes, we use the jetbrains annotations
Rover656 (Migrated from github.com) reviewed 2025-03-16 20:24:22 +00:00
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessAntennaBlock.java
@ -0,0 +1,22 @@
package com.enderio.machines.common.blocks.wireless_charger;
Rover656 (Migrated from github.com) commented 2025-03-16 20:24:22 +00:00
Copy link

On blocks we should store data in the block entity. I mistakenly adopted attachments when we ported to Neo and have been working to undo this work.

Attachments - for adding data to stuff that isn't "yours".
Once MC changes to components however this story changes :)

On blocks we should store data in the block entity. I mistakenly adopted attachments when we ported to Neo and have been working to undo this work. Attachments - for adding data to stuff that isn't "yours". Once MC changes to components however this story changes :)
coderabbitai[bot] commented 2025-05-01 09:33:20 +00:00 (Migrated from github.com)
Copy link

Walkthrough

This update introduces a new wireless charger machine and its antenna blocks, including their block entities, menus, GUIs, recipes, and data handling. It adds configuration options, translations, models, and range-extending mechanics. Additionally, it unifies range button creation in GUIs, enhances item animation logic, adjusts range handling in block entities, and updates build properties for dependency management.

Changes

File(s) / Path(s) Change Summary
enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java Added factory methods for range increase/decrease buttons and corresponding sprites.
enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java
enderio-base/src/main/java/com/enderio/base/common/item/tool/LevitationStaffItem.java
enderio-base/src/main/java/com/enderio/base/common/item/tool/TravelStaffItem.java		 Added overrides for re-equip animation and block break reset logic; minor formatting.
enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java Added new translation constant for "Maximum Range".
enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java Registered new data provider for range extenders in data generation.
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/AversionObeliskScreen.java
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/DrainScreen.java
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/InhibitorObeliskScreen.java
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/RelocatorObeliskScreen.java
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/VacuumChestScreen.java
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/XPVacuumScreen.java		 Refactored plus/minus range button creation to use common widget factory methods.
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java Added new GUI screen for the wireless charger machine.
enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/ObeliskBER.java Adjusted Y-axis rotation for rendered item orientation.
enderio-machines/src/main/java/com/enderio/machines/common/attachment/ActionRange.java Added maxRange field, updated codecs, and methods to handle new field.
enderio-machines/src/main/java/com/enderio/machines/common/blocks/drain/DrainBlockEntity.java
enderio-machines/src/main/java/com/enderio/machines/common/blocks/vacuum/VacuumMachineBlockEntity.java
enderio-machines/src/main/java/com/enderio/machines/common/blocks/farming_station/FarmingStationBlockEntity.java		 Moved location of getMaxRange() method within class; no logic change.
enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/ObeliskBlockEntity.java Added override for getMaxRange() returning 32.
enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/aversion/AversionObeliskBlockEntity.java
enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/inhibitor/InhibitorObeliskBlockEntity.java
enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/relocator/RelocatorObeliskBlockEntity.java		 Removed redundant getMaxRange() overrides.
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessAntennaBlock.java Added new block class for wireless charger antenna with custom shape.
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java Added new block entity for the wireless charger, including range, charging, and persistence logic.
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java Added new menu for wireless charger, handling range controls and slots.
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/package-info.java Added package-level non-null annotations.
enderio-machines/src/main/java/com/enderio/machines/common/config/MachinesConfigLang.java Added translations for wireless charger-related configuration options.
enderio-machines/src/main/java/com/enderio/machines/common/config/client/MachinesClientBlocksConfig.java Added config value for wireless charger range colour.
enderio-machines/src/main/java/com/enderio/machines/common/config/common/EnergyConfig.java Added wireless charger energy config values; increased wired charger usage default.
enderio-machines/src/main/java/com/enderio/machines/common/config/common/MachinesCommonConfig.java Added config value for wireless charger base range.
enderio-machines/src/main/java/com/enderio/machines/common/datamap/RangeExtender.java Added new class for range extender data map and codec.
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineAttachments.java Minor import reordering.
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java Registered wireless charger block entity.
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java Registered wireless charger and antenna blocks; added helper for antenna registration.
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineDataMaps.java Registered range extender data map.
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineMenus.java Registered wireless charger menu and screen.
enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java Added block tag for range extenders.
enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java Added data provider for range extender block data.
enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java Added recipes for wireless charger and antennas; reformatted recipe builder chains.
enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger.json
enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_active.json
enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_antenna.json
enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_antenna_advanced.json		 Added block model JSONs for wireless charger and antenna variants.
enderio/build.gradle.kts
gradle.properties		 Renamed project property and updated dependency for "stitch" (formerly "athena").

Sequence Diagram(s)

sequenceDiagram
    participant Player
    participant WirelessChargerBlockEntity
    participant WirelessChargerMenu
    participant WirelessChargerScreen

    Player->>WirelessChargerScreen: Open GUI
    WirelessChargerScreen->>WirelessChargerMenu: Interact with range controls (increase/decrease/toggle)
    WirelessChargerMenu->>WirelessChargerBlockEntity: Apply range change or toggle visibility
    WirelessChargerBlockEntity->>WirelessChargerMenu: Sync updated range/maxRange
    WirelessChargerMenu->>WirelessChargerScreen: Update displayed range and controls
    loop Each server tick
        WirelessChargerBlockEntity->>Player: Attempt to charge items in range
    end

Possibly related PRs

  • Team-EnderIO/EnderIO#1048: Renames the project property and updates the Maven dependency from "athena-ctm" to "stitch", matching the build configuration changes in this PR.

Suggested labels

Type-Enhancement, Status-Needs Updating, Area-Parity

Suggested reviewers

  • Rover656

Poem

Oh wireless charger, box so bright,
You beam out power, day and night!
With antennas tall and range so wide,
Your energy flows on every side.
Now rabbits hop with gadgets charged,
Thanks to code so well enlarged!
🐇🔋✨

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.
<!-- This is an auto-generated comment: summarize by coderabbit.ai --> <!-- walkthrough_start --> ## Walkthrough This update introduces a new wireless charger machine and its antenna blocks, including their block entities, menus, GUIs, recipes, and data handling. It adds configuration options, translations, models, and range-extending mechanics. Additionally, it unifies range button creation in GUIs, enhances item animation logic, adjusts range handling in block entities, and updates build properties for dependency management. ## Changes | File(s) / Path(s) | Change Summary | |----------------------------------------------------------------------------------------------------|---------------| | enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java | Added factory methods for range increase/decrease buttons and corresponding sprites. | | enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java<br>enderio-base/src/main/java/com/enderio/base/common/item/tool/LevitationStaffItem.java<br>enderio-base/src/main/java/com/enderio/base/common/item/tool/TravelStaffItem.java | Added overrides for re-equip animation and block break reset logic; minor formatting. | | enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java | Added new translation constant for "Maximum Range". | | enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java | Registered new data provider for range extenders in data generation. | | enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/AversionObeliskScreen.java<br>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/DrainScreen.java<br>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/InhibitorObeliskScreen.java<br>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/RelocatorObeliskScreen.java<br>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/VacuumChestScreen.java<br>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/XPVacuumScreen.java | Refactored plus/minus range button creation to use common widget factory methods. | | enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java | Added new GUI screen for the wireless charger machine. | | enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/ObeliskBER.java | Adjusted Y-axis rotation for rendered item orientation. | | enderio-machines/src/main/java/com/enderio/machines/common/attachment/ActionRange.java | Added `maxRange` field, updated codecs, and methods to handle new field. | | enderio-machines/src/main/java/com/enderio/machines/common/blocks/drain/DrainBlockEntity.java<br>enderio-machines/src/main/java/com/enderio/machines/common/blocks/vacuum/VacuumMachineBlockEntity.java<br>enderio-machines/src/main/java/com/enderio/machines/common/blocks/farming_station/FarmingStationBlockEntity.java | Moved location of `getMaxRange()` method within class; no logic change. | | enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/ObeliskBlockEntity.java | Added override for `getMaxRange()` returning 32. | | enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/aversion/AversionObeliskBlockEntity.java<br>enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/inhibitor/InhibitorObeliskBlockEntity.java<br>enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/relocator/RelocatorObeliskBlockEntity.java | Removed redundant `getMaxRange()` overrides. | | enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessAntennaBlock.java | Added new block class for wireless charger antenna with custom shape. | | enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java | Added new block entity for the wireless charger, including range, charging, and persistence logic. | | enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java | Added new menu for wireless charger, handling range controls and slots. | | enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/package-info.java | Added package-level non-null annotations. | | enderio-machines/src/main/java/com/enderio/machines/common/config/MachinesConfigLang.java | Added translations for wireless charger-related configuration options. | | enderio-machines/src/main/java/com/enderio/machines/common/config/client/MachinesClientBlocksConfig.java | Added config value for wireless charger range colour. | | enderio-machines/src/main/java/com/enderio/machines/common/config/common/EnergyConfig.java | Added wireless charger energy config values; increased wired charger usage default. | | enderio-machines/src/main/java/com/enderio/machines/common/config/common/MachinesCommonConfig.java | Added config value for wireless charger base range. | | enderio-machines/src/main/java/com/enderio/machines/common/datamap/RangeExtender.java | Added new class for range extender data map and codec. | | enderio-machines/src/main/java/com/enderio/machines/common/init/MachineAttachments.java | Minor import reordering. | | enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java | Registered wireless charger block entity. | | enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java | Registered wireless charger and antenna blocks; added helper for antenna registration. | | enderio-machines/src/main/java/com/enderio/machines/common/init/MachineDataMaps.java | Registered range extender data map. | | enderio-machines/src/main/java/com/enderio/machines/common/init/MachineMenus.java | Registered wireless charger menu and screen. | | enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java | Added block tag for range extenders. | | enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java | Added data provider for range extender block data. | | enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java | Added recipes for wireless charger and antennas; reformatted recipe builder chains. | | enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger.json<br>enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_active.json<br>enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_antenna.json<br>enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_antenna_advanced.json | Added block model JSONs for wireless charger and antenna variants. | | enderio/build.gradle.kts<br>gradle.properties | Renamed project property and updated dependency for "stitch" (formerly "athena"). | ## Sequence Diagram(s) ```mermaid sequenceDiagram participant Player participant WirelessChargerBlockEntity participant WirelessChargerMenu participant WirelessChargerScreen Player->>WirelessChargerScreen: Open GUI WirelessChargerScreen->>WirelessChargerMenu: Interact with range controls (increase/decrease/toggle) WirelessChargerMenu->>WirelessChargerBlockEntity: Apply range change or toggle visibility WirelessChargerBlockEntity->>WirelessChargerMenu: Sync updated range/maxRange WirelessChargerMenu->>WirelessChargerScreen: Update displayed range and controls loop Each server tick WirelessChargerBlockEntity->>Player: Attempt to charge items in range end ``` ## Possibly related PRs - [Team-EnderIO/EnderIO#1048](https://github.com/Team-EnderIO/EnderIO/pull/1048): Renames the project property and updates the Maven dependency from "athena-ctm" to "stitch", matching the build configuration changes in this PR. ## Suggested labels `Type-Enhancement`, `Status-Needs Updating`, `Area-Parity` ## Suggested reviewers - Rover656 ## Poem > Oh wireless charger, box so bright, > You beam out power, day and night! > With antennas tall and range so wide, > Your energy flows on every side. > Now rabbits hop with gadgets charged, > Thanks to code so well enlarged! > 🐇🔋✨ <!-- walkthrough_end --> <!-- internal state start --> <!-- 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= --> <!-- internal state end --> <!-- finishing_touch_checkbox_start --> <details open="true"> <summary>✨ Finishing Touches</summary> - [ ] <!-- {"checkboxId": "7962f53c-55bc-4827-bfbf-6a18da830691"} --> 📝 Generate Docstrings </details> <!-- finishing_touch_checkbox_end --> <!-- tips_start --> --- Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. <details> <summary>❤️ Share</summary> - [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A&url=https%3A//coderabbit.ai) - [Mastodon](https://mastodon.social/share?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A%20https%3A%2F%2Fcoderabbit.ai) - [Reddit](https://www.reddit.com/submit?title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&text=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code.%20Check%20it%20out%3A%20https%3A//coderabbit.ai) - [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fcoderabbit.ai&mini=true&title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&summary=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code) </details> <details> <summary>🪧 Tips</summary> ### Chat There are 3 ways to chat with [CodeRabbit](https://coderabbit.ai?utm_source=oss&utm_medium=github&utm_campaign=Team-EnderIO/EnderIO&utm_content=1017): - Review comments: Directly reply to a review comment made by CodeRabbit. Example: - `I pushed a fix in commit <commit_id>, please review it.` - `Generate unit testing code for this file.` - `Open a follow-up GitHub issue for this discussion.` - Files and specific lines of code (under the "Files changed" tab): Tag `@coderabbitai` in a new review comment at the desired location with your query. Examples: - `@coderabbitai generate unit testing code for this file.` - `@coderabbitai modularize this function.` - PR comments: Tag `@coderabbitai` in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples: - `@coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.` - `@coderabbitai read src/utils.ts and generate unit testing code.` - `@coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.` - `@coderabbitai help me debug CodeRabbit configuration file.` ### Support Need help? Create a ticket on our [support page](https://www.coderabbit.ai/contact-us/support) for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. ### CodeRabbit Commands (Invoked using PR comments) - `@coderabbitai pause` to pause the reviews on a PR. - `@coderabbitai resume` to resume the paused reviews. - `@coderabbitai review` to trigger an incremental review. This is useful when automatic reviews are disabled for the repository. - `@coderabbitai full review` to do a full review from scratch and review all the files again. - `@coderabbitai summary` to regenerate the summary of the PR. - `@coderabbitai generate docstrings` to [generate docstrings](https://docs.coderabbit.ai/finishing-touches/docstrings) for this PR. - `@coderabbitai generate sequence diagram` to generate a sequence diagram of the changes in this PR. - `@coderabbitai resolve` resolve all the CodeRabbit review comments. - `@coderabbitai configuration` to show the current CodeRabbit configuration for the repository. - `@coderabbitai help` to get help. ### Other keywords and placeholders - Add `@coderabbitai ignore` anywhere in the PR description to prevent this PR from being reviewed. - Add `@coderabbitai summary` to generate the high-level summary at a specific location in the PR description. - Add `@coderabbitai` anywhere in the PR title to generate the title automatically. ### CodeRabbit Configuration File (`.coderabbit.yaml`) - You can programmatically configure CodeRabbit by adding a `.coderabbit.yaml` file to the root of your repository. - Please see the [configuration documentation](https://docs.coderabbit.ai/guides/configure-coderabbit) for more information. - If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: `# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json` ### Documentation and Community - Visit our [Documentation](https://docs.coderabbit.ai) for detailed information on how to use CodeRabbit. - Join our [Discord Community](http://discord.gg/coderabbit) to get help, request features, and share feedback. - Follow us on [X/Twitter](https://twitter.com/coderabbitai) for updates and announcements. </details> <!-- tips_end -->
coderabbitai[bot] (Migrated from github.com) reviewed 2025-05-01 09:36:22 +00:00
coderabbitai[bot] (Migrated from github.com) left a comment
Copy link

Actionable comments posted: 4

🧹 Nitpick comments (4)
enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_antenna_advanced.json (1)

1-81: Advanced antenna model maintains consistency with base antenna.

The advanced antenna model appropriately uses the same structure as the basic antenna, with the main difference being the use of vibrant_alloy_block texture instead of pulsating_alloy_block, indicating a higher tier upgrade.

I do notice one minor point: both antenna models use identical element naming, with three elements all named "ring". Consider using more specific names like "upper_ring", "middle_ring", and "lower_ring" for better clarity if the model needs future modifications.

enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java (2)

45-45: Consider using dedicated button IDs instead of shared constants

The screen is currently using button IDs from AversionObeliskMenu (VISIBILITY_BUTTON_ID). It would be better for maintainability to define these constants in the WirelessChargerMenu class instead to avoid potentially confusing dependencies between unrelated components.

66-69: Consider extracting range value rendering to a helper method

The calculation of the position for the range value text is quite verbose. Consider extracting this to a helper method for improved readability.

-        guiGraphics.drawString(font, getMenu().getBlockEntity().getRange() + "",
-                leftPos + imageWidth - 8 - 16 - font.width(getMenu().getBlockEntity().getRange() + "") - 10,
-                topPos + rangeOffset + 5, 0, false);
+        drawRangeValue(guiGraphics, getMenu().getBlockEntity().getRange(), rangeOffset);

+ // Add this helper method to the class
+ private void drawRangeValue(GuiGraphics guiGraphics, int range, int rangeOffset) {
+     String rangeText = String.valueOf(range);
+     int textWidth = font.width(rangeText);
+     int x = leftPos + imageWidth - 8 - 16 - textWidth - 10;
+     guiGraphics.drawString(font, rangeText, x, topPos + rangeOffset + 5, 0, false);
+ }
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (1)

211-218: Consider adding state change event notification

When changing the action range and updating the bounds, consider notifying relevant systems of this state change to ensure proper updates throughout the game.

Ensure the state update is propagated consistently by adding an event or notification system for range changes, which could be useful for other components that might depend on this information.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 397c648f55 and a53359613e.

⛔ Files ignored due to path filters (26)
  • enderio-base/src/generated/resources/assets/enderio/lang/en_us.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/blockstates/wireless_charger.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/blockstates/wireless_charger_antenna.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/blockstates/wireless_charger_antenna_advanced.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/lang/en_us.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/models/block/wireless_charger_active_combined.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/models/block/wireless_charger_combined.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/models/item/wireless_charger.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/models/item/wireless_charger_antenna.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/models/item/wireless_charger_antenna_advanced.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/wireless_charger.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/wireless_charger_antenna.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/wireless_charger_antenna_advanced.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/data_maps/block/range_extender.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/loot_table/blocks/wireless_charger.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/loot_table/blocks/wireless_charger_antenna.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/loot_table/blocks/wireless_charger_antenna_advanced.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/recipe/wireless_charger.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/recipe/wireless_charger_antenna.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/recipe/wireless_charger_antenna_advanced.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/tags/block/range_extender.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json is excluded by !**/generated/**
  • enderio-machines/src/main/resources/assets/enderio/textures/block/wireless_charger_front.png is excluded by !**/*.png
  • enderio-machines/src/main/resources/assets/enderio/textures/block/wireless_charger_front_active.png is excluded by !**/*.png
  • enderio-machines/src/main/resources/assets/enderio/textures/gui/screen/wireless_charger.png is excluded by !**/*.png
📒 Files selected for processing (45)
  • enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java (1 hunks)
  • enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java (4 hunks)
  • enderio-base/src/main/java/com/enderio/base/common/item/tool/LevitationStaffItem.java (4 hunks)
  • enderio-base/src/main/java/com/enderio/base/common/item/tool/TravelStaffItem.java (6 hunks)
  • enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java (6 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/AversionObeliskScreen.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/DrainScreen.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/InhibitorObeliskScreen.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/RelocatorObeliskScreen.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/VacuumChestScreen.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/XPVacuumScreen.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/ObeliskBER.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/attachment/ActionRange.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/attachment/RangedActor.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/drain/DrainBlockEntity.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/ObeliskBlockEntity.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/aversion/AversionObeliskBlockEntity.java (0 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/inhibitor/InhibitorObeliskBlockEntity.java (0 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/relocator/RelocatorObeliskBlockEntity.java (0 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/vacuum/VacuumMachineBlockEntity.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessAntennaBlock.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/package-info.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/config/MachinesConfigLang.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/config/client/MachinesClientBlocksConfig.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/config/common/EnergyConfig.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/config/common/MachinesCommonConfig.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/datamap/RangeExtender.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/init/MachineAttachments.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java (7 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/init/MachineDataMaps.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/init/MachineMenus.java (3 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java (2 hunks)
  • enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger.json (1 hunks)
  • enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_active.json (1 hunks)
  • enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_antenna.json (1 hunks)
  • enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_antenna_advanced.json (1 hunks)
  • enderio/build.gradle.kts (2 hunks)
  • gradle.properties (1 hunks)
💤 Files with no reviewable changes (3)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/aversion/AversionObeliskBlockEntity.java
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/relocator/RelocatorObeliskBlockEntity.java
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/inhibitor/InhibitorObeliskBlockEntity.java
🧰 Additional context used
🧬 Code Graph Analysis (11)
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java (2)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (1)
  • WirelessChargerBlockEntity (44-230)
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java (1)
  • MachineBlocks (69-398)
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/AversionObeliskScreen.java (1)
enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java (1)
  • EIOCommonWidgets (13-40)
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineMenus.java (2)
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java (1)
  • WirelessChargerScreen (17-84)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java (1)
  • WirelessChargerMenu (10-58)
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/InhibitorObeliskScreen.java (1)
enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java (1)
  • EIOCommonWidgets (13-40)
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineDataMaps.java (1)
enderio-machines/src/main/java/com/enderio/machines/common/datamap/RangeExtender.java (1)
  • RangeExtender (14-22)
enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java (1)
enderio-base/src/main/java/com/enderio/base/api/EnderIO.java (1)
  • EnderIO (5-11)
enderio-base/src/main/java/com/enderio/base/common/item/tool/TravelStaffItem.java (1)
enderio-base/src/main/java/com/enderio/base/common/init/EIODataComponents.java (1)
  • EIODataComponents (21-75)
enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java (1)
enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java (1)
  • RangeExtenderDataProvider (16-37)
enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java (1)
enderio-base/src/main/java/com/enderio/base/api/EnderIO.java (1)
  • EnderIO (5-11)
enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java (1)
enderio-base/src/main/java/com/enderio/base/api/EnderIO.java (1)
  • EnderIO (5-11)
enderio-machines/src/main/java/com/enderio/machines/common/datamap/RangeExtender.java (1)
enderio-base/src/main/java/com/enderio/base/api/EnderIO.java (1)
  • EnderIO (5-11)
🔇 Additional comments (66)
gradle.properties (1)

31-31:

✅ Verification successful

Library dependency updated to Stitch

The dependency has been changed from Athena CTM to Stitch 4.0.1. This change aligns with the corresponding update in enderio/build.gradle.kts.

🏁 Script executed:

#!/bin/bash
# Verify if Stitch is a valid Modrinth dependency and check its compatibility with Minecraft 1.21.1

echo "Checking Stitch dependency validity on Modrinth..."
curl -s "https://api.modrinth.com/v2/project/stitch" | jq '.id, .title, .description, .versions[0]'

# Check the game versions supported by the latest Stitch version
curl -s "https://api.modrinth.com/v2/version/XgZZ2JbG" | jq '.game_versions'

Length of output: 416

🏁 Script executed:

#!/bin/bash
# Fetch Stitch version ID for version 4.0.1 and print its supported game versions
VERSION_ID=$(curl -s "https://api.modrinth.com/v2/project/stitch/versions" | jq -r '.[] | select(.version_number=="4.0.1") | .id')
echo "Stitch 4.0.1 version ID: $VERSION_ID"
curl -s "https://api.modrinth.com/v2/version/$VERSION_ID" | jq '.game_versions'

Length of output: 340

🏁 Script executed:

#!/bin/bash
# Correctly fetch the list of versions for the Stitch project and check supported game versions for 4.0.1

# Retrieve all version metadata for the Stitch project
VERSIONS_JSON=$(curl -s "https://api.modrinth.com/v2/project/stitch/version")

# Extract the version ID for version 4.0.1
VERSION_ID=$(echo "$VERSIONS_JSON" | jq -r '.[] | select(.version_number=="4.0.1") | .id')

echo "Stitch 4.0.1 version ID: $VERSION_ID"

# Fetch and print the supported game versions for that release
curl -s "https://api.modrinth.com/v2/version/$VERSION_ID" | jq '.game_versions'

Length of output: 61927

Confirm Stitch 4.0.1 supports Minecraft 1.21.1
The update from Athena (Athena 4.0.1) to Stitch 4.0.1 in gradle.properties is valid:

  • Modrinth project “Stitch (formerly Athena)” version 4.0.1 is published under both Fabric (ID 7G1e11iK) and NeoForge (ID zzovqkDA) builds
  • Both builds declare support for game versions 1.21 and 1.21.1

This aligns with the corresponding update in enderio/build.gradle.kts. The change can be approved as-is.

enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/ObeliskBER.java (1)

42-42: Fixed Enderman head orientation in obelisks

The rotation adjustment of 180 degrees ensures the Enderman head now faces the correct direction in obelisk renderings, as mentioned in the PR objectives.

enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/ObeliskBlockEntity.java (2)

31-33: Import organization improved

The imports have been reordered for better readability, placing annotations and core Java imports first.

40-40: Added maxRange parameter to ActionRange constructor

The DEFAULT_RANGE constant now includes a maxRange parameter (32), which aligns with the broader refactoring of range handling across machines and obelisks mentioned in the PR objectives.

enderio/build.gradle.kts (2)

23-23: Renamed property to match new dependency

The property has been renamed from athenaVersion to stitchVersion to reflect the library change.

54-54:

✅ Verification successful

Updated runtime dependency to Stitch

The runtime dependency has been changed from "athena-ctm" to "stitch", matching the property rename in gradle.properties.

🌐 Web query:

Is "stitch" the successor to "athena-ctm" for Minecraft 1.21?

💡 Result:

Yes, "Stitch" is the successor to "athena-ctm" (commonly known as Athena) for Minecraft 1.21 and newer versions. The mod has undergone a rebranding: it is now named "Stitch," whereas it was previously called "Athena" or referred to as "athena-ctm"[1][2][7][8].

Several sources confirm this transition. For example, both CurseForge and Modrinth list the project as "Stitch (formerly Athena)," highlighting the direct lineage between the two names[1][2][7]. The mod continues to fulfill the same purpose—providing a cross-platform, high-performance solution for connected textures across major mod loaders like Forge, Fabric, and NeoForge[1][2][3][6][9].

For Minecraft 1.21, you will find Stitch downloads and documentation where you previously would have found Athena. This means that Stitch is the active, maintained, and official replacement for "athena-ctm" starting with the 1.21 update and beyond[1][2][7][8].

Citations:

Runtime dependency correctly updated to Stitch

Verified that Stitch (formerly Athena/athena-ctm) is the official successor for Minecraft 1.21 and newer. The change in enderio/build.gradle.kts at line 54 aligns with the renamed Gradle property.

• File: enderio/build.gradle.kts (line 54)

runtimeOnly("maven.modrinth:stitch:${stitchVersion}")
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/DrainScreen.java (1)

45-48: Refactored range buttons using common widgets

The direct instantiation of range increase/decrease buttons has been replaced with calls to common widget factory methods from EIOCommonWidgets. This improves code maintainability by consolidating duplicate range GUI code across the application, as mentioned in the PR objectives.

enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/XPVacuumScreen.java (1)

42-45: Good refactoring to use common widget factory methods.

Using the centralised factory methods from EIOCommonWidgets for range control buttons improves code maintainability and consistency across GUI screens.

enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/VacuumChestScreen.java (1)

40-43: Good refactoring to use common widget factory methods.

Using the centralised factory methods from EIOCommonWidgets for range control buttons improves code maintainability and consistency across different machine GUIs.

enderio-machines/src/main/java/com/enderio/machines/common/config/common/MachinesCommonConfig.java (2)

15-15: New configuration property for wireless charger range added.

The new config value aligns with the PR objectives of adding wireless charger functionality.

43-45: Well-structured configuration category for the wireless charger.

The new configuration category follows the established pattern in the file with proper builder push/pop and a descriptive comment.

enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java (2)

24-24: New import for the RangeExtenderDataProvider.

This import supports the addition of wireless charger functionality with range extension capabilities.

119-119: Added RangeExtenderDataProvider to the data generation pipeline.

The data provider is properly registered with the same conditional inclusion pattern as other providers, ensuring range extender data is generated for server use.

enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/AversionObeliskScreen.java (1)

43-46: Good refactoring to use common widget factory methods.

Using the centralised factory methods from EIOCommonWidgets for range control buttons improves code maintainability and consistency across different GUI screens.

enderio-machines/src/main/java/com/enderio/machines/common/init/MachineMenus.java (3)

26-26: Imported WirelessChargerScreen class

The import for the new wireless charger screen class looks correct and follows the same import pattern as other machine screens.

52-52: Imported WirelessChargerMenu class

The import for the wireless charger menu class follows the established pattern in the codebase.

94-95: Added menu registration for wireless charger

The registration of the wireless charger menu follows the same pattern as other machine menu registrations, using consistent naming conventions and parameter ordering.

enderio-machines/src/main/java/com/enderio/machines/common/attachment/RangedActor.java (2)

8-10: Added default implementation for getMaxRange

This change properly adds a default implementation that delegates to the ActionRange record's maxRange value, which supports the per-instance dynamic maximum ranges for the wireless charger feature.

37-37: Improved range comparison logic

The condition has been updated to compare the current range directly with the maxRange from the same ActionRange object, making the comparison more direct and consistent with the new default implementation of getMaxRange().

enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/RelocatorObeliskScreen.java (1)

43-46: Consolidated range adjustment buttons using common widget methods

The implementation now uses the common factory methods from EIOCommonWidgets for creating range adjustment buttons, which helps standardize UI controls across all machine screens that implement range functionality. This reduces code duplication and ensures a consistent look and feel.

enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger.json (1)

1-12: New model file for wireless charger block

The model definition follows Minecraft's standard block model conventions and reuses existing EnderIO machine textures where appropriate, while defining a custom front texture for the wireless charger. The particle texture is correctly set to the front texture, which is standard practice for visible block faces.

enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java (2)

44-44: Good addition of the necessary import.

The import for WirelessChargerBlockEntity is correctly added to support the new wireless charger functionality.

137-139: LGTM: Correctly registers the wireless charger block entity.

The wireless charger block entity registration follows the same pattern as other powered machines, particularly similar to the wired charger registration above it. The poweredMachineBlockEntityCapabilities application ensures it has the necessary energy storage and item handling capabilities.

enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/package-info.java (1)

1-4: Standard null-safety annotations applied correctly.

These annotations properly establish non-null defaults for parameters and return values throughout the package, which is a good practice for ensuring null-safety.

enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_active.json (1)

1-12: Model JSON follows standard conventions and is well structured.

The wireless charger active model correctly inherits from the standard cube block model and properly defines textures for all faces. The use of the active texture for the front face will provide visual feedback when the machine is operating.

enderio-machines/src/main/java/com/enderio/machines/common/blocks/vacuum/VacuumMachineBlockEntity.java (2)

27-33: Import statements reorganised correctly.

The import statements have been moved to a more logical location at the end of the import block, which improves code organisation without changing functionality.

43-43: Good refactoring of range management.

The DEFAULT_RANGE has been updated to include the max range parameter (6) which previously was defined in a separate getMaxRange() method. This consolidation is part of the broader refactoring of range management into a common widget as mentioned in the PR objectives.

enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java (2)

215-215: Added new translation key for Maximum Range.

This new translation key adds support for the wireless charger and range extender features, providing localized text for displaying maximum range values in GUIs.

37-38: Formatting improvements for better readability.

These formatting changes improve code readability and maintain consistent style throughout the file.

Also applies to: 42-43, 48-49, 64-64, 263-264, 289-292, 316-316, 319-319

enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/InhibitorObeliskScreen.java (1)

43-46: Improved code reuse with widget factory methods.

Good refactoring to use the common widget factory methods instead of direct button creation. This improves maintainability and consistency across different machine GUIs.

enderio-machines/src/main/java/com/enderio/machines/common/attachment/ActionRange.java (5)

18-18: Added maxRange field to ActionRange record.

The record now includes a maxRange field to support dynamic maximum range values for machines like the wireless charger.

20-23: Updated CODEC to include maxRange field.

The Codec correctly includes the new maxRange field for serialization and deserialization.

25-26: Updated STREAM_CODEC to include maxRange field.

The StreamCodec correctly includes the new maxRange field for network transmission.

31-33: Updated factory methods to preserve maxRange.

All methods creating new ActionRange instances now correctly preserve the maxRange value.

Also applies to: 35-37, 39-41, 43-45, 47-49

51-53: Added setMaxRange method.

The new setMaxRange method allows for updating the maxRange value while preserving other fields, which is essential for the wireless charger's range extension functionality.

enderio-machines/src/main/java/com/enderio/machines/common/init/MachineDataMaps.java (2)

4-4: Added import for RangeExtender.

Added the necessary import for the new RangeExtender class.

15-15: Registered RangeExtender data map.

This registration enables the range extender functionality, allowing blocks like antennas to extend the range of wireless chargers.

enderio-machines/src/main/java/com/enderio/machines/common/config/MachinesConfigLang.java (2)

63-70: Good addition of Wireless Charger configuration translations.

The new translation keys for the Wireless Charger feature are well-structured and follow the established pattern in the file. The translations are descriptive and clear for users.

90-91: Improved code formatting for readability.

Breaking the parameters across multiple lines improves readability of the code.

enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessAntennaBlock.java (1)

12-12: Custom shape implementation looks good.

The custom VoxelShape creates a proper hitbox for the antenna, making it match its visual appearance rather than being a full block.

enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java (2)

17-20: Good centralisation of button resources.

The addition of these resource locations and widget sprites centralises the UI element definitions, which supports the DRY principle and improves consistency across the UI.

33-39: Excellent addition of factory methods for range buttons.

These factory methods help standardise the creation of range adjustment buttons across different GUIs, reducing code duplication and ensuring consistent appearance.

enderio-machines/src/main/java/com/enderio/machines/common/init/MachineAttachments.java (1)

28-28: Good update to ActionRange constructor with maxRange parameter.

The addition of the maxRange parameter to the ActionRange constructor aligns with the refactoring to support per-instance maximum ranges, which is needed for the wireless charger feature.

enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_antenna.json (1)

1-81: The model looks well-structured.

The wireless charger antenna model is properly defined with appropriate elements for the base, stem, and rings. The texture references and UV mappings are correctly specified.

enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java (3)

7-7: LGTM! Import added for Block class.

The import is correctly added to support the new blocks tag implementation.

13-13: LGTM! Register method updated.

The register method properly calls the new Blocks.init() method.

27-37: LGTM! Well-structured tag implementation.

The Blocks class implementation follows the same pattern as the existing EntityTypes class, maintaining consistent code style. The RANGE_EXTENDER tag is properly created using the EnderIO namespace.

enderio-machines/src/main/java/com/enderio/machines/common/config/common/EnergyConfig.java (2)

40-42: New configuration fields added for wireless charger.

The configuration fields for the wireless charger capacity, usage, and upkeep are properly defined.

166-173: LGTM! Wireless charger configuration section.

The wireless charger configuration section follows the same structure as other machine configurations with appropriate comments and reasonable default values:

  • 128,000 uI capacity matches the wired charger
  • 60 uI/t charge rate matches the wired charger
  • 2 uI/t upkeep cost is reasonable for a passive wireless device

This ensures consistency in the energy system balancing.

enderio-machines/src/main/java/com/enderio/machines/common/datamap/RangeExtender.java (1)

14-22: Well-structured data map implementation for range extension functionality.

This is a good implementation of a data map for tracking range extension values. The code effectively uses NeoForged's data map API to create a mapping between block tags and integer values that represent range extension amounts.

The structure allows for flexible configuration of range extenders through data generation rather than hardcoded values, which is a maintainable approach.

enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java (2)

16-25: Data provider implementation looks good.

The provider correctly implements the data generation pattern with a clean API for adding entries. The computeIfAbsent approach in the addData method efficiently handles the nested map structure.

27-36: Range values for antennas look appropriate.

The implementation correctly associates the wireless charger antennas with their respective range extension values (16 and 32), which seems appropriate for a basic and advanced version. The data is properly added to the RangeExtender data map.

enderio-base/src/main/java/com/enderio/base/common/item/tool/LevitationStaffItem.java (2)

85-93: Good addition of animation and block break reset methods.

These overrides improve the user experience by preventing unnecessary re-equip animations and block break resets when switching between items of the same type. This makes the item behaviour more polished.

22-24: Improved formatting for better readability.

The reformatting of the FLUID_HANDLER_PROVIDER definition improves code readability without changing functionality.

enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java (1)

1-58: Well-structured menu implementation for the new wireless charger feature.

The menu class follows the established pattern for machine menus in this codebase with clear button handling for range control and visibility toggle. The implementation is clean and appropriately leverages the base class functionality.

enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java (3)

230-239: Good recipe implementation for the wireless charger.

The recipe follows the same pattern as other machine recipes while requiring appropriate ingredients including copper alloy ingots, void chassis, and ender resonator for the wireless functionality.

241-250: Clear recipe definition for the wireless charger antenna.

The recipe appropriately uses pulsating alloy for the antenna element along with copper alloy and ender resonator, which aligns with the expected functionality of the component.

252-261: Well-defined recipe for the advanced wireless charger antenna.

The upgrade path from basic to advanced antenna is logical, replacing pulsating alloy with vibrant alloy and using sentient ender instead of the basic ender resonator for improved range capabilities.

enderio-base/src/main/java/com/enderio/base/common/item/tool/TravelStaffItem.java (1)

171-179: Good addition of animation control methods to improve player experience.

These methods prevent unnecessary re-equip animations and block break resets when the item doesn't actually change. This provides a smoother experience when item data changes but the item itself remains the same.

enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java (2)

143-151: Appropriate block registrations for the new wireless charger system.

The registrations for the wireless charger and its two antenna variants follow the established pattern for machine blocks in this class. The wireless charger is correctly registered as a progress machine, which aligns with its expected functionality.

379-392: Good implementation of a helper method for wireless antenna blocks.

The wirelessAntenna method efficiently centralizes the common properties for antenna blocks, including strength, occlusion settings, loot table, block tags, and UI elements. The method appropriately adds the antennas to the RANGE_EXTENDER tag, which will allow them to be discovered by the wireless charger for range extension.

enderio-machines/src/main/java/com/enderio/machines/common/blocks/drain/DrainBlockEntity.java (2)

58-58: Consistent update to the ActionRange constructor

The DEFAULT_RANGE now properly includes the maxRange parameter (10), which aligns with the broader refactoring of range handling across machine block entities. This change correctly supports the new range extension system.

86-86: Good use of the new ActionRange.maxRange() method

The updated setActionRange method now correctly uses actionRange.maxRange() for clamping instead of a hard-coded value, making the range limits more flexible and consistent with the new implementation.

enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java (1)

47-51: Good utilisation of common widget factories

The screen appropriately uses the standardised EIOCommonWidgets.createRangeIncrease and createRangeDecrease methods, which improves consistency across the GUI system. This is a good approach for maintaining visual coherence.

enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java (1)

85-93: Good addition of animation control methods

The addition of shouldCauseReequipAnimation and shouldCauseBlockBreakReset methods improves the user experience by preventing unnecessary animations when only the item's NBT data changes (like energy level), while still correctly handling actual item changes or slot changes.

enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (1)

70-97: 🛠️ Refactor suggestion

Improve charging algorithm efficiency and error handling

The current implementation has several concerns:

  1. Early return from nested loops can lead to uneven distribution of energy
  2. No null check before accessing the energy capability

Consider refactoring to improve efficiency and robustness.

 public void chargeItem() {
-    if (level == null || bounds == null) {
+    if (level == null) {
         return;
     }
     PoweredMachineEnergyStorage energyStorage = getEnergyStorage();
     if (energyStorage.getEnergyStored() <= 0) {
         return;
     }
     int toDistribute = Math.min(energyStorage.getEnergyStored(), getMaxEnergyUse());

     List<Player> players = level.getEntitiesOfClass(Player.class, bounds);
     for (Player player : players) {
         Inventory inventory = player.getInventory();
         for (int i = 0; i < inventory.getContainerSize(); i++) {
             ItemStack stack = inventory.getItem(i);
-            @Nullable
-            IEnergyStorage cap = stack.getCapability(Capabilities.EnergyStorage.ITEM);
-            if (cap != null && cap.canReceive()) {
-                int received = cap.receiveEnergy(toDistribute, false);
-                energyStorage.consumeEnergy(received);
-                toDistribute -= received;
-                if (toDistribute <= 0) {
-                    return;
+            if (!stack.isEmpty()) {
+                @Nullable IEnergyStorage cap = stack.getCapability(Capabilities.EnergyStorage.ITEM);
+                if (cap != null && cap.canReceive()) {
+                    int received = cap.receiveEnergy(toDistribute, false);
+                    if (received > 0) {
+                        energyStorage.consumeEnergy(received);
+                        toDistribute -= received;
+                        if (toDistribute <= 0) {
+                            break; // Break just this inner loop, not the entire method
+                        }
+                    }
                 }
             }
         }
+        if (toDistribute <= 0) {
+            break; // Break the outer loop if we've distributed all available energy
+        }
     }
 }

Likely an incorrect or invalid review comment.

**Actionable comments posted: 4** <details> <summary>🧹 Nitpick comments (4)</summary><blockquote> <details> <summary>enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_antenna_advanced.json (1)</summary><blockquote> `1-81`: **Advanced antenna model maintains consistency with base antenna.** The advanced antenna model appropriately uses the same structure as the basic antenna, with the main difference being the use of vibrant_alloy_block texture instead of pulsating_alloy_block, indicating a higher tier upgrade. I do notice one minor point: both antenna models use identical element naming, with three elements all named "ring". Consider using more specific names like "upper_ring", "middle_ring", and "lower_ring" for better clarity if the model needs future modifications. </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java (2)</summary><blockquote> `45-45`: **Consider using dedicated button IDs instead of shared constants** The screen is currently using button IDs from AversionObeliskMenu (VISIBILITY_BUTTON_ID). It would be better for maintainability to define these constants in the WirelessChargerMenu class instead to avoid potentially confusing dependencies between unrelated components. --- `66-69`: **Consider extracting range value rendering to a helper method** The calculation of the position for the range value text is quite verbose. Consider extracting this to a helper method for improved readability. ```diff - guiGraphics.drawString(font, getMenu().getBlockEntity().getRange() + "", - leftPos + imageWidth - 8 - 16 - font.width(getMenu().getBlockEntity().getRange() + "") - 10, - topPos + rangeOffset + 5, 0, false); + drawRangeValue(guiGraphics, getMenu().getBlockEntity().getRange(), rangeOffset); + // Add this helper method to the class + private void drawRangeValue(GuiGraphics guiGraphics, int range, int rangeOffset) { + String rangeText = String.valueOf(range); + int textWidth = font.width(rangeText); + int x = leftPos + imageWidth - 8 - 16 - textWidth - 10; + guiGraphics.drawString(font, rangeText, x, topPos + rangeOffset + 5, 0, false); + } ``` </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (1)</summary><blockquote> `211-218`: **Consider adding state change event notification** When changing the action range and updating the bounds, consider notifying relevant systems of this state change to ensure proper updates throughout the game. Ensure the state update is propagated consistently by adding an event or notification system for range changes, which could be useful for other components that might depend on this information. </blockquote></details> </blockquote></details> <details> <summary>📜 Review details</summary> **Configuration used: CodeRabbit UI** **Review profile: CHILL** **Plan: Pro** <details> <summary>📥 Commits</summary> Reviewing files that changed from the base of the PR and between 397c648f55d0b2e936bf3caff92acace6743dc05 and a53359613efffca3f1d2abadc10196f9397b7934. </details> <details> <summary>⛔ Files ignored due to path filters (26)</summary> * `enderio-base/src/generated/resources/assets/enderio/lang/en_us.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/blockstates/wireless_charger.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/blockstates/wireless_charger_antenna.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/blockstates/wireless_charger_antenna_advanced.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/lang/en_us.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/models/block/wireless_charger_active_combined.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/models/block/wireless_charger_combined.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/models/item/wireless_charger.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/models/item/wireless_charger_antenna.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/models/item/wireless_charger_antenna_advanced.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/wireless_charger.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/wireless_charger_antenna.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/wireless_charger_antenna_advanced.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/data_maps/block/range_extender.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/loot_table/blocks/wireless_charger.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/loot_table/blocks/wireless_charger_antenna.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/loot_table/blocks/wireless_charger_antenna_advanced.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/recipe/wireless_charger.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/recipe/wireless_charger_antenna.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/recipe/wireless_charger_antenna_advanced.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/tags/block/range_extender.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json` is excluded by `!**/generated/**` * `enderio-machines/src/main/resources/assets/enderio/textures/block/wireless_charger_front.png` is excluded by `!**/*.png` * `enderio-machines/src/main/resources/assets/enderio/textures/block/wireless_charger_front_active.png` is excluded by `!**/*.png` * `enderio-machines/src/main/resources/assets/enderio/textures/gui/screen/wireless_charger.png` is excluded by `!**/*.png` </details> <details> <summary>📒 Files selected for processing (45)</summary> * `enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java` (1 hunks) * `enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java` (4 hunks) * `enderio-base/src/main/java/com/enderio/base/common/item/tool/LevitationStaffItem.java` (4 hunks) * `enderio-base/src/main/java/com/enderio/base/common/item/tool/TravelStaffItem.java` (6 hunks) * `enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java` (6 hunks) * `enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/AversionObeliskScreen.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/DrainScreen.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/InhibitorObeliskScreen.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/RelocatorObeliskScreen.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/VacuumChestScreen.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/XPVacuumScreen.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/ObeliskBER.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/attachment/ActionRange.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/attachment/RangedActor.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/drain/DrainBlockEntity.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/ObeliskBlockEntity.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/aversion/AversionObeliskBlockEntity.java` (0 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/inhibitor/InhibitorObeliskBlockEntity.java` (0 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/relocator/RelocatorObeliskBlockEntity.java` (0 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/vacuum/VacuumMachineBlockEntity.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessAntennaBlock.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/package-info.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/config/MachinesConfigLang.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/config/client/MachinesClientBlocksConfig.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/config/common/EnergyConfig.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/config/common/MachinesCommonConfig.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/datamap/RangeExtender.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/init/MachineAttachments.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java` (7 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/init/MachineDataMaps.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/init/MachineMenus.java` (3 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java` (2 hunks) * `enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger.json` (1 hunks) * `enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_active.json` (1 hunks) * `enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_antenna.json` (1 hunks) * `enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_antenna_advanced.json` (1 hunks) * `enderio/build.gradle.kts` (2 hunks) * `gradle.properties` (1 hunks) </details> <details> <summary>💤 Files with no reviewable changes (3)</summary> * enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/aversion/AversionObeliskBlockEntity.java * enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/relocator/RelocatorObeliskBlockEntity.java * enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/inhibitor/InhibitorObeliskBlockEntity.java </details> <details> <summary>🧰 Additional context used</summary> <details> <summary>🧬 Code Graph Analysis (11)</summary> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java (2)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (1)</summary> * `WirelessChargerBlockEntity` (44-230) </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java (1)</summary> * `MachineBlocks` (69-398) </details> </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/AversionObeliskScreen.java (1)</summary><blockquote> <details> <summary>enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java (1)</summary> * `EIOCommonWidgets` (13-40) </details> </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineMenus.java (2)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java (1)</summary> * `WirelessChargerScreen` (17-84) </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java (1)</summary> * `WirelessChargerMenu` (10-58) </details> </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/InhibitorObeliskScreen.java (1)</summary><blockquote> <details> <summary>enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java (1)</summary> * `EIOCommonWidgets` (13-40) </details> </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineDataMaps.java (1)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/datamap/RangeExtender.java (1)</summary> * `RangeExtender` (14-22) </details> </blockquote></details> <details> <summary>enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java (1)</summary><blockquote> <details> <summary>enderio-base/src/main/java/com/enderio/base/api/EnderIO.java (1)</summary> * `EnderIO` (5-11) </details> </blockquote></details> <details> <summary>enderio-base/src/main/java/com/enderio/base/common/item/tool/TravelStaffItem.java (1)</summary><blockquote> <details> <summary>enderio-base/src/main/java/com/enderio/base/common/init/EIODataComponents.java (1)</summary> * `EIODataComponents` (21-75) </details> </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java (1)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java (1)</summary> * `RangeExtenderDataProvider` (16-37) </details> </blockquote></details> <details> <summary>enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java (1)</summary><blockquote> <details> <summary>enderio-base/src/main/java/com/enderio/base/api/EnderIO.java (1)</summary> * `EnderIO` (5-11) </details> </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java (1)</summary><blockquote> <details> <summary>enderio-base/src/main/java/com/enderio/base/api/EnderIO.java (1)</summary> * `EnderIO` (5-11) </details> </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/datamap/RangeExtender.java (1)</summary><blockquote> <details> <summary>enderio-base/src/main/java/com/enderio/base/api/EnderIO.java (1)</summary> * `EnderIO` (5-11) </details> </blockquote></details> </details> </details> <details> <summary>🔇 Additional comments (66)</summary><blockquote> <details> <summary>gradle.properties (1)</summary> `31-31`: <details> <summary>✅ Verification successful</summary> **Library dependency updated to Stitch** The dependency has been changed from Athena CTM to Stitch 4.0.1. This change aligns with the corresponding update in enderio/build.gradle.kts. --- 🏁 Script executed: ```shell #!/bin/bash # Verify if Stitch is a valid Modrinth dependency and check its compatibility with Minecraft 1.21.1 echo "Checking Stitch dependency validity on Modrinth..." curl -s "https://api.modrinth.com/v2/project/stitch" | jq '.id, .title, .description, .versions[0]' # Check the game versions supported by the latest Stitch version curl -s "https://api.modrinth.com/v2/version/XgZZ2JbG" | jq '.game_versions' ``` Length of output: 416 --- 🏁 Script executed: ```shell #!/bin/bash # Fetch Stitch version ID for version 4.0.1 and print its supported game versions VERSION_ID=$(curl -s "https://api.modrinth.com/v2/project/stitch/versions" | jq -r '.[] | select(.version_number=="4.0.1") | .id') echo "Stitch 4.0.1 version ID: $VERSION_ID" curl -s "https://api.modrinth.com/v2/version/$VERSION_ID" | jq '.game_versions' ``` Length of output: 340 --- 🏁 Script executed: ```shell #!/bin/bash # Correctly fetch the list of versions for the Stitch project and check supported game versions for 4.0.1 # Retrieve all version metadata for the Stitch project VERSIONS_JSON=$(curl -s "https://api.modrinth.com/v2/project/stitch/version") # Extract the version ID for version 4.0.1 VERSION_ID=$(echo "$VERSIONS_JSON" | jq -r '.[] | select(.version_number=="4.0.1") | .id') echo "Stitch 4.0.1 version ID: $VERSION_ID" # Fetch and print the supported game versions for that release curl -s "https://api.modrinth.com/v2/version/$VERSION_ID" | jq '.game_versions' ``` Length of output: 61927 --- </details> **Confirm Stitch 4.0.1 supports Minecraft 1.21.1** The update from Athena (Athena 4.0.1) to Stitch 4.0.1 in `gradle.properties` is valid: - Modrinth project “Stitch (formerly Athena)” version 4.0.1 is published under both Fabric (ID 7G1e11iK) and NeoForge (ID zzovqkDA) builds - Both builds declare support for game versions `1.21` and `1.21.1` This aligns with the corresponding update in `enderio/build.gradle.kts`. The change can be approved as-is. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/ObeliskBER.java (1)</summary> `42-42`: **Fixed Enderman head orientation in obelisks** The rotation adjustment of 180 degrees ensures the Enderman head now faces the correct direction in obelisk renderings, as mentioned in the PR objectives. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/ObeliskBlockEntity.java (2)</summary> `31-33`: **Import organization improved** The imports have been reordered for better readability, placing annotations and core Java imports first. --- `40-40`: **Added maxRange parameter to ActionRange constructor** The DEFAULT_RANGE constant now includes a maxRange parameter (32), which aligns with the broader refactoring of range handling across machines and obelisks mentioned in the PR objectives. </details> <details> <summary>enderio/build.gradle.kts (2)</summary> `23-23`: **Renamed property to match new dependency** The property has been renamed from athenaVersion to stitchVersion to reflect the library change. --- `54-54`: <details> <summary>✅ Verification successful</summary> **Updated runtime dependency to Stitch** The runtime dependency has been changed from "athena-ctm" to "stitch", matching the property rename in gradle.properties. --- 🌐 Web query: ```web Is "stitch" the successor to "athena-ctm" for Minecraft 1.21? ``` 💡 Result: Yes, "Stitch" is the successor to "athena-ctm" (commonly known as Athena) for Minecraft 1.21 and newer versions. The mod has undergone a rebranding: it is now named "Stitch," whereas it was previously called "Athena" or referred to as "athena-ctm"[1][2][7][8]. Several sources confirm this transition. For example, both CurseForge and Modrinth list the project as "Stitch (formerly Athena)," highlighting the direct lineage between the two names[1][2][7]. The mod continues to fulfill the same purpose—providing a cross-platform, high-performance solution for connected textures across major mod loaders like Forge, Fabric, and NeoForge[1][2][3][6][9]. For Minecraft 1.21, you will find Stitch downloads and documentation where you previously would have found Athena. This means that Stitch is the active, maintained, and official replacement for "athena-ctm" starting with the 1.21 update and beyond[1][2][7][8]. Citations: - 1: https://www.curseforge.com/minecraft/mc-mods/stitch - 2: https://modrinth.com/mod/stitch/versions - 3: https://www.9minecraft.net/athena-mod/ - 4: https://tlauncher.org/en/mods-1214_175/athena-1-21-4_26775.html - 5: https://modrinth.com/resourcepack/mt-ct-d/version/V2 - 6: https://modrinth.com/mod/athena-ctm/version/1.0.0 - 7: https://www.modpackindex.com/mod/43599/athena - 8: https://modrinth.com/mod/stitch/gallery - 9: https://www.curseforge.com/minecraft/mc-mods/athena/files --- </details> **Runtime dependency correctly updated to Stitch** Verified that Stitch (formerly Athena/athena-ctm) is the official successor for Minecraft 1.21 and newer. The change in `enderio/build.gradle.kts` at line 54 aligns with the renamed Gradle property. • File: enderio/build.gradle.kts (line 54) ```kotlin runtimeOnly("maven.modrinth:stitch:${stitchVersion}") ``` </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/DrainScreen.java (1)</summary> `45-48`: **Refactored range buttons using common widgets** The direct instantiation of range increase/decrease buttons has been replaced with calls to common widget factory methods from EIOCommonWidgets. This improves code maintainability by consolidating duplicate range GUI code across the application, as mentioned in the PR objectives. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/XPVacuumScreen.java (1)</summary> `42-45`: **Good refactoring to use common widget factory methods.** Using the centralised factory methods from `EIOCommonWidgets` for range control buttons improves code maintainability and consistency across GUI screens. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/VacuumChestScreen.java (1)</summary> `40-43`: **Good refactoring to use common widget factory methods.** Using the centralised factory methods from `EIOCommonWidgets` for range control buttons improves code maintainability and consistency across different machine GUIs. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/config/common/MachinesCommonConfig.java (2)</summary> `15-15`: **New configuration property for wireless charger range added.** The new config value aligns with the PR objectives of adding wireless charger functionality. --- `43-45`: **Well-structured configuration category for the wireless charger.** The new configuration category follows the established pattern in the file with proper builder push/pop and a descriptive comment. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java (2)</summary> `24-24`: **New import for the RangeExtenderDataProvider.** This import supports the addition of wireless charger functionality with range extension capabilities. --- `119-119`: **Added RangeExtenderDataProvider to the data generation pipeline.** The data provider is properly registered with the same conditional inclusion pattern as other providers, ensuring range extender data is generated for server use. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/AversionObeliskScreen.java (1)</summary> `43-46`: **Good refactoring to use common widget factory methods.** Using the centralised factory methods from `EIOCommonWidgets` for range control buttons improves code maintainability and consistency across different GUI screens. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineMenus.java (3)</summary> `26-26`: **Imported WirelessChargerScreen class** The import for the new wireless charger screen class looks correct and follows the same import pattern as other machine screens. --- `52-52`: **Imported WirelessChargerMenu class** The import for the wireless charger menu class follows the established pattern in the codebase. --- `94-95`: **Added menu registration for wireless charger** The registration of the wireless charger menu follows the same pattern as other machine menu registrations, using consistent naming conventions and parameter ordering. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/attachment/RangedActor.java (2)</summary> `8-10`: **Added default implementation for getMaxRange** This change properly adds a default implementation that delegates to the ActionRange record's maxRange value, which supports the per-instance dynamic maximum ranges for the wireless charger feature. --- `37-37`: **Improved range comparison logic** The condition has been updated to compare the current range directly with the maxRange from the same ActionRange object, making the comparison more direct and consistent with the new default implementation of getMaxRange(). </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/RelocatorObeliskScreen.java (1)</summary> `43-46`: **Consolidated range adjustment buttons using common widget methods** The implementation now uses the common factory methods from EIOCommonWidgets for creating range adjustment buttons, which helps standardize UI controls across all machine screens that implement range functionality. This reduces code duplication and ensures a consistent look and feel. </details> <details> <summary>enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger.json (1)</summary> `1-12`: **New model file for wireless charger block** The model definition follows Minecraft's standard block model conventions and reuses existing EnderIO machine textures where appropriate, while defining a custom front texture for the wireless charger. The particle texture is correctly set to the front texture, which is standard practice for visible block faces. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java (2)</summary> `44-44`: **Good addition of the necessary import.** The import for `WirelessChargerBlockEntity` is correctly added to support the new wireless charger functionality. --- `137-139`: **LGTM: Correctly registers the wireless charger block entity.** The wireless charger block entity registration follows the same pattern as other powered machines, particularly similar to the wired charger registration above it. The `poweredMachineBlockEntityCapabilities` application ensures it has the necessary energy storage and item handling capabilities. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/package-info.java (1)</summary> `1-4`: **Standard null-safety annotations applied correctly.** These annotations properly establish non-null defaults for parameters and return values throughout the package, which is a good practice for ensuring null-safety. </details> <details> <summary>enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_active.json (1)</summary> `1-12`: **Model JSON follows standard conventions and is well structured.** The wireless charger active model correctly inherits from the standard cube block model and properly defines textures for all faces. The use of the active texture for the front face will provide visual feedback when the machine is operating. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/vacuum/VacuumMachineBlockEntity.java (2)</summary> `27-33`: **Import statements reorganised correctly.** The import statements have been moved to a more logical location at the end of the import block, which improves code organisation without changing functionality. --- `43-43`: **Good refactoring of range management.** The DEFAULT_RANGE has been updated to include the max range parameter (6) which previously was defined in a separate getMaxRange() method. This consolidation is part of the broader refactoring of range management into a common widget as mentioned in the PR objectives. </details> <details> <summary>enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java (2)</summary> `215-215`: **Added new translation key for Maximum Range.** This new translation key adds support for the wireless charger and range extender features, providing localized text for displaying maximum range values in GUIs. --- `37-38`: **Formatting improvements for better readability.** These formatting changes improve code readability and maintain consistent style throughout the file. Also applies to: 42-43, 48-49, 64-64, 263-264, 289-292, 316-316, 319-319 </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/InhibitorObeliskScreen.java (1)</summary> `43-46`: **Improved code reuse with widget factory methods.** Good refactoring to use the common widget factory methods instead of direct button creation. This improves maintainability and consistency across different machine GUIs. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/attachment/ActionRange.java (5)</summary> `18-18`: **Added maxRange field to ActionRange record.** The record now includes a maxRange field to support dynamic maximum range values for machines like the wireless charger. --- `20-23`: **Updated CODEC to include maxRange field.** The Codec correctly includes the new maxRange field for serialization and deserialization. --- `25-26`: **Updated STREAM_CODEC to include maxRange field.** The StreamCodec correctly includes the new maxRange field for network transmission. --- `31-33`: **Updated factory methods to preserve maxRange.** All methods creating new ActionRange instances now correctly preserve the maxRange value. Also applies to: 35-37, 39-41, 43-45, 47-49 --- `51-53`: **Added setMaxRange method.** The new setMaxRange method allows for updating the maxRange value while preserving other fields, which is essential for the wireless charger's range extension functionality. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineDataMaps.java (2)</summary> `4-4`: **Added import for RangeExtender.** Added the necessary import for the new RangeExtender class. --- `15-15`: **Registered RangeExtender data map.** This registration enables the range extender functionality, allowing blocks like antennas to extend the range of wireless chargers. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/config/MachinesConfigLang.java (2)</summary> `63-70`: **Good addition of Wireless Charger configuration translations.** The new translation keys for the Wireless Charger feature are well-structured and follow the established pattern in the file. The translations are descriptive and clear for users. --- `90-91`: **Improved code formatting for readability.** Breaking the parameters across multiple lines improves readability of the code. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessAntennaBlock.java (1)</summary> `12-12`: **Custom shape implementation looks good.** The custom VoxelShape creates a proper hitbox for the antenna, making it match its visual appearance rather than being a full block. </details> <details> <summary>enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java (2)</summary> `17-20`: **Good centralisation of button resources.** The addition of these resource locations and widget sprites centralises the UI element definitions, which supports the DRY principle and improves consistency across the UI. --- `33-39`: **Excellent addition of factory methods for range buttons.** These factory methods help standardise the creation of range adjustment buttons across different GUIs, reducing code duplication and ensuring consistent appearance. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineAttachments.java (1)</summary> `28-28`: **Good update to ActionRange constructor with maxRange parameter.** The addition of the maxRange parameter to the ActionRange constructor aligns with the refactoring to support per-instance maximum ranges, which is needed for the wireless charger feature. </details> <details> <summary>enderio-machines/src/main/resources/assets/enderio/models/block/wireless_charger_antenna.json (1)</summary> `1-81`: **The model looks well-structured.** The wireless charger antenna model is properly defined with appropriate elements for the base, stem, and rings. The texture references and UV mappings are correctly specified. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/tag/MachineTags.java (3)</summary> `7-7`: **LGTM! Import added for Block class.** The import is correctly added to support the new blocks tag implementation. --- `13-13`: **LGTM! Register method updated.** The register method properly calls the new Blocks.init() method. --- `27-37`: **LGTM! Well-structured tag implementation.** The Blocks class implementation follows the same pattern as the existing EntityTypes class, maintaining consistent code style. The RANGE_EXTENDER tag is properly created using the EnderIO namespace. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/config/common/EnergyConfig.java (2)</summary> `40-42`: **New configuration fields added for wireless charger.** The configuration fields for the wireless charger capacity, usage, and upkeep are properly defined. --- `166-173`: **LGTM! Wireless charger configuration section.** The wireless charger configuration section follows the same structure as other machine configurations with appropriate comments and reasonable default values: - 128,000 uI capacity matches the wired charger - 60 uI/t charge rate matches the wired charger - 2 uI/t upkeep cost is reasonable for a passive wireless device This ensures consistency in the energy system balancing. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/datamap/RangeExtender.java (1)</summary> `14-22`: **Well-structured data map implementation for range extension functionality.** This is a good implementation of a data map for tracking range extension values. The code effectively uses NeoForged's data map API to create a mapping between block tags and integer values that represent range extension amounts. The structure allows for flexible configuration of range extenders through data generation rather than hardcoded values, which is a maintainable approach. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java (2)</summary> `16-25`: **Data provider implementation looks good.** The provider correctly implements the data generation pattern with a clean API for adding entries. The `computeIfAbsent` approach in the `addData` method efficiently handles the nested map structure. --- `27-36`: **Range values for antennas look appropriate.** The implementation correctly associates the wireless charger antennas with their respective range extension values (16 and 32), which seems appropriate for a basic and advanced version. The data is properly added to the RangeExtender data map. </details> <details> <summary>enderio-base/src/main/java/com/enderio/base/common/item/tool/LevitationStaffItem.java (2)</summary> `85-93`: **Good addition of animation and block break reset methods.** These overrides improve the user experience by preventing unnecessary re-equip animations and block break resets when switching between items of the same type. This makes the item behaviour more polished. --- `22-24`: **Improved formatting for better readability.** The reformatting of the FLUID_HANDLER_PROVIDER definition improves code readability without changing functionality. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java (1)</summary> `1-58`: **Well-structured menu implementation for the new wireless charger feature.** The menu class follows the established pattern for machine menus in this codebase with clear button handling for range control and visibility toggle. The implementation is clean and appropriately leverages the base class functionality. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java (3)</summary> `230-239`: **Good recipe implementation for the wireless charger.** The recipe follows the same pattern as other machine recipes while requiring appropriate ingredients including copper alloy ingots, void chassis, and ender resonator for the wireless functionality. --- `241-250`: **Clear recipe definition for the wireless charger antenna.** The recipe appropriately uses pulsating alloy for the antenna element along with copper alloy and ender resonator, which aligns with the expected functionality of the component. --- `252-261`: **Well-defined recipe for the advanced wireless charger antenna.** The upgrade path from basic to advanced antenna is logical, replacing pulsating alloy with vibrant alloy and using sentient ender instead of the basic ender resonator for improved range capabilities. </details> <details> <summary>enderio-base/src/main/java/com/enderio/base/common/item/tool/TravelStaffItem.java (1)</summary> `171-179`: **Good addition of animation control methods to improve player experience.** These methods prevent unnecessary re-equip animations and block break resets when the item doesn't actually change. This provides a smoother experience when item data changes but the item itself remains the same. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java (2)</summary> `143-151`: **Appropriate block registrations for the new wireless charger system.** The registrations for the wireless charger and its two antenna variants follow the established pattern for machine blocks in this class. The wireless charger is correctly registered as a progress machine, which aligns with its expected functionality. --- `379-392`: **Good implementation of a helper method for wireless antenna blocks.** The `wirelessAntenna` method efficiently centralizes the common properties for antenna blocks, including strength, occlusion settings, loot table, block tags, and UI elements. The method appropriately adds the antennas to the `RANGE_EXTENDER` tag, which will allow them to be discovered by the wireless charger for range extension. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/drain/DrainBlockEntity.java (2)</summary> `58-58`: **Consistent update to the ActionRange constructor** The DEFAULT_RANGE now properly includes the maxRange parameter (10), which aligns with the broader refactoring of range handling across machine block entities. This change correctly supports the new range extension system. --- `86-86`: **Good use of the new ActionRange.maxRange() method** The updated setActionRange method now correctly uses actionRange.maxRange() for clamping instead of a hard-coded value, making the range limits more flexible and consistent with the new implementation. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java (1)</summary> `47-51`: **Good utilisation of common widget factories** The screen appropriately uses the standardised EIOCommonWidgets.createRangeIncrease and createRangeDecrease methods, which improves consistency across the GUI system. This is a good approach for maintaining visual coherence. </details> <details> <summary>enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java (1)</summary> `85-93`: **Good addition of animation control methods** The addition of shouldCauseReequipAnimation and shouldCauseBlockBreakReset methods improves the user experience by preventing unnecessary animations when only the item's NBT data changes (like energy level), while still correctly handling actual item changes or slot changes. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (1)</summary> `70-97`: _🛠️ Refactor suggestion_ **Improve charging algorithm efficiency and error handling** The current implementation has several concerns: 1. Early return from nested loops can lead to uneven distribution of energy 2. No null check before accessing the energy capability Consider refactoring to improve efficiency and robustness. ```diff public void chargeItem() { - if (level == null || bounds == null) { + if (level == null) { return; } PoweredMachineEnergyStorage energyStorage = getEnergyStorage(); if (energyStorage.getEnergyStored() <= 0) { return; } int toDistribute = Math.min(energyStorage.getEnergyStored(), getMaxEnergyUse()); List<Player> players = level.getEntitiesOfClass(Player.class, bounds); for (Player player : players) { Inventory inventory = player.getInventory(); for (int i = 0; i < inventory.getContainerSize(); i++) { ItemStack stack = inventory.getItem(i); - @Nullable - IEnergyStorage cap = stack.getCapability(Capabilities.EnergyStorage.ITEM); - if (cap != null && cap.canReceive()) { - int received = cap.receiveEnergy(toDistribute, false); - energyStorage.consumeEnergy(received); - toDistribute -= received; - if (toDistribute <= 0) { - return; + if (!stack.isEmpty()) { + @Nullable IEnergyStorage cap = stack.getCapability(Capabilities.EnergyStorage.ITEM); + if (cap != null && cap.canReceive()) { + int received = cap.receiveEnergy(toDistribute, false); + if (received > 0) { + energyStorage.consumeEnergy(received); + toDistribute -= received; + if (toDistribute <= 0) { + break; // Break just this inner loop, not the entire method + } + } } } } + if (toDistribute <= 0) { + break; // Break the outer loop if we've distributed all available energy + } } } ``` > Likely an incorrect or invalid review comment. </details> </blockquote></details> </details> <!-- This is an auto-generated comment by CodeRabbit for review status -->
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessAntennaBlock.java
@ -0,0 +18,4 @@
@Override
protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) {
return SHAPE;
}
coderabbitai[bot] (Migrated from github.com) commented 2025-05-01 09:36:20 +00:00
Copy link

⚠️ Potential issue

Incorrect method override needs fixing.

The method being overridden should be getOutlineShape, not getShape. The getShape method doesn't exist in the Block class.

Apply this diff to fix the method override:

-    @Override
-    protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) {
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) {
         return SHAPE;
     }

You should also consider overriding getCollisionShape to match the outline shape:

@Override
public VoxelShape getCollisionShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) {
    return SHAPE;
}
_⚠️ Potential issue_ **Incorrect method override needs fixing.** The method being overridden should be `getOutlineShape`, not `getShape`. The `getShape` method doesn't exist in the Block class. Apply this diff to fix the method override: ```diff - @Override - protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { + @Override + public VoxelShape getOutlineShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { return SHAPE; } ``` You should also consider overriding `getCollisionShape` to match the outline shape: ```java @Override public VoxelShape getCollisionShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { return SHAPE; } ``` <!-- This is an auto-generated comment by CodeRabbit -->
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java
@ -0,0 +1,238 @@
package com.enderio.machines.common.blocks.wireless_charger;
coderabbitai[bot] (Migrated from github.com) commented 2025-05-01 09:36:21 +00:00
Copy link

🛠️ Refactor suggestion

Initialise the bounds in the constructor

The bounds field is marked @Nullable but should be initialised in the constructor rather than being checked for null later, to ensure it's always available after object creation.

 private @Nullable AABB bounds;

 public WirelessChargerBlockEntity(BlockPos worldPosition, BlockState blockState) {
     super(MachineBlockEntities.WIRELESS_CHARGER.get(), worldPosition, blockState, true, CapacitorSupport.REQUIRED,
             EnergyIOMode.Input, CAPACITY, USAGE);
     actionRange = new ActionRange(MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get(), false, MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get());
     energyUpkeep = MachinesConfig.COMMON.ENERGY.WIRELESS_CHARGER_UPKEEP;
+    updateBounds();
 }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

    private @Nullable AABB bounds;

    public WirelessChargerBlockEntity(BlockPos worldPosition, BlockState blockState) {
        super(MachineBlockEntities.WIRELESS_CHARGER.get(), worldPosition, blockState, true,
              CapacitorSupport.REQUIRED, EnergyIOMode.Input, CAPACITY, USAGE);
        actionRange = new ActionRange(
            MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get(),
            false,
            MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get()
        );
        energyUpkeep = MachinesConfig.COMMON.ENERGY.WIRELESS_CHARGER_UPKEEP;
+       updateBounds();
    }
_🛠️ Refactor suggestion_ **Initialise the bounds in the constructor** The bounds field is marked @Nullable but should be initialised in the constructor rather than being checked for null later, to ensure it's always available after object creation. ```diff private @Nullable AABB bounds; public WirelessChargerBlockEntity(BlockPos worldPosition, BlockState blockState) { super(MachineBlockEntities.WIRELESS_CHARGER.get(), worldPosition, blockState, true, CapacitorSupport.REQUIRED, EnergyIOMode.Input, CAPACITY, USAGE); actionRange = new ActionRange(MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get(), false, MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get()); energyUpkeep = MachinesConfig.COMMON.ENERGY.WIRELESS_CHARGER_UPKEEP; + updateBounds(); } ``` <!-- suggestion_start --> <details> <summary>📝 Committable suggestion</summary> > ‼️ **IMPORTANT** > Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements. `````suggestion private @Nullable AABB bounds; public WirelessChargerBlockEntity(BlockPos worldPosition, BlockState blockState) { super(MachineBlockEntities.WIRELESS_CHARGER.get(), worldPosition, blockState, true, CapacitorSupport.REQUIRED, EnergyIOMode.Input, CAPACITY, USAGE); actionRange = new ActionRange( MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get(), false, MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get() ); energyUpkeep = MachinesConfig.COMMON.ENERGY.WIRELESS_CHARGER_UPKEEP; + updateBounds(); } ````` </details> <!-- suggestion_end --> <!-- This is an auto-generated comment by CodeRabbit -->
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java
@ -0,0 +207,4 @@
}
}
return rangeExtension;
}
coderabbitai[bot] (Migrated from github.com) commented 2025-05-01 09:36:21 +00:00
Copy link

🛠️ Refactor suggestion

Add error handling for RangeExtender data retrieval

The data map retrieval doesn't have proper error handling if the getBlockHolder or getData operations fail. Consider adding more robust error handling.

 private int getRangeExtension() {
     int rangeExtension = 0;
     if (level != null) {
         BlockState bs = level.getBlockState(getBlockPos().above());
         if (bs.is(MachineTags.Blocks.RANGE_EXTENDER)) {
-            Map<TagKey<Block>, Integer> map = bs.getBlockHolder().getData(RangeExtender.DATA_MAP);
-            if (map != null) {
-                rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0);
+            try {
+                var holder = bs.getBlockHolder();
+                if (holder != null) {
+                    Map<TagKey<Block>, Integer> map = holder.getData(RangeExtender.DATA_MAP);
+                    if (map != null) {
+                        rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0);
+                    }
+                }
+            } catch (Exception e) {
+                // Log error or handle exception
+                rangeExtension = 0;
             }
         }
     }
     return rangeExtension;
 }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

private int getRangeExtension() {
    int rangeExtension = 0;
    if (level != null) {
        BlockState bs = level.getBlockState(getBlockPos().above());
        if (bs.is(MachineTags.Blocks.RANGE_EXTENDER)) {
            try {
                var holder = bs.getBlockHolder();
                if (holder != null) {
                    Map<TagKey<Block>, Integer> map = holder.getData(RangeExtender.DATA_MAP);
                    if (map != null) {
                        rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0);
                    }
                }
            } catch (Exception e) {
                // Log error or handle exception
                rangeExtension = 0;
            }
        }
    }
    return rangeExtension;
}
_🛠️ Refactor suggestion_ **Add error handling for RangeExtender data retrieval** The data map retrieval doesn't have proper error handling if the getBlockHolder or getData operations fail. Consider adding more robust error handling. ```diff private int getRangeExtension() { int rangeExtension = 0; if (level != null) { BlockState bs = level.getBlockState(getBlockPos().above()); if (bs.is(MachineTags.Blocks.RANGE_EXTENDER)) { - Map<TagKey<Block>, Integer> map = bs.getBlockHolder().getData(RangeExtender.DATA_MAP); - if (map != null) { - rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0); + try { + var holder = bs.getBlockHolder(); + if (holder != null) { + Map<TagKey<Block>, Integer> map = holder.getData(RangeExtender.DATA_MAP); + if (map != null) { + rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0); + } + } + } catch (Exception e) { + // Log error or handle exception + rangeExtension = 0; } } } return rangeExtension; } ``` <!-- suggestion_start --> <details> <summary>📝 Committable suggestion</summary> > ‼️ **IMPORTANT** > Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements. `````suggestion private int getRangeExtension() { int rangeExtension = 0; if (level != null) { BlockState bs = level.getBlockState(getBlockPos().above()); if (bs.is(MachineTags.Blocks.RANGE_EXTENDER)) { try { var holder = bs.getBlockHolder(); if (holder != null) { Map<TagKey<Block>, Integer> map = holder.getData(RangeExtender.DATA_MAP); if (map != null) { rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0); } } } catch (Exception e) { // Log error or handle exception rangeExtension = 0; } } } return rangeExtension; } ````` </details> <!-- suggestion_end --> <!-- This is an auto-generated comment by CodeRabbit -->
enderio-machines/src/main/java/com/enderio/machines/common/config/client/MachinesClientBlocksConfig.java
@ -11,17 +11,26 @@ public class MachinesClientBlocksConfig {
public final ModConfigSpec.ConfigValue<String> INHIBITOR_RANGE_COLOR;
coderabbitai[bot] (Migrated from github.com) commented 2025-05-01 09:36:21 +00:00
Copy link

⚠️ Potential issue

Config key for wireless charger range color is duplicated.

There's a bug in the configuration key for the wireless charger range color. It's using "aversionRangeColor" which is the same key already used for the Aversion Obelisk range color on line 31. This will cause both config options to use the same underlying value.

Modify the config key to be unique:

 WIRELESS_CHARGER_RANGE_COLOR = builder.comment("The color of the range box of the Wireless Charger")
-        .define("aversionRangeColor", "C7CC2A");
+        .define("wirelessChargerRangeColor", "C7CC2A");
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

        WIRELESS_CHARGER_RANGE_COLOR = builder.comment("The color of the range box of the Wireless Charger")
                .define("wirelessChargerRangeColor", "C7CC2A");

✅ Addressed in commits 720109b to 1549f4d

_⚠️ Potential issue_ **Config key for wireless charger range color is duplicated.** There's a bug in the configuration key for the wireless charger range color. It's using "aversionRangeColor" which is the same key already used for the Aversion Obelisk range color on line 31. This will cause both config options to use the same underlying value. Modify the config key to be unique: ```diff WIRELESS_CHARGER_RANGE_COLOR = builder.comment("The color of the range box of the Wireless Charger") - .define("aversionRangeColor", "C7CC2A"); + .define("wirelessChargerRangeColor", "C7CC2A"); ``` <!-- suggestion_start --> <details> <summary>📝 Committable suggestion</summary> > ‼️ **IMPORTANT** > Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements. `````suggestion WIRELESS_CHARGER_RANGE_COLOR = builder.comment("The color of the range box of the Wireless Charger") .define("wirelessChargerRangeColor", "C7CC2A"); ````` </details> <!-- suggestion_end --> <!-- This is an auto-generated comment by CodeRabbit --> ✅ Addressed in commits 720109b to 1549f4d
ferriarnus (Migrated from github.com) reviewed 2025-05-01 09:55:39 +00:00
coderabbitai[bot] (Migrated from github.com) reviewed 2025-05-01 10:25:25 +00:00
coderabbitai[bot] (Migrated from github.com) left a comment
Copy link

Actionable comments posted: 0

♻️ Duplicate comments (2)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (2)

56-63: Initialise the bounds in the constructor

The bounds field is marked @Nullable but should be initialised in the constructor rather than only in onLoad(), to ensure it's always available after object creation.

Apply this change:

 public WirelessChargerBlockEntity(BlockPos worldPosition, BlockState blockState) {
     super(MachineBlockEntities.WIRELESS_CHARGER.get(), worldPosition, blockState, true, CapacitorSupport.REQUIRED,
             EnergyIOMode.Input, CAPACITY, USAGE);
     actionRange = new ActionRange(MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get(), false, MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get());
     energyUpkeep = MachinesConfig.COMMON.ENERGY.WIRELESS_CHARGER_UPKEEP;
+    updateBounds();
 }

190-202: Add error handling for RangeExtender data retrieval

The data map retrieval doesn't have proper error handling if the getBlockHolder or getData operations fail. Consider adding more robust error handling.

 private int getRangeExtension() {
     int rangeExtension = 0;
     if (level != null) {
         BlockState bs = level.getBlockState(getBlockPos().above());
         if (bs.is(MachineTags.Blocks.RANGE_EXTENDER)) {
-            Map<TagKey<Block>, Integer> map = bs.getBlockHolder().getData(RangeExtender.DATA_MAP);
-            if (map != null) {
-                rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0);
+            try {
+                var holder = bs.getBlockHolder();
+                if (holder != null) {
+                    Map<TagKey<Block>, Integer> map = holder.getData(RangeExtender.DATA_MAP);
+                    if (map != null) {
+                        rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0);
+                    }
+                }
+            } catch (Exception e) {
+                // Log error or handle exception
+                rangeExtension = 0;
             }
         }
     }
     return rangeExtension;
 }
🧹 Nitpick comments (5)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (5)

70-97: Optimize chargeItem() to reduce unnecessary iterations

The current implementation continues iterating through a player's inventory even if there's no energy left to distribute. Adding a check at the start of each player's inventory processing could improve performance.

 public void chargeItem() {
     if (level == null || bounds == null) {
         return;
     }
     PoweredMachineEnergyStorage energyStorage = getEnergyStorage();
     if (energyStorage.getEnergyStored() <= 0) {
         return;
     }
     int toDistribute = Math.min(energyStorage.getEnergyStored(), getMaxEnergyUse());

     List<Player> players = level.getEntitiesOfClass(Player.class, bounds);
     for (Player player : players) {
+        if (toDistribute <= 0) {
+            return;
+        }
         Inventory inventory = player.getInventory();
         for (int i = 0; i < inventory.getContainerSize(); i++) {
             ItemStack stack = inventory.getItem(i);
             @Nullable
             IEnergyStorage cap = stack.getCapability(Capabilities.EnergyStorage.ITEM);
             if (cap != null && cap.canReceive()) {
                 int received = cap.receiveEnergy(toDistribute, false);
                 energyStorage.consumeEnergy(received);
                 toDistribute -= received;
                 if (toDistribute <= 0) {
                     return;
                 }
             }
         }
     }
 }

38-38: Use the standard Nullable annotation

The current implementation uses Jetbrains annotations for @Nullable instead of the standard one used elsewhere in the codebase.

As noted in previous discussions, we should use the Jetbrains annotations consistently, so this import is correct. Please ensure that all team members are aware of this standard.

186-188: Consider adding null check in updateBounds method

The updateBounds method creates a new bounding box but doesn't check if getRange() could return null or if the block position is valid.

 private void updateBounds() {
-    bounds = new AABB(getBlockPos()).inflate(getRange());
+    if (level != null) {
+        bounds = new AABB(getBlockPos()).inflate(getRange());
+    }
 }

129-137: Consider simplifying the onLoad logic

The onLoad method has a complex conditional that could be simplified.

 @Override
 public void onLoad() {
     super.onLoad();
-    if (level != null && !level.isClientSide() && actionRange.range() > calculateMaxRange()) {
-        int maxRange = calculateMaxRange();
-        setActionRange(new ActionRange(maxRange, actionRange.isVisible(), maxRange));
+    if (level != null && !level.isClientSide()) {
+        int maxRange = calculateMaxRange();
+        if (actionRange.range() > maxRange) {
+            setActionRange(new ActionRange(maxRange, actionRange.isVisible(), maxRange));
+        }
     }
     updateBounds();
 }

80-96: Consider adding a particle effect when items are charged

Adding a visual indicator when an item is charged would improve user feedback.

Adding a particle effect at the player's position when their items are charged would make it more obvious that the wireless charger is working. Consider adding something like:

 for (Player player : players) {
     Inventory inventory = player.getInventory();
+    boolean charged = false;
     for (int i = 0; i < inventory.getContainerSize(); i++) {
         ItemStack stack = inventory.getItem(i);
         @Nullable
         IEnergyStorage cap = stack.getCapability(Capabilities.EnergyStorage.ITEM);
         if (cap != null && cap.canReceive()) {
             int received = cap.receiveEnergy(toDistribute, false);
             energyStorage.consumeEnergy(received);
             toDistribute -= received;
+            if (received > 0) {
+                charged = true;
+            }
             if (toDistribute <= 0) {
+                if (charged && level.isClientSide()) {
+                    level.addParticle(ParticleTypes.ELECTRIC_SPARK, 
+                        player.getX(), player.getY() + 1.0, player.getZ(), 
+                        0, 0, 0);
+                }
                 return;
             }
         }
     }
+    if (charged && level.isClientSide()) {
+        level.addParticle(ParticleTypes.ELECTRIC_SPARK, 
+            player.getX(), player.getY() + 1.0, player.getZ(), 
+            0, 0, 0);
+    }
 }
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 1549f4d3a55797102c57d9fab92228854293d04c and 63bb7da210b330017ee4d0f8a54f3812e7f4b684.

📒 Files selected for processing (1)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: verify
**Actionable comments posted: 0** <details> <summary>♻️ Duplicate comments (2)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (2)</summary><blockquote> `56-63`: **Initialise the bounds in the constructor** The bounds field is marked @Nullable but should be initialised in the constructor rather than only in onLoad(), to ensure it's always available after object creation. Apply this change: ```diff public WirelessChargerBlockEntity(BlockPos worldPosition, BlockState blockState) { super(MachineBlockEntities.WIRELESS_CHARGER.get(), worldPosition, blockState, true, CapacitorSupport.REQUIRED, EnergyIOMode.Input, CAPACITY, USAGE); actionRange = new ActionRange(MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get(), false, MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get()); energyUpkeep = MachinesConfig.COMMON.ENERGY.WIRELESS_CHARGER_UPKEEP; + updateBounds(); } ``` --- `190-202`: **Add error handling for RangeExtender data retrieval** The data map retrieval doesn't have proper error handling if the getBlockHolder or getData operations fail. Consider adding more robust error handling. ```diff private int getRangeExtension() { int rangeExtension = 0; if (level != null) { BlockState bs = level.getBlockState(getBlockPos().above()); if (bs.is(MachineTags.Blocks.RANGE_EXTENDER)) { - Map<TagKey<Block>, Integer> map = bs.getBlockHolder().getData(RangeExtender.DATA_MAP); - if (map != null) { - rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0); + try { + var holder = bs.getBlockHolder(); + if (holder != null) { + Map<TagKey<Block>, Integer> map = holder.getData(RangeExtender.DATA_MAP); + if (map != null) { + rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0); + } + } + } catch (Exception e) { + // Log error or handle exception + rangeExtension = 0; } } } return rangeExtension; } ``` </blockquote></details> </blockquote></details> <details> <summary>🧹 Nitpick comments (5)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (5)</summary><blockquote> `70-97`: **Optimize chargeItem() to reduce unnecessary iterations** The current implementation continues iterating through a player's inventory even if there's no energy left to distribute. Adding a check at the start of each player's inventory processing could improve performance. ```diff public void chargeItem() { if (level == null || bounds == null) { return; } PoweredMachineEnergyStorage energyStorage = getEnergyStorage(); if (energyStorage.getEnergyStored() <= 0) { return; } int toDistribute = Math.min(energyStorage.getEnergyStored(), getMaxEnergyUse()); List<Player> players = level.getEntitiesOfClass(Player.class, bounds); for (Player player : players) { + if (toDistribute <= 0) { + return; + } Inventory inventory = player.getInventory(); for (int i = 0; i < inventory.getContainerSize(); i++) { ItemStack stack = inventory.getItem(i); @Nullable IEnergyStorage cap = stack.getCapability(Capabilities.EnergyStorage.ITEM); if (cap != null && cap.canReceive()) { int received = cap.receiveEnergy(toDistribute, false); energyStorage.consumeEnergy(received); toDistribute -= received; if (toDistribute <= 0) { return; } } } } } ``` --- `38-38`: **Use the standard Nullable annotation** The current implementation uses Jetbrains annotations for @Nullable instead of the standard one used elsewhere in the codebase. As noted in previous discussions, we should use the Jetbrains annotations consistently, so this import is correct. Please ensure that all team members are aware of this standard. --- `186-188`: **Consider adding null check in updateBounds method** The updateBounds method creates a new bounding box but doesn't check if getRange() could return null or if the block position is valid. ```diff private void updateBounds() { - bounds = new AABB(getBlockPos()).inflate(getRange()); + if (level != null) { + bounds = new AABB(getBlockPos()).inflate(getRange()); + } } ``` --- `129-137`: **Consider simplifying the onLoad logic** The onLoad method has a complex conditional that could be simplified. ```diff @Override public void onLoad() { super.onLoad(); - if (level != null && !level.isClientSide() && actionRange.range() > calculateMaxRange()) { - int maxRange = calculateMaxRange(); - setActionRange(new ActionRange(maxRange, actionRange.isVisible(), maxRange)); + if (level != null && !level.isClientSide()) { + int maxRange = calculateMaxRange(); + if (actionRange.range() > maxRange) { + setActionRange(new ActionRange(maxRange, actionRange.isVisible(), maxRange)); + } } updateBounds(); } ``` --- `80-96`: **Consider adding a particle effect when items are charged** Adding a visual indicator when an item is charged would improve user feedback. Adding a particle effect at the player's position when their items are charged would make it more obvious that the wireless charger is working. Consider adding something like: ```diff for (Player player : players) { Inventory inventory = player.getInventory(); + boolean charged = false; for (int i = 0; i < inventory.getContainerSize(); i++) { ItemStack stack = inventory.getItem(i); @Nullable IEnergyStorage cap = stack.getCapability(Capabilities.EnergyStorage.ITEM); if (cap != null && cap.canReceive()) { int received = cap.receiveEnergy(toDistribute, false); energyStorage.consumeEnergy(received); toDistribute -= received; + if (received > 0) { + charged = true; + } if (toDistribute <= 0) { + if (charged && level.isClientSide()) { + level.addParticle(ParticleTypes.ELECTRIC_SPARK, + player.getX(), player.getY() + 1.0, player.getZ(), + 0, 0, 0); + } return; } } } + if (charged && level.isClientSide()) { + level.addParticle(ParticleTypes.ELECTRIC_SPARK, + player.getX(), player.getY() + 1.0, player.getZ(), + 0, 0, 0); + } } ``` </blockquote></details> </blockquote></details> <details> <summary>📜 Review details</summary> **Configuration used: CodeRabbit UI** **Review profile: CHILL** **Plan: Pro** <details> <summary>📥 Commits</summary> Reviewing files that changed from the base of the PR and between 1549f4d3a55797102c57d9fab92228854293d04c and 63bb7da210b330017ee4d0f8a54f3812e7f4b684. </details> <details> <summary>📒 Files selected for processing (1)</summary> * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java` (1 hunks) </details> <details> <summary>⏰ Context from checks skipped due to timeout of 90000ms (1)</summary> * GitHub Check: verify </details> </details> <!-- This is an auto-generated comment by CodeRabbit for review status -->
Rover656 commented 2025-05-02 00:04:01 +00:00 (Migrated from github.com)
Copy link

Apologies, if you can resolve the conflicts that'd be great - changed to target the 8.0 branch.
Cheers

Apologies, if you can resolve the conflicts that'd be great - changed to target the 8.0 branch. Cheers
coderabbitai[bot] (Migrated from github.com) reviewed 2025-05-06 18:24:05 +00:00
coderabbitai[bot] (Migrated from github.com) left a comment
Copy link

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 63bb7da210b330017ee4d0f8a54f3812e7f4b684 and 0ded80fd68.

⛔ Files ignored due to path filters (15)
  • enderio-base/src/generated/resources/assets/enderio/lang/en_us.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/blockstates/wireless_charger.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/blockstates/wireless_charger_antenna.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/blockstates/wireless_charger_antenna_advanced.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/lang/en_us.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/models/block/wireless_charger_active_combined.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/models/block/wireless_charger_combined.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/models/item/wireless_charger.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/models/item/wireless_charger_antenna.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/assets/enderio/models/item/wireless_charger_antenna_advanced.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/erase_wireless_charger.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/wireless_charger.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/wireless_charger_antenna.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/wireless_charger_antenna_advanced.json is excluded by !**/generated/**
  • enderio-machines/src/generated/resources/data/enderio/data_maps/block/range_extender.json is excluded by !**/generated/**
📒 Files selected for processing (13)
  • docs/README.md (1 hunks)
  • endercore/src/main/java/com/enderio/core/client/gui/widgets/BaseEnumPickerWidget.java (2 hunks)
  • endercore/src/main/resources/META-INF/neoforge.mods.toml (1 hunks)
  • enderio-armory/src/main/resources/META-INF/neoforge.mods.toml (1 hunks)
  • enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java (1 hunks)
  • enderio-base/src/main/java/com/enderio/base/client/paint/model/PaintedBlockModel.java (14 hunks)
  • enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java (4 hunks)
  • enderio-base/src/main/java/com/enderio/base/common/item/tool/LevitationStaffItem.java (4 hunks)
  • enderio-base/src/main/java/com/enderio/base/common/item/tool/TravelStaffItem.java (1 hunks)
  • enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java (1 hunks)
  • enderio-base/src/main/resources/META-INF/neoforge.mods.toml (1 hunks)
  • enderio-conduits-modded/src/main/resources/META-INF/neoforge.mods.toml (1 hunks)
  • enderio-conduits/src/main/resources/META-INF/neoforge.mods.toml (1 hunks)
✅ Files skipped from review due to trivial changes (8)
  • endercore/src/main/resources/META-INF/neoforge.mods.toml
  • enderio-base/src/main/resources/META-INF/neoforge.mods.toml
  • docs/README.md
  • enderio-conduits/src/main/resources/META-INF/neoforge.mods.toml
  • enderio-armory/src/main/resources/META-INF/neoforge.mods.toml
  • enderio-conduits-modded/src/main/resources/META-INF/neoforge.mods.toml
  • enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java
  • enderio-base/src/main/java/com/enderio/base/client/paint/model/PaintedBlockModel.java
🚧 Files skipped from review as they are similar to previous changes (4)
  • enderio-base/src/main/java/com/enderio/base/common/item/tool/TravelStaffItem.java
  • enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java
  • enderio-base/src/main/java/com/enderio/base/common/item/tool/LevitationStaffItem.java
  • enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: verify
🔇 Additional comments (3)
endercore/src/main/java/com/enderio/core/client/gui/widgets/BaseEnumPickerWidget.java (3)

136-136: Behaviour change in the onPress method

The change now always selects the next value before displaying the selection screen, whereas previously it appears to have only changed the selection when the widget was already expanded.

Please verify this is the intended behaviour. If users expect to see the current selection when opening the dropdown, this could be confusing.

141-152: Excellent addition of mouse wheel support

The addition of mouse wheel support improves the usability of the widget, allowing users to quickly navigate through options without opening the dropdown.

156-157: Good improvement in the selection logic

Using the new getValueIndex method instead of directly relying on ordinal() makes the code more robust, especially if the widget needs to work with a filtered or reordered subset of enum values.

However, this depends on the getValueIndex method correctly handling all cases, as noted in the earlier comment.

**Actionable comments posted: 1** <details> <summary>📜 Review details</summary> **Configuration used: CodeRabbit UI** **Review profile: CHILL** **Plan: Pro** <details> <summary>📥 Commits</summary> Reviewing files that changed from the base of the PR and between 63bb7da210b330017ee4d0f8a54f3812e7f4b684 and 0ded80fd6851b45789c6b789a5aa867d23f227c8. </details> <details> <summary>⛔ Files ignored due to path filters (15)</summary> * `enderio-base/src/generated/resources/assets/enderio/lang/en_us.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/blockstates/wireless_charger.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/blockstates/wireless_charger_antenna.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/blockstates/wireless_charger_antenna_advanced.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/lang/en_us.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/models/block/wireless_charger_active_combined.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/models/block/wireless_charger_combined.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/models/item/wireless_charger.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/models/item/wireless_charger_antenna.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/models/item/wireless_charger_antenna_advanced.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/erase_wireless_charger.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/wireless_charger.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/wireless_charger_antenna.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/wireless_charger_antenna_advanced.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/data_maps/block/range_extender.json` is excluded by `!**/generated/**` </details> <details> <summary>📒 Files selected for processing (13)</summary> * `docs/README.md` (1 hunks) * `endercore/src/main/java/com/enderio/core/client/gui/widgets/BaseEnumPickerWidget.java` (2 hunks) * `endercore/src/main/resources/META-INF/neoforge.mods.toml` (1 hunks) * `enderio-armory/src/main/resources/META-INF/neoforge.mods.toml` (1 hunks) * `enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java` (1 hunks) * `enderio-base/src/main/java/com/enderio/base/client/paint/model/PaintedBlockModel.java` (14 hunks) * `enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java` (4 hunks) * `enderio-base/src/main/java/com/enderio/base/common/item/tool/LevitationStaffItem.java` (4 hunks) * `enderio-base/src/main/java/com/enderio/base/common/item/tool/TravelStaffItem.java` (1 hunks) * `enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java` (1 hunks) * `enderio-base/src/main/resources/META-INF/neoforge.mods.toml` (1 hunks) * `enderio-conduits-modded/src/main/resources/META-INF/neoforge.mods.toml` (1 hunks) * `enderio-conduits/src/main/resources/META-INF/neoforge.mods.toml` (1 hunks) </details> <details> <summary>✅ Files skipped from review due to trivial changes (8)</summary> * endercore/src/main/resources/META-INF/neoforge.mods.toml * enderio-base/src/main/resources/META-INF/neoforge.mods.toml * docs/README.md * enderio-conduits/src/main/resources/META-INF/neoforge.mods.toml * enderio-armory/src/main/resources/META-INF/neoforge.mods.toml * enderio-conduits-modded/src/main/resources/META-INF/neoforge.mods.toml * enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java * enderio-base/src/main/java/com/enderio/base/client/paint/model/PaintedBlockModel.java </details> <details> <summary>🚧 Files skipped from review as they are similar to previous changes (4)</summary> * enderio-base/src/main/java/com/enderio/base/common/item/tool/TravelStaffItem.java * enderio-base/src/main/java/com/enderio/base/client/gui/widget/EIOCommonWidgets.java * enderio-base/src/main/java/com/enderio/base/common/item/tool/LevitationStaffItem.java * enderio-base/src/main/java/com/enderio/base/common/item/tool/ElectromagnetItem.java </details> <details> <summary>⏰ Context from checks skipped due to timeout of 90000ms (1)</summary> * GitHub Check: verify </details> <details> <summary>🔇 Additional comments (3)</summary><blockquote> <details> <summary>endercore/src/main/java/com/enderio/core/client/gui/widgets/BaseEnumPickerWidget.java (3)</summary> `136-136`: **Behaviour change in the `onPress` method** The change now always selects the next value before displaying the selection screen, whereas previously it appears to have only changed the selection when the widget was already expanded. Please verify this is the intended behaviour. If users expect to see the current selection when opening the dropdown, this could be confusing. --- `141-152`: **Excellent addition of mouse wheel support** The addition of mouse wheel support improves the usability of the widget, allowing users to quickly navigate through options without opening the dropdown. --- `156-157`: **Good improvement in the selection logic** Using the new `getValueIndex` method instead of directly relying on `ordinal()` makes the code more robust, especially if the widget needs to work with a filtered or reordered subset of enum values. However, this depends on the `getValueIndex` method correctly handling all cases, as noted in the earlier comment. </details> </blockquote></details> </details> <!-- This is an auto-generated comment by CodeRabbit for review status -->
endercore/src/main/java/com/enderio/core/client/gui/widgets/BaseEnumPickerWidget.java
coderabbitai[bot] (Migrated from github.com) commented 2025-05-06 18:24:04 +00:00
Copy link

🛠️ Refactor suggestion

Potential issue with the new getValueIndex method

While this method provides a nice abstraction for finding an enum's index, it has a potential issue: if the provided value is not found in the array returned by getValues(), the method will return an index equal to the array length, which could lead to an ArrayIndexOutOfBoundsException in the selectNext() method.

Consider adding a check to handle non-existent values:

public int getValueIndex(T value) {
    int i = 0;
    for (T t : getValues()) {
        if (t == value) {
            return i;
        }
        i++;
    }
-   return i;
+   return 0; // Return first index if value not found, or throw an exception
}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

    public int getValueIndex(T value) {
        int i = 0;
        for (T t : getValues()) {
            if (t == value) {
                return i;
            }
            i++;
        }
        return 0; // Return first index if value not found, or throw an exception
    }
_🛠️ Refactor suggestion_ **Potential issue with the new `getValueIndex` method** While this method provides a nice abstraction for finding an enum's index, it has a potential issue: if the provided value is not found in the array returned by `getValues()`, the method will return an index equal to the array length, which could lead to an `ArrayIndexOutOfBoundsException` in the `selectNext()` method. Consider adding a check to handle non-existent values: ```diff public int getValueIndex(T value) { int i = 0; for (T t : getValues()) { if (t == value) { return i; } i++; } - return i; + return 0; // Return first index if value not found, or throw an exception } ``` <!-- suggestion_start --> <details> <summary>📝 Committable suggestion</summary> > ‼️ **IMPORTANT** > Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements. `````suggestion public int getValueIndex(T value) { int i = 0; for (T t : getValues()) { if (t == value) { return i; } i++; } return 0; // Return first index if value not found, or throw an exception } ````` </details> <!-- suggestion_end --> <!-- This is an auto-generated comment by CodeRabbit -->
Rover656 (Migrated from github.com) requested changes 2025-05-06 18:38:14 +00:00
Rover656 (Migrated from github.com) left a comment
Copy link

Just a few changes please, mainly around ActionRange. Thanks!

Just a few changes please, mainly around ActionRange. Thanks!
enderio-machines/src/main/java/com/enderio/machines/common/attachment/ActionRange.java
Rover656 (Migrated from github.com) commented 2025-05-06 18:33:35 +00:00
Copy link

I don't think maxRange should be stored in the component if I'm honest.

I don't think maxRange should be stored in the component if I'm honest.
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java
@ -0,0 +1,238 @@
package com.enderio.machines.common.blocks.wireless_charger;
Rover656 (Migrated from github.com) commented 2025-05-06 18:35:37 +00:00
Copy link

Instead of storing maxRange in the ActionRange, just cache the max range whenever the neighbours change.

Instead of storing maxRange in the ActionRange, just cache the max range whenever the neighbours change.
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java
@ -0,0 +36,4 @@
addPlayerInventorySlots(8, 84);
}
public boolean isRangeVisible() {
Rover656 (Migrated from github.com) commented 2025-05-06 18:36:39 +00:00
Copy link

Either mark this as EnsureSide SERVER, or use a SyncSlot to sync the state as the block entity isn't available on the client.

Either mark this as EnsureSide SERVER, or use a SyncSlot to sync the state as the block entity isn't available on the client.
enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java
@ -0,0 +25,4 @@
@Override
protected void gather() {
addData(MachineTags.Blocks.RANGE_EXTENDER, MachineBlocks.WIRELESS_CHARGER_ANTENNA.get(), 16);
Rover656 (Migrated from github.com) commented 2025-05-06 18:37:48 +00:00
Copy link

Are these figures a bit large?

Are these figures a bit large?
Rover656 (Migrated from github.com) reviewed 2025-05-06 18:42:33 +00:00
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java
@ -0,0 +36,4 @@
addPlayerInventorySlots(8, 84);
}
public boolean isRangeVisible() {
Rover656 (Migrated from github.com) commented 2025-05-06 18:42:33 +00:00
Copy link

Okay I realise this isn't strictly true, not all machines fully use sync slots yet.
In this case though, I think sync slots are still what we should be doing.

Okay I realise this isn't strictly true, not all machines fully use sync slots yet. In this case though, I think sync slots are still what we should be doing.
ferriarnus (Migrated from github.com) reviewed 2025-05-06 19:38:32 +00:00
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java
@ -0,0 +36,4 @@
addPlayerInventorySlots(8, 84);
}
public boolean isRangeVisible() {
ferriarnus (Migrated from github.com) commented 2025-05-06 19:38:32 +00:00
Copy link

It is synced through ActionRange no?

It is synced through ActionRange no?
ferriarnus (Migrated from github.com) reviewed 2025-05-06 19:38:51 +00:00
enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java
@ -0,0 +25,4 @@
@Override
protected void gather() {
addData(MachineTags.Blocks.RANGE_EXTENDER, MachineBlocks.WIRELESS_CHARGER_ANTENNA.get(), 16);
ferriarnus (Migrated from github.com) commented 2025-05-06 19:38:50 +00:00
Copy link

in what way?

in what way?
Rover656 (Migrated from github.com) reviewed 2025-05-06 19:39:28 +00:00
enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java
@ -0,0 +25,4 @@
@Override
protected void gather() {
addData(MachineTags.Blocks.RANGE_EXTENDER, MachineBlocks.WIRELESS_CHARGER_ANTENNA.get(), 16);
Rover656 (Migrated from github.com) commented 2025-05-06 19:39:28 +00:00
Copy link

16 blocks per antenna would quickly outpace the size of many many chunks when surrounding the wireless charger, no? Unless it's just one antenna per machine in which case its okay.

16 blocks per antenna would quickly outpace the size of many many chunks when surrounding the wireless charger, no? Unless it's just one antenna per machine in which case its okay.
Rover656 (Migrated from github.com) reviewed 2025-05-06 19:39:47 +00:00
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java
@ -0,0 +36,4 @@
addPlayerInventorySlots(8, 84);
}
public boolean isRangeVisible() {
Rover656 (Migrated from github.com) commented 2025-05-06 19:39:47 +00:00
Copy link

Yeah ignore this one, I was being daft - apologies

Yeah ignore this one, I was being daft - apologies
ferriarnus (Migrated from github.com) reviewed 2025-05-06 19:41:14 +00:00
enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java
@ -0,0 +25,4 @@
@Override
protected void gather() {
addData(MachineTags.Blocks.RANGE_EXTENDER, MachineBlocks.WIRELESS_CHARGER_ANTENNA.get(), 16);
ferriarnus (Migrated from github.com) commented 2025-05-06 19:41:14 +00:00
Copy link

Yeah it's only 1, and only on top of the machine.

Yeah it's only 1, and only on top of the machine.
Rover656 (Migrated from github.com) reviewed 2025-05-06 19:47:45 +00:00
enderio-machines/src/main/java/com/enderio/machines/data/datamap/RangeExtenderDataProvider.java
@ -0,0 +25,4 @@
@Override
protected void gather() {
addData(MachineTags.Blocks.RANGE_EXTENDER, MachineBlocks.WIRELESS_CHARGER_ANTENNA.get(), 16);
Rover656 (Migrated from github.com) commented 2025-05-06 19:47:45 +00:00
Copy link

ah gotcha, thats fine then :)

ah gotcha, thats fine then :)
coderabbitai[bot] (Migrated from github.com) reviewed 2025-05-06 19:53:56 +00:00
coderabbitai[bot] (Migrated from github.com) left a comment
Copy link

Actionable comments posted: 0

♻️ Duplicate comments (2)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (2)

57-64: Initialise the bounds in the constructor

The bounds field is marked @Nullable but should be initialised in the constructor rather than being checked for null later, to ensure it's always available after object creation.

 private @Nullable AABB bounds;

 public WirelessChargerBlockEntity(BlockPos worldPosition, BlockState blockState) {
     super(MachineBlockEntities.WIRELESS_CHARGER.get(), worldPosition, blockState, true, CapacitorSupport.REQUIRED,
             EnergyIOMode.Input, CAPACITY, USAGE);
     actionRange = new ActionRange(MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get(), false);
     energyUpkeep = MachinesConfig.COMMON.ENERGY.WIRELESS_CHARGER_UPKEEP;
+    updateBounds();
 }

198-210: Add error handling for RangeExtender data retrieval

The data map retrieval doesn't have proper error handling if the getBlockHolder or getData operations fail. Consider adding more robust error handling.

 private int getRangeExtension() {
     int rangeExtension = 0;
     if (level != null) {
         BlockState bs = level.getBlockState(getBlockPos().above());
         if (bs.is(MachineTags.Blocks.RANGE_EXTENDER)) {
-            Map<TagKey<Block>, Integer> map = bs.getBlockHolder().getData(RangeExtender.DATA_MAP);
-            if (map != null) {
-                rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0);
+            try {
+                var holder = bs.getBlockHolder();
+                if (holder != null) {
+                    Map<TagKey<Block>, Integer> map = holder.getData(RangeExtender.DATA_MAP);
+                    if (map != null) {
+                        rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0);
+                    }
+                }
+            } catch (Exception e) {
+                // Log error or handle exception
+                rangeExtension = 0;
             }
         }
     }
     return rangeExtension;
 }
🧹 Nitpick comments (3)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (3)

121-128: Call super.clientTick() at the beginning of the method

It's a good practice to call the parent method first unless there's a specific reason to do otherwise. This ensures that the parent's setup code runs before any child-specific logic.

 @Override
 public void clientTick() {
+    super.clientTick();
     if (level instanceof ClientLevel clientLevel) {
         getActionRange().addClientParticle(clientLevel, getBlockPos(),
                 MachinesConfig.CLIENT.BLOCKS.WIRELESS_CHARGER_RANGE_COLOR.get());
     }
-    super.clientTick();
 }

182-187: Extract duplicate block update code

The code to send block updates is duplicated in both calculateMaxRange() and setActionRange() methods. Extract this to a helper method to reduce duplication and improve maintainability.

+private void sendBlockUpdate() {
+    if (level != null) {
+        level.sendBlockUpdated(getBlockPos(), getBlockState(), getBlockState(), Block.UPDATE_ALL);
+    }
+}

 private void calculateMaxRange() {
     this.maxRange = MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get() + getRangeExtension();
-    if (level != null) {
-        level.sendBlockUpdated(getBlockPos(), getBlockState(), getBlockState(), Block.UPDATE_ALL);
-    }
+    sendBlockUpdate();
 }

 @Override
 @UseOnly(LogicalSide.SERVER)
 public void setActionRange(ActionRange actionRange) {
     this.actionRange = actionRange.clamp(0, getMaxRange());
     updateBounds();
     setChanged();
-    if (level != null) {
-        level.sendBlockUpdated(getBlockPos(), getBlockState(), getBlockState(), Block.UPDATE_ALL);
-    }
+    sendBlockUpdate();
 }

Also applies to: 222-226

79-97: Optimise player inventory iteration

The current implementation iterates through all players and all their inventory slots, which could be inefficient with many players. Consider optimising by limiting energy distributed per player or implementing a batched processing approach.

 int toDistribute = Math.min(energyStorage.getEnergyStored(), getMaxEnergyUse());

 List<Player> players = level.getEntitiesOfClass(Player.class, bounds);
+// Distribute energy fairly among players
+int energyPerPlayer = players.isEmpty() ? 0 : toDistribute / players.size();
+if (energyPerPlayer > 0) {
     for (Player player : players) {
+        int playerEnergy = Math.min(energyPerPlayer, toDistribute);
         Inventory inventory = player.getInventory();
         for (int i = 0; i < inventory.getContainerSize(); i++) {
             ItemStack stack = inventory.getItem(i);
             @Nullable
             IEnergyStorage cap = stack.getCapability(Capabilities.EnergyStorage.ITEM);
             if (cap != null && cap.canReceive()) {
-                int received = cap.receiveEnergy(toDistribute, false);
+                int received = cap.receiveEnergy(playerEnergy, false);
                 energyStorage.consumeEnergy(received);
                 toDistribute -= received;
+                playerEnergy -= received;
                 if (toDistribute <= 0) {
                     return;
                 }
+                if (playerEnergy <= 0) {
+                    break;
+                }
             }
         }
     }
+}
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 069a6fd5fc and 493a911aaa.

📒 Files selected for processing (9)
  • enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/attachment/ActionRange.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/drain/DrainBlockEntity.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/farming_station/FarmingStationBlockEntity.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/ObeliskBlockEntity.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/vacuum/VacuumMachineBlockEntity.java (2 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java (1 hunks)
  • enderio-machines/src/main/java/com/enderio/machines/common/init/MachineAttachments.java (1 hunks)
✅ Files skipped from review due to trivial changes (3)
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/farming_station/FarmingStationBlockEntity.java
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/drain/DrainBlockEntity.java
  • enderio-machines/src/main/java/com/enderio/machines/common/attachment/ActionRange.java
🚧 Files skipped from review as they are similar to previous changes (5)
  • enderio-machines/src/main/java/com/enderio/machines/common/init/MachineAttachments.java
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/ObeliskBlockEntity.java
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/vacuum/VacuumMachineBlockEntity.java
  • enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java
  • enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: verify
**Actionable comments posted: 0** <details> <summary>♻️ Duplicate comments (2)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (2)</summary><blockquote> `57-64`: **Initialise the bounds in the constructor** The `bounds` field is marked `@Nullable` but should be initialised in the constructor rather than being checked for null later, to ensure it's always available after object creation. ```diff private @Nullable AABB bounds; public WirelessChargerBlockEntity(BlockPos worldPosition, BlockState blockState) { super(MachineBlockEntities.WIRELESS_CHARGER.get(), worldPosition, blockState, true, CapacitorSupport.REQUIRED, EnergyIOMode.Input, CAPACITY, USAGE); actionRange = new ActionRange(MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get(), false); energyUpkeep = MachinesConfig.COMMON.ENERGY.WIRELESS_CHARGER_UPKEEP; + updateBounds(); } ``` --- `198-210`: **Add error handling for RangeExtender data retrieval** The data map retrieval doesn't have proper error handling if the getBlockHolder or getData operations fail. Consider adding more robust error handling. ```diff private int getRangeExtension() { int rangeExtension = 0; if (level != null) { BlockState bs = level.getBlockState(getBlockPos().above()); if (bs.is(MachineTags.Blocks.RANGE_EXTENDER)) { - Map<TagKey<Block>, Integer> map = bs.getBlockHolder().getData(RangeExtender.DATA_MAP); - if (map != null) { - rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0); + try { + var holder = bs.getBlockHolder(); + if (holder != null) { + Map<TagKey<Block>, Integer> map = holder.getData(RangeExtender.DATA_MAP); + if (map != null) { + rangeExtension = map.getOrDefault(MachineTags.Blocks.RANGE_EXTENDER, 0); + } + } + } catch (Exception e) { + // Log error or handle exception + rangeExtension = 0; } } } return rangeExtension; } ``` </blockquote></details> </blockquote></details> <details> <summary>🧹 Nitpick comments (3)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java (3)</summary><blockquote> `121-128`: **Call super.clientTick() at the beginning of the method** It's a good practice to call the parent method first unless there's a specific reason to do otherwise. This ensures that the parent's setup code runs before any child-specific logic. ```diff @Override public void clientTick() { + super.clientTick(); if (level instanceof ClientLevel clientLevel) { getActionRange().addClientParticle(clientLevel, getBlockPos(), MachinesConfig.CLIENT.BLOCKS.WIRELESS_CHARGER_RANGE_COLOR.get()); } - super.clientTick(); } ``` --- `182-187`: **Extract duplicate block update code** The code to send block updates is duplicated in both `calculateMaxRange()` and `setActionRange()` methods. Extract this to a helper method to reduce duplication and improve maintainability. ```diff +private void sendBlockUpdate() { + if (level != null) { + level.sendBlockUpdated(getBlockPos(), getBlockState(), getBlockState(), Block.UPDATE_ALL); + } +} private void calculateMaxRange() { this.maxRange = MachinesConfig.COMMON.WIRELESS_CHARGER_RANGE.get() + getRangeExtension(); - if (level != null) { - level.sendBlockUpdated(getBlockPos(), getBlockState(), getBlockState(), Block.UPDATE_ALL); - } + sendBlockUpdate(); } @Override @UseOnly(LogicalSide.SERVER) public void setActionRange(ActionRange actionRange) { this.actionRange = actionRange.clamp(0, getMaxRange()); updateBounds(); setChanged(); - if (level != null) { - level.sendBlockUpdated(getBlockPos(), getBlockState(), getBlockState(), Block.UPDATE_ALL); - } + sendBlockUpdate(); } ``` Also applies to: 222-226 --- `79-97`: **Optimise player inventory iteration** The current implementation iterates through all players and all their inventory slots, which could be inefficient with many players. Consider optimising by limiting energy distributed per player or implementing a batched processing approach. ```diff int toDistribute = Math.min(energyStorage.getEnergyStored(), getMaxEnergyUse()); List<Player> players = level.getEntitiesOfClass(Player.class, bounds); +// Distribute energy fairly among players +int energyPerPlayer = players.isEmpty() ? 0 : toDistribute / players.size(); +if (energyPerPlayer > 0) { for (Player player : players) { + int playerEnergy = Math.min(energyPerPlayer, toDistribute); Inventory inventory = player.getInventory(); for (int i = 0; i < inventory.getContainerSize(); i++) { ItemStack stack = inventory.getItem(i); @Nullable IEnergyStorage cap = stack.getCapability(Capabilities.EnergyStorage.ITEM); if (cap != null && cap.canReceive()) { - int received = cap.receiveEnergy(toDistribute, false); + int received = cap.receiveEnergy(playerEnergy, false); energyStorage.consumeEnergy(received); toDistribute -= received; + playerEnergy -= received; if (toDistribute <= 0) { return; } + if (playerEnergy <= 0) { + break; + } } } } +} ``` </blockquote></details> </blockquote></details> <details> <summary>📜 Review details</summary> **Configuration used: CodeRabbit UI** **Review profile: CHILL** **Plan: Pro** <details> <summary>📥 Commits</summary> Reviewing files that changed from the base of the PR and between 069a6fd5fcb7ee43b8d10a56de884de48cc8e914 and 493a911aaaa8bf5b45a7217568a572e49990327c. </details> <details> <summary>📒 Files selected for processing (9)</summary> * `enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/attachment/ActionRange.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/drain/DrainBlockEntity.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/farming_station/FarmingStationBlockEntity.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/ObeliskBlockEntity.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/vacuum/VacuumMachineBlockEntity.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerBlockEntity.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/init/MachineAttachments.java` (1 hunks) </details> <details> <summary>✅ Files skipped from review due to trivial changes (3)</summary> * enderio-machines/src/main/java/com/enderio/machines/common/blocks/farming_station/FarmingStationBlockEntity.java * enderio-machines/src/main/java/com/enderio/machines/common/blocks/drain/DrainBlockEntity.java * enderio-machines/src/main/java/com/enderio/machines/common/attachment/ActionRange.java </details> <details> <summary>🚧 Files skipped from review as they are similar to previous changes (5)</summary> * enderio-machines/src/main/java/com/enderio/machines/common/init/MachineAttachments.java * enderio-machines/src/main/java/com/enderio/machines/common/blocks/obelisks/ObeliskBlockEntity.java * enderio-machines/src/main/java/com/enderio/machines/common/blocks/vacuum/VacuumMachineBlockEntity.java * enderio-machines/src/main/java/com/enderio/machines/common/blocks/wireless_charger/WirelessChargerMenu.java * enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/WirelessChargerScreen.java </details> <details> <summary>⏰ Context from checks skipped due to timeout of 90000ms (1)</summary> * GitHub Check: verify </details> </details> <!-- This is an auto-generated comment by CodeRabbit for review status -->
Rover656 (Migrated from github.com) approved these changes 2025-05-06 20:06:40 +00:00
Rover656 (Migrated from github.com) left a comment
Copy link

This looks good to me, thanks Ferri!

This looks good to me, thanks Ferri!
Sign in to join this conversation.
Reviewers
No reviewers
ferriarnus
Rover656
Labels
Clear labels   
Area-Assets

   
Area-Backend

Backend work not usually visible to players.

  
Area-Conduits

Everything involving conduits

  
Area-Datapacks

   
Area-Lang

   
Area-Mod Compat

   
Area-Parity

1.12.2 missing features

  
Area-Rendering

Rendering code, might be shaders specific or general.

  
Good first issue

   
MC-1.19.2

   
MC-1.20.1

   
MC-1.20.4

   
MC-1.20.6

   
MC-1.21

   
MC-1.21.1

   
Modtoberfest

   
P-0-High

High priority, crash/breaking.

  
P-1-Medium

Medium priority. Potentially deleting items or breaking functionality.

  
P-2-Low

Low priority. Not hurting anyone, just annoying.

  
Status-Awaiting Response

Waiting for OP to respond

  
Status-Behind-Flag

This change is available but is placed behind a feature flag.

  
Status-Blocked

Blocked by a specific issue or protocol.

  
Status-Cannot Reproduce

   
Status-Duplicate

This issue or pull request already exists

  
Status-Help Wanted

We need some help to try and track this thing down..

  
Status-Incomplete Report

   
Status-Invalid

This doesn't seem right

  
Status-Needs LTS Backport

Fixed in latest but requires LTS backport.

  
Status-Needs Updating

Needs updating to a newer Minecraft version.

  
Status-Stale

This may not be updated by the OP any further.

  
Status-To Implement

   
Status-Triage

A Triage Member should take a look at this

  
Status-Wontfix

This will not be worked on

  
Status-Wontmerge

This PR won't be merged, but is left now for reference of ongoing or future works.

  
Type-Backport

   
Type-Bug

There is a problem.

  
Type-Documentation

Improvements or additions to documentation

  
Type-Enhancement

New feature or enhancement to existing feature.

  
Type-Question

Further information is requested

  
Type-RFC

Request for comments.

  
Type-Suggestion
No labels
Area-Assets
Area-Backend
Area-Conduits
Area-Datapacks
Area-Lang
Area-Mod Compat
Area-Parity
Area-Rendering
Good first issue
MC-1.19.2
MC-1.20.1
MC-1.20.4
MC-1.20.6
MC-1.21
MC-1.21.1
Modtoberfest
P-0-High
P-1-Medium
P-2-Low
Status-Awaiting Response
Status-Behind-Flag
Status-Blocked
Status-Cannot Reproduce
Status-Duplicate
Status-Help Wanted
Status-Incomplete Report
Status-Invalid
Status-Needs LTS Backport
Status-Needs Updating
Status-Stale
Status-To Implement
Status-Triage
Status-Wontfix
Status-Wontmerge
Type-Backport
Type-Bug
Type-Documentation
Type-Enhancement
Type-Question
Type-RFC
Type-Suggestion
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Team-EnderIO/EnderIO#1017
No description provided.
Delete branch "AddWirelessCharger"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?