Updating some files

MGP6775 · Nov 6, 2019 · 7e28144 · 7e28144
1 parent bc2e3a7
commit 7e28144
Show file tree

Hide file tree

Showing 20 changed files with 272 additions and 1,056 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,5 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+.idea/
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/GottderBots.iml b/GottderBots.iml
@@ -11,16 +11,23 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: net.dv8tion:JDA:3.5.0_334" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20190722" level="project" />
+    <orderEntry type="library" name="Maven: net.dv8tion:JDA:4.0.0_56" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:16.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.13.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: club.minnced:opus-java-api:1.0.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: net.java.dev.jna:jna:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: club.minnced:opus-java-natives:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160810" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.4.0" level="project" />
-    <orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.9-rc" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.18" level="project" />
+    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
   </component>
 </module>
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Big Bot Network
+Copyright (c) 2019 BigBotNetwork
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,2 +1,2 @@
-# NEW BOT
-https://github.com/BigBotNetwork/GottBotReloaded/
+# Gott der Bots (OUTDATED)
+Not further in programming.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>Gott der Bots</groupId>
     <artifactId>Gott der Bots</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
     <build>
         <plugins>
             <plugin>
@@ -38,12 +38,11 @@
         </repository>
     </repositories>
 
-
     <dependencies>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>LATEST</version>
+            <version>20190722</version>
         </dependency>
         <dependency>
             <groupId>net.dv8tion</groupId>
@@ -56,5 +55,4 @@
             <version>LATEST</version>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/src/main/java/commands/Command.java b/src/main/java/commands/Command.java
@@ -1,12 +1,13 @@
 package commands;
 
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 public interface Command {
 
     boolean called(String[] args, MessageReceivedEvent event);
     void action(String[] args, MessageReceivedEvent event);
     void executed(boolean success, MessageReceivedEvent event);
+
     String help();
 
 }
diff --git a/src/main/java/commands/bots.java → src/main/java/commands/CommandBots.java b/src/main/java/commands/bots.java → src/main/java/commands/CommandBots.java
@@ -1,14 +1,13 @@
 package commands;
 
 import core.Main;
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
 
 import java.sql.*;
 import static core.Main.urlempty;
-import static util.SECRETS.VERSION;
 
-public class bots implements Command {
+public class CommandBots implements Command {
     @Override
     public boolean called(String[] args, MessageReceivedEvent event) {
         return false;
@@ -21,13 +20,15 @@ public void action(String[] args, MessageReceivedEvent event) {
         PreparedStatement pst = con.prepareStatement("SELECT * FROM `list`");
         ResultSet rs = pst.executeQuery();
 
-        String out = "";
+        StringBuilder out = new StringBuilder();
 
         while (rs.next()) {
-            out += "``"+rs.getString(6) + "`` Invite Link: ``" + rs.getString(5) + "``\n";
+            out.append("``").append(rs.getString(6)).append("`` Invite Link: ``").append(rs.getString(5)).append("``\n");
+        }
+            event.getChannel().sendMessage(new EmbedBuilder().setFooter(Main.Footer, Main.Footer2).setTitle("Alle Bots").setDescription("Hier eine Übersicht aller Bots: \n" + out).build()).queue();
+        } catch (SQLException e) {
+            e.printStackTrace();
         }
-            event.getChannel().sendMessage(new EmbedBuilder().setFooter(Main.Footer, Main.Footer2).setTitle("Alle Bots").setDescription("Hier eine übersicht aller Bots: \n" + out).build()).queue();
-        } catch (SQLException e) {}
     }
 
     @Override

diff --git a/src/main/java/commands/help.java → src/main/java/commands/CommandHelp.java b/src/main/java/commands/help.java → src/main/java/commands/CommandHelp.java
@@ -2,24 +2,14 @@
 
 import core.HelpMenu;
 import core.Main;
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.entities.PrivateChannel;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
-import util.SECRETS;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
 
 import java.awt.*;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.Timer;
 import java.util.concurrent.TimeUnit;
 
-import static core.Main.urlempty;
-import static util.SECRETS.VERSION;
 
-
-public class help implements Command {
+public class CommandHelp implements Command {
     @Override
     public boolean called(String[] args, MessageReceivedEvent event) {
         return false;
@@ -34,7 +24,7 @@ public void action(String[] args, MessageReceivedEvent event) {
                 HelpMenu.Help("\uD83D\uDD19");
             long Message= event.getMember().getUser().openPrivateChannel().complete().sendMessage(new EmbedBuilder().setColor(Color.GREEN).setTitle(HelpMenu.Title).setDescription(HelpMenu.Message).build()).complete().getIdLong();
             System.out.println(Message);
-            int i=1;
+            int i = 1;
             while (HelpMenu.Emoji.length>i) {
                 event.getAuthor().openPrivateChannel().complete().addReactionById(Message, HelpMenu.Emoji[i]).queue();
                 HelpMenu.Emoji[i]=null;

diff --git a/src/main/java/commands/miner.java → src/main/java/commands/CommandMiner.java b/src/main/java/commands/miner.java → src/main/java/commands/CommandMiner.java
@@ -1,24 +1,17 @@
 package commands;
 
-import com.oracle.tools.packager.IOUtils;
 import core.Main;
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Member;
 import org.json.JSONObject;
 
 import java.awt.*;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.charset.Charset;
 import java.sql.*;
 
 import static core.Main.*;
 
-public class miner implements Command {
+public class CommandMiner implements Command {
 
     Member user;
     String useruser;

diff --git a/src/main/java/commands/profile.java → src/main/java/commands/CommandProfile.java b/src/main/java/commands/profile.java → src/main/java/commands/CommandProfile.java
@@ -1,21 +1,17 @@
 package commands;
 
 import core.Main;
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.entities.Message;
-import net.dv8tion.jda.core.entities.User;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Member;
 
-import javax.sound.sampled.LineEvent;
 import java.awt.*;
 import java.sql.*;
 import java.time.format.DateTimeFormatter;
 
 import static core.Main.urlempty;
-import static util.SECRETS.VERSION;
 
-public class profile implements Command {
+public class CommandProfile implements Command {
     String Nick;
     String Game;
     Member user;
@@ -34,27 +30,27 @@ public void action(String[] args, MessageReceivedEvent event) {
                 useruser = args[0].replace("<", "").replace("@", "").replace(">", "").replace("!","");
                 user = event.getGuild().getMemberById(useruser);
             if (useruser.equals(event.getMember().getUser().getId())) {
-                event.getTextChannel().sendMessage("Was bringt es sich selbst zu hinzuschreiben?? egal... mach es nächstes mal einfach mit -profile :wink: ").queue();
+                event.getTextChannel().sendMessage("Was bringt es sich selbst hinzuschreiben?? Egal... mach es nächstes mal einfach mit -profile :wink: ").queue();
             }
 
         }catch ( ArrayIndexOutOfBoundsException e) {
             user = event.getMember();
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (user.getGame() == null) Game = "Es gibt kein Aktuell gespieltes Spiel";
-            else Game  = ""+user.getGame().getName();
+        if (user.getActivities() == null) Game = "Es gibt kein Aktuell gespieltes Spiel";
+            else Game  = "" + user.getActivities().get(0).getName();
         if (user.getNickname() == null) Nick = "Es gibt keinen Nicknamen";
             else Nick = user.getNickname();
-            int i=0;
-            String Rollen="";
+            int i = 0;
+            StringBuilder Rollen = new StringBuilder();
             int end = user.getRoles().size()-1;
             while (i<user.getRoles().size()) {
                 if (i<end) {
-                    Rollen += user.getRoles().get(i).getName() + ", ";
+                    Rollen.append(user.getRoles().get(i).getName()).append(", ");
                     i++;
                 } else {
-                    Rollen += user.getRoles().get(i).getName();
+                    Rollen.append(user.getRoles().get(i).getName());
                     i++;
                 }
             }
@@ -68,7 +64,9 @@ public void action(String[] args, MessageReceivedEvent event) {
                 } else {
                     Cookies=rs.getInt(2)+"";
                 }
-            } catch (SQLException e) {}
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
             //Level
         try {
             Connection con = DriverManager.getConnection(urlempty + "lvl" + "?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC", Main.user, Main.password);
@@ -81,14 +79,16 @@ public void action(String[] args, MessageReceivedEvent event) {
                 Punkte=rs.getInt(2)+"";
                 Level=rs.getInt(3)+"";
             }
-        } catch (SQLException e) {}
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
 
         EmbedBuilder eb = new EmbedBuilder().setFooter(Main.Footer, Main.Footer2).setColor(Color.GREEN).setTitle("Your Profile");
             eb.addField("Name", user.getUser().getName(), true);
             eb.addField("Nickname", Nick, true);
             eb.addField("Game", Game, true);
-            eb.addField("Rollen", Rollen, true);
-            eb.addField("Server betreten", user.getJoinDate().format(DateTimeFormatter.ofPattern("dd.MM.yyyy, HH:mm:ss")), true);
+            eb.addField("Rollen", Rollen.toString(), true);
+            eb.addField("Server betreten", user.getTimeJoined().format(DateTimeFormatter.ofPattern("dd.MM.yyyy, HH:mm:ss")), true);
             eb.addField("Status", user.getOnlineStatus().toString(), true);
 
             eb.setThumbnail(user.getUser().getAvatarUrl());

diff --git a/src/main/java/commands/register.java → src/main/java/commands/CommandRegister.java b/src/main/java/commands/register.java → src/main/java/commands/CommandRegister.java
@@ -1,17 +1,17 @@
 package commands;
 
 import core.Main;
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import util.SECRETS;
 
 import java.awt.*;
 import java.sql.*;
 
 import static core.Main.urlempty;
-import static util.SECRETS.VERSION;
 
-public class register implements Command {
+public class CommandRegister implements Command {
+
     @Override
     public boolean called(String[] args, MessageReceivedEvent event) {
         return false;
@@ -20,39 +20,34 @@ public boolean called(String[] args, MessageReceivedEvent event) {
     @Override
     public void action(String[] args, MessageReceivedEvent event) {
         if (args.length<1) {
-            event.getChannel().sendMessage(new EmbedBuilder().setFooter(Main.Footer, Main.Footer2).setTitle("Register").setDescription("Damit kannst du dich bei verschiedenen Bots registrieren. Folgene Commands kannst du benutzen: \n``" +
-                    SECRETS.PREFIX + "register list`` Zeigt dir eine Liste bei welchen Bots du dich Registrieren kannst!\n``" +
+            event.getChannel().sendMessage(new EmbedBuilder().setFooter(Main.Footer, Main.Footer2).setTitle("Register").setDescription("Damit kannst du dich bei verschiedenen Bots registrieren. Folgende Commands kannst du benutzen: \n``" +
+                    SECRETS.PREFIX + "register list`` Zeigt dir eine Liste bei welchen Bots du dich registrieren kannst!\n``" +
                     SECRETS.PREFIX + "register <NamedesBots>`` Registriert dich bei dem Bot.").build()).queue();
         }
         try {
-            switch (args[0].toLowerCase()) {
-                case "list":
-
-                    try {
-                        Connection con = DriverManager.getConnection(urlempty + "bank" + "?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC", Main.user, Main.password);
-                        PreparedStatement pst = con.prepareStatement("SELECT * FROM `list`");
-                        ResultSet rs = pst.executeQuery();
+            if ("list".equals(args[0].toLowerCase())) {
+                try {
+                    Connection con = DriverManager.getConnection(urlempty + "bank" + "?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC", Main.user, Main.password);
+                    PreparedStatement pst = con.prepareStatement("SELECT * FROM `list`");
+                    ResultSet rs = pst.executeQuery();
 
-                        String out = "";
+                    StringBuilder out = new StringBuilder();
 
-                        while (rs.next()) {
-                            out += "●► ``" + rs.getString(6) + "``\n";
-                        }
-                        event.getChannel().sendMessage(new EmbedBuilder().setFooter(Main.Footer, Main.Footer2).setColor(Color.GREEN)
-                                .setDescription("Hier eine Liste aller Bots bei denen du dich registrieren kannst: \n" + out)
-                                .setTitle("Liste")
-                                .build()
-                        ).queue();
-                    } catch (SQLException e) {
-                        e.printStackTrace();
+                    while (rs.next()) {
+                        out.append("●► ``").append(rs.getString(6)).append("``\n");
                     }
-                    break;
+                    event.getChannel().sendMessage(new EmbedBuilder().setFooter(Main.Footer, Main.Footer2).setColor(Color.GREEN)
+                            .setDescription("Hier eine Liste aller Bots bei denen du dich registrieren kannst: \n" + out)
+                            .setTitle("Liste")
+                            .build()
+                    ).queue();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
             }
 
             try {
-                if (args[0].toLowerCase().equals("list")) {
-
-                } else {
+                if (!args[0].toLowerCase().equals("list")) {
                     Connection con = DriverManager.getConnection(urlempty + "bank" + "?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC", Main.user, Main.password);
                     PreparedStatement pst = con.prepareStatement("SELECT * FROM `list` WHERE `NameRichtig` LIKE '" + args[0] + "'");
                     ResultSet rs = pst.executeQuery();
@@ -86,11 +81,8 @@ public void action(String[] args, MessageReceivedEvent event) {
             } catch (SQLException e) {
                 e.printStackTrace();
             }
-        }catch (ArrayIndexOutOfBoundsException e ) {
-
-        }
-        catch (Exception e) {
-                e.printStackTrace();
+        } catch (Exception e ) {
+            e.printStackTrace();
         }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,3 +20,5 @@

		# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
		hs_err_pid*

		.idea/