Merge pull request #51 from VoxCrafterLP/main

Release v1.2.0

.github/workflows/stable.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Java CI with Maven
+name: Publish
 
 on:
   push:
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Maven Central Repository
+      - name: Set up repository
         uses: actions/setup-java@v2
         with:
           java-version: '8'

pom.xml

@@ -15,7 +15,7 @@
     <groupId>com.voxcrafterlp</groupId>
     <artifactId>JumpRace</artifactId>
     <name>JumpRace</name>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RELEASE</version>
 
     <build>
         <plugins>

src/main/java/com/voxcrafterlp/jumprace/minigameserver/listener/deathmatch/PlayerInteractListener.java

@@ -1,5 +1,6 @@
 package com.voxcrafterlp.jumprace.minigameserver.listener.deathmatch;
 
+import com.google.common.collect.Lists;
 import com.voxcrafterlp.jumprace.JumpRace;
 import com.voxcrafterlp.jumprace.enums.GameState;
 import org.bukkit.Material;
@@ -10,6 +11,7 @@
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -55,32 +57,30 @@ public void onInteract(PlayerInteractEvent event) {
 
         if(event.getItem().getType() == Material.COMPASS) {
             final List<Entity> nearbyEntities = player.getNearbyEntities(100.0D, 100.0D, 100.0D);
-            final AtomicReference<Player> nearestPlayer = new AtomicReference<>();
-
-            if(nearbyEntities.isEmpty()) {
-                player.sendMessage(JumpRace.getInstance().getLanguageLoader().getTranslationByKeyWithPrefix("message-tracker-no-player-found"));
-                return;
-            }
 
+            //Removes every entity that is not an instance of Player
             nearbyEntities.forEach(entity -> {
-                if(entity instanceof Player) {
-                    final Player target = (Player) entity;
-                    if(nearestPlayer.get() != null) {
-                        if(player.getLocation().distance(target.getLocation()) > nearestPlayer.get().getLocation().distance(target.getLocation()))
-                            nearestPlayer.set(target);
-                    } else
-                        nearestPlayer.set(target);
-                }
+                if(!(entity instanceof Player))
+                    nearbyEntities.remove(entity);
             });
 
-            if(nearestPlayer.get().isEmpty()) {
+            final Player nearestPlayer = (Player) nearbyEntities.stream().sorted((entity1, entity2) -> {
+                final double distance1 = player.getLocation().distance(entity1.getLocation());
+                final double distance2 = player.getLocation().distance(entity2.getLocation());
+
+                if(distance1 == distance2) return 0;
+                return (distance1 < distance2) ? -1 : 1;
+            }).findAny().orElse(null);
+
+
+            if(nearestPlayer == null) {
                 player.sendMessage(JumpRace.getInstance().getLanguageLoader().getTranslationByKeyWithPrefix("message-tracker-no-player-found"));
                 return;
             }
 
-            int distance = Math.round((float) nearestPlayer.get().getLocation().distance(player.getLocation()));
-            player.sendMessage(JumpRace.getInstance().getLanguageLoader().getTranslationByKeyWithPrefix("message-tracker-track", JumpRace.getInstance().getGameManager().getPlayerNames().get(nearestPlayer.get()), String.valueOf(distance)));
-            player.setCompassTarget(nearestPlayer.get().getLocation());
+            final int distance = Math.round((float) nearestPlayer.getLocation().distance(player.getLocation()));
+            player.sendMessage(JumpRace.getInstance().getLanguageLoader().getTranslationByKeyWithPrefix("message-tracker-track", JumpRace.getInstance().getGameManager().getPlayerNames().get(nearestPlayer), String.valueOf(distance)));
+            player.setCompassTarget(nearestPlayer.getLocation());
         }
     }
 }

src/main/java/com/voxcrafterlp/jumprace/minigameserver/manager/InventoryManager.java

@@ -50,7 +50,7 @@ private void buildInventories() {
         //===============================================//
 
         this.jumpingInventory.setItem(0, new ItemManager(Material.WOOD_AXE).setUnbreakable(true).build());
-        this.jumpingInventory.setItem(8, new ItemManager(Material.COMPASS).build());
+        this.jumpingInventory.setItem(8, new ItemManager(Material.COMPASS).setDisplayName(JumpRace.getInstance().getLanguageLoader().getTranslationByKey("item-tracker-name")).build());
 
         //===============================================//
 

src/main/java/com/voxcrafterlp/jumprace/objects/Countdown.java

@@ -81,7 +81,8 @@ public void startCountdown() {
                     case 10:
                     case 5:
                         if(this.type == Type.LOBBY)
-                            Bukkit.getOnlinePlayers().forEach(player -> new TitleUtil().sendTitle(player, "§bJumpRace", 10, 45, 10));
+                            Bukkit.getOnlinePlayers().forEach(player -> new TitleUtil().sendFullTitle(player, "§bJumpRace",
+                                    JumpRace.getInstance().getLocationManager().getCurrentMapName(), 10, 45, 10));
                     case 4:
                     case 3:
                     case 2:

src/main/resources/languages/de_CH.yml

@@ -53,7 +53,7 @@ settings-inventory-name: "&cIhstellige"
 heads-inventory-name: "&bChöpf"
 
 settings-item-name: "&cIhstellige"
-settings-item-description: "&7Hier kannst du Einstellungen\n&7zu dem Modul abändern,\n&7sowie einige einzigartige\n&7Features nutzen"
+settings-item-description: "&7Da chasch du Ihstellige\n&7zu dem Modul abändere,\n&7sowie einigi einzigartigi\n&7Features nutze"
 settings-item-rename-name: "&cModul umbenenne"
 settings-item-rename-description: "&7Da chasch du\n&7s'Modul\n&7umbenenne"
 settings-item-change-difficulty-name: "&cSchwierigkeit ändere"
@@ -70,8 +70,8 @@ settings-item-physics-name-disabled: "&bPhysik &7(&cdeaktiviert&7)"
 settings-item-physics-description: "&7Da chasch du d'\n&7Block-Physik\n&7umstelle"
 settings-item-heads-name: "&bChöpf"
 settings-item-heads-description: "&7Da findsch du einigi\n&7Chöpf für dis Bauwerch"
-settings-item-particles-name: "&bPartikel-Effekte"
-settings-item-particles-description: "&7Hier kannst du eigene\n&7Partikel-Effekte für\n&7dein Bauwerk hinzufügen"
+settings-item-particles-name: "&bPartikel-Effekt"
+settings-item-particles-description: "&7Da chasch du eigeni\n&7Partikel-Effekt zu\n&7deinem Bauwerk hinzuefüege"
 
 previous-page-name: "&bVorherigi Site"
 next-page-name: "&bNächsti Site"
@@ -80,42 +80,44 @@ pageswitcher-description: "&7Site&8: &3{0}&8/&b{1}"
 heads-headitem-name: "&bChopf"
 
 particles-overview-inventory: "&bPartikel"
-particles-overview-addeffect-name: "&bEffekt hinzufügen"
-particles-overview-addeffect-description: "&7Füge einen eigenen\n&7Partikel-Effekt hinzu"
-particles-overview-noeffects-name: "&cKeine Effekte"
-particles-overview-noeffects-description: "&7Du hast bislang noch\n&7keine Effekte hinzugefügt.\n\n&7Du kannst Effekte hinzufügen,\n&7indem du auf den &8\"&bEffekt\n&bhinzufügen&8\"&7-Knopf drückst."
-
-particles-addeffect-inventory: "&bPartikel-Effekt hinzufügen"
-particles-addeffect-item-description: "&7Klicke um diesen\n&7Partikel-Effekt hinzuzufügen"
-particles-addeffect-info-name: "&bInformationen"
-particles-addeffect-info-description: "&cHinweis&8: &7Wenn du\n&7einen Partikel-Effekt\n&7hinzufügst, wird dieser\n&7an deiner aktuellen\n&7Position gespawnt."
-particles-addeffect-back-name: "&cZurück zur Übersicht"
-particles-addeffect-back-description: "&7Klicke um zurück zu\n&7der Übersicht zu gelangen"
-particles-addeffect-success: "&7Du hast den {0}&7-Effekt &berfolgreich &7hinzugefügt."
-
-particles-effectsettings-inventory: "&bEffect settings"
+particles-overview-addeffect-name: "&bEffekt hinzuefüge"
+particles-overview-addeffect-description: "&7Füeg en eigne\n&7Partikel-Effekt hinzue"
+particles-overview-noeffects-name: "&cKei Effekt"
+particles-overview-noeffects-description: "&7Du hesch bislang no\n&7kei Effekt hinzuegfüegt.\n\n&7Du chasch Effekt hinzuefüege,\n&7indem du uf de &8\"&bEffekt\n&bhinzuefüege&8\"&7-Chnopf drücksch."
+particles-overview-item-description: "&7Klick, um d'Ihstellige\n&7für de Effekt\n&7ahzpasse"
+
+particles-addeffect-inventory: "&bPartikel-Effekt hinzuefüege"
+particles-addeffect-item-description: "&7Klick, um de\n&7Partikel-Effekt hinzuezfüege"
+particles-addeffect-info-name: "&bInformatione"
+particles-addeffect-info-description: "&cHiwis&8: &7Wenn du\n&7en Partikel-Effekt\n&7hinzuefüegsch, wird de\n&7ah dinere aktuelle\n&7Position gspawnt."
+particles-addeffect-back-name: "&cZrugg zur Übersicht"
+particles-addeffect-back-description: "&7Klick, um zrugg zur\n&7Übersicht z'glange"
+particles-addeffect-success: "&7Du hesch de {0}&7-Effekt &berfolgrich &7hinzuegfüegt."
+
+particles-effectsettings-inventory: "&bEffektihstellige"
 particles-effectsettings-yaw-name: "&bYaw"
-particles-effectsettings-yaw-description: "&7Change the &byaw\n&7rotation of the effect\n\n&7Current value&8: &3{0}"
+particles-effectsettings-yaw-description: "&7Ändere d'&bYaw\n&7Rotation vom Effekt\n\n&7Aktuelle Wert&8: &3{0}"
 particles-effectsettings-pitch-name: "&bPitch"
-particles-effectsettings-pitch-description: "&7Change the &bpitch\n&7rotation of the effect\n\n&7Current value&8: &3{0}"
-particles-effectsettings-size-name: "&bSize"
-particles-effectsettings-size-description: "&7Change the &bsize\n&7of the effect\n\n&7Current value&8: &3{0}"
-particles-effectsettings-particles-name: "&cChange particles"
-particles-effectsettings-particles-description: "&7Click to change the\n&7particles of the effect.\n\n&7Currently these\n&7particles are\n&7selected&8: &c{0}"
-particles-effectsettings-teleport-name: "&3Teleport"
-particles-effectsettings-teleport-description: "&7Click to teleport\n&7the effect to your\n&7current position"
-particles-effectsettings-delete-name: "&4Delete"
-particles-effectsettings-delete-description: "&7Click to\n&7delete the effect"
-particles-effectsettings-configure-name: "&cConfigure action"
-particles-effectsettings-configure-description: "&7Click to configure a\n&7custom action\n&7for the effect"
-
-particle-effect-ring-name: "&2Ring"
-particle-effect-cube-name: "&6Cube"
-particle-effect-sphere-name: "&aSphere"
-particle-effect-plate-name: "&ePlate"
-particle-effect-hollow-plate-name: "&5Hollow plate"
+particles-effectsettings-pitch-description: "&7Ändere d'&bPitch\n&7Rotation vom Effekte\n\n&7Aktuelle Wert&8: &3{0}"
+particles-effectsettings-size-name: "&bGrössi"
+particles-effectsettings-size-description: "&7Ändere d&bGrössi\n&7vom Effekt\n\n&7Aktuelle Wert&8: &3{0}"
+particles-effectsettings-particles-name: "&cPartikeltyp ändere"
+particles-effectsettings-particles-description: "&7Klick, um de Partikeltyp\n&7vom Effekt z'ändere.\n\n&7Momentan isch de Typ\n&7usgwählt&8: &c{0}"
+particles-effectsettings-teleport-name: "&3Teleportiere"
+particles-effectsettings-teleport-description: "&7Klick, um de Effekt\n&7ah dini aktuelli\n&7Position z'teleportiere"
+particles-effectsettings-delete-name: "&4Lösche"
+particles-effectsettings-delete-description: "&7Klick, um de Effekt\n&7z'lösche"
+particles-effectsettings-configure-name: "&cAktion konfiguriere"
+particles-effectsettings-configure-description: "&7Klick, um en Aktion\n&7für de Effekt\n&7z'konfiguriere"
+
+particle-effect-ring-name: "&2Chreis"
+particle-effect-cube-name: "&6Würfel"
+particle-effect-sphere-name: "&aChugle"
+particle-effect-plate-name: "&ePlatte"
+particle-effect-hollow-plate-name: "&5Hohli Platte"
 particle-effect-helix-name: "&9Helix"
 
+# Do not translate this part
 particle-flame-name: "&6Flames"
 particle-villager_happy-name: "&2Happy villager"
 particle-drip_water-name: "&bWater drip"
@@ -128,20 +130,20 @@ particle-fireworks-name: "&fFireworks"
 particle-heart-name: "&cHeart"
 particle-enchantment_table-name: "&9Enchantment table"
 
-action-inventory-name: "&cConfigure action"
-action-velocity-name: "&aVelocity boost"
-action-velocity-description: "&7Boosts the player\n&7into the air"
-action-jumpboost-name: "&aJump boost"
-action-jumpboost-description: "&7Gives the player the\n&2jump boost &7effect for\n&7a specific time"
-action-speed-name: "&aSpeed boost"
-action-speed-description: "&7Gives the player the\n&2speed &7effect for a\n&7specific time"
-action-info-name: "&bChange value"
-action-info-description-velocity: "&7Change the power\n&7of the boost\n\n&7Current power: &2{0}"
-action-info-description-jumpboost: "&7Change the duration\n&7of the jump boost effect.\n\n&7Current boost: &2{0} seconds"
-action-info-description-speed: "&7Change the duration\n&7of the speed effect.\n\n&7Current boost: &2{0} seconds"
-
-particles-message-delete-success: "&7You &asuccessfully &7deleted the &bparticle effect&7."
-particles-message-teleport-success: "&7You &asuccessfully &7teleported the &bparticle effect &7to your current position."
+action-inventory-name: "&cAktion konfiguriere"
+action-velocity-name: "&aBeschlünigungsboost"
+action-velocity-description: "&7Boost de Spieler\n&7ih d'Luft"
+action-jumpboost-name: "&aSprungchraft"
+action-jumpboost-description: "&7Gibt em Spieler de\n&2Sprungchraft &7Effekt für\n&7e bestimmti Ziit"
+action-speed-name: "&aGschwindigkeitseffekt"
+action-speed-description: "&7Gibt em Spieler den\n&2Gschwindigkeitseffekt &7für\n&7e bestimmti Ziit"
+action-info-name: "&bWert ändere"
+action-info-description-velocity: "&7Änder d'Stärchi\n&7vom Boost\n\n&7Aktuelli Stärchi: &2{0}"
+action-info-description-jumpboost: "&7Änder d'Duur vom\n&7Sprungchraft Effekt.\n\n&7Aktuelli Ziit: &2{0} Sekunde"
+action-info-description-speed: "&7Änder d'Duur vom\n&7Gschwindigkeitseffekt.\n\n&7Aktuelli Ziit: &2{0} Sekunde"
+
+particles-message-delete-success: "&7Du hesch de &bPartikeleffekt &7erfolgrich &cglöscht&7."
+particles-message-teleport-success: "&7Du hesch de &bPartikeleffekt &7ah dini aktuelli Position &ateleportiert&7."
 
 message-editor-start-1: "&7Du chasch s'Modul jetzt &bbaue&8."
 message-editor-start-2: "&7Du chasch Partikel ih de &bIhstellige &cdeaktiviere&7, indem du ih de &cPerformance-Editor &7wechslisch&8."
@@ -253,4 +255,6 @@ scoreboard-map: "&7Map&8:"
 scoreboard-teams: "&7Teams&8:"
 scoreboard-time: "&7Ziit&8: "
 
-# Translated by Lezurex (https://github.com/Lezurex) 
+item-tracker-name: "&9Tracker"
+
+# Translated by Lezurex (https://github.com/Lezurex)