Big move
This commit is contained in:
Greg
parent
3af0867311
commit
68d2ffbf8e
93 changed files with 65 additions and 66 deletions
6
pom.xml
6
pom.xml
|
|
@ -6,7 +6,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>Hadder</groupId>
|
<groupId>Hadder</groupId>
|
||||||
<artifactId>Hadder</artifactId>
|
<artifactId>Hadder</artifactId>
|
||||||
<version>1.3.26</version>
|
<version>2.0.0</version>
|
||||||
<name>Hadder</name>
|
<name>Hadder</name>
|
||||||
<inceptionYear>2019</inceptionYear>
|
<inceptionYear>2019</inceptionYear>
|
||||||
<description>Hadder is a multi-purpose Discord bot.</description>
|
<description>Hadder is a multi-purpose Discord bot.</description>
|
||||||
|
|
@ -130,7 +130,7 @@
|
||||||
<finalName>Hadder-Build</finalName>
|
<finalName>Hadder-Build</finalName>
|
||||||
<archive>
|
<archive>
|
||||||
<manifest>
|
<manifest>
|
||||||
<mainClass>com.bbn.hadder.Hadder</mainClass>
|
<mainClass>one.bbn.hadder.Hadder</mainClass>
|
||||||
</manifest>
|
</manifest>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
@ -169,7 +169,7 @@
|
||||||
<finalName>Hadder-Build</finalName>
|
<finalName>Hadder-Build</finalName>
|
||||||
<archive>
|
<archive>
|
||||||
<manifest>
|
<manifest>
|
||||||
<mainClass>com.bbn.hadder.Hadder</mainClass>
|
<mainClass>one.bbn.hadder.Hadder</mainClass>
|
||||||
</manifest>
|
</manifest>
|
||||||
</archive>
|
</archive>
|
||||||
<descriptorRefs>
|
<descriptorRefs>
|
||||||
|
|
|
||||||
|
|
@ -14,25 +14,25 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder;
|
package one.bbn.hadder;
|
||||||
|
|
||||||
import com.bbn.hadder.audio.AudioManager;
|
import one.bbn.hadder.audio.AudioManager;
|
||||||
import com.bbn.hadder.commands.fun.AvatarCommand;
|
import one.bbn.hadder.commands.fun.AvatarCommand;
|
||||||
import com.bbn.hadder.commands.fun.ClydeCommand;
|
import one.bbn.hadder.commands.fun.ClydeCommand;
|
||||||
import com.bbn.hadder.commands.fun.GifCommand;
|
import one.bbn.hadder.commands.fun.GifCommand;
|
||||||
import com.bbn.hadder.commands.fun.MemeCommand;
|
import one.bbn.hadder.commands.fun.MemeCommand;
|
||||||
import com.bbn.hadder.commands.general.*;
|
import one.bbn.hadder.commands.general.*;
|
||||||
import com.bbn.hadder.commands.misc.*;
|
import one.bbn.hadder.commands.misc.*;
|
||||||
import com.bbn.hadder.commands.moderation.*;
|
import one.bbn.hadder.commands.moderation.*;
|
||||||
import com.bbn.hadder.commands.music.*;
|
import one.bbn.hadder.commands.music.*;
|
||||||
import com.bbn.hadder.commands.nsfw.*;
|
import one.bbn.hadder.commands.nsfw.*;
|
||||||
import com.bbn.hadder.commands.owner.*;
|
import one.bbn.hadder.commands.owner.*;
|
||||||
import com.bbn.hadder.commands.settings.LanguageCommand;
|
import one.bbn.hadder.commands.settings.LanguageCommand;
|
||||||
import com.bbn.hadder.commands.settings.UserPrefixCommand;
|
import one.bbn.hadder.commands.settings.UserPrefixCommand;
|
||||||
import com.bbn.hadder.core.CommandHandler;
|
import one.bbn.hadder.core.CommandHandler;
|
||||||
import com.bbn.hadder.core.Config;
|
import one.bbn.hadder.core.Config;
|
||||||
import com.bbn.hadder.db.Rethink;
|
import one.bbn.hadder.db.Rethink;
|
||||||
import com.bbn.hadder.listener.*;
|
import one.bbn.hadder.listener.*;
|
||||||
import net.dv8tion.jda.api.OnlineStatus;
|
import net.dv8tion.jda.api.OnlineStatus;
|
||||||
import net.dv8tion.jda.api.entities.Activity;
|
import net.dv8tion.jda.api.entities.Activity;
|
||||||
import net.dv8tion.jda.api.requests.GatewayIntent;
|
import net.dv8tion.jda.api.requests.GatewayIntent;
|
||||||
|
|
@ -14,13 +14,13 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.listener;
|
package one.bbn.hadder.listener;
|
||||||
|
|
||||||
import com.bbn.hadder.audio.AudioManager;
|
import one.bbn.hadder.audio.AudioManager;
|
||||||
import com.bbn.hadder.core.CommandHandler;
|
import one.bbn.hadder.core.CommandHandler;
|
||||||
import com.bbn.hadder.db.Rethink;
|
import one.bbn.hadder.db.Rethink;
|
||||||
import com.bbn.hadder.db.RethinkServer;
|
import one.bbn.hadder.db.RethinkServer;
|
||||||
import com.bbn.hadder.db.RethinkUser;
|
import one.bbn.hadder.db.RethinkUser;
|
||||||
import net.dv8tion.jda.api.EmbedBuilder;
|
import net.dv8tion.jda.api.EmbedBuilder;
|
||||||
import net.dv8tion.jda.api.Permission;
|
import net.dv8tion.jda.api.Permission;
|
||||||
import net.dv8tion.jda.api.entities.ChannelType;
|
import net.dv8tion.jda.api.entities.ChannelType;
|
||||||
|
|
@ -14,12 +14,12 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.listener;
|
package one.bbn.hadder.listener;
|
||||||
|
|
||||||
import com.bbn.hadder.core.Config;
|
import one.bbn.hadder.core.Config;
|
||||||
import com.bbn.hadder.db.Rethink;
|
import one.bbn.hadder.db.Rethink;
|
||||||
import com.bbn.hadder.utils.BotList;
|
import one.bbn.hadder.utils.BotList;
|
||||||
import com.bbn.hadder.utils.MessageEditor;
|
import one.bbn.hadder.utils.MessageEditor;
|
||||||
import net.dv8tion.jda.api.entities.Member;
|
import net.dv8tion.jda.api.entities.Member;
|
||||||
import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
|
import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
|
||||||
import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
|
import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
|
||||||
|
|
@ -14,10 +14,10 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.listener;
|
package one.bbn.hadder.listener;
|
||||||
|
|
||||||
import com.bbn.hadder.db.Rethink;
|
import one.bbn.hadder.db.Rethink;
|
||||||
import com.bbn.hadder.db.RethinkServer;
|
import one.bbn.hadder.db.RethinkServer;
|
||||||
import net.dv8tion.jda.api.Permission;
|
import net.dv8tion.jda.api.Permission;
|
||||||
import net.dv8tion.jda.api.entities.ChannelType;
|
import net.dv8tion.jda.api.entities.ChannelType;
|
||||||
import net.dv8tion.jda.api.entities.Guild;
|
import net.dv8tion.jda.api.entities.Guild;
|
||||||
|
|
@ -14,12 +14,12 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.listener;
|
package one.bbn.hadder.listener;
|
||||||
|
|
||||||
import com.bbn.hadder.core.Config;
|
import one.bbn.hadder.core.Config;
|
||||||
import com.bbn.hadder.db.Rethink;
|
import one.bbn.hadder.db.Rethink;
|
||||||
import com.bbn.hadder.db.RethinkServer;
|
import one.bbn.hadder.db.RethinkServer;
|
||||||
import com.bbn.hadder.db.RethinkUser;
|
import one.bbn.hadder.db.RethinkUser;
|
||||||
import net.dv8tion.jda.api.EmbedBuilder;
|
import net.dv8tion.jda.api.EmbedBuilder;
|
||||||
import net.dv8tion.jda.api.entities.ChannelType;
|
import net.dv8tion.jda.api.entities.ChannelType;
|
||||||
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
|
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
|
||||||
|
|
@ -2,9 +2,9 @@
|
||||||
* @author Hax / Hax6775 / Schlauer_Hax
|
* @author Hax / Hax6775 / Schlauer_Hax
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.listener;
|
package one.bbn.hadder.listener;
|
||||||
|
|
||||||
import com.bbn.hadder.core.Config;
|
import one.bbn.hadder.core.Config;
|
||||||
import net.dv8tion.jda.api.entities.Emote;
|
import net.dv8tion.jda.api.entities.Emote;
|
||||||
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
|
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
|
||||||
import net.dv8tion.jda.api.hooks.ListenerAdapter;
|
import net.dv8tion.jda.api.hooks.ListenerAdapter;
|
||||||
|
|
@ -14,11 +14,11 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.listener;
|
package one.bbn.hadder.listener;
|
||||||
|
|
||||||
import com.bbn.hadder.db.Rethink;
|
import one.bbn.hadder.db.Rethink;
|
||||||
import com.bbn.hadder.db.RethinkUser;
|
import one.bbn.hadder.db.RethinkUser;
|
||||||
import com.bbn.hadder.utils.MessageEditor;
|
import one.bbn.hadder.utils.MessageEditor;
|
||||||
import net.dv8tion.jda.api.EmbedBuilder;
|
import net.dv8tion.jda.api.EmbedBuilder;
|
||||||
import net.dv8tion.jda.api.entities.ChannelType;
|
import net.dv8tion.jda.api.entities.ChannelType;
|
||||||
import net.dv8tion.jda.api.entities.PrivateChannel;
|
import net.dv8tion.jda.api.entities.PrivateChannel;
|
||||||
|
|
@ -14,11 +14,10 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.listener;
|
package one.bbn.hadder.listener;
|
||||||
|
|
||||||
import com.bbn.hadder.core.Config;
|
import one.bbn.hadder.core.Config;
|
||||||
import com.bbn.hadder.db.Rethink;
|
import one.bbn.hadder.db.Rethink;
|
||||||
import com.bbn.hadder.utils.BotList;
|
|
||||||
import net.dv8tion.jda.api.entities.Guild;
|
import net.dv8tion.jda.api.entities.Guild;
|
||||||
import net.dv8tion.jda.api.entities.User;
|
import net.dv8tion.jda.api.entities.User;
|
||||||
import net.dv8tion.jda.api.events.ReadyEvent;
|
import net.dv8tion.jda.api.events.ReadyEvent;
|
||||||
|
|
@ -14,10 +14,10 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.listener;
|
package one.bbn.hadder.listener;
|
||||||
|
|
||||||
import com.bbn.hadder.db.Rethink;
|
import one.bbn.hadder.db.Rethink;
|
||||||
import com.bbn.hadder.db.RethinkServer;
|
import one.bbn.hadder.db.RethinkServer;
|
||||||
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
|
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
|
||||||
import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
|
import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
|
||||||
import net.dv8tion.jda.api.hooks.ListenerAdapter;
|
import net.dv8tion.jda.api.hooks.ListenerAdapter;
|
||||||
|
|
@ -14,10 +14,10 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.listener;
|
package one.bbn.hadder.listener;
|
||||||
|
|
||||||
import com.bbn.hadder.db.Rethink;
|
import one.bbn.hadder.db.Rethink;
|
||||||
import com.bbn.hadder.db.RethinkServer;
|
import one.bbn.hadder.db.RethinkServer;
|
||||||
import net.dv8tion.jda.api.EmbedBuilder;
|
import net.dv8tion.jda.api.EmbedBuilder;
|
||||||
import net.dv8tion.jda.api.MessageBuilder;
|
import net.dv8tion.jda.api.MessageBuilder;
|
||||||
import net.dv8tion.jda.api.entities.MessageReaction;
|
import net.dv8tion.jda.api.entities.MessageReaction;
|
||||||
|
|
@ -14,9 +14,9 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.listener;
|
package one.bbn.hadder.listener;
|
||||||
|
|
||||||
import com.bbn.hadder.audio.AudioManager;
|
import one.bbn.hadder.audio.AudioManager;
|
||||||
import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent;
|
import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent;
|
||||||
import net.dv8tion.jda.api.hooks.ListenerAdapter;
|
import net.dv8tion.jda.api.hooks.ListenerAdapter;
|
||||||
|
|
||||||
|
|
@ -14,10 +14,10 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.utils;
|
package one.bbn.hadder.utils;
|
||||||
|
|
||||||
import com.bbn.hadder.Hadder;
|
import one.bbn.hadder.Hadder;
|
||||||
import com.bbn.hadder.core.Config;
|
import one.bbn.hadder.core.Config;
|
||||||
import okhttp3.MediaType;
|
import okhttp3.MediaType;
|
||||||
import okhttp3.OkHttpClient;
|
import okhttp3.OkHttpClient;
|
||||||
import okhttp3.Request;
|
import okhttp3.Request;
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.utils;
|
package one.bbn.hadder.utils;
|
||||||
|
|
||||||
import net.dv8tion.jda.api.JDA;
|
import net.dv8tion.jda.api.JDA;
|
||||||
import net.dv8tion.jda.api.entities.User;
|
import net.dv8tion.jda.api.entities.User;
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.utils;
|
package one.bbn.hadder.utils;
|
||||||
|
|
||||||
import okhttp3.OkHttpClient;
|
import okhttp3.OkHttpClient;
|
||||||
import okhttp3.Response;
|
import okhttp3.Response;
|
||||||
|
|
@ -14,9 +14,9 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.bbn.hadder.utils;
|
package one.bbn.hadder.utils;
|
||||||
|
|
||||||
import com.bbn.hadder.db.RethinkUser;
|
import one.bbn.hadder.db.RethinkUser;
|
||||||
import net.dv8tion.jda.api.EmbedBuilder;
|
import net.dv8tion.jda.api.EmbedBuilder;
|
||||||
import net.dv8tion.jda.api.entities.User;
|
import net.dv8tion.jda.api.entities.User;
|
||||||
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
Manifest-Version: 1.0
|
Manifest-Version: 1.0
|
||||||
Main-Class: com.bbn.hadder.Hadder
|
Main-Class: one.bbn.hadder.Hadder
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue