Skip to content
This repository was archived by the owner on Oct 28, 2021. It is now read-only.

Commit 7d9675c

Browse files
Schlauer-HaxSchlauer-Hax
authored
Merge pull request #104 from BigBotNetwork/Hax
Hax
2 parents 263b331 + bfbdac2 commit 7d9675c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1588
-1106
lines changed

‎.idea/workspace.xml

Lines changed: 117 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎GBideen.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
GottBotReloaded ideen
22

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

‎GottBotReloaded.iml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,15 @@
1010
</content>
1111
<orderEntry type="inheritedJdk" />
1212
<orderEntry type="sourceFolder" forTests="false" />
13+
<<<<<<< HEAD
1314
<orderEntry type="library" name="Maven: net.dv8tion:JDA:3.5.1_351" level="project" />
1415
<orderEntry type="library" name="Maven: net.dv8tion:JDA:3.5.1_353" level="project" />
1516
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.8.0-beta2" level="project" />
1617
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.8.0-beta2" level="project" />
18+
=======
19+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.8.0-beta1" level="project" />
20+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.8.0-beta1" level="project" />
21+
>>>>>>> master
1722
<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
1823
<orderEntry type="library" name="Maven: org.kohsuke:github-api:1.92" level="project" />
1924
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
@@ -27,19 +32,26 @@
2732
<orderEntry type="library" name="Maven: org.livetribe:livetribe-jsr223:2.0.3" level="project" />
2833
<orderEntry type="library" name="Maven: rhino:js:1.7R1" level="project" />
2934
<orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />
35+
<<<<<<< HEAD
3036
<orderEntry type="library" name="Maven: net.dv8tion:JDA:3.6.0_354" level="project" />
37+
=======
38+
<orderEntry type="library" name="Maven: net.dv8tion:JDA:3.5.1_350" level="project" />
39+
>>>>>>> master
3140
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
3241
<orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
3342
<orderEntry type="library" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
3443
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.4.0" level="project" />
3544
<orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.2" level="project" />
3645
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
3746
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
47+
<<<<<<< HEAD
3848
<orderEntry type="library" name="Maven: com.github.ForYaSee:HttpRequest:1.1.0" level="project" />
3949
<orderEntry type="library" name="Maven: com.github.DiscordBotList:DBL-Java-Wrapper:v1.0" level="project" />
4050
<orderEntry type="library" name="Maven: com.squareup.retrofit2:converter-gson:2.3.0" level="project" />
4151
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
4252
<orderEntry type="library" name="Maven: com.squareup.retrofit2:retrofit:2.3.0" level="project" />
4353
<orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
54+
=======
55+
>>>>>>> master
4456
</component>
4557
</module>

‎pom.xml

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,15 @@
3333
</repositories>
3434
<dependencies>
3535
<dependency>
36-
<groupId>org.slf4j</groupId>
37-
<artifactId>slf4j-log4j12</artifactId>
36+
<groupId>com.github.DiscordBotList</groupId>
37+
<artifactId>DBL-Java-Wrapper</artifactId>
3838
<version>LATEST</version>
3939
</dependency>
40+
<dependency>
41+
<groupId>org.slf4j</groupId>
42+
<artifactId>slf4j-simple</artifactId>
43+
<version>1.7.5</version>
44+
</dependency>
4045
<!-- https://mvnrepository.com/artifact/org.kohsuke/github-api -->
4146
<dependency>
4247
<groupId>org.kohsuke</groupId>
@@ -49,11 +54,6 @@
4954
<artifactId>mysql-connector-java</artifactId>
5055
<version>8.0.9-rc</version>
5156
</dependency>
52-
<!-- https://mvnrepository.com/artifact/org.json/json -->
53-
<dependency>
54-
<groupId>org.json</groupId>
55-
<artifactId>json</artifactId>
56-
</dependency>
5757
<!-- https://mvnrepository.com/artifact/com.google.code.scriptengines/scriptengines-javascript -->
5858
<dependency>
5959
<groupId>com.google.code.scriptengines</groupId>
@@ -75,16 +75,6 @@
7575
<artifactId>HttpRequest</artifactId>
7676
<version>LATEST</version>
7777
</dependency>
78-
<dependency>
79-
<groupId>com.github.DiscordBotList</groupId>
80-
<artifactId>DBL-Java-Wrapper</artifactId>
81-
<version>LATEST</version>
82-
</dependency>
83-
<dependency>
84-
<groupId>com.github.ForYaSee</groupId>
85-
<artifactId>HttpRequest</artifactId>
86-
<version>LATEST</version>
87-
</dependency>
8878
<!-- https://bintray.com/sedmelluq/com.sedmelluq/lavaplayer -->
8979
<dependency>
9080
<groupId>com.sedmelluq</groupId>
@@ -106,5 +96,29 @@
10696
<artifactId>ftpserver-core</artifactId>
10797
<version>LATEST</version>
10898
</dependency>
99+
100+
<dependency>
101+
<groupId>com.google.api-client</groupId>
102+
<artifactId>google-api-client</artifactId>
103+
<version>1.23.0</version>
104+
</dependency>
105+
106+
<dependency>
107+
<groupId>com.google.oauth-client</groupId>
108+
<artifactId>google-oauth-client-jetty</artifactId>
109+
<version>1.23.0</version>
110+
</dependency>
111+
112+
<dependency>
113+
<groupId>com.google.apis</groupId>
114+
<artifactId>google-api-services-youtube</artifactId>
115+
<version>v3-rev191-1.23.0</version>
116+
</dependency>
117+
118+
<dependency>
119+
<groupId>com.google.api-client</groupId>
120+
<artifactId>google-api-client-appengine</artifactId>
121+
<version>1.23.0</version>
122+
</dependency>
109123
</dependencies>
110124
</project>

‎src/main/java/commands/botowner/CommandBlacklist.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package commands.botowner;
22

33
import commands.Command;
4+
import core.MessageHandler;
5+
import core.Main;
46
import core.MySQL;
5-
import net.dv8tion.jda.core.EmbedBuilder;
6-
import net.dv8tion.jda.core.MessageBuilder;
77
import net.dv8tion.jda.core.Permission;
88
import net.dv8tion.jda.core.entities.User;
99
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
10-
import util.Embed;
1110

12-
import java.awt.*;
1311
import java.util.List;
1412

1513
public class CommandBlacklist implements Command {
@@ -22,7 +20,7 @@ public boolean called(String[] args, MessageReceivedEvent event) {
2220
public void action(String[] args, MessageReceivedEvent event) {
2321
if (Owner.get(event.getAuthor())) {
2422
if (args.length < 1) {
25-
event.getTextChannel().sendMessage(Embed.error("Blacklist - Help ", "Do gb.blacklist add @User or gb.blacklist remove @User. DO IT JUST DO IT!").build()).queue();
23+
event.getTextChannel().sendMessage(MessageHandler.getEmbed("botowner.blacklist.title2", "botowner.blacklist.text2", "", "error", event)).queue();
2624
} else {
2725
switch (args[0].toLowerCase()) {
2826
case "add":
@@ -41,10 +39,10 @@ public void action(String[] args, MessageReceivedEvent event) {
4139
int i=0;
4240
List<String> list = MySQL.getallwithoutwhere("blacklist", "id");
4341
while (list.size()>i) {
44-
out += event.getJDA().getUserById(list.get(i)).getName()+", ";
42+
out += Main.shardManager.getUserById(list.get(i)).getName()+", ";
4543
i++;
4644
}
47-
event.getTextChannel().sendMessage(Embed.normal("Blacklisted Users", out).build()).queue();
45+
event.getTextChannel().sendMessage(MessageHandler.getEmbed("botowner.blacklist.title", "botowner.blacklist.text", out, "normal", event)).queue();
4846
break;
4947
}
5048
}

‎src/main/java/commands/botowner/CommandDM.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import commands.Command;
44
import core.MessageHandler;
5-
import net.dv8tion.jda.core.MessageBuilder;
65
import net.dv8tion.jda.core.entities.Member;
76
import net.dv8tion.jda.core.entities.PrivateChannel;
87
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
9-
import util.Embed;
108

119
public class CommandDM implements Command {
1210
@Override
@@ -22,7 +20,7 @@ public void action(String[] args, MessageReceivedEvent event) {
2220

2321
PrivateChannel channel = User.getUser().openPrivateChannel().complete();
2422
channel.sendMessage(Content).queue();
25-
event.getTextChannel().sendMessage(Embed.success(MessageHandler.get(event.getAuthor()).getString("dmtitel"), MessageHandler.get(event.getAuthor()).getString("dmdescription")).build()).queue();
23+
event.getTextChannel().sendMessage(MessageHandler.getEmbed("botowner.dm.text", "botowner.dm.title", "", "normal", event)).queue();
2624
}
2725
}
2826

0 commit comments

Comments
 (0)