fix small issues

AtomPilz-DevTeam · Jan 2, 2025 · 4c81757 · 4c81757
1 parent 67eec9b
commit 4c81757
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 66 deletions.
diff --git a/src/main/java/de/j/deathMinigames/dmUtil/TestCMD.java b/src/main/java/de/j/deathMinigames/dmUtil/TestCMD.java
@@ -1,14 +1,11 @@
 package de.j.deathMinigames.dmUtil;
 
-import de.j.deathMinigames.database.Database;
 import io.papermc.paper.command.brigadier.BasicCommand;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashMap;
-
 public class TestCMD implements BasicCommand {
 
     /**
@@ -38,6 +35,5 @@ public boolean canUse(@NotNull CommandSender sender) {
     public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
         Player player = (Player) stack.getSender();
         player.sendMessage("test");
-
     }
 }
diff --git a/src/main/java/de/j/deathMinigames/listeners/InventoryListener.java b/src/main/java/de/j/deathMinigames/listeners/InventoryListener.java
@@ -41,7 +41,6 @@ public void onSettingsClick(InventoryClickEvent event) {
         UUID ID;
         int slot = event.getSlot();
         if(slot < 0) {
-            Main.getMainLogger().info("Slot is smaller or is 0: " + slot);
             return;
         }
         Player player = (Player) event.getWhoClicked();
@@ -115,27 +114,27 @@ public void reloadInventory(InventoryMenus inventory, int slot, MainMenu mainMen
             throw new IllegalStateException("No player selected");
         }
         switch (inventory) {
-            case InventoryMenus.INTRODUCTION:
+            case INTRODUCTION:
                 if(playerClickedData.getIntroduction()) {
                     MainMenu.getIntroduction().addClickableItemStack(playerClicked.getName(), Material.GREEN_CONCRETE_POWDER, 1, slot);
                 }
                 else {
                     MainMenu.getIntroduction().addClickableItemStack(playerClicked.getName(), Material.RED_CONCRETE_POWDER, 1, slot);
                 }
                 break;
-            case InventoryMenus.USES_PLUGIN:
+            case USES_PLUGIN:
                 if(playerClickedData.getUsesPlugin()) {
                     MainMenu.getUsesPlugin().addClickableItemStack(playerClicked.getName(), Material.GREEN_CONCRETE_POWDER, 1, slot);
                 }
                 else {
                     MainMenu.getUsesPlugin().addClickableItemStack(playerClicked.getName(), Material.RED_CONCRETE_POWDER, 1, slot);
                 }
                 break;
-            case InventoryMenus.DIFFICULTY_SETTINGS:
+            case DIFFICULTY_SETTINGS:
                 int difficulty = playerClickedData.getDifficulty();
                 mainMenu.difficultySettingsSetInventoryContents(difficulty);
                 break;
-            case InventoryMenus.SETTINGS:
+            case SETTINGS:
                 if(config.checkSetUp()) {
                     mainMenu.addClickableItemStack("SetUp", Material.GREEN_CONCRETE, 1, 0);
                 }
@@ -157,7 +156,7 @@ public void reloadInventory(InventoryMenus inventory, int slot, MainMenu mainMen
     public void reloadInventory(InventoryMenus inventory, MainMenu mainMenu) {
         PlayerData playerData;
         switch (inventory) {
-            case InventoryMenus.INTRODUCTION:
+            case INTRODUCTION:
                 HashMap<UUID, PlayerData> knownPlayers = HandlePlayers.getKnownPlayers();
                 for(int i = 0; i < knownPlayers.size(); i++) {
                     Player currentPlayer = getIndexAssociatedWithPlayerInKnownPlayersList(i);
@@ -166,35 +165,35 @@ public void reloadInventory(InventoryMenus inventory, MainMenu mainMenu) {
                     MainMenu.getIntroduction().addClickableItemStack(currentPlayer.getName(), getMaterialBasedOnBoolean(playerData.getIntroduction()), 1, i);
                 }
                 break;
-            case InventoryMenus.USES_PLUGIN:
+            case USES_PLUGIN:
                 for(int i = 0; i < HandlePlayers.getKnownPlayers().size(); i++) {
                     Player currentPlayer = getIndexAssociatedWithPlayerInKnownPlayersList(i);
                     if(currentPlayer == null) continue;
                     playerData = HandlePlayers.getKnownPlayers().get(currentPlayer.getUniqueId());
                     MainMenu.getUsesPlugin().addClickableItemStack(currentPlayer.getName(), getMaterialBasedOnBoolean(playerData.getUsesPlugin()), 1, i);
                 }
                 break;
-            case InventoryMenus.DIFFICULTY:
+            case DIFFICULTY:
                 MainMenu.getDifficulty().addPlayerHeads(HandlePlayers.getKnownPlayers());
                 break;
-            case InventoryMenus.DIFFICULTY_SETTINGS:
+            case DIFFICULTY_SETTINGS:
                 playerData = HandlePlayers.getKnownPlayers().get(playerClicked.getUniqueId());
                 int difficulty = playerData.getDifficulty();
                 mainMenu.difficultySettingsSetInventoryContents(difficulty);
                 break;
-            case InventoryMenus.SETUP:
+            case SETUP:
                 mainMenu.setUpSettingsSetInventoryContents();
                 break;
-            case InventoryMenus.PARKOUR_START_HEIGHT:
+            case PARKOUR_START_HEIGHT:
                 mainMenu.parkourStartHeightSettingsSetInventoryContents();
                 break;
-            case InventoryMenus.PARKOUR_LENGTH:
+            case PARKOUR_LENGTH:
                 mainMenu.parkourLengthSettingsSetInventoryContents();
                 break;
-            case InventoryMenus.COST_TO_LOWER_THE_DIFFICULTY:
+            case COST_TO_LOWER_THE_DIFFICULTY:
                 mainMenu.costToLowerTheDifficultySettingsSetInventoryContents();
                 break;
-            case InventoryMenus.TIME_TO_DECIDE_WHEN_RESPAWNING:
+            case TIME_TO_DECIDE_WHEN_RESPAWNING:
                 mainMenu.timeToDecideWhenRespawningSettingsSetInventoryContents();
                 break;
         }
@@ -325,7 +324,6 @@ private void handleDifficultyGUI(InventoryClickEvent event, Player player, MainM
         } else if (slot <= HandlePlayers.getKnownPlayers().size()) {
             playerClicked = getIndexAssociatedWithPlayerInKnownPlayersList(slot);
             player.sendMessage(Component.text(new TranslationFactory().getTranslation(player, "somethingWentWrong")).color(NamedTextColor.RED));
-            Main.getMainLogger().info(playerClicked.getName());
             reloadInventory(InventoryMenus.DIFFICULTY_SETTINGS, slot, mainMenu);
             MainMenu.getDifficultyPlayerSettings().addBackButton(player);
             MainMenu.getDifficultyPlayerSettings().showInventory(player);

diff --git a/src/main/java/de/j/deathMinigames/listeners/RespawnListener.java b/src/main/java/de/j/deathMinigames/listeners/RespawnListener.java
@@ -7,7 +7,9 @@
 import de.j.deathMinigames.minigames.Minigame;
 import de.j.stationofdoom.util.translations.TranslationFactory;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.title.Title;
 import org.bukkit.Location;
@@ -64,10 +66,10 @@ public void onRespawn(PlayerRespawnEvent event) {
      * @param player the player who should decide whether to play a minigame
      */
     public void handleTimerWhilePlayerDecides(Player player) {
-        player.sendMessage(Component.text(tf.getTranslation(player, "decision")).color(NamedTextColor.GOLD));
-        player.sendMessage(Component.text(tf.getTranslation(player, "playMinigame")).clickEvent(net.kyori.adventure.text.event.ClickEvent.clickEvent(net.kyori.adventure.text.event.ClickEvent.Action.RUN_COMMAND, "/game start")).color(NamedTextColor.GREEN)
+        player.sendMessage(Component.text(tf.getTranslation(player, "decision")).color(NamedTextColor.GOLD)
+                .append(Component.text(tf.getTranslation(player, "playMinigame")).decorate(TextDecoration.UNDERLINED).color(NamedTextColor.GREEN).clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND, "/game start")))
                 .append(Component.text(" / ").color(NamedTextColor.GOLD))
-                .append(Component.text(tf.getTranslation(player, "ignoreMinigame")).clickEvent(net.kyori.adventure.text.event.ClickEvent.clickEvent(net.kyori.adventure.text.event.ClickEvent.Action.RUN_COMMAND, "/game ignore")).color(NamedTextColor.RED)));
+                .append(Component.text(tf.getTranslation(player, "ignoreMinigame")).decorate(TextDecoration.UNDERLINED).color(NamedTextColor.RED).clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND, "/game ignore"))));
         timerWhilePlayerDecides(player);
     }
 

diff --git a/src/main/java/de/j/deathMinigames/main/Config.java b/src/main/java/de/j/deathMinigames/main/Config.java
@@ -112,7 +112,7 @@ public void cloneConfigToPlugin() {
             config.set("Database.database", "default");
             config.set("Database.password", "default");
             config.set("Database.applicationName", "default");
-            config.set("Database.schema", "default");
+            config.set("Database.schema", "public");
             Main.getPlugin().saveConfig();
         }
     }
@@ -311,14 +311,6 @@ public HashMap<String, String> getDatabaseConfig() {
             }
             databaseConnectionInfo.put(field, value);
         }
-        /*databaseConnectionInfo.put("host", config.getString("Database.host"));
-        databaseConnectionInfo.put("port", config.getString("Database.port"));
-        databaseConnectionInfo.put("database", config.getString("Database.database"));
-        databaseConnectionInfo.put("user", config.getString("Database.user"));
-        databaseConnectionInfo.put("password", config.getString("Database.password"));
-        databaseConnectionInfo.put("applicationName", config.getString("Database.applicationName"));
-        databaseConnectionInfo.put("schema", config.getString("Database.schema"));
-         */
         return databaseConnectionInfo;
     }
 }
diff --git a/src/main/java/de/j/deathMinigames/main/HandlePlayers.java b/src/main/java/de/j/deathMinigames/main/HandlePlayers.java
@@ -89,7 +89,7 @@ public synchronized void addNewPlayer(Player player) {
             return;
         }
         knownPlayers.put(playerUUID, playerData);
-        Main.getMainLogger().info("Added new player " + playerData.getName() + " " + playerData.getIntroduction());
+        Main.getMainLogger().info("Added new player " + playerData.getName());
     }
 
 
@@ -130,25 +130,19 @@ public void resetLeaderboardAndTimesOfPlayers() {
     }
 
     public void checkIfPlayerLeftWhileInWaitingList(Player player) {
-        Main.getMainLogger().info("Checking if player " + player.getName() + " left while in waiting list");
         if(waitingListMinigame.contains(player)) {
             Main.getMainLogger().info("Player " + player.getName() + " left while in waiting list");
             getKnownPlayers().get(player.getUniqueId()).setLeftWhileProcessing(true);
             waitingListMinigame.remove(player);
             Minigame.getInstance().dropInvAndClearData(player);
-            return;
         }
-        Main.getMainLogger().info("Player " + player.getName() + " did not leave while in waiting list");
     }
 
     public void handlePlayerLeftWhileProcessing(Player player) {
         PlayerData playerData = getKnownPlayers().get(player.getUniqueId());
         if(playerData.getLeftWhileProcessing()) {
             Minigame.getInstance().tpPlayerToRespawnLocation(player);
-            Main.getMainLogger().info("Player " + player.getName() + " left while in parkour");
             playerData.setLeftWhileProcessing(false);
-            return;
         }
-        Main.getMainLogger().info("Player " + player.getName() + " did not leave while in parkour");
     }
 }
diff --git a/src/main/java/de/j/deathMinigames/main/InitWaitingListLocationOnJoin.java b/src/main/java/de/j/deathMinigames/main/InitWaitingListLocationOnJoin.java
@@ -5,6 +5,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextDecoration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -34,19 +35,16 @@ public void onJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
         if(player== null) throw new NullPointerException("player is null!");
 
-        Main.getMainLogger().info(Boolean.toString(init));
         if(!init) {
             config.cloneWaitingListLocationToPlugin(player.getWorld());
             init = true;
         }
         if(player.isOp() && config.checkWaitingListLocation() == null) {
             player.sendMessage(Component.text(tf.getTranslation(player, "waitingListPositionNotSetUp")).color(NamedTextColor.RED)
-                    .append(Component.text(tf.getTranslation(player, "yes")).color(NamedTextColor.GREEN).clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND, "/game setWaitingListPosition")))
+                    .append(Component.text(""))
+                    .append(Component.text(tf.getTranslation(player, "yes")).decorate(TextDecoration.UNDERLINED).color(NamedTextColor.GREEN).clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND, "/game setWaitingListPosition")))
                     .append(Component.text(" / ").color(NamedTextColor.GOLD))
-                    .append(Component.text(tf.getTranslation(player, "no")).color(NamedTextColor.RED).clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND, "/game decidedNotToSetPosition"))));
-        }
-        else {
-            Main.getMainLogger().info("WaitingListLocation is set to: " + config.checkWaitingListLocation());
+                    .append(Component.text(tf.getTranslation(player, "no")).decorate(TextDecoration.UNDERLINED).color(NamedTextColor.RED).clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND, "/game decidedNotToSetPosition"))));
         }
     }
 }
diff --git a/src/main/java/de/j/deathMinigames/main/Introduction.java b/src/main/java/de/j/deathMinigames/main/Introduction.java
@@ -5,6 +5,7 @@
 import de.j.stationofdoom.util.translations.TranslationFactory;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextDecoration;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -51,9 +52,10 @@ private void sendPlayerIntroMessage(Player player) {
         TranslationFactory tf = new TranslationFactory();
         player.sendMessage(Component.text(tf.getTranslation(player, "introMessage")));
 
-        player.sendMessage(Component.text(tf.getTranslation(player, "yes")).clickEvent(net.kyori.adventure.text.event.ClickEvent.clickEvent(net.kyori.adventure.text.event.ClickEvent.Action.RUN_COMMAND, "/game introPlayerDecidesToUseFeatures")).color(NamedTextColor.GREEN)
+        player.sendMessage(Component.text("")
+                .append(Component.text(tf.getTranslation(player, "yes")).decorate(TextDecoration.UNDERLINED).clickEvent(net.kyori.adventure.text.event.ClickEvent.clickEvent(net.kyori.adventure.text.event.ClickEvent.Action.RUN_COMMAND, "/game introPlayerDecidesToUseFeatures")).color(NamedTextColor.GREEN))
                 .append(Component.text(" / ").color(NamedTextColor.GOLD))
-                .append(Component.text(tf.getTranslation(player, "no")).clickEvent(net.kyori.adventure.text.event.ClickEvent.clickEvent(net.kyori.adventure.text.event.ClickEvent.Action.RUN_COMMAND, "/game introPlayerDecidesToNotUseFeatures")).color(NamedTextColor.RED)));
+                .append(Component.text(tf.getTranslation(player, "no")).decorate(TextDecoration.UNDERLINED).clickEvent(net.kyori.adventure.text.event.ClickEvent.clickEvent(net.kyori.adventure.text.event.ClickEvent.Action.RUN_COMMAND, "/game introPlayerDecidesToNotUseFeatures")).color(NamedTextColor.RED)));
     }
 
     /**

diff --git a/src/main/java/de/j/deathMinigames/minigames/JumpAndRun.java b/src/main/java/de/j/deathMinigames/minigames/JumpAndRun.java
@@ -261,15 +261,10 @@ public void run() {
                     Main.getMainLogger().info("Removed " + waitingListMinigame.getFirst().getName() + " from waiting list");
                     waitingListMinigame.remove(playerInArena);
                     running = false;
-                    mg.outPutWaitingListInConsole();
                     if(!waitingListMinigame.isEmpty()) {
-                        Main.getMainLogger().info("WaitingList is not empty");
                         Main.getMainLogger().info("Started new minigame with: " + waitingListMinigame.getFirst().getName());
                         Minigame.getInstance().minigameStart(waitingListMinigame.getFirst());
                     }
-                    else {
-                        Main.getMainLogger().info("WaitingList is empty");
-                    }
                     cancel();
                 }
                 else {

diff --git a/src/main/java/de/j/deathMinigames/minigames/Minigame.java b/src/main/java/de/j/deathMinigames/minigames/Minigame.java
@@ -52,10 +52,7 @@ else if(!playerData.getUsesPlugin()) {
         if(!waitingListMinigame.contains(playerToStart)) {
             waitingListMinigame.addLast(playerToStart);
         }
-        Main.getMainLogger().info("Added player to WaitingList: " + playerToStart.getName());
-        Minigame.getInstance().outPutWaitingListInConsole();
         if(!JumpAndRun.getInstance().getRunning()) {
-            Main.getMainLogger().info("Started new minigame with: " + playerToStart.getName() + " because Parkour is not running");
             playerData.setStatus(PlayerMinigameStatus.IN_MINIGAME);
             jumpAndRun.start();
         }
@@ -216,8 +213,4 @@ public void teleportPlayerInBox(Player player, Location locationOfBox) {
         player.teleport(locationOfBox);
         WaitingListPositionTimer.getInstance().run(player);
     }
-
-    public void outPutWaitingListInConsole() {
-        Main.getMainLogger().info("WaitingList: " + waitingListMinigame.toString());
-    }
 }
diff --git a/src/main/java/de/j/deathMinigames/minigames/ParkourTimer.java b/src/main/java/de/j/deathMinigames/minigames/ParkourTimer.java
@@ -34,7 +34,6 @@ public static float getTimer() {
     }
 
     public static void resetTimer() {
-        Main.getMainLogger().info(Float.toString(timer));
         ParkourTimer.timer = 0;
     }
 
@@ -48,7 +47,6 @@ public static void startTimer(Player player) {
             Main.getMainLogger().warning("Runnable is not null! Timer not started!");
             return;
         }
-        Main.getMainLogger().info("Started timer");
         timer(player);
     }