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

Commit bdf4a2a

Browse files
CodeDoctorDECodeDoctorDE
authored
Merge pull request #19 from CodeDoctorDE/feature/format
Feature/format
2 parents 33a4636 + e256abd commit bdf4a2a

File tree

65 files changed

+155
-158
lines changed

Some content is hidden

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

65 files changed

+155
-158
lines changed

‎src/main/java/com/github/codedoctorde/linwood/apps/single/game/mode/tictactoe/TicTacToe.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public void start(SingleApplication app) {
5757
var bundle = getBundle(session);
5858
Category finalCategory = category;
5959
ChannelAction<TextChannel> action;
60-
action = finalCategory == null ?game.getGuild().createTextChannel(MessageFormat.format(bundle.getString("TextChannel"),game.getId())):
61-
finalCategory.createTextChannel(MessageFormat.format(bundle.getString("TextChannel"),game.getId()));
60+
action = finalCategory == null ?game.getGuild().createTextChannel(String.format(bundle.getString("TextChannel"),game.getId())):
61+
finalCategory.createTextChannel(String.format(bundle.getString("TextChannel"),game.getId()));
6262
session.close();
6363
action.queue((textChannel -> {
6464
this.textChannelId = textChannel.getIdLong();

‎src/main/java/com/github/codedoctorde/linwood/apps/single/game/mode/whatisit/WhatIsIt.java‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,12 @@ public void start(SingleApplication app) {
4646
var guild = GuildEntity.get(session, game.getGuildId());
4747
Category category = null;
4848
if(guild.getGameEntity().getGameCategoryId() != null)
49-
category = guild.getGameEntity().getGameCategory();
49+
category = guild.getGameEntity().getGameCategory();
5050
var bundle = getBundle(session);
5151
Category finalCategory = category;
52-
ChannelAction<TextChannel> action;
53-
if(finalCategory == null)
54-
action = game.getGuild().createTextChannel(MessageFormat.format(bundle.getString("TextChannel"),game.getId()));
55-
else
56-
action = finalCategory.createTextChannel(MessageFormat.format(bundle.getString("TextChannel"),game.getId()));
5752
session.close();
58-
action.queue((textChannel -> {
53+
((finalCategory == null)?game.getGuild().createTextChannel(String.format(bundle.getString("TextChannel"),game.getId())):
54+
finalCategory.createTextChannel(String.format(bundle.getString("TextChannel"),game.getId()))).queue((textChannel -> {
5955
this.textChannelId = textChannel.getIdLong();
6056
if(finalCategory != null)
6157
textChannel.getManager().setParent(finalCategory).queue();
@@ -84,10 +80,10 @@ public void chooseNextPlayer(){
8480
var session = Linwood.getInstance().getDatabase().getSessionFactory().openSession();
8581
var bundle = getBundle(session);
8682
sendLeaderboard(session);
87-
getTextChannel().sendMessage(MessageFormat.format(bundle.getString("Next"), currentRound + 1)).queue(message -> {
83+
getTextChannel().sendMessageFormat(bundle.getString("Next"), currentRound + 1).queue(message -> {
8884
wantWriterMessageId = message.getIdLong();
8985
message.addReaction("\uD83D\uDD90️").queue(aVoid ->
90-
message.addReaction("⛔").queue());
86+
message.addReaction("⛔").queue());
9187
stopTimer();
9288
timer.schedule(new TimerTask() {
9389
@Override
@@ -117,7 +113,7 @@ public void nextRound(Session session, long writerId){
117113
var bundle = getBundle(session);
118114
game.getGuild().retrieveMemberById(writerId).queue(member -> {
119115
var session1 = Linwood.getInstance().getDatabase().getSessionFactory().openSession();
120-
getTextChannel().sendMessage(MessageFormat.format(bundle.getString("Round"), member.getAsMention())).queue();
116+
getTextChannel().sendMessageFormat(bundle.getString("Round"), member.getAsMention()).queue();
121117
sendLeaderboard(session1);
122118
session1.close();
123119
round.inputWriter();
@@ -164,7 +160,7 @@ public void finishRound(){
164160
wantWriter.clear();
165161
if(currentRound >= maxRounds) finishGame();
166162
else
167-
chooseNextPlayer();
163+
chooseNextPlayer();
168164
session.close();
169165
});
170166
}
@@ -182,16 +178,16 @@ private void sendLeaderboard(ResourceBundle bundle, TextChannel textChannel){
182178
var leaderboard = getLeaderboard();
183179
if(textChannel == null)
184180
return;
185-
textChannel.getGuild().retrieveMembersByIds(leaderboard.stream().map(Map.Entry::getKey).collect(Collectors.toList())).onSuccess(members -> {
186-
StringBuilder stringBuilder = new StringBuilder();
187-
for (int i = 0; i < members.size(); i++) {
188-
var member = members.get(i);
189-
if (member != null)
190-
stringBuilder.append(MessageFormat.format(bundle.getString("Leaderboard"), i + 1,
191-
member.getAsMention(), leaderboard.get(i).getValue()));
192-
}
193-
textChannel.sendMessage(new EmbedBuilder().setTitle(bundle.getString("LeaderboardHeader")).setDescription(stringBuilder.toString()).setFooter(bundle.getString("LeaderboardFooter")).build()).queue();
194-
});
181+
textChannel.getGuild().retrieveMembersByIds(leaderboard.stream().map(Map.Entry::getKey).collect(Collectors.toList())).onSuccess(members -> {
182+
StringBuilder stringBuilder = new StringBuilder();
183+
for (int i = 0; i < members.size(); i++) {
184+
var member = members.get(i);
185+
if (member != null)
186+
stringBuilder.append(String.format(bundle.getString("Leaderboard"), i + 1,
187+
member.getAsMention(), leaderboard.get(i).getValue()));
188+
}
189+
textChannel.sendMessage(new EmbedBuilder().setTitle(bundle.getString("LeaderboardHeader")).setDescription(stringBuilder.toString()).setFooter(bundle.getString("LeaderboardFooter")).build()).queue();
190+
});
195191
}
196192

197193
private ArrayList<Map.Entry<Long, Integer>> getLeaderboard() {
@@ -251,12 +247,12 @@ public boolean wantWriter(Session session, Member member) {
251247
if(getRound() != null)
252248
return false;
253249
wantWriter.add(member.getIdLong());
254-
getTextChannel().sendMessage(MessageFormat.format(getBundle(session).getString("Join"), member.getUser().getAsMention())).queue();
250+
getTextChannel().sendMessageFormat(getBundle(session).getString("Join"), member.getUser().getAsMention()).queue();
255251
return true;
256252
}
257253

258254
public void removeWriter(Session session, Member member) {
259255
wantWriter.remove(member.getIdLong());
260-
getTextChannel().sendMessage(MessageFormat.format(getBundle(session).getString("Leave"), member.getUser().getAsMention())).queue();
256+
getTextChannel().sendMessageFormat(getBundle(session).getString("Leave"), member.getUser().getAsMention()).queue();
261257
}
262258
}

‎src/main/java/com/github/codedoctorde/linwood/apps/single/game/mode/whatisit/WhatIsItEvents.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ public WhatIsItEvents(WhatIsIt whatIsIt){
2222
}
2323
@SubscribeEvent
2424
public void onGuess(MessageReceivedEvent event){
25-
try {
25+
try{
2626
if (event.getChannel().getIdLong() != whatIsIt.getTextChannelId() || event.getMember() == null)
27-
;
27+
return;
2828
var session = Linwood.getInstance().getDatabase().getSessionFactory().openSession();
2929
var message = event.getMessage();
3030
if (whatIsIt.getTextChannelId() == message.getTextChannel().getIdLong()){
3131
var round = whatIsIt.getRound();
3232
if (round != null && round.getWord() != null && message.getContentStripped().toLowerCase().contains(round.getWord().toLowerCase())) {
3333
message.delete().queue();
3434
if (!round.isGuesser(event.getMember()) && message.getAuthor().getIdLong() != round.getWriterId())
35-
event.getChannel().sendMessage(MessageFormat.format(whatIsIt.getBundle(session).getString("Guess"), event.getAuthor().getName(), round.guessCorrectly(event.getMember()))).queue(message1 -> {
35+
event.getChannel().sendMessageFormat(whatIsIt.getBundle(session).getString("Guess"), event.getAuthor().getName(), round.guessCorrectly(event.getMember())).queue(message1 -> {
3636
var session1 = Linwood.getInstance().getDatabase().getSessionFactory().openSession();
3737
round.checkEverybody(session1);
3838
session1.close();

‎src/main/java/com/github/codedoctorde/linwood/apps/single/game/mode/whatisit/WhatIsItRound.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void run() {
7272
String message = null;
7373
switch (time) {
7474
case 120:
75-
message = MessageFormat.format(bundle.getString("CountdownMinutes"), time / 60);
75+
message = String.format(bundle.getString("CountdownMinutes"), time / 60);
7676
break;
7777
case 60:
7878
message = bundle.getString("CountdownMinute");
@@ -84,7 +84,7 @@ public void run() {
8484
case 4:
8585
case 3:
8686
case 2:
87-
message = MessageFormat.format(bundle.getString("CountdownSeconds"), time);
87+
message = String.format(bundle.getString("CountdownSeconds"), time);
8888
break;
8989
case 1:
9090
message = bundle.getString("CountdownSecond");
@@ -101,7 +101,7 @@ public void stopRound(){
101101
var session = Linwood.getInstance().getDatabase().getSessionFactory().openSession();
102102
var bundle = whatIsIt.getBundle(session);
103103
if(word != null)
104-
whatIsIt.getTextChannel().sendMessage(MessageFormat.format(bundle.getString("Word"), word)).queue();
104+
whatIsIt.getTextChannel().sendMessageFormat(bundle.getString("Word"), word).queue();
105105
stopTimer();
106106
session.close();
107107
}

‎src/main/java/com/github/codedoctorde/linwood/commands/ClearCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public boolean onCommand(Session session, Message message, GuildEntity entity, S
3333
message.getChannel().sendMessage(bundle.getString("Between")).queue();
3434
message.getChannel().getHistory().retrievePast(count).queue(messages -> {
3535
messages.forEach(deleteMessage -> deleteMessage.delete().queue());
36-
message.getChannel().sendMessage(MessageFormat.format(bundle.getString("Success"), messages.size())).queue();
36+
message.getChannel().sendMessageFormat(bundle.getString("Success"), messages.size()).queue();
3737
});
3838
return true;
3939
}

‎src/main/java/com/github/codedoctorde/linwood/commands/CommandManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public boolean onCommand(Session session, Message message, GuildEntity entity, S
2727
if (!command.onCommand(session, message, entity,
2828
(args.length > 0) ? args[0] : "",
2929
(args.length > 0) ? Arrays.copyOfRange(args, 1, args.length) : new String[0]))
30-
message.getChannel().sendMessage(MessageFormat.format(ResourceBundle.getBundle("locale.Command").getString("Syntax"), Objects.requireNonNull(command.getBundle(entity)).getString("Syntax"))).queue();
30+
message.getChannel().sendMessageFormat(ResourceBundle.getBundle("locale.Command").getString("Syntax"), Objects.requireNonNull(command.getBundle(entity)).getString("Syntax")).queue();
3131
}
3232
else
3333
message.getChannel().sendMessage(baseBundle.getString("NoPermission")).queue();

‎src/main/java/com/github/codedoctorde/linwood/commands/InfoCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public String infoFormat(Message message, GuildEntity entity, String text){
3636
long hour = (uptime / (1000 * 60 * 60)) % 24;
3737
long days = (uptime / (1000 * 60 * 24));
3838
var prefixes = String.join(", ", entity.getPrefixes());
39-
return MessageFormat.format(text, Linwood.getInstance().getVersion(), message.getAuthor().getAsMention(), prefixes.isBlank()? " ": prefixes,
39+
return String.format(text, Linwood.getInstance().getVersion(), message.getAuthor().getAsMention(), prefixes.isBlank()? " ": prefixes,
4040
days, hour, minute, second, millis, Linwood.getInstance().getConfig().getSupportURL());
4141
}
4242

‎src/main/java/com/github/codedoctorde/linwood/commands/PlanCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public boolean onCommand(Session session, Message message, GuildEntity entity, S
2424
var bundle = getBundle(entity);
2525
message.getChannel().sendMessage(new EmbedBuilder()
2626
.addField(bundle.getString("Plan"), bundle.getString("Plan" + entity.getPlan().name()), false)
27-
.addField(bundle.getString("PrefixLimitTitle"), MessageFormat.format(bundle.getString("PrefixLimitBody"), entity.getPlan().getPrefixLimit()), false)
27+
.addField(bundle.getString("PrefixLimitTitle"), String.format(bundle.getString("PrefixLimitBody"), entity.getPlan().getPrefixLimit()), false)
2828
.build()).queue();
2929
return true;
3030
}

‎src/main/java/com/github/codedoctorde/linwood/commands/fun/DiceCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public boolean onCommand(Session session, Message message, GuildEntity entity, S
2020
if(args.length > 0)
2121
return false;
2222
var bundle = getBundle(entity);
23-
message.getChannel().sendMessage(MessageFormat.format(bundle.getString("Output"), random.nextInt(5) + 1)).queue();
23+
message.getChannel().sendMessageFormat(bundle.getString("Output"), random.nextInt(5) + 1).queue();
2424
return true;
2525
}
2626

‎src/main/java/com/github/codedoctorde/linwood/commands/karma/KarmaLeaderboardCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public boolean onCommand(Session session, Message message, GuildEntity entity, S
3131
description.append(bundle.getString("LeaderboardBodyStart"));
3232
for (int i = 0; i < members.size(); i++) {
3333
var member = members.get(i);
34-
description.append(MessageFormat.format(bundle.getString("LeaderboardBody"), i, member.getUser().getAsMention(), leaderboard[i].getLikes() - leaderboard[i].getDislikes(),
34+
description.append(String.format(bundle.getString("LeaderboardBody"), i, member.getUser().getAsMention(), leaderboard[i].getLikes() - leaderboard[i].getDislikes(),
3535
leaderboard[i].getLikes(), leaderboard[i].getDislikes()));
3636
}
3737
description.append(bundle.getString("LeaderboardBodyEnd"));

0 commit comments

Comments
 (0)