moving packets around

63 files changed, 98 insertions, 93 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
index 848d45421..c614cba01 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
@@ -1,27 +1,34 @@
 package at.hannibal2.skyhanni;
 
-import at.hannibal2.skyhanni.bazaar.BazaarApi;
-import at.hannibal2.skyhanni.bazaar.BazaarBestSellMethod;
-import at.hannibal2.skyhanni.bazaar.BazaarOrderHelper;
-import at.hannibal2.skyhanni.chat.ChatFilter;
-import at.hannibal2.skyhanni.chat.ChatManager;
-import at.hannibal2.skyhanni.chat.NewChatFilter;
-import at.hannibal2.skyhanni.chat.PlayerChatFilter;
 import at.hannibal2.skyhanni.config.Features;
 import at.hannibal2.skyhanni.config.gui.commands.Commands;
-import at.hannibal2.skyhanni.damageindicator.DamageIndicatorManager;
-import at.hannibal2.skyhanni.dungeon.*;
-import at.hannibal2.skyhanni.fishing.SeaCreatureManager;
-import at.hannibal2.skyhanni.fishing.SeaCreatureMessageShortener;
-import at.hannibal2.skyhanni.fishing.TrophyFishMessages;
-import at.hannibal2.skyhanni.inventory.anvil.AnvilCombineHelper;
-import at.hannibal2.skyhanni.items.HideNotClickableItems;
-import at.hannibal2.skyhanni.items.ItemDisplayOverlayFeatures;
-import at.hannibal2.skyhanni.items.abilitycooldown.ItemAbilityCooldown;
-import at.hannibal2.skyhanni.misc.*;
-import at.hannibal2.skyhanni.misc.nether.ashfang.AshfangFreezeCooldown;
-import at.hannibal2.skyhanni.misc.nether.ashfang.AshfangNextResetCooldown;
-import at.hannibal2.skyhanni.repo.RepoManager;
+import at.hannibal2.skyhanni.data.ApiData;
+import at.hannibal2.skyhanni.data.HypixelData;
+import at.hannibal2.skyhanni.data.ItemRenderBackground;
+import at.hannibal2.skyhanni.data.ScoreboardData;
+import at.hannibal2.skyhanni.data.repo.RepoManager;
+import at.hannibal2.skyhanni.features.ButtonOnPause;
+import at.hannibal2.skyhanni.features.CurrentPetDisplay;
+import at.hannibal2.skyhanni.features.ExpBottleOnGroundHider;
+import at.hannibal2.skyhanni.features.SummoningSoulsName;
+import at.hannibal2.skyhanni.features.anvil.AnvilCombineHelper;
+import at.hannibal2.skyhanni.features.bazaar.BazaarApi;
+import at.hannibal2.skyhanni.features.bazaar.BazaarBestSellMethod;
+import at.hannibal2.skyhanni.features.bazaar.BazaarOrderHelper;
+import at.hannibal2.skyhanni.features.chat.ChatFilter;
+import at.hannibal2.skyhanni.features.chat.ChatManager;
+import at.hannibal2.skyhanni.features.chat.NewChatFilter;
+import at.hannibal2.skyhanni.features.chat.PlayerChatFilter;
+import at.hannibal2.skyhanni.features.damageindicator.DamageIndicatorManager;
+import at.hannibal2.skyhanni.features.dungeon.*;
+import at.hannibal2.skyhanni.features.fishing.SeaCreatureManager;
+import at.hannibal2.skyhanni.features.fishing.SeaCreatureMessageShortener;
+import at.hannibal2.skyhanni.features.fishing.TrophyFishMessages;
+import at.hannibal2.skyhanni.features.items.HideNotClickableItems;
+import at.hannibal2.skyhanni.features.items.ItemDisplayOverlayFeatures;
+import at.hannibal2.skyhanni.features.items.abilitycooldown.ItemAbilityCooldown;
+import at.hannibal2.skyhanni.features.nether.ashfang.AshfangFreezeCooldown;
+import at.hannibal2.skyhanni.features.nether.ashfang.AshfangNextResetCooldown;
 import at.hannibal2.skyhanni.test.LorenzTest;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarData.kt b/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarData.kt
deleted file mode 100644
index 01300e67c..000000000
--- a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarData.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package at.hannibal2.skyhanni.bazaar
-
-data class BazaarData(val apiName: String, val itemName: String, val sellPrice: Double, val buyPrice: Double)
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/ApiData.kt b/src/main/java/at/hannibal2/skyhanni/data/ApiData.kt
index b0437e852..9e47d5d0f 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/ApiData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ApiData.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 177917900..f9c0af979 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.PacketEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/ItemRenderBackground.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemRenderBackground.kt
index bd30ed597..bff39fc8c 100644
--- a/src/main/java/at/hannibal2/skyhanni/ItemRenderBackground.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ItemRenderBackground.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni
+package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.events.RenderRealOverlayEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
index 51bf32e56..179635250 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/ScoreboardData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.utils.LorenzUtils.removeColor
 import net.minecraft.client.Minecraft
diff --git a/src/main/java/at/hannibal2/skyhanni/repo/RepoManager.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
index eea0f83bd..8351991ab 100644
--- a/src/main/java/at/hannibal2/skyhanni/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.repo
+package at.hannibal2.skyhanni.data.repo
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/repo/RepoUtils.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt
index efe656e1c..969b526cc 100644
--- a/src/main/java/at/hannibal2/skyhanni/repo/RepoUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.repo
+package at.hannibal2.skyhanni.data.repo
 
 import com.google.gson.Gson
 import com.google.gson.JsonObject
diff --git a/src/main/java/at/hannibal2/skyhanni/events/PlayerSendChatEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/PlayerSendChatEvent.kt
index 4ce9db1a8..1776b2bd0 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/PlayerSendChatEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/PlayerSendChatEvent.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.events
 
-import at.hannibal2.skyhanni.chat.PlayerMessageChannel
+import at.hannibal2.skyhanni.features.chat.PlayerMessageChannel
 
 
 class PlayerSendChatEvent(
diff --git a/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt
index 841133ae9..f2c610e04 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.events
 
-import at.hannibal2.skyhanni.repo.RepoUtils
+import at.hannibal2.skyhanni.data.repo.RepoUtils
 import com.google.gson.Gson
 import com.google.gson.JsonObject
 import java.io.File
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/ButtonOnPause.kt b/src/main/java/at/hannibal2/skyhanni/features/ButtonOnPause.kt
index 68ae8a93c..4e85f4399 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/ButtonOnPause.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/ButtonOnPause.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.features
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.gui.config.ConfigEditor
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/CurrentPetDisplay.kt
index 9266dd4f5..f0e8e033e 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/CurrentPetDisplay.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.features
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/ExpBottleOnGroundHider.kt b/src/main/java/at/hannibal2/skyhanni/features/ExpBottleOnGroundHider.kt
index 119160c4f..c9e2b4bf4 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/ExpBottleOnGroundHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/ExpBottleOnGroundHider.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.features
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/SummoningSoulsName.kt b/src/main/java/at/hannibal2/skyhanni/features/SummoningSoulsName.kt
index 4cb1a90ae..478cdc100 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/SummoningSoulsName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/SummoningSoulsName.kt
@@ -1,7 +1,7 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.features
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.damageindicator.hasNameTagWith
+import at.hannibal2.skyhanni.features.damageindicator.hasNameTagWith
 import at.hannibal2.skyhanni.test.GriffinJavaUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture
 import at.hannibal2.skyhanni.utils.LocationUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/inventory/anvil/AnvilCombineHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt
index 03405090b..251c4e7a6 100644
--- a/src/main/java/at/hannibal2/skyhanni/inventory/anvil/AnvilCombineHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.inventory.anvil
+package at.hannibal2.skyhanni.features.anvil
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiContainerEvent
@@ -9,7 +9,6 @@ import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.inventory.ContainerChest
-import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.lwjgl.opengl.GL11
 
diff --git a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
index cbebe951c..3de78206b 100644
--- a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarApi.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.bazaar
+package at.hannibal2.skyhanni.fea