Skip to content

EntityBlockStorage + Beehive#7316

Merged
sovdeeth merged 24 commits into
SkriptLang:dev/featurefrom
Absolutionism:dev/EntityBlockStorage
Mar 16, 2025
Merged

EntityBlockStorage + Beehive#7316
sovdeeth merged 24 commits into
SkriptLang:dev/featurefrom
Absolutionism:dev/EntityBlockStorage

Conversation

@Absolutionism
Copy link
Copy Markdown
Contributor

@Absolutionism Absolutionism commented Dec 27, 2024

Description

This PR aims to add support for EntityBlockStorage. Allowing users to add entities into an entity block storage such as beehives, release the stored entities, clear the stored entities (Paper) and get the current + max entity count.
As well as support for Beehives such as target flower and honey level.


Target Minecraft Versions: any
Requirements: none
Related Issues: none

Comment thread src/main/java/ch/njol/skript/effects/EffInsertEntityStorage.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntiyCount.java Outdated
Comment thread src/main/java/ch/njol/skript/bukkitutil/EntityBlockStorageUtils.java Outdated
Comment thread src/main/java/ch/njol/skript/bukkitutil/EntityBlockStorageUtils.java Outdated
Comment thread src/main/java/ch/njol/skript/conditions/CondEntityStorageIsFull.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprBeehiveHoneyLevel.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprBeehiveHoneyLevel.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntiyCount.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprEntityStorageMaxEntities.java Outdated
@Efnilite Efnilite added the enhancement Feature request, an issue about something that could be improved, or a PR improving something. label Dec 27, 2024
Comment thread src/main/java/ch/njol/skript/conditions/CondIsSedated.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprEntityStorageMaxEntities.java Outdated
Copy link
Copy Markdown
Contributor

@ShaneBeee ShaneBeee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple minor things

Comment thread src/main/java/ch/njol/skript/conditions/CondEntityStorageIsFull.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprBeehiveFlower.java Outdated
Copy link
Copy Markdown
Contributor

@ShaneBeee ShaneBeee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good, just one little nit pick

Comment thread src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated
Copy link
Copy Markdown
Contributor

@ShaneBeee ShaneBeee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is my approval for fun 👍

Copy link
Copy Markdown
Member

@sovdeeth sovdeeth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

syntax comments

Comment thread src/main/java/ch/njol/skript/conditions/CondEntityStorageIsFull.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprBeehiveFlower.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprEntityStorageMaxEntities.java Outdated
Comment thread src/main/java/ch/njol/skript/conditions/CondEntityStorageIsFull.java Outdated
Comment thread src/main/java/ch/njol/skript/conditions/CondEntityStorageIsFull.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java
Comment thread src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated
Comment thread src/main/java/ch/njol/skript/expressions/ExprEntityStorageEntities.java Outdated
Copy link
Copy Markdown
Member

@sovdeeth sovdeeth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks pretty good

Comment thread src/main/java/ch/njol/skript/effects/EffClearEntityStorage.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffInsertEntityStorage.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffInsertEntityStorage.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffInsertEntityStorage.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffInsertEntityStorage.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java
Comment thread src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated
@Efnilite Efnilite added feature Pull request adding a new feature. and removed enhancement Feature request, an issue about something that could be improved, or a PR improving something. labels Dec 31, 2024
Copy link
Copy Markdown
Member

@sovdeeth sovdeeth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just some edge cases, everything else looks good

Comment thread src/test/skript/tests/syntaxes/expressions/ExprBeehiveHoneyLevel.sk
Comment thread src/main/java/ch/njol/skript/conditions/CondEntityStorageIsFull.java Outdated
Comment thread src/main/java/ch/njol/skript/conditions/CondIsSedated.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated
Comment thread src/main/java/ch/njol/skript/effects/EffReleaseEntityStorage.java Outdated
Comment thread src/test/skript/tests/syntaxes/expressions/ExprBeehiveFlower.sk Outdated
Comment thread src/test/skript/tests/syntaxes/expressions/ExprBeehiveHoneyLevel.sk Outdated
@Absolutionism Absolutionism requested a review from sovdeeth January 9, 2025 20:07
@Efnilite Efnilite added the feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. label Mar 15, 2025
@sovdeeth sovdeeth merged commit 5bcbd80 into SkriptLang:dev/feature Mar 16, 2025
erenkarakal pushed a commit to erenkarakal/Skript that referenced this pull request Nov 26, 2025
* Initial Commit

* Tests

* Beehives

* Notes

* Cleanup

* Fix tests

* Partial Changes

* Requested Changes

* Update

* Additional Changes

* Requested Changes

* Requested Changes

* Requested Changes

* Changes

* Update Tests

* Typo

* Fix Tests

* Fix Tests - 2

---------

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

feature Pull request adding a new feature. feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants