updated files

Author: basion96

.gitignore

@@ -0,0 +1,4 @@
+/libs/
+/out/
+/.idea/
+/DrunkBot.iml

resources/bot.properties

@@ -2,5 +2,5 @@
 
 token =
 
-prefix =
+prefix = !
 

src/drunkBot/commands/HelpCommand.java

@@ -24,7 +24,14 @@ private EmbedBuilder writeEmbed(MessageReceivedEvent event) {
 
         eb.setTitle("Command List");
         eb.setThumbnail(DrunkBot.getJDA().getSelfUser().getAvatarUrl());
-
+        eb.addField("!addme", "Gives you a membership to the pub", false);
+        eb.addField("!deleteme", "Membership is revoked, probs because you're a shit cunt", false);
+        eb.addField("!membership", "Your valuable membership info", false);
+        eb.addField("!pokies", " the fuckin pokies mate, do !pokies [amount] where amount can only be 1, 5, 10, 20 or !pokies info", false);
+        eb.addField("!givejoshlotsofmonies", "Because he's a poor shit who lives off the dole", false);
+        eb.addField("!pitymoney", "For when you lose all your money to the pokies", false);
+        eb.addField("!kob", "I think this starts king of beers? i forgot how this works", false);
+        eb.addField("!help", "Take a fuckin guess mate", false);
 
         return eb;
     }

src/drunkBot/core/DrunkBot.java

@@ -3,6 +3,7 @@
 import drunkBot.eventListeners.*;
 import drunkBot.handlers.JukeboxMessageHandler;
 import drunkBot.memberFunctions.MemberFunctions;
+import drunkBot.util.TerminalListener;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.entities.Activity;
@@ -32,14 +33,16 @@ private void run(){
         jda.getPresence().setActivity(Activity.playing("with dem titties"));
 
         memberFunctions = new MemberFunctions();
+        //memberFunctions.loadUsers();
 
         jda.addEventListener(
                 new MessageReceivedListener(),
                 new JukeboxMessageHandler(),
                 new GuildMemberJoinListener()
         );
 
-
+        TerminalListener terminalListener = new TerminalListener();
+        new Thread(terminalListener).start();
 
     }
 

src/drunkBot/memberFunctions/MemberFunctions.java

@@ -25,15 +25,17 @@ public MemberFunctions(){
         //read in user data
         ObjectInputStream in = null;
         File folder = new File("resources/users");
-        for (final File fileEntry : folder.listFiles()) {
-            if (!fileEntry.isDirectory()) {
-                try {
-                    String filename = "resources/users/" + fileEntry.getName();
-                    in = new ObjectInputStream(new FileInputStream(filename));
-                    members.add((Member)in.readObject());
-                    in.close();
-                }catch (Exception e){
-                    System.out.println(e);
+        if(folder.exists()){
+            for (final File fileEntry : folder.listFiles()) {
+                if (!fileEntry.isDirectory()) {
+                    try {
+                        String filename = "resources/users/" + fileEntry.getName();
+                        in = new ObjectInputStream(new FileInputStream(filename));
+                        members.add((Member)in.readObject());
+                        in.close();
+                    }catch (Exception e){
+                        System.out.println(e);
+                    }
                 }
             }
         }
@@ -113,7 +115,7 @@ public void saveUsers(){
 
         try{
             for(Member member : members){
-                String filename = "resources/users/User - " + member.getName() + ".txt";
+                String filename = "resources/users/user_" + member.getName() + ".txt";
                 fileOut = new FileOutputStream(filename);
                 out = new ObjectOutputStream(fileOut);
                 out.writeObject(member);

src/drunkBot/util/TerminalListener.java

@@ -28,6 +28,7 @@ private void readCommand(String input){
             // format = !money [user] [amount]
             case "money":
                 DrunkBot.getMemberFunctions().getMember(args[1]).addCredits(Integer.parseInt(args[2]));
+                System.out.println("adding money");
         }
     }