Merge branch 'dev'

91 files changed, 1016 insertions, 434 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
index eccfc78c9..f6190fb10 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
@@ -5,7 +5,6 @@ import at.hannibal2.skyhanni.config.Features;
 import at.hannibal2.skyhanni.config.commands.Commands;
 import at.hannibal2.skyhanni.data.*;
 import at.hannibal2.skyhanni.data.repo.RepoManager;
-import at.hannibal2.skyhanni.features.*;
 import at.hannibal2.skyhanni.features.anvil.AnvilCombineHelper;
 import at.hannibal2.skyhanni.features.bazaar.BazaarApi;
 import at.hannibal2.skyhanni.features.bazaar.BazaarBestSellMethod;
@@ -30,6 +29,7 @@ import at.hannibal2.skyhanni.features.inventory.*;
 import at.hannibal2.skyhanni.features.itemabilities.FireVeilWandParticles;
 import at.hannibal2.skyhanni.features.itemabilities.abilitycooldown.ItemAbilityCooldown;
 import at.hannibal2.skyhanni.features.minion.MinionFeatures;
+import at.hannibal2.skyhanni.features.misc.*;
 import at.hannibal2.skyhanni.features.nether.MilleniaAgedBlazeColor;
 import at.hannibal2.skyhanni.features.nether.ashfang.*;
 import at.hannibal2.skyhanni.features.slayer.EndermanSlayerBeacon;
@@ -62,7 +62,7 @@ import java.util.List;
 public class SkyHanniMod {
 
     public static final String MODID = "skyhanni";
-    public static final String VERSION = "0.13";
+    public static final String VERSION = "0.14";
 
     public static Features feature;
 
@@ -70,7 +70,7 @@ public class SkyHanniMod {
     public static ConfigManager configManager;
     private static Logger logger;
 
-    public static List<Object> listenerClasses = new ArrayList<>();
+    public static List<Object> modules = new ArrayList<>();
     public static Job globalJob = JobKt.Job(null);
     public static CoroutineScope coroutineScope =
             CoroutineScopeKt.CoroutineScope(
@@ -84,94 +84,98 @@ public class SkyHanniMod {
 
         //API and utils
         new BazaarApi();
-        registerEvent(this);
-        registerEvent(new ChatManager());
-        registerEvent(new HypixelData());
-        registerEvent(new DungeonData());
-        registerEvent(new ScoreboardData());
-        registerEvent(new ApiKeyGrabber());
-        registerEvent(new SeaCreatureManager());
-        registerEvent(new ItemRenderBackground());
-        registerEvent(new EntityData());
-        registerEvent(new EntityMovementData());
-        registerEvent(new ItemClickData());
-        registerEvent(new MinecraftData());
-        registerEvent(new SendTitleHelper());
-        registerEvent(new ItemTipHelper());
+        loadModule(this);
+        loadModule(new ChatManager());
+        loadModule(new HyPixelData());
+        loadModule(new DungeonData());
+        loadModule(new ScoreboardData());
+        loadModule(new ApiDataLoader());
+        loadModule(new SeaCreatureManager());
+        loadModule(new ItemRenderBackground());
+        loadModule(new EntityData());
+        loadModule(new EntityMovementData());
+        loadModule(new ItemClickData());
+        loadModule(new MinecraftData());
+        loadModule(new SendTitleHelper());
+        loadModule(new ItemTipHelper());
 
         //features
-        registerEvent(new BazaarOrderHelper());
-        registerEvent(new ChatFilter());
-        registerEvent(new PlayerChatModifier());
-        registerEvent(new DungeonChatFilter());
-        registerEvent(new HideNotClickableItems());
-        registerEvent(new ItemDisplayOverlayFeatures());
-        registerEvent(new CurrentPetDisplay());
-        registerEvent(new ExpBottleOnGroundHider());
-        registerEvent(new DamageIndicatorManager());
-        registerEvent(new ItemAbilityCooldown());
-        registerEvent(new DungeonHighlightClickedBlocks());
-        registerEvent(new DungeonMilestonesDisplay());
-        registerEvent(new DungeonDeathCounter());
-        registerEvent(new DungeonCleanEnd());
-        registerEvent(new DungeonBossMessages());
-        registerEvent(new DungeonBossHideDamageSplash());
-        registerEvent(new TrophyFishMessages());
-        registerEvent(new BazaarBestSellMethod());
-        registerEvent(new AnvilCombineHelper());
-        registerEvent(new SeaCreatureMessage