Added extra priorities to support Sponge

MinecraftForge · Sep 17, 2014 · a5f229e · a5f229e
1 parent 5365f5e
commit a5f229e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/cpw/mods/fml/common/eventhandler/EventBus.java b/src/main/java/cpw/mods/fml/common/eventhandler/EventBus.java
@@ -147,6 +147,10 @@ public boolean post(Event event)
         return (event.isCancelable() ? event.isCanceled() : false);
     }
 
+    public int getBusID() {
+        return busID;
+    }
+
     @Override
     public void handleException(EventBus bus, Event event, IEventListener[] listeners, int index, Throwable throwable)
     {

diff --git a/src/main/java/cpw/mods/fml/common/eventhandler/EventPriority.java b/src/main/java/cpw/mods/fml/common/eventhandler/EventPriority.java
@@ -8,11 +8,15 @@ public enum EventPriority implements IEventListener
      *   Due to using a ArrayList in the ListenerList,
      *   these need to stay in a contiguous index starting at 0. {Default ordinal}
      */
-    HIGHEST, //First to execute
+    PRE, //First to execute.  Cancellation is not allowed
+    AFTER_PRE, //Cancellation is not allowed
+    HIGHEST, //First standard priority to execute
     HIGH,
     NORMAL,
     LOW,
-    LOWEST //Last to execute
+    LOWEST, //Last standard priority to execute
+    BEFORE_POST, //Cancellation is not allowed
+    POST //Last to execute.  Cancellation is not allowed
 ;
 
     @Override