Merge branch 'BentoBoxWorld:develop' into develop

Author: Zarkness

pom.xml

@@ -55,7 +55,7 @@
         <powermock.version>2.0.9</powermock.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.21.3-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>3.2.5-SNAPSHOT</bentobox.version>
+        <bentobox.version>3.3.1-SNAPSHOT</bentobox.version>
         <!-- Warps addon version -->
         <warps.version>1.12.0</warps.version>
         <!-- Visit addon version -->
@@ -67,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.19.2</build.version>
+        <build.version>2.19.3</build.version>
         <sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -351,7 +351,7 @@
                     <doclint>none</doclint>  <!-- Turnoff all checks -->
                     <failOnError>false</failOnError>
                     <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
-                    <source>17</source>
+                    <source>21</source>
                 </configuration>
                 <executions>
                     <execution>

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

@@ -100,7 +100,7 @@ private void addMissing(ConfigurationSection blocks) {
 
     private boolean isOther(String key) {
         // Maybe a custom name space
-        return ItemsAdderHook.isInRegistry(key);
+        return addon.isItemsAdder() && ItemsAdderHook.isInRegistry(key);
     }
 
     private boolean isSpawner(String key) {

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

@@ -60,6 +60,7 @@
 import world.bentobox.bentobox.managers.AddonsManager;
 import world.bentobox.bentobox.managers.CommandsManager;
 import world.bentobox.bentobox.managers.FlagsManager;
+import world.bentobox.bentobox.managers.HooksManager;
 import world.bentobox.bentobox.managers.IslandWorldManager;
 import world.bentobox.bentobox.managers.IslandsManager;
 import world.bentobox.bentobox.managers.PlaceholdersManager;
@@ -118,6 +119,8 @@ public class LevelTest {
 	private PluginManager pim;
 	@Mock
 	private BlockConfig blockConfig;
+    @Mock
+    private HooksManager hm;
 
 	@BeforeClass
 	public static void beforeClass() throws IOException {
@@ -150,6 +153,8 @@ public static void beforeClass() throws IOException {
 	 */
     @Before
 	public void setUp() throws Exception {
+        when(plugin.getHooks()).thenReturn(hm);
+
         Server server = ServerMocks.newServer();
 		// Set up plugin
 		Whitebox.setInternalState(BentoBox.class, "instance", plugin);