From 9f59b8843ef8e493d3a53a36d28897661ff952c8 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 23 Sep 2024 13:56:50 -0400 Subject: [PATCH] Revert "Implemented animation events and made some event classes abstract." This reverts commit cd180e4520d766f927fb954433fd7812155a501f. --- java/noppes/npcs/api/entity/IAnimatable.java | 8 ---- java/noppes/npcs/api/entity/ICustomNpc.java | 2 +- java/noppes/npcs/api/entity/IPlayer.java | 2 +- .../npcs/api/event/IAnimationEvent.java | 40 ------------------- .../npcs/api/handler/data/IAnimation.java | 2 - .../npcs/api/handler/data/IAnimationData.java | 4 -- 6 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 java/noppes/npcs/api/entity/IAnimatable.java delete mode 100644 java/noppes/npcs/api/event/IAnimationEvent.java diff --git a/java/noppes/npcs/api/entity/IAnimatable.java b/java/noppes/npcs/api/entity/IAnimatable.java deleted file mode 100644 index 9d7fbc9..0000000 --- a/java/noppes/npcs/api/entity/IAnimatable.java +++ /dev/null @@ -1,8 +0,0 @@ -package noppes.npcs.api.entity; - -import noppes.npcs.api.handler.data.IAnimationData; - -public interface IAnimatable { - - IAnimationData getAnimationData(); -} diff --git a/java/noppes/npcs/api/entity/ICustomNpc.java b/java/noppes/npcs/api/entity/ICustomNpc.java index 9937e95..ddcc35d 100644 --- a/java/noppes/npcs/api/entity/ICustomNpc.java +++ b/java/noppes/npcs/api/entity/ICustomNpc.java @@ -13,7 +13,7 @@ import noppes.npcs.api.item.IItemStack; import noppes.npcs.api.jobs.IJob; import noppes.npcs.api.roles.IRole; -public interface ICustomNpc extends IEntityLiving, IAnimatable { +public interface ICustomNpc extends IEntityLiving { /** * @return Returns the current npcs size 1-30 */ diff --git a/java/noppes/npcs/api/entity/IPlayer.java b/java/noppes/npcs/api/entity/IPlayer.java index f8d2432..185e79b 100644 --- a/java/noppes/npcs/api/entity/IPlayer.java +++ b/java/noppes/npcs/api/entity/IPlayer.java @@ -13,7 +13,7 @@ import noppes.npcs.api.handler.data.ISound; import noppes.npcs.api.item.IItemStack; import noppes.npcs.api.overlay.ICustomOverlay; -public interface IPlayer extends IEntityLivingBase, IAnimatable { +public interface IPlayer extends IEntityLivingBase { /** * @return Returns the displayed name of the player */ diff --git a/java/noppes/npcs/api/event/IAnimationEvent.java b/java/noppes/npcs/api/event/IAnimationEvent.java deleted file mode 100644 index 400c597..0000000 --- a/java/noppes/npcs/api/event/IAnimationEvent.java +++ /dev/null @@ -1,40 +0,0 @@ -package noppes.npcs.api.event; - -import cpw.mods.fml.common.eventhandler.Cancelable; -import noppes.npcs.api.entity.IAnimatable; -import noppes.npcs.api.handler.data.IAnimation; -import noppes.npcs.api.handler.data.IAnimationData; -import noppes.npcs.api.handler.data.IFrame; - -public interface IAnimationEvent extends ICustomNPCsEvent { - - IAnimation getAnimation(); - - IAnimationData getAnimationData(); - - IAnimatable getEntity(); - - @Cancelable - interface Started extends IAnimationEvent { - - } - - interface Ended extends IAnimationEvent { - - } - - interface IFrameEvent extends IAnimationEvent { - - int getIndex(); - - IFrame getFrame(); - - interface Entered extends IFrameEvent { - - } - - interface Exited extends IFrameEvent { - - } - } -} diff --git a/java/noppes/npcs/api/handler/data/IAnimation.java b/java/noppes/npcs/api/handler/data/IAnimation.java index 469359e..f502937 100644 --- a/java/noppes/npcs/api/handler/data/IAnimation.java +++ b/java/noppes/npcs/api/handler/data/IAnimation.java @@ -2,8 +2,6 @@ package noppes.npcs.api.handler.data; public interface IAnimation { - IAnimationData getParent(); - IFrame currentFrame(); IFrame[] getFrames(); diff --git a/java/noppes/npcs/api/handler/data/IAnimationData.java b/java/noppes/npcs/api/handler/data/IAnimationData.java index 269bedd..82f3bcf 100644 --- a/java/noppes/npcs/api/handler/data/IAnimationData.java +++ b/java/noppes/npcs/api/handler/data/IAnimationData.java @@ -1,11 +1,7 @@ package noppes.npcs.api.handler.data; -import noppes.npcs.api.entity.IAnimatable; - public interface IAnimationData { - IAnimatable getEntity(); - void updateClient(); boolean isActive();