From 227ebef82431b7dbd312c114f352abcadf36812b Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Sun, 12 Jan 2020 16:30:50 -0800
Subject: [PATCH] Reverting to non-static AddonEvent. Reminder don't break API

Next time I'll add to the API but not break it. I actually did not
realize this API was being used (I forgot).
---
 .../bentobox/api/events/addon/AddonEvent.java    | 16 +++++-----------
 .../bentobox/managers/AddonsManager.java         |  6 +++---
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEvent.java b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEvent.java
index b3cb40814..40036ab3a 100644
--- a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEvent.java
+++ b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEvent.java
@@ -20,43 +20,37 @@ public class AddonEvent {
 
     /**
      * @return Addon event builder
-     * @deprecated Use static Builder instead
      */
-    @Deprecated
     public AddonEventBuilder builder() {
         return new AddonEventBuilder();
     }
 
-    public static AddonEventBuilder Builder() {
-        return new AddonEventBuilder();
-    }
-
-    public static class AddonEnableEvent extends AddonBaseEvent {
+    public class AddonEnableEvent extends AddonBaseEvent {
         private AddonEnableEvent(Addon addon, Map<String, Object> keyValues) {
             // Final variables have to be declared in the constructor
             super(addon, keyValues);
         }
     }
-    public static class AddonDisableEvent extends AddonBaseEvent {
+    public class AddonDisableEvent extends AddonBaseEvent {
         private AddonDisableEvent(Addon addon, Map<String, Object> keyValues) {
             // Final variables have to be declared in the constructor
             super(addon, keyValues);
         }
     }
-    public static class AddonLoadEvent extends AddonBaseEvent {
+    public class AddonLoadEvent extends AddonBaseEvent {
         private AddonLoadEvent(Addon addon, Map<String, Object> keyValues) {
             // Final variables have to be declared in the constructor
             super(addon, keyValues);
         }
     }
-    public static class AddonGeneralEvent extends AddonBaseEvent {
+    public class AddonGeneralEvent extends AddonBaseEvent {
         private AddonGeneralEvent(Addon addon, Map<String, Object> keyValues) {
             // Final variables have to be declared in the constructor
             super(addon, keyValues);
         }
     }
 
-    public static class AddonEventBuilder {
+    public class AddonEventBuilder {
         // Here field are NOT final. They are just used for the building.
         private Addon addon;
         private Reason reason = Reason.UNKNOWN;
diff --git a/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java b/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java
index 5c4b053af..7ab4750d3 100644
--- a/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java
@@ -108,7 +108,7 @@ public class AddonsManager {
         plugin.getLocalesManager().loadLocalesFromFile(addon.getDescription().getName());
 
         // Fire the load event
-        AddonEvent.Builder().addon(addon).reason(AddonEvent.Reason.LOAD).build();
+        new AddonEvent().builder().addon(addon).reason(AddonEvent.Reason.LOAD).build();
 
         // Add it to the list of addons
         addons.remove(addon);
@@ -176,7 +176,7 @@ public class AddonsManager {
                 gameMode.getPlayerCommand().ifPresent(c -> c.setWorld(gameMode.getOverWorld()));
                 gameMode.getAdminCommand().ifPresent(c -> c.setWorld(gameMode.getOverWorld()));
             }
-            AddonEvent.Builder().addon(addon).reason(AddonEvent.Reason.ENABLE).build();
+            new AddonEvent().builder().addon(addon).reason(AddonEvent.Reason.ENABLE).build();
             addon.setState(Addon.State.ENABLED);
             plugin.log("Enabling " + addon.getDescription().getName() + "...");
         } catch (NoClassDefFoundError | NoSuchMethodError | NoSuchFieldError e) {
@@ -429,7 +429,7 @@ public class AddonsManager {
                 addon.getDescription().getAuthors().forEach(plugin::logError);
                 plugin.logStacktrace(e);
             }
-            AddonEvent.Builder().addon(addon).reason(AddonEvent.Reason.DISABLE).build();
+            new AddonEvent().builder().addon(addon).reason(AddonEvent.Reason.DISABLE).build();
         }
         // Clear loaders
         if (loaders.containsKey(addon)) {