From 36655dfd849e9dfd3fff91294f617dbfeb356060 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 20 Feb 2019 13:41:53 +0100 Subject: [PATCH] Adding project file and moving /unlol Also fixed Vault dep --- .gitignore | 2 +- .idea/ButtonChat.iml | 44 +++++++++++++++++++ pom.xml | 8 ++-- .../buttondevteam/chat/ChatProcessing.java | 2 +- .../fun}/UnlolCommand.java | 2 +- .../listener/PlayerJoinLeaveListener.java | 2 +- 6 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 .idea/ButtonChat.iml rename src/main/java/buttondevteam/chat/{commands => components/fun}/UnlolCommand.java (97%) diff --git a/.gitignore b/.gitignore index deefcdf..456756d 100644 --- a/.gitignore +++ b/.gitignore @@ -217,7 +217,7 @@ pip-log.txt .mr.developer.cfg .metadata/* TheButtonAutoFlair/out/artifacts/Autoflair/Autoflair.jar -*.iml +#*.iml *.name .idea/compiler.xml *.xml diff --git a/.idea/ButtonChat.iml b/.idea/ButtonChat.iml new file mode 100644 index 0000000..d0664f8 --- /dev/null +++ b/.idea/ButtonChat.iml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index b8cbcb0..aaac3ac 100644 --- a/pom.xml +++ b/pom.xml @@ -163,10 +163,10 @@ Minigames http://maven.addstar.com.au/artifactory/release - + @@ -215,9 +215,9 @@ - net.milkbowl.vault + com.github.milkbowl VaultAPI - 1.6 + master-SNAPSHOT provided diff --git a/src/main/java/buttondevteam/chat/ChatProcessing.java b/src/main/java/buttondevteam/chat/ChatProcessing.java index 86a9526..21fe575 100644 --- a/src/main/java/buttondevteam/chat/ChatProcessing.java +++ b/src/main/java/buttondevteam/chat/ChatProcessing.java @@ -1,6 +1,6 @@ package buttondevteam.chat; -import buttondevteam.chat.commands.UnlolCommand; +import buttondevteam.chat.components.fun.UnlolCommand; import buttondevteam.chat.commands.ucmds.admin.DebugCommand; import buttondevteam.chat.formatting.ChatFormatter; import buttondevteam.chat.formatting.TellrawEvent; diff --git a/src/main/java/buttondevteam/chat/commands/UnlolCommand.java b/src/main/java/buttondevteam/chat/components/fun/UnlolCommand.java similarity index 97% rename from src/main/java/buttondevteam/chat/commands/UnlolCommand.java rename to src/main/java/buttondevteam/chat/components/fun/UnlolCommand.java index 7ab2311..2ad8e6b 100644 --- a/src/main/java/buttondevteam/chat/commands/UnlolCommand.java +++ b/src/main/java/buttondevteam/chat/components/fun/UnlolCommand.java @@ -1,4 +1,4 @@ -package buttondevteam.chat.commands; +package buttondevteam.chat.components.fun; import buttondevteam.core.component.channel.Channel; import buttondevteam.lib.TBMCChatEventBase; diff --git a/src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java b/src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java index 4dfb371..915596f 100644 --- a/src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java +++ b/src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java @@ -3,7 +3,7 @@ package buttondevteam.chat.listener; import buttondevteam.chat.ChatPlayer; import buttondevteam.chat.PlayerJoinTimerTask; import buttondevteam.chat.PluginMain; -import buttondevteam.chat.commands.UnlolCommand; +import buttondevteam.chat.components.fun.UnlolCommand; import buttondevteam.chat.commands.ucmds.HistoryCommand; import buttondevteam.chat.components.flair.FlairComponent; import buttondevteam.chat.components.flair.FlairStates;