From 0ed95121d275f4f65c2fa4644f08d220ae4d5b3e Mon Sep 17 00:00:00 2001 From: BrokenFire Date: Mon, 20 Mar 2017 18:44:53 +0100 Subject: [PATCH] Package edit --- src/net/{borken => Broken}/BotListener.java | 10 +++------- src/net/{borken => Broken}/Commande.java | 2 +- src/net/{borken => Broken}/MainBot.java | 16 ++++++---------- src/net/{borken => Broken}/Outils/AntiSpam.java | 7 +++---- .../{borken => Broken}/Outils/CommandParser.java | 3 +-- .../{borken => Broken}/Outils/DayListener.java | 4 ++-- .../{borken => Broken}/Outils/LimitChecker.java | 4 +--- .../{borken => Broken}/Outils/Moderateur.java | 9 ++------- .../{borken => Broken}/Outils/Redirection.java | 3 +-- src/net/{borken => Broken}/commandes/Cat.java | 6 +++--- src/net/{borken => Broken}/commandes/Help.java | 6 +++--- src/net/{borken => Broken}/commandes/Move.java | 4 ++-- .../commandes/NumberedCommande.java | 9 ++++----- .../{borken => Broken}/commandes/Over18/Ass.java | 4 ++-- .../commandes/Over18/Boobs.java | 4 ++-- .../commandes/Over18/Madame.java | 7 +++---- .../commandes/Over18/Pipe.java | 4 ++-- .../{borken => Broken}/commandes/Over18/SM.java | 6 +++--- .../commandes/PingCommande.java | 4 ++-- src/net/{borken => Broken}/commandes/Spam.java | 8 ++++---- 20 files changed, 50 insertions(+), 70 deletions(-) rename src/net/{borken => Broken}/BotListener.java (89%) rename src/net/{borken => Broken}/Commande.java (94%) rename src/net/{borken => Broken}/MainBot.java (96%) rename src/net/{borken => Broken}/Outils/AntiSpam.java (97%) rename src/net/{borken => Broken}/Outils/CommandParser.java (97%) rename src/net/{borken => Broken}/Outils/DayListener.java (94%) rename src/net/{borken => Broken}/Outils/LimitChecker.java (96%) rename src/net/{borken => Broken}/Outils/Moderateur.java (95%) rename src/net/{borken => Broken}/Outils/Redirection.java (91%) rename src/net/{borken => Broken}/commandes/Cat.java (95%) rename src/net/{borken => Broken}/commandes/Help.java (95%) rename src/net/{borken => Broken}/commandes/Move.java (98%) rename src/net/{borken => Broken}/commandes/NumberedCommande.java (91%) rename src/net/{borken => Broken}/commandes/Over18/Ass.java (73%) rename src/net/{borken => Broken}/commandes/Over18/Boobs.java (73%) rename src/net/{borken => Broken}/commandes/Over18/Madame.java (92%) rename src/net/{borken => Broken}/commandes/Over18/Pipe.java (95%) rename src/net/{borken => Broken}/commandes/Over18/SM.java (93%) rename src/net/{borken => Broken}/commandes/PingCommande.java (93%) rename src/net/{borken => Broken}/commandes/Spam.java (99%) diff --git a/src/net/borken/BotListener.java b/src/net/Broken/BotListener.java similarity index 89% rename from src/net/borken/BotListener.java rename to src/net/Broken/BotListener.java index 88614ac..c15659b 100644 --- a/src/net/borken/BotListener.java +++ b/src/net/Broken/BotListener.java @@ -1,14 +1,10 @@ -package net.borken; +package net.Broken; -import net.borken.Outils.AntiSpam; -import net.borken.Outils.Moderateur; +import net.Broken.Outils.AntiSpam; +import net.Broken.Outils.Moderateur; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.User; -import net.dv8tion.jda.core.events.DisconnectEvent; import net.dv8tion.jda.core.events.ReadyEvent; -import net.dv8tion.jda.core.events.ReconnectedEvent; -import net.dv8tion.jda.core.events.StatusChangeEvent; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import net.dv8tion.jda.core.hooks.ListenerAdapter; import net.dv8tion.jda.core.managers.GuildManager; diff --git a/src/net/borken/Commande.java b/src/net/Broken/Commande.java similarity index 94% rename from src/net/borken/Commande.java rename to src/net/Broken/Commande.java index 7a34742..653e517 100644 --- a/src/net/borken/Commande.java +++ b/src/net/Broken/Commande.java @@ -1,4 +1,4 @@ -package net.borken; +package net.Broken; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; diff --git a/src/net/borken/MainBot.java b/src/net/Broken/MainBot.java similarity index 96% rename from src/net/borken/MainBot.java rename to src/net/Broken/MainBot.java index 0725989..33082e1 100644 --- a/src/net/borken/MainBot.java +++ b/src/net/Broken/MainBot.java @@ -1,10 +1,10 @@ -package net.borken; +package net.Broken; -import net.borken.Outils.CommandParser; -import net.borken.Outils.DayListener; -import net.borken.Outils.Redirection; -import net.borken.commandes.*; -import net.borken.commandes.Over18.*; +import net.Broken.Outils.CommandParser; +import net.Broken.Outils.DayListener; +import net.Broken.Outils.Redirection; +import net.Broken.commandes.*; +import net.Broken.commandes.Over18.*; import net.dv8tion.jda.core.AccountType; import net.dv8tion.jda.core.JDA; import net.dv8tion.jda.core.JDABuilder; @@ -18,11 +18,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import javax.security.auth.login.LoginException; -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; import java.util.HashMap; import java.util.Hashtable; import java.util.List; diff --git a/src/net/borken/Outils/AntiSpam.java b/src/net/Broken/Outils/AntiSpam.java similarity index 97% rename from src/net/borken/Outils/AntiSpam.java rename to src/net/Broken/Outils/AntiSpam.java index ae9488c..82a74ea 100644 --- a/src/net/borken/Outils/AntiSpam.java +++ b/src/net/Broken/Outils/AntiSpam.java @@ -1,13 +1,12 @@ -package net.borken.Outils; +package net.Broken.Outils; -import net.borken.MainBot; -import net.borken.commandes.Move; +import net.Broken.MainBot; +import net.Broken.commandes.Move; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.Member; import net.dv8tion.jda.core.entities.Role; import net.dv8tion.jda.core.entities.TextChannel; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; -import net.dv8tion.jda.core.exceptions.RateLimitedException; import net.dv8tion.jda.core.managers.GuildManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/net/borken/Outils/CommandParser.java b/src/net/Broken/Outils/CommandParser.java similarity index 97% rename from src/net/borken/Outils/CommandParser.java rename to src/net/Broken/Outils/CommandParser.java index e63527c..287f307 100644 --- a/src/net/borken/Outils/CommandParser.java +++ b/src/net/Broken/Outils/CommandParser.java @@ -1,6 +1,5 @@ -package net.borken.Outils; +package net.Broken.Outils; -import net.dv8tion.jda.*; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/net/borken/Outils/DayListener.java b/src/net/Broken/Outils/DayListener.java similarity index 94% rename from src/net/borken/Outils/DayListener.java rename to src/net/Broken/Outils/DayListener.java index e7a7cbc..714eef6 100644 --- a/src/net/borken/Outils/DayListener.java +++ b/src/net/Broken/Outils/DayListener.java @@ -1,5 +1,5 @@ -package net.borken.Outils; -import net.borken.commandes.Spam; +package net.Broken.Outils; +import net.Broken.commandes.Spam; import net.dv8tion.jda.core.exceptions.RateLimitedException; import org.apache.logging.log4j.LogManager; diff --git a/src/net/borken/Outils/LimitChecker.java b/src/net/Broken/Outils/LimitChecker.java similarity index 96% rename from src/net/borken/Outils/LimitChecker.java rename to src/net/Broken/Outils/LimitChecker.java index 223ff28..95a770b 100644 --- a/src/net/borken/Outils/LimitChecker.java +++ b/src/net/Broken/Outils/LimitChecker.java @@ -1,4 +1,4 @@ -package net.borken.Outils; +package net.Broken.Outils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -6,8 +6,6 @@ import org.apache.logging.log4j.Logger; import java.io.IOException; import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.ProtocolException; import java.net.URL; /** diff --git a/src/net/borken/Outils/Moderateur.java b/src/net/Broken/Outils/Moderateur.java similarity index 95% rename from src/net/borken/Outils/Moderateur.java rename to src/net/Broken/Outils/Moderateur.java index 1a2ace9..6b570c4 100644 --- a/src/net/borken/Outils/Moderateur.java +++ b/src/net/Broken/Outils/Moderateur.java @@ -1,19 +1,14 @@ -package net.borken.Outils; +package net.Broken.Outils; -import net.borken.MainBot; +import net.Broken.MainBot; -import java.util.HashMap; -import net.borken.Commande; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.User; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import net.dv8tion.jda.core.managers.GuildManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import static net.borken.MainBot.historique; - /** * Created by Parayre on 24/10/2016. */ diff --git a/src/net/borken/Outils/Redirection.java b/src/net/Broken/Outils/Redirection.java similarity index 91% rename from src/net/borken/Outils/Redirection.java rename to src/net/Broken/Outils/Redirection.java index 85c4112..011971b 100644 --- a/src/net/borken/Outils/Redirection.java +++ b/src/net/Broken/Outils/Redirection.java @@ -1,8 +1,7 @@ -package net.borken.Outils; +package net.Broken.Outils; import java.io.IOException; import java.io.InputStream; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; diff --git a/src/net/borken/commandes/Cat.java b/src/net/Broken/commandes/Cat.java similarity index 95% rename from src/net/borken/commandes/Cat.java rename to src/net/Broken/commandes/Cat.java index 31c474c..0099f94 100644 --- a/src/net/borken/commandes/Cat.java +++ b/src/net/Broken/commandes/Cat.java @@ -1,7 +1,7 @@ -package net.borken.commandes; +package net.Broken.commandes; -import net.borken.Commande; -import net.borken.Outils.Redirection; +import net.Broken.Commande; +import net.Broken.Outils.Redirection; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import java.io.BufferedReader; diff --git a/src/net/borken/commandes/Help.java b/src/net/Broken/commandes/Help.java similarity index 95% rename from src/net/borken/commandes/Help.java rename to src/net/Broken/commandes/Help.java index 6de8c57..3c8037c 100644 --- a/src/net/borken/commandes/Help.java +++ b/src/net/Broken/commandes/Help.java @@ -1,7 +1,7 @@ -package net.borken.commandes; +package net.Broken.commandes; -import net.borken.Commande; -import net.borken.MainBot; +import net.Broken.Commande; +import net.Broken.MainBot; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/net/borken/commandes/Move.java b/src/net/Broken/commandes/Move.java similarity index 98% rename from src/net/borken/commandes/Move.java rename to src/net/Broken/commandes/Move.java index 22db871..03bd827 100644 --- a/src/net/borken/commandes/Move.java +++ b/src/net/Broken/commandes/Move.java @@ -1,6 +1,6 @@ -package net.borken.commandes; +package net.Broken.commandes; -import net.borken.Commande; +import net.Broken.Commande; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.Member; import net.dv8tion.jda.core.entities.Role; diff --git a/src/net/borken/commandes/NumberedCommande.java b/src/net/Broken/commandes/NumberedCommande.java similarity index 91% rename from src/net/borken/commandes/NumberedCommande.java rename to src/net/Broken/commandes/NumberedCommande.java index 3247575..9eba44a 100644 --- a/src/net/borken/commandes/NumberedCommande.java +++ b/src/net/Broken/commandes/NumberedCommande.java @@ -1,13 +1,12 @@ -package net.borken.commandes; -import net.borken.Commande; -import net.borken.Outils.LimitChecker; -import net.borken.Outils.Redirection; +package net.Broken.commandes; +import net.Broken.Commande; +import net.Broken.Outils.LimitChecker; +import net.Broken.Outils.Redirection; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.IOException; -import java.util.Random; /** * Created by seb65 on 07/11/2016. diff --git a/src/net/borken/commandes/Over18/Ass.java b/src/net/Broken/commandes/Over18/Ass.java similarity index 73% rename from src/net/borken/commandes/Over18/Ass.java rename to src/net/Broken/commandes/Over18/Ass.java index 005365e..2a1c4fb 100644 --- a/src/net/borken/commandes/Over18/Ass.java +++ b/src/net/Broken/commandes/Over18/Ass.java @@ -1,6 +1,6 @@ -package net.borken.commandes.Over18; +package net.Broken.commandes.Over18; -import net.borken.commandes.NumberedCommande; +import net.Broken.commandes.NumberedCommande; import org.apache.logging.log4j.LogManager; /** diff --git a/src/net/borken/commandes/Over18/Boobs.java b/src/net/Broken/commandes/Over18/Boobs.java similarity index 73% rename from src/net/borken/commandes/Over18/Boobs.java rename to src/net/Broken/commandes/Over18/Boobs.java index a91592e..d215b52 100644 --- a/src/net/borken/commandes/Over18/Boobs.java +++ b/src/net/Broken/commandes/Over18/Boobs.java @@ -1,6 +1,6 @@ -package net.borken.commandes.Over18; +package net.Broken.commandes.Over18; -import net.borken.commandes.NumberedCommande; +import net.Broken.commandes.NumberedCommande; import org.apache.logging.log4j.LogManager; /** diff --git a/src/net/borken/commandes/Over18/Madame.java b/src/net/Broken/commandes/Over18/Madame.java similarity index 92% rename from src/net/borken/commandes/Over18/Madame.java rename to src/net/Broken/commandes/Over18/Madame.java index 4065222..aebdd47 100644 --- a/src/net/borken/commandes/Over18/Madame.java +++ b/src/net/Broken/commandes/Over18/Madame.java @@ -1,9 +1,8 @@ -package net.borken.commandes.Over18; +package net.Broken.commandes.Over18; -import net.borken.Commande; -import net.borken.Outils.Redirection; +import net.Broken.Commande; +import net.Broken.Outils.Redirection; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; -import net.dv8tion.jda.core.exceptions.RateLimitedException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/net/borken/commandes/Over18/Pipe.java b/src/net/Broken/commandes/Over18/Pipe.java similarity index 95% rename from src/net/borken/commandes/Over18/Pipe.java rename to src/net/Broken/commandes/Over18/Pipe.java index 3c93c42..bd5f620 100644 --- a/src/net/borken/commandes/Over18/Pipe.java +++ b/src/net/Broken/commandes/Over18/Pipe.java @@ -1,6 +1,6 @@ -package net.borken.commandes.Over18; +package net.Broken.commandes.Over18; -import net.borken.commandes.NumberedCommande; +import net.Broken.commandes.NumberedCommande; import org.apache.logging.log4j.LogManager; /** diff --git a/src/net/borken/commandes/Over18/SM.java b/src/net/Broken/commandes/Over18/SM.java similarity index 93% rename from src/net/borken/commandes/Over18/SM.java rename to src/net/Broken/commandes/Over18/SM.java index 5927ab1..4ad8ad9 100644 --- a/src/net/borken/commandes/Over18/SM.java +++ b/src/net/Broken/commandes/Over18/SM.java @@ -1,7 +1,7 @@ -package net.borken.commandes.Over18; +package net.Broken.commandes.Over18; -import net.borken.Commande; -import net.borken.Outils.Redirection; +import net.Broken.Commande; +import net.Broken.Outils.Redirection; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/net/borken/commandes/PingCommande.java b/src/net/Broken/commandes/PingCommande.java similarity index 93% rename from src/net/borken/commandes/PingCommande.java rename to src/net/Broken/commandes/PingCommande.java index 125ba2c..469963b 100644 --- a/src/net/borken/commandes/PingCommande.java +++ b/src/net/Broken/commandes/PingCommande.java @@ -1,6 +1,6 @@ -package net.borken.commandes; +package net.Broken.commandes; -import net.borken.Commande; +import net.Broken.Commande; import net.dv8tion.jda.core.events.message.MessageReceivedEvent; import org.apache.logging.log4j.LogManager; diff --git a/src/net/borken/commandes/Spam.java b/src/net/Broken/commandes/Spam.java similarity index 99% rename from src/net/borken/commandes/Spam.java rename to src/net/Broken/commandes/Spam.java index 66cb948..559d871 100644 --- a/src/net/borken/commandes/Spam.java +++ b/src/net/Broken/commandes/Spam.java @@ -1,8 +1,8 @@ -package net.borken.commandes; +package net.Broken.commandes; -import net.borken.Commande; -import net.borken.MainBot; -import net.borken.Outils.AntiSpam; +import net.Broken.Commande; +import net.Broken.MainBot; +import net.Broken.Outils.AntiSpam; import net.dv8tion.jda.core.entities.Guild; import net.dv8tion.jda.core.entities.Member; import net.dv8tion.jda.core.entities.User;