Made event interfaces extend from their base interfaces.

src/api/java/noppes/npcs/api/event/ICustomGuiEvent.java

@@ -13,16 +13,16 @@ public interface ICustomGuiEvent extends ICustomNPCsEvent {
 
     int getId();
 
-    interface ButtonEvent {
+    interface ButtonEvent extends ICustomGuiEvent {
     }
 
-    interface UnfocusedEvent {
+    interface UnfocusedEvent extends ICustomGuiEvent {
     }
 
-    interface CloseEvent {
+    interface CloseEvent extends ICustomGuiEvent {
     }
 
-    interface ScrollEvent {
+    interface ScrollEvent extends ICustomGuiEvent {
         String[] getSelection();
 
         boolean doubleClick();
@@ -30,12 +30,12 @@ public interface ICustomGuiEvent extends ICustomNPCsEvent {
         int getScrollIndex();
     }
 
-    interface SlotEvent {
+    interface SlotEvent extends ICustomGuiEvent {
         IItemStack getStack();
     }
 
     @Cancelable
-    interface SlotClickEvent {
+    interface SlotClickEvent extends ICustomGuiEvent {
         IItemStack getStack();
 
         int getDragType();

src/api/java/noppes/npcs/api/event/ICustomNPCsEvent.java

@@ -7,7 +7,7 @@ import noppes.npcs.api.handler.data.INaturalSpawn;
 public interface ICustomNPCsEvent {
 
     @Cancelable
-    interface CNPCNaturalSpawnEvent {
+    interface CNPCNaturalSpawnEvent extends ICustomNPCsEvent {
         INaturalSpawn getNaturalSpawn();
 
         void setAttemptPosition(IPos attemptPosition);

src/api/java/noppes/npcs/api/event/IDialogEvent.java

@@ -11,13 +11,13 @@ public interface IDialogEvent extends ICustomNPCsEvent {
     IDialog getDialog();
 
     @Cancelable
-    interface DialogOpen {
+    interface DialogOpen extends IDialogEvent {
     }
 
     @Cancelable
-    interface DialogOption {
+    interface DialogOption extends IDialogEvent {
     }
 
-    interface DialogClosed {
+    interface DialogClosed extends IDialogEvent {
     }
 }

src/api/java/noppes/npcs/api/event/IFactionEvent.java

@@ -11,7 +11,7 @@ public interface IFactionEvent extends ICustomNPCsEvent {
     IFaction getFaction();
 
     @Cancelable
-    interface FactionPoints {
+    interface FactionPoints extends IFactionEvent {
         boolean decreased();
 
         int getPoints();

src/api/java/noppes/npcs/api/event/IForgeEvent.java

@@ -8,14 +8,14 @@ public interface IForgeEvent extends ICustomNPCsEvent {
 
     Event getEvent();
 
-    interface WorldEvent {
+    interface WorldEvent extends IForgeEvent {
         IWorld getWorld();
     }
 
-    interface EntityEvent {
+    interface EntityEvent extends IForgeEvent {
         IEntity getEntity();
     }
 
-    interface InitEvent {
+    interface InitEvent extends IForgeEvent {
     }
 }

src/api/java/noppes/npcs/api/event/IItemEvent.java

@@ -9,31 +9,31 @@ public interface IItemEvent extends ICustomNPCsEvent {
 
     IItemCustom getItem();
 
-    interface InitEvent {
+    interface InitEvent extends IItemEvent {
     }
 
-    interface UpdateEvent {
+    interface UpdateEvent extends IItemEvent {
         IEntity getEntity();
     }
 
     @Cancelable
-    interface TossedEvent {
+    interface TossedEvent extends IItemEvent {
         IEntity getEntity();
 
         IPlayer getPlayer();
     }
 
-    interface PickedUpEvent {
+    interface PickedUpEvent extends IItemEvent {
         IPlayer getPlayer();
     }
 
     @Cancelable
-    interface SpawnEvent {
+    interface SpawnEvent extends IItemEvent {
         IEntity getEntity();
     }
 
     @Cancelable
-    interface InteractEvent {
+    interface InteractEvent extends IItemEvent {
         int getType();
 
         IEntity getTarget();
@@ -42,7 +42,7 @@ public interface IItemEvent extends ICustomNPCsEvent {
     }
 
     @Cancelable
-    interface AttackEvent {
+    interface AttackEvent extends IItemEvent {
         int getType();
 
         IEntity getTarget();
@@ -50,25 +50,25 @@ public interface IItemEvent extends ICustomNPCsEvent {
         IEntity getSwingingEntity();
     }
 
-    interface StartUsingItem {
+    interface StartUsingItem extends IItemEvent {
         IPlayer getPlayer();
 
         int getDuration();
     }
 
-    interface UsingItem {
+    interface UsingItem extends IItemEvent {
         IPlayer getPlayer();
 
         int getDuration();
     }
 
-    interface StopUsingItem {
+    interface StopUsingItem extends IItemEvent {
         IPlayer getPlayer();
 
         int getDuration();
     }
 
-    interface FinishUsingItem {
+    interface FinishUsingItem extends IItemEvent {
         IPlayer getPlayer();
 
         int getDuration();

src/api/java/noppes/npcs/api/event/INpcEvent.java

@@ -13,16 +13,16 @@ public interface INpcEvent extends ICustomNPCsEvent {
 
     ICustomNpc getNpc();
 
-    interface TimerEvent {
+    interface TimerEvent extends INpcEvent {
         int getId();
     }
 
-    interface CollideEvent {
+    interface CollideEvent extends INpcEvent{
         IEntity getEntity();
     }
 
     @Cancelable
-    interface DamagedEvent {
+    interface DamagedEvent extends INpcEvent {
 
         IEntity getSource();
 
@@ -40,7 +40,7 @@ public interface INpcEvent extends ICustomNPCsEvent {
     }
 
     @Cancelable
-    interface RangedLaunchedEvent {
+    interface RangedLaunchedEvent extends INpcEvent {
         IEntityLivingBase getTarget();
 
         void setDamage(float damage);
@@ -49,7 +49,7 @@ public interface INpcEvent extends ICustomNPCsEvent {
     }
 
     @Cancelable
-    interface MeleeAttackEvent {
+    interface MeleeAttackEvent extends INpcEvent {
         IEntityLivingBase getTarget();
 
         void setDamage(float damage);
@@ -62,7 +62,7 @@ public interface INpcEvent extends ICustomNPCsEvent {
     }
 
     @Cancelable
-    interface DiedEvent {
+    interface DiedEvent extends INpcEvent {
         IEntity getSource();
 
         IDamageSource getDamageSource();
@@ -79,12 +79,12 @@ public interface INpcEvent extends ICustomNPCsEvent {
     }
 
     @Cancelable
-    interface InteractEvent {
+    interface InteractEvent extends INpcEvent {
         IPlayer getPlayer();
     }
 
     @Cancelable
-    interface DialogEvent {
+    interface DialogEvent extends INpcEvent {
         IPlayer getPlayer();
 
         IDialog getDialog();
@@ -94,7 +94,7 @@ public interface INpcEvent extends ICustomNPCsEvent {
         int getOptionId();
     }
 
-    interface DialogClosedEvent {
+    interface DialogClosedEvent extends INpcEvent {
         IPlayer getPlayer();
 
         IDialog getDialog();
@@ -105,20 +105,20 @@ public interface INpcEvent extends ICustomNPCsEvent {
     }
 
     @Cancelable
-    interface TargetLostEvent {
+    interface TargetLostEvent extends INpcEvent {
         IEntityLivingBase getTarget();
     }
 
     @Cancelable
-    interface TargetEvent {
+    interface TargetEvent extends INpcEvent {
         void setTarget(IEntityLivingBase entity);
 
         IEntityLivingBase getTarget();
     }
 
-    interface UpdateEvent {
+    interface UpdateEvent extends INpcEvent {
     }
 
-    interface InitEvent {
+    interface InitEvent extends INpcEvent {
     }
 }

src/api/java/noppes/npcs/api/event/IPlayerEvent.java

@@ -14,13 +14,13 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
     IPlayer getPlayer();
 
     @Cancelable
-    interface ChatEvent {
+    interface ChatEvent extends IPlayerEvent {
         void setMessage(String message);
 
         String getMessage();
     }
 
-    interface KeyPressedEvent {
+    interface KeyPressedEvent extends IPlayerEvent {
         int getKey();
 
         boolean isCtrlPressed();
@@ -36,7 +36,7 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
         int[] getKeysDown();
     }
 
-    interface MouseClickedEvent {
+    interface MouseClickedEvent extends IPlayerEvent {
         int getButton();
 
         int getMouseWheel();
@@ -54,35 +54,35 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
         int[] getKeysDown();
     }
 
-    interface PickupXPEvent {
+    interface PickupXPEvent extends IPlayerEvent {
         int getAmount();
     }
 
-    interface LevelUpEvent {
+    interface LevelUpEvent extends IPlayerEvent {
         int getChange();
     }
 
-    interface LogoutEvent {
+    interface LogoutEvent extends IPlayerEvent {
     }
 
-    interface LoginEvent {
+    interface LoginEvent extends IPlayerEvent {
     }
 
-    interface RespawnEvent {
+    interface RespawnEvent extends IPlayerEvent {
     }
 
-    interface ChangedDimension {
+    interface ChangedDimension extends IPlayerEvent {
         int getFromDim();
 
         int getToDim();
     }
 
-    interface TimerEvent {
+    interface TimerEvent extends IPlayerEvent {
         int getId();
     }
 
     @Cancelable
-    interface AttackedEvent {
+    interface AttackedEvent extends IPlayerEvent {
         IDamageSource getDamageSource();
 
         IEntity getSource();
@@ -91,7 +91,7 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
     }
 
     @Cancelable
-    interface DamagedEvent {
+    interface DamagedEvent extends IPlayerEvent {
         IDamageSource getDamageSource();
 
         IEntity getSource();
@@ -100,11 +100,11 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
     }
 
     @Cancelable
-    interface LightningEvent {
+    interface LightningEvent extends IPlayerEvent {
     }
 
     @Cancelable
-    interface SoundEvent {
+    interface SoundEvent extends IPlayerEvent {
         String getName();
 
         float getPitch();
@@ -113,18 +113,18 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
     }
 
     @Cancelable
-    interface FallEvent {
+    interface FallEvent extends IPlayerEvent {
         float getDistance();
     }
 
-    interface JumpEvent {
+    interface JumpEvent extends IPlayerEvent {
     }
 
-    interface KilledEntityEvent {
+    interface KilledEntityEvent extends IPlayerEvent {
         IEntityLivingBase getEntity();
     }
 
-    interface DiedEvent {
+    interface DiedEvent extends IPlayerEvent {
         IDamageSource getDamageSource();
 
         String getType();
@@ -133,14 +133,14 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
     }
 
     @Cancelable
-    interface RangedLaunchedEvent {
+    interface RangedLaunchedEvent extends IPlayerEvent {
         IItemStack getBow();
 
         int getCharge();
     }
 
     @Cancelable
-    interface AttackEvent {
+    interface AttackEvent extends IPlayerEvent {
         IDamageSource getDamageSource();
 
         IEntity getTarget();
@@ -149,7 +149,7 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
     }
 
     @Cancelable
-    interface DamagedEntityEvent {
+    interface DamagedEntityEvent extends IPlayerEvent {
         IDamageSource getDamageSource();
 
         IEntity getTarget();
@@ -157,74 +157,74 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
         float getDamage();
     }
 
-    interface ContainerClosed {
+    interface ContainerClosed extends IPlayerEvent {
         IContainer getContainer();
     }
 
-    interface ContainerOpen {
+    interface ContainerOpen extends IPlayerEvent {
         IContainer getContainer();
     }
 
     @Cancelable
-    interface PickUpEvent {
+    interface PickUpEvent extends IPlayerEvent {
         IItemStack getItem();
     }
 
     @Cancelable
-    interface DropEvent {
+    interface DropEvent extends IPlayerEvent {
         IItemStack[] getItems();
     }
 
     @Cancelable
-    interface TossEvent {
+    interface TossEvent extends IPlayerEvent {
         IItemStack getItem();
     }
 
     @Cancelable
-    interface InteractEvent {
+    interface InteractEvent extends IPlayerEvent {
         int getType();
 
         IEntity getTarget();
     }
 
-    interface UpdateEvent {
+    interface UpdateEvent extends IPlayerEvent {
     }
 
-    interface InitEvent {
+    interface InitEvent extends IPlayerEvent {
     }
 
-    interface StartUsingItem {
+    interface StartUsingItem extends IPlayerEvent {
         IItemStack getItem();
 
         int getDuration();
     }
 
-    interface UsingItem {
+    interface UsingItem extends IPlayerEvent {
         IItemStack getItem();
 
         int getDuration();
     }
 
-    interface StopUsingItem {
+    interface StopUsingItem extends IPlayerEvent {
         IItemStack getItem();
 
         int getDuration();
     }
 
-    interface FinishUsingItem {
+    interface FinishUsingItem extends IPlayerEvent {
         IItemStack getItem();
 
         int getDuration();
     }
 
     @Cancelable
-    interface BreakEvent {
+    interface BreakEvent extends IPlayerEvent {
         IBlock getBlock();
 
         int getExp();
     }
 
-    interface UseHoeEvent {
+    interface UseHoeEvent extends IPlayerEvent {
         IItemStack getHoe();
 
         int getX();
@@ -234,11 +234,11 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
         int getZ();
     }
 
-    interface WakeUpEvent {
+    interface WakeUpEvent extends IPlayerEvent {
         boolean setSpawn();
     }
 
-    interface SleepEvent {
+    interface SleepEvent extends IPlayerEvent {
         int getX();
 
         int getY();
@@ -246,17 +246,17 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
         int getZ();
     }
 
-    interface AchievementEvent {
+    interface AchievementEvent extends IPlayerEvent {
         String getDescription();
     }
 
-    interface FillBucketEvent {
+    interface FillBucketEvent extends IPlayerEvent {
         IItemStack getCurrent() ;
 
         IItemStack getFilled();
     }
 
-    interface BonemealEvent {
+    interface BonemealEvent extends IPlayerEvent {
         IBlock getBlock();
 
         int getX();
@@ -266,6 +266,6 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
         int getZ();
     }
 
-    interface RangedChargeEvent {
+    interface RangedChargeEvent extends IPlayerEvent {
     }
 }

src/api/java/noppes/npcs/api/event/IQuestEvent.java

@@ -11,15 +11,15 @@ public interface IQuestEvent extends ICustomNPCsEvent {
 
     IQuest getQuest();
 
-    interface QuestCompletedEvent {
+    interface QuestCompletedEvent extends IQuestEvent {
     }
 
     @Cancelable
-    interface QuestStartEvent {
+    interface QuestStartEvent extends IQuestEvent {
     }
 
     @Cancelable
-    interface QuestTurnedInEvent {
+    interface QuestTurnedInEvent extends IQuestEvent {
         void setExpReward(int expReward);
 
         void setItemRewards(IItemStack[] itemRewards);