Add Niard (#148) #1096

2025-06-29T07:32:09Z

Trytoon commented

2025-06-29 07:32:09 +00:00

(Migrated from github.com)

Description

Added the Niard Block. This block places fluid around it in a given range when supplied with power and a fluid.

TODO

Finish rendering the fluid "shower" when active
Tank Renderer to see the fluid inside

Changes

I made some util classes to reuse some of the Fluid Tank logic for the Niard

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 Niard machine block, which automatically places fluids in the world within a configurable range.
- Added a dedicated Niard GUI featuring fluid tank display, energy, redstone control, activity indicator, and range adjustment buttons.
- Provided a crafting recipe for the Niard block.
- Implemented visual range indicators with configurable colour and a custom block model for the Niard.
- Added fluid rendering utilities and integrated them into machine block entity renderers for consistent fluid visuals.
Configuration
- Added client and server configuration options for Niard energy capacity, usage, and range colour.
Documentation
- Updated language and configuration files to include the Niard machine.
Chores
- Registered the Niard block, block entity, menu, and screen in the game’s block and menu registries.

# Description Added the Niard Block. This block places fluid around it in a given range when supplied with power and a fluid.  # TODO - [x] Finish rendering the fluid "shower" when active - [x] Tank Renderer to see the fluid inside # Changes I made some util classes to reuse some of the Fluid Tank logic for the Niard  # 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.   ## Summary by CodeRabbit ## Summary by CodeRabbit - **New Features** - Introduced the Niard machine block, which automatically places fluids in the world within a configurable range. - Added a dedicated Niard GUI featuring fluid tank display, energy, redstone control, activity indicator, and range adjustment buttons. - Provided a crafting recipe for the Niard block. - Implemented visual range indicators with configurable colour and a custom block model for the Niard. - Added fluid rendering utilities and integrated them into machine block entity renderers for consistent fluid visuals. - **Configuration** - Added client and server configuration options for Niard energy capacity, usage, and range colour. - **Documentation** - Updated language and configuration files to include the Niard machine. - **Chores** - Registered the Niard block, block entity, menu, and screen in the game’s block and menu registries.

coderabbitai[bot] commented

2025-06-29 07:32:42 +00:00

(Migrated from github.com)

Walkthrough

This update introduces a new machine called the "Niard" with full block, entity, menu, GUI, configuration, and recipe integration. It refactors internal fluid tank logic, adds range-based fluid placement mechanics, registers all necessary assets and configuration entries, and provides crafting and block model resources for the new machine.

Changes

File(s) / Path(s)	Change Summary
.../client/gui/screen/NiardScreen.java	Added new GUI screen for the Niard machine with widgets for fluid, energy, range, and redstone controls.
.../common/blocks/niard/NiardBlock.java .../niard/NiardBlockEntity.java .../niard/NiardMenu.java .../niard/NiardRangeIterator.java .../niard/package-info.java	Introduced the Niard machine block, its entity, menu, range iterator, and package annotations.
.../common/blocks/fluid_tank/FluidTankBlockEntity.java .../common/blocks/fluid_tank/InternalTankTasks.java	Refactored fluid tank logic: moved internal fill, drain, and mend tool logic to new utility class InternalTankTasks.
.../common/config/MachinesConfigLang.java	Added translation entry for "niard".
.../common/config/client/MachinesClientBlocksConfig.java	Added client config for Niard range colour.
.../common/config/common/EnergyConfig.java	Added config values for Niard energy capacity and usage.
.../common/init/MachineBlockEntities.java	Registered Niard block entity.
.../common/init/MachineBlocks.java	Registered Niard block.
.../common/init/MachineMenus.java	Registered Niard menu and associated screen.
.../data/recipes/MachineRecipeProvider.java	Added crafting recipe for Niard and included it in the machines list.
.../resources/assets/enderio/models/block/niard.json	Added block model resource for Niard.
.../client/rendering/blockentity/FluidTankBER.java .../client/rendering/item/FluidTankBEWLR.java .../core/client/FluidRendererUtil.java .../client/rendering/blockentity/NiardBER.java	Refactored fluid rendering: centralized fluid rendering logic in FluidRendererUtil; added Niard block entity renderer.

Sequence Diagram(s)

sequenceDiagram
    participant Player
    participant NiardBlock
    participant NiardBlockEntity
    participant World

    Player->>NiardBlock: useItemOn()
    NiardBlock->>NiardBlockEntity: handleFluidItemInteraction()
    alt Fluid interaction handled
        NiardBlockEntity-->>Player: Consume item, update inventory
    else Not handled
        NiardBlock->>NiardBlock: Fallback to superclass useItemOn()
    end

    loop Each server tick
        NiardBlockEntity->>NiardBlockEntity: fill tank from input items
        NiardBlockEntity->>NiardRangeIterator: Iterate positions in range
        alt Can place fluid
            NiardBlockEntity->>World: Place fluid block
            NiardBlockEntity->>NiardBlockEntity: Drain fluid, consume energy
        end
    end

Team-EnderIO/EnderIO#1017: Adds common widget factory methods for range increase/decrease buttons used in various GUIs, related to NiardScreen's range control buttons.

Suggested labels

Area-Backend, MC-1.21.1

Suggested reviewers

Rover656

Poem

In the land of Ender, a Niard appears,
With tanks and with range, it conquers all fears.
It places the fluids with energy spent,
Its GUI sparkles—on progress it's bent!
So hop with delight, for the code is now clear,
The Niard is ready—let’s give it a cheer!
🐇✨

✨ 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.
- Explain this complex logic.
- 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 explain this code block.
- @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 explain its main purpose.
- @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.

## Walkthrough This update introduces a new machine called the "Niard" with full block, entity, menu, GUI, configuration, and recipe integration. It refactors internal fluid tank logic, adds range-based fluid placement mechanics, registers all necessary assets and configuration entries, and provides crafting and block model resources for the new machine. ## Changes | File(s) / Path(s) | Change Summary | |-----------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------| | .../client/gui/screen/NiardScreen.java | Added new GUI screen for the Niard machine with widgets for fluid, energy, range, and redstone controls. | | .../common/blocks/niard/NiardBlock.java .../niard/NiardBlockEntity.java .../niard/NiardMenu.java .../niard/NiardRangeIterator.java .../niard/package-info.java | Introduced the Niard machine block, its entity, menu, range iterator, and package annotations. | | .../common/blocks/fluid_tank/FluidTankBlockEntity.java .../common/blocks/fluid_tank/InternalTankTasks.java | Refactored fluid tank logic: moved internal fill, drain, and mend tool logic to new utility class InternalTankTasks.| | .../common/config/MachinesConfigLang.java | Added translation entry for "niard". | | .../common/config/client/MachinesClientBlocksConfig.java | Added client config for Niard range colour. | | .../common/config/common/EnergyConfig.java | Added config values for Niard energy capacity and usage. | | .../common/init/MachineBlockEntities.java | Registered Niard block entity. | | .../common/init/MachineBlocks.java | Registered Niard block. | | .../common/init/MachineMenus.java | Registered Niard menu and associated screen. | | .../data/recipes/MachineRecipeProvider.java | Added crafting recipe for Niard and included it in the machines list. | | .../resources/assets/enderio/models/block/niard.json | Added block model resource for Niard. | | .../client/rendering/blockentity/FluidTankBER.java .../client/rendering/item/FluidTankBEWLR.java .../core/client/FluidRendererUtil.java .../client/rendering/blockentity/NiardBER.java | Refactored fluid rendering: centralized fluid rendering logic in FluidRendererUtil; added Niard block entity renderer.| ## Sequence Diagram(s) ```mermaid sequenceDiagram participant Player participant NiardBlock participant NiardBlockEntity participant World Player->>NiardBlock: useItemOn() NiardBlock->>NiardBlockEntity: handleFluidItemInteraction() alt Fluid interaction handled NiardBlockEntity-->>Player: Consume item, update inventory else Not handled NiardBlock->>NiardBlock: Fallback to superclass useItemOn() end loop Each server tick NiardBlockEntity->>NiardBlockEntity: fill tank from input items NiardBlockEntity->>NiardRangeIterator: Iterate positions in range alt Can place fluid NiardBlockEntity->>World: Place fluid block NiardBlockEntity->>NiardBlockEntity: Drain fluid, consume energy end end ``` ## Possibly related PRs - Team-EnderIO/EnderIO#1017: Adds common widget factory methods for range increase/decrease buttons used in various GUIs, related to NiardScreen's range control buttons. ## Suggested labels `Area-Backend`, `MC-1.21.1` ## Suggested reviewers - Rover656 ## Poem > In the land of Ender, a Niard appears, > With tanks and with range, it conquers all fears. > It places the fluids with energy spent, > Its GUI sparkles—on progress it's bent! > So hop with delight, for the code is now clear, > The Niard is ready—let’s give it a cheer! > 🐇✨      <details open="true"> <summary>✨ Finishing Touches</summary> - [ ]  📝 Generate Docstrings </details>   --- 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=1096): - Review comments: Directly reply to a review comment made by CodeRabbit. Example: - `I pushed a fix in commit <commit_id>, please review it.` - `Explain this complex logic.` - `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 explain this code block.` - `@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 explain its main purpose.` - `@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>

coderabbitai[bot] (Migrated from github.com) reviewed

2025-06-29 07:37:17 +00:00

coderabbitai[bot] (Migrated from github.com) left a comment

Actionable comments posted: 4

🧹 Nitpick comments (6)

enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/InternalTankTasks.java (1)
101-101: Remove the French comment.

The comment is not in English and is also incorrect as the method already exists.
                        fluidHandlerItem,
-                        blockEntity.getFluidHandler(), // méthode à définir dans ton interface
+                        blockEntity.getFluidHandler(),
                        tank.getFluidAmount(blockEntity),
enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardRangeIterator.java (1)
24-25: Fix formatting: Add missing spaces.

There are missing spaces after bc.getY() in the position calculations.

Apply this diff to fix the formatting:
-                positions.add(new BlockPos(bc.getX() + j, bc.getY()- 1, bc.getZ() + i));
-                positions.add(new BlockPos(bc.getX() - j, bc.getY()- 1, bc.getZ() - i));
+                positions.add(new BlockPos(bc.getX() + j, bc.getY() - 1, bc.getZ() + i));
+                positions.add(new BlockPos(bc.getX() - j, bc.getY() - 1, bc.getZ() - i));
enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardMenu.java (1)

51-68: Consider refactoring duplicated button handling logic.

The suppression comment indicates this button handling pattern is duplicated across multiple menu classes. Consider extracting this to a shared utility method or base class to improve maintainability.

Would you like me to help create a shared button handler utility that can be reused across different menu classes?
enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java (3)
44-46: Standardise on a single annotation library.

The code imports @Nullable from JetBrains annotations and @Nonnull from javax.annotation. Consider using annotations from a single library for consistency.
-import org.jetbrains.annotations.Nullable;
-
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
Or alternatively, use javax.annotation for both:
-import org.jetbrains.annotations.Nullable;
-
-import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
62-62: Fix formatting: remove extra space.
-    public static final  TankAccess TANK = new TankAccess();
+    public static final TankAccess TANK = new TankAccess();
220-220: Fix formatting: remove extra space.
-            || (fluidInTank == Fluids.LAVA && (fluidAtPos == Fluids.LAVA  || fluidAtPos == Fluids.FLOWING_LAVA))
+            || (fluidInTank == Fluids.LAVA && (fluidAtPos == Fluids.LAVA || fluidAtPos == Fluids.FLOWING_LAVA))

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 84bfe2477a and 467e4bd9f9.

⛔ Files ignored due to path filters (10)

enderio-machines/src/generated/resources/assets/enderio/blockstates/niard.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/niard_combined.json is excluded by !**/generated/**
enderio-machines/src/generated/resources/assets/enderio/models/item/niard.json is excluded by !**/generated/**
enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/erase_niard.json is excluded by !**/generated/**
enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/niard.json is excluded by !**/generated/**
enderio-machines/src/generated/resources/data/enderio/loot_table/blocks/niard.json is excluded by !**/generated/**
enderio-machines/src/generated/resources/data/enderio/recipe/erase_niard.json is excluded by !**/generated/**
enderio-machines/src/generated/resources/data/enderio/recipe/niard.json is excluded by !**/generated/**
enderio-machines/src/main/resources/assets/enderio/textures/block/niard_front.png is excluded by !**/*.png

📒 Files selected for processing (16)

enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/NiardScreen.java (1 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/FluidTankBlockEntity.java (2 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/InternalTankTasks.java (1 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlock.java (1 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java (1 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardMenu.java (1 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardRangeIterator.java (1 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/package-info.java (1 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/config/MachinesConfigLang.java (1 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/config/client/MachinesClientBlocksConfig.java (2 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/init/MachineBlockEntities.java (2 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.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/data/recipes/MachineRecipeProvider.java (2 hunks)
enderio-machines/src/main/resources/assets/enderio/models/block/niard.json (1 hunks)

🧰 Additional context used

🧬 Code Graph Analysis (5)

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

enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java (1)

NiardBlockEntity (49-299)

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

MachineBlocks (75-467)

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

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

NiardScreen (18-59)

enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardMenu.java (1)

NiardMenu (13-69)

enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/FluidTankBlockEntity.java (1)

enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/InternalTankTasks.java (1)

InternalTankTasks (21-149)

enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardMenu.java (5)

enderio-machines/src/main/java/com/enderio/machines/common/blocks/base/menu/MachineSlot.java (1)

MachineSlot (12-54)

enderio-machines/src/main/java/com/enderio/machines/common/blocks/base/menu/PoweredMachineMenu.java (1)

PoweredMachineMenu (15-58)

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

MachineBlockEntities (66-279)

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

MachineMenus (64-130)

enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java (1)

NiardBlockEntity (49-299)

enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlock.java (1)

enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java (1)

NiardBlockEntity (49-299)

⏰ Context from checks skipped due to timeout of 90000ms (2)

GitHub Check: Run Tests
GitHub Check: Analyze (java-kotlin)

🔇 Additional comments (23)

enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/FluidTankBlockEntity.java (3)

40-42: Standard imports look good.

217-219: Correct delegation to utility class.

The refactoring properly delegates the fluid filling logic to the centralised utility.

221-223: Correct delegation to utility class.

The refactoring properly delegates the fluid draining logic to the centralised utility.

enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/InternalTankTasks.java (2)

24-66: Well-structured fluid filling logic.

The method properly handles both bucket and fluid handler item interactions with appropriate simulation checks.

115-147: Correct implementation of tool mending logic.

The method properly handles experience fluid consumption and tool repair calculations.

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

47-47: LGTM: Translation entry properly added.

The translation entry follows the established pattern and is correctly positioned alphabetically between existing entries.

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

1-4: LGTM: Standard package-level nullability annotations.

The package-info file correctly applies nullability defaults, which is consistent with best practices used throughout the codebase.

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

15-15: LGTM: Import statements properly placed.

The import statements for NiardScreen and NiardMenu are correctly positioned alphabetically with existing imports.

Also applies to: 39-39

96-97: LGTM: Menu registration follows established pattern.

The NIARD menu registration correctly follows the same pattern as other machine menus, using appropriate constructor references and screen factory.

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

278-291: LGTM: Well-designed crafting recipe.

The Niard recipe uses appropriate materials that reflect its fluid placement functionality (bucket, fluid tank, piston) and follows the established pattern for machine recipes. The unlocking criterion using void chassis is consistent with other machines.

553-553: LGTM: Correctly added to MACHINES list.

The addition to the MACHINES list is necessary for the erase recipes functionality and is properly positioned.

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

1-12: LGTM: Standard machine block model.

The block model follows established conventions for machine blocks, with appropriate texture assignments including a unique front texture and standard machine textures for other faces. The particle texture is correctly set to the front face.

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

30-30: LGTM! Proper import addition.

The import for NiardBlock is correctly placed in alphabetical order within the niard package imports.

291-293: LGTM! Standard machine block registration.

The Niard block registration follows the established pattern using the baseMachine helper method with appropriate block properties, block entity reference, and translation. This is consistent with other machine registrations in the codebase.

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

28-28: LGTM! Proper import addition.

The import for NiardBlockEntity is correctly placed in alphabetical order within the niard package imports.

133-135: LGTM! Appropriate block entity registration.

The Niard block entity registration follows the established pattern and correctly applies both poweredMachineBlockEntityCapabilities and fluidHandlerCapability, which is appropriate for a machine that consumes energy and handles fluids.

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

48-49: LGTM! Standard energy configuration fields.

The field declarations for Niard energy capacity and usage follow the established naming convention and type structure.

197-202: LGTM! Appropriate energy configuration values.

The configuration setup follows the standard pattern with reasonable default values (64,000 capacity and 10 uI/t usage), proper validation ranges, and appropriate comments. The low energy usage is suitable for a fluid placement utility machine.

enderio-machines/src/main/java/com/enderio/machines/common/config/client/MachinesClientBlocksConfig.java (1)

11-11: LGTM! Proper field declaration.

The field declaration for Niard range color follows the established naming convention.

enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardRangeIterator.java (3)

9-11: LGTM! Appropriate class documentation.

The comment indicating this is adapted from older Ender IO versions provides useful context for the implementation approach.

12-15: LGTM! Clean class structure.

The class structure with a positions list and index for cyclic iteration is well-designed and straightforward.

30-44: LGTM! Complete and efficient iterator API.

The iterator methods provide a clean and efficient API for cyclic iteration over the generated positions. The moveToNextPosition() method correctly handles wrapping with the modulo operator.
enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlock.java (1)

30-32: Inventory update call is required after fluid interaction

The default handleFluidItemInteraction implementation does not mark the player’s inventory as dirty, so the explicit
player.getInventory().setChanged();
call is necessary to ensure the client is informed of item stack changes. You can safely keep it in NiardBlock.java at lines 30–32.

Likely an incorrect or invalid review comment.

**Actionable comments posted: 4** <details> <summary>🧹 Nitpick comments (6)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/InternalTankTasks.java (1)</summary><blockquote> `101-101`: **Remove the French comment.** The comment is not in English and is also incorrect as the method already exists. ```diff fluidHandlerItem, - blockEntity.getFluidHandler(), // méthode à définir dans ton interface + blockEntity.getFluidHandler(), tank.getFluidAmount(blockEntity), ``` </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardRangeIterator.java (1)</summary><blockquote> `24-25`: **Fix formatting: Add missing spaces.** There are missing spaces after `bc.getY()` in the position calculations. Apply this diff to fix the formatting: ```diff - positions.add(new BlockPos(bc.getX() + j, bc.getY()- 1, bc.getZ() + i)); - positions.add(new BlockPos(bc.getX() - j, bc.getY()- 1, bc.getZ() - i)); + positions.add(new BlockPos(bc.getX() + j, bc.getY() - 1, bc.getZ() + i)); + positions.add(new BlockPos(bc.getX() - j, bc.getY() - 1, bc.getZ() - i)); ``` </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardMenu.java (1)</summary><blockquote> `51-68`: **Consider refactoring duplicated button handling logic.** The suppression comment indicates this button handling pattern is duplicated across multiple menu classes. Consider extracting this to a shared utility method or base class to improve maintainability. Would you like me to help create a shared button handler utility that can be reused across different menu classes? </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java (3)</summary><blockquote> `44-46`: **Standardise on a single annotation library.** The code imports `@Nullable` from JetBrains annotations and `@Nonnull` from javax.annotation. Consider using annotations from a single library for consistency. ```diff -import org.jetbrains.annotations.Nullable; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.NotNull; ``` Or alternatively, use javax.annotation for both: ```diff -import org.jetbrains.annotations.Nullable; - -import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import javax.annotation.Nonnull; ``` --- `62-62`: **Fix formatting: remove extra space.** ```diff - public static final TankAccess TANK = new TankAccess(); + public static final TankAccess TANK = new TankAccess(); ``` --- `220-220`: **Fix formatting: remove extra space.** ```diff - || (fluidInTank == Fluids.LAVA && (fluidAtPos == Fluids.LAVA || fluidAtPos == Fluids.FLOWING_LAVA)) + || (fluidInTank == Fluids.LAVA && (fluidAtPos == Fluids.LAVA || fluidAtPos == Fluids.FLOWING_LAVA)) ``` </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 84bfe2477a65a3a08fddde900ab2367fde300798 and 467e4bd9f92758d48c0db89fc36a7e4a9f43502b. </details> <details> <summary>⛔ Files ignored due to path filters (10)</summary> * `enderio-machines/src/generated/resources/assets/enderio/blockstates/niard.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/niard_combined.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/assets/enderio/models/item/niard.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/erase_niard.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/advancement/recipes/misc/niard.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/loot_table/blocks/niard.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/recipe/erase_niard.json` is excluded by `!**/generated/**` * `enderio-machines/src/generated/resources/data/enderio/recipe/niard.json` is excluded by `!**/generated/**` * `enderio-machines/src/main/resources/assets/enderio/textures/block/niard_front.png` is excluded by `!**/*.png` </details> <details> <summary>📒 Files selected for processing (16)</summary> * `enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/NiardScreen.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/FluidTankBlockEntity.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/InternalTankTasks.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlock.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardMenu.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardRangeIterator.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/package-info.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/config/MachinesConfigLang.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/config/client/MachinesClientBlocksConfig.java` (2 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/init/MachineBlockEntities.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.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/data/recipes/MachineRecipeProvider.java` (2 hunks) * `enderio-machines/src/main/resources/assets/enderio/models/block/niard.json` (1 hunks) </details> <details> <summary>🧰 Additional context used</summary> <details> <summary>🧬 Code Graph Analysis (5)</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/niard/NiardBlockEntity.java (1)</summary> * `NiardBlockEntity` (49-299) </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java (1)</summary> * `MachineBlocks` (75-467) </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/NiardScreen.java (1)</summary> * `NiardScreen` (18-59) </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardMenu.java (1)</summary> * `NiardMenu` (13-69) </details> </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/FluidTankBlockEntity.java (1)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/InternalTankTasks.java (1)</summary> * `InternalTankTasks` (21-149) </details> </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardMenu.java (5)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/base/menu/MachineSlot.java (1)</summary> * `MachineSlot` (12-54) </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/base/menu/PoweredMachineMenu.java (1)</summary> * `PoweredMachineMenu` (15-58) </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java (1)</summary> * `MachineBlockEntities` (66-279) </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineMenus.java (1)</summary> * `MachineMenus` (64-130) </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java (1)</summary> * `NiardBlockEntity` (49-299) </details> </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlock.java (1)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java (1)</summary> * `NiardBlockEntity` (49-299) </details> </blockquote></details> </details> </details> <details> <summary>⏰ Context from checks skipped due to timeout of 90000ms (2)</summary> * GitHub Check: Run Tests * GitHub Check: Analyze (java-kotlin) </details> <details> <summary>🔇 Additional comments (23)</summary><blockquote> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/FluidTankBlockEntity.java (3)</summary> `40-42`: **Standard imports look good.** --- `217-219`: **Correct delegation to utility class.** The refactoring properly delegates the fluid filling logic to the centralised utility. --- `221-223`: **Correct delegation to utility class.** The refactoring properly delegates the fluid draining logic to the centralised utility. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/InternalTankTasks.java (2)</summary> `24-66`: **Well-structured fluid filling logic.** The method properly handles both bucket and fluid handler item interactions with appropriate simulation checks. --- `115-147`: **Correct implementation of tool mending logic.** The method properly handles experience fluid consumption and tool repair calculations. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/config/MachinesConfigLang.java (1)</summary> `47-47`: **LGTM: Translation entry properly added.** The translation entry follows the established pattern and is correctly positioned alphabetically between existing entries. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/package-info.java (1)</summary> `1-4`: **LGTM: Standard package-level nullability annotations.** The package-info file correctly applies nullability defaults, which is consistent with best practices used throughout the codebase. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineMenus.java (2)</summary> `15-15`: **LGTM: Import statements properly placed.** The import statements for NiardScreen and NiardMenu are correctly positioned alphabetically with existing imports. Also applies to: 39-39 --- `96-97`: **LGTM: Menu registration follows established pattern.** The NIARD menu registration correctly follows the same pattern as other machine menus, using appropriate constructor references and screen factory. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/data/recipes/MachineRecipeProvider.java (2)</summary> `278-291`: **LGTM: Well-designed crafting recipe.** The Niard recipe uses appropriate materials that reflect its fluid placement functionality (bucket, fluid tank, piston) and follows the established pattern for machine recipes. The unlocking criterion using void chassis is consistent with other machines. --- `553-553`: **LGTM: Correctly added to MACHINES list.** The addition to the MACHINES list is necessary for the erase recipes functionality and is properly positioned. </details> <details> <summary>enderio-machines/src/main/resources/assets/enderio/models/block/niard.json (1)</summary> `1-12`: **LGTM: Standard machine block model.** The block model follows established conventions for machine blocks, with appropriate texture assignments including a unique front texture and standard machine textures for other faces. The particle texture is correctly set to the front face. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java (2)</summary> `30-30`: **LGTM! Proper import addition.** The import for `NiardBlock` is correctly placed in alphabetical order within the niard package imports. --- `291-293`: **LGTM! Standard machine block registration.** The Niard block registration follows the established pattern using the `baseMachine` helper method with appropriate block properties, block entity reference, and translation. This is consistent with other machine registrations in the codebase. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java (2)</summary> `28-28`: **LGTM! Proper import addition.** The import for `NiardBlockEntity` is correctly placed in alphabetical order within the niard package imports. --- `133-135`: **LGTM! Appropriate block entity registration.** The Niard block entity registration follows the established pattern and correctly applies both `poweredMachineBlockEntityCapabilities` and `fluidHandlerCapability`, which is appropriate for a machine that consumes energy and handles fluids. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/config/common/EnergyConfig.java (2)</summary> `48-49`: **LGTM! Standard energy configuration fields.** The field declarations for Niard energy capacity and usage follow the established naming convention and type structure. --- `197-202`: **LGTM! Appropriate energy configuration values.** The configuration setup follows the standard pattern with reasonable default values (64,000 capacity and 10 uI/t usage), proper validation ranges, and appropriate comments. The low energy usage is suitable for a fluid placement utility machine. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/config/client/MachinesClientBlocksConfig.java (1)</summary> `11-11`: **LGTM! Proper field declaration.** The field declaration for Niard range color follows the established naming convention. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardRangeIterator.java (3)</summary> `9-11`: **LGTM! Appropriate class documentation.** The comment indicating this is adapted from older Ender IO versions provides useful context for the implementation approach. --- `12-15`: **LGTM! Clean class structure.** The class structure with a positions list and index for cyclic iteration is well-designed and straightforward. --- `30-44`: **LGTM! Complete and efficient iterator API.** The iterator methods provide a clean and efficient API for cyclic iteration over the generated positions. The `moveToNextPosition()` method correctly handles wrapping with the modulo operator. </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlock.java (1)</summary> `30-32`: **Inventory update call is required after fluid interaction** The default `handleFluidItemInteraction` implementation does not mark the player’s inventory as dirty, so the explicit ```java player.getInventory().setChanged(); ``` call is necessary to ensure the client is informed of item stack changes. You can safely keep it in `NiardBlock.java` at lines 30–32. > Likely an incorrect or invalid review comment. </details> </blockquote></details> </details>

enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/NiardScreen.java

					
				@ -0,0 +1,130 @@

				package com.enderio.machines.client.gui.screen;

coderabbitai[bot] (Migrated from github.com) commented

2025-06-29 07:37:17 +00:00

⚠️ Potential issue

Use NiardMenu button IDs instead of DrainMenu constants.

The code is using button IDs from DrainMenu which breaks encapsulation. Replace with the corresponding constants from NiardMenu.

-            (ignore) -> handleButtonPress(DrainMenu.VISIBILITY_BUTTON_ID)));
+            (ignore) -> handleButtonPress(NiardMenu.VISIBILITY_BUTTON_ID)));

         addRenderableWidget(EIOCommonWidgets.createRangeIncrease(leftPos + imageWidth - 2 * 16, topPos + 2 + 16 * 2,
-            (b) -> handleButtonPress(DrainMenu.INCREASE_BUTTON_ID)));
+            (b) -> handleButtonPress(NiardMenu.INCREASE_BUTTON_ID)));
         addRenderableWidget(EIOCommonWidgets.createRangeDecrease(leftPos + imageWidth - 2 * 16, topPos + 2 + 16 * 2 + 8,
-            (b) -> handleButtonPress(DrainMenu.DECREASE_BUTTON_ID)));
+            (b) -> handleButtonPress(NiardMenu.DECREASE_BUTTON_ID)));

📝 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.

            (ignore) -> handleButtonPress(NiardMenu.VISIBILITY_BUTTON_ID)));

        addRenderableWidget(EIOCommonWidgets.createRangeIncrease(leftPos + imageWidth - 2 * 16, topPos + 2 + 16 * 2,
            (b) -> handleButtonPress(NiardMenu.INCREASE_BUTTON_ID)));
        addRenderableWidget(EIOCommonWidgets.createRangeDecrease(leftPos + imageWidth - 2 * 16, topPos + 2 + 16 * 2 + 8,
            (b) -> handleButtonPress(NiardMenu.DECREASE_BUTTON_ID)));

🤖 Prompt for AI Agents

In
enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/NiardScreen.java
around lines 39 to 44, the button IDs are incorrectly referenced from DrainMenu
instead of NiardMenu. Replace all instances of DrainMenu.VISIBILITY_BUTTON_ID,
DrainMenu.INCREASE_BUTTON_ID, and DrainMenu.DECREASE_BUTTON_ID with the
corresponding constants from NiardMenu to maintain proper encapsulation and
correct referencing.

_⚠️ Potential issue_ **Use NiardMenu button IDs instead of DrainMenu constants.** The code is using button IDs from `DrainMenu` which breaks encapsulation. Replace with the corresponding constants from `NiardMenu`. ```diff - (ignore) -> handleButtonPress(DrainMenu.VISIBILITY_BUTTON_ID))); + (ignore) -> handleButtonPress(NiardMenu.VISIBILITY_BUTTON_ID))); addRenderableWidget(EIOCommonWidgets.createRangeIncrease(leftPos + imageWidth - 2 * 16, topPos + 2 + 16 * 2, - (b) -> handleButtonPress(DrainMenu.INCREASE_BUTTON_ID))); + (b) -> handleButtonPress(NiardMenu.INCREASE_BUTTON_ID))); addRenderableWidget(EIOCommonWidgets.createRangeDecrease(leftPos + imageWidth - 2 * 16, topPos + 2 + 16 * 2 + 8, - (b) -> handleButtonPress(DrainMenu.DECREASE_BUTTON_ID))); + (b) -> handleButtonPress(NiardMenu.DECREASE_BUTTON_ID))); ```  <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 (ignore) -> handleButtonPress(NiardMenu.VISIBILITY_BUTTON_ID))); addRenderableWidget(EIOCommonWidgets.createRangeIncrease(leftPos + imageWidth - 2 * 16, topPos + 2 + 16 * 2, (b) -> handleButtonPress(NiardMenu.INCREASE_BUTTON_ID))); addRenderableWidget(EIOCommonWidgets.createRangeDecrease(leftPos + imageWidth - 2 * 16, topPos + 2 + 16 * 2 + 8, (b) -> handleButtonPress(NiardMenu.DECREASE_BUTTON_ID))); ``` </details>  <details> <summary>🤖 Prompt for AI Agents</summary> ``` In enderio-machines/src/main/java/com/enderio/machines/client/gui/screen/NiardScreen.java around lines 39 to 44, the button IDs are incorrectly referenced from DrainMenu instead of NiardMenu. Replace all instances of DrainMenu.VISIBILITY_BUTTON_ID, DrainMenu.INCREASE_BUTTON_ID, and DrainMenu.DECREASE_BUTTON_ID with the corresponding constants from NiardMenu to maintain proper encapsulation and correct referencing. ``` </details>

enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/FluidTankBlockEntity.java

					
				@ -216,76 +213,21 @@ public abstract class FluidTankBlockEntity extends MachineBlockEntity implements

				        return TANK.getTank(this);

coderabbitai[bot] (Migrated from github.com) commented

2025-06-29 07:37:16 +00:00

⚠️ Potential issue

Fix incorrect parameter in tryMendTool delegation.

The last parameter should be FLUID_DRAIN_OUTPUT instead of FLUID_FILL_INPUT to match the expected slot for the mended tool output.

    private void tryMendTool() {
-        InternalTankTasks.tryMendTool(this, TANK, FLUID_DRAIN_INPUT, FLUID_FILL_INPUT);
+        InternalTankTasks.tryMendTool(this, TANK, FLUID_DRAIN_INPUT, FLUID_DRAIN_OUTPUT);
    }

🤖 Prompt for AI Agents

In
enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/FluidTankBlockEntity.java
at lines 225 to 227, the method tryMendTool incorrectly passes FLUID_FILL_INPUT
as the last parameter to InternalTankTasks.tryMendTool. Replace FLUID_FILL_INPUT
with FLUID_DRAIN_OUTPUT to correctly specify the output slot for the mended
tool.

_⚠️ Potential issue_ **Fix incorrect parameter in tryMendTool delegation.** The last parameter should be `FLUID_DRAIN_OUTPUT` instead of `FLUID_FILL_INPUT` to match the expected slot for the mended tool output. ```diff private void tryMendTool() { - InternalTankTasks.tryMendTool(this, TANK, FLUID_DRAIN_INPUT, FLUID_FILL_INPUT); + InternalTankTasks.tryMendTool(this, TANK, FLUID_DRAIN_INPUT, FLUID_DRAIN_OUTPUT); } ``` <details> <summary>🤖 Prompt for AI Agents</summary> ``` In enderio-machines/src/main/java/com/enderio/machines/common/blocks/fluid_tank/FluidTankBlockEntity.java at lines 225 to 227, the method tryMendTool incorrectly passes FLUID_FILL_INPUT as the last parameter to InternalTankTasks.tryMendTool. Replace FLUID_FILL_INPUT with FLUID_DRAIN_OUTPUT to correctly specify the output slot for the mended tool. ``` </details>

enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java

					
				@ -0,0 +119,4 @@

				        if (fluid == Fluids.EMPTY) return;

				        BlockState fluidBlockState = fluid.defaultFluidState().createLegacyBlock();

				        level.setBlock(pos, fluidBlockState, Block.UPDATE_ALL);

coderabbitai[bot] (Migrated from github.com) commented

2025-06-29 07:37:17 +00:00

💡 Verification agent

🧩 Analysis chain

Verify the use of createLegacyBlock() for fluid placement.

The method name suggests this might be a legacy approach. Ensure this is the correct method for placing fluid blocks in the current Minecraft version.

🌐 Web query:

What is the correct way to place fluid blocks in Minecraft modding with recent versions? Is createLegacyBlock() the recommended approach or is there a newer method?

💡 Result:

In recent versions of Minecraft modding, particularly with Forge, the recommended approach for placing fluid blocks has evolved. The createLegacyBlock() method, which was previously used to create a BlockState from a FluidState, is now considered deprecated. This deprecation indicates that there is a newer, preferred method for handling fluid block placement.

The current best practice involves using the FluidBlock class, which is designed to handle fluid block behavior more effectively. For example, in Forge 1.20.6, the FluidBlock class provides methods like getFluidState() to retrieve the fluid state associated with the block. This approach offers a more streamlined and efficient way to manage fluid blocks in your mod.

Therefore, it is advisable to transition away from using createLegacyBlock() and adopt the FluidBlock class for fluid block placement in your Minecraft modding projects.

Replace deprecated createLegacyBlock() with FluidBlock-based placement

The createLegacyBlock() call is deprecated in recent Forge versions. Instead, use your fluid’s associated FluidBlock for placement. For example:

• In enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java (lines 115–116):

- BlockState fluidBlockState = fluid.defaultFluidState().createLegacyBlock();
+ FluidBlock fluidBlock = (FluidBlock) fluid.getBlock();
+ BlockState fluidBlockState = fluidBlock.defaultBlockState(); 
level.setBlock(pos, fluidBlockState, Block.UPDATE_ALL);

This ensures you’re using the modern FluidBlock API rather than the deprecated legacy method.

📝 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.

        FluidBlock fluidBlock = (FluidBlock) fluid.getBlock();
        BlockState fluidBlockState = fluidBlock.defaultBlockState();
        level.setBlock(pos, fluidBlockState, Block.UPDATE_ALL);

🤖 Prompt for AI Agents

In
enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java
at lines 115-116, replace the deprecated call to
fluid.defaultFluidState().createLegacyBlock() with the modern approach by
obtaining the FluidBlock associated with the fluid and using it to set the block
state. This involves retrieving the FluidBlock instance for the fluid and
setting the block at the position using that FluidBlock's default state instead
of the legacy method.

_💡 Verification agent_ <details> <summary>🧩 Analysis chain</summary> **Verify the use of createLegacyBlock() for fluid placement.** The method name suggests this might be a legacy approach. Ensure this is the correct method for placing fluid blocks in the current Minecraft version. --- 🌐 Web query: ```web What is the correct way to place fluid blocks in Minecraft modding with recent versions? Is createLegacyBlock() the recommended approach or is there a newer method? ``` 💡 Result: In recent versions of Minecraft modding, particularly with Forge, the recommended approach for placing fluid blocks has evolved. The `createLegacyBlock()` method, which was previously used to create a `BlockState` from a `FluidState`, is now considered deprecated. This deprecation indicates that there is a newer, preferred method for handling fluid block placement. The current best practice involves using the `FluidBlock` class, which is designed to handle fluid block behavior more effectively. For example, in Forge 1.20.6, the `FluidBlock` class provides methods like `getFluidState()` to retrieve the fluid state associated with the block. This approach offers a more streamlined and efficient way to manage fluid blocks in your mod. Therefore, it is advisable to transition away from using `createLegacyBlock()` and adopt the `FluidBlock` class for fluid block placement in your Minecraft modding projects. --- </details> **Replace deprecated createLegacyBlock() with FluidBlock-based placement** The `createLegacyBlock()` call is deprecated in recent Forge versions. Instead, use your fluid’s associated FluidBlock for placement. For example: • In enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java (lines 115–116): ```diff - BlockState fluidBlockState = fluid.defaultFluidState().createLegacyBlock(); + FluidBlock fluidBlock = (FluidBlock) fluid.getBlock(); + BlockState fluidBlockState = fluidBlock.defaultBlockState(); level.setBlock(pos, fluidBlockState, Block.UPDATE_ALL); ``` This ensures you’re using the modern `FluidBlock` API rather than the deprecated legacy method.  <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 FluidBlock fluidBlock = (FluidBlock) fluid.getBlock(); BlockState fluidBlockState = fluidBlock.defaultBlockState(); level.setBlock(pos, fluidBlockState, Block.UPDATE_ALL); ``` </details>  <details> <summary>🤖 Prompt for AI Agents</summary> ``` In enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java at lines 115-116, replace the deprecated call to fluid.defaultFluidState().createLegacyBlock() with the modern approach by obtaining the FluidBlock associated with the fluid and using it to set the block state. This involves retrieving the FluidBlock instance for the fluid and setting the block at the position using that FluidBlock's default state instead of the legacy method. ``` </details>

enderio-machines/src/main/java/com/enderio/machines/common/config/client/MachinesClientBlocksConfig.java

					
				@ -24,6 +25,8 @@ public class MachinesClientBlocksConfig {

				                .define("poweredSpawnerRangeColor", "FF0000");

coderabbitai[bot] (Migrated from github.com) commented

2025-06-29 07:37:16 +00:00

⚠️ Potential issue

Fix the duplicate configuration key.

The configuration key "drainRangeColor" is already used by DRAIN_RANGE_COLOR on line 27. This will cause configuration conflicts.

Apply this diff to fix the duplicate key:

 NIARD_RANGE_COLOR = builder.comment("The color of the range box of the Niard")
-    .define("drainRangeColor", "FFA500");
+    .define("niardRangeColor", "FFA500");

📝 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.

        NIARD_RANGE_COLOR = builder.comment("The color of the range box of the Niard")
            .define("niardRangeColor", "FFA500");

🤖 Prompt for AI Agents

In
enderio-machines/src/main/java/com/enderio/machines/common/config/client/MachinesClientBlocksConfig.java
around lines 28 to 29, the configuration key "drainRangeColor" is duplicated
from line 27's DRAIN_RANGE_COLOR. Rename the key in NIARD_RANGE_COLOR to a
unique string, such as "niardRangeColor", to avoid conflicts in the
configuration.

_⚠️ Potential issue_ **Fix the duplicate configuration key.** The configuration key "drainRangeColor" is already used by `DRAIN_RANGE_COLOR` on line 27. This will cause configuration conflicts. Apply this diff to fix the duplicate key: ```diff NIARD_RANGE_COLOR = builder.comment("The color of the range box of the Niard") - .define("drainRangeColor", "FFA500"); + .define("niardRangeColor", "FFA500"); ```  <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 NIARD_RANGE_COLOR = builder.comment("The color of the range box of the Niard") .define("niardRangeColor", "FFA500"); ``` </details>  <details> <summary>🤖 Prompt for AI Agents</summary> ``` In enderio-machines/src/main/java/com/enderio/machines/common/config/client/MachinesClientBlocksConfig.java around lines 28 to 29, the configuration key "drainRangeColor" is duplicated from line 27's DRAIN_RANGE_COLOR. Rename the key in NIARD_RANGE_COLOR to a unique string, such as "niardRangeColor", to avoid conflicts in the configuration. ``` </details>

coderabbitai[bot] (Migrated from github.com) reviewed

2025-07-17 10:57:33 +00:00

coderabbitai[bot] (Migrated from github.com) left a comment

Actionable comments posted: 0

🧹 Nitpick comments (2)

endercore/src/main/java/com/enderio/core/client/FluidRendererUtil.java (1)
26-52: Consider extracting magic numbers as constants.

The implementation is correct, but the magic numbers could be made more maintainable.
+    private static final float FLUID_INSET = 0.0625F;
+    private static final float FACE_SIZE = 14 / 16.0f;
+    private static final float FLUID_HEIGHT_MULTIPLIER = 14 / 16.0f;
+
     public static void renderFluid(PoseStack.Pose pose, VertexConsumer consumer, Fluid fluid, float fillAmount,
         int color, int packedLight) {
         // Get fluid texture
         IClientFluidTypeExtensions props = IClientFluidTypeExtensions.of(fluid);
         TextureAtlasSprite texture = Minecraft.getInstance()
             .getTextureAtlas(InventoryMenu.BLOCK_ATLAS)
             .apply(props.getStillTexture());
 
         // Get sizes
-        float fluidHeight = (14 * fillAmount) / 16.0f;
-        float inset = 0.0625F;
-        float faceSize = 14 / 16.0f;
+        float fluidHeight = (FLUID_HEIGHT_MULTIPLIER * fillAmount);
+        float inset = FLUID_INSET;
+        float faceSize = FACE_SIZE;
enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/NiardBER.java (1)
15-17: Consider documenting the unused constructor parameter.

The constructor correctly follows the required signature but doesn't use the context parameter. Consider adding a comment to clarify this is intentional.
 public NiardBER(BlockEntityRendererProvider.Context context) {
-
+    // Context not required for this renderer
 }

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4b447f8f27 and b40bbe78c9.

📒 Files selected for processing (8)

endercore/src/main/java/com/enderio/core/client/FluidRendererUtil.java (1 hunks)
enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/FluidTankBER.java (2 hunks)
enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/NiardBER.java (1 hunks)
enderio-machines/src/main/java/com/enderio/machines/client/rendering/item/FluidTankBEWLR.java (2 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java (1 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java (3 hunks)
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java (2 hunks)
enderio-machines/src/main/resources/assets/enderio/models/block/niard.json (1 hunks)

✅ Files skipped from review due to trivial changes (2)

enderio-machines/src/main/java/com/enderio/machines/client/rendering/item/FluidTankBEWLR.java
enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/FluidTankBER.java

🚧 Files skipped from review as they are similar to previous changes (3)

enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java
enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java
enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java

🔇 Additional comments (4)

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

1-13: LGTM! Standard block model implementation.

The JSON model correctly defines the Niard block's visual appearance using standard Minecraft conventions. The texture mappings are consistent with other machine blocks, and the render type is appropriate.

endercore/src/main/java/com/enderio/core/client/FluidRendererUtil.java (2)

13-24: Well-designed utility method with proper delegation.

The first renderFluid method correctly extracts fluid properties and delegates to the main rendering method. The early return for empty fluid stacks is good practice.

22-22: Clarify the commented colour handling logic.

The commented line suggests there might be cases where getTintColor returns -1. Should this fallback to white (0xffffff) be implemented, or is the current approach sufficient?

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

19-38: Well-implemented block entity renderer.

The renderer correctly follows Minecraft patterns:

Proper early return for empty tanks

Correct use of translucent cull block sheet for fluid rendering

Accurate fill ratio calculation

Appropriate delegation to the utility class

**Actionable comments posted: 0** <details> <summary>🧹 Nitpick comments (2)</summary><blockquote> <details> <summary>endercore/src/main/java/com/enderio/core/client/FluidRendererUtil.java (1)</summary><blockquote> `26-52`: **Consider extracting magic numbers as constants.** The implementation is correct, but the magic numbers could be made more maintainable. ```diff + private static final float FLUID_INSET = 0.0625F; + private static final float FACE_SIZE = 14 / 16.0f; + private static final float FLUID_HEIGHT_MULTIPLIER = 14 / 16.0f; + public static void renderFluid(PoseStack.Pose pose, VertexConsumer consumer, Fluid fluid, float fillAmount, int color, int packedLight) { // Get fluid texture IClientFluidTypeExtensions props = IClientFluidTypeExtensions.of(fluid); TextureAtlasSprite texture = Minecraft.getInstance() .getTextureAtlas(InventoryMenu.BLOCK_ATLAS) .apply(props.getStillTexture()); // Get sizes - float fluidHeight = (14 * fillAmount) / 16.0f; - float inset = 0.0625F; - float faceSize = 14 / 16.0f; + float fluidHeight = (FLUID_HEIGHT_MULTIPLIER * fillAmount); + float inset = FLUID_INSET; + float faceSize = FACE_SIZE; ``` </blockquote></details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/NiardBER.java (1)</summary><blockquote> `15-17`: **Consider documenting the unused constructor parameter.** The constructor correctly follows the required signature but doesn't use the context parameter. Consider adding a comment to clarify this is intentional. ```diff public NiardBER(BlockEntityRendererProvider.Context context) { - + // Context not required for this renderer } ``` </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 4b447f8f271c9e176abb7ae8181f04362f668b63 and b40bbe78c9f024ab04fe65bd104db388ddb5a2b6. </details> <details> <summary>📒 Files selected for processing (8)</summary> * `endercore/src/main/java/com/enderio/core/client/FluidRendererUtil.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/FluidTankBER.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/NiardBER.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/client/rendering/item/FluidTankBEWLR.java` (2 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java` (1 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java` (3 hunks) * `enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java` (2 hunks) * `enderio-machines/src/main/resources/assets/enderio/models/block/niard.json` (1 hunks) </details> <details> <summary>✅ Files skipped from review due to trivial changes (2)</summary> * enderio-machines/src/main/java/com/enderio/machines/client/rendering/item/FluidTankBEWLR.java * enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/FluidTankBER.java </details> <details> <summary>🚧 Files skipped from review as they are similar to previous changes (3)</summary> * enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlockEntities.java * enderio-machines/src/main/java/com/enderio/machines/common/init/MachineBlocks.java * enderio-machines/src/main/java/com/enderio/machines/common/blocks/niard/NiardBlockEntity.java </details> <details> <summary>🔇 Additional comments (4)</summary><blockquote> <details> <summary>enderio-machines/src/main/resources/assets/enderio/models/block/niard.json (1)</summary> `1-13`: **LGTM! Standard block model implementation.** The JSON model correctly defines the Niard block's visual appearance using standard Minecraft conventions. The texture mappings are consistent with other machine blocks, and the render type is appropriate. </details> <details> <summary>endercore/src/main/java/com/enderio/core/client/FluidRendererUtil.java (2)</summary> `13-24`: **Well-designed utility method with proper delegation.** The first `renderFluid` method correctly extracts fluid properties and delegates to the main rendering method. The early return for empty fluid stacks is good practice. --- `22-22`: **Clarify the commented colour handling logic.** The commented line suggests there might be cases where `getTintColor` returns -1. Should this fallback to white (0xffffff) be implemented, or is the current approach sufficient? </details> <details> <summary>enderio-machines/src/main/java/com/enderio/machines/client/rendering/blockentity/NiardBER.java (1)</summary> `19-38`: **Well-implemented block entity renderer.** The renderer correctly follows Minecraft patterns: - Proper early return for empty tanks - Correct use of translucent cull block sheet for fluid rendering - Accurate fill ratio calculation - Appropriate delegation to the utility class </details> </blockquote></details> </details>

dphaldes commented

2025-08-19 19:00:55 +00:00

(Migrated from github.com)

I see you have changed how Tank Filling works. I would prefer if this was split into 2 PRs. One for Tanks and One for Niard

👍 1

Sign in to join this conversation.

No reviewers