From 9a57a3e703dade03fd71d840f8d54209c8dd792e Mon Sep 17 00:00:00 2001 From: loki5512344 Date: Mon, 1 Jun 2026 00:07:45 +0200 Subject: [PATCH] Restructure wand and util test packages - move GroupWand classes to wand/group/, move Selection tests to util/selection/ --- src/main/java/dev/loki/lomines/ComponentInitializer.java | 2 +- src/main/java/dev/loki/lomines/LoMinesPlugin.java | 2 +- .../java/dev/loki/lomines/command/player/PlayerCommands.java | 2 +- src/main/java/dev/loki/lomines/gui/group/GroupCreateGui.java | 4 ++-- .../java/dev/loki/lomines/gui/group/GroupCreateItems.java | 2 +- .../dev/loki/lomines/listener/PlayerInteractListener.java | 4 ++-- .../java/dev/loki/lomines/wand/{ => group}/GroupWandItem.java | 2 +- .../dev/loki/lomines/wand/{ => group}/GroupWandManager.java | 2 +- .../dev/loki/lomines/wand/{ => group}/GroupWandSession.java | 2 +- .../lomines/util/{ => selection}/SelectionManagerTest.java | 2 +- .../dev/loki/lomines/util/{ => selection}/SelectionTest.java | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) rename src/main/java/dev/loki/lomines/wand/{ => group}/GroupWandItem.java (98%) rename src/main/java/dev/loki/lomines/wand/{ => group}/GroupWandManager.java (93%) rename src/main/java/dev/loki/lomines/wand/{ => group}/GroupWandSession.java (98%) rename src/test/java/dev/loki/lomines/util/{ => selection}/SelectionManagerTest.java (98%) rename src/test/java/dev/loki/lomines/util/{ => selection}/SelectionTest.java (99%) diff --git a/src/main/java/dev/loki/lomines/ComponentInitializer.java b/src/main/java/dev/loki/lomines/ComponentInitializer.java index e8c5b7d..eb5952b 100644 --- a/src/main/java/dev/loki/lomines/ComponentInitializer.java +++ b/src/main/java/dev/loki/lomines/ComponentInitializer.java @@ -4,7 +4,7 @@ import dev.loki.lomines.core.mine.MineTicker; import dev.loki.lomines.core.mine.Mines; import dev.loki.lomines.data.stats.StatsManager; import dev.loki.lomines.integration.IntegrationManager; -import dev.loki.lomines.wand.GroupWandManager; +import dev.loki.lomines.wand.group.GroupWandManager; import dev.lolib.commands.CommandManager; import java.io.IOException; diff --git a/src/main/java/dev/loki/lomines/LoMinesPlugin.java b/src/main/java/dev/loki/lomines/LoMinesPlugin.java index 495d3d0..edf6e0b 100644 --- a/src/main/java/dev/loki/lomines/LoMinesPlugin.java +++ b/src/main/java/dev/loki/lomines/LoMinesPlugin.java @@ -4,8 +4,8 @@ import dev.loki.lomines.core.mine.MineTicker; import dev.loki.lomines.core.mine.Mines; import dev.loki.lomines.data.stats.StatsManager; import dev.loki.lomines.integration.IntegrationManager; -import dev.loki.lomines.wand.GroupWandManager; import dev.loki.lomines.wand.WandParticleService; +import dev.loki.lomines.wand.group.GroupWandManager; import dev.lolib.commands.CommandManager; import dev.lolib.core.LoPlugin; import dev.lolib.core.dependency.DependencyManager; diff --git a/src/main/java/dev/loki/lomines/command/player/PlayerCommands.java b/src/main/java/dev/loki/lomines/command/player/PlayerCommands.java index 873d1d8..ccf9178 100644 --- a/src/main/java/dev/loki/lomines/command/player/PlayerCommands.java +++ b/src/main/java/dev/loki/lomines/command/player/PlayerCommands.java @@ -2,7 +2,7 @@ package dev.loki.lomines.command.player; import dev.loki.lomines.LoMinesPlugin; import dev.loki.lomines.util.ErrorHandler; -import dev.loki.lomines.wand.GroupWandItem; +import dev.loki.lomines.wand.group.GroupWandItem; import dev.lolib.commands.annotation.Arg; import dev.lolib.commands.annotation.Command; import dev.lolib.commands.annotation.Subcommand; diff --git a/src/main/java/dev/loki/lomines/gui/group/GroupCreateGui.java b/src/main/java/dev/loki/lomines/gui/group/GroupCreateGui.java index 676a815..a7445f2 100644 --- a/src/main/java/dev/loki/lomines/gui/group/GroupCreateGui.java +++ b/src/main/java/dev/loki/lomines/gui/group/GroupCreateGui.java @@ -2,8 +2,8 @@ package dev.loki.lomines.gui.group; import dev.loki.lomines.LoMinesPlugin; import dev.loki.lomines.core.mine.Mines; -import dev.loki.lomines.wand.GroupWandManager; -import dev.loki.lomines.wand.GroupWandSession; +import dev.loki.lomines.wand.group.GroupWandManager; +import dev.loki.lomines.wand.group.GroupWandSession; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; diff --git a/src/main/java/dev/loki/lomines/gui/group/GroupCreateItems.java b/src/main/java/dev/loki/lomines/gui/group/GroupCreateItems.java index 4ac70ef..c42aaab 100644 --- a/src/main/java/dev/loki/lomines/gui/group/GroupCreateItems.java +++ b/src/main/java/dev/loki/lomines/gui/group/GroupCreateItems.java @@ -1,6 +1,6 @@ package dev.loki.lomines.gui.group; -import dev.loki.lomines.wand.GroupWandSession; +import dev.loki.lomines.wand.group.GroupWandSession; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Material; diff --git a/src/main/java/dev/loki/lomines/listener/PlayerInteractListener.java b/src/main/java/dev/loki/lomines/listener/PlayerInteractListener.java index aa7c69c..2c36951 100644 --- a/src/main/java/dev/loki/lomines/listener/PlayerInteractListener.java +++ b/src/main/java/dev/loki/lomines/listener/PlayerInteractListener.java @@ -2,8 +2,8 @@ package dev.loki.lomines.listener; import dev.loki.lomines.LoMinesPlugin; import dev.loki.lomines.gui.group.GroupCreateGui; -import dev.loki.lomines.wand.GroupWandItem; -import dev.loki.lomines.wand.GroupWandSession; +import dev.loki.lomines.wand.group.GroupWandItem; +import dev.loki.lomines.wand.group.GroupWandSession; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.block.Block; diff --git a/src/main/java/dev/loki/lomines/wand/GroupWandItem.java b/src/main/java/dev/loki/lomines/wand/group/GroupWandItem.java similarity index 98% rename from src/main/java/dev/loki/lomines/wand/GroupWandItem.java rename to src/main/java/dev/loki/lomines/wand/group/GroupWandItem.java index 9eee2d1..8697cd5 100644 --- a/src/main/java/dev/loki/lomines/wand/GroupWandItem.java +++ b/src/main/java/dev/loki/lomines/wand/group/GroupWandItem.java @@ -1,4 +1,4 @@ -package dev.loki.lomines.wand; +package dev.loki.lomines.wand.group; import dev.loki.lomines.LoMinesPlugin; import net.kyori.adventure.text.Component; diff --git a/src/main/java/dev/loki/lomines/wand/GroupWandManager.java b/src/main/java/dev/loki/lomines/wand/group/GroupWandManager.java similarity index 93% rename from src/main/java/dev/loki/lomines/wand/GroupWandManager.java rename to src/main/java/dev/loki/lomines/wand/group/GroupWandManager.java index 67c7358..e3c20b3 100644 --- a/src/main/java/dev/loki/lomines/wand/GroupWandManager.java +++ b/src/main/java/dev/loki/lomines/wand/group/GroupWandManager.java @@ -1,4 +1,4 @@ -package dev.loki.lomines.wand; +package dev.loki.lomines.wand.group; import java.util.Map; import java.util.UUID; diff --git a/src/main/java/dev/loki/lomines/wand/GroupWandSession.java b/src/main/java/dev/loki/lomines/wand/group/GroupWandSession.java similarity index 98% rename from src/main/java/dev/loki/lomines/wand/GroupWandSession.java rename to src/main/java/dev/loki/lomines/wand/group/GroupWandSession.java index 9f0183d..fe5340e 100644 --- a/src/main/java/dev/loki/lomines/wand/GroupWandSession.java +++ b/src/main/java/dev/loki/lomines/wand/group/GroupWandSession.java @@ -1,4 +1,4 @@ -package dev.loki.lomines.wand; +package dev.loki.lomines.wand.group; import org.bukkit.Location; diff --git a/src/test/java/dev/loki/lomines/util/SelectionManagerTest.java b/src/test/java/dev/loki/lomines/util/selection/SelectionManagerTest.java similarity index 98% rename from src/test/java/dev/loki/lomines/util/SelectionManagerTest.java rename to src/test/java/dev/loki/lomines/util/selection/SelectionManagerTest.java index 2129996..83fbe3b 100644 --- a/src/test/java/dev/loki/lomines/util/SelectionManagerTest.java +++ b/src/test/java/dev/loki/lomines/util/selection/SelectionManagerTest.java @@ -1,4 +1,4 @@ -package dev.loki.lomines.util; +package dev.loki.lomines.util.selection; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/dev/loki/lomines/util/SelectionTest.java b/src/test/java/dev/loki/lomines/util/selection/SelectionTest.java similarity index 99% rename from src/test/java/dev/loki/lomines/util/SelectionTest.java rename to src/test/java/dev/loki/lomines/util/selection/SelectionTest.java index 9f7db08..bfe0a05 100644 --- a/src/test/java/dev/loki/lomines/util/SelectionTest.java +++ b/src/test/java/dev/loki/lomines/util/selection/SelectionTest.java @@ -1,4 +1,4 @@ -package dev.loki.lomines.util; +package dev.loki.lomines.util.selection; import org.bukkit.Location; import org.bukkit.World;