From 14daef3a9ffc3956e5af5619f0aa48563ecdd616 Mon Sep 17 00:00:00 2001 From: loki5512344 Date: Thu, 23 Apr 2026 23:28:43 +0200 Subject: [PATCH] refactor: reorganize data/ and util/ into subpackages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - data/ (15 files) → config/ (6), reward/ (3), stats/ (4), FillMode (1) - util/ (9 files) → location/ (3), selection/ (3), format/ (2) - Updated all package declarations and imports - Rule: ≤6 files per folder enforced --- .../java/com/loki/lomines/data/{ => config}/ConfigLoader.java | 2 +- .../loki/lomines/data/{ => config}/ConfigParseException.java | 2 +- .../java/com/loki/lomines/data/{ => config}/ConfigParser.java | 2 +- .../com/loki/lomines/data/{ => config}/ConfigSerializer.java | 2 +- .../com/loki/lomines/data/{ => config}/ConfigValidator.java | 2 +- .../java/com/loki/lomines/data/{ => config}/MineConfig.java | 2 +- src/main/java/com/loki/lomines/data/{ => reward}/Reward.java | 2 +- .../com/loki/lomines/data/{ => reward}/RewardItemParser.java | 2 +- .../java/com/loki/lomines/data/{ => reward}/RewardParser.java | 2 +- .../java/com/loki/lomines/data/{ => stats}/Leaderboard.java | 2 +- .../com/loki/lomines/data/{ => stats}/LeaderboardEntry.java | 2 +- .../java/com/loki/lomines/data/{ => stats}/PlayerStats.java | 2 +- .../java/com/loki/lomines/data/{ => stats}/StatsManager.java | 2 +- .../java/com/loki/lomines/util/{ => format}/ChunkUtils.java | 2 +- .../java/com/loki/lomines/util/{ => format}/TimeFormatter.java | 2 +- .../java/com/loki/lomines/util/{ => location}/BlockKeys.java | 2 +- src/main/java/com/loki/lomines/util/{ => location}/Cuboid.java | 2 +- .../com/loki/lomines/util/{ => location}/LocationParser.java | 2 +- .../java/com/loki/lomines/util/{ => selection}/MaskScanner.java | 2 +- .../java/com/loki/lomines/util/{ => selection}/Selection.java | 2 +- .../com/loki/lomines/util/{ => selection}/SelectionManager.java | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) rename src/main/java/com/loki/lomines/data/{ => config}/ConfigLoader.java (99%) rename src/main/java/com/loki/lomines/data/{ => config}/ConfigParseException.java (91%) rename src/main/java/com/loki/lomines/data/{ => config}/ConfigParser.java (99%) rename src/main/java/com/loki/lomines/data/{ => config}/ConfigSerializer.java (99%) rename src/main/java/com/loki/lomines/data/{ => config}/ConfigValidator.java (99%) rename src/main/java/com/loki/lomines/data/{ => config}/MineConfig.java (99%) rename src/main/java/com/loki/lomines/data/{ => reward}/Reward.java (98%) rename src/main/java/com/loki/lomines/data/{ => reward}/RewardItemParser.java (98%) rename src/main/java/com/loki/lomines/data/{ => reward}/RewardParser.java (99%) rename src/main/java/com/loki/lomines/data/{ => stats}/Leaderboard.java (99%) rename src/main/java/com/loki/lomines/data/{ => stats}/LeaderboardEntry.java (96%) rename src/main/java/com/loki/lomines/data/{ => stats}/PlayerStats.java (97%) rename src/main/java/com/loki/lomines/data/{ => stats}/StatsManager.java (99%) rename src/main/java/com/loki/lomines/util/{ => format}/ChunkUtils.java (99%) rename src/main/java/com/loki/lomines/util/{ => format}/TimeFormatter.java (98%) rename src/main/java/com/loki/lomines/util/{ => location}/BlockKeys.java (92%) rename src/main/java/com/loki/lomines/util/{ => location}/Cuboid.java (99%) rename src/main/java/com/loki/lomines/util/{ => location}/LocationParser.java (98%) rename src/main/java/com/loki/lomines/util/{ => selection}/MaskScanner.java (97%) rename src/main/java/com/loki/lomines/util/{ => selection}/Selection.java (99%) rename src/main/java/com/loki/lomines/util/{ => selection}/SelectionManager.java (98%) diff --git a/src/main/java/com/loki/lomines/data/ConfigLoader.java b/src/main/java/com/loki/lomines/data/config/ConfigLoader.java similarity index 99% rename from src/main/java/com/loki/lomines/data/ConfigLoader.java rename to src/main/java/com/loki/lomines/data/config/ConfigLoader.java index 66ed184..c80942c 100644 --- a/src/main/java/com/loki/lomines/data/ConfigLoader.java +++ b/src/main/java/com/loki/lomines/data/config/ConfigLoader.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.config; import org.bukkit.Location; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/com/loki/lomines/data/ConfigParseException.java b/src/main/java/com/loki/lomines/data/config/ConfigParseException.java similarity index 91% rename from src/main/java/com/loki/lomines/data/ConfigParseException.java rename to src/main/java/com/loki/lomines/data/config/ConfigParseException.java index 0f69b26..f470ccf 100644 --- a/src/main/java/com/loki/lomines/data/ConfigParseException.java +++ b/src/main/java/com/loki/lomines/data/config/ConfigParseException.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.config; /** * Exception thrown when configuration parsing fails. diff --git a/src/main/java/com/loki/lomines/data/ConfigParser.java b/src/main/java/com/loki/lomines/data/config/ConfigParser.java similarity index 99% rename from src/main/java/com/loki/lomines/data/ConfigParser.java rename to src/main/java/com/loki/lomines/data/config/ConfigParser.java index 7fa36e7..d2ac816 100644 --- a/src/main/java/com/loki/lomines/data/ConfigParser.java +++ b/src/main/java/com/loki/lomines/data/config/ConfigParser.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.config; import com.loki.lomines.util.LocationParser; import org.bukkit.Location; diff --git a/src/main/java/com/loki/lomines/data/ConfigSerializer.java b/src/main/java/com/loki/lomines/data/config/ConfigSerializer.java similarity index 99% rename from src/main/java/com/loki/lomines/data/ConfigSerializer.java rename to src/main/java/com/loki/lomines/data/config/ConfigSerializer.java index 3f0b117..361d9e8 100644 --- a/src/main/java/com/loki/lomines/data/ConfigSerializer.java +++ b/src/main/java/com/loki/lomines/data/config/ConfigSerializer.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.config; import com.loki.lomines.util.LocationParser; import org.bukkit.Location; diff --git a/src/main/java/com/loki/lomines/data/ConfigValidator.java b/src/main/java/com/loki/lomines/data/config/ConfigValidator.java similarity index 99% rename from src/main/java/com/loki/lomines/data/ConfigValidator.java rename to src/main/java/com/loki/lomines/data/config/ConfigValidator.java index 093ead1..a42b59e 100644 --- a/src/main/java/com/loki/lomines/data/ConfigValidator.java +++ b/src/main/java/com/loki/lomines/data/config/ConfigValidator.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.config; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/com/loki/lomines/data/MineConfig.java b/src/main/java/com/loki/lomines/data/config/MineConfig.java similarity index 99% rename from src/main/java/com/loki/lomines/data/MineConfig.java rename to src/main/java/com/loki/lomines/data/config/MineConfig.java index dad48be..484f33c 100644 --- a/src/main/java/com/loki/lomines/data/MineConfig.java +++ b/src/main/java/com/loki/lomines/data/config/MineConfig.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.config; import org.bukkit.Location; diff --git a/src/main/java/com/loki/lomines/data/Reward.java b/src/main/java/com/loki/lomines/data/reward/Reward.java similarity index 98% rename from src/main/java/com/loki/lomines/data/Reward.java rename to src/main/java/com/loki/lomines/data/reward/Reward.java index 2b2ec08..20cea50 100644 --- a/src/main/java/com/loki/lomines/data/Reward.java +++ b/src/main/java/com/loki/lomines/data/reward/Reward.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.reward; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/com/loki/lomines/data/RewardItemParser.java b/src/main/java/com/loki/lomines/data/reward/RewardItemParser.java similarity index 98% rename from src/main/java/com/loki/lomines/data/RewardItemParser.java rename to src/main/java/com/loki/lomines/data/reward/RewardItemParser.java index 5aeb910..5c842f1 100644 --- a/src/main/java/com/loki/lomines/data/RewardItemParser.java +++ b/src/main/java/com/loki/lomines/data/reward/RewardItemParser.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.reward; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/com/loki/lomines/data/RewardParser.java b/src/main/java/com/loki/lomines/data/reward/RewardParser.java similarity index 99% rename from src/main/java/com/loki/lomines/data/RewardParser.java rename to src/main/java/com/loki/lomines/data/reward/RewardParser.java index 877aafe..d83d72f 100644 --- a/src/main/java/com/loki/lomines/data/RewardParser.java +++ b/src/main/java/com/loki/lomines/data/reward/RewardParser.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.reward; import org.bukkit.Material; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/com/loki/lomines/data/Leaderboard.java b/src/main/java/com/loki/lomines/data/stats/Leaderboard.java similarity index 99% rename from src/main/java/com/loki/lomines/data/Leaderboard.java rename to src/main/java/com/loki/lomines/data/stats/Leaderboard.java index 8c7ae3c..b44e99a 100644 --- a/src/main/java/com/loki/lomines/data/Leaderboard.java +++ b/src/main/java/com/loki/lomines/data/stats/Leaderboard.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.stats; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/com/loki/lomines/data/LeaderboardEntry.java b/src/main/java/com/loki/lomines/data/stats/LeaderboardEntry.java similarity index 96% rename from src/main/java/com/loki/lomines/data/LeaderboardEntry.java rename to src/main/java/com/loki/lomines/data/stats/LeaderboardEntry.java index 02fa6b4..034c3aa 100644 --- a/src/main/java/com/loki/lomines/data/LeaderboardEntry.java +++ b/src/main/java/com/loki/lomines/data/stats/LeaderboardEntry.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.stats; import java.util.Objects; import java.util.UUID; diff --git a/src/main/java/com/loki/lomines/data/PlayerStats.java b/src/main/java/com/loki/lomines/data/stats/PlayerStats.java similarity index 97% rename from src/main/java/com/loki/lomines/data/PlayerStats.java rename to src/main/java/com/loki/lomines/data/stats/PlayerStats.java index f264225..ef8f7db 100644 --- a/src/main/java/com/loki/lomines/data/PlayerStats.java +++ b/src/main/java/com/loki/lomines/data/stats/PlayerStats.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.stats; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/com/loki/lomines/data/StatsManager.java b/src/main/java/com/loki/lomines/data/stats/StatsManager.java similarity index 99% rename from src/main/java/com/loki/lomines/data/StatsManager.java rename to src/main/java/com/loki/lomines/data/stats/StatsManager.java index 7566a53..c58317e 100644 --- a/src/main/java/com/loki/lomines/data/StatsManager.java +++ b/src/main/java/com/loki/lomines/data/stats/StatsManager.java @@ -1,4 +1,4 @@ -package com.loki.lomines.data; +package com.loki.lomines.data.stats; import com.loki.lomines.LoMinesPlugin; import dev.lolib.scheduler.Scheduler; diff --git a/src/main/java/com/loki/lomines/util/ChunkUtils.java b/src/main/java/com/loki/lomines/util/format/ChunkUtils.java similarity index 99% rename from src/main/java/com/loki/lomines/util/ChunkUtils.java rename to src/main/java/com/loki/lomines/util/format/ChunkUtils.java index a293316..788ac4a 100644 --- a/src/main/java/com/loki/lomines/util/ChunkUtils.java +++ b/src/main/java/com/loki/lomines/util/format/ChunkUtils.java @@ -1,4 +1,4 @@ -package com.loki.lomines.util; +package com.loki.lomines.util.format; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/src/main/java/com/loki/lomines/util/TimeFormatter.java b/src/main/java/com/loki/lomines/util/format/TimeFormatter.java similarity index 98% rename from src/main/java/com/loki/lomines/util/TimeFormatter.java rename to src/main/java/com/loki/lomines/util/format/TimeFormatter.java index 0118927..920ccc0 100644 --- a/src/main/java/com/loki/lomines/util/TimeFormatter.java +++ b/src/main/java/com/loki/lomines/util/format/TimeFormatter.java @@ -1,4 +1,4 @@ -package com.loki.lomines.util; +package com.loki.lomines.util.format; /** * Utility class for formatting time from Minecraft ticks to human-readable formats. diff --git a/src/main/java/com/loki/lomines/util/BlockKeys.java b/src/main/java/com/loki/lomines/util/location/BlockKeys.java similarity index 92% rename from src/main/java/com/loki/lomines/util/BlockKeys.java rename to src/main/java/com/loki/lomines/util/location/BlockKeys.java index 781ce8b..090c263 100644 --- a/src/main/java/com/loki/lomines/util/BlockKeys.java +++ b/src/main/java/com/loki/lomines/util/location/BlockKeys.java @@ -1,4 +1,4 @@ -package com.loki.lomines.util; +package com.loki.lomines.util.location; import org.bukkit.Location; import org.bukkit.block.Block; diff --git a/src/main/java/com/loki/lomines/util/Cuboid.java b/src/main/java/com/loki/lomines/util/location/Cuboid.java similarity index 99% rename from src/main/java/com/loki/lomines/util/Cuboid.java rename to src/main/java/com/loki/lomines/util/location/Cuboid.java index d4f3b91..b10922c 100644 --- a/src/main/java/com/loki/lomines/util/Cuboid.java +++ b/src/main/java/com/loki/lomines/util/location/Cuboid.java @@ -1,4 +1,4 @@ -package com.loki.lomines.util; +package com.loki.lomines.util.location; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/com/loki/lomines/util/LocationParser.java b/src/main/java/com/loki/lomines/util/location/LocationParser.java similarity index 98% rename from src/main/java/com/loki/lomines/util/LocationParser.java rename to src/main/java/com/loki/lomines/util/location/LocationParser.java index c527aa3..0b25bf0 100644 --- a/src/main/java/com/loki/lomines/util/LocationParser.java +++ b/src/main/java/com/loki/lomines/util/location/LocationParser.java @@ -1,4 +1,4 @@ -package com.loki.lomines.util; +package com.loki.lomines.util.location; import com.loki.lomines.data.ConfigParseException; import org.bukkit.Bukkit; diff --git a/src/main/java/com/loki/lomines/util/MaskScanner.java b/src/main/java/com/loki/lomines/util/selection/MaskScanner.java similarity index 97% rename from src/main/java/com/loki/lomines/util/MaskScanner.java rename to src/main/java/com/loki/lomines/util/selection/MaskScanner.java index c39e489..95b0e4a 100644 --- a/src/main/java/com/loki/lomines/util/MaskScanner.java +++ b/src/main/java/com/loki/lomines/util/selection/MaskScanner.java @@ -1,4 +1,4 @@ -package com.loki.lomines.util; +package com.loki.lomines.util.selection; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/com/loki/lomines/util/Selection.java b/src/main/java/com/loki/lomines/util/selection/Selection.java similarity index 99% rename from src/main/java/com/loki/lomines/util/Selection.java rename to src/main/java/com/loki/lomines/util/selection/Selection.java index a229607..eafd5e6 100644 --- a/src/main/java/com/loki/lomines/util/Selection.java +++ b/src/main/java/com/loki/lomines/util/selection/Selection.java @@ -1,4 +1,4 @@ -package com.loki.lomines.util; +package com.loki.lomines.util.selection; import org.bukkit.Location; diff --git a/src/main/java/com/loki/lomines/util/SelectionManager.java b/src/main/java/com/loki/lomines/util/selection/SelectionManager.java similarity index 98% rename from src/main/java/com/loki/lomines/util/SelectionManager.java rename to src/main/java/com/loki/lomines/util/selection/SelectionManager.java index bd9ce11..27789ac 100644 --- a/src/main/java/com/loki/lomines/util/SelectionManager.java +++ b/src/main/java/com/loki/lomines/util/selection/SelectionManager.java @@ -1,4 +1,4 @@ -package com.loki.lomines.util; +package com.loki.lomines.util.selection; import java.util.Map; import java.util.Optional;