Release 2.11.0 (#290)

* Version 2.7.1 * Version 2.7.2 * Use Java 9's takeWhile * Added placeholder %Level_[gamemode]_rank_value Fixes #228 * No save on disable (#231) * Release 2.6.4 * Remove saving to database on disable. #229 First, the top ten tables are never actually used or loaded. They are created in memory by loading the island levels. So there is no reason to keep saving them. Second, the island level data is saved every time it is changed, so there is no need to save all of the cache on exit. * Fixes tests * Rosestacker (#232) * Add support for RoseStacker 1.3.0 * Made plugin a Pladdon. * Version 2.8.0 * Added new placeholders %Level_%gamemode%_top_island_name_%rank% - lists the island name %Level_%gamemode%_top_island_members_%rank% - a comma separated list of team members #224 #211 #132 #107 #105 * Update to BentoBox API 1.18 * Open up modules for testing access. * Back support for BentoBox 1.16.5. * Version 2.8.1 * Speeds up level calculation by doing more chunk scans async. If chests are scanned, then it will take longer because these have to be done sync. #243 * add Vietnamese (#240) * Raw island level placeholder (#241) * Changed IslandLevelCalculator minHeight to world minHeight for negative blocks height support since 1.18. (#246) * Version 2.9.0 * Chinese Translation (#249) * Translate zh-CN.yml via GitLocalize * Translate zh-CN.yml via GitLocalize Co-authored-by: mt-gitlocalize <[email protected]> Co-authored-by: 织梦 <[email protected]> * Translate id.yml via GitLocalize (#250) Co-authored-by: Nathan Adhitya <[email protected]> * Translate fr.yml via GitLocalize (#251) Co-authored-by: organizatsiya <[email protected]> * Korean translation (#252) * Translate ko.yml via GitLocalize * Translate ko.yml via GitLocalize Co-authored-by: chickiyeah <[email protected]> Co-authored-by: mt-gitlocalize <[email protected]> * German Translation (#253) * Translate de.yml via GitLocalize * Update de.yml Co-authored-by: Rikamo045 <[email protected]> Co-authored-by: tastybento <[email protected]> * Translate hu.yml via GitLocalize (#254) Co-authored-by: András Marczinkó <[email protected]> * Version 2.9.1 * Attempt to handle WildStacker spawners * Fix error lon loading id locale * Avoid async chunk snapshotting. Fixes #256 * Update to BentoBox API 1.20. Replace plugin.yml with spigot-annotations. Implement customizable TopLevelPanel. * Fixes some small issues with TopLevelPanel Add Utils class that contains some useful things. * Implement customizable DetailsPanel. Remove old DetailsGUITab due to new implementation. * Fix failing test. * Remove blank file * Added repo for maven plugin snapshots * Implement feature that allows to sort items in detail panel. (#259) Apparently, because it is 2 years old request, it got in a state -> implement or drop. Fixes #192 * Implement calculated value for blocks. (#260) It is ~ value, as calculation formula cannot be applied per block. At least I think so. Part of #192 * Update es.yml (#261) * Implement customizable Values GUI. (#262) This GUI shows value to all items in game. It also shows max limit of blocks, if it is set. Fixes of #192 * Support for AdvancedChests was updated. (#266) * Implements visit/warp actions in top gui Add 2 new actions for island buttons in TOP GUI: - Visit -> allows to visit island, but it requires Visit Addon - Warp -> allows to warp to island, but it requires Warp Addon Requested via Discord. * Fixes a Level addon crash on startup. Level addon crashed at the startup if Visit or Warps addon were not installed. It happened because Level addon main class were implementing Listener interface. To avoid it and fix the crash, I moved migration listener to a separate class. Fixes #2012 * Translate pl.yml via GitLocalize (#269) Co-authored-by: wiktorm12 <[email protected]> * Translate fr.yml via GitLocalize (#272) Co-authored-by: organizatsiya <[email protected]> * Update to Java 17 * Update Github workflow to Java 17 * Adds %Level_[gamemode]_island_level_max% placeholder This records the lifetime maximum level the island has ever had. Addresses #271 * Only shows Members or higher in the top members placeholder Fixes #267 * Add natural log to level-calc formula parsing Relates to #274 * feat: add island total points + placeholder (#264) * feat: add island total points + placeholder * Update IslandLevels.java * Fix JavaDoc * Translate zh-CN.yml via GitLocalize (#276) Co-authored-by: dawnTak <[email protected]> * Translate nl.yml via GitLocalize (#277) Co-authored-by: DevSolaris <[email protected]> * Add ${argLine} to get jacoco coverage * Updated Jacoco POM * Add shulker to in chest count (#275) * Sonar Cloud code smell clean up (#278) * Refactor placeholders (#279) * Update ReadMe * Fix Jacoco * Remove unused imports * Remove placeholders from main class Created a separate class for cleaner code and added a test class. * Remove dependency * Add UltimateStacker hook for stacked blocks (#281) * Create plugin.yml (#282) * Create plugin.yml The annotations do not provide the option to define the version dynamically from maven. This should fix that. * Remove Spigot Plugin Annotations * Remove plugin-annotation repo * Updated dependencies * Version 2.10.1 * Add blocks that should be zero by default as they are available on the ocean floor. #284 * Chinese (#288) * Translate zh-CN.yml via GitLocalize * Translate zh-CN.yml via GitLocalize --------- Co-authored-by: Jeansou <[email protected]> Co-authored-by: dawnTak <[email protected]> * Translate id.yml via GitLocalize (#287) Co-authored-by: Dusty <[email protected]> * French (#286) * Translate fr.yml via GitLocalize * Translate fr.yml via GitLocalize * Translate fr.yml via GitLocalize --------- Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com> Co-authored-by: organizatsiya <[email protected]> Co-authored-by: Florian CUNY <[email protected]> * Spanish (#285) * Translate es.yml via GitLocalize * Translate es.yml via GitLocalize --------- Co-authored-by: ChrissTM03 <[email protected]> Co-authored-by: Espan <[email protected]> * Version 2.11.0 --------- Co-authored-by: Huynh Tien <[email protected]> Co-authored-by: Rubén <[email protected]> Co-authored-by: Pierre Dedrie <[email protected]> Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com> Co-authored-by: mt-gitlocalize <[email protected]> Co-authored-by: 织梦 <[email protected]> Co-authored-by: Nathan Adhitya <[email protected]> Co-authored-by: organizatsiya <[email protected]> Co-authored-by: chickiyeah <[email protected]> Co-authored-by: Rikamo045 <[email protected]> Co-authored-by: András Marczinkó <[email protected]> Co-authored-by: BONNe <[email protected]> Co-authored-by: KrazyxWolf <[email protected]> Co-authored-by: DeadSilenceIV <[email protected]> Co-authored-by: wiktorm12 <[email protected]> Co-authored-by: evlad <[email protected]> Co-authored-by: dawnTak <[email protected]> Co-authored-by: DevSolaris <[email protected]> Co-authored-by: DevSolaris <[email protected]> Co-authored-by: ceze88 <[email protected]> Co-authored-by: Jeansou <[email protected]> Co-authored-by: Dusty <[email protected]> Co-authored-by: Florian CUNY <[email protected]> Co-authored-by: ChrissTM03 <[email protected]> Co-authored-by: Espan <[email protected]>
BentoBoxWorld · Jun 3, 2023 · f87603d · f87603d
1 parent 95c9e55
commit f87603d
Show file tree

Hide file tree

Showing 6 changed files with 280 additions and 101 deletions.
diff --git a/pom.xml b/pom.xml
@@ -71,7 +71,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>2.10.0</build.version>
+        <build.version>2.11.0</build.version>
         <sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -127,18 +127,6 @@
     </pluginRepositories>
 
     <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
-        </repository>
-        <repository>
-            <id>codemc-repo</id>
-            <url>https://repo.codemc.org/repository/maven-public/</url>
-        </repository>
-        <repository>
-            <id>codemc-public</id>
-            <url>https://repo.codemc.org/repository/maven-public/</url>
-        </repository>
         <!--Wild Stacker repo -->
         <repository>
             <id>jitpack.io</id>
@@ -154,6 +142,18 @@
             <id>songoda-public</id>
             <url>https://repo.songoda.com/repository/public/</url>
         </repository>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
+        </repository>
+        <repository>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>codemc-public</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -331,10 +331,10 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.0.1</version>
                 <configuration>
+                    <doclint>none</doclint>  <!-- Turnoff all checks -->
                     <failOnError>false</failOnError>
-                    <additionalJOption>-Xdoclint:none</additionalJOption>
                     <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
-                    <source>16</source>
+                    <source>17</source>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/src/main/java/world/bentobox/level/Level.java b/src/main/java/world/bentobox/level/Level.java
@@ -190,9 +190,9 @@ private void hookExtensions()
 
     /**
      * Compares versions
-     * @param version1
-     * @param version2
-     * @return <0 if version 1 is older than version 2, =0 if the same, >0 if version 1 is newer than version 2
+     * @param version1 version 1
+     * @param version2 version 2
+     * @return {@code <0 if version 1 is older than version 2, =0 if the same, >0 if version 1 is newer than version 2}
      */
     public static int compareVersions(String version1, String version2) {
         int comparisonResult = 0;

diff --git a/src/main/resources/blockconfig.yml b/src/main/resources/blockconfig.yml
@@ -778,6 +778,58 @@ worlds:
     ANDESITE: 0
     DIORITE: 0
   acidisland_world:
+    BRAIN_CORAL: 0
+    BRAIN_CORAL_BLOCK: 0
+    BRAIN_CORAL_FAN: 0
+    BRAIN_CORAL_WALL_FAN: 0
+    BUBBLE_CORAL: 0
+    BUBBLE_CORAL_BLOCK: 0
+    BUBBLE_CORAL_FAN: 0
+    BUBBLE_CORAL_WALL_FAN: 0
+    DEAD_BRAIN_CORAL: 0
+    DEAD_BRAIN_CORAL_BLOCK: 0
+    DEAD_BRAIN_CORAL_FAN: 0
+    DEAD_BRAIN_CORAL_WALL_FAN: 0
+    DEAD_BUBBLE_CORAL: 0
+    DEAD_BUBBLE_CORAL_BLOCK: 0
+    DEAD_BUBBLE_CORAL_FAN: 0
+    DEAD_BUBBLE_CORAL_WALL_FAN: 0
+    FIRE_CORAL: 0
+    FIRE_CORAL_BLOCK: 0
+    FIRE_CORAL_FAN: 0
+    FIRE_CORAL_WALL_FAN: 0
+    DEAD_FIRE_CORAL: 0
+    DEAD_FIRE_CORAL_BLOCK: 0
+    DEAD_FIRE_CORAL_FAN: 0
+    DEAD_FIRE_CORAL_WALL_FAN: 0
+    HORN_CORAL: 0
+    HORN_CORAL_BLOCK: 0
+    HORN_CORAL_FAN: 0
+    HORN_CORAL_WALL_FAN: 0
+    DEAD_HORN_CORAL: 0
+    DEAD_HORN_CORAL_BLOCK: 0
+    DEAD_HORN_CORAL_FAN: 0
+    DEAD_HORN_CORAL_WALL_FAN: 0
+    TUBE_CORAL: 0
+    TUBE_CORAL_BLOCK: 0
+    TUBE_CORAL_FAN: 0
+    TUBE_CORAL_WALL_FAN: 0
+    DEAD_TUBE_CORAL: 0
+    DEAD_TUBE_CORAL_BLOCK: 0
+    DEAD_TUBE_CORAL_FAN: 0
+    DEAD_TUBE_CORAL_WALL_FAN: 0
     SAND: 0
     SANDSTONE: 0
+    RED_SAND: 0
     ICE: 0
+    AMETHYST_CLUSTER: 0
+    AMETHYST_BLOCK: 0
+    LARGE_AMETHYST_BUD: 0
+    MEDIUM_AMETHYST_BUD: 0
+    SMALL_AMETHYST_BUD: 0
+    BUDDING_AMETHYST: 0
+    SEA_PICKLE: 0
+    CALCITE: 0
+    TALL_SEAGRASS: 0
+    SEAGRASS: 0
+    SMOOTH_BASALT: 0
diff --git a/src/main/resources/locales/es.yml b/src/main/resources/locales/es.yml
@@ -1,94 +1,79 @@
-###########################################################################################################
-# Este es un archivo YML. Tenga cuidado al editar. Revisa tus ediciones en un verificador de YAML como    #
-# el de http://yaml-online-parser.appspot.com                                                             #
-###########################################################################################################
-
+---
 admin:
   level:
     parameters: "<player>"
-    description: "Calcula el nivel de la isla del jugador"
+    description: Calcula el nivel de la isla del jugador
     sethandicap:
-      parameters: <player> <handicap>
-      description: "Define la desventaja de la isla, usualmente el nivel inicial para nuevas islas"
+      parameters: "<player> <handicap>"
+      description: Define la desventaja de la isla, usualmente el nivel inicial para
+        nuevas islas
       changed: "&aDesventaja inicial de la isla cambiado de [number] a [new_number]."
       invalid-level: "&cNúmero no válido. Usa un número entero."
   levelstatus:
-    description: "Muestra cuantas islas hay en la cola para escanear"
+    description: Muestra cuantas islas hay en la cola para escanear
     islands-in-queue: "&aIslas en cola: [number]"
   top:
-    description: "Muestra la lista de las diez primeras islas"
+    description: Muestra la lista de las diez primeras islas
     unknown-world: "&c¡Mundo desconocido!"
     display: "&f[rank]. &a[name] &7- &b[level]"
     remove:
-      description: "Elimina a un jugador de los diez primeros"
-      parameters: "<player>"
-
-
+      description: Elimina a un jugador de los diez primeros
+      parameters: "<jugador>"
 island:
-  level: 
+  level:
     parameters: "[player]"
-    description: "Calcula tu nivel de isla o muestra el nivel de [player]"
+    description: Calcula tu nivel de isla o muestra el nivel de [player]
     calculating: "&aCalculando nivel..."
     estimated-wait: "&aEspera estimada: [number] segundos"
     in-queue: "&aEstás en el puesto [number] de la cola"
     island-level-is: "&aNivel de isla es de &b[level]"
-    required-points-to-next-level: "&a[points] Puntos requeridos hasta el siguiente nivel."
+    required-points-to-next-level: "&a[points] Puntos requeridos hasta el siguiente
+      nivel."
     deaths: "&c([number] Muertes)"
     cooldown: "&cDebes esperar &b[time] &csegundos para poder volver a hacer esto."
     in-progress: "&6El Calculo del nivel de la islas está en progreso..."
     time-out: "&cEl calculo del nivel de la isla está tardando. Intente más tarde."
-
   top:
-    description: "Muestra el top de islas"
+    description: Muestra el top de islas
     gui-title: "&aTop diez"
     gui-heading: "&6[name]: &b[rank]"
     island-level: "&bNivel [level]"
     warp-to: "&aLlevándote a la isla de [name]"
-
   level-details:
-    above-sea-level-blocks: "Bloques sobre el nivel del mar"
-    spawners: "Spawners"
-    underwater-blocks: "Bloques debajo del nivel del mar"
-    all-blocks: "Todos los bloques"
+    above-sea-level-blocks: Bloques sobre el nivel del mar
+    spawners: Spawners
+    underwater-blocks: Bloques debajo del nivel del mar
+    all-blocks: Todos los bloques
     no-island: "&c¡Sin isla!"
-    names-island: "Isla de [name]"
+    names-island: Isla de [name]
     syntax: "[name] x [number]"
     hint: "&cEscriba /level para ver el recuento de bloques"
-
-  value:
-    description: "Muestra el valor de un bloque en la mano"
-    success: "&7El valor del este bloque es: &e[value]"
-    success-underwater: "&7El valor de este bloque debajo del nivel del mar es: &e[value]"
-    empty-hand: "&cNo hay bloques en tu mano."
-    no-value: "&cEste objeto no tiene valor."
-
 level:
+  commands:
+    value:
+      parameters: "[hand|<material>]"
+      description: muestra el valor de los bloques. Añade 'hand' al final para mostrar
+        el valor del bloque de la mano.
   gui:
     titles:
       top: "&0&lTop de islas"
       detail-panel: "&0&lIsla de [name]"
+      value-panel: "&0&l Valores de los Bloques"
     buttons:
       island:
-        empty: '&f&l[name]. lugar'
-        name: '&f&l[name]'
+        empty: "&f&l[name]. lugar"
+        name: "&f&l[name]"
         description: |-
           [owner]
           [members]
           [place]
           [level]
-        # Text that is replacing [name] if island do not have a name
-        owners-island: "Isla de [player]"
-        # Text for [owner] in description.
+        owners-island: Isla de [player]
         owner: "&7&l Dueño: &r&b[player]"
-        # Title before listing members for [members] in description
         members-title: "&7&l Miembros:"
-        # List each member under the title for [members] in description
         member: "&b - [player]"
-        # Name of unknown player.
         unknown: " desconocido"
-        # Section for parsing [place]
         place: "&7&o [number]. &r&7lugar"
-        # Section for parsing [level]
         level: "&7 Nivel: &o[number]"
       material:
         name: "&f&l[number] x [material]"
@@ -123,39 +108,65 @@ level:
           &7 nivel del mar.
       spawner:
         name: "&f&lSpawners"
-        description: |-
-          &7Mostrar solo spawners.
+        description: "&7Mostrar solo spawners."
       filters:
         name:
           name: "&f&lOrdenar por nombre"
-          description: |-
-            &7Ordenar todos los bloques por nombre.
+          description: "&7Ordenar todos los bloques por nombre."
         value:
           name: "&f&lOrdenar por valor"
-          description: |-
-            &7Ordenar todos los bloques por valor.
+          description: "&7Ordenar todos los bloques por valor."
         count:
           name: "&f&lOrdenar por cantidad"
-          description: |-
-            &7Ordenar todos los bloques por cantidad.
-      # Button that is used in multi-page GUIs which allows to return to previous page.
+          description: "&7Ordenar todos los bloques por cantidad."
+      value:
+        name: "&f&l [material]"
+        description: |-
+          [description]
+          [value]
+          [underwater]
+          [limit]
+          [id]
+        id: "&7 ID de Bloque: &e [id]"
+        value: "&7 Valor del Bloque: &e [number]"
+        underwater: "&7 Por debajo del nivel del mar: &e [number]"
+        limit: "&7 Límite de bloque: &e [number]"
       previous:
         name: "&f&lPágina anterior"
-        description: |-
-          &7Cambiar a la página [number]
-      # Button that is used in multi-page GUIs which allows to go to next page.
+        description: "&7Cambiar a la página [number]"
       next:
         name: "&f&lSiguiente página"
+        description: "&7Cambiar a la página [number]"
+      search:
+        name: "&f&l Buscar"
         description: |-
-          &7Cambiar a la página [number]
+          &7 Buscar un determinado
+          &7 valor.
+        search: "&b Valor: [value]"
     tips:
       click-to-view: "&eClic &7para ver."
       click-to-previous: "&eClic &7 para ir a la página anterior."
       click-to-next: "&eClic &7 para ir a la siguiente página."
       click-to-select: "&eClic &7 para seleccionar."
       left-click-to-cycle-up: "&eClic izquierdo &7para ir hacia arriba."
       right-click-to-cycle-down: "&eClic derecho &7para ir hacia abajo."
+      left-click-to-change: "&e Clic Izquierdo &7 para editar."
+      right-click-to-clear: "&e Clic Derecho &7 para borrar."
+      click-to-asc: "&e Clic &7 para ordenar de forma creciente."
+      click-to-desc: "&e Clic &7 para ordenar de forma decreciente."
+      click-to-warp: "&e Clic &7 para teletransportarse."
+      click-to-visit: "&e Clic &7 para visitar."
+      right-click-to-visit: "&e Clic Derecho &7 para visitar."
   conversations:
-    # Prefix for messages that are send from server.
     prefix: "&l&6[BentoBox]: &r"
     no-data: "&cEscriba /level para ver el recuento de bloques."
+    cancel-string: cancelar
+    exit-string: cancelar, salir, abandonar
+    write-search: "&e Introduce un valor de búsqueda. (Escribe 'cancel' para salir)"
+    search-updated: "&a Valor de búsqueda actualizado."
+    cancelled: "&c ¡Conversación cancelada!"
+    no-value: "&c Ese ítem no tiene valor."
+    unknown-item: "&c El '[material]' no existe en el juego."
+    value: "&7 El valor de '[material]' es: &e[value]"
+    value-underwater: "&7 El valor de '[material]' por debajo del nivel del mar: &e[value]"
+    empty-hand: "&c No hay bloques en tu mano"