Skip to content

Events Migration (Entity Events)#8748

Open
AnOwlBe wants to merge 31 commits into
SkriptLang:dev/featurefrom
AnOwlBe:EntityEvents
Open

Events Migration (Entity Events)#8748
AnOwlBe wants to merge 31 commits into
SkriptLang:dev/featurefrom
AnOwlBe:EntityEvents

Conversation

@AnOwlBe

@AnOwlBe AnOwlBe commented Jul 3, 2026

Copy link
Copy Markdown

Problem

This is part 2 of probably 6-8 more prs needed to migrate all of simpleevents & njol/skript/events into the skriptlang folder in their related module while (hopefully) preventing any breaking changes.

Solution

This PR is targetted at entity events in SimpleEvents (Events in Bukkit/Paper that start with Entity or entity specific events)
Also migrates all entity events in njol/skript/events (probably)

progress:

  • EvtEntityBlockChange
  • EvtEntityBreakDoor
  • EvtEntityDamage
  • EvtEntityDeath
  • EvtEntityHeal
  • EvtEntityLeash
  • EvtEntityMove
  • EvtEntityPortal
  • EvtEntityShootBow
  • EvtEntitySpawn
  • EvtEntityTarget
  • EvtEntityTeleport
  • EvtEntityTransform
  • EvtExperienceSpawn
  • EvtFireworkExplode
  • EvtBatToggleSleep
  • EvtCreeperPower
  • EvtEndermanEnrage
  • EvtEntityCombust
  • EvtEntityDismount
  • EvtEntityExplode
  • EvtEntityJump
  • EvtEntityMount
  • EvtEntityPortalEnter
  • EvtEntityResurrectAttempt
  • EvtEntityTame
  • EvtEntityToggleSwim
  • EvtHorseJump
  • EvtPigZap
  • EvtPiglinBarter
  • EvtSheepRegrowWool
  • EvtSlimeSplit
  • EvtVillagerCareerChange

Testing Completed

Manual testing completed for every event along with junit & quicktest passed

If anyone wants to test themselves for bugs or breaking changes: entityevents.txt

Supporting Information

Note that the stuff in BukkitModule will exist until #8741 replaces it when 2.16 is officially out allowing it to be merged into dev/feature


Completes: none
Related: #8716
AI assistance: some here and there but about 90% done by me

@AnOwlBe AnOwlBe requested a review from a team as a code owner July 3, 2026 03:08
@AnOwlBe AnOwlBe requested review from Pesekjak and cheeezburga and removed request for a team July 3, 2026 03:08
@skriptlang-automation skriptlang-automation Bot added needs reviews A PR that needs additional reviews needs triage An issue that hasn't been classified or verified yet labels Jul 3, 2026
@skriptlang-automation

skriptlang-automation Bot commented Jul 3, 2026

Copy link
Copy Markdown

🔍 Triage Checklist

Type

  • bug
  • feature
  • enhancement

Project

  • 2.15 Releases
  • 2.16 Releases
  • 2.17 Releases

  • ✅ Mark as triaged

@Absolutionism Absolutionism left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

First batch

AnOwlBe and others added 2 commits July 3, 2026 19:35
Co-authored-by: SirSmurfy2 <82696841+Absolutionism@users.noreply.github.com>
@AnOwlBe AnOwlBe requested a review from Absolutionism July 3, 2026 23:38

@Absolutionism Absolutionism left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Second batch

Comment thread src/main/java/org/skriptlang/skript/bukkit/entity/EntityModule.java Outdated
AnOwlBe and others added 5 commits July 4, 2026 22:58
# Conflicts:
#	src/main/java/org/skriptlang/skript/bukkit/entity/elements/events/EvtEntityBlockChange.java
Co-authored-by: SirSmurfy2 <82696841+Absolutionism@users.noreply.github.com>
Co-authored-by: SirSmurfy2 <82696841+Absolutionism@users.noreply.github.com>
@AnOwlBe AnOwlBe requested a review from Absolutionism July 5, 2026 03:15
@AnOwlBe AnOwlBe mentioned this pull request Jul 5, 2026
26 tasks

@Absolutionism Absolutionism left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

A lot of Space Invaders too

@SuppressWarnings("unchecked")
public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
if (args[0] != null) {
entityData = (Literal<EntityData<?>>) args[0];

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Perhaps we should check to see what entity types are provided, and if one or more is not of the types that can trigger this event, to error and inform

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I guess but also could be limiting in future and as is its not really confusing a user won't have the event and expect a pig to break down a door

AnOwlBe and others added 2 commits July 5, 2026 15:32
…nts/EvtEntityDamage.java

Co-authored-by: SirSmurfy2 <82696841+Absolutionism@users.noreply.github.com>
@AnOwlBe AnOwlBe requested a review from Absolutionism July 5, 2026 19:33
@AnOwlBe AnOwlBe requested a review from Absolutionism July 5, 2026 22:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs reviews A PR that needs additional reviews needs triage An issue that hasn't been classified or verified yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants