From 4523503f6ec9dffc1308079c940487dd9c967eb1 Mon Sep 17 00:00:00 2001 From: Jesse Prescott Date: Wed, 6 Jun 2018 06:45:29 +0100 Subject: [PATCH] Refactor packages. --- .../gmail/bleedobsidian/itemcase/{commands => }/Command.java | 2 +- .../java/com/gmail/bleedobsidian/itemcase/CommandHandler.java | 2 ++ .../java/com/gmail/bleedobsidian/itemcase/ItemCaseCore.java | 3 +++ .../gmail/bleedobsidian/itemcase/commands/CreateCommand.java | 3 ++- .../gmail/bleedobsidian/itemcase/commands/DestroyCommand.java | 3 ++- .../gmail/bleedobsidian/itemcase/commands/ModifyCommand.java | 3 ++- .../gmail/bleedobsidian/itemcase/commands/OrderCommand.java | 3 ++- .../gmail/bleedobsidian/itemcase/commands/StorageCommand.java | 3 ++- .../gmail/bleedobsidian/itemcase/{ => loggers}/ChatLogger.java | 3 ++- .../bleedobsidian/itemcase/{ => loggers}/ConsoleLogger.java | 3 ++- .../bleedobsidian/itemcase/{ => loggers}/GenericLogger.java | 3 ++- .../gmail/bleedobsidian/itemcase/managers/OrderManager.java | 2 +- 12 files changed, 23 insertions(+), 10 deletions(-) rename src/main/java/com/gmail/bleedobsidian/itemcase/{commands => }/Command.java (95%) rename src/main/java/com/gmail/bleedobsidian/itemcase/{ => loggers}/ChatLogger.java (94%) rename src/main/java/com/gmail/bleedobsidian/itemcase/{ => loggers}/ConsoleLogger.java (97%) rename src/main/java/com/gmail/bleedobsidian/itemcase/{ => loggers}/GenericLogger.java (93%) diff --git a/src/main/java/com/gmail/bleedobsidian/itemcase/commands/Command.java b/src/main/java/com/gmail/bleedobsidian/itemcase/Command.java similarity index 95% rename from src/main/java/com/gmail/bleedobsidian/itemcase/commands/Command.java rename to src/main/java/com/gmail/bleedobsidian/itemcase/Command.java index e65eac3..04c5991 100644 --- a/src/main/java/com/gmail/bleedobsidian/itemcase/commands/Command.java +++ b/src/main/java/com/gmail/bleedobsidian/itemcase/Command.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.gmail.bleedobsidian.itemcase.commands; +package com.gmail.bleedobsidian.itemcase; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/gmail/bleedobsidian/itemcase/CommandHandler.java b/src/main/java/com/gmail/bleedobsidian/itemcase/CommandHandler.java index a8432f7..a0421d2 100644 --- a/src/main/java/com/gmail/bleedobsidian/itemcase/CommandHandler.java +++ b/src/main/java/com/gmail/bleedobsidian/itemcase/CommandHandler.java @@ -14,6 +14,8 @@ */ package com.gmail.bleedobsidian.itemcase; +import com.gmail.bleedobsidian.itemcase.loggers.GenericLogger; +import com.gmail.bleedobsidian.itemcase.loggers.ChatLogger; import com.gmail.bleedobsidian.itemcase.commands.CreateCommand; import com.gmail.bleedobsidian.itemcase.commands.ModifyCommand; import com.gmail.bleedobsidian.itemcase.commands.DestroyCommand; diff --git a/src/main/java/com/gmail/bleedobsidian/itemcase/ItemCaseCore.java b/src/main/java/com/gmail/bleedobsidian/itemcase/ItemCaseCore.java index d8cc761..4f761cf 100644 --- a/src/main/java/com/gmail/bleedobsidian/itemcase/ItemCaseCore.java +++ b/src/main/java/com/gmail/bleedobsidian/itemcase/ItemCaseCore.java @@ -15,6 +15,9 @@ package com.gmail.bleedobsidian.itemcase; +import com.gmail.bleedobsidian.itemcase.loggers.ConsoleLogger; +import com.gmail.bleedobsidian.itemcase.loggers.GenericLogger; +import com.gmail.bleedobsidian.itemcase.loggers.ChatLogger; import com.gmail.bleedobsidian.itemcase.Itemcase.ItemcaseListener; import com.gmail.bleedobsidian.itemcase.configurations.ConfigFile; import com.gmail.bleedobsidian.itemcase.managers.ItemcaseManager; diff --git a/src/main/java/com/gmail/bleedobsidian/itemcase/commands/CreateCommand.java b/src/main/java/com/gmail/bleedobsidian/itemcase/commands/CreateCommand.java index c159300..517d23f 100644 --- a/src/main/java/com/gmail/bleedobsidian/itemcase/commands/CreateCommand.java +++ b/src/main/java/com/gmail/bleedobsidian/itemcase/commands/CreateCommand.java @@ -14,7 +14,8 @@ */ package com.gmail.bleedobsidian.itemcase.commands; -import com.gmail.bleedobsidian.itemcase.ChatLogger; +import com.gmail.bleedobsidian.itemcase.Command; +import com.gmail.bleedobsidian.itemcase.loggers.ChatLogger; import com.gmail.bleedobsidian.itemcase.ItemCaseCore; import com.gmail.bleedobsidian.itemcase.LanguageTranslator; import java.util.ArrayList; diff --git a/src/main/java/com/gmail/bleedobsidian/itemcase/commands/DestroyCommand.java b/src/main/java/com/gmail/bleedobsidian/itemcase/commands/DestroyCommand.java index c2014ed..4cd239b 100644 --- a/src/main/java/com/gmail/bleedobsidian/itemcase/commands/DestroyCommand.java +++ b/src/main/java/com/gmail/bleedobsidian/itemcase/commands/DestroyCommand.java @@ -14,7 +14,8 @@ */ package com.gmail.bleedobsidian.itemcase.commands; -import com.gmail.bleedobsidian.itemcase.ChatLogger; +import com.gmail.bleedobsidian.itemcase.Command; +import com.gmail.bleedobsidian.itemcase.loggers.ChatLogger; import com.gmail.bleedobsidian.itemcase.ItemCaseCore; import com.gmail.bleedobsidian.itemcase.Itemcase; import com.gmail.bleedobsidian.itemcase.LanguageTranslator; diff --git a/src/main/java/com/gmail/bleedobsidian/itemcase/commands/ModifyCommand.java b/src/main/java/com/gmail/bleedobsidian/itemcase/commands/ModifyCommand.java index 8673267..aac3a35 100644 --- a/src/main/java/com/gmail/bleedobsidian/itemcase/commands/ModifyCommand.java +++ b/src/main/java/com/gmail/bleedobsidian/itemcase/commands/ModifyCommand.java @@ -14,7 +14,8 @@ */ package com.gmail.bleedobsidian.itemcase.commands; -import com.gmail.bleedobsidian.itemcase.ChatLogger; +import com.gmail.bleedobsidian.itemcase.Command; +import com.gmail.bleedobsidian.itemcase.loggers.ChatLogger; import com.gmail.bleedobsidian.itemcase.ItemCaseCore; import com.gmail.bleedobsidian.itemcase.Itemcase; import com.gmail.bleedobsidian.itemcase.Itemcase.StorageType; diff --git a/src/main/java/com/gmail/bleedobsidian/itemcase/commands/OrderCommand.java b/src/main/java/com/gmail/bleedobsidian/itemcase/commands/OrderCommand.java index 328d92c..c38d054 100644 --- a/src/main/java/com/gmail/bleedobsidian/itemcase/commands/OrderCommand.java +++ b/src/main/java/com/gmail/bleedobsidian/itemcase/commands/OrderCommand.java @@ -14,7 +14,8 @@ */ package com.gmail.bleedobsidian.itemcase.commands; -import com.gmail.bleedobsidian.itemcase.ChatLogger; +import com.gmail.bleedobsidian.itemcase.Command; +import com.gmail.bleedobsidian.itemcase.loggers.ChatLogger; import com.gmail.bleedobsidian.itemcase.ItemCaseCore; import com.gmail.bleedobsidian.itemcase.Itemcase; import com.gmail.bleedobsidian.itemcase.Itemcase.StorageType; diff --git a/src/main/java/com/gmail/bleedobsidian/itemcase/commands/StorageCommand.java b/src/main/java/com/gmail/bleedobsidian/itemcase/commands/StorageCommand.java index c9eb46b..7b669ba 100644 --- a/src/main/java/com/gmail/bleedobsidian/itemcase/commands/StorageCommand.java +++ b/src/main/java/com/gmail/bleedobsidian/itemcase/commands/StorageCommand.java @@ -14,7 +14,8 @@ */ package com.gmail.bleedobsidian.itemcase.commands; -import com.gmail.bleedobsidian.itemcase.ChatLogger; +import com.gmail.bleedobsidian.itemcase.Command; +import com.gmail.bleedobsidian.itemcase.loggers.ChatLogger; import com.gmail.bleedobsidian.itemcase.ItemCaseCore; import com.gmail.bleedobsidian.itemcase.Itemcase; import com.gmail.bleedobsidian.itemcase.Itemcase.StorageType; diff --git a/src/main/java/com/gmail/bleedobsidian/itemcase/ChatLogger.java b/src/main/java/com/gmail/bleedobsidian/itemcase/loggers/ChatLogger.java similarity index 94% rename from src/main/java/com/gmail/bleedobsidian/itemcase/ChatLogger.java rename to src/main/java/com/gmail/bleedobsidian/itemcase/loggers/ChatLogger.java index 051e91b..122576a 100644 --- a/src/main/java/com/gmail/bleedobsidian/itemcase/ChatLogger.java +++ b/src/main/java/com/gmail/bleedobsidian/itemcase/loggers/ChatLogger.java @@ -12,8 +12,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.gmail.bleedobsidian.itemcase; +package com.gmail.bleedobsidian.itemcase.loggers; +import com.gmail.bleedobsidian.itemcase.LanguageTranslator; import net.md_5.bungee.api.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/com/gmail/bleedobsidian/itemcase/ConsoleLogger.java b/src/main/java/com/gmail/bleedobsidian/itemcase/loggers/ConsoleLogger.java similarity index 97% rename from src/main/java/com/gmail/bleedobsidian/itemcase/ConsoleLogger.java rename to src/main/java/com/gmail/bleedobsidian/itemcase/loggers/ConsoleLogger.java index 064778d..fb0a8b3 100644 --- a/src/main/java/com/gmail/bleedobsidian/itemcase/ConsoleLogger.java +++ b/src/main/java/com/gmail/bleedobsidian/itemcase/loggers/ConsoleLogger.java @@ -13,8 +13,9 @@ * along with this program. If not, see . */ -package com.gmail.bleedobsidian.itemcase; +package com.gmail.bleedobsidian.itemcase.loggers; +import com.gmail.bleedobsidian.itemcase.LanguageTranslator; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; diff --git a/src/main/java/com/gmail/bleedobsidian/itemcase/GenericLogger.java b/src/main/java/com/gmail/bleedobsidian/itemcase/loggers/GenericLogger.java similarity index 93% rename from src/main/java/com/gmail/bleedobsidian/itemcase/GenericLogger.java rename to src/main/java/com/gmail/bleedobsidian/itemcase/loggers/GenericLogger.java index 64675f9..66dfa82 100644 --- a/src/main/java/com/gmail/bleedobsidian/itemcase/GenericLogger.java +++ b/src/main/java/com/gmail/bleedobsidian/itemcase/loggers/GenericLogger.java @@ -12,8 +12,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.gmail.bleedobsidian.itemcase; +package com.gmail.bleedobsidian.itemcase.loggers; +import com.gmail.bleedobsidian.itemcase.LanguageTranslator; import org.bukkit.command.CommandSender; /** diff --git a/src/main/java/com/gmail/bleedobsidian/itemcase/managers/OrderManager.java b/src/main/java/com/gmail/bleedobsidian/itemcase/managers/OrderManager.java index c3139f0..4ea7dda 100644 --- a/src/main/java/com/gmail/bleedobsidian/itemcase/managers/OrderManager.java +++ b/src/main/java/com/gmail/bleedobsidian/itemcase/managers/OrderManager.java @@ -14,7 +14,7 @@ */ package com.gmail.bleedobsidian.itemcase.managers; -import com.gmail.bleedobsidian.itemcase.ChatLogger; +import com.gmail.bleedobsidian.itemcase.loggers.ChatLogger; import com.gmail.bleedobsidian.itemcase.ItemCaseCore; import com.gmail.bleedobsidian.itemcase.Itemcase; import com.gmail.bleedobsidian.itemcase.Itemcase.Type;