Entity Events module #42

williambl · 2021-10-17T20:54:21Z

This PR adds:

A new library, entity (as described in RFC #9)
A new module, entity_events
A set of events in that module.
A test mod for that module.

The events included are:

EntityKilledCallback, with similar purpose to Fabric's AfterKilledOtherEntity.
TryReviveCallback - the AllowDeathEvent I wrote for FAPI was merged in a state I was unhappy with. This is closer to how I imagined it.
EntityWorldChangedEvents - unchanged from FAPI's ServerEntityWorldChangedEvents, other than name.
EntityLoadEvents, two events for when entities are loaded and unloaded on the server.
ClientEntityLoadEvents, ditto but for the client.
ServerPlayerEntityCopyCallback, for copying data after player respawn.

There is certainly space for more events.

...ntity/entity-events/src/main/java/org/quiltmc/qsl/entity/api/event/EntityKilledCallback.java

...ry/entity/entity-events/src/main/java/org/quiltmc/qsl/entity/api/event/EntityLoadEvents.java

.../entity/entity-events/src/main/java/org/quiltmc/qsl/entity/api/event/EntityTickCallback.java

...y/entity/entity-events/src/main/java/org/quiltmc/qsl/entity/api/event/TryReviveCallback.java

.../entity/entity-events/src/main/java/org/quiltmc/qsl/entity/api/event/EntityTickCallback.java

...ry/entity/entity-events/src/main/java/org/quiltmc/qsl/entity/api/event/EntityLoadEvents.java

...y/entity/entity-events/src/main/java/org/quiltmc/qsl/entity/api/event/TryReviveCallback.java

williambl · 2021-10-31T23:25:17Z

marking as ready for review just for hacktoberfest, sorry :(

BasiqueEvangelist · 2021-11-14T10:52:27Z

Could you add events for copying player data on respawn and travel from end?

williambl · 2021-11-19T22:57:28Z

Going to rebase onto 1.18 and force push.

...ry/entity/entity-events/src/main/java/org/quiltmc/qsl/entity/api/event/EntityLoadEvents.java

.../entity/entity-events/src/main/java/org/quiltmc/qsl/entity/api/event/EntityReviveEvents.java

williambl · 2021-11-21T23:42:44Z

Not sure why checks are failing, they're passing locally

williambl · 2021-11-22T01:27:51Z

@BasiqueEvangelist added ServerPlayerEntityCopyCallback (name subject to change because that's quite long) - does this fit what you'd need?

BasiqueEvangelist · 2021-11-23T14:14:40Z

@BasiqueEvangelist added ServerPlayerEntityCopyCallback (name subject to change because that's quite long) - does this fit what you'd need?

This seems to fit all common use cases, so yes.

...ty-events/src/main/java/org/quiltmc/qsl/entity/api/event/ServerPlayerEntityCopyCallback.java

TheGlitch76 · 2022-02-24T01:41:48Z

is this API still WIP?

williambl · 2022-02-26T15:35:17Z

is this API still WIP?

There are a couple more events to be added, but I think I'd be happy to merge these existing ones as-is. (with the caveat that I'd like someone to have a look at the the tryrevive events and see if they can be done with the event phase system, which I'm having trouble wrapping my head around)

LambdAurora

Some of those events could be AwareListeners to allow them to be used in entrypoints.

Package also seems to be wrong: https://github.com/QuiltMC/quilt-standard-libraries/blob/1.18/CONTRIBUTING.md#packages

library/entity/entity-events/build.gradle

...ntity/entity-events/src/main/java/org/quiltmc/qsl/entity/api/event/EntityKilledCallback.java

.../entity/entity-events/src/main/java/org/quiltmc/qsl/entity/api/event/EntityReviveEvents.java

...ity-events/src/main/java/org/quiltmc/qsl/entity/api/event/client/ClientEntityLoadEvents.java

library/entity/entity-events/src/main/resources/fabric.mod.json

...y/entity/entity-events/src/testmod/java/org/quiltmc/qsl/entity/test/EntityEventsTestMod.java

...tity/entity_events/src/main/java/org/quiltmc/qsl/entity_events/api/EntityKilledCallback.java

...entity/entity_events/src/main/java/org/quiltmc/qsl/entity_events/api/EntityReviveEvents.java

...y_events/src/main/java/org/quiltmc/qsl/entity_events/api/ServerPlayerEntityCopyCallback.java

...entity_events/src/main/java/org/quiltmc/qsl/entity_events/mixin/ServerPlayerEntityMixin.java

i5 will not be re-reviewing

EnnuiL

We're almost there! With the Checkstyle clean-ups, I could spot few potential problems

...y/entity_events/src/main/java/org/quiltmc/qsl/entity_events/api/EntityWorldChangeEvents.java

...entity_events/src/main/java/org/quiltmc/qsl/entity_events/api/LivingEntityDeathCallback.java

...y_events/src/main/java/org/quiltmc/qsl/entity_events/api/ServerPlayerEntityCopyCallback.java

…ity_events/api/ServerPlayerEntityCopyCallback.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

…ity_events/api/LivingEntityDeathCallback.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

williambl · 2022-09-14T20:51:01Z

We're almost there! With the Checkstyle clean-ups, I could spot few potential problems

All addressed I think - maybe this'll get merged before its birthday! :P

EnnuiL

I have a final barrage of nitpicks

...y/entity_events/src/main/java/org/quiltmc/qsl/entity_events/api/EntityWorldChangeEvents.java

...entity/entity_events/src/main/java/org/quiltmc/qsl/entity_events/api/EntityReviveEvents.java

…ity_events/api/EntityReviveEvents.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

…ity_events/api/EntityWorldChangeEvents.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

…ity_events/api/EntityReviveEvents.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

…ity_events/api/EntityWorldChangeEvents.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

EnnuiL

After months of work, I believe that this is finally ready!

outdated; concerns adressed

EnnuiL

Actually, no, I have a final objection

...entity/entity_events/src/main/java/org/quiltmc/qsl/entity_events/api/EntityReviveEvents.java

…ity_events/api/EntityReviveEvents.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

OroArmor

For such a large number of events, its surprising how few mixins are needed

...y_events/src/main/java/org/quiltmc/qsl/entity_events/api/ServerPlayerEntityCopyCallback.java

williambl marked this pull request as draft October 17, 2021 20:54

OroArmor requested changes Oct 17, 2021

View reviewed changes

i509VCB added hacktoberfest-accepted new: library A pull request which adds a new library. new: module A pull request which adds a new module labels Oct 17, 2021

i509VCB reviewed Oct 17, 2021

View reviewed changes

williambl marked this pull request as ready for review October 31, 2021 23:24

williambl force-pushed the entity branch from 9d68833 to 420c934 Compare November 19, 2021 22:57

williambl changed the base branch from 1.17.1 to 1.18 November 19, 2021 22:58

williambl changed the title ~~[WIP] Add Entity Events module~~ [WIP] Entity Events module Nov 19, 2021

i509VCB previously requested changes Nov 19, 2021

View reviewed changes

BasiqueEvangelist approved these changes Nov 25, 2021

View reviewed changes

TheGlitch76 mentioned this pull request Dec 4, 2021

Entity Library TODO #49

Open

4 tasks

lenrik1589 reviewed Dec 26, 2021

View reviewed changes

...ty-events/src/main/java/org/quiltmc/qsl/entity/api/event/ServerPlayerEntityCopyCallback.java Outdated Show resolved Hide resolved

Platymemo mentioned this pull request Jan 18, 2022

Entity Object Builders #67

Merged

LambdAurora added the library: entity Related to the entity library. label Jan 23, 2022

LambdAurora added the t: new api This adds a new API. label Feb 18, 2022

williambl changed the title ~~[WIP] Entity Events module~~ Entity Events module Feb 26, 2022

LambdAurora suggested changes Mar 1, 2022

View reviewed changes

TheGlitch76 previously requested changes Mar 16, 2022

View reviewed changes

williambl changed the base branch from 1.18 to 1.19 April 15, 2022 19:05

williambl added 2 commits September 11, 2022 19:52

Replace fabric.mod.json with quilt.mod.json in entity events testmod

9fdc038

Fix javadoc in entity events

9105a10

williambl requested a review from EnnuiL September 13, 2022 18:37

EnnuiL suggested changes Sep 14, 2022

View reviewed changes

williambl and others added 3 commits September 14, 2022 20:40

Update library/entity/entity_events/src/main/java/org/quiltmc/qsl/ent…

932c3a8

…ity_events/api/ServerPlayerEntityCopyCallback.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

Update library/entity/entity_events/src/main/java/org/quiltmc/qsl/ent…

8a58ec1

…ity_events/api/LivingEntityDeathCallback.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

Rename some entity world change events

cfe4f92

Merge branch '1.19' into entity

1defed0

EnnuiL suggested changes Sep 14, 2022

View reviewed changes

williambl and others added 5 commits September 22, 2022 09:08

Update library/entity/entity_events/src/main/java/org/quiltmc/qsl/ent…

9f3afbd

…ity_events/api/EntityReviveEvents.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

Update library/entity/entity_events/src/main/java/org/quiltmc/qsl/ent…

e7e12f2

…ity_events/api/EntityWorldChangeEvents.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

Update library/entity/entity_events/src/main/java/org/quiltmc/qsl/ent…

5b0286b

…ity_events/api/EntityWorldChangeEvents.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

Update library/entity/entity_events/src/main/java/org/quiltmc/qsl/ent…

8995107

…ity_events/api/EntityReviveEvents.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

Update library/entity/entity_events/src/main/java/org/quiltmc/qsl/ent…

5847a75

…ity_events/api/EntityWorldChangeEvents.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

williambl requested a review from EnnuiL September 22, 2022 09:09

Merge branch '1.19' into entity

5518b89

EnnuiL approved these changes Sep 26, 2022

View reviewed changes

EnnuiL removed request for a team and LambdAurora September 26, 2022 19:19

EnnuiL suggested changes Sep 26, 2022

View reviewed changes

...entity/entity_events/src/main/java/org/quiltmc/qsl/entity_events/api/EntityReviveEvents.java Outdated Show resolved Hide resolved

Update library/entity/entity_events/src/main/java/org/quiltmc/qsl/ent…

0e9ad2d

…ity_events/api/EntityReviveEvents.java Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

williambl requested a review from EnnuiL September 26, 2022 21:23

EnnuiL approved these changes Sep 27, 2022

View reviewed changes

EnnuiL added the final-comment-period label Sep 27, 2022

OroArmor self-requested a review September 28, 2022 21:42

OroArmor approved these changes Sep 28, 2022

View reviewed changes

...y_events/src/main/java/org/quiltmc/qsl/entity_events/api/ServerPlayerEntityCopyCallback.java Show resolved Hide resolved

Merge branch '1.19' into entity

1757579

EnnuiL merged commit aa226fb into QuiltMC:1.19 Oct 5, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Entity Events module #42

Entity Events module #42

williambl commented Oct 17, 2021 •

edited

Loading

williambl commented Oct 31, 2021

BasiqueEvangelist commented Nov 14, 2021

williambl commented Nov 19, 2021

williambl commented Nov 21, 2021

williambl commented Nov 22, 2021

BasiqueEvangelist commented Nov 23, 2021

TheGlitch76 commented Feb 24, 2022

williambl commented Feb 26, 2022

LambdAurora left a comment •

edited

Loading

EnnuiL left a comment

williambl commented Sep 14, 2022

EnnuiL left a comment

EnnuiL left a comment

EnnuiL left a comment

OroArmor left a comment

Entity Events module #42

Entity Events module #42

Conversation

williambl commented Oct 17, 2021 • edited Loading

williambl commented Oct 31, 2021

BasiqueEvangelist commented Nov 14, 2021

williambl commented Nov 19, 2021

williambl commented Nov 21, 2021

williambl commented Nov 22, 2021

BasiqueEvangelist commented Nov 23, 2021

TheGlitch76 commented Feb 24, 2022

williambl commented Feb 26, 2022

LambdAurora left a comment • edited Loading

Choose a reason for hiding this comment

EnnuiL left a comment

Choose a reason for hiding this comment

williambl commented Sep 14, 2022

EnnuiL left a comment

Choose a reason for hiding this comment

EnnuiL left a comment

Choose a reason for hiding this comment

EnnuiL left a comment

Choose a reason for hiding this comment

OroArmor left a comment

Choose a reason for hiding this comment

williambl commented Oct 17, 2021 •

edited

Loading

LambdAurora left a comment •

edited

Loading