More work on things

LanternPowered · Aug 17, 2018 · cabc06f · cabc06f
1 parent 2b96cad
commit cabc06f
Show file tree

Hide file tree

Showing 142 changed files with 1,645 additions and 3,063 deletions.
diff --git a/...in/java/org/lanternpowered/server/effect/entity/animation/DefaultLivingHurtAnimation.java b/...in/java/org/lanternpowered/server/effect/entity/animation/DefaultLivingHurtAnimation.java
@@ -27,7 +27,7 @@
 
 import org.lanternpowered.server.effect.entity.EntityEffect;
 import org.lanternpowered.server.entity.LanternEntity;
-import org.lanternpowered.server.entity.event.EntityDamagedShardevent;
+import org.lanternpowered.api.entity.event.animation.DamageEntityAnimation;
 
 /**
  * Plays a entity hurt animation. This will make a
@@ -37,6 +37,6 @@ public class DefaultLivingHurtAnimation implements EntityEffect {
 
     @Override
     public void play(LanternEntity entity) {
-        entity.getShardeventBus().post(new EntityDamagedShardevent());
+        entity.getShardeventBus().post(new DamageEntityAnimation());
     }
 }
diff --git a/src/main/java/org/lanternpowered/server/entity/LanternEntity.java b/src/main/java/org/lanternpowered/server/entity/LanternEntity.java
@@ -42,7 +42,7 @@
 import org.lanternpowered.server.data.key.LanternKeys;
 import org.lanternpowered.server.data.property.AbstractPropertyHolder;
 import org.lanternpowered.server.effect.entity.EntityEffectCollection;
-import org.lanternpowered.server.entity.event.EntityDamagedShardevent;
+import org.lanternpowered.api.entity.event.animation.DamageEntityAnimation;
 import org.lanternpowered.server.entity.interfaces.IEntity;
 import org.lanternpowered.server.entity.living.player.LanternPlayer;
 import org.lanternpowered.server.event.LanternEventContextKeys;
@@ -713,7 +713,7 @@ public Random getRandom() {
         return this.random;
     }
 
-    private static final EntityDamagedShardevent ENTITY_DAMAGED_SHARDEVENT = new EntityDamagedShardevent();
+    private static final DamageEntityAnimation ENTITY_DAMAGED_SHARDEVENT = new DamageEntityAnimation();
 
     @Override
     public boolean damage(double damage, DamageSource damageSource) {

diff --git a/src/main/java/org/lanternpowered/server/entity/LanternHumanoid.java b/src/main/java/org/lanternpowered/server/entity/LanternHumanoid.java
@@ -27,7 +27,6 @@
 
 import org.lanternpowered.server.data.key.LanternKeys;
 import org.lanternpowered.server.entity.interfaces.living.IHumanoid;
-import org.spongepowered.api.entity.living.Humanoid;
 
 import java.util.HashSet;
 import java.util.UUID;

diff --git a/src/main/java/org/lanternpowered/server/entity/LanternItem.java b/src/main/java/org/lanternpowered/server/entity/LanternItem.java
@@ -32,8 +32,8 @@
 import org.lanternpowered.server.effect.entity.EntityEffectCollection;
 import org.lanternpowered.server.effect.entity.EntityEffectTypes;
 import org.lanternpowered.server.effect.entity.particle.item.ItemDeathParticleEffect;
-import org.lanternpowered.server.entity.shards.NetworkShard;
-import org.lanternpowered.server.entity.event.CollectEntityShardevent;
+import org.lanternpowered.server.entity.shard.NetworkShard;
+import org.lanternpowered.api.entity.event.animation.CollectEntityAnimation;
 import org.lanternpowered.server.event.LanternEventContextKeys;
 import org.lanternpowered.server.inventory.IInventory;
 import org.lanternpowered.server.inventory.LanternItemStack;
@@ -230,7 +230,7 @@ private void tryToPickupItems() {
                     .forEach(transaction -> transaction.getSlot().set(transaction.getFinal().createStack()));
             final int added = originalStack.getQuantity() - stack.getQuantity();
             if (added != 0 && entity instanceof Living) {
-                getShardeventBus().post(new CollectEntityShardevent((Living) entity, added));
+                getShardeventBus().post(new CollectEntityAnimation((Living) entity, added));
             }
             if (isRemoved()) {
                 stack.clear();

diff --git a/src/main/java/org/lanternpowered/server/entity/event/CollectEntityShardevent.java b/src/main/java/org/lanternpowered/server/entity/event/CollectEntityShardevent.java
diff --git a/src/main/java/org/lanternpowered/server/entity/event/EntityWorldShardevent.java b/src/main/java/org/lanternpowered/server/entity/event/EntityWorldShardevent.java
diff --git a/src/main/java/org/lanternpowered/server/entity/interfaces/IFallingBlock.java b/src/main/java/org/lanternpowered/server/entity/interfaces/IFallingBlock.java
diff --git a/src/main/java/org/lanternpowered/server/entity/interfaces/IItem.java b/src/main/java/org/lanternpowered/server/entity/interfaces/IItem.java
diff --git a/src/main/java/org/lanternpowered/server/entity/interfaces/IMerchantEntity.java b/src/main/java/org/lanternpowered/server/entity/interfaces/IMerchantEntity.java
diff --git a/src/main/java/org/lanternpowered/server/entity/interfaces/IShulkerBullet.java b/src/main/java/org/lanternpowered/server/entity/interfaces/IShulkerBullet.java
diff --git a/src/main/java/org/lanternpowered/server/entity/interfaces/ITamerEntity.java b/src/main/java/org/lanternpowered/server/entity/interfaces/ITamerEntity.java