diff --git a/java/noppes/npcs/api/event/IAnimationEvent.java b/java/noppes/npcs/api/event/IAnimationEvent.java
index 400c597..e5ce165 100644
--- a/java/noppes/npcs/api/event/IAnimationEvent.java
+++ b/java/noppes/npcs/api/event/IAnimationEvent.java
@@ -14,11 +14,17 @@ public interface IAnimationEvent extends ICustomNPCsEvent {
 
     IAnimatable getEntity();
 
+    /**
+     * @hookName animationStart
+     */
     @Cancelable
     interface Started extends IAnimationEvent {
 
     }
 
+    /**
+     * @hookName animationEnd
+     */
     interface Ended extends IAnimationEvent {
 
     }
@@ -29,10 +35,16 @@ public interface IAnimationEvent extends ICustomNPCsEvent {
 
         IFrame getFrame();
 
+        /**
+         * @hookName frameEnter
+         */
         interface Entered extends IFrameEvent {
 
         }
 
+        /**
+         * @hookName frameExit
+         */
         interface Exited extends IFrameEvent {
 
         }
diff --git a/java/noppes/npcs/api/event/IBlockEvent.java b/java/noppes/npcs/api/event/IBlockEvent.java
index 2e85076..bd7d65f 100644
--- a/java/noppes/npcs/api/event/IBlockEvent.java
+++ b/java/noppes/npcs/api/event/IBlockEvent.java
@@ -8,6 +8,9 @@ import noppes.npcs.api.entity.IPlayer;
 
 public interface IBlockEvent extends ICustomNPCsEvent {
     IBlock getBlock();
+    /**
+     * @hookName fallenUpon
+     */
     @Cancelable
     interface EntityFallenUponEvent extends IBlockEvent{
         IEntity getEntity();
@@ -31,6 +34,9 @@ public interface IBlockEvent extends ICustomNPCsEvent {
         int getPrevPower();
         int getPower();
     }
+    /**
+     * @hookName broken
+     */
     interface BreakEvent extends IBlockEvent{
 
     }
@@ -38,6 +44,9 @@ public interface IBlockEvent extends ICustomNPCsEvent {
     interface ExplodedEvent extends IBlockEvent{
 
     }
+    /**
+     * @hookName rainFilled
+     */
     interface RainFillEvent extends IBlockEvent{
 
     }
@@ -49,6 +58,9 @@ public interface IBlockEvent extends ICustomNPCsEvent {
     interface InitEvent extends IBlockEvent{
 
     }
+    /**
+     * @hookName tick
+     */
     interface UpdateEvent extends IBlockEvent{
 
     }
diff --git a/java/noppes/npcs/api/event/ICustomGuiEvent.java b/java/noppes/npcs/api/event/ICustomGuiEvent.java
index b3f905e..d5b3578 100644
--- a/java/noppes/npcs/api/event/ICustomGuiEvent.java
+++ b/java/noppes/npcs/api/event/ICustomGuiEvent.java
@@ -10,15 +10,27 @@ public interface ICustomGuiEvent extends IPlayerEvent {
 
     int getId();
 
+    /**
+     * @hookName customGuiButton
+     */
     interface ButtonEvent extends ICustomGuiEvent {
     }
 
+    /**
+     * @hookName customGuiTextfield
+     */
     interface UnfocusedEvent extends ICustomGuiEvent {
     }
 
+    /**
+     * @hookName customGuiClosed
+     */
     interface CloseEvent extends ICustomGuiEvent {
     }
 
+    /**
+     * @hookName customGuiScroll
+     */
     interface ScrollEvent extends ICustomGuiEvent {
         String[] getSelection();
 
@@ -27,10 +39,16 @@ public interface ICustomGuiEvent extends IPlayerEvent {
         int getScrollIndex();
     }
 
+    /**
+     * @hookName customGuiSlot
+     */
     interface SlotEvent extends ICustomGuiEvent {
         IItemStack getStack();
     }
 
+    /**
+     * @hookName customGuiSlotClicked
+     */
     @Cancelable
     interface SlotClickEvent extends ICustomGuiEvent {
         IItemStack getStack();
diff --git a/java/noppes/npcs/api/event/ICustomNPCsEvent.java b/java/noppes/npcs/api/event/ICustomNPCsEvent.java
index bc82109..961ecf0 100644
--- a/java/noppes/npcs/api/event/ICustomNPCsEvent.java
+++ b/java/noppes/npcs/api/event/ICustomNPCsEvent.java
@@ -9,6 +9,9 @@ public interface ICustomNPCsEvent {
 
     String getHookName();
 
+    /**
+     * @hookName onCNPCNaturalSpawn
+     */
     @Cancelable
     interface CNPCNaturalSpawnEvent extends ICustomNPCsEvent {
         INaturalSpawn getNaturalSpawn();
diff --git a/java/noppes/npcs/api/event/IDialogEvent.java b/java/noppes/npcs/api/event/IDialogEvent.java
index 691a730..eda5e7a 100644
--- a/java/noppes/npcs/api/event/IDialogEvent.java
+++ b/java/noppes/npcs/api/event/IDialogEvent.java
@@ -15,6 +15,9 @@ public interface IDialogEvent extends IPlayerEvent {
     interface DialogOption extends IDialogEvent {
     }
 
+    /**
+     * @hookName dialogClose
+     */
     interface DialogClosed extends IDialogEvent {
     }
 }
diff --git a/java/noppes/npcs/api/event/IForgeEvent.java b/java/noppes/npcs/api/event/IForgeEvent.java
index 0dfc333..a88934c 100644
--- a/java/noppes/npcs/api/event/IForgeEvent.java
+++ b/java/noppes/npcs/api/event/IForgeEvent.java
@@ -8,14 +8,23 @@ public interface IForgeEvent extends ICustomNPCsEvent {
 
     Event getEvent();
 
+    /**
+     * @hookName forgeWorld
+     */
     interface WorldEvent extends IForgeEvent {
         IWorld getWorld();
     }
 
+    /**
+     * @hookName forgeEntity
+     */
     interface EntityEvent extends IForgeEvent {
         IEntity getEntity();
     }
 
+    /**
+     * @hookName forgeInit
+     */
     interface InitEvent extends IForgeEvent {
     }
 }
diff --git a/java/noppes/npcs/api/event/IItemEvent.java b/java/noppes/npcs/api/event/IItemEvent.java
index e522695..c6c2bde 100644
--- a/java/noppes/npcs/api/event/IItemEvent.java
+++ b/java/noppes/npcs/api/event/IItemEvent.java
@@ -13,6 +13,9 @@ public interface IItemEvent extends ICustomNPCsEvent {
     interface InitEvent extends IItemEvent {
     }
 
+    /**
+     * @hookName tick
+     */
     interface UpdateEvent extends IItemEvent {
         IEntity getEntity();
     }
@@ -60,6 +63,9 @@ public interface IItemEvent extends ICustomNPCsEvent {
         IEntity getSwingingEntity();
     }
 
+    /**
+     * @hookName startItem
+     */
     interface StartUsingItem extends IItemEvent {
         IPlayer getPlayer();
 
@@ -72,12 +78,18 @@ public interface IItemEvent extends ICustomNPCsEvent {
         int getDuration();
     }
 
+    /**
+     * @hookName stopItem
+     */
     interface StopUsingItem extends IItemEvent {
         IPlayer getPlayer();
 
         int getDuration();
     }
 
+    /**
+     * @hookName finishItem
+     */
     interface FinishUsingItem extends IItemEvent {
         IPlayer getPlayer();
 
diff --git a/java/noppes/npcs/api/event/ILinkedItemEvent.java b/java/noppes/npcs/api/event/ILinkedItemEvent.java
index d9f91b1..6e9194c 100644
--- a/java/noppes/npcs/api/event/ILinkedItemEvent.java
+++ b/java/noppes/npcs/api/event/ILinkedItemEvent.java
@@ -2,7 +2,9 @@ package noppes.npcs.api.event;
 
 public interface ILinkedItemEvent extends IItemEvent {
 
-    // Version Change Event
+    /**
+     * @hookName versionChanged
+     */
     interface VersionChangeEvent extends IItemEvent {
 
         int getVersion();
@@ -10,6 +12,9 @@ public interface ILinkedItemEvent extends IItemEvent {
         int getPreviousVersion();
     }
 
+    /**
+     * @hookName buildingItem
+     */
     interface BuildEvent extends IItemEvent {
     }
 }
diff --git a/java/noppes/npcs/api/event/INpcEvent.java b/java/noppes/npcs/api/event/INpcEvent.java
index d6bfa85..adcc400 100644
--- a/java/noppes/npcs/api/event/INpcEvent.java
+++ b/java/noppes/npcs/api/event/INpcEvent.java
@@ -57,6 +57,9 @@ public interface INpcEvent extends ICustomNPCsEvent {
         float getDamage();
     }
 
+    /**
+     * @hookName meleeSwing
+     */
     interface SwingEvent extends INpcEvent {
 
         /**
@@ -66,10 +69,16 @@ public interface INpcEvent extends ICustomNPCsEvent {
         IItemStack getItemStack();
     }
 
+    /**
+     * @hookName kills
+     */
     interface KilledEntityEvent {
         IEntityLivingBase getEntity();
     }
 
+    /**
+     * @hookName killed
+     */
     @Cancelable
     interface DiedEvent extends INpcEvent {
         IEntity getSource();
@@ -127,6 +136,9 @@ public interface INpcEvent extends ICustomNPCsEvent {
         IEntityLivingBase getTarget();
     }
 
+    /**
+     * @hookName tick
+     */
     interface UpdateEvent extends INpcEvent {
     }
 
diff --git a/java/noppes/npcs/api/event/IPlayerEvent.java b/java/noppes/npcs/api/event/IPlayerEvent.java
index 15d6619..82e82f8 100644
--- a/java/noppes/npcs/api/event/IPlayerEvent.java
+++ b/java/noppes/npcs/api/event/IPlayerEvent.java
@@ -73,6 +73,9 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
     interface RespawnEvent extends IPlayerEvent {
     }
 
+    /**
+     * @hookName changedDim
+     */
     interface ChangedDimension extends IPlayerEvent {
         int getFromDim();
 
@@ -105,6 +108,9 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
     interface LightningEvent extends IPlayerEvent {
     }
 
+    /**
+     * @hookName playSound
+     */
     @Cancelable
     interface SoundEvent extends IPlayerEvent {
         String getName();
@@ -122,10 +128,16 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
     interface JumpEvent extends IPlayerEvent {
     }
 
+    /**
+     * @hookName kills
+     */
     interface KilledEntityEvent extends IPlayerEvent {
         IEntityLivingBase getEntity();
     }
 
+    /**
+     * @hookName killed
+     */
     interface DiedEvent extends IPlayerEvent {
         IDamageSource getDamageSource();
 
@@ -198,12 +210,18 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
         IPlayer getPlayer();
     }
 
+    /**
+     * @hookName tick
+     */
     interface UpdateEvent extends IPlayerEvent {
     }
 
     interface InitEvent extends IPlayerEvent {
     }
 
+    /**
+     * @hookName startItem
+     */
     interface StartUsingItem extends IPlayerEvent {
         IItemStack getItem();
 
@@ -216,18 +234,27 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
         int getDuration();
     }
 
+    /**
+     * @hookName stopItem
+     */
     interface StopUsingItem extends IPlayerEvent {
         IItemStack getItem();
 
         int getDuration();
     }
 
+    /**
+     * @hookName finishItem
+     */
     interface FinishUsingItem extends IPlayerEvent {
         IItemStack getItem();
 
         int getDuration();
     }
 
+    /**
+     * @hookName breakBlock
+     */
     @Cancelable
     interface BreakEvent extends IPlayerEvent {
         IBlock getBlock();
@@ -284,12 +311,23 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
 
         IPlayerEffect getEffect();
 
+        /**
+         * @hookName onEffectAdd
+         */
         interface Added extends EffectEvent {
 
         }
+
+        /**
+         * @hookName onEffectTick
+         */
         interface Ticked extends EffectEvent {
 
         }
+
+        /**
+         * @hookName onEffectRemove
+         */
         interface Removed extends EffectEvent {
 
             /**
@@ -323,6 +361,9 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
          */
         boolean isPost();
 
+        /**
+         * @hookName profileChange
+         */
         @Cancelable
         interface Changed extends ProfileEvent {
             /**
@@ -331,9 +372,15 @@ public interface IPlayerEvent extends ICustomNPCsEvent {
             int getPrevSlot();
         }
 
+        /**
+         * @hookName profileCreate
+         */
         @Cancelable
         interface Create extends ProfileEvent {}
 
+        /**
+         * @hookName profileRemove
+         */
         @Cancelable
         interface Removed extends ProfileEvent {}
     }
diff --git a/java/noppes/npcs/api/event/IProjectileEvent.java b/java/noppes/npcs/api/event/IProjectileEvent.java
index 657c68d..949318f 100644
--- a/java/noppes/npcs/api/event/IProjectileEvent.java
+++ b/java/noppes/npcs/api/event/IProjectileEvent.java
@@ -9,9 +9,15 @@ public interface IProjectileEvent extends ICustomNPCsEvent {
     public IProjectile getProjectile();
     public IEntity getSource();
 
+    /**
+     * @hookName projectileTick
+     */
     interface UpdateEvent extends IProjectileEvent {
     }
 
+    /**
+     * @hookName projectileImpact
+     */
     interface ImpactEvent extends IProjectileEvent {
         public int getType();
         public IEntity getEntity();
diff --git a/java/noppes/npcs/api/event/IQuestEvent.java b/java/noppes/npcs/api/event/IQuestEvent.java
index 997c377..a871bc6 100644
--- a/java/noppes/npcs/api/event/IQuestEvent.java
+++ b/java/noppes/npcs/api/event/IQuestEvent.java
@@ -15,6 +15,9 @@ public interface IQuestEvent extends IPlayerEvent {
     interface QuestStartEvent extends IQuestEvent {
     }
 
+    /**
+     * @hookName questTurnIn
+     */
     @Cancelable
     interface QuestTurnedInEvent extends IQuestEvent {
         void setExpReward(int expReward);