From e430ee073f074ab7c7fb827253d54a9c3a492128 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Fri, 27 Aug 2021 02:25:11 +0200 Subject: [PATCH] Move all classes to the logblock package --- src/main/java/de/diddiz/LogBlock/Actor.java | 3 ++- .../java/de/diddiz/LogBlock/BlockChange.java | 22 +++++++++---------- .../java/de/diddiz/LogBlock/ChatMessage.java | 10 ++++----- .../de/diddiz/LogBlock/CommandsHandler.java | 18 +++++++-------- .../java/de/diddiz/LogBlock/Consumer.java | 10 ++++----- .../de/diddiz/LogBlock/DumpedLogImporter.java | 5 ++--- .../java/de/diddiz/LogBlock/EntityChange.java | 18 +++++++-------- src/main/java/de/diddiz/LogBlock/Kill.java | 13 ++++++----- .../java/de/diddiz/LogBlock/LogBlock.java | 8 +++---- .../java/de/diddiz/LogBlock/QueryParams.java | 14 ++++++------ .../diddiz/LogBlock/SummedBlockChanges.java | 5 +++-- .../diddiz/LogBlock/SummedEntityChanges.java | 6 ++--- .../java/de/diddiz/LogBlock/SummedKills.java | 2 +- src/main/java/de/diddiz/LogBlock/Updater.java | 9 ++++---- .../java/de/diddiz/LogBlock/WorldEditor.java | 9 ++++---- .../LogBlock/WorldEditorEditFactory.java | 2 +- .../blockstate/BlockStateCodecShulkerBox.java | 2 +- .../blockstate/BlockStateCodecSign.java | 2 +- .../de/diddiz/LogBlock/config/Config.java | 7 +++--- .../diddiz/LogBlock/config/WorldConfig.java | 3 +-- .../listeners/AdvancedEntityLogging.java | 4 ++-- .../LogBlock/listeners/BlockBreakLogging.java | 9 ++++---- .../LogBlock/listeners/BlockBurnLogging.java | 6 ++--- .../LogBlock/listeners/BlockPlaceLogging.java | 3 +-- .../listeners/ChestAccessLogging.java | 2 +- .../listeners/CreatureInteractLogging.java | 2 +- .../LogBlock/listeners/DragonEggLogging.java | 2 +- .../LogBlock/listeners/ExplosionLogging.java | 5 ++--- .../LogBlock/listeners/FluidFlowLogging.java | 3 +-- .../LogBlock/listeners/InteractLogging.java | 2 +- .../listeners/LeavesDecayLogging.java | 4 ++-- .../listeners/ScaffoldingLogging.java | 2 +- .../LogBlock/listeners/ToolListener.java | 4 ++-- .../{ => LogBlock}/util/ActionColor.java | 2 +- .../{ => LogBlock}/util/BukkitUtils.java | 4 ++-- .../util/ComparableVersion.java | 2 +- .../{ => LogBlock}/util/CuboidRegion.java | 2 +- .../{ => LogBlock}/util/LoggingUtil.java | 2 +- .../{ => LogBlock}/util/MessagingUtil.java | 10 ++++----- .../util/MySQLConnectionPool.java | 2 +- .../{ => LogBlock}/util/ReflectionUtil.java | 2 +- .../diddiz/{ => LogBlock}/util/SqlUtil.java | 2 +- .../diddiz/{ => LogBlock}/util/TypeColor.java | 2 +- .../{ => LogBlock}/util/UUIDFetcher.java | 2 +- .../de/diddiz/{ => LogBlock}/util/Utils.java | 2 +- .../worldedit/WorldEditHelper.java | 4 ++-- .../worldedit/WorldEditLoggingHook.java | 5 ++--- .../de/diddiz/LogBlock/QueryParsingTest.java | 3 +-- 48 files changed, 127 insertions(+), 135 deletions(-) rename src/main/java/de/diddiz/{ => LogBlock}/util/ActionColor.java (92%) rename src/main/java/de/diddiz/{ => LogBlock}/util/BukkitUtils.java (97%) rename src/main/java/de/diddiz/{ => LogBlock}/util/ComparableVersion.java (96%) rename src/main/java/de/diddiz/{ => LogBlock}/util/CuboidRegion.java (98%) rename src/main/java/de/diddiz/{ => LogBlock}/util/LoggingUtil.java (99%) rename src/main/java/de/diddiz/{ => LogBlock}/util/MessagingUtil.java (94%) rename src/main/java/de/diddiz/{ => LogBlock}/util/MySQLConnectionPool.java (95%) rename src/main/java/de/diddiz/{ => LogBlock}/util/ReflectionUtil.java (96%) rename src/main/java/de/diddiz/{ => LogBlock}/util/SqlUtil.java (95%) rename src/main/java/de/diddiz/{ => LogBlock}/util/TypeColor.java (94%) rename src/main/java/de/diddiz/{ => LogBlock}/util/UUIDFetcher.java (96%) rename src/main/java/de/diddiz/{ => LogBlock}/util/Utils.java (96%) rename src/main/java/de/diddiz/{ => LogBlock}/worldedit/WorldEditHelper.java (98%) rename src/main/java/de/diddiz/{ => LogBlock}/worldedit/WorldEditLoggingHook.java (98%) diff --git a/src/main/java/de/diddiz/LogBlock/Actor.java b/src/main/java/de/diddiz/LogBlock/Actor.java index e8f3b79..6364ab9 100644 --- a/src/main/java/de/diddiz/LogBlock/Actor.java +++ b/src/main/java/de/diddiz/LogBlock/Actor.java @@ -7,9 +7,10 @@ import org.bukkit.entity.Projectile; import org.bukkit.projectiles.BlockProjectileSource; import org.bukkit.projectiles.ProjectileSource; +import static de.diddiz.LogBlock.util.BukkitUtils.entityName; + import java.sql.ResultSet; import java.sql.SQLException; -import static de.diddiz.util.BukkitUtils.entityName; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.block.Block; diff --git a/src/main/java/de/diddiz/LogBlock/BlockChange.java b/src/main/java/de/diddiz/LogBlock/BlockChange.java index da136f4..5585853 100644 --- a/src/main/java/de/diddiz/LogBlock/BlockChange.java +++ b/src/main/java/de/diddiz/LogBlock/BlockChange.java @@ -1,18 +1,18 @@ package de.diddiz.LogBlock; -import static de.diddiz.util.ActionColor.CREATE; -import static de.diddiz.util.ActionColor.DESTROY; -import static de.diddiz.util.ActionColor.INTERACT; -import static de.diddiz.util.TypeColor.DEFAULT; -import static de.diddiz.util.MessagingUtil.createTextComponentWithColor; -import static de.diddiz.util.MessagingUtil.prettyDate; -import static de.diddiz.util.MessagingUtil.prettyLocation; -import static de.diddiz.util.MessagingUtil.prettyMaterial; -import static de.diddiz.util.MessagingUtil.prettyState; +import static de.diddiz.LogBlock.util.ActionColor.CREATE; +import static de.diddiz.LogBlock.util.ActionColor.DESTROY; +import static de.diddiz.LogBlock.util.ActionColor.INTERACT; +import static de.diddiz.LogBlock.util.MessagingUtil.createTextComponentWithColor; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyLocation; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyState; +import static de.diddiz.LogBlock.util.TypeColor.DEFAULT; import de.diddiz.LogBlock.blockstate.BlockStateCodecs; -import de.diddiz.util.BukkitUtils; -import de.diddiz.util.Utils; +import de.diddiz.LogBlock.util.BukkitUtils; +import de.diddiz.LogBlock.util.Utils; import java.sql.ResultSet; import java.sql.SQLException; import java.util.logging.Level; diff --git a/src/main/java/de/diddiz/LogBlock/ChatMessage.java b/src/main/java/de/diddiz/LogBlock/ChatMessage.java index 1f55dd2..379e636 100644 --- a/src/main/java/de/diddiz/LogBlock/ChatMessage.java +++ b/src/main/java/de/diddiz/LogBlock/ChatMessage.java @@ -1,11 +1,11 @@ package de.diddiz.LogBlock; -import static de.diddiz.util.LoggingUtil.checkText; -import static de.diddiz.util.MessagingUtil.brackets; -import static de.diddiz.util.MessagingUtil.prettyDate; +import static de.diddiz.LogBlock.util.LoggingUtil.checkText; +import static de.diddiz.LogBlock.util.MessagingUtil.brackets; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate; -import de.diddiz.util.MessagingUtil; -import de.diddiz.util.MessagingUtil.BracketType; +import de.diddiz.LogBlock.util.MessagingUtil; +import de.diddiz.LogBlock.util.MessagingUtil.BracketType; import java.sql.ResultSet; import java.sql.SQLException; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/src/main/java/de/diddiz/LogBlock/CommandsHandler.java b/src/main/java/de/diddiz/LogBlock/CommandsHandler.java index 9ef9654..1a76ca9 100755 --- a/src/main/java/de/diddiz/LogBlock/CommandsHandler.java +++ b/src/main/java/de/diddiz/LogBlock/CommandsHandler.java @@ -14,21 +14,21 @@ import static de.diddiz.LogBlock.config.Config.rollbackMaxArea; import static de.diddiz.LogBlock.config.Config.rollbackMaxTime; import static de.diddiz.LogBlock.config.Config.toolsByName; import static de.diddiz.LogBlock.config.Config.toolsByType; -import static de.diddiz.util.BukkitUtils.giveTool; -import static de.diddiz.util.BukkitUtils.saveSpawnHeight; -import static de.diddiz.util.TypeColor.DEFAULT; -import static de.diddiz.util.TypeColor.ERROR; -import static de.diddiz.util.TypeColor.HEADER; -import static de.diddiz.util.Utils.isInt; -import static de.diddiz.util.Utils.listing; +import static de.diddiz.LogBlock.util.BukkitUtils.giveTool; +import static de.diddiz.LogBlock.util.BukkitUtils.saveSpawnHeight; +import static de.diddiz.LogBlock.util.TypeColor.DEFAULT; +import static de.diddiz.LogBlock.util.TypeColor.ERROR; +import static de.diddiz.LogBlock.util.TypeColor.HEADER; +import static de.diddiz.LogBlock.util.Utils.isInt; +import static de.diddiz.LogBlock.util.Utils.listing; import de.diddiz.LogBlock.QueryParams.BlockChangeType; import de.diddiz.LogBlock.QueryParams.Order; import de.diddiz.LogBlock.QueryParams.SummarizationMode; import de.diddiz.LogBlock.config.Config; import de.diddiz.LogBlock.config.WorldConfig; -import de.diddiz.util.MessagingUtil; -import de.diddiz.util.Utils; +import de.diddiz.LogBlock.util.MessagingUtil; +import de.diddiz.LogBlock.util.Utils; import java.io.BufferedOutputStream; import java.io.BufferedWriter; import java.io.File; diff --git a/src/main/java/de/diddiz/LogBlock/Consumer.java b/src/main/java/de/diddiz/LogBlock/Consumer.java index d530f0a..d90c1f3 100644 --- a/src/main/java/de/diddiz/LogBlock/Consumer.java +++ b/src/main/java/de/diddiz/LogBlock/Consumer.java @@ -5,9 +5,9 @@ import static de.diddiz.LogBlock.config.Config.hiddenBlocks; import static de.diddiz.LogBlock.config.Config.hiddenPlayers; import static de.diddiz.LogBlock.config.Config.isLogged; import static de.diddiz.LogBlock.config.Config.logPlayerInfo; -import static de.diddiz.util.BukkitUtils.compressInventory; -import static de.diddiz.util.BukkitUtils.itemIDfromProjectileEntity; -import static de.diddiz.util.Utils.mysqlTextEscape; +import static de.diddiz.LogBlock.util.BukkitUtils.compressInventory; +import static de.diddiz.LogBlock.util.BukkitUtils.itemIDfromProjectileEntity; +import static de.diddiz.LogBlock.util.Utils.mysqlTextEscape; import java.io.File; import java.io.FileNotFoundException; @@ -54,8 +54,8 @@ import de.diddiz.LogBlock.blockstate.BlockStateCodecs; import de.diddiz.LogBlock.config.Config; import de.diddiz.LogBlock.events.BlockChangePreLogEvent; import de.diddiz.LogBlock.events.EntityChangePreLogEvent; -import de.diddiz.util.BukkitUtils; -import de.diddiz.util.Utils; +import de.diddiz.LogBlock.util.BukkitUtils; +import de.diddiz.LogBlock.util.Utils; public class Consumer extends Thread { private static final int MAX_SHUTDOWN_TIME_MILLIS = 20000; diff --git a/src/main/java/de/diddiz/LogBlock/DumpedLogImporter.java b/src/main/java/de/diddiz/LogBlock/DumpedLogImporter.java index a871efa..f430bb4 100644 --- a/src/main/java/de/diddiz/LogBlock/DumpedLogImporter.java +++ b/src/main/java/de/diddiz/LogBlock/DumpedLogImporter.java @@ -1,7 +1,8 @@ package de.diddiz.LogBlock; -import de.diddiz.util.Utils.ExtensionFilenameFilter; +import static de.diddiz.LogBlock.util.Utils.newline; +import de.diddiz.LogBlock.util.Utils.ExtensionFilenameFilter; import java.io.*; import java.sql.Connection; import java.sql.SQLException; @@ -11,8 +12,6 @@ import java.util.Comparator; import java.util.logging.Level; import java.util.regex.Pattern; -import static de.diddiz.util.Utils.newline; - public class DumpedLogImporter implements Runnable { private final LogBlock logblock; diff --git a/src/main/java/de/diddiz/LogBlock/EntityChange.java b/src/main/java/de/diddiz/LogBlock/EntityChange.java index 77a1d23..77c8acf 100644 --- a/src/main/java/de/diddiz/LogBlock/EntityChange.java +++ b/src/main/java/de/diddiz/LogBlock/EntityChange.java @@ -1,15 +1,15 @@ package de.diddiz.LogBlock; -import static de.diddiz.util.ActionColor.CREATE; -import static de.diddiz.util.ActionColor.DESTROY; -import static de.diddiz.util.ActionColor.INTERACT; -import static de.diddiz.util.MessagingUtil.createTextComponentWithColor; -import static de.diddiz.util.MessagingUtil.prettyDate; -import static de.diddiz.util.MessagingUtil.prettyEntityType; -import static de.diddiz.util.MessagingUtil.prettyLocation; -import static de.diddiz.util.MessagingUtil.prettyMaterial; +import static de.diddiz.LogBlock.util.ActionColor.CREATE; +import static de.diddiz.LogBlock.util.ActionColor.DESTROY; +import static de.diddiz.LogBlock.util.ActionColor.INTERACT; +import static de.diddiz.LogBlock.util.MessagingUtil.createTextComponentWithColor; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyEntityType; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyLocation; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial; -import de.diddiz.util.Utils; +import de.diddiz.LogBlock.util.Utils; import java.sql.ResultSet; import java.sql.SQLException; import java.util.UUID; diff --git a/src/main/java/de/diddiz/LogBlock/Kill.java b/src/main/java/de/diddiz/LogBlock/Kill.java index bec4f18..2302c63 100755 --- a/src/main/java/de/diddiz/LogBlock/Kill.java +++ b/src/main/java/de/diddiz/LogBlock/Kill.java @@ -1,11 +1,12 @@ package de.diddiz.LogBlock; -import static de.diddiz.util.ActionColor.DESTROY; -import static de.diddiz.util.MessagingUtil.prettyDate; -import static de.diddiz.util.MessagingUtil.prettyLocation; -import static de.diddiz.util.MessagingUtil.prettyMaterial; -import de.diddiz.util.BukkitUtils; -import de.diddiz.util.MessagingUtil; +import static de.diddiz.LogBlock.util.ActionColor.DESTROY; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyLocation; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial; + +import de.diddiz.LogBlock.util.BukkitUtils; +import de.diddiz.LogBlock.util.MessagingUtil; import java.sql.ResultSet; import java.sql.SQLException; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/src/main/java/de/diddiz/LogBlock/LogBlock.java b/src/main/java/de/diddiz/LogBlock/LogBlock.java index 4079104..36f8dc7 100644 --- a/src/main/java/de/diddiz/LogBlock/LogBlock.java +++ b/src/main/java/de/diddiz/LogBlock/LogBlock.java @@ -3,10 +3,10 @@ package de.diddiz.LogBlock; import de.diddiz.LogBlock.config.Config; import de.diddiz.LogBlock.listeners.*; import de.diddiz.LogBlock.questioner.Questioner; -import de.diddiz.util.BukkitUtils; -import de.diddiz.util.MySQLConnectionPool; -import de.diddiz.worldedit.WorldEditHelper; -import de.diddiz.worldedit.WorldEditLoggingHook; +import de.diddiz.LogBlock.util.BukkitUtils; +import de.diddiz.LogBlock.util.MySQLConnectionPool; +import de.diddiz.LogBlock.worldedit.WorldEditHelper; +import de.diddiz.LogBlock.worldedit.WorldEditLoggingHook; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.command.Command; diff --git a/src/main/java/de/diddiz/LogBlock/QueryParams.java b/src/main/java/de/diddiz/LogBlock/QueryParams.java index 9bf6894..1151726 100644 --- a/src/main/java/de/diddiz/LogBlock/QueryParams.java +++ b/src/main/java/de/diddiz/LogBlock/QueryParams.java @@ -1,11 +1,11 @@ package de.diddiz.LogBlock; import de.diddiz.LogBlock.config.Config; -import de.diddiz.util.BukkitUtils; -import de.diddiz.util.CuboidRegion; -import de.diddiz.util.SqlUtil; -import de.diddiz.util.Utils; -import de.diddiz.worldedit.WorldEditHelper; +import de.diddiz.LogBlock.util.BukkitUtils; +import de.diddiz.LogBlock.util.CuboidRegion; +import de.diddiz.LogBlock.util.SqlUtil; +import de.diddiz.LogBlock.util.Utils; +import de.diddiz.LogBlock.worldedit.WorldEditHelper; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -20,8 +20,8 @@ import java.util.regex.Pattern; import static de.diddiz.LogBlock.Session.getSession; import static de.diddiz.LogBlock.config.Config.*; -import static de.diddiz.util.BukkitUtils.friendlyWorldname; -import static de.diddiz.util.Utils.*; +import static de.diddiz.LogBlock.util.BukkitUtils.friendlyWorldname; +import static de.diddiz.LogBlock.util.Utils.*; public final class QueryParams implements Cloneable { private static final HashMap keywords = new HashMap<>(); diff --git a/src/main/java/de/diddiz/LogBlock/SummedBlockChanges.java b/src/main/java/de/diddiz/LogBlock/SummedBlockChanges.java index f7c36d9..2e357c1 100644 --- a/src/main/java/de/diddiz/LogBlock/SummedBlockChanges.java +++ b/src/main/java/de/diddiz/LogBlock/SummedBlockChanges.java @@ -1,8 +1,9 @@ package de.diddiz.LogBlock; -import static de.diddiz.util.MessagingUtil.prettyMaterial; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial; + import de.diddiz.LogBlock.QueryParams.SummarizationMode; -import de.diddiz.util.MessagingUtil; +import de.diddiz.LogBlock.util.MessagingUtil; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Objects; diff --git a/src/main/java/de/diddiz/LogBlock/SummedEntityChanges.java b/src/main/java/de/diddiz/LogBlock/SummedEntityChanges.java index 4c14f5f..d9a1499 100644 --- a/src/main/java/de/diddiz/LogBlock/SummedEntityChanges.java +++ b/src/main/java/de/diddiz/LogBlock/SummedEntityChanges.java @@ -1,7 +1,9 @@ package de.diddiz.LogBlock; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial; + import de.diddiz.LogBlock.QueryParams.SummarizationMode; -import de.diddiz.util.MessagingUtil; +import de.diddiz.LogBlock.util.MessagingUtil; import org.bukkit.Location; import java.sql.ResultSet; @@ -10,8 +12,6 @@ import java.util.Objects; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TextComponent; -import static de.diddiz.util.MessagingUtil.prettyMaterial; - public class SummedEntityChanges implements LookupCacheElement { private final int type; private final int created, destroyed; diff --git a/src/main/java/de/diddiz/LogBlock/SummedKills.java b/src/main/java/de/diddiz/LogBlock/SummedKills.java index 2bec40c..a185e9d 100644 --- a/src/main/java/de/diddiz/LogBlock/SummedKills.java +++ b/src/main/java/de/diddiz/LogBlock/SummedKills.java @@ -1,6 +1,6 @@ package de.diddiz.LogBlock; -import de.diddiz.util.MessagingUtil; +import de.diddiz.LogBlock.util.MessagingUtil; import java.sql.ResultSet; import java.sql.SQLException; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/src/main/java/de/diddiz/LogBlock/Updater.java b/src/main/java/de/diddiz/LogBlock/Updater.java index c548701..9918384 100644 --- a/src/main/java/de/diddiz/LogBlock/Updater.java +++ b/src/main/java/de/diddiz/LogBlock/Updater.java @@ -3,9 +3,9 @@ package de.diddiz.LogBlock; import de.diddiz.LogBlock.blockstate.BlockStateCodecSign; import de.diddiz.LogBlock.config.Config; import de.diddiz.LogBlock.config.WorldConfig; -import de.diddiz.util.UUIDFetcher; -import de.diddiz.util.Utils; - +import de.diddiz.LogBlock.util.ComparableVersion; +import de.diddiz.LogBlock.util.UUIDFetcher; +import de.diddiz.LogBlock.util.Utils; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.data.BlockData; @@ -25,8 +25,7 @@ import java.util.logging.Level; import static de.diddiz.LogBlock.config.Config.getLoggedWorlds; import static de.diddiz.LogBlock.config.Config.isLogging; -import static de.diddiz.util.BukkitUtils.friendlyWorldname; -import de.diddiz.util.ComparableVersion; +import static de.diddiz.LogBlock.util.BukkitUtils.friendlyWorldname; class Updater { private final LogBlock logblock; diff --git a/src/main/java/de/diddiz/LogBlock/WorldEditor.java b/src/main/java/de/diddiz/LogBlock/WorldEditor.java index d562479..15fa285 100644 --- a/src/main/java/de/diddiz/LogBlock/WorldEditor.java +++ b/src/main/java/de/diddiz/LogBlock/WorldEditor.java @@ -28,10 +28,9 @@ import org.bukkit.inventory.ItemStack; import de.diddiz.LogBlock.QueryParams.Order; import de.diddiz.LogBlock.blockstate.BlockStateCodecs; -import de.diddiz.util.BukkitUtils; -import de.diddiz.util.Utils; -import de.diddiz.worldedit.WorldEditHelper; - +import de.diddiz.LogBlock.util.BukkitUtils; +import de.diddiz.LogBlock.util.Utils; +import de.diddiz.LogBlock.worldedit.WorldEditHelper; import java.io.File; import java.io.PrintWriter; import java.sql.ResultSet; @@ -49,7 +48,7 @@ import net.md_5.bungee.api.chat.TextComponent; import static de.diddiz.LogBlock.config.Config.dontRollback; import static de.diddiz.LogBlock.config.Config.replaceAnyway; -import static de.diddiz.util.BukkitUtils.*; +import static de.diddiz.LogBlock.util.BukkitUtils.*; public class WorldEditor implements Runnable { private final LogBlock logblock; diff --git a/src/main/java/de/diddiz/LogBlock/WorldEditorEditFactory.java b/src/main/java/de/diddiz/LogBlock/WorldEditorEditFactory.java index efec508..d167d23 100644 --- a/src/main/java/de/diddiz/LogBlock/WorldEditorEditFactory.java +++ b/src/main/java/de/diddiz/LogBlock/WorldEditorEditFactory.java @@ -6,7 +6,7 @@ import java.sql.SQLException; import org.bukkit.inventory.ItemStack; import de.diddiz.LogBlock.QueryParams.BlockChangeType; -import de.diddiz.util.Utils; +import de.diddiz.LogBlock.util.Utils; public class WorldEditorEditFactory { private final WorldEditor editor; diff --git a/src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecShulkerBox.java b/src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecShulkerBox.java index ccbeca8..d26c234 100644 --- a/src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecShulkerBox.java +++ b/src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecShulkerBox.java @@ -4,7 +4,7 @@ import static de.diddiz.LogBlock.config.Config.getWorldConfig; import de.diddiz.LogBlock.Logging; import de.diddiz.LogBlock.config.WorldConfig; -import de.diddiz.util.BukkitUtils; +import de.diddiz.LogBlock.util.BukkitUtils; import org.bukkit.Material; import org.bukkit.block.BlockState; import org.bukkit.block.ShulkerBox; diff --git a/src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecSign.java b/src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecSign.java index 656ec74..e60c2a8 100644 --- a/src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecSign.java +++ b/src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecSign.java @@ -1,6 +1,6 @@ package de.diddiz.LogBlock.blockstate; -import de.diddiz.util.BukkitUtils; +import de.diddiz.LogBlock.util.BukkitUtils; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/src/main/java/de/diddiz/LogBlock/config/Config.java b/src/main/java/de/diddiz/LogBlock/config/Config.java index 11be9f8..f0ec2ad 100644 --- a/src/main/java/de/diddiz/LogBlock/config/Config.java +++ b/src/main/java/de/diddiz/LogBlock/config/Config.java @@ -1,8 +1,7 @@ package de.diddiz.LogBlock.config; import de.diddiz.LogBlock.*; -import de.diddiz.util.ComparableVersion; - +import de.diddiz.LogBlock.util.ComparableVersion; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.configuration.ConfigurationSection; @@ -17,8 +16,8 @@ import java.util.Map.Entry; import java.util.logging.Level; import java.util.zip.DataFormatException; -import static de.diddiz.util.BukkitUtils.friendlyWorldname; -import static de.diddiz.util.Utils.parseTimeSpec; +import static de.diddiz.LogBlock.util.BukkitUtils.friendlyWorldname; +import static de.diddiz.LogBlock.util.Utils.parseTimeSpec; import static org.bukkit.Bukkit.*; public class Config { diff --git a/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java b/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java index 19230bd..da4f8e5 100644 --- a/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java +++ b/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java @@ -2,8 +2,7 @@ package de.diddiz.LogBlock.config; import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.Logging; -import de.diddiz.util.BukkitUtils; - +import de.diddiz.LogBlock.util.BukkitUtils; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Animals; import org.bukkit.entity.ArmorStand; diff --git a/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java index f8b13e0..457ffd6 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java @@ -42,8 +42,8 @@ import de.diddiz.LogBlock.EntityChange.EntityChangeType; import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.config.Config; import de.diddiz.LogBlock.config.EntityLogging; -import de.diddiz.util.LoggingUtil; -import de.diddiz.worldedit.WorldEditHelper; +import de.diddiz.LogBlock.util.LoggingUtil; +import de.diddiz.LogBlock.worldedit.WorldEditHelper; import java.util.UUID; public class AdvancedEntityLogging extends LoggingListener { diff --git a/src/main/java/de/diddiz/LogBlock/listeners/BlockBreakLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/BlockBreakLogging.java index 9f1d11c..c561456 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/BlockBreakLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/BlockBreakLogging.java @@ -4,8 +4,7 @@ import de.diddiz.LogBlock.Actor; import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.Logging; import de.diddiz.LogBlock.config.WorldConfig; -import de.diddiz.util.BukkitUtils; - +import de.diddiz.LogBlock.util.BukkitUtils; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Material; @@ -19,9 +18,9 @@ import org.bukkit.event.player.PlayerBucketFillEvent; import static de.diddiz.LogBlock.config.Config.getWorldConfig; import static de.diddiz.LogBlock.config.Config.isLogging; -import static de.diddiz.util.LoggingUtil.smartLogBlockBreak; -import static de.diddiz.util.LoggingUtil.smartLogBlockReplace; -import static de.diddiz.util.LoggingUtil.smartLogFallables; +import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak; +import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockReplace; +import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables; public class BlockBreakLogging extends LoggingListener { public BlockBreakLogging(LogBlock lb) { diff --git a/src/main/java/de/diddiz/LogBlock/listeners/BlockBurnLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/BlockBurnLogging.java index e329ccf..5ba55c6 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/BlockBurnLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/BlockBurnLogging.java @@ -17,9 +17,9 @@ import org.bukkit.event.block.BlockIgniteEvent.IgniteCause; import org.bukkit.event.player.PlayerInteractEvent; import static de.diddiz.LogBlock.config.Config.isLogging; -import static de.diddiz.util.LoggingUtil.smartLogBlockBreak; -import static de.diddiz.util.LoggingUtil.smartLogBlockReplace; -import static de.diddiz.util.LoggingUtil.smartLogFallables; +import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak; +import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockReplace; +import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables; public class BlockBurnLogging extends LoggingListener { public BlockBurnLogging(LogBlock lb) { diff --git a/src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java index 58ce7a2..b24cfcf 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java @@ -4,8 +4,7 @@ import de.diddiz.LogBlock.Actor; import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.Logging; import de.diddiz.LogBlock.config.Config; -import de.diddiz.util.LoggingUtil; - +import de.diddiz.LogBlock.util.LoggingUtil; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockState; diff --git a/src/main/java/de/diddiz/LogBlock/listeners/ChestAccessLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/ChestAccessLogging.java index 6211d07..15606ec 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/ChestAccessLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/ChestAccessLogging.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Map.Entry; import static de.diddiz.LogBlock.config.Config.isLogging; -import static de.diddiz.util.BukkitUtils.*; +import static de.diddiz.LogBlock.util.BukkitUtils.*; public class ChestAccessLogging extends LoggingListener { private class PlayerActiveInventoryModifications { diff --git a/src/main/java/de/diddiz/LogBlock/listeners/CreatureInteractLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/CreatureInteractLogging.java index 84651b2..395fe35 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/CreatureInteractLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/CreatureInteractLogging.java @@ -4,7 +4,7 @@ import de.diddiz.LogBlock.Actor; import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.Logging; import de.diddiz.LogBlock.config.WorldConfig; -import de.diddiz.util.BukkitUtils; +import de.diddiz.LogBlock.util.BukkitUtils; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/de/diddiz/LogBlock/listeners/DragonEggLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/DragonEggLogging.java index 45fde6d..657ae9e 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/DragonEggLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/DragonEggLogging.java @@ -20,7 +20,7 @@ import de.diddiz.LogBlock.Actor; import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.Logging; import de.diddiz.LogBlock.config.Config; -import de.diddiz.util.LoggingUtil; +import de.diddiz.LogBlock.util.LoggingUtil; public class DragonEggLogging extends LoggingListener { diff --git a/src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java index ad46e9b..9695e96 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java @@ -5,8 +5,7 @@ import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.Logging; import de.diddiz.LogBlock.config.Config; import de.diddiz.LogBlock.config.WorldConfig; -import de.diddiz.util.BukkitUtils; - +import de.diddiz.LogBlock.util.BukkitUtils; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -24,7 +23,7 @@ import org.bukkit.scheduler.BukkitRunnable; import static de.diddiz.LogBlock.config.Config.getWorldConfig; import static de.diddiz.LogBlock.config.Config.logCreeperExplosionsAsPlayerWhoTriggeredThese; -import static de.diddiz.util.BukkitUtils.getContainerBlocks; +import static de.diddiz.LogBlock.util.BukkitUtils.getContainerBlocks; import java.util.UUID; diff --git a/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java index 51fe14d..b571011 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java @@ -5,8 +5,7 @@ import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.Logging; import de.diddiz.LogBlock.config.Config; import de.diddiz.LogBlock.config.WorldConfig; -import de.diddiz.util.BukkitUtils; - +import de.diddiz.LogBlock.util.BukkitUtils; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java index 40af564..a865cee 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java @@ -4,7 +4,7 @@ import de.diddiz.LogBlock.Actor; import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.Logging; import de.diddiz.LogBlock.config.WorldConfig; -import de.diddiz.util.BukkitUtils; +import de.diddiz.LogBlock.util.BukkitUtils; import org.bukkit.DyeColor; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/de/diddiz/LogBlock/listeners/LeavesDecayLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/LeavesDecayLogging.java index 055974e..5b1a9d8 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/LeavesDecayLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/LeavesDecayLogging.java @@ -8,8 +8,8 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.block.LeavesDecayEvent; import static de.diddiz.LogBlock.config.Config.isLogging; -import static de.diddiz.util.LoggingUtil.smartLogBlockBreak; -import static de.diddiz.util.LoggingUtil.smartLogFallables; +import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak; +import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables; public class LeavesDecayLogging extends LoggingListener { public LeavesDecayLogging(LogBlock lb) { diff --git a/src/main/java/de/diddiz/LogBlock/listeners/ScaffoldingLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/ScaffoldingLogging.java index cf7e1f3..032c7e9 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/ScaffoldingLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/ScaffoldingLogging.java @@ -18,7 +18,7 @@ import org.bukkit.event.block.BlockFadeEvent; import org.bukkit.event.block.BlockPlaceEvent; import static de.diddiz.LogBlock.config.Config.isLogging; -import static de.diddiz.util.LoggingUtil.smartLogFallables; +import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables; public class ScaffoldingLogging extends LoggingListener { private final static long MAX_SCAFFOLDING_LOG_TIME_MS = 2000; diff --git a/src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java b/src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java index e20b1c4..7a192c5 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java @@ -2,8 +2,8 @@ package de.diddiz.LogBlock.listeners; import de.diddiz.LogBlock.*; import de.diddiz.LogBlock.events.ToolUseEvent; -import de.diddiz.util.BukkitUtils; -import de.diddiz.util.CuboidRegion; +import de.diddiz.LogBlock.util.BukkitUtils; +import de.diddiz.LogBlock.util.CuboidRegion; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/de/diddiz/util/ActionColor.java b/src/main/java/de/diddiz/LogBlock/util/ActionColor.java similarity index 92% rename from src/main/java/de/diddiz/util/ActionColor.java rename to src/main/java/de/diddiz/LogBlock/util/ActionColor.java index e336ba0..fa69d50 100644 --- a/src/main/java/de/diddiz/util/ActionColor.java +++ b/src/main/java/de/diddiz/LogBlock/util/ActionColor.java @@ -1,4 +1,4 @@ -package de.diddiz.util; +package de.diddiz.LogBlock.util; import net.md_5.bungee.api.ChatColor; diff --git a/src/main/java/de/diddiz/util/BukkitUtils.java b/src/main/java/de/diddiz/LogBlock/util/BukkitUtils.java similarity index 97% rename from src/main/java/de/diddiz/util/BukkitUtils.java rename to src/main/java/de/diddiz/LogBlock/util/BukkitUtils.java index 2228c93..5622882 100644 --- a/src/main/java/de/diddiz/util/BukkitUtils.java +++ b/src/main/java/de/diddiz/LogBlock/util/BukkitUtils.java @@ -1,6 +1,6 @@ -package de.diddiz.util; +package de.diddiz.LogBlock.util; -import static de.diddiz.util.MessagingUtil.prettyMaterial; +import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial; import de.diddiz.LogBlock.LogBlock; import java.io.File; diff --git a/src/main/java/de/diddiz/util/ComparableVersion.java b/src/main/java/de/diddiz/LogBlock/util/ComparableVersion.java similarity index 96% rename from src/main/java/de/diddiz/util/ComparableVersion.java rename to src/main/java/de/diddiz/LogBlock/util/ComparableVersion.java index 95aba24..17e8824 100644 --- a/src/main/java/de/diddiz/util/ComparableVersion.java +++ b/src/main/java/de/diddiz/LogBlock/util/ComparableVersion.java @@ -1,4 +1,4 @@ -package de.diddiz.util; +package de.diddiz.LogBlock.util; // Taken from maven-artifact at // http://grepcode.com/file_/repo1.maven.org/maven2/org.apache.maven/maven-artifact/3.2.3/org/apache/maven/artifact/versioning/ComparableVersion.java/?v=source diff --git a/src/main/java/de/diddiz/util/CuboidRegion.java b/src/main/java/de/diddiz/LogBlock/util/CuboidRegion.java similarity index 98% rename from src/main/java/de/diddiz/util/CuboidRegion.java rename to src/main/java/de/diddiz/LogBlock/util/CuboidRegion.java index a704609..7247706 100644 --- a/src/main/java/de/diddiz/util/CuboidRegion.java +++ b/src/main/java/de/diddiz/LogBlock/util/CuboidRegion.java @@ -1,4 +1,4 @@ -package de.diddiz.util; +package de.diddiz.LogBlock.util; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/de/diddiz/util/LoggingUtil.java b/src/main/java/de/diddiz/LogBlock/util/LoggingUtil.java similarity index 99% rename from src/main/java/de/diddiz/util/LoggingUtil.java rename to src/main/java/de/diddiz/LogBlock/util/LoggingUtil.java index 3c68c5b..2c8ede7 100644 --- a/src/main/java/de/diddiz/util/LoggingUtil.java +++ b/src/main/java/de/diddiz/LogBlock/util/LoggingUtil.java @@ -1,4 +1,4 @@ -package de.diddiz.util; +package de.diddiz.LogBlock.util; import de.diddiz.LogBlock.Actor; import de.diddiz.LogBlock.Consumer; diff --git a/src/main/java/de/diddiz/util/MessagingUtil.java b/src/main/java/de/diddiz/LogBlock/util/MessagingUtil.java similarity index 94% rename from src/main/java/de/diddiz/util/MessagingUtil.java rename to src/main/java/de/diddiz/LogBlock/util/MessagingUtil.java index b9f6a22..3a82894 100644 --- a/src/main/java/de/diddiz/util/MessagingUtil.java +++ b/src/main/java/de/diddiz/LogBlock/util/MessagingUtil.java @@ -1,9 +1,9 @@ -package de.diddiz.util; +package de.diddiz.LogBlock.util; -import static de.diddiz.util.ActionColor.CREATE; -import static de.diddiz.util.ActionColor.DESTROY; -import static de.diddiz.util.TypeColor.DEFAULT; -import static de.diddiz.util.Utils.spaces; +import static de.diddiz.LogBlock.util.ActionColor.CREATE; +import static de.diddiz.LogBlock.util.ActionColor.DESTROY; +import static de.diddiz.LogBlock.util.TypeColor.DEFAULT; +import static de.diddiz.LogBlock.util.Utils.spaces; import de.diddiz.LogBlock.config.Config; import net.md_5.bungee.api.ChatColor; diff --git a/src/main/java/de/diddiz/util/MySQLConnectionPool.java b/src/main/java/de/diddiz/LogBlock/util/MySQLConnectionPool.java similarity index 95% rename from src/main/java/de/diddiz/util/MySQLConnectionPool.java rename to src/main/java/de/diddiz/LogBlock/util/MySQLConnectionPool.java index b064d70..c5b7882 100644 --- a/src/main/java/de/diddiz/util/MySQLConnectionPool.java +++ b/src/main/java/de/diddiz/LogBlock/util/MySQLConnectionPool.java @@ -1,4 +1,4 @@ -package de.diddiz.util; +package de.diddiz.LogBlock.util; import com.zaxxer.hikari.HikariDataSource; import de.diddiz.LogBlock.config.Config; diff --git a/src/main/java/de/diddiz/util/ReflectionUtil.java b/src/main/java/de/diddiz/LogBlock/util/ReflectionUtil.java similarity index 96% rename from src/main/java/de/diddiz/util/ReflectionUtil.java rename to src/main/java/de/diddiz/LogBlock/util/ReflectionUtil.java index ba50bd8..5a79770 100644 --- a/src/main/java/de/diddiz/util/ReflectionUtil.java +++ b/src/main/java/de/diddiz/LogBlock/util/ReflectionUtil.java @@ -1,4 +1,4 @@ -package de.diddiz.util; +package de.diddiz.LogBlock.util; import org.bukkit.Bukkit; diff --git a/src/main/java/de/diddiz/util/SqlUtil.java b/src/main/java/de/diddiz/LogBlock/util/SqlUtil.java similarity index 95% rename from src/main/java/de/diddiz/util/SqlUtil.java rename to src/main/java/de/diddiz/LogBlock/util/SqlUtil.java index d84df36..a21c2c4 100644 --- a/src/main/java/de/diddiz/util/SqlUtil.java +++ b/src/main/java/de/diddiz/LogBlock/util/SqlUtil.java @@ -1,4 +1,4 @@ -package de.diddiz.util; +package de.diddiz.LogBlock.util; public class SqlUtil { public static String escapeString(String s) { diff --git a/src/main/java/de/diddiz/util/TypeColor.java b/src/main/java/de/diddiz/LogBlock/util/TypeColor.java similarity index 94% rename from src/main/java/de/diddiz/util/TypeColor.java rename to src/main/java/de/diddiz/LogBlock/util/TypeColor.java index 00904d0..db62b56 100644 --- a/src/main/java/de/diddiz/util/TypeColor.java +++ b/src/main/java/de/diddiz/LogBlock/util/TypeColor.java @@ -1,4 +1,4 @@ -package de.diddiz.util; +package de.diddiz.LogBlock.util; import net.md_5.bungee.api.ChatColor; diff --git a/src/main/java/de/diddiz/util/UUIDFetcher.java b/src/main/java/de/diddiz/LogBlock/util/UUIDFetcher.java similarity index 96% rename from src/main/java/de/diddiz/util/UUIDFetcher.java rename to src/main/java/de/diddiz/LogBlock/util/UUIDFetcher.java index 14d42fd..d6bca85 100644 --- a/src/main/java/de/diddiz/util/UUIDFetcher.java +++ b/src/main/java/de/diddiz/LogBlock/util/UUIDFetcher.java @@ -1,4 +1,4 @@ -package de.diddiz.util; +package de.diddiz.LogBlock.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/de/diddiz/util/Utils.java b/src/main/java/de/diddiz/LogBlock/util/Utils.java similarity index 96% rename from src/main/java/de/diddiz/util/Utils.java rename to src/main/java/de/diddiz/LogBlock/util/Utils.java index 3e38a3b..e84f1f9 100644 --- a/src/main/java/de/diddiz/util/Utils.java +++ b/src/main/java/de/diddiz/LogBlock/util/Utils.java @@ -1,4 +1,4 @@ -package de.diddiz.util; +package de.diddiz.LogBlock.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/main/java/de/diddiz/worldedit/WorldEditHelper.java b/src/main/java/de/diddiz/LogBlock/worldedit/WorldEditHelper.java similarity index 98% rename from src/main/java/de/diddiz/worldedit/WorldEditHelper.java rename to src/main/java/de/diddiz/LogBlock/worldedit/WorldEditHelper.java index b24413e..f59aa8a 100644 --- a/src/main/java/de/diddiz/worldedit/WorldEditHelper.java +++ b/src/main/java/de/diddiz/LogBlock/worldedit/WorldEditHelper.java @@ -1,4 +1,4 @@ -package de.diddiz.worldedit; +package de.diddiz.LogBlock.worldedit; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -34,7 +34,7 @@ import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.Region; import de.diddiz.LogBlock.LogBlock; -import de.diddiz.util.CuboidRegion; +import de.diddiz.LogBlock.util.CuboidRegion; public class WorldEditHelper { private static boolean checkedForWorldEdit; diff --git a/src/main/java/de/diddiz/worldedit/WorldEditLoggingHook.java b/src/main/java/de/diddiz/LogBlock/worldedit/WorldEditLoggingHook.java similarity index 98% rename from src/main/java/de/diddiz/worldedit/WorldEditLoggingHook.java rename to src/main/java/de/diddiz/LogBlock/worldedit/WorldEditLoggingHook.java index 1a9ab28..613405f 100644 --- a/src/main/java/de/diddiz/worldedit/WorldEditLoggingHook.java +++ b/src/main/java/de/diddiz/LogBlock/worldedit/WorldEditLoggingHook.java @@ -1,4 +1,4 @@ -package de.diddiz.worldedit; +package de.diddiz.LogBlock.worldedit; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.WorldEdit; @@ -15,8 +15,7 @@ import de.diddiz.LogBlock.LogBlock; import de.diddiz.LogBlock.Logging; import de.diddiz.LogBlock.blockstate.BlockStateCodecs; import de.diddiz.LogBlock.config.Config; -import de.diddiz.util.BukkitUtils; - +import de.diddiz.LogBlock.util.BukkitUtils; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; diff --git a/src/test/java/de/diddiz/LogBlock/QueryParsingTest.java b/src/test/java/de/diddiz/LogBlock/QueryParsingTest.java index 9e7d828..751aa4c 100644 --- a/src/test/java/de/diddiz/LogBlock/QueryParsingTest.java +++ b/src/test/java/de/diddiz/LogBlock/QueryParsingTest.java @@ -1,9 +1,8 @@ package de.diddiz.LogBlock; -import de.diddiz.util.Utils; import org.junit.Assert; import org.junit.Test; - +import de.diddiz.LogBlock.util.Utils; import java.util.Arrays; import java.util.List;