drop a bunch of events

SpongePowered · May 29, 2021 · 5e41643 · 5e41643
1 parent 52e4dfb
commit 5e41643
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 324 deletions.
diff --git a/src/main/java/org/spongepowered/api/event/advancement/AdvancementEvent.java b/src/main/java/org/spongepowered/api/event/advancement/AdvancementEvent.java
@@ -26,7 +26,6 @@
 
 import org.spongepowered.api.advancement.Advancement;
 import org.spongepowered.api.advancement.criteria.AdvancementCriterion;
-import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.entity.living.player.server.ServerPlayer;
 import org.spongepowered.api.event.Event;
 import org.spongepowered.api.event.message.MessageCancellable;

diff --git a/src/main/java/org/spongepowered/api/event/entity/ChangeEntityExperienceEvent.java b/src/main/java/org/spongepowered/api/event/entity/ChangeEntityExperienceEvent.java
diff --git a/src/main/java/org/spongepowered/api/event/entity/ChangeEntityPotionEffectEvent.java b/src/main/java/org/spongepowered/api/event/entity/ChangeEntityPotionEffectEvent.java
diff --git a/src/main/java/org/spongepowered/api/event/entity/HarvestEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/HarvestEntityEvent.java
@@ -46,11 +46,11 @@ public interface HarvestEntityEvent extends Event, Cancellable {
     Entity entity();
 
     /**
-     * An event where the target is a {@link Player}. Usually this will
+     * An event where the target is a {@link org.spongepowered.api.entity.living.player.Player}. Usually this will
      * have additional information regarding whether the player
      * {@link #keepsInventory()} and their current experience.
      */
-    interface TargetPlayer extends HarvestEntityEvent, ChangeEntityExperienceEvent {
+    interface Player extends HarvestEntityEvent {
 
         @Override
         ServerPlayer entity();
@@ -96,5 +96,27 @@ interface TargetPlayer extends HarvestEntityEvent, ChangeEntityExperienceEvent {
          * @param level The new level after death
          */
         void setLevel(int level);
+
+        /**
+         * Gets the original experience unmodified by event changes.
+         *
+         * @return The experience
+         */
+        int originalExperience();
+
+        /**
+         * Gets the experience after an event has been processed.
+         *
+         * @return The experience to receive
+         */
+        int experience();
+
+        /**
+         * Sets the amount of experience after an event has been processed.
+         * Negative values will remove experience.
+         *
+         * @param exp The experience to give or take
+         */
+        void setExperience(int exp);
     }
 }
diff --git a/src/main/java/org/spongepowered/api/event/entity/living/ChangeGameModeEvent.java b/src/main/java/org/spongepowered/api/event/entity/living/ChangeGameModeEvent.java
diff --git a/src/main/java/org/spongepowered/api/event/lifecycle/EngineLifecycleEvent.java b/src/main/java/org/spongepowered/api/event/lifecycle/EngineLifecycleEvent.java
@@ -26,7 +26,9 @@
 
 import org.spongepowered.api.Engine;
 import org.spongepowered.api.event.GenericEvent;
+import org.spongepowered.api.util.annotation.eventgen.NoFactoryMethod;
 
+@NoFactoryMethod
 public interface EngineLifecycleEvent<E extends Engine> extends GenericEvent<E>, LifecycleEvent {
 
     /**

diff --git a/...in/java/org/spongepowered/api/event/lifecycle/RegisterProfessionTradeGeneratorsEvent.java b/...in/java/org/spongepowered/api/event/lifecycle/RegisterProfessionTradeGeneratorsEvent.java
diff --git a/...ain/java/org/spongepowered/api/event/lifecycle/RegisterWanderingTradeGeneratorsEvent.java b/...ain/java/org/spongepowered/api/event/lifecycle/RegisterWanderingTradeGeneratorsEvent.java
diff --git a/src/main/java/org/spongepowered/api/event/message/MessageCancellable.java b/src/main/java/org/spongepowered/api/event/message/MessageCancellable.java
@@ -25,10 +25,12 @@
 package org.spongepowered.api.event.message;
 
 import net.kyori.adventure.text.Component;
+import org.spongepowered.api.util.annotation.eventgen.NoFactoryMethod;
 
 /**
  * Represents an event whose message can be cancelled.
  */
+@NoFactoryMethod
 public interface MessageCancellable {
 
     /**