update und clean

build.gradle

@@ -1,25 +1,26 @@
 plugins {
     id'application'
-    id'com.github.johnrengelman.shadow' version '7.1.2'
+    id ('com.gradleup.shadow') version '8.3.0'
+    id 'java'
 }
 
 
 application.mainClass = "core.Main"
-group 'de.ocame'
+group = 'de.ocame'
-version '0.20'
+version = '0.20'
 
 repositories {
     mavenCentral()
 }
 
 //def jdaVersion = '3.8.3_460'
-def jdaVersion = '5.2.3'
+def jdaVersion = '5.6.1'
 
 
-apply plugin: 'java'
+java {
-
+    sourceCompatibility = '21'
-sourceCompatibility = '17'
+    targetCompatibility = '21'
-targetCompatibility = '17'
+}
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
@@ -34,6 +35,6 @@ dependencies {
     implementation 'org.json:json:20231013'
     implementation 'com.mysql:mysql-connector-j:9.2.0'
 
-    implementation "ch.qos.logback:logback-classic:1.5.6"
+    implementation 'ch.qos.logback:logback-classic:1.5.13'
 }
 

src/main/java/Earthdawn/dice.java

@@ -19,24 +19,24 @@ import java.util.concurrent.ThreadLocalRandom;
 
 public class dice extends ListenerAdapter {
 
-    private String prefixSr;
+    private final String prefixSr;
     private String prefixIni;
 
 
-    private language langDe = new language("de");
+    private final language langDe = new language("de");
-    private language langEn = new language("en");
+    private final language langEn = new language("en");
 
-    private help helpDe = new help("de");
+    private final help helpDe = new help("de");
-    private help helpEn = new help("En");
+    private final help helpEn = new help("En");
 
     private language activLang;
     private help activHelp;
 
-    private db_connect db;
+    private final db_connect db;
 
-    private Map<String, String> channelList = new HashMap<>();
+    private final Map<String, String> channelList = new HashMap<>();
 
-    private step dieRoll = new step();
+    private final step dieRoll = new step();
 
 
     public dice() {
@@ -68,7 +68,7 @@ public class dice extends ListenerAdapter {
 
         if(!channelList.containsKey(event.getChannel().getId())) {
             Map<String, String> Einstellungen = db.getChannelSettings(event.getChannel().getId());
-            channelList.put(event.getChannel().getId(), Einstellungen.get("lang").toString());
+            channelList.put(event.getChannel().getId(), Einstellungen.get("lang"));
         }
         switch (channelList.get(event.getChannel().getId())) {
             case "de":
@@ -82,7 +82,8 @@ public class dice extends ListenerAdapter {
 
         }
         User author = event.getAuthor();
-        if (!author.isBot() || true) {
+        author.isBot();
+        if (true) {
             if (event.getMessage().getContentRaw().startsWith(this.prefixSr))
                 this.srroll(event);
         }
@@ -127,17 +128,17 @@ public class dice extends ListenerAdapter {
             }
             for(int i = 0; i < 6; i++) {
                 float pro = verteilung[i]*100f/rounds;
-                test.addField(Integer.toString(i+1), Integer.toString(verteilung[i]) + " - " + String.format("%.2f", pro) + "%", true);
+                test.addField(Integer.toString(i+1), verteilung[i] + " - " + String.format("%.2f", pro) + "%", true);
             }
             test.addBlankField(false);
             for(int i = 0; i < 6; i++) {
                 float pro = verteilung2[i]*100f/rounds;
-                test.addField(Integer.toString(i+1), Integer.toString(verteilung2[i]) + " - " + String.format("%.2f", pro) + "%", true);
+                test.addField(Integer.toString(i+1), verteilung2[i] + " - " + String.format("%.2f", pro) + "%", true);
             }
             test.addBlankField(false);
             for(int i = 0; i < 6; i++) {
                 float pro = verteilung3[i]*100f/rounds;
-                test.addField(Integer.toString(i+1), Integer.toString(verteilung3[i]) + " - " + String.format("%.2f", pro) + "%", true);
+                test.addField(Integer.toString(i+1), verteilung3[i] + " - " + String.format("%.2f", pro) + "%", true);
             }
             event.getChannel().sendMessage(test.build().toString()).queue();
 
@@ -163,7 +164,7 @@ public class dice extends ListenerAdapter {
         int dice1;
         int numberOfDice = 1;
         int diceart = 6;
-        StringBuilder result = new StringBuilder("");
+        StringBuilder result = new StringBuilder();
 
         int hits = 0;
         boolean glitches = false;
@@ -421,7 +422,7 @@ public class dice extends ListenerAdapter {
                 break;
             default:
                 int w20 = 0;
-                w20 = (int) ((stufe-8)/11);
+                w20 = (stufe-8)/11;
                 switch ((stufe-8)%11) {
                     case 0:
                         dieRoll.setW20(w20).setW6(2);

src/main/java/Earthdawn/messageInterpreter.java

@@ -12,8 +12,8 @@ public class messageInterpreter {
     private Integer typ = 0;
     private Integer intResult = 0;
 
-    private language activLang;
+    private final language activLang;
-    private MessageReceivedEvent event;
+    private final MessageReceivedEvent event;
     boolean glitches = true;
 
     public Integer getDiceart() {
@@ -31,17 +31,11 @@ public class messageInterpreter {
 
 
     public boolean isNum() {
-        if(typ == 1) {
+        return typ == 1;
-            return  true;
-        }
-        return false;
     }
 
     public boolean isDice() {
-        if(typ == 2) {
+        return typ == 2;
-            return  true;
-        }
-        return false;
     }
     /**
      *
@@ -62,7 +56,7 @@ public class messageInterpreter {
         reset();
         Scanner sc = new Scanner(Input.trim());
 
-        StringBuilder resultString = new StringBuilder("");
+        StringBuilder resultString = new StringBuilder();
 
         Integer PartValue = 0;
 
@@ -72,7 +66,6 @@ public class messageInterpreter {
         if(sc.hasNextInt()) { // ist eine Zahl
             typ = 1;
             intResult = Integer.parseInt(Input.trim());
-            return;
         }
         else {
             String[] MalusParts= Input.trim().toLowerCase().replace(" ", "").split("\\-");

src/main/java/Earthdawn/step.java

@@ -22,7 +22,7 @@ public class step {
 
     private int modifier = 0;
 
-    StringBuilder resultStructur = new StringBuilder("");
+    StringBuilder resultStructur = new StringBuilder();
 
 
     public int getW4() {
@@ -184,13 +184,13 @@ public class step {
         diceStructur = "";
         diceResult = "";
         resultInt = 0;
-        resultStructur = new StringBuilder("");
+        resultStructur = new StringBuilder();
         return this;
     }
 
     public void roll() {
 
-        StringBuilder resultConstruction = new StringBuilder("");
+        StringBuilder resultConstruction = new StringBuilder();
 
         if(w4 > 0) {
             rollDice(w4, 4);

src/main/java/Engel/arcana.java

@@ -1,18 +1,18 @@
 package Engel;
 
 public class arcana {
-    private String name;
+    private final String name;
-    private String upsideMeaning;
+    private final String upsideMeaning;
-    private String upsideExplain;
+    private final String upsideExplain;
-    private String upsideText;
+    private final String upsideText;
-    private String downSideMeaning;
+    private final String downSideMeaning;
-    private String downSideExplain;
+    private final String downSideExplain;
-    private String downsideText;
+    private final String downsideText;
 
 
 
-    private String upsideNumber;
+    private final String upsideNumber;
-    private String downsideNumber;
+    private final String downsideNumber;
 
 
     public arcana(String name, String upsideMeaning, String upsideExplain, String upsideText, String upsideNumber, String downSideMeaning, String downSideExplain, String downsideText, String downsideNumber) {

src/main/java/Engel/arcanaList.java

@@ -15,7 +15,7 @@ public class arcanaList {
 
     private boolean side;
     private int stack;
-    private boolean[] usedCard;
+    private final boolean[] usedCard;
     private int activArcana;
 
     public boolean isLoF() {
@@ -43,7 +43,7 @@ public class arcanaList {
 
     public void draw() {
         EmbedBuilder outputBox = new EmbedBuilder();
-        StringBuilder resultConstruction = new StringBuilder("");
+        StringBuilder resultConstruction = new StringBuilder();
 
         if(stack < 1) {
             reset();
@@ -51,24 +51,16 @@ public class arcanaList {
         int draw = new Random().nextInt(stack);
         int j = 0;
         for(int i = 0; i < draw; i++, j++) { // hochzählen von Zieh coutner und Kartennummer
-            if (usedCard[j] == true) { // wenn die Karte schon benutzt wurde wird der counter um eines reduziert um die nächste frei Karte zu finden
+            if (usedCard[j]) { // wenn die Karte schon benutzt wurde wird der counter um eines reduziert um die nächste frei Karte zu finden
                 i--;
             }
         }
         stack--;
         int UpDown = new Random().nextInt(100);
-        if(UpDown % 2 == 0)
+        side = UpDown % 2 != 0;
-            side = false;
-        else
-            side = true;
 
         activArcana = j;
-        if(j == 15) {
+        LoF = j == 15;
-            LoF = true;
-        }
-        else {
-            LoF = false;
-        }
     }
 
     public String getName() {

src/main/java/Engel/dice.java

@@ -16,24 +16,24 @@ import java.util.Random;
 
 public class dice extends ListenerAdapter {
 
-    private String prefixEngel;
+    private final String prefixEngel;
-    private String prefixEngelShort;
+    private final String prefixEngelShort;
 
-    private language langDe = new language("de");
+    private final language langDe = new language("de");
-    private language langEn = new language("en");
+    private final language langEn = new language("en");
 
-    private help helpDe = new help("de");
+    private final help helpDe = new help("de");
-    private help helpEn = new help("En");
+    private final help helpEn = new help("En");
 
     private language activLang;
     private help activHelp;
 
     private arcanaList activArcanaList;
 
-    private db_connect db;
+    private final db_connect db;
 
-    private Map<String, String> channelList = new HashMap<>();
+    private final Map<String, String> channelList = new HashMap<>();
-    private Map<String, arcanaList> arcanaList = new HashMap<>();
+    private final Map<String, arcanaList> arcanaList = new HashMap<>();
 
 
     public dice() {
@@ -53,7 +53,7 @@ public class dice extends ListenerAdapter {
 
         if(!channelList.containsKey(event.getChannel().getId())) {
             Map<String, String> Einstellungen = db.getChannelSettings(event.getChannel().getId());
-            channelList.put(event.getChannel().getId(), Einstellungen.get("lang").toString());
+            channelList.put(event.getChannel().getId(), Einstellungen.get("lang"));
         }
         switch (channelList.get(event.getChannel().getId())) {
             case "de":
@@ -100,7 +100,7 @@ public class dice extends ListenerAdapter {
 
         EmbedBuilder outputBox = new EmbedBuilder();
 
-        StringBuilder result = new StringBuilder("");
+        StringBuilder result = new StringBuilder();
 
 
         try {

src/main/java/Keeproll/dice.java

@@ -17,22 +17,22 @@ import java.util.regex.Pattern;
 
 public class dice extends ListenerAdapter {
 
-    private String prefixlong;
+    private final String prefixlong;
-    private String prefixShort;
+    private final String prefixShort;
-    private String prefixVeryShort;
+    private final String prefixVeryShort;
 
-    private language langDe = new language("de");
+    private final language langDe = new language("de");
-    private language langEn = new language("en");
+    private final language langEn = new language("en");
 
-    private help helpDe = new help("de");
+    private final help helpDe = new help("de");
-    private help helpEn = new help("En");
+    private final help helpEn = new help("En");
 
     private language activLang;
     private help activHelp;
 
-    private db_connect db;
+    private final db_connect db;
 
-    private Map<String, String> channelList = new HashMap<>();
+    private final Map<String, String> channelList = new HashMap<>();
 
 
     public dice() {
@@ -54,7 +54,7 @@ public class dice extends ListenerAdapter {
 
         if(!channelList.containsKey(event.getChannel().getId())) {
             Map<String, String> Einstellungen = db.getChannelSettings(event.getChannel().getId());
-            channelList.put(event.getChannel().getId(), Einstellungen.get("lang").toString());
+            channelList.put(event.getChannel().getId(), Einstellungen.get("lang"));
         }
         switch (channelList.get(event.getChannel().getId())) {
             case "de":
@@ -95,7 +95,7 @@ public class dice extends ListenerAdapter {
     private void roll(MessageReceivedEvent event) {
 
         EmbedBuilder outputBox = new EmbedBuilder();
-        StringBuilder result = new StringBuilder("");
+        StringBuilder result = new StringBuilder();
         String msgText = "";
 
         int numberOfDice, diceCount, resultValue, difficult, bonus;
@@ -120,21 +120,21 @@ public class dice extends ListenerAdapter {
 
             msgText = MsgParts[1].trim();
             if(msgText.matches(".*[^0-9].*")) { // es wurden andere zeichen als Zahlen gefunden
-                if(msgText.toLowerCase().equals("de")) {
+                if(msgText.equalsIgnoreCase("de")) {
                     activLang = langDe;
                     channelList.put(event.getChannel().getId(), "de");
                     event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
                     db.setChannelSettings(event.getChannel().getId(), "de", event.getGuild().getId(), event.getChannel().getName());
                     return;
                 }
-                else if(msgText.toLowerCase().equals("en")) {
+                else if(msgText.equalsIgnoreCase("en")) {
                     activLang = langEn;
                     channelList.put(event.getChannel().getId(), "en");
                     event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
                     db.setChannelSettings(event.getChannel().getId(), "en", event.getGuild().getId(), event.getChannel().getName());
                     return;
                 }
-                else if(msgText.toLowerCase().equals("help") || msgText.toLowerCase().equals("hilfe")) {
+                else if(msgText.equalsIgnoreCase("help") || msgText.equalsIgnoreCase("hilfe")) {
                     event.getChannel().sendMessage(getAsMention(event)
                     + " Die Syntax lautet XkY z.b. 5k4\nEs werden X mal W10 gewürfelt und davon die höhsten Anzahl Y behalten und addiert. Wird eine 10 gewürfelt, wird der Wurf weiter gewürfelt und addiert aber nur als ein Wurf gezählt.\nWird nach dem XkY eine weiter Zahl angeben so ist dies die Schwierigkeit\n"
                         + "Wird nach dem XkY eine Zahl mit + oder - Angegeben, zählt dies als ein Modifikator für das ergebnis.\n\n"
@@ -274,10 +274,10 @@ public class dice extends ListenerAdapter {
             String addition = "";
             if(bonus != 0) {
                 if(bonus < 0) {
-                    addition += " - " + (bonus*-1) + " ";;
+                    addition += " - " + (bonus*-1) + " ";
                 }
                 else {
-                    addition += " + " + bonus + " ";;
+                    addition += " + " + bonus + " ";
                 }
             }
             if(difficult > 0) {

src/main/java/Keeproll/result.java

@@ -5,7 +5,7 @@ import java.util.Random;
 public class result {
     private StringBuilder text;
     private int value;
-    private int diceart;
+    private final int diceart;
     private Boolean reroll9;
     private Boolean reroll1;
     private Boolean maxReroll;

src/main/java/Shadowrun/db_connect.java

@@ -131,7 +131,6 @@ public class db_connect extends DB.base {
             e.printStackTrace();
         }
         close();
-        return;
     }
 
     public Map<String, String> getMesssage(Long MsgId) {

src/main/java/Shadowrun/dice.java

@@ -23,25 +23,25 @@ import java.util.concurrent.ThreadLocalRandom;
 
 public class dice extends ListenerAdapter {
 
-    private String prefixSr;
+    private final String prefixSr;
-    private String prefixIni;
+    private final String prefixIni;
-    private String prefixZitat;
+    private final String prefixZitat;
-    private String prefixTest;
+    private final String prefixTest;
-    private String prefixCId;
+    private final String prefixCId;
 
-    private language langDe = new language("de");
+    private final language langDe = new language("de");
-    private language langEn = new language("en");
+    private final language langEn = new language("en");
 
-    private help helpDe = new help("de");
+    private final help helpDe = new help("de");
-    private help helpEn = new help("En");
+    private final help helpEn = new help("En");
 
     private language activLang;
     private help activHelp;
 
-    private db_connect db;
+    private final db_connect db;
 
 
-    private Map<String, String> channelList = new HashMap<>();
+    private final Map<String, String> channelList = new HashMap<>();
 
 
     public dice() {
@@ -82,7 +82,7 @@ public class dice extends ListenerAdapter {
 
         if(!channelList.containsKey(event.getChannel().getId())) {
             Map<String, String> Einstellungen = db.getChannelSettings(event.getChannel().getId());
-            channelList.put(event.getChannel().getId(), Einstellungen.get("lang").toString());
+            channelList.put(event.getChannel().getId(), Einstellungen.get("lang"));
         }
         switch (channelList.get(event.getChannel().getId())) {
             case "de":
@@ -175,17 +175,17 @@ public class dice extends ListenerAdapter {
             }
             for(int i = 0; i < 6; i++) {
                 float pro = verteilung[i]*100f/rounds;
-                test.addField(Integer.toString(i+1), Integer.toString(verteilung[i]) + " - " + String.format("%.2f", pro) + "%", true);
+                test.addField(Integer.toString(i+1), verteilung[i] + " - " + String.format("%.2f", pro) + "%", true);
             }
             test.addBlankField(false);
             for(int i = 0; i < 6; i++) {
                 float pro = verteilung2[i]*100f/rounds;
-                test.addField(Integer.toString(i+1), Integer.toString(verteilung2[i]) + " - " + String.format("%.2f", pro) + "%", true);
+                test.addField(Integer.toString(i+1), verteilung2[i] + " - " + String.format("%.2f", pro) + "%", true);
             }
             test.addBlankField(false);
             for(int i = 0; i < 6; i++) {
                 float pro = verteilung3[i]*100f/rounds;
-                test.addField(Integer.toString(i+1), Integer.toString(verteilung3[i]) + " - " + String.format("%.2f", pro) + "%", true);
+                test.addField(Integer.toString(i+1), verteilung3[i] + " - " + String.format("%.2f", pro) + "%", true);
             }
             event.getChannel().sendMessageEmbeds(test.build()).queue();
 
@@ -240,14 +240,14 @@ public class dice extends ListenerAdapter {
             }
 
             if(MsgParts[1].trim().matches(".*[^0-9].*")) { // es wurden andere zeichen als Zahlen gefunden
-                if(MsgParts[1].trim().toLowerCase().equals("de")) {
+                if(MsgParts[1].trim().equalsIgnoreCase("de")) {
                     activLang = langDe;
                     channelList.put(event.getChannel().getId(), "de");
                     event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
                     db.setChannelSettings(event.getChannel().getId(), "de", event.getGuild().getId(), event.getChannel().getName());
                     return;
                 }
-                else if(MsgParts[1].trim().toLowerCase().equals("en")) {
+                else if(MsgParts[1].trim().equalsIgnoreCase("en")) {
                     activLang = langEn;
                     channelList.put(event.getChannel().getId(), "en");
                     event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
@@ -318,8 +318,8 @@ public class dice extends ListenerAdapter {
 
         int[] verteilung = new int[diceart];
         int dice1;
-        StringBuilder result = new StringBuilder("");
+        StringBuilder result = new StringBuilder();
-        StringBuilder rollString = new StringBuilder("");
+        StringBuilder rollString = new StringBuilder();
 
         int hits = 0;
         boolean glitches = false;
@@ -374,13 +374,13 @@ public class dice extends ListenerAdapter {
             if(type == 1) {
                 message = activLang.resultText;
                 //%numberOfDice%%dice%%diceart% %EdgeDice%:\tErfolge: %hits%\tMisserfolge: %oneHits%";
-                message = message.replace("%numberOfDice%", String.valueOf(numberOfDice)).replace("%diceart%", String.valueOf(diceart)).replace("%EdgeDice%", addition).replace("%hits%", String.valueOf(hits) + "\t Gesamt: " + (hits + hitBasis)).replace("%oneHits%", String.valueOf(verteilung[0]));
+                message = message.replace("%numberOfDice%", String.valueOf(numberOfDice)).replace("%diceart%", String.valueOf(diceart)).replace("%EdgeDice%", addition).replace("%hits%", hits + "\t Gesamt: " + (hits + hitBasis)).replace("%oneHits%", String.valueOf(verteilung[0]));
                 outputBox.setTitle(effectiveName + " Edgereroll " + message);
             }
             if(type == 2) {
                 message = activLang.resultTextExtent;
                 //%numberOfDice%%dice%%diceart% %EdgeDice%:\tErfolge: %hits%\tMisserfolge: %oneHits%";
-                message = message.replace("%numberOfDice%", String.valueOf(numberOfDice)).replace("%diceart%", String.valueOf(diceart)).replace("%EdgeDice%", addition).replace("%hits%", String.valueOf(hits) + "\t Gesamt: " + (hits + hitBasis)).replace("%oneHits%", String.valueOf(verteilung[0]));
+                message = message.replace("%numberOfDice%", String.valueOf(numberOfDice)).replace("%diceart%", String.valueOf(diceart)).replace("%EdgeDice%", addition).replace("%hits%", hits + "\t Gesamt: " + (hits + hitBasis)).replace("%oneHits%", String.valueOf(verteilung[0]));
                 outputBox.setTitle(effectiveName + " Ausgedehnt " + message);
             }
             else {
@@ -443,7 +443,7 @@ public class dice extends ListenerAdapter {
         int diceart = 6;
         int iniBase = 0;
         int ini = 0;
-        StringBuilder result = new StringBuilder("");
+        StringBuilder result = new StringBuilder();
 
         try {
             String[] MsgParts = event.getMessage().getContentRaw().split(" ", 2);
@@ -455,13 +455,13 @@ public class dice extends ListenerAdapter {
             }
 
             if(MsgParts[1].trim().matches(".*[^0-9].*")) { // es wurden andere zeichen als Zahlen gefunden
-                if(MsgParts[1].trim().toLowerCase().equals("de")) {
+                if(MsgParts[1].trim().equalsIgnoreCase("de")) {
                     activLang = langDe;
                     channelList.put(event.getChannel().getId(), "de");
                     event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
                     return;
                 }
-                else if(MsgParts[1].trim().toLowerCase().equals("en")) {
+                else if(MsgParts[1].trim().equalsIgnoreCase("en")) {
                     activLang = langEn;
                     channelList.put(event.getChannel().getId(), "en");
                     event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
@@ -538,7 +538,7 @@ public class dice extends ListenerAdapter {
             outputBox.setTitle(getEffectiveName(event)  + message);
 
 
-            outputBox.setDescription(String.valueOf(iniBase) + " + (" +  result.toString().trim().replace(" ", "+") + ")");
+            outputBox.setDescription(iniBase + " + (" +  result.toString().trim().replace(" ", "+") + ")");
 
             event.getChannel().sendMessageEmbeds(outputBox.build()).queue();
 
@@ -558,11 +558,9 @@ public class dice extends ListenerAdapter {
         String[] quotes = new String[7];
 
         quotes[0] = "*quiek quiek quiek*";
-        quotes[1] = "" +
+        quotes[1] = "(\\\\______/)\n" +
-                "(\\\\______/)\n" +
                 "( ͡ ͡° ͜ ʖ ͡ ͡°)  *snuff snuff*\n" +
-                "\\\\╭☞ \\\\╭☞\n" +
+                "\\\\╭☞ \\\\╭☞\n";
-                "";
         quotes[2] = "(づ｡◕‿‿◕｡)づ";
         quotes[3] = "zzzZZZZZzzZZ";
         quotes[4] = "piiiep";

src/main/java/Shadowrun/help.java

@@ -5,12 +5,12 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 public class help {
 
-    private StringBuilder hilfstext;
+    private final StringBuilder hilfstext;
-    private String sprache;
+    private final String sprache;
 
     public help(String sprache) {
         this.sprache = sprache;
-        hilfstext = new StringBuilder("");
+        hilfstext = new StringBuilder();
     }
 
     public void add(String befehl, String hilftext) {
@@ -24,7 +24,7 @@ public class help {
     }
 
     public void send() {
-        StringBuilder ausgabe = new StringBuilder("");
+        StringBuilder ausgabe = new StringBuilder();
 
     }
 }

src/main/java/Shadowrun/messageInterpreter.java

@@ -11,8 +11,8 @@ public class messageInterpreter {
     private Integer typ = 0;
     private Integer intResult = 0;
 
-    private language activLang;
+    private final language activLang;
-    private MessageReceivedEvent event;
+    private final MessageReceivedEvent event;
 
 
     public Integer getDiceart() {
@@ -28,17 +28,11 @@ public class messageInterpreter {
     }
 
     public boolean isNum() {
-        if(typ == 1) {
+        return typ == 1;
-            return  true;
-        }
-        return false;
     }
 
     public boolean isDice() {
-        if(typ == 2) {
+        return typ == 2;
-            return  true;
-        }
-        return false;
     }
     /**
      *
@@ -62,7 +56,6 @@ public class messageInterpreter {
         if(sc.hasNextInt()) { // ist eine Zahl
             typ = 1;
             intResult = Integer.parseInt(Input.trim());
-            return;
         }
         else {
             if (Input.trim().toLowerCase().replace(" ", "").matches("([0-9]*)[dw]([0-9].*)")) { // format besteh aus (Zahlen)d(Zahlen) oder (Zahlen)w(Zahlen)

src/main/java/Simpleroll/dice.java

@@ -14,22 +14,22 @@ import java.util.Random;
 
 public class dice extends ListenerAdapter {
 
-    private String prefixR;
+    private final String prefixR;
-    private String prefixRoll;
+    private final String prefixRoll;
-    private String prefixHelp;
+    private final String prefixHelp;
 
-    private language langDe = new language("de");
+    private final language langDe = new language("de");
-    private language langEn = new language("en");
+    private final language langEn = new language("en");
 
-    private help helpDe = new help("de");
+    private final help helpDe = new help("de");
-    private help helpEn = new help("En");
+    private final help helpEn = new help("En");
 
     private language activLang;
     private help activHelp;
 
-    private db_connect db;
+    private final db_connect db;
 
-    private Map<String, String> channelList = new HashMap<>();
+    private final Map<String, String> channelList = new HashMap<>();
 
 
     public dice() {
@@ -50,7 +50,7 @@ public class dice extends ListenerAdapter {
 
         if(!channelList.containsKey(event.getChannel().getId())) {
             Map<String, String> Einstellungen = db.getChannelSettings(event.getChannel().getId());
-            channelList.put(event.getChannel().getId(), Einstellungen.get("lang").toString());
+            channelList.put(event.getChannel().getId(), Einstellungen.get("lang"));
         }
         switch (channelList.get(event.getChannel().getId())) {
             case "en":
@@ -107,14 +107,14 @@ public class dice extends ListenerAdapter {
             }
 
 
-            if(MsgParts[1].trim().toLowerCase().equals("de")) {
+            if(MsgParts[1].trim().equalsIgnoreCase("de")) {
                 activLang = langDe;
                 channelList.put(event.getChannel().getId(), "de");
                 event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
                 db.setChannelSettings(event.getChannel().getId(), "de", event.getGuild().getId(), event.getChannel().getName());
                 return;
             }
-            else if(MsgParts[1].trim().toLowerCase().equals("en")) {
+            else if(MsgParts[1].trim().equalsIgnoreCase("en")) {
                 activLang = langEn;
                 channelList.put(event.getChannel().getId(), "en");
                 event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
@@ -153,7 +153,7 @@ public class dice extends ListenerAdapter {
 
     private void help(MessageReceivedEvent event) {
         EmbedBuilder outputBox = new EmbedBuilder();
-        StringBuilder result = new StringBuilder("");
+        StringBuilder result = new StringBuilder();
 
 
         outputBox.setTitle("Hallo ich exestieren aktuell in der Version: 0.10\n");

src/main/java/Simpleroll/diceOld.java

@@ -14,22 +14,22 @@ import java.util.Random;
 
 public class diceOld extends ListenerAdapter {
 
-    private String prefixR;
+    private final String prefixR;
-    private String prefixRoll;
+    private final String prefixRoll;
-    private String prefixHelp;
+    private final String prefixHelp;
 
-    private language langDe = new language("de");
+    private final language langDe = new language("de");
-    private language langEn = new language("en");
+    private final language langEn = new language("en");
 
-    private help helpDe = new help("de");
+    private final help helpDe = new help("de");
-    private help helpEn = new help("En");
+    private final help helpEn = new help("En");
 
     private language activLang;
     private help activHelp;
 
-    private db_connect db;
+    private final db_connect db;
 
-    private Map<String, String> channelList = new HashMap<>();
+    private final Map<String, String> channelList = new HashMap<>();
 
 
     public diceOld() {
@@ -50,7 +50,7 @@ public class diceOld extends ListenerAdapter {
 
         if(!channelList.containsKey(event.getChannel().getId())) {
             Map<String, String> Einstellungen = db.getChannelSettings(event.getChannel().getId());
-            channelList.put(event.getChannel().getId(), Einstellungen.get("lang").toString());
+            channelList.put(event.getChannel().getId(), Einstellungen.get("lang"));
         }
         switch (channelList.get(event.getChannel().getId())) {
             case "de":
@@ -98,7 +98,7 @@ public class diceOld extends ListenerAdapter {
         int dice1;
         int numberOfDice = 1;
         int diceart = 6;
-        StringBuilder result = new StringBuilder("");
+        StringBuilder result = new StringBuilder();
 
         int hits = 0;
 
@@ -119,14 +119,14 @@ public class diceOld extends ListenerAdapter {
 
 
             if(MsgParts[1].trim().matches(".*[^0-9].*")) { // es wurden andere zeichen als Zahlen gefunden
-                if(MsgParts[1].trim().toLowerCase().equals("de")) {
+                if(MsgParts[1].trim().equalsIgnoreCase("de")) {
                     activLang = langDe;
                     channelList.put(event.getChannel().getId(), "de");
                     event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
                     db.setChannelSettings(event.getChannel().getId(), "de", event.getGuild().getId(), event.getChannel().getName());
                     return;
                 }
-                else if(MsgParts[1].trim().toLowerCase().equals("en")) {
+                else if(MsgParts[1].trim().equalsIgnoreCase("en")) {
                     activLang = langEn;
                     channelList.put(event.getChannel().getId(), "en");
                     event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
@@ -220,7 +220,7 @@ public class diceOld extends ListenerAdapter {
 
     private void help(MessageReceivedEvent event) {
         EmbedBuilder outputBox = new EmbedBuilder();
-        StringBuilder result = new StringBuilder("");
+        StringBuilder result = new StringBuilder();
 
 
         outputBox.setTitle("Hallo ich exestieren aktuell in der Version: 0.8\n");

src/main/java/Simpleroll/help.java

@@ -3,12 +3,12 @@ package Simpleroll;
 
 public class help {
 
-    private StringBuilder hilfstext;
+    private final StringBuilder hilfstext;
-    private String sprache;
+    private final String sprache;
 
     public help(String sprache) {
         this.sprache = sprache;
-        hilfstext = new StringBuilder("");
+        hilfstext = new StringBuilder();
     }
 
     public void add(String befehl, String hilftext) {
@@ -22,7 +22,7 @@ public class help {
     }
 
     public void send() {
-        StringBuilder ausgabe = new StringBuilder("");
+        StringBuilder ausgabe = new StringBuilder();
 
     }
 }

src/main/java/Simpleroll/subpart.java

@@ -10,9 +10,9 @@ public class subpart {
     private Integer resolve;
 
     public subpart() {
-        bodyOutput = new StringBuilder("");
+        bodyOutput = new StringBuilder();
-        resolveOutput = new StringBuilder("");
+        resolveOutput = new StringBuilder();
-        headerOutput = new StringBuilder("");
+        headerOutput = new StringBuilder();
         resolve = 0;
     }
 

src/main/java/Socket/shadowrun.java

@@ -16,7 +16,7 @@ import java.net.Socket;
 
 public class shadowrun implements Runnable{
 
-    private JDA jda;
+    private final JDA jda;
 
     public shadowrun(JDA jda) {
         this.jda = jda;
@@ -42,14 +42,14 @@ public class shadowrun implements Runnable{
 
 
     private static class iniEcho implements Runnable {
-        private Socket socket;
+        private final Socket socket;
-        private JDA jda;
+        private final JDA jda;
 
         private boolean checkin;
         private Scanner in;
         private PrintWriter out;
 
-        private String salt;
+        private final String salt;
 
         iniEcho(Socket socket, JDA jda) {
             this.socket = socket;
@@ -66,7 +66,7 @@ public class shadowrun implements Runnable{
                 out = new PrintWriter(socket.getOutputStream(), true);
                 String message = "";
                 while (in.hasNextLine()) {
-                    if(this.checkin == false) {
+                    if(!this.checkin) {
                         chekin();
                         continue;
                     }

src/main/java/Vampire/dice.java

@@ -17,22 +17,22 @@ import java.util.regex.Pattern;
 
 public class dice extends ListenerAdapter {
 
-    private String prefixlong;
+    private final String prefixlong;
-    private String prefixShort;
+    private final String prefixShort;
     private String prefixVeryShort;
 
-    private language langDe = new language("de");
+    private final language langDe = new language("de");
-    private language langEn = new language("en");
+    private final language langEn = new language("en");
 
-    private help helpDe = new help("de");
+    private final help helpDe = new help("de");
-    private help helpEn = new help("En");
+    private final help helpEn = new help("En");
 
     private language activLang;
     private help activHelp;
 
-    private db_connect db;
+    private final db_connect db;
 
-    private Map<String, String> channelList = new HashMap<>();
+    private final Map<String, String> channelList = new HashMap<>();
 
 
     public dice() {
@@ -52,7 +52,7 @@ public class dice extends ListenerAdapter {
 
         if(!channelList.containsKey(event.getChannel().getId())) {
             Map<String, String> Einstellungen = db.getChannelSettings(event.getChannel().getId());
-            channelList.put(event.getChannel().getId(), Einstellungen.get("lang").toString());
+            channelList.put(event.getChannel().getId(), Einstellungen.get("lang"));
         }
         switch (channelList.get(event.getChannel().getId())) {
             case "de":
@@ -93,9 +93,9 @@ public class dice extends ListenerAdapter {
     private void roll(MessageReceivedEvent event) {
 
         EmbedBuilder outputBox = new EmbedBuilder();
-        StringBuilder result = new StringBuilder("");
+        StringBuilder result = new StringBuilder();
-        StringBuilder resultDice = new StringBuilder("");
+        StringBuilder resultDice = new StringBuilder();
-        StringBuilder resultHungerDice = new StringBuilder("");
+        StringBuilder resultHungerDice = new StringBuilder();
         String msgText = "";
         String rollState = "";
 
@@ -121,21 +121,21 @@ public class dice extends ListenerAdapter {
 
             msgText = MsgParts[1].trim();
             if(msgText.matches(".*[^0-9].*")) { // es wurden andere zeichen als Zahlen gefunden
-                if(msgText.toLowerCase().equals("de")) {
+                if(msgText.equalsIgnoreCase("de")) {
                     activLang = langDe;
                     channelList.put(event.getChannel().getId(), "de");
                     event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
                     db.setChannelSettings(event.getChannel().getId(), "de", event.getGuild().getId(), event.getChannel().getName());
                     return;
                 }
-                else if(msgText.toLowerCase().equals("en")) {
+                else if(msgText.equalsIgnoreCase("en")) {
                     activLang = langEn;
                     channelList.put(event.getChannel().getId(), "en");
                     event.getChannel().sendMessage(getAsMention(event) + activLang.language).queue();
                     db.setChannelSettings(event.getChannel().getId(), "en", event.getGuild().getId(), event.getChannel().getName());
                     return;
                 }
-                else if(msgText.toLowerCase().equals("help") || msgText.toLowerCase().equals("hilfe")) {
+                else if(msgText.equalsIgnoreCase("help") || msgText.equalsIgnoreCase("hilfe")) {
                     event.getChannel().sendMessage(getAsMention(event)
                     + " Die Syntax lautet XkY z.b. 5k4\nEs werden X mal W10 gewürfelt und davon die höhsten Anzahl Y behalten und addiert. Wird eine 10 gewürfelt, wird der Wurf weiter gewürfelt und addiert aber nur als ein Wurf gezählt.\nWird nach dem XkY eine weiter Zahl angeben so ist dies die Schwierigkeit\n"
                         + "Wird nach dem XkY eine Zahl mit + oder - Angegeben, zählt dies als ein Modifikator für das ergebnis.\n\n"

src/main/java/Vampire/result.java

@@ -5,7 +5,7 @@ import java.util.Random;
 public class result {
     private StringBuilder text;
     private int value;
-    private int diceart;
+    private final int diceart;
     private Boolean reroll9;
     private Boolean reroll1;
     private Boolean maxReroll;