From dad2b2f4f9beb626b5641b7d06bb7df20e7c9e09 Mon Sep 17 00:00:00 2001 From: Ryder Belserion Date: Fri, 8 Mar 2024 13:00:20 -0500 Subject: [PATCH] [ci-skip] Get all gui related classes in one location --- .../crazyenchantments/paper/CrazyEnchantments.java | 6 +++++- .../crazyenchantments/paper/commands/CECommand.java | 2 +- .../paper/{controllers => gui}/BlackSmith.java | 2 +- .../paper/{controllers => gui}/GKitzController.java | 2 +- .../paper/{controllers => gui}/InfoGUIControl.java | 2 +- .../paper/{listeners => gui}/ShopListener.java | 8 +++++--- .../paper/{controllers => gui}/Tinkerer.java | 2 +- 7 files changed, 15 insertions(+), 9 deletions(-) rename paper/src/main/java/com/badbones69/crazyenchantments/paper/{controllers => gui}/BlackSmith.java (99%) rename paper/src/main/java/com/badbones69/crazyenchantments/paper/{controllers => gui}/GKitzController.java (99%) rename paper/src/main/java/com/badbones69/crazyenchantments/paper/{controllers => gui}/InfoGUIControl.java (97%) rename paper/src/main/java/com/badbones69/crazyenchantments/paper/{listeners => gui}/ShopListener.java (96%) rename paper/src/main/java/com/badbones69/crazyenchantments/paper/{controllers => gui}/Tinkerer.java (99%) diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/CrazyEnchantments.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/CrazyEnchantments.java index 6876ae7c..6259e8f2 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/CrazyEnchantments.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/CrazyEnchantments.java @@ -17,12 +17,16 @@ import com.badbones69.crazyenchantments.paper.enchantments.PickaxeEnchantments; import com.badbones69.crazyenchantments.paper.enchantments.SwordEnchantments; import com.badbones69.crazyenchantments.paper.enchantments.ToolEnchantments; +import com.badbones69.crazyenchantments.paper.gui.BlackSmith; +import com.badbones69.crazyenchantments.paper.gui.GKitzController; +import com.badbones69.crazyenchantments.paper.gui.InfoGUIControl; +import com.badbones69.crazyenchantments.paper.gui.Tinkerer; import com.badbones69.crazyenchantments.paper.listeners.AuraListener; import com.badbones69.crazyenchantments.paper.listeners.DustControlListener; import com.badbones69.crazyenchantments.paper.listeners.FireworkDamageListener; import com.badbones69.crazyenchantments.paper.listeners.MiscListener; import com.badbones69.crazyenchantments.paper.listeners.ProtectionCrystalListener; -import com.badbones69.crazyenchantments.paper.listeners.ShopListener; +import com.badbones69.crazyenchantments.paper.gui.ShopListener; import com.badbones69.crazyenchantments.paper.listeners.server.WorldSwitchListener; import org.bstats.bukkit.Metrics; import org.bukkit.command.CommandExecutor; diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/commands/CECommand.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/commands/CECommand.java index a1db514d..feff404d 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/commands/CECommand.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/commands/CECommand.java @@ -23,7 +23,7 @@ import com.badbones69.crazyenchantments.paper.controllers.settings.EnchantmentBookSettings; import com.badbones69.crazyenchantments.paper.controllers.settings.ProtectionCrystalSettings; import com.badbones69.crazyenchantments.paper.listeners.ScramblerListener; -import com.badbones69.crazyenchantments.paper.listeners.ShopListener; +import com.badbones69.crazyenchantments.paper.gui.ShopListener; import com.badbones69.crazyenchantments.paper.api.utils.ColorUtils; import com.badbones69.crazyenchantments.paper.api.utils.NumberUtils; import com.google.gson.Gson; diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/BlackSmith.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/BlackSmith.java similarity index 99% rename from paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/BlackSmith.java rename to paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/BlackSmith.java index 87e543d9..27f27cef 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/BlackSmith.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/BlackSmith.java @@ -1,4 +1,4 @@ -package com.badbones69.crazyenchantments.paper.controllers; +package com.badbones69.crazyenchantments.paper.gui; import com.badbones69.crazyenchantments.paper.CrazyEnchantments; import com.badbones69.crazyenchantments.paper.Methods; diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/GKitzController.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/GKitzController.java similarity index 99% rename from paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/GKitzController.java rename to paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/GKitzController.java index 9f6bbd52..8ca9a1da 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/GKitzController.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/GKitzController.java @@ -1,4 +1,4 @@ -package com.badbones69.crazyenchantments.paper.controllers; +package com.badbones69.crazyenchantments.paper.gui; import com.badbones69.crazyenchantments.paper.CrazyEnchantments; import com.badbones69.crazyenchantments.paper.Starter; diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/InfoGUIControl.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/InfoGUIControl.java similarity index 97% rename from paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/InfoGUIControl.java rename to paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/InfoGUIControl.java index 06a0879b..41a18226 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/InfoGUIControl.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/InfoGUIControl.java @@ -1,4 +1,4 @@ -package com.badbones69.crazyenchantments.paper.controllers; +package com.badbones69.crazyenchantments.paper.gui; import com.badbones69.crazyenchantments.paper.CrazyEnchantments; import com.badbones69.crazyenchantments.paper.Starter; diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/listeners/ShopListener.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/ShopListener.java similarity index 96% rename from paper/src/main/java/com/badbones69/crazyenchantments/paper/listeners/ShopListener.java rename to paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/ShopListener.java index e6dd18d0..b7ad616e 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/listeners/ShopListener.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/ShopListener.java @@ -1,4 +1,4 @@ -package com.badbones69.crazyenchantments.paper.listeners; +package com.badbones69.crazyenchantments.paper.gui; import com.badbones69.crazyenchantments.paper.CrazyEnchantments; import com.badbones69.crazyenchantments.paper.Methods; @@ -15,11 +15,13 @@ import com.badbones69.crazyenchantments.paper.api.objects.Category; import com.badbones69.crazyenchantments.paper.api.objects.other.ItemBuilder; import com.badbones69.crazyenchantments.paper.api.objects.LostBook; -import com.badbones69.crazyenchantments.paper.controllers.BlackSmith; -import com.badbones69.crazyenchantments.paper.controllers.Tinkerer; +import com.badbones69.crazyenchantments.paper.gui.BlackSmith; +import com.badbones69.crazyenchantments.paper.gui.Tinkerer; import com.badbones69.crazyenchantments.paper.controllers.settings.EnchantmentBookSettings; import com.badbones69.crazyenchantments.paper.controllers.settings.ProtectionCrystalSettings; import com.badbones69.crazyenchantments.paper.api.utils.ColorUtils; +import com.badbones69.crazyenchantments.paper.listeners.ScramblerListener; +import com.badbones69.crazyenchantments.paper.listeners.SlotCrystalListener; import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/Tinkerer.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/Tinkerer.java similarity index 99% rename from paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/Tinkerer.java rename to paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/Tinkerer.java index e254bdb7..84797b31 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/Tinkerer.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/gui/Tinkerer.java @@ -1,4 +1,4 @@ -package com.badbones69.crazyenchantments.paper.controllers; +package com.badbones69.crazyenchantments.paper.gui; import com.badbones69.crazyenchantments.paper.CrazyEnchantments; import com.badbones69.crazyenchantments.paper.Methods;