Adds the soul pot #1136

Open

justliliandev wants to merge 3 commits from feature/soul_pot into dev/1.21.1

justliliandev commented

2025-09-15 18:40:47 +00:00

(Migrated from github.com)

Description

The soul pot is a block that can catch an entity from the environment (based on blocks nearby, biome, structures, etc.) . it's automatable using a dispenser, piston and comparator.

TODO

[] properly move the soul data reload listener from machines to base
[] merge with reorganization

Breaking Changes

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.

# Description The soul pot is a block that can catch an entity from the environment (based on blocks nearby, biome, structures, etc.) . it's automatable using a dispenser, piston and comparator. # TODO - [] properly move the soul data reload listener from machines to base - [] merge with reorganization # Breaking Changes # 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.

coderabbitai[bot] commented

2025-09-15 18:40:55 +00:00

(Migrated from github.com)

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing touches

🧪 Generate unit tests

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch feature/soul_pot

Tip
👮 Agentic pre-merge checks are now available in preview!

Pro plan users can now enable pre-merge checks in their settings to enforce checklists before merging PRs.

- Built-in checks – Quickly apply ready-made checks to enforce title conventions, require pull request descriptions that follow templates, validate linked issues for compliance, and more.
- Custom agentic checks – Define your own rules using CodeRabbit’s advanced agentic capabilities to enforce organization-specific policies and workflows. For example, you can instruct CodeRabbit’s agent to verify that API documentation is updated whenever API schema files are modified in a PR. Note: Upto 5 custom checks are currently allowed during the preview period. Pricing for this feature will be announced in a few weeks.

Please see the documentation for more information.

Example:
reviews:
  pre_merge_checks:
    custom_checks:
      - name: "Undocumented Breaking Changes"
        mode: "warning"
        instructions: |
          Pass/fail criteria: All breaking changes to public APIs, CLI flags, environment variables, configuration keys, database schemas, or HTTP/GraphQL endpoints must be documented in the "Breaking Change" section of the PR description and in CHANGELOG.md. Exclude purely internal or private changes (e.g., code not exported from package entry points or explicitly marked as internal).
Please share your feedback with us on this Discord post.

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

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

> [!IMPORTANT] > ## Review skipped > > Draft detected. > > Please check the settings in the CodeRabbit UI or the `.coderabbit.yaml` file in this repository. To trigger a single review, invoke the `@coderabbitai review` command. > > You can disable this status message by setting the `reviews.review_status` to `false` in the CodeRabbit configuration file.   <details> <summary>✨ Finishing touches</summary> <details> <summary>🧪 Generate unit tests</summary> - [ ]  Create PR with unit tests - [ ]  Post copyable unit tests in a comment - [ ]  Commit unit tests in branch `feature/soul_pot` </details> </details>   > [!TIP] > <details> > <summary>👮 Agentic pre-merge checks are now available in preview!</summary> > > Pro plan users can now enable pre-merge checks in their settings to enforce checklists before merging PRs. > > - Built-in checks – Quickly apply ready-made checks to enforce title conventions, require pull request descriptions that follow templates, validate linked issues for compliance, and more. > - Custom agentic checks – Define your own rules using CodeRabbit’s advanced agentic capabilities to enforce organization-specific policies and workflows. For example, you can instruct CodeRabbit’s agent to verify that API documentation is updated whenever API schema files are modified in a PR. Note: Upto 5 custom checks are currently allowed during the preview period. Pricing for this feature will be announced in a few weeks. > > Please see the [documentation](https://docs.coderabbit.ai/pr-reviews/pre-merge-checks) for more information. > > Example: > > ```yaml > reviews: > pre_merge_checks: > custom_checks: > - name: "Undocumented Breaking Changes" > mode: "warning" > instructions: | > Pass/fail criteria: All breaking changes to public APIs, CLI flags, environment variables, configuration keys, database schemas, or HTTP/GraphQL endpoints must be documented in the "Breaking Change" section of the PR description and in CHANGELOG.md. Exclude purely internal or private changes (e.g., code not exported from package entry points or explicitly marked as internal). > ``` > > Please share your feedback with us on this [Discord post](https://discord.com/channels/1134356397673414807/1414771631775158383). > > </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> <sub>Comment `@coderabbitai help` to get the list of available commands and usage tips.</sub>

This pull request has changes conflicting with the target branch.

enderio-base/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json
enderio-base/src/main/java/com/enderio/EnderIOBase.java
enderio-base/src/main/java/com/enderio/base/api/registry/EnderIORegistries.java
enderio-base/src/main/java/com/enderio/base/client/EnderIOBaseClient.java
enderio-base/src/main/java/com/enderio/base/common/init/EIOBlockEntities.java
enderio-base/src/main/java/com/enderio/base/common/init/EIORecipes.java
enderio-base/src/main/java/com/enderio/base/common/lang/EIOLang.java
enderio-base/src/main/java/com/enderio/machines/common/soulpot/SoulData.java
enderio-base/src/main/java/com/enderio/machines/common/soulpot/SoulDataReloadListener.java
enderio-machines/src/main/java/com/enderio/machines/EnderIOMachines.java
enderio-machines/src/main/java/com/enderio/machines/common/souldata/SoulData.java
enderio-machines/src/main/java/com/enderio/machines/common/souldata/SoulDataReloadListener.java
enderio-modded-conduits/src/main/java/com/enderio/modded_conduits/data/SoulPotBEWLR.java
enderio-modded-conduits/src/main/java/com/enderio/modded_conduits/data/block/SoulPotRenderer.java
enderio/src/datagen/java/com/enderio/enderio/datagen/common/recipes/ItemRecipeProvider.java
enderio/src/datagen/java/com/enderio/enderio/datagen/common/souldata/SoulDataProvider.java
enderio/src/generated/resources/assets/enderio/blockstates/soul_pot.json
enderio/src/generated/resources/assets/enderio/lang/en_us.json
enderio/src/generated/resources/assets/enderio/models/block/soul_pot.json
enderio/src/generated/resources/data/enderio/loot_table/blocks/soul_pot.json
enderio/src/generated/resources/data/enderio/recipe/soul_pot.json
enderio/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json
enderio/src/main/java/com/enderio/enderio/compat/ftb_ultimine/ConduitBlockBreakHandler.java
enderio/src/main/java/com/enderio/enderio/compat/jei_machines_to_merge/category/SoulBindingCategory.java
enderio/src/main/java/com/enderio/enderio/content/machines/soul_binder/SoulBindingRecipe.java
enderio/src/main/java/com/enderio/enderio/content/misc_blocks/SoulCatchingPotBlock.java
enderio/src/main/java/com/enderio/enderio/foundation/block/entity/SoulPotBlockEntity.java
enderio/src/main/java/com/enderio/enderio/foundation/particle/SoulParticle.java
enderio/src/main/java/com/enderio/enderio/foundation/particle/SoulParticleData.java
enderio/src/main/java/com/enderio/enderio/foundation/particle/SoulParticleProvider.java
enderio/src/main/java/com/enderio/enderio/foundation/particle/SoulParticleType.java
enderio/src/main/java/com/enderio/enderio/foundation/souldata/EngineSoul.java
enderio/src/main/java/com/enderio/enderio/foundation/souldata/FarmSoul.java
enderio/src/main/java/com/enderio/enderio/foundation/souldata/SolarSoul.java
enderio/src/main/java/com/enderio/enderio/foundation/souldata/SoulData.java
enderio/src/main/java/com/enderio/enderio/foundation/souldata/SoulDataReloadListener.java
enderio/src/main/java/com/enderio/enderio/foundation/souldata/SpawnerSoul.java
enderio/src/main/java/com/enderio/enderio/init/EIOBlocks.java
enderio/src/main/java/com/enderio/enderio/init/EIOOrigins.java
enderio/src/main/java/com/enderio/enderio/init/EIOParticles.java
enderio/src/main/resources/assets/enderio/models/item/soul_pot.json
enderio/src/main/resources/assets/enderio/particles/soul_particle.json

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin feature/soul_pot:feature/soul_pot

git switch feature/soul_pot

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch dev/1.21.1

git merge --no-ff feature/soul_pot

git switch feature/soul_pot

git rebase dev/1.21.1

git switch dev/1.21.1

git merge --ff-only feature/soul_pot

git switch feature/soul_pot

git rebase dev/1.21.1

git switch dev/1.21.1

git merge --no-ff feature/soul_pot

git switch dev/1.21.1

git merge --squash feature/soul_pot