Merge pull request #228 from BentoBoxWorld/develop

Release 1.26.0
BentoBoxWorld · Nov 17, 2024 · f3c9b4c · f3c9b4c
2 parents 8095cdd + 52c12e2
commit f3c9b4c
Show file tree

Hide file tree

Showing 9 changed files with 340 additions and 219 deletions.
diff --git a/pom.xml b/pom.xml
@@ -39,13 +39,9 @@
     </issueManagement>
 
     <distributionManagement>
-        <snapshotRepository>
-            <id>codemc-snapshots</id>
-            <url>https://repo.codemc.org/repository/maven-snapshots</url>
-        </snapshotRepository>
         <repository>
-            <id>codemc-releases</id>
-            <url>https://repo.codemc.org/repository/maven-releases</url>
+            <id>bentoboxworld</id>
+            <url>https://repo.codemc.org/repository/bentoboxworld/</url>
         </repository>
     </distributionManagement>
 
@@ -57,14 +53,14 @@
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.9</powermock.version>
         <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.20.5-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>2.4.1-SNAPSHOT</bentobox.version>
+        <spigot.version>1.21.3-R0.1-SNAPSHOT</spigot.version>
+        <bentobox.version>2.7.1-SNAPSHOT</bentobox.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.25.0</build.version>
+        <build.version>1.26.0</build.version>
         <sonar.projectKey>BentoBoxWorld_Limits</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -118,13 +114,13 @@
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
         </repository>
         <repository>
-            <id>codemc</id>
-            <url>https://repo.codemc.org/repository/maven-snapshots/</url>
+            <id>bentoboxworld</id>
+            <url>https://repo.codemc.org/repository/bentoboxworld/</url>
         </repository>
         <repository>
-            <id>codemc-repo</id>
-            <url>https://repo.codemc.org/repository/maven-public/</url>
-        </repository>
+             <id>codemc</id>
+             <url>https://repo.codemc.org/repository/maven-snapshots/</url>
+         </repository>
     </repositories>
 
     <dependencies>

diff --git a/src/main/java/world/bentobox/limits/Limits.java b/src/main/java/world/bentobox/limits/Limits.java
@@ -6,6 +6,7 @@
 import java.util.stream.Collectors;
 
 import org.bukkit.Material;
+import org.bukkit.Registry;
 import org.bukkit.World;
 import org.bukkit.entity.EntityType;
 import org.eclipse.jdt.annotation.Nullable;
@@ -137,7 +138,7 @@ public JoinListener getJoinListener() {
 
     private void registerPlaceholders(GameModeAddon gm) {
         if (getPlugin().getPlaceholdersManager() == null) return;
-        Arrays.stream(Material.values())
+        Registry.MATERIAL.stream()
         .filter(Material::isBlock)
         .forEach(m -> registerCountAndLimitPlaceholders(m, gm));
 

diff --git a/src/main/java/world/bentobox/limits/commands/player/LimitTab.java b/src/main/java/world/bentobox/limits/commands/player/LimitTab.java
@@ -48,7 +48,7 @@ enum SORT_BY {
             .put(EntityType.IRON_GOLEM, Material.IRON_BLOCK)
             .put(EntityType.ILLUSIONER, Material.VILLAGER_SPAWN_EGG)
             .put(EntityType.WITHER, Material.WITHER_SKELETON_SKULL)
-            .put(EntityType.BOAT, Material.OAK_BOAT)
+            //.put(EntityType.BOAT, Material.OAK_BOAT)
             .put(EntityType.ARMOR_STAND, Material.ARMOR_STAND)
             .put(EntityType.ITEM_FRAME, Material.ITEM_FRAME)
             .put(EntityType.PAINTING, Material.PAINTING)
@@ -58,7 +58,7 @@ enum SORT_BY {
             .put(EntityType.FURNACE_MINECART, Material.FURNACE_MINECART)
             .put(EntityType.HOPPER_MINECART, Material.HOPPER_MINECART)
             .put(EntityType.SPAWNER_MINECART, Material.MINECART)
-            .put(EntityType.CHEST_BOAT, Material.OAK_CHEST_BOAT)
+            //.put(EntityType.CHEST_BOAT, Material.OAK_CHEST_BOAT)
             .build();
     // This is a map of blocks to Items
     private static final Map<Material, Material> B2M;

diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml
@@ -1,7 +1,7 @@
 name: Limits
 main: world.bentobox.limits.Limits
 version: ${version}${build.number}
-api-version: 2.3.0
+api-version: 2.7.1
 
 authors: tastybento
 

diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml
@@ -21,9 +21,7 @@ admin:
          finished: "&a Island recalc finished successfully!"
       offset:
         unknown: "&c Unknown material or entity [name]."
-        main:
-          parameters: ""
-          description: "allows to manage limits offsets for materials and entities"
+        description: "allows to manage limits offsets for materials and entities"
         set:
           parameters: "<player> <material|entity> <number>"
           description: "sets new offset for material or entity limit"

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: BentoBox-Limits
 main: world.bentobox.limits.LimitsPladdon
 version: ${project.version}${build.number}
-api-version: "1.19"
+api-version: "1.21"
 
 authors: [tastybento]
 contributors: ["The BentoBoxWorld Community"]