LinwoodDev · CodeDoctorDE · Aug 14, 2020 · Aug 14, 2020 · Aug 14, 2020 · Aug 14, 2020
diff --git a/README.md b/README.md
@@ -23,6 +23,19 @@ Java bot with many features. Developed by @CodeDoctorDE (Discord: CodeDoctor#871
 ### What is it?
 Guess what word the writer has chosen. This is a turn based game. Every player can join in.
 
+# Contributing
+
+To contribute, fork this repository and create a pull request. If you want you can also join my discord. If you contribute more, you can get the contributor role.
+
+## Branches
+
+Name | Description
+--- | ---
+feature/* | Every new feature will developed here
+hotfix/* | Fixing bugs will be developed here
+master | Every feature and hotfix will be merged here 
+stable | Stable changes will be merged here
+
 # Current servers
 You can visit my bot on this servers:
 * [KniffelGames](https://discord.gg/J7EUgvN)

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.codedoctorde</groupId>
     <artifactId>linwood</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <properties>
         <java.version>11</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/com/github/codedoctorde/linwood/apps/single/game/mode/tictactoe/TicTacToe.java b/src/main/java/com/github/codedoctorde/linwood/apps/single/game/mode/tictactoe/TicTacToe.java
@@ -57,8 +57,8 @@ public void start(SingleApplication app) {
         var bundle = getBundle(session);
         Category finalCategory = category;
         ChannelAction<TextChannel> action;
-        action = finalCategory == null ?game.getGuild().createTextChannel(MessageFormat.format(bundle.getString("TextChannel"),game.getId())):
-                finalCategory.createTextChannel(MessageFormat.format(bundle.getString("TextChannel"),game.getId()));
+        action = finalCategory == null ?game.getGuild().createTextChannel(String.format(bundle.getString("TextChannel"),game.getId())):
+                finalCategory.createTextChannel(String.format(bundle.getString("TextChannel"),game.getId()));
         session.close();
         action.queue((textChannel -> {
             this.textChannelId = textChannel.getIdLong();

diff --git a/src/main/java/com/github/codedoctorde/linwood/apps/single/game/mode/whatisit/WhatIsIt.java b/src/main/java/com/github/codedoctorde/linwood/apps/single/game/mode/whatisit/WhatIsIt.java
@@ -46,16 +46,12 @@ public void start(SingleApplication app) {
         var guild = GuildEntity.get(session, game.getGuildId());
         Category category = null;
         if(guild.getGameEntity().getGameCategoryId() != null)
-        category = guild.getGameEntity().getGameCategory();
+            category = guild.getGameEntity().getGameCategory();
         var bundle = getBundle(session);
         Category finalCategory = category;
-        ChannelAction<TextChannel> action;
-        if(finalCategory == null)
-            action = game.getGuild().createTextChannel(MessageFormat.format(bundle.getString("TextChannel"),game.getId()));
-        else
-            action = finalCategory.createTextChannel(MessageFormat.format(bundle.getString("TextChannel"),game.getId()));
         session.close();
-        action.queue((textChannel -> {
+        ((finalCategory == null)?game.getGuild().createTextChannel(String.format(bundle.getString("TextChannel"),game.getId())):
+                finalCategory.createTextChannel(String.format(bundle.getString("TextChannel"),game.getId()))).queue((textChannel -> {
             this.textChannelId = textChannel.getIdLong();
             if(finalCategory != null)
                 textChannel.getManager().setParent(finalCategory).queue();
@@ -84,10 +80,10 @@ public void chooseNextPlayer(){
         var session = Linwood.getInstance().getDatabase().getSessionFactory().openSession();
         var bundle = getBundle(session);
         sendLeaderboard(session);
-        getTextChannel().sendMessage(MessageFormat.format(bundle.getString("Next"), currentRound + 1)).queue(message -> {
+        getTextChannel().sendMessageFormat(bundle.getString("Next"), currentRound + 1).queue(message -> {
             wantWriterMessageId = message.getIdLong();
             message.addReaction("\uD83D\uDD90️").queue(aVoid ->
-                message.addReaction("⛔").queue());
+                    message.addReaction("⛔").queue());
             stopTimer();
             timer.schedule(new TimerTask() {
                 @Override
@@ -117,7 +113,7 @@ public void nextRound(Session session, long writerId){
         var bundle = getBundle(session);
         game.getGuild().retrieveMemberById(writerId).queue(member -> {
             var session1 = Linwood.getInstance().getDatabase().getSessionFactory().openSession();
-            getTextChannel().sendMessage(MessageFormat.format(bundle.getString("Round"), member.getAsMention())).queue();
+            getTextChannel().sendMessageFormat(bundle.getString("Round"), member.getAsMention()).queue();
             sendLeaderboard(session1);
             session1.close();
             round.inputWriter();
@@ -164,7 +160,7 @@ public void finishRound(){
             wantWriter.clear();
             if(currentRound >= maxRounds) finishGame();
             else
-            chooseNextPlayer();
+                chooseNextPlayer();
             session.close();
         });
     }
@@ -182,16 +178,16 @@ private void sendLeaderboard(ResourceBundle bundle, TextChannel textChannel){
         var leaderboard = getLeaderboard();
         if(textChannel == null)
             return;
-            textChannel.getGuild().retrieveMembersByIds(leaderboard.stream().map(Map.Entry::getKey).collect(Collectors.toList())).onSuccess(members -> {
-                StringBuilder stringBuilder = new StringBuilder();
-                for (int i = 0; i < members.size(); i++) {
-                    var member = members.get(i);
-                    if (member != null)
-                        stringBuilder.append(MessageFormat.format(bundle.getString("Leaderboard"), i + 1,
-                                member.getAsMention(), leaderboard.get(i).getValue()));
-                }
-                textChannel.sendMessage(new EmbedBuilder().setTitle(bundle.getString("LeaderboardHeader")).setDescription(stringBuilder.toString()).setFooter(bundle.getString("LeaderboardFooter")).build()).queue();
-            });
+        textChannel.getGuild().retrieveMembersByIds(leaderboard.stream().map(Map.Entry::getKey).collect(Collectors.toList())).onSuccess(members -> {
+            StringBuilder stringBuilder = new StringBuilder();
+            for (int i = 0; i < members.size(); i++) {
+                var member = members.get(i);
+                if (member != null)
+                    stringBuilder.append(String.format(bundle.getString("Leaderboard"), i + 1,
+                            member.getAsMention(), leaderboard.get(i).getValue()));
+            }
+            textChannel.sendMessage(new EmbedBuilder().setTitle(bundle.getString("LeaderboardHeader")).setDescription(stringBuilder.toString()).setFooter(bundle.getString("LeaderboardFooter")).build()).queue();
+        });
     }
 
     private ArrayList<Map.Entry<Long, Integer>> getLeaderboard() {
@@ -251,12 +247,12 @@ public boolean wantWriter(Session session, Member member) {
         if(getRound() != null)
             return false;
         wantWriter.add(member.getIdLong());
-        getTextChannel().sendMessage(MessageFormat.format(getBundle(session).getString("Join"), member.getUser().getAsMention())).queue();
+        getTextChannel().sendMessageFormat(getBundle(session).getString("Join"), member.getUser().getAsMention()).queue();
         return true;
     }
 
     public void removeWriter(Session session, Member member) {
         wantWriter.remove(member.getIdLong());
-        getTextChannel().sendMessage(MessageFormat.format(getBundle(session).getString("Leave"), member.getUser().getAsMention())).queue();
+        getTextChannel().sendMessageFormat(getBundle(session).getString("Leave"), member.getUser().getAsMention()).queue();
     }
 }
diff --git a/...n/java/com/github/codedoctorde/linwood/apps/single/game/mode/whatisit/WhatIsItEvents.java b/...n/java/com/github/codedoctorde/linwood/apps/single/game/mode/whatisit/WhatIsItEvents.java
@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
+import net.dv8tion.jda.api.exceptions.PermissionException;
 import net.dv8tion.jda.api.hooks.SubscribeEvent;
 
 import java.text.MessageFormat;
@@ -21,17 +22,17 @@ public WhatIsItEvents(WhatIsIt whatIsIt){
     }
     @SubscribeEvent
     public void onGuess(MessageReceivedEvent event){
-        try {
+        try{
             if (event.getChannel().getIdLong() != whatIsIt.getTextChannelId() || event.getMember() == null)
-                ;
+                return;
             var session = Linwood.getInstance().getDatabase().getSessionFactory().openSession();
             var message = event.getMessage();
             if (whatIsIt.getTextChannelId() == message.getTextChannel().getIdLong()){
                 var round = whatIsIt.getRound();
                 if (round != null && round.getWord() != null && message.getContentStripped().toLowerCase().contains(round.getWord().toLowerCase())) {
                     message.delete().queue();
                     if (!round.isGuesser(event.getMember()) && message.getAuthor().getIdLong() != round.getWriterId())
-                        event.getChannel().sendMessage(MessageFormat.format(whatIsIt.getBundle(session).getString("Guess"), event.getAuthor().getName(), round.guessCorrectly(event.getMember()))).queue(message1 -> {
+                        event.getChannel().sendMessageFormat(whatIsIt.getBundle(session).getString("Guess"), event.getAuthor().getName(), round.guessCorrectly(event.getMember())).queue(message1 -> {
                             var session1 = Linwood.getInstance().getDatabase().getSessionFactory().openSession();
                             round.checkEverybody(session1);
                             session1.close();
@@ -40,6 +41,9 @@ public void onGuess(MessageReceivedEvent event){
             }
             session.close();
         }
+        catch(PermissionException e){
+            e.printStackTrace();
+        }
         catch(Exception e){
             e.printStackTrace();
             Sentry.capture(e);
@@ -51,6 +55,9 @@ public void onWord(MessageReceivedEvent event) {
             if (event.getChannelType() == ChannelType.PRIVATE && whatIsIt.getRound() != null && whatIsIt.getRound().getWriterId() == event.getAuthor().getIdLong() && whatIsIt.getRound().getWord() == null)
                 whatIsIt.getRound().startRound(event.getMessage().getContentStripped());
         }
+        catch(PermissionException e){
+            e.printStackTrace();
+        }
         catch(Exception e){
             e.printStackTrace();
             Sentry.capture(e);
@@ -83,6 +90,9 @@ public void onJoin(MessageReactionAddEvent event){
                 session.close();
             });
         }
+        catch(PermissionException e){
+            e.printStackTrace();
+        }
         catch(Exception e){
             e.printStackTrace();
             Sentry.capture(e);
@@ -99,6 +109,9 @@ public void onLeave(MessageReactionRemoveEvent event){
                 session.close();
             });
         }
+        catch(PermissionException e){
+            e.printStackTrace();
+        }
         catch(Exception e){
             e.printStackTrace();
             Sentry.capture(e);

diff --git a/...in/java/com/github/codedoctorde/linwood/apps/single/game/mode/whatisit/WhatIsItRound.java b/...in/java/com/github/codedoctorde/linwood/apps/single/game/mode/whatisit/WhatIsItRound.java
@@ -72,7 +72,7 @@ public void run() {
                     String message = null;
                     switch (time) {
                         case 120:
-                            message = MessageFormat.format(bundle.getString("CountdownMinutes"), time / 60);
+                            message = String.format(bundle.getString("CountdownMinutes"), time / 60);
                             break;
                         case 60:
                             message = bundle.getString("CountdownMinute");
@@ -84,7 +84,7 @@ public void run() {
                         case 4:
                         case 3:
                         case 2:
-                            message = MessageFormat.format(bundle.getString("CountdownSeconds"), time);
+                            message = String.format(bundle.getString("CountdownSeconds"), time);
                             break;
                         case 1:
                             message = bundle.getString("CountdownSecond");
@@ -101,7 +101,7 @@ public void stopRound(){
         var session = Linwood.getInstance().getDatabase().getSessionFactory().openSession();
         var bundle = whatIsIt.getBundle(session);
         if(word != null)
-        whatIsIt.getTextChannel().sendMessage(MessageFormat.format(bundle.getString("Word"), word)).queue();
+        whatIsIt.getTextChannel().sendMessageFormat(bundle.getString("Word"), word).queue();
         stopTimer();
         session.close();
     }

diff --git a/src/main/java/com/github/codedoctorde/linwood/commands/ClearCommand.java b/src/main/java/com/github/codedoctorde/linwood/commands/ClearCommand.java
@@ -33,7 +33,7 @@ public boolean onCommand(Session session, Message message, GuildEntity entity, S
             message.getChannel().sendMessage(bundle.getString("Between")).queue();
         message.getChannel().getHistory().retrievePast(count).queue(messages -> {
             messages.forEach(deleteMessage -> deleteMessage.delete().queue());
-            message.getChannel().sendMessage(MessageFormat.format(bundle.getString("Success"), messages.size())).queue();
+            message.getChannel().sendMessageFormat(bundle.getString("Success"), messages.size()).queue();
         });
         return true;
     }

diff --git a/src/main/java/com/github/codedoctorde/linwood/commands/CommandManager.java b/src/main/java/com/github/codedoctorde/linwood/commands/CommandManager.java
@@ -27,7 +27,7 @@ public boolean onCommand(Session session, Message message, GuildEntity entity, S
                     if (!command.onCommand(session, message, entity,
                             (args.length > 0) ? args[0] : "",
                             (args.length > 0) ? Arrays.copyOfRange(args, 1, args.length) : new String[0]))
-                        message.getChannel().sendMessage(MessageFormat.format(ResourceBundle.getBundle("locale.Command").getString("Syntax"), Objects.requireNonNull(command.getBundle(entity)).getString("Syntax"))).queue();
+                        message.getChannel().sendMessageFormat(ResourceBundle.getBundle("locale.Command").getString("Syntax"), Objects.requireNonNull(command.getBundle(entity)).getString("Syntax")).queue();
                 }
                 else
                     message.getChannel().sendMessage(baseBundle.getString("NoPermission")).queue();

diff --git a/src/main/java/com/github/codedoctorde/linwood/commands/InfoCommand.java b/src/main/java/com/github/codedoctorde/linwood/commands/InfoCommand.java
@@ -36,7 +36,7 @@ public String infoFormat(Message message, GuildEntity entity, String text){
         long hour = (uptime / (1000 * 60 * 60)) % 24;
         long days = (uptime / (1000 * 60 * 24));
         var prefixes = String.join(", ", entity.getPrefixes());
-        return MessageFormat.format(text, Linwood.getInstance().getVersion(), message.getAuthor().getAsMention(), prefixes.isBlank()? " ": prefixes,
+        return String.format(text, Linwood.getInstance().getVersion(), message.getAuthor().getAsMention(), prefixes.isBlank()? " ": prefixes,
                 days, hour, minute, second, millis, Linwood.getInstance().getConfig().getSupportURL());
     }
 

diff --git a/src/main/java/com/github/codedoctorde/linwood/commands/PlanCommand.java b/src/main/java/com/github/codedoctorde/linwood/commands/PlanCommand.java
@@ -24,7 +24,7 @@ public boolean onCommand(Session session, Message message, GuildEntity entity, S
         var bundle = getBundle(entity);
         message.getChannel().sendMessage(new EmbedBuilder()
                 .addField(bundle.getString("Plan"), bundle.getString("Plan" + entity.getPlan().name()), false)
-                .addField(bundle.getString("PrefixLimitTitle"), MessageFormat.format(bundle.getString("PrefixLimitBody"), entity.getPlan().getPrefixLimit()), false)
+                .addField(bundle.getString("PrefixLimitTitle"), String.format(bundle.getString("PrefixLimitBody"), entity.getPlan().getPrefixLimit()), false)
                 .build()).queue();
         return true;
     }

diff --git a/src/main/java/com/github/codedoctorde/linwood/commands/fun/DiceCommand.java b/src/main/java/com/github/codedoctorde/linwood/commands/fun/DiceCommand.java
@@ -20,7 +20,7 @@ public boolean onCommand(Session session, Message message, GuildEntity entity, S
         if(args.length > 0)
             return false;
         var bundle = getBundle(entity);
-        message.getChannel().sendMessage(MessageFormat.format(bundle.getString("Output"), random.nextInt(5) + 1)).queue();
+        message.getChannel().sendMessageFormat(bundle.getString("Output"), random.nextInt(5) + 1).queue();
         return true;
     }
 

diff --git a/src/main/java/com/github/codedoctorde/linwood/commands/karma/KarmaLeaderboardCommand.java b/src/main/java/com/github/codedoctorde/linwood/commands/karma/KarmaLeaderboardCommand.java
@@ -28,10 +28,10 @@ public boolean onCommand(Session session, Message message, GuildEntity entity, S
         var leaderboard = Linwood.getInstance().getDatabase().getKarmaLeaderboard(session, message.getGuild().getIdLong());
         message.getGuild().retrieveMembersByIds(Arrays.stream(leaderboard).map(MemberEntity::getMemberId).collect(Collectors.toList())).onSuccess(members -> {
             var description = new StringBuilder();
-            description.append(bundle.getString("LeaderboardBodyStart"));
+            description.append(bundle.getString("LeaderboardBodyStart") + "\n");
             for (int i = 0; i < members.size(); i++) {
                 var member = members.get(i);
-                description.append(MessageFormat.format(bundle.getString("LeaderboardBody"), i, member.getUser().getAsMention(), leaderboard[i].getLikes() - leaderboard[i].getDislikes(),
+                description.append(String.format(bundle.getString("LeaderboardBody"), i + 1, member.getUser().getAsMention(), leaderboard[i].getLikes() - leaderboard[i].getDislikes(),
                         leaderboard[i].getLikes(), leaderboard[i].getDislikes()));
             }
             description.append(bundle.getString("LeaderboardBodyEnd"));
@@ -55,6 +55,6 @@ public boolean onCommand(Session session, Message message, GuildEntity entity, S
 
     @Override
     public @NotNull ResourceBundle getBundle(GuildEntity entity) {
-        return ResourceBundle.getBundle("locale.commands.karma.Leaderbaord");
+        return ResourceBundle.getBundle("locale.commands.karma.Leaderboard");
     }
 }
diff --git a/...main/java/com/github/codedoctorde/linwood/commands/settings/game/GameCategoryCommand.java b/...main/java/com/github/codedoctorde/linwood/commands/settings/game/GameCategoryCommand.java
@@ -26,7 +26,7 @@ public boolean onCommand(Session session, Message message, GuildEntity entity, S
             return false;
         if(args.length == 0)
             if(entity.getGameEntity().getGameCategoryId() != null)
-                message.getChannel().sendMessage(MessageFormat.format(bundle.getString("Get"), entity.getGameEntity().getGameCategory().getName(), entity.getGameEntity().getGameCategoryId())).queue();
+                message.getChannel().sendMessageFormat(bundle.getString("Get"), entity.getGameEntity().getGameCategory().getName(), entity.getGameEntity().getGameCategoryId()).queue();
             else
                 message.getChannel().sendMessage(bundle.getString("GetNull")).queue();
         else {
@@ -50,7 +50,7 @@ else if(categories.size() > 1)
                 }
                 entity.getGameEntity().setGameCategory(category);
                 entity.save(session);
-                message.getChannel().sendMessage(MessageFormat.format(bundle.getString("Set"), entity.getGameEntity().getGameCategory().getName(), entity.getGameEntity().getGameCategoryId())).queue();
+                message.getChannel().sendMessageFormat(bundle.getString("Set"), entity.getGameEntity().getGameCategory().getName(), entity.getGameEntity().getGameCategoryId()).queue();
             }catch(NullPointerException e){
                 message.getChannel().sendMessage(bundle.getString("NotValid")).queue();
             }