Release 2.17.0

pom.xml

@@ -41,13 +41,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>
 
@@ -58,8 +54,8 @@
  <!-- Non-minecraft related dependencies -->
  <powermock.version>2.0.9</powermock.version>
  <!-- More visible way how to change dependency versions -->
- <spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
- <bentobox.version>2.5.1-SNAPSHOT</bentobox.version>
+ <spigot.version>1.21.3-R0.1-SNAPSHOT</spigot.version>
+ <bentobox.version>2.7.1-SNAPSHOT</bentobox.version>
  <!-- Warps addon version -->
  <warps.version>1.12.0</warps.version>
  <!-- Visit addon version -->
@@ -71,7 +67,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.16.1</build.version>
+ <build.version>2.17.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,6 +123,26 @@
  </pluginRepositories>
 
  <repositories>
+ <repository>
+ <id>spigot-repo</id>
+ <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
+ </repository>
+ <repository>
+ <id>codemc</id>
+ <url>https://repo.codemc.org/repository/maven-snapshots/</url>
+ </repository>
+ <repository>
+ <id>codemc-repo</id>
+ <url>https://repo.codemc.org/repository/maven-public/</url>
+ </repository>
+ <repository>
+ <id>bentoboxworld</id>
+ <url>https://repo.codemc.org/repository/bentoboxworld/</url>
+ </repository>
+ <repository>
+ <id>jitpack.io</id>
+ <url>https://jitpack.io</url>
+ </repository>
  <!--Wild Stacker repo -->
  <repository>
  <id>bg-repo</id>
@@ -142,22 +158,6 @@
  <id>songoda-plugins</id>
  <url>https://repo.songoda.com/repository/minecraft-plugins/</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>
- <repository>
- <id>jitpack.io</id>
- <url>https://jitpack.io</url>
- </repository>
  </repositories>
 
  <dependencies>
@@ -235,7 +235,7 @@
  <dependency>
  <groupId>dev.rosewood</groupId>
  <artifactId>rosestacker</artifactId>
- <version>1.3.0</version>
+ <version>1.5.27</version>
  <scope>provided</scope>
  </dependency>
  <!-- Ultimate Stacker dependency -->
@@ -274,25 +274,25 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.4.0</version>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.3.1</version>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.13.0</version>
  <configuration>
  <release>${java.version}</release>
  </configuration>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version>
+ <version>3.5.2</version>
  <configuration>
  <argLine>
  ${argLine}
@@ -329,12 +329,12 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-jar-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.4.2</version>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.11.1</version>
  <configuration>
  <doclint>none</doclint> <!-- Turnoff all checks -->
  <failOnError>false</failOnError>
@@ -353,7 +353,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-source-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.3.1</version>
  <executions>
  <execution>
  <id>attach-sources</id>
@@ -366,17 +366,17 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
+ <version>3.1.3</version>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>3.1.3</version>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-shade-plugin</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.6.0</version>
  <configuration>
  <minimizeJar>true</minimizeJar>
  <artifactSet>

src/main/java/world/bentobox/level/PlaceholderManager.java

@@ -2,6 +2,7 @@
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -111,7 +112,8 @@ String getRankName(World world, int rank, boolean weighted) {
  rank = Math.max(1, Math.min(rank, Level.TEN));
  if (weighted) {
  return addon.getManager().getWeightedTopTen(world, Level.TEN).keySet().stream().skip(rank - 1L).limit(1L)
- .findFirst().map(Island::getOwner).map(addon.getPlayers()::getName).orElse("");
+ .findFirst().map(Island::getOwner).filter(Objects::nonNull).map(addon.getPlayers()::getName)
+ .orElse("");
  }
  @Nullable
  UUID owner = addon.getManager().getTopTen(world, Level.TEN).keySet().stream().skip(rank - 1L).limit(1L)

src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java

@@ -62,7 +62,12 @@ public class IslandLevelCalculator {
  Material.LIME_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.ORANGE_SHULKER_BOX,
  Material.PINK_SHULKER_BOX, Material.PURPLE_SHULKER_BOX, Material.RED_SHULKER_BOX, Material.RED_SHULKER_BOX,
  Material.WHITE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX, Material.COMPOSTER, Material.BARREL,
- Material.DISPENSER, Material.DROPPER, Material.SMOKER, Material.BLAST_FURNACE);
+ Material.DISPENSER, Material.DROPPER, Material.SMOKER, Material.BLAST_FURNACE, Material.BUNDLE,
+ Material.RED_BUNDLE, Material.BLACK_BUNDLE, Material.BLUE_BUNDLE, Material.BROWN_BUNDLE,
+ Material.CYAN_BUNDLE, Material.GRAY_BUNDLE, Material.GREEN_BUNDLE, Material.LIGHT_BLUE_BUNDLE,
+ Material.LIGHT_GRAY_BUNDLE, Material.LIME_BUNDLE, Material.MAGENTA_BUNDLE, Material.ORANGE_BUNDLE,
+ Material.PINK_BUNDLE, Material.PURPLE_BUNDLE, Material.RED_BUNDLE, Material.WHITE_BUNDLE,
+ Material.YELLOW_BUNDLE);
  private static final int CHUNKS_TO_SCAN = 100;
  private final Level addon;
  private final Queue<Pair<Integer, Integer>> chunksToCheck;
@@ -469,6 +474,7 @@ private void scanAsync(ChunkPair cp) {
 
  // Scan chests
  if (addon.getSettings().isIncludeChests() && CHESTS.contains(m)) {
+
  chestBlocks.add(cp.chunk);
  }
  // Add the value of the block's material

src/main/java/world/bentobox/level/config/BlockConfig.java

@@ -13,6 +13,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.Registry;
 import org.bukkit.World;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -96,7 +97,7 @@ private Map<Material, Integer> loadBlockValues(YamlConfiguration blockValues2) {
  ConfigurationSection blocks = Objects.requireNonNull(blockValues2.getConfigurationSection("blocks"));
  Map<Material, Integer> bv = new EnumMap<>(Material.class);
  // Update blockvalues to latest settings
-Arrays.stream(Material.values()).filter(Material::isBlock)
+Registry.MATERIAL.stream().filter(Material::isBlock)
  .filter(m -> !m.name().startsWith("LEGACY_"))
  .filter(m -> !m.isAir())
  .filter(m -> !m.equals(Material.WATER))

src/main/java/world/bentobox/level/panels/ValuePanel.java

@@ -58,6 +58,7 @@ private ValuePanel(Level addon,
  this.activeFilter = Filter.NAME_ASC;
  this.materialRecordList = Arrays.stream(Material.values()).
  filter(Material::isBlock).
+ filter(Material::isItem). // Remove things like PITCHER_CROP
  filter(m -> !m.name().startsWith("LEGACY_")).
  filter(this.addon.getBlockConfig()::isNotHiddenBlock).
  map(material ->
@@ -584,6 +585,7 @@ private PanelItem createMaterialButton(ItemTemplateRecord template, TemplatedPan
  return null;
  }
 
+ @SuppressWarnings("deprecation")
  int index = this.pageIndex * slot.amountMap().getOrDefault(BLOCK, 1) + slot.slot();
 
  if (index >= this.elementList.size())

src/main/resources/addon.yml

@@ -2,7 +2,7 @@ name: Level
 main: world.bentobox.level.Level
 version: ${version}${build.number}
 icon: DIAMOND
-api-version: 2.5.1
+api-version: 2.7.1
 
 authors: tastybento
 

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: BentoBox-Level
 main: world.bentobox.level.LevelPladdon
 version: ${project.version}${build.number}
-api-version: "1.19"
+api-version: "1.21"
 
 authors: [tastybento]
 contributors: ["The BentoBoxWorld Community"]

src/test/java/world/bentobox/level/LevelTest.java

@@ -66,6 +66,7 @@
 import world.bentobox.level.config.ConfigSettings;
 import world.bentobox.level.listeners.IslandActivitiesListeners;
 import world.bentobox.level.listeners.JoinLeaveListener;
+import world.bentobox.level.mocks.ServerMocks;
 
 /**
  * @author tastybento
@@ -147,6 +148,7 @@ public static void beforeClass() throws IOException {
  */
  @Before
 	public void setUp() throws Exception {
+ Server server = ServerMocks.newServer();
  // Set up plugin
  Whitebox.setInternalState(BentoBox.class, "instance", plugin);
  when(plugin.getLogger()).thenReturn(Logger.getAnonymousLogger());
@@ -186,7 +188,6 @@ public void setUp() throws Exception {
 
  // Server
  PowerMockito.mockStatic(Bukkit.class);
- Server server = mock(Server.class);
  when(Bukkit.getServer()).thenReturn(server);
  when(Bukkit.getLogger()).thenReturn(Logger.getAnonymousLogger());
  when(Bukkit.getPluginManager()).thenReturn(mock(PluginManager.class));
@@ -252,6 +253,7 @@ public void setUp() throws Exception {
  */
 	@After
 	public void tearDown() throws Exception {
+ ServerMocks.unsetBukkitServer();
  deleteAll(new File("database"));
 	}