Broke up utils into separate packages

Jeqo-Studios · Jun 23, 2024 · ccf476a · ccf476a
1 parent 2e49f6b
commit ccf476a
Show file tree

Hide file tree

Showing 34 changed files with 64 additions and 61 deletions.
diff --git a/src/main/java/net/jeqo/bloons/Bloons.java b/src/main/java/net/jeqo/bloons/Bloons.java
@@ -10,10 +10,10 @@
 import net.jeqo.bloons.listeners.multipart.MultipartBalloonPlayerJoinListener;
 import net.jeqo.bloons.listeners.multipart.MultipartBalloonPlayerLeaveListener;
 import net.jeqo.bloons.listeners.single.SingleBalloonPlayerListener;
-import net.jeqo.bloons.utils.Languages;
-import net.jeqo.bloons.utils.UpdateChecker;
+import net.jeqo.bloons.message.Languages;
+import net.jeqo.bloons.health.UpdateChecker;
 import net.jeqo.bloons.logger.Logger;
-import net.jeqo.bloons.utils.Metrics;
+import net.jeqo.bloons.health.Metrics;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.HashMap;

diff --git a/src/main/java/net/jeqo/bloons/balloon/model/BalloonModel.java b/src/main/java/net/jeqo/bloons/balloon/model/BalloonModel.java
@@ -1,7 +1,7 @@
 package net.jeqo.bloons.balloon.model;
 
 import net.jeqo.bloons.logger.Logger;
-import net.jeqo.bloons.utils.Languages;
+import net.jeqo.bloons.message.Languages;
 import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;

diff --git a/src/main/java/net/jeqo/bloons/balloon/multipart/MultipartBalloonModel.java b/src/main/java/net/jeqo/bloons/balloon/multipart/MultipartBalloonModel.java
@@ -5,8 +5,8 @@
 import net.jeqo.bloons.balloon.model.BalloonModel;
 import net.jeqo.bloons.balloon.model.BalloonModelType;
 import net.jeqo.bloons.logger.Logger;
-import net.jeqo.bloons.utils.Color;
-import net.jeqo.bloons.utils.Languages;
+import net.jeqo.bloons.colors.Color;
+import net.jeqo.bloons.message.Languages;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 

diff --git a/src/main/java/net/jeqo/bloons/balloon/single/SingleBalloon.java b/src/main/java/net/jeqo/bloons/balloon/single/SingleBalloon.java
@@ -7,9 +7,9 @@
 import net.jeqo.bloons.events.balloon.single.SingleBalloonEquipEvent;
 import net.jeqo.bloons.events.balloon.single.SingleBalloonForceUnequipEvent;
 import net.jeqo.bloons.logger.Logger;
-import net.jeqo.bloons.utils.Languages;
-import net.jeqo.bloons.utils.management.SingleBalloonManagement;
-import net.jeqo.bloons.utils.Color;
+import net.jeqo.bloons.message.Languages;
+import net.jeqo.bloons.management.SingleBalloonManagement;
+import net.jeqo.bloons.colors.Color;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Location;
 import org.bukkit.Material;

diff --git a/...ain/java/net/jeqo/bloons/utils/Color.java → ...in/java/net/jeqo/bloons/colors/Color.java b/...ain/java/net/jeqo/bloons/utils/Color.java → ...in/java/net/jeqo/bloons/colors/Color.java
@@ -1,4 +1,4 @@
-package net.jeqo.bloons.utils;
+package net.jeqo.bloons.colors;
 
 import org.bukkit.ChatColor;
 

diff --git a/...jeqo/bloons/utils/ColorCodeConverter.java → ...eqo/bloons/colors/ColorCodeConverter.java b/...jeqo/bloons/utils/ColorCodeConverter.java → ...eqo/bloons/colors/ColorCodeConverter.java
@@ -1,4 +1,4 @@
-package net.jeqo.bloons.utils;
+package net.jeqo.bloons.colors;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/src/main/java/net/jeqo/bloons/commands/CommandEquip.java b/src/main/java/net/jeqo/bloons/commands/CommandEquip.java
@@ -11,10 +11,10 @@
 import net.jeqo.bloons.events.balloon.multipart.MultipartBalloonEquipEvent;
 import net.jeqo.bloons.events.balloon.multipart.MultipartBalloonUnequipEvent;
 import net.jeqo.bloons.events.balloon.single.SingleBalloonEquipEvent;
-import net.jeqo.bloons.utils.Languages;
-import net.jeqo.bloons.utils.management.SingleBalloonManagement;
-import net.jeqo.bloons.utils.MessageTranslations;
-import net.jeqo.bloons.utils.management.MultipartBalloonManagement;
+import net.jeqo.bloons.message.Languages;
+import net.jeqo.bloons.management.SingleBalloonManagement;
+import net.jeqo.bloons.message.MessageTranslations;
+import net.jeqo.bloons.management.MultipartBalloonManagement;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Sound;
 import org.bukkit.command.CommandSender;

diff --git a/src/main/java/net/jeqo/bloons/commands/CommandForceEquip.java b/src/main/java/net/jeqo/bloons/commands/CommandForceEquip.java
@@ -11,10 +11,10 @@
 import net.jeqo.bloons.events.balloon.multipart.MultipartBalloonEquipEvent;
 import net.jeqo.bloons.events.balloon.multipart.MultipartBalloonUnequipEvent;
 import net.jeqo.bloons.events.balloon.single.SingleBalloonEquipEvent;
-import net.jeqo.bloons.utils.Languages;
-import net.jeqo.bloons.utils.management.SingleBalloonManagement;
-import net.jeqo.bloons.utils.MessageTranslations;
-import net.jeqo.bloons.utils.management.MultipartBalloonManagement;
+import net.jeqo.bloons.message.Languages;
+import net.jeqo.bloons.management.SingleBalloonManagement;
+import net.jeqo.bloons.message.MessageTranslations;
+import net.jeqo.bloons.management.MultipartBalloonManagement;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;

diff --git a/src/main/java/net/jeqo/bloons/commands/CommandForceUnequip.java b/src/main/java/net/jeqo/bloons/commands/CommandForceUnequip.java
@@ -7,10 +7,10 @@
 import net.jeqo.bloons.commands.manager.types.CommandPermission;
 import net.jeqo.bloons.events.balloon.multipart.MultipartBalloonUnequipEvent;
 import net.jeqo.bloons.events.balloon.single.SingleBalloonUnequipEvent;
-import net.jeqo.bloons.utils.Languages;
-import net.jeqo.bloons.utils.management.SingleBalloonManagement;
-import net.jeqo.bloons.utils.MessageTranslations;
-import net.jeqo.bloons.utils.management.MultipartBalloonManagement;
+import net.jeqo.bloons.message.Languages;
+import net.jeqo.bloons.management.SingleBalloonManagement;
+import net.jeqo.bloons.message.MessageTranslations;
+import net.jeqo.bloons.management.MultipartBalloonManagement;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;

diff --git a/src/main/java/net/jeqo/bloons/commands/CommandReload.java b/src/main/java/net/jeqo/bloons/commands/CommandReload.java
@@ -4,8 +4,8 @@
 import net.jeqo.bloons.commands.manager.Command;
 import net.jeqo.bloons.commands.manager.types.CommandPermission;
 import net.jeqo.bloons.events.general.BloonsConfigReloadEvent;
-import net.jeqo.bloons.utils.Languages;
-import net.jeqo.bloons.utils.MessageTranslations;
+import net.jeqo.bloons.message.Languages;
+import net.jeqo.bloons.message.MessageTranslations;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;

diff --git a/src/main/java/net/jeqo/bloons/commands/CommandUnequip.java b/src/main/java/net/jeqo/bloons/commands/CommandUnequip.java
@@ -7,10 +7,10 @@
 import net.jeqo.bloons.commands.manager.types.CommandPermission;
 import net.jeqo.bloons.events.balloon.multipart.MultipartBalloonUnequipEvent;
 import net.jeqo.bloons.events.balloon.single.SingleBalloonUnequipEvent;
-import net.jeqo.bloons.utils.Languages;
-import net.jeqo.bloons.utils.management.SingleBalloonManagement;
-import net.jeqo.bloons.utils.MessageTranslations;
-import net.jeqo.bloons.utils.management.MultipartBalloonManagement;
+import net.jeqo.bloons.message.Languages;
+import net.jeqo.bloons.management.SingleBalloonManagement;
+import net.jeqo.bloons.message.MessageTranslations;
+import net.jeqo.bloons.management.MultipartBalloonManagement;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Sound;
 import org.bukkit.command.CommandSender;

diff --git a/src/main/java/net/jeqo/bloons/commands/manager/CommandCore.java b/src/main/java/net/jeqo/bloons/commands/manager/CommandCore.java
@@ -9,9 +9,9 @@
 import net.jeqo.bloons.configuration.PluginConfiguration;
 import net.jeqo.bloons.gui.menus.BalloonMenu;
 import net.jeqo.bloons.logger.Logger;
-import net.jeqo.bloons.utils.Color;
-import net.jeqo.bloons.utils.Languages;
-import net.jeqo.bloons.utils.MessageTranslations;
+import net.jeqo.bloons.colors.Color;
+import net.jeqo.bloons.message.Languages;
+import net.jeqo.bloons.message.MessageTranslations;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.command.CommandExecutor;

diff --git a/src/main/java/net/jeqo/bloons/commands/utils/ErrorHandling.java b/src/main/java/net/jeqo/bloons/commands/utils/ErrorHandling.java
@@ -2,7 +2,7 @@
 
 import net.jeqo.bloons.Bloons;
 import net.jeqo.bloons.configuration.PluginConfiguration;
-import net.jeqo.bloons.utils.MessageTranslations;
+import net.jeqo.bloons.message.MessageTranslations;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 

diff --git a/src/main/java/net/jeqo/bloons/configuration/ConfigConfiguration.java b/src/main/java/net/jeqo/bloons/configuration/ConfigConfiguration.java
@@ -6,7 +6,7 @@
 import net.jeqo.bloons.balloon.multipart.MultipartBalloonType;
 import net.jeqo.bloons.balloon.single.SingleBalloonType;
 import net.jeqo.bloons.logger.Logger;
-import net.jeqo.bloons.utils.Languages;
+import net.jeqo.bloons.message.Languages;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;

diff --git a/src/main/java/net/jeqo/bloons/gui/GUI.java b/src/main/java/net/jeqo/bloons/gui/GUI.java
@@ -1,7 +1,7 @@
 package net.jeqo.bloons.gui;
 
 import net.jeqo.bloons.events.BloonsEvent;
-import net.jeqo.bloons.utils.NBTItem;
+import net.jeqo.bloons.item.NBTItem;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

diff --git a/src/main/java/net/jeqo/bloons/gui/GUIClickableItem.java b/src/main/java/net/jeqo/bloons/gui/GUIClickableItem.java
@@ -1,6 +1,6 @@
 package net.jeqo.bloons.gui;
 
-import net.jeqo.bloons.utils.NBTItem;
+import net.jeqo.bloons.item.NBTItem;
 import org.bukkit.event.inventory.InventoryClickEvent;
 
 import java.util.HashMap;

diff --git a/src/main/java/net/jeqo/bloons/gui/GUIListener.java b/src/main/java/net/jeqo/bloons/gui/GUIListener.java
@@ -1,6 +1,6 @@
 package net.jeqo.bloons.gui;
 
-import net.jeqo.bloons.utils.NBTItem;
+import net.jeqo.bloons.item.NBTItem;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

diff --git a/src/main/java/net/jeqo/bloons/gui/item/border/BlackGlassPaneBorder.java b/src/main/java/net/jeqo/bloons/gui/item/border/BlackGlassPaneBorder.java
@@ -1,7 +1,7 @@
 package net.jeqo.bloons.gui.item.border;
 
 import net.jeqo.bloons.gui.GUIClickableItem;
-import net.jeqo.bloons.utils.NBTItem;
+import net.jeqo.bloons.item.NBTItem;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.event.inventory.InventoryClickEvent;

diff --git a/src/main/java/net/jeqo/bloons/gui/item/filler/BlackGlassPaneFillerItem.java b/src/main/java/net/jeqo/bloons/gui/item/filler/BlackGlassPaneFillerItem.java
@@ -1,7 +1,7 @@
 package net.jeqo.bloons.gui.item.filler;
 
 import net.jeqo.bloons.gui.GUIClickableItem;
-import net.jeqo.bloons.utils.NBTItem;
+import net.jeqo.bloons.item.NBTItem;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.event.inventory.InventoryClickEvent;

diff --git a/src/main/java/net/jeqo/bloons/gui/menus/BalloonMenu.java b/src/main/java/net/jeqo/bloons/gui/menus/BalloonMenu.java
@@ -4,9 +4,9 @@
 import lombok.Setter;
 import net.jeqo.bloons.Bloons;
 import net.jeqo.bloons.logger.Logger;
-import net.jeqo.bloons.utils.Color;
-import net.jeqo.bloons.utils.Languages;
-import net.jeqo.bloons.utils.MessageTranslations;
+import net.jeqo.bloons.colors.Color;
+import net.jeqo.bloons.message.Languages;
+import net.jeqo.bloons.message.MessageTranslations;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

diff --git a/src/main/java/net/jeqo/bloons/gui/menus/ExampleMenu.java b/src/main/java/net/jeqo/bloons/gui/menus/ExampleMenu.java
@@ -4,7 +4,7 @@
 import net.jeqo.bloons.gui.GUIClickableItem;
 import net.jeqo.bloons.gui.item.border.BlackGlassPaneBorder;
 import net.jeqo.bloons.gui.item.filler.BlackGlassPaneFillerItem;
-import net.jeqo.bloons.utils.NBTItem;
+import net.jeqo.bloons.item.NBTItem;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

diff --git a/...n/java/net/jeqo/bloons/utils/Metrics.java → .../java/net/jeqo/bloons/health/Metrics.java b/...n/java/net/jeqo/bloons/utils/Metrics.java → .../java/net/jeqo/bloons/health/Metrics.java
@@ -12,7 +12,7 @@
  *
  * Violations will result in a ban of your plugin and account from bStats.
  */
-package net.jeqo.bloons.utils;
+package net.jeqo.bloons.health;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;

diff --git a/.../net/jeqo/bloons/utils/UpdateChecker.java → ...net/jeqo/bloons/health/UpdateChecker.java b/.../net/jeqo/bloons/utils/UpdateChecker.java → ...net/jeqo/bloons/health/UpdateChecker.java
@@ -1,4 +1,4 @@
-package net.jeqo.bloons.utils;
+package net.jeqo.bloons.health;
 
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;

diff --git a/...n/java/net/jeqo/bloons/utils/NBTItem.java → ...in/java/net/jeqo/bloons/item/NBTItem.java b/...n/java/net/jeqo/bloons/utils/NBTItem.java → ...in/java/net/jeqo/bloons/item/NBTItem.java
@@ -1,4 +1,4 @@
-package net.jeqo.bloons.utils;
+package net.jeqo.bloons.item;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/src/main/java/net/jeqo/bloons/listeners/BalloonMenuListener.java b/src/main/java/net/jeqo/bloons/listeners/BalloonMenuListener.java
@@ -5,14 +5,17 @@
 import net.jeqo.bloons.balloon.multipart.balloon.MultipartBalloonBuilder;
 import net.jeqo.bloons.balloon.multipart.MultipartBalloonType;
 import net.jeqo.bloons.balloon.single.SingleBalloon;
+import net.jeqo.bloons.colors.Color;
+import net.jeqo.bloons.colors.ColorCodeConverter;
 import net.jeqo.bloons.events.balloon.multipart.MultipartBalloonEquipEvent;
 import net.jeqo.bloons.events.balloon.multipart.MultipartBalloonUnequipEvent;
 import net.jeqo.bloons.events.balloon.single.SingleBalloonEquipEvent;
 import net.jeqo.bloons.events.balloon.single.SingleBalloonUnequipEvent;
 import net.jeqo.bloons.gui.menus.BalloonMenu;
-import net.jeqo.bloons.utils.*;
-import net.jeqo.bloons.utils.management.MultipartBalloonManagement;
-import net.jeqo.bloons.utils.management.SingleBalloonManagement;
+import net.jeqo.bloons.message.Languages;
+import net.jeqo.bloons.message.MessageTranslations;
+import net.jeqo.bloons.management.MultipartBalloonManagement;
+import net.jeqo.bloons.management.SingleBalloonManagement;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;

diff --git a/src/main/java/net/jeqo/bloons/listeners/multipart/MultipartBalloonPlayerJoinListener.java b/src/main/java/net/jeqo/bloons/listeners/multipart/MultipartBalloonPlayerJoinListener.java
@@ -4,7 +4,7 @@
 import net.jeqo.bloons.balloon.multipart.balloon.MultipartBalloonBuilder;
 import net.jeqo.bloons.balloon.multipart.MultipartBalloonType;
 import net.jeqo.bloons.events.balloon.multipart.MultipartBalloonEquipEvent;
-import net.jeqo.bloons.utils.management.MultipartBalloonManagement;
+import net.jeqo.bloons.management.MultipartBalloonManagement;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;

diff --git a/src/main/java/net/jeqo/bloons/listeners/multipart/MultipartBalloonPlayerLeaveListener.java b/src/main/java/net/jeqo/bloons/listeners/multipart/MultipartBalloonPlayerLeaveListener.java
@@ -2,7 +2,7 @@
 
 import net.jeqo.bloons.balloon.multipart.balloon.MultipartBalloon;
 import net.jeqo.bloons.events.balloon.multipart.MultipartBalloonUnequipEvent;
-import net.jeqo.bloons.utils.management.MultipartBalloonManagement;
+import net.jeqo.bloons.management.MultipartBalloonManagement;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;

diff --git a/src/main/java/net/jeqo/bloons/listeners/multipart/MultipartBalloonPlayerListener.java b/src/main/java/net/jeqo/bloons/listeners/multipart/MultipartBalloonPlayerListener.java
@@ -6,8 +6,8 @@
 import net.jeqo.bloons.balloon.multipart.balloon.MultipartBalloonBuilder;
 import net.jeqo.bloons.events.balloon.multipart.*;
 import net.jeqo.bloons.events.balloon.single.SingleBalloonForceUnequipEvent;
-import net.jeqo.bloons.utils.management.MultipartBalloonManagement;
-import net.jeqo.bloons.utils.management.SingleBalloonManagement;
+import net.jeqo.bloons.management.MultipartBalloonManagement;
+import net.jeqo.bloons.management.SingleBalloonManagement;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;

diff --git a/src/main/java/net/jeqo/bloons/listeners/single/SingleBalloonPlayerListener.java b/src/main/java/net/jeqo/bloons/listeners/single/SingleBalloonPlayerListener.java
@@ -4,9 +4,9 @@
 import net.jeqo.bloons.balloon.single.SingleBalloon;
 import net.jeqo.bloons.events.balloon.single.SingleBalloonForceUnequipEvent;
 import net.jeqo.bloons.events.balloon.single.SingleBalloonStoreEvent;
-import net.jeqo.bloons.utils.UpdateChecker;
+import net.jeqo.bloons.health.UpdateChecker;
 import net.jeqo.bloons.logger.Logger;
-import net.jeqo.bloons.utils.management.SingleBalloonManagement;
+import net.jeqo.bloons.management.SingleBalloonManagement;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

diff --git a/src/main/java/net/jeqo/bloons/logger/Logger.java b/src/main/java/net/jeqo/bloons/logger/Logger.java
@@ -3,8 +3,8 @@
 import net.jeqo.bloons.Bloons;
 import net.jeqo.bloons.configuration.ConfigConfiguration;
 import net.jeqo.bloons.configuration.PluginConfiguration;
-import net.jeqo.bloons.utils.Languages;
-import net.jeqo.bloons.utils.MessageTranslations;
+import net.jeqo.bloons.message.Languages;
+import net.jeqo.bloons.message.MessageTranslations;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

diff --git a/...anagement/MultipartBalloonManagement.java → ...anagement/MultipartBalloonManagement.java b/...anagement/MultipartBalloonManagement.java → ...anagement/MultipartBalloonManagement.java
@@ -1,4 +1,4 @@
-package net.jeqo.bloons.utils.management;
+package net.jeqo.bloons.management;
 
 import net.jeqo.bloons.Bloons;
 import net.jeqo.bloons.balloon.multipart.balloon.MultipartBalloon;

diff --git a/...s/management/SingleBalloonManagement.java → ...s/management/SingleBalloonManagement.java b/...s/management/SingleBalloonManagement.java → ...s/management/SingleBalloonManagement.java
@@ -1,4 +1,4 @@
-package net.jeqo.bloons.utils.management;
+package net.jeqo.bloons.management;
 
 import net.jeqo.bloons.Bloons;
 import net.jeqo.bloons.balloon.single.SingleBalloon;

diff --git a/...java/net/jeqo/bloons/utils/Languages.java → ...va/net/jeqo/bloons/message/Languages.java b/...java/net/jeqo/bloons/utils/Languages.java → ...va/net/jeqo/bloons/message/Languages.java
@@ -1,4 +1,4 @@
-package net.jeqo.bloons.utils;
+package net.jeqo.bloons.message;
 
 import lombok.Getter;
 import net.jeqo.bloons.Bloons;

diff --git a/...eqo/bloons/utils/MessageTranslations.java → ...o/bloons/message/MessageTranslations.java b/...eqo/bloons/utils/MessageTranslations.java → ...o/bloons/message/MessageTranslations.java
@@ -1,4 +1,4 @@
-package net.jeqo.bloons.utils;
+package net.jeqo.bloons.message;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;