Many fixes

core/pom.xml

@@ -123,15 +123,16 @@
 		<!-- NBT-API -->
 		<dependency>
 			<groupId>de.tr7zw</groupId>
-			<artifactId>item-nbt-api</artifactId>
-			<version>2.15.0</version>
+			<artifactId>item-nbt-api-plugin</artifactId>
+			<version>2.15.1</version>
+			<scope>provided</scope>
 		</dependency>
 
 		<!-- XSeries -->
 		<dependency>
 			<groupId>com.github.cryptomorin</groupId>
 			<artifactId>XSeries</artifactId>
-			<version>13.2.0</version>
+			<version>13.3.3</version>
 		</dependency>
 
 		<!--This adds the Spigot API artifact to the build -->
@@ -339,17 +340,15 @@
 		<dependency>
 			<groupId>me.clip</groupId>
 			<artifactId>placeholderapi</artifactId>
-			<version>2.11.1</version>
+			<version>2.11.6</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<!-- HikariCP -->
 		<dependency>
 			<groupId>com.zaxxer</groupId>
 			<artifactId>HikariCP</artifactId>
-			<version>4.0.3</version>
-			<scope>compile</scope>
-			<type>jar</type>
+			<version>6.3.0</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
@@ -515,14 +514,15 @@
 					</artifactSet>
 					<relocations>
 						<relocation>
-							<pattern>de.tr7zw.changeme.nbtapi</pattern>
+							<pattern>com.cryptomorin.xseries</pattern>
 							<shadedPattern>
-								me.kryniowesegryderiusz.kgenerators.dependencies.shaded.nbtapi</shadedPattern>
+								me.kryniowesegryderiusz.kgenerators.dependencies.shaded.xseries</shadedPattern>
 						</relocation>
 						<relocation>
-							<pattern>com.cryptomorin.xseries</pattern>
+							<pattern>com.zaxxer.hikari</pattern>
 							<shadedPattern>
-								me.kryniowesegryderiusz.kgenerators.dependencies.shaded.xseries</shadedPattern>
+								me.kryniowesegryderiusz.kgenerators.dependencies.shaded.hikaricp
+							</shadedPattern>
 						</relocation>
 					</relocations>
 				</configuration>

core/src/main/java/me/kryniowesegryderiusz/kgenerators/Main.java

@@ -5,6 +5,7 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 
+import me.kryniowesegryderiusz.kgenerators.listeners.*;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -31,14 +32,6 @@
 import me.kryniowesegryderiusz.kgenerators.generators.upgrades.UpgradesManager;
 import me.kryniowesegryderiusz.kgenerators.gui.MenusManager;
 import me.kryniowesegryderiusz.kgenerators.lang.Lang;
-import me.kryniowesegryderiusz.kgenerators.listeners.BlockBreakListener;
-import me.kryniowesegryderiusz.kgenerators.listeners.BlockPistonListener;
-import me.kryniowesegryderiusz.kgenerators.listeners.BlockPlaceListener;
-import me.kryniowesegryderiusz.kgenerators.listeners.CraftingListeners;
-import me.kryniowesegryderiusz.kgenerators.listeners.FurnaceSmeltListener;
-import me.kryniowesegryderiusz.kgenerators.listeners.InventoryClickListener;
-import me.kryniowesegryderiusz.kgenerators.listeners.GeneratorProtectionListeners;
-import me.kryniowesegryderiusz.kgenerators.listeners.PlayerInteractListener;
 import me.kryniowesegryderiusz.kgenerators.logger.Logger;
 import me.kryniowesegryderiusz.kgenerators.multiversion.MultiVersionManager;
 import me.kryniowesegryderiusz.kgenerators.settings.Settings;
@@ -173,6 +166,7 @@ public void enable() {
 			this.getServer().getPluginManager().registerEvents(new InventoryClickListener(), this);
 			this.getServer().getPluginManager().registerEvents(new FurnaceSmeltListener(), this);
 			this.getServer().getPluginManager().registerEvents(new GeneratorProtectionListeners(), this);
+			this.getServer().getPluginManager().registerEvents(new WorldListeners(), this);
 			//Chunk listeners were moved to PlacedGeneratorsManager
 
 			/* 

core/src/main/java/me/kryniowesegryderiusz/kgenerators/data/databases/SQLDatabase.java

@@ -61,6 +61,7 @@ public SQLDatabase(DatabaseType dbType, SQLConfig sqlconfig) {
 				config.setJdbcUrl("jdbc:sqlite:" + Main.getInstance().getDataFolder().getPath() + "/data/database.db");
 				config.setConnectionTestQuery("SELECT 1");
 				config.setMaxLifetime(60000); // 60 Sec
+				config.setKeepaliveTime(0); // Disable keepalive for SQLite
 				config.setMaximumPoolSize(sqlconfig.getPoolSize());
 				if (sqlconfig.getPoolSize() > 1) {
 					Logger.warn("Database " + dbType.name() + ": SQL: The pool size is higher than one! If you dont know what you're doing change database.pool-size in config.yml to one!");
@@ -102,6 +103,7 @@ public SQLDatabase(DatabaseType dbType, SQLConfig sqlconfig) {
 				config.setPassword(sqlconfig.getDbPass());
 				config.setConnectionTestQuery("SELECT 1");
 				config.setMaxLifetime(60000); // 60 Sec
+				config.setKeepaliveTime(30000); // 30 Sec
 				config.setMaximumPoolSize(sqlconfig.getPoolSize());
 				if (sqlconfig.getPoolSize() <= 1)
 					Logger.warn("Database " + dbType.name() + ": SQL: The pool size is set to one! You probably want to change database.pool-size in config.yml to 3 or higher!");

core/src/main/java/me/kryniowesegryderiusz/kgenerators/dependencies/hooks/NBTAPIHook.java

@@ -2,7 +2,7 @@
 
 import org.bukkit.inventory.ItemStack;
 
-import de.tr7zw.changeme.nbtapi.NBT;
+import de.tr7zw.nbtapi.NBT;
 import me.kryniowesegryderiusz.kgenerators.logger.Logger;
 
 public class NBTAPIHook {

core/src/main/java/me/kryniowesegryderiusz/kgenerators/dependencies/hooks/SuperiorSkyblock2Hook.java

@@ -61,7 +61,7 @@ public static void forceHook() {
 					"Dependencies: SuperiorSkyblock2: Other party plugin tried to initialise additional privilages, but failed! IslandPrivileges are not added yet!");
 	}
 
-	@EventHandler
+	@EventHandler (priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onDeleteEvent(IslandDisbandEvent e) {
 
 		Location min = e.getIsland().getMinimum();

core/src/main/java/me/kryniowesegryderiusz/kgenerators/generators/locations/handlers/GeneratorLocationRegenerateHandler.java

@@ -14,7 +14,6 @@
 public class GeneratorLocationRegenerateHandler {
 
 	static Material pistonHead = XMaterial.PISTON_HEAD.get();
-	static Material pistonMoving = XMaterial.MOVING_PISTON.get();
 
 	public void handle(GeneratorLocation gLocation) {
 
@@ -30,7 +29,7 @@ public void handle(GeneratorLocation gLocation) {
 		Location generatingLocation = gLocation.getGeneratedBlockLocation();
 		Block generatingLocationBlock = generatingLocation.getBlock();
 
-		if (generatingLocationBlock.getType() == pistonHead || generatingLocationBlock.getType() == pistonMoving) {
+		if (generatingLocationBlock.getType() == pistonHead) {
 			gLocation.scheduleGeneratorRegeneration();
 			return;
 		}

core/src/main/java/me/kryniowesegryderiusz/kgenerators/listeners/WorldListeners.java

@@ -0,0 +1,16 @@
+package me.kryniowesegryderiusz.kgenerators.listeners;
+
+import me.kryniowesegryderiusz.kgenerators.Main;
+import org.bukkit.Chunk;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.world.WorldUnloadEvent;
+
+public class WorldListeners implements Listener {
+    @EventHandler
+    public void onWorldUnload(WorldUnloadEvent e) {
+        for(Chunk chunk : e.getWorld().getLoadedChunks()) {
+            Main.getPlacedGenerators().unloadChunk(chunk);
+        }
+    }
+}

core/src/main/resources/plugin.yml

@@ -5,6 +5,7 @@ author: Kryniowesegryderiusz (Krynio_ on spigot)
 website: https://www.spigotmc.org/resources/79246/
 description: Create your custom generators
 loadbefore: [SuperiorSkyblock2]
+depend: [NBTAPI]
 softdepend: [ItemsAdder, PlaceholderAPI]
 api-version: 1.13
 commands: