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

Commit 3fdc56b

Browse files
Schlauer-HaxSchlauer-Hax
committed
Hier so %prefix% replace :D
1 parent 9394c56 commit 3fdc56b

File tree

12 files changed

+95
-88
lines changed

12 files changed

+95
-88
lines changed

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

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

33
import commands.Command;
4+
import core.Main;
45
import core.MySQL;
6+
import net.dv8tion.jda.bot.sharding.ShardManager;
57
import net.dv8tion.jda.core.MessageBuilder;
68
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
79
import org.slf4j.Logger;
@@ -19,14 +21,17 @@ public void action(String[] args, MessageReceivedEvent event) {
1921
if (Owner.get(event.getAuthor())) {
2022
Thread t = new Thread(() -> {
2123
int i = 0;
22-
while (event.getJDA().getGuilds().size() - 1 >= i) {
23-
if (MySQL.get("server", "id", event.getJDA().getGuilds().get(i).getId(), "id") == null) {
24-
MySQL.insert("server", "id", event.getJDA().getGuilds().get(i).getId() + "");
25-
logger.info("neuer Server in database Name: " + event.getJDA().getGuilds().get(i).getName() + " ID: " + event.getJDA().getGuilds().get(i).getId());
24+
int i2 = 0;
25+
ShardManager shardManager = Main.shardManager;
26+
while (shardManager.getGuilds().size() - 1 >= i) {
27+
if (MySQL.get("server", "id", shardManager.getGuilds().get(i).getId(), "id") == null) {
28+
MySQL.insert("server", "id", shardManager.getGuilds().get(i).getId() + "");
29+
logger.info("neuer Server in database Name: " + shardManager.getGuilds().get(i).getName() + " ID: " + shardManager.getGuilds().get(i).getId());
30+
i2++;
2631
}
2732
i++;
2833
}
29-
event.getTextChannel().sendMessage("Succesfully registered " + i + " server").queue();
34+
event.getTextChannel().sendMessage("Succesfully registered " + i2 + " server").queue();
3035
});
3136
t.setName("registerserver");
3237
t.start();

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@ public boolean called(String[] args, MessageReceivedEvent event) {
1414

1515
@Override
1616
public void action(String[] args, MessageReceivedEvent event) {
17+
System.out.println("lololololololol");
1718
if (Owner.get(event.getAuthor())) {
1819
event.getTextChannel().sendMessage(MessageHandler.getEmbed("botowner.test.title", "botowner.test.text", "", "normal", event)).queue();
19-
20-
21-
22-
23-
2420
} else {
2521
event.getTextChannel().sendMessage(MessageHandler.getEmbed("util.error", "util.nopermissionuser", "", "error", event)).queue();
2622
}

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

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import core.MessageHandler;
55
import core.MySQL;
66
import net.dv8tion.jda.core.EmbedBuilder;
7+
import net.dv8tion.jda.core.entities.Guild;
78
import net.dv8tion.jda.core.entities.Member;
89
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
910
import org.json.JSONObject;
@@ -20,8 +21,6 @@
2021
public class CommandProfile implements Command {
2122
String Nick;
2223
String Game;
23-
Member user;
24-
String useruser;
2524
String Punkte;
2625
String Level;
2726
String Progress;
@@ -38,14 +37,14 @@ public boolean called(String[] args, MessageReceivedEvent event) {
3837
@Override
3938
public void action(String[] args, MessageReceivedEvent event) {
4039
try {
41-
ResourceBundle msg = MessageHandler.get(event.getAuthor());
4240
Member user;
4341
if (event.getMessage().getMentionedMembers().size() == 1) {
4442
user = event.getMessage().getMentionedMembers().get(0);
4543
} else user = event.getMember();
46-
if (user.getGame() == null) Game = msg.getString("tools.profile.nogame");
44+
Guild guild = event.getGuild();
45+
if (user.getGame() == null) Game = MessageHandler.get("tools.profile.nogame", user.getUser(), guild);
4746
else Game = "" + user.getGame().getName();
48-
if (user.getNickname() == null) Nick = msg.getString("tools.profile.nonick");
47+
if (user.getNickname() == null) Nick = MessageHandler.get("tools.profile.nonick", user.getUser(), guild);
4948
else Nick = user.getNickname();
5049
int i = 0;
5150
String Rollen = "";
@@ -117,22 +116,22 @@ public void action(String[] args, MessageReceivedEvent event) {
117116
event.getJDA().getGuildById(DATA.BBNS).getEmotesByName("progbar_end_full", true).get(0).getAsMention();
118117
}
119118
String Github = MySQL.get("user", "ID", user.getUser().getId(), "github");
120-
event.getTextChannel().sendMessage(new EmbedBuilder().setTitle(MessageHandler.get(event.getAuthor()).getString("tools.profile.title"))
121-
.addField(msg.getString("tools.profile.1"), user.getUser().getName(), false)
122-
.addField(msg.getString("tools.profile.2"), Nick, false)
123-
.addField(msg.getString("tools.profile.3"), Game, false)
124-
.addField(msg.getString("tools.profile.4"), Rollen, false)
125-
.addField(msg.getString("tools.profile.5"), user.getJoinDate().format(DateTimeFormatter.ofPattern("dd.MM.yy, HH:mm:ss")), false)
126-
.addField(msg.getString("tools.profile.6"), event.getMessage().getAuthor().getCreationTime().format(DateTimeFormatter.ofPattern("dd.MM.yy, HH:mm:ss")), false)
127-
.addField(msg.getString("tools.profile.7"), user.getOnlineStatus().toString(), false)
128-
.addField(msg.getString("tools.profile.8"), Github, false)
129-
.addField(msg.getString("tools.profile.9"), Level, false)
130-
.addField(msg.getString("tools.profile.10"), Punkte, false)
131-
.addField(msg.getString("tools.profile.11"), Progress, false)
132-
.addField(msg.getString("tools.profile.12"), String.valueOf(mined), false)
133-
.addField(msg.getString("tools.profile.13"), withdrawn, false)
134-
.addField(msg.getString("tools.profile.14"), String.valueOf(mined-Long.parseLong(withdrawn)), false)
135-
.addField(msg.getString("tools.profile.15"), hashes, false)
119+
event.getTextChannel().sendMessage(new EmbedBuilder().setTitle(MessageHandler.get("tools.profile.title", user.getUser(), guild))
120+
.addField(MessageHandler.get("tools.profile.1", user.getUser(), guild), user.getUser().getName(), false)
121+
.addField(MessageHandler.get("tools.profile.2", user.getUser(), guild), Nick, false)
122+
.addField(MessageHandler.get("tools.profile.3", user.getUser(), guild), Game, false)
123+
.addField(MessageHandler.get("tools.profile.4", user.getUser(), guild), Rollen, false)
124+
.addField(MessageHandler.get("tools.profile.5", user.getUser(), guild), user.getJoinDate().format(DateTimeFormatter.ofPattern("dd.MM.yy, HH:mm:ss")), false)
125+
.addField(MessageHandler.get("tools.profile.6", user.getUser(), guild), event.getMessage().getAuthor().getCreationTime().format(DateTimeFormatter.ofPattern("dd.MM.yy, HH:mm:ss")), false)
126+
.addField(MessageHandler.get("tools.profile.7", user.getUser(), guild), user.getOnlineStatus().toString(), false)
127+
.addField(MessageHandler.get("tools.profile.8", user.getUser(), guild), Github, false)
128+
.addField(MessageHandler.get("tools.profile.9", user.getUser(), guild), Level, false)
129+
.addField(MessageHandler.get("tools.profile.10", user.getUser(), guild), Punkte, false)
130+
.addField(MessageHandler.get("tools.profile.11", user.getUser(), guild), Progress, false)
131+
.addField(MessageHandler.get("tools.profile.12", user.getUser(), guild), String.valueOf(mined), false)
132+
.addField(MessageHandler.get("tools.profile.13", user.getUser(), guild), withdrawn, false)
133+
.addField(MessageHandler.get("tools.profile.14", user.getUser(), guild), String.valueOf(mined-Long.parseLong(withdrawn)), false)
134+
.addField(MessageHandler.get("tools.profile.15", user.getUser(), guild), hashes, false)
136135
.setColor(java.awt.Color.CYAN).setThumbnail(user.getUser().getAvatarUrl()).build()).queue();
137136

138137
} catch (Exception e) {
@@ -143,4 +142,4 @@ public void action(String[] args, MessageReceivedEvent event) {
143142
@Override
144143
public void executed(boolean success, MessageReceivedEvent event) {
145144
}
146-
}
145+
}

‎src/main/java/commands/tools/CommandUptime.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public boolean called(String[] args, MessageReceivedEvent event) {
1717
@Override
1818
public void action(String[] args, MessageReceivedEvent event) {
1919
long uptime = ManagementFactory.getRuntimeMXBean().getUptime();
20-
event.getTextChannel().sendMessage(new EmbedBuilder().setDescription(MessageHandler.get(event.getAuthor()).getString("tools.uptime") + " " + String.valueOf(TimeUnit.MILLISECONDS.toDays(uptime) + "d " + TimeUnit.MILLISECONDS.toHours(uptime) % 24 + "h " + TimeUnit.MILLISECONDS.toMinutes(uptime) % 60 + "m " + TimeUnit.MILLISECONDS.toSeconds(uptime) % 60 + "s")).setTitle(":clock: "+MessageHandler.get(event.getAuthor()).getString("tools.uptime")+" :clock:").build()).queue();
20+
event.getTextChannel().sendMessage(new EmbedBuilder().setDescription(MessageHandler.get("tools.uptime",event.getAuthor(),event.getGuild()) + " " + String.valueOf(TimeUnit.MILLISECONDS.toDays(uptime) + "d " + TimeUnit.MILLISECONDS.toHours(uptime) % 24 + "h " + TimeUnit.MILLISECONDS.toMinutes(uptime) % 60 + "m " + TimeUnit.MILLISECONDS.toSeconds(uptime) % 60 + "s")).setTitle(":clock: "+MessageHandler.get("tools.uptime",event.getAuthor(),event.getGuild())+" :clock:").build()).queue();
2121
}
2222

2323
@Override

‎src/main/java/commands/usercommands/CommandHelp.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public void action(String[] args, MessageReceivedEvent event) {
2424
if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_MANAGE)) {
2525
Message message = event.getTextChannel().sendMessage(MessageHandler.getEmbed("usercommands.help.loading", "usercommands.help.loading", "", "normal", event)).complete();
2626
MySQL.insert("helpmenu", "id`,`message", event.getAuthor().getId() + "','" + message.getId());
27-
event.getTextChannel().editMessageById(message.getId(), MenuHandler.getMessage("\uD83D\uDD19", new EmbedBuilder().setTitle(MessageHandler.get(event.getAuthor()).getString("Helpmenu.helpmenu") + " - ").build(), event.getAuthor())).queue();
28-
List<String> list = MenuHandler.getemote("\uD83D\uDD19", MessageHandler.getEmbed("Helpmenu.helpmenu", "Helpmenu.helpmenu", "", "normal", event), event.getAuthor());
27+
event.getTextChannel().editMessageById(message.getId(), MenuHandler.getMessage("\uD83D\uDD19", new EmbedBuilder().setTitle(MessageHandler.get("Helpmenu.helpmenu", event.getAuthor(),event.getGuild()) + " - ").build(), event.getAuthor(), event.getGuild())).queue();
28+
List<String> list = MenuHandler.getemote("\uD83D\uDD19", MessageHandler.getEmbed("Helpmenu.helpmenu", "Helpmenu.helpmenu", "", "normal", event), event.getAuthor(), event.getGuild());
2929
while (list.size() > 0) {
3030
message.addReaction(list.get(0)).queue();
3131
list.remove(0);

‎src/main/java/commands/usercommands/CommandPremium.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public boolean called(String[] args, MessageReceivedEvent event) {
2424
public void action(String[] args, MessageReceivedEvent event) {
2525
if (args.length!=1) {
2626
String status;
27-
if (MySQL.get("user", "id", event.getAuthor().getId(), "premium").equals("none")) status= MessageHandler.get(event.getAuthor()).getString("util.none");
27+
if (MySQL.get("user", "id", event.getAuthor().getId(), "premium").equals("none")) status= MessageHandler.get("util.none",event.getAuthor(), event.getGuild());
2828
else {
2929
Date date = new Date();
3030
date.setTime(Long.parseLong(MySQL.get("user", "id", event.getAuthor().getId(), "premium")));

‎src/main/java/commands/usercommands/CommandStats.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import core.MySQL;
77
import core.commandHandler;
88
import net.dv8tion.jda.core.EmbedBuilder;
9+
import net.dv8tion.jda.core.entities.Guild;
10+
import net.dv8tion.jda.core.entities.User;
911
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
1012

1113
import java.util.ResourceBundle;
@@ -24,16 +26,17 @@ public void action(String[] args, MessageReceivedEvent event) {
2426
User=User+event.getJDA().getGuilds().get(i).getMembers().size();
2527
i++;
2628
}
27-
ResourceBundle msg = MessageHandler.get(event.getAuthor());
29+
net.dv8tion.jda.core.entities.User user = event.getAuthor();
30+
Guild guild = event.getGuild();
2831
event.getTextChannel().sendMessage(new EmbedBuilder().setTitle("Stats")
29-
.addField(msg.getString("usercommands.stats.stats1"), MySQL.get1("stats", "1", "command"),true)
30-
.addField(msg.getString("usercommands.stats.stats2"), MySQL.get1("stats", "1", "message"),true)
31-
.addField(msg.getString("usercommands.stats.stats3"), String.valueOf(Main.shardManager.getGuilds().size()), true)
32-
.addField(msg.getString("usercommands.stats.stats4"),String.valueOf(User), true)
33-
.addField(msg.getString("usercommands.stats.stats5"), String.valueOf(event.getJDA().getRegisteredListeners().size()), true)
34-
.addField(msg.getString("usercommands.stats.stats6"), String.valueOf(commandHandler.commands.size()), true)
35-
.addField(msg.getString("usercommands.stats.stats7"), String.valueOf(MySQL.getallwithoutwhere("user", "id").size()), true)
36-
.addField(msg.getString("usercommands.stats.stats8"), String.valueOf(MySQL.getallwithoutwhere("server", "id").size()), true)
32+
.addField(MessageHandler.get("usercommands.stats.stats1",user,guild), MySQL.get1("stats", "1", "command"),true)
33+
.addField(MessageHandler.get("usercommands.stats.stats2",user,guild), MySQL.get1("stats", "1", "message"),true)
34+
.addField(MessageHandler.get("usercommands.stats.stats3",user,guild), String.valueOf(Main.shardManager.getGuilds().size()), true)
35+
.addField(MessageHandler.get("usercommands.stats.stats4",user,guild),String.valueOf(User), true)
36+
.addField(MessageHandler.get("usercommands.stats.stats5",user,guild), String.valueOf(event.getJDA().getRegisteredListeners().size()), true)
37+
.addField(MessageHandler.get("usercommands.stats.stats6",user,guild), String.valueOf(commandHandler.commands.size()), true)
38+
.addField(MessageHandler.get("usercommands.stats.stats7",user,guild), String.valueOf(MySQL.getallwithoutwhere("user", "id").size()), true)
39+
.addField(MessageHandler.get("usercommands.stats.stats8",user,guild), String.valueOf(MySQL.getallwithoutwhere("server", "id").size()), true)
3740
.setThumbnail(event.getJDA().getSelfUser().getEffectiveAvatarUrl())
3841
.build()
3942
).queue();

0 commit comments

Comments
 (0)