greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Bug fixes and improvements

Browse source
This commit is contained in:
GregTCLTK 2019-12-28 15:22:03 +01:00
parent 1eb970fca4
commit 50163ca1b0
No known key found for this signature in database
GPG key ID: A91BADE5C070FF67
5 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/bbn/hadder/audio/AudioManager.java
View file

@ -138,7 +138,6 @@ public class AudioManager {
public void forceSkipTrack(CommandEvent event) { public void forceSkipTrack(CommandEvent event) {
getPlayer(event.getGuild()).stopTrack(); getPlayer(event.getGuild()).stopTrack();
event.getTextChannel().sendMessage("Skipped boyy :D").queue();
} }
public String getTimestamp(long milis) { public String getTimestamp(long milis) {

4
src/main/java/com/bbn/hadder/commands/music/QueueCommand.java
View file

@ -26,7 +26,9 @@ public class QueueCommand implements Command {
for (AudioInfo g : queue) { for (AudioInfo g : queue) {
builder.append("**").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n"); builder.append("**").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n");
} }
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.queue.success.title", "", "commands.music.queue.success.description", builder.toString()).build()).queue(); event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.queue.success.title", "",
"commands.music.queue.success.description", builder.toString()).build()).queue();
} }
} }

2
src/main/java/com/bbn/hadder/commands/music/SkipCommand.java
View file

@ -12,7 +12,7 @@ public class SkipCommand implements Command {
@Override @Override
public void executed(String[] args, CommandEvent event) { public void executed(String[] args, CommandEvent event) {
if (!event.getAudioManager().hasPlayer(event.getGuild()) || event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() == null) { if (event.getAudioManager().hasPlayer(event.getGuild()) && !event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) {
event.getAudioManager().forceSkipTrack(event); event.getAudioManager().forceSkipTrack(event);
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.skip.success.title", "commands.music.skip.success.title",

2
src/main/java/com/bbn/hadder/commands/music/StopCommand.java
View file

@ -12,7 +12,7 @@ public class StopCommand implements Command {
@Override @Override
public void executed(String[] args, CommandEvent event) { public void executed(String[] args, CommandEvent event) {
if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() == null) { if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) {
event.getAudioManager().players.remove(event.getGuild().getId()); event.getAudioManager().players.remove(event.getGuild().getId());
event.getAudioManager().getPlayer(event.getGuild()).destroy(); event.getAudioManager().getPlayer(event.getGuild()).destroy();
event.getAudioManager().getTrackManager(event.getGuild()).purgeQueue(); event.getAudioManager().getTrackManager(event.getGuild()).purgeQueue();

20
src/main/java/com/bbn/hadder/utils/MessageEditor.java
View file

@ -24,21 +24,21 @@ public class MessageEditor {
return this.getMessage(type, "", "", "", "", "", ""); return this.getMessage(type, "", "", "", "", "", "");
} }
public EmbedBuilder getMessage(MessageType type, String title_language_string, String description_language_string) { public EmbedBuilder getMessage(MessageType type, String title, String description) {
return this.getMessage(type, title_language_string, "", "", description_language_string, "", ""); return this.getMessage(type, title, "", "", description, "", "");
} }
public EmbedBuilder getMessage(MessageType type, String title_language_string, String title_extra, public EmbedBuilder getMessage(MessageType type, String title, String title_extra,
String description_language_string, String description_extra) { String description, String description_extra) {
return this.getMessage(type, title_language_string, title_extra, "", description_language_string, description_extra, ""); return this.getMessage(type, title, title_extra, "", description, description_extra, "");
} }
public EmbedBuilder getMessage(MessageType type, String title_language_string, String title_extra, String title_extra_two, public EmbedBuilder getMessage(MessageType type, String title, String title_extra, String title_extra_two,
String description_language_string, String description_extra, String description_extra_two) { String description, String description_extra, String description_extra_two) {
String language = (this.user!=null) ? rethink.getLanguage(this.user.getId()) : null; String language = (this.user!=null) ? rethink.getLanguage(this.user.getId()) : null;
EmbedBuilder eb = this.getDefaultSettings(type); EmbedBuilder eb = this.getDefaultSettings(type);
if (!title_language_string.equals("")) eb.setTitle(this.handle(language, title_language_string, title_extra, title_extra_two)); if (!title.equals("")) eb.setTitle(this.handle(language, title, title_extra, title_extra_two));
if (!description_language_string.equals("")) eb.setDescription(this.handle(language, description_language_string, description_extra, description_extra_two)); if (!description.equals("")) eb.setDescription(this.handle(language, description, description_extra, description_extra_two));
return eb; return eb;
} }
@ -122,7 +122,7 @@ public class MessageEditor {
Locale locale = new Locale(language_code); Locale locale = new Locale(language_code);
ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale); ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale);
if (resourceBundle.containsKey(string)) if (resourceBundle.containsKey(string))
return resourceBundle.getString(string).replaceAll("%prefix%", "h.").replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two); return resourceBundle.getString(string).replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two);
else return "This key doesn't exist. Please report this to the Bot Developers. Key: " + string + " Language_code: " + language_code; else return "This key doesn't exist. Please report this to the Bot Developers. Key: " + string + " Language_code: " + language_code;
} }
} }