Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added back non-static AddonEvent builder to not break API 

Relates to https://github.com/BentoBoxWorld/Level/issues/119
This commit is contained in:
tastybento 2020-01-11 08:50:14 -08:00
parent 9169242434
commit ab6a9978ff
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/world/bentobox/bentobox/api/events/addon/AddonEvent.java
View File

@ -18,7 +18,16 @@ public class AddonEvent {
}
public static AddonEventBuilder builder() {
/**
* @return Addon event builder
* @deprecated Use static Builder instead
*/
@Deprecated
public AddonEventBuilder builder() {
return new AddonEventBuilder();
}
public static AddonEventBuilder Builder() {
return new AddonEventBuilder();
}
@ -85,7 +94,7 @@ public class AddonEvent {
return new AddonGeneralEvent(addon, keyValues);
}
}
/**
* Build and fire event
* @return event

6
src/main/java/world/bentobox/bentobox/managers/AddonsManager.java
View File

@ -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();
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();
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();
AddonEvent.Builder().addon(addon).reason(AddonEvent.Reason.DISABLE).build();
}
// Clear loaders
if (loaders.containsKey(addon)) {