did some maintenance :3

- updated dependencies
- fixed dependency reallocation since core changed their locations
- updated shadow jar plugin to new fork to keep up with updates and fix unknown class 65 (java shit)
- fixed confirmation gui default config to not be stupid
- updated NBTAPI usage to be in line with recent changes (1.20.5 ...)

Author: sh0inx

build.gradle.kts

@@ -1,11 +1,11 @@
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("io.github.goooler.shadow") version "8.1.8"
 }
 
 group = "com.iridium"
-version = "1.0.7"
+version = "1.0.9"
 description = "IridiumChunkBusters"
 
 repositories {
@@ -17,14 +17,14 @@ repositories {
     maven("https://nexus.iridiumdevelopment.net/repository/maven-releases/")
     maven("https://papermc.io/repo/repository/maven-public/")
     maven("https://repo.rosewooddev.io/repository/public/")
-    maven("https://hub.jeff-media.com/nexus/repository/jeff-media-public/")
+    maven("https://repo.jeff-media.com/public/")
     mavenCentral()
 }
 
 dependencies {
     // Dependencies that we want to shade in
     implementation("org.jetbrains:annotations:26.0.1")
-    implementation("com.iridium:IridiumCore:2.0.8.8")
+    implementation("com.iridium:IridiumCore:2.0.9")
     implementation("org.bstats:bstats-bukkit:3.1.0")
     implementation("com.j256.ormlite:ormlite-core:6.1")
     implementation("com.j256.ormlite:ormlite-jdbc:6.1")
@@ -46,14 +46,29 @@ tasks {
     }
 
     shadowJar {
+        fun relocate(origin: String) =
+            relocate(origin, "com.iridium.iridiumchunkbusters.dependencies${origin.substring(origin.lastIndexOf('.'))}")
+
         // Remove the archive classifier suffix
         archiveClassifier.set("")
 
         // Relocate dependencies
-        relocate("com.fasterxml.jackson", "com.iridium.iridiumchunkbusters.dependencies.fasterxml")
-        relocate("com.j256.ormlite", "com.iridium.iridiumchunkbusters.dependencies.ormlite")
-        relocate("org.bstats", "com.iridium.iridiumchunkbusters.dependencies.bstats")
-        relocate("de.jeff_media", "com.iridium.iridiumchunkbusters.dependencies")
+        relocate("com.iridium.iridiumcore")
+        relocate("com.j256.ormlite")
+        relocate("de.jeff_media.updatechecker")
+        relocate("org.bstats")
+        relocate("org.intellij.lang.annotations")
+        relocate("org.jetbrains.annotations")
+        relocate("org.jnbt")
+
+        // Relocate IridiumCore dependencies
+        relocate("de.tr7zw.changeme.nbtapi")
+        relocate("com.iridium.iridiumcolorapi")
+        relocate("org.yaml.snakeyaml")
+        relocate("io.papermc.lib")
+        relocate("com.cryptomorin.xseries")
+        relocate("com.fasterxml.jackson")
+        relocate("org.apache.commons")
 
         // Remove unnecessary files from the jar
         minimize()

src/main/java/com/iridium/chunkbusters/IridiumChunkBusters.java

@@ -13,7 +13,7 @@
 import com.iridium.chunkbusters.listeners.PlayerInteractListener;
 import com.iridium.chunkbusters.support.*;
 import com.iridium.iridiumcore.IridiumCore;
-import com.iridium.iridiumcore.dependencies.nbtapi.NBTItem;
+import de.tr7zw.changeme.nbtapi.NBT;
 import com.iridium.iridiumcore.utils.ItemStackUtils;
 import com.iridium.iridiumcore.utils.Placeholder;
 import lombok.Getter;
@@ -95,15 +95,20 @@ public Support getSupport() {
 
     public ItemStack getChunkBuster(int size) {
         ItemStack itemStack = ItemStackUtils.makeItem(IridiumChunkBusters.getInstance().getConfiguration().chunkBuster, Collections.singletonList(new Placeholder("size", String.valueOf(size * 2 - 1))));
-        NBTItem nbtItem = new NBTItem(itemStack);
-        nbtItem.setInteger("IridiumChunkBuster", size);
-        return nbtItem.getItem();
+
+        NBT.modify(itemStack, readWriteItemNBT -> {
+            readWriteItemNBT.resolveOrCreateCompound("IridiumChunkBuster").setInteger("size", size);
+        });
+
+        return itemStack;
     }
 
     public int getChunkBusterSize(ItemStack itemStack) {
         if (itemStack == null || itemStack.getType() == Material.AIR) return 0;
-        NBTItem nbtItem = new NBTItem(itemStack);
-        return nbtItem.hasKey("IridiumChunkBuster") ? nbtItem.getInteger("IridiumChunkBuster") : 0;
+
+        return NBT.get(itemStack, readableItemNBT -> {
+            return readableItemNBT.resolveOrDefault("IridiumChunkBuster.size", 0);
+        });
     }
 
     @Override

src/main/java/com/iridium/chunkbusters/configs/Configuration.java

@@ -1,7 +1,7 @@
 package com.iridium.chunkbusters.configs;
 
 import com.iridium.iridiumcore.Item;
-import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
+import com.cryptomorin.xseries.XMaterial;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -25,7 +25,7 @@ public class Configuration {
     public Item no = new Item(XMaterial.RED_STAINED_GLASS_PANE, 1, "&c&lNo", Collections.emptyList());
     public Item nextPage = new Item(XMaterial.GREEN_STAINED_GLASS_PANE, 1, "&a&lNext", Collections.emptyList());
     public Item previousPage = new Item(XMaterial.RED_STAINED_GLASS_PANE, 1, "&c&lPrevious", Collections.emptyList());
-    public Item chunkBusterLog = new Item(XMaterial.PLAYER_HEAD, 0, 1, "&e&l%player%", "%player%", Arrays.asList("&7Size: %size%x%size%", "&7Time: %time%", "&7Chunk: %chunk%", "", "&e&l[!] &7Click to restore chunks"));
+    public Item chunkBusterLog = new Item(XMaterial.PLAYER_HEAD, 0, "%player%", 1, "&e&l%player%", Arrays.asList("&7Size: %size%x%size%", "&7Time: %time%", "&7Chunk: %chunk%", "", "&e&l[!] &7Click to restore chunks"));
 
     public List<XMaterial> blacklist = Arrays.asList(XMaterial.BEDROCK, XMaterial.SPAWNER);
 

src/main/java/com/iridium/chunkbusters/database/ChunkBuster.java

@@ -3,7 +3,7 @@
 import com.iridium.chunkbusters.ChunkLayer;
 import com.iridium.chunkbusters.IridiumChunkBusters;
 import com.iridium.chunkbusters.gui.ConfirmationGUI;
-import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
+import com.cryptomorin.xseries.XMaterial;
 import com.j256.ormlite.dao.ForeignCollection;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.field.ForeignCollectionField;

src/main/java/com/iridium/chunkbusters/gui/ConfirmationGUI.java

@@ -2,7 +2,7 @@
 
 import com.iridium.chunkbusters.IridiumChunkBusters;
 import com.iridium.chunkbusters.database.ChunkBuster;
-import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
+import com.cryptomorin.xseries.XMaterial;
 import com.iridium.iridiumcore.utils.ItemStackUtils;
 import com.iridium.iridiumcore.utils.StringUtils;
 import lombok.Getter;

src/main/java/com/iridium/chunkbusters/gui/LogsGUI.java

@@ -2,7 +2,7 @@
 
 import com.iridium.chunkbusters.IridiumChunkBusters;
 import com.iridium.chunkbusters.database.ChunkBuster;
-import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
+import com.cryptomorin.xseries.XMaterial;
 import com.iridium.iridiumcore.utils.ItemStackUtils;
 import com.iridium.iridiumcore.utils.Placeholder;
 import lombok.Getter;