gitflow-hotfix-stash: slowmerge

This commit is contained in:
Matthew Cech
2019-10-17 22:39:56 -07:00
parent bbbb138f5e
commit afb27df33d
8 changed files with 271 additions and 7 deletions
+6 -1
View File
@@ -24,13 +24,14 @@ import dataStructures.Response;
import dataStructures.UserInput;
import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
import net.dv8tion.jda.core.hooks.ListenerAdapter;
import trash.MainFAKE;
import utils.GlobalLog;
// http://www.slf4j.org/ - this JDA logging tool has been disabled by specifying NOP implementation.
// This is the application entry point, and bot startup location!
@SuppressWarnings("unused")
public class Main extends ListenerAdapter
public class Main// extends ListenerAdapter
{
// Variables and bot specific objects
private static KittyCore kittyCore;
@@ -45,6 +46,9 @@ public class Main extends ListenerAdapter
// Initialization and setup
public static void main(String[] args) throws InterruptedException, LoginException, Exception
{
MainFAKE.mainFAKE(args);
}
/*
// Factory startup. The ordering is intentional.
GlobalLog.initialize();
databaseManager = ObjectBuilderFactory.constructDatabaseManager();
@@ -115,4 +119,5 @@ public class Main extends ListenerAdapter
if(!Superintendent.perCommandUpkeepPost(kittyCore, databaseManager))
return;
}
*/
}