[ci skip] Cleanup events (#10202)

patches/api/Add-PufferFishStateChangeEvent.patch

@@ -16,16 +16,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.entity.EntityEvent;
++import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
 + * Called just before a {@link PufferFish} inflates or deflates.
 + */
 +public class PufferFishStateChangeEvent extends EntityEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean cancelled;
-+    private int newPuffState;
 +
++    private static final HandlerList HANDLER_LIST = new HandlerList();
++
++    private final int newPuffState;
++    private boolean cancelled;
++
++    @ApiStatus.Internal
 +    public PufferFishStateChangeEvent(@NotNull PufferFish entity, int newPuffState) {
 +        super(entity);
 +        this.newPuffState = newPuffState;
@@ -34,7 +38,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @NotNull
 +    @Override
 +    public PufferFish getEntity() {
-+        return (PufferFish) entity;
++        return (PufferFish) super.getEntity();
 +    }
 +
 +    /**
@@ -42,6 +46,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * <p>
 +     * This is what the {@link PufferFish}'s new puff state will be after this event if it isn't cancelled.<br>
 +     * Refer to {@link PufferFish#getPuffState()} to get the current puff state.
++     *
 +     * @return The <strong>new</strong> puff state, 0 being not inflated, 1 being slightly inflated and 2 being fully inflated
 +     */
 +    public int getNewPuffState() {
@@ -50,24 +55,26 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    /**
 +     * Get if the {@link PufferFish} is going to inflate.
-+     * @return If its going to inflate
++     *
++     * @return If it's going to inflate
 +     */
 +    public boolean isInflating() {
-+        return getNewPuffState() > getEntity().getPuffState();
++        return this.newPuffState > this.getEntity().getPuffState();
 +    }
 +
 +    /**
 +     * Get if the {@link PufferFish} is going to deflate.
-+     * @return If its going to deflate
++     *
++     * @return If it's going to deflate
 +     */
 +    public boolean isDeflating() {
-+        return getNewPuffState() < getEntity().getPuffState();
++        return this.newPuffState < this.getEntity().getPuffState();
 +    }
 +
 +    /**
-+     * Set whether or not to cancel the {@link PufferFish} (in/de)flating.
++     * Set whether to cancel the {@link PufferFish} (in/de)flating.
 +     *
-+     * @param cancel true if you wish to cancel the (in/de)flation
++     * @param cancel {@code true} if you wish to cancel the (in/de)flation
 +     */
 +    @Override
 +    public void setCancelled(boolean cancel) {
@@ -76,17 +83,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    @Override
 +    public boolean isCancelled() {
-+        return cancelled;
++        return this.cancelled;
 +    }
 +
 +    @NotNull
 +    @Override
 +    public HandlerList getHandlers() {
-+        return handlers;
++        return HANDLER_LIST;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return handlers;
++        return HANDLER_LIST;
 +    }
 +}