Merge branch 'master' into Hax

Author: greg6775

GBideen.txt

@@ -1,7 +1,6 @@
 GottBotReloaded ideen
 
 - 1 Handler mit Owner überprüfung, Language Handler, Menu handler, MySQL Handler,  (commandHandler?), usw
-- Better language integration/Handler
-- Sharding?
+- Music Command
 - commandRegisterHandler damit man nicht so viele zeilen nur für commandRegistering braucht
-- games
+- games

pom.xml

@@ -96,5 +96,29 @@
             <artifactId>ftpserver-core</artifactId>
             <version>LATEST</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.google.api-client</groupId>
+            <artifactId>google-api-client</artifactId>
+            <version>1.23.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.oauth-client</groupId>
+            <artifactId>google-oauth-client-jetty</artifactId>
+            <version>1.23.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.apis</groupId>
+            <artifactId>google-api-services-youtube</artifactId>
+            <version>v3-rev191-1.23.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.api-client</groupId>
+            <artifactId>google-api-client-appengine</artifactId>
+            <version>1.23.0</version>
+        </dependency>
     </dependencies>
 </project>

src/main/java/commands/music/CommandJoin.java

@@ -0,0 +1,35 @@
+package commands.music;
+
+import commands.Command;
+import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.core.exceptions.PermissionException;
+
+public class CommandJoin implements Command {
+    @Override
+    public boolean called(String[] args, MessageReceivedEvent event) {
+        return false;
+    }
+
+    @Override
+    public void action(String[] args, MessageReceivedEvent event) {
+        try {
+            if (!event.getGuild().getAudioManager().isConnected() && !event.getGuild().getAudioManager().isAttemptingToConnect()) {
+                if (event.getGuild().getAudioManager().getGuild().getVoiceChannels().contains(event.getMember().getVoiceState().getChannel())) {
+                    event.getGuild().getAudioManager().openAudioConnection(event.getMember().getVoiceState().getChannel());
+                } else {
+                    event.getTextChannel().sendMessage("unknown error (eigentlich nicht)").queue();
+                }
+            } else {
+                event.getTextChannel().sendMessage("I am already connected!").queue();
+            }
+        } catch (PermissionException e) {
+
+        }
+        event.getGuild().getAudioManager().setSelfDeafened(true);
+    }
+
+    @Override
+    public void executed(boolean success, MessageReceivedEvent event) {
+
+    }
+}

src/main/java/commands/music/CommandLeave.java

@@ -0,0 +1,25 @@
+package commands.music;
+
+import commands.Command;
+import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+
+public class CommandLeave implements Command {
+    @Override
+    public boolean called(String[] args, MessageReceivedEvent event) {
+        return false;
+    }
+
+    @Override
+    public void action(String[] args, MessageReceivedEvent event) {
+        if (event.getGuild().getAudioManager().isConnected() || event.getGuild().getAudioManager().isAttemptingToConnect()) {
+            event.getGuild().getAudioManager().closeAudioConnection();
+        } else {
+            event.getTextChannel().sendMessage("I cant leave when i am not in a voice channel").queue();
+        }
+    }
+
+    @Override
+    public void executed(boolean success, MessageReceivedEvent event) {
+
+    }
+}

src/main/java/commands/tools/CommandProfile.java

@@ -17,6 +17,7 @@
 import java.util.ResourceBundle;
 
 import static core.JSONhandler.readJsonFromUrl;
+import static javax.print.attribute.standard.Chromaticity.COLOR;
 
 public class CommandProfile implements Command {
     String Nick;

src/main/java/core/Main.java

@@ -2,12 +2,14 @@
 
 import commands.botowner.*;
 import commands.moderation.*;
+import commands.music.CommandJoin;
 import commands.tools.*;
 import commands.usercommands.*;
 import commands.usercommands.CommandHelp;
 import commands.botowner.CommandInfo;
 import commands.usercommands.CommandPremium;
 import listener.*;
+import music.AudioCore;
 import net.dv8tion.jda.bot.sharding.DefaultShardManagerBuilder;
 import net.dv8tion.jda.bot.sharding.ShardManager;
 import net.dv8tion.jda.core.JDA;
@@ -29,6 +31,7 @@ public class Main {
     public static boolean dev = true;
     public static SessionController sessionController;
     public static ShardManager shardManager;
+    public static AudioCore audioCore;
 
     public static void main(String[] args2) {
         try {
@@ -84,7 +87,7 @@ public static void main(String[] args2) {
             commandHandler.commands.put("setxp", new CommandSetXP());
             commandHandler.commands.put("clyde", new CommandClyde());
             commandHandler.commands.put("ping", new CommandPing());
-            commandHandler.commands.put("leave", new CommandLeave());
+            commandHandler.commands.put("guildleave", new CommandLeave());
             commandHandler.commands.put("stats", new CommandStats());
             commandHandler.commands.put("verification", new CommandVerification());
             commandHandler.commands.put("say", new CommandSay());
@@ -107,6 +110,9 @@ public static void main(String[] args2) {
             commandHandler.commands.put("shard", new CommandShard());
             commandHandler.commands.put("uptime", new CommandUptime());
             commandHandler.commands.put("role", new CommandRole());
+            /*MUSIC*/
+            commandHandler.commands.put("join", new CommandJoin());
+            commandHandler.commands.put("leave", new commands.music.CommandLeave());
             args = args2;
             logger.info("loaded all commands");
             logger.info("Starting the Bot...");

target/classes/MessagesBundle_de.properties

@@ -1,4 +1,3 @@
-
 #Helpmenu
 Helpmenu.helpmenu=Helpmenu
 Helpmenu.helpmenu.description=Please react with the Emotes. Use the :arrow_backward: or the :back: emoji to see the overview
@@ -136,7 +135,6 @@ util.none=none
 util.mine=You don't have enough Hashes... Mine! %extra%
 util.bbnguild=Please use this command on the official BigBotNetwork Server: %extra%
 util.nopermissionuser=You have no Permission to use this
-<<<<<<< HEAD
 util.nopermissionbot=I have no permission to do this
 #botowner
 botowner.test.title=Erfolgreich
@@ -154,7 +152,4 @@ botowner.setlvl.text=Erfolgreich Level gesetzt
 botowner.setxp.title=Erfolgreich
 botowner.setxp.text=Erfolgreich XP gesetzt
 botowner.leave.title=Erfolgreich
-botowner.leave.text=Erfolgreich den Server %extra% verlassen
-=======
-util.nopermissionbot=I have no permission to do this
->>>>>>> 3c136e0338f156d8787b69dfb3a9ae18657881d5
+botowner.leave.text=Erfolgreich den Server %extra% verlassen