From 050b100819e901b0fcec34ea3fe6fda7dc7dd985 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 8 Sep 2016 16:27:45 +0200 Subject: [PATCH] Put formatter stuff in it's package --- src/buttondevteam/chat/Channel.java | 2 ++ src/buttondevteam/chat/ChatPlayer.java | 1 + src/buttondevteam/chat/ChatProcessing.java | 8 ++++++-- src/buttondevteam/chat/commands/ucmds/CCommand.java | 2 +- src/buttondevteam/chat/formatting/ChatFormatter.java | 2 +- .../chat/formatting/ChatFormatterBuilder.java | 8 ++++---- src/buttondevteam/chat/formatting/FormattedSection.java | 2 +- src/buttondevteam/chat/formatting/TellrawEvent.java | 2 +- src/buttondevteam/chat/formatting/TellrawPart.java | 2 +- .../chat/formatting/TellrawSerializableEnum.java | 2 +- src/buttondevteam/chat/formatting/TellrawSerializer.java | 2 +- 11 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/buttondevteam/chat/Channel.java b/src/buttondevteam/chat/Channel.java index 7d3326f..b84f681 100644 --- a/src/buttondevteam/chat/Channel.java +++ b/src/buttondevteam/chat/Channel.java @@ -1,5 +1,7 @@ package buttondevteam.chat; +import buttondevteam.chat.formatting.ChatFormatter; + public class Channel { public final String DisplayName; public final ChatFormatter.Color Color; diff --git a/src/buttondevteam/chat/ChatPlayer.java b/src/buttondevteam/chat/ChatPlayer.java index 716acf2..b86efdd 100644 --- a/src/buttondevteam/chat/ChatPlayer.java +++ b/src/buttondevteam/chat/ChatPlayer.java @@ -10,6 +10,7 @@ import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import buttondevteam.bucket.core.TBMCPlayer; +import buttondevteam.chat.formatting.ChatFormatter; public class ChatPlayer extends TBMCPlayer { public String UserName; diff --git a/src/buttondevteam/chat/ChatProcessing.java b/src/buttondevteam/chat/ChatProcessing.java index 647df84..597c672 100644 --- a/src/buttondevteam/chat/ChatProcessing.java +++ b/src/buttondevteam/chat/ChatProcessing.java @@ -19,10 +19,14 @@ import com.palmergames.bukkit.towny.object.Nation; import com.palmergames.bukkit.towny.object.Resident; import com.palmergames.bukkit.towny.object.Town; -import buttondevteam.chat.ChatFormatter.Color; -import buttondevteam.chat.ChatFormatter.Priority; import buttondevteam.chat.commands.UnlolCommand; import buttondevteam.chat.commands.ucmds.admin.DebugCommand; +import buttondevteam.chat.formatting.ChatFormatter; +import buttondevteam.chat.formatting.ChatFormatterBuilder; +import buttondevteam.chat.formatting.TellrawEvent; +import buttondevteam.chat.formatting.TellrawPart; +import buttondevteam.chat.formatting.ChatFormatter.Color; +import buttondevteam.chat.formatting.ChatFormatter.Priority; public class ChatProcessing { private static final Pattern CONSOLE_PING_PATTERN = Pattern.compile("(?i)" + Pattern.quote("@console")); diff --git a/src/buttondevteam/chat/commands/ucmds/CCommand.java b/src/buttondevteam/chat/commands/ucmds/CCommand.java index ed41a57..177f1e7 100644 --- a/src/buttondevteam/chat/commands/ucmds/CCommand.java +++ b/src/buttondevteam/chat/commands/ucmds/CCommand.java @@ -3,9 +3,9 @@ package buttondevteam.chat.commands.ucmds; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import buttondevteam.chat.ChatFormatter; import buttondevteam.chat.ChatPlayer; import buttondevteam.chat.PluginMain; +import buttondevteam.chat.formatting.ChatFormatter; public class CCommand extends UCommandBase { diff --git a/src/buttondevteam/chat/formatting/ChatFormatter.java b/src/buttondevteam/chat/formatting/ChatFormatter.java index 6451d56..1962cb7 100644 --- a/src/buttondevteam/chat/formatting/ChatFormatter.java +++ b/src/buttondevteam/chat/formatting/ChatFormatter.java @@ -1,4 +1,4 @@ -package buttondevteam.chat; +package buttondevteam.chat.formatting; import java.util.ArrayList; import java.util.List; diff --git a/src/buttondevteam/chat/formatting/ChatFormatterBuilder.java b/src/buttondevteam/chat/formatting/ChatFormatterBuilder.java index 504b255..f400cb1 100644 --- a/src/buttondevteam/chat/formatting/ChatFormatterBuilder.java +++ b/src/buttondevteam/chat/formatting/ChatFormatterBuilder.java @@ -1,11 +1,11 @@ -package buttondevteam.chat; +package buttondevteam.chat.formatting; import java.util.function.Function; import java.util.regex.Pattern; -import buttondevteam.chat.ChatFormatter.Color; -import buttondevteam.chat.ChatFormatter.Format; -import buttondevteam.chat.ChatFormatter.Priority; +import buttondevteam.chat.formatting.ChatFormatter.Color; +import buttondevteam.chat.formatting.ChatFormatter.Format; +import buttondevteam.chat.formatting.ChatFormatter.Priority; public class ChatFormatterBuilder { private Pattern regex; diff --git a/src/buttondevteam/chat/formatting/FormattedSection.java b/src/buttondevteam/chat/formatting/FormattedSection.java index 842f6ca..a7c4531 100644 --- a/src/buttondevteam/chat/formatting/FormattedSection.java +++ b/src/buttondevteam/chat/formatting/FormattedSection.java @@ -1,4 +1,4 @@ -package buttondevteam.chat; +package buttondevteam.chat.formatting; import java.util.ArrayList; import java.util.Collection; diff --git a/src/buttondevteam/chat/formatting/TellrawEvent.java b/src/buttondevteam/chat/formatting/TellrawEvent.java index 8aad3fd..7f43dc5 100644 --- a/src/buttondevteam/chat/formatting/TellrawEvent.java +++ b/src/buttondevteam/chat/formatting/TellrawEvent.java @@ -1,4 +1,4 @@ -package buttondevteam.chat; +package buttondevteam.chat.formatting; import java.io.Serializable; diff --git a/src/buttondevteam/chat/formatting/TellrawPart.java b/src/buttondevteam/chat/formatting/TellrawPart.java index 2dd0a5a..505f942 100644 --- a/src/buttondevteam/chat/formatting/TellrawPart.java +++ b/src/buttondevteam/chat/formatting/TellrawPart.java @@ -1,4 +1,4 @@ -package buttondevteam.chat; +package buttondevteam.chat.formatting; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/buttondevteam/chat/formatting/TellrawSerializableEnum.java b/src/buttondevteam/chat/formatting/TellrawSerializableEnum.java index ca9ecd9..9fc8ac2 100644 --- a/src/buttondevteam/chat/formatting/TellrawSerializableEnum.java +++ b/src/buttondevteam/chat/formatting/TellrawSerializableEnum.java @@ -1,4 +1,4 @@ -package buttondevteam.chat; +package buttondevteam.chat.formatting; public interface TellrawSerializableEnum { public String getName(); diff --git a/src/buttondevteam/chat/formatting/TellrawSerializer.java b/src/buttondevteam/chat/formatting/TellrawSerializer.java index 067f262..7bee357 100644 --- a/src/buttondevteam/chat/formatting/TellrawSerializer.java +++ b/src/buttondevteam/chat/formatting/TellrawSerializer.java @@ -1,4 +1,4 @@ -package buttondevteam.chat; +package buttondevteam.chat.formatting; import java.io.IOException;