v1.4.1

Author: byteful

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'idea'
     id 'maven-publish'
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id("com.gradleup.shadow") version "9.0.0-beta13"
 }
 
 repositories {
@@ -37,15 +37,15 @@ repositories {
 }
 
 dependencies {
-    implementation 'de.tr7zw:item-nbt-api:2.13.1'
+    implementation 'de.tr7zw:item-nbt-api:2.15.0'
     implementation 'com.github.Redempt:RedLib:6.6.1'
     implementation 'com.github.Redempt:Crunch:2.0.3'
-    implementation 'com.github.cryptomorin:XSeries:11.2.0'
-    implementation 'com.github.Revxrsal.Lamp:common:3.2.1'
-    implementation 'com.github.Revxrsal.Lamp:bukkit:3.2.1'
+    implementation 'com.github.cryptomorin:XSeries:13.2.0'
+    implementation 'com.github.Revxrsal.Lamp:common:3.3.6'
+    implementation 'com.github.Revxrsal.Lamp:bukkit:3.3.6'
     implementation 'com.github.Sven65:Item-Names:1.0.2'
-    implementation 'org.bstats:bstats-bukkit:3.0.2'
-    implementation 'com.jeff_media:MorePersistentDataTypes:2.4.0'
+    implementation 'org.bstats:bstats-bukkit:3.1.0'
+    implementation 'com.jeff-media:MorePersistentDataTypes:2.4.0'
 
     compileOnly files('libs/folia-api-1.20.4-R0.1-SNAPSHOT.jar') // Modified API jar with Java 8 support
     compileOnly 'net.kyori:adventure-api:4.17.0' // Not used but needed for Folia compilation
@@ -55,7 +55,7 @@ dependencies {
 }
 
 group = 'me.byteful.plugin'
-version = '1.4.0.2'
+version = '1.4.1'
 description = 'LevelTools'
 java.sourceCompatibility = JavaVersion.VERSION_17
 
@@ -77,7 +77,7 @@ shadowJar {
     relocate "redempt.redlib", "me.byteful.plugin.leveltools.libs.redlib"
     relocate 'revxrsal.commands', 'me.byteful.plugin.leveltools.libs.lamp'
     relocate 'org.bstats', 'me.byteful.plugin.leveltools.libs.bstats'
-    relocate 'com.jeff_media.morepersistentdatatypes', 'me.byteful.plugin.leveltools.libs.morepersistentdatatypes'
+    relocate 'com.jeff-media.morepersistentdatatypes', 'me.byteful.plugin.leveltools.libs.morepersistentdatatypes'
 }
 
 def targetJavaVersion = 8
@@ -104,6 +104,4 @@ processResources {
 
 compileJava { // Preserve parameter names in the bytecode
     options.compilerArgs += ["-parameters"]
-    options.fork = true
-    options.forkOptions.executable = "javac"
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -9,6 +9,7 @@
 import java.util.concurrent.TimeUnit;
 import me.byteful.plugin.leveltools.api.AnvilCombineMode;
 import me.byteful.plugin.leveltools.api.block.BlockDataManager;
+import me.byteful.plugin.leveltools.api.block.BlockDataManagerFactory;
 import me.byteful.plugin.leveltools.api.block.impl.FileBlockDataManager;
 import me.byteful.plugin.leveltools.api.scheduler.Scheduler;
 import me.byteful.plugin.leveltools.listeners.AnvilListener;
@@ -54,17 +55,11 @@ public void onEnable() {
     setLevelXpFormula();
     getLogger().info("Loaded configuration...");
 
-    final Path blocksFile = getDataFolder().toPath().resolve("placed_blocks.txt");
-
-    if (!Files.exists(blocksFile)) {
-      try {
-        blocksFile.toFile().createNewFile();
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-    }
-
-    blockDataManager = new FileBlockDataManager(blocksFile, scheduler);
+    blockDataManager = BlockDataManagerFactory.createBlockDataManager(
+        getDataFolder().toPath(),
+        getConfig(),
+        scheduler
+    );
     blockDataManager.load();
     getLogger().info("Loaded block data manager...");
 

gradlew

@@ -0,0 +1,23 @@
+package me.byteful.plugin.leveltools.api.block;
+
+import me.byteful.plugin.leveltools.api.block.impl.FileBlockDataManager;
+import me.byteful.plugin.leveltools.api.block.impl.SqliteBlockDataManager;
+import me.byteful.plugin.leveltools.api.scheduler.Scheduler;
+import org.bukkit.configuration.ConfigurationSection;
+
+import java.nio.file.Path;
+import java.sql.SQLException;
+
+public class BlockDataManagerFactory {
+    public static BlockDataManager createBlockDataManager(Path dataFolder, ConfigurationSection config, Scheduler scheduler) {
+        String storageType = config.getString("block_data_storage.type", "LEGACY_TEXT");
+
+        switch (storageType.toUpperCase()) {
+            case "SQLITE":
+                return new SqliteBlockDataManager(dataFolder.resolve("placed_blocks.db"), scheduler);
+            case "LEGACY_TEXT":
+            default:
+                return new FileBlockDataManager(dataFolder.resolve("placed_blocks.txt"), scheduler);
+        }
+    }
+}

gradlew.bat

@@ -19,7 +19,7 @@
 import me.byteful.plugin.leveltools.util.Text;
 
 public class FileBlockDataManager implements BlockDataManager {
-  private static final int MAX_CACHE_SIZE = 10_000;
+  private static final int MAX_CACHE_SIZE = 100_000;
   private final Set<BlockPosition> cache = ConcurrentHashMap.newKeySet();
   private final Path file;
   private final ScheduledTask saveTask;
@@ -83,7 +83,8 @@ public void load() {
 
   @Override
   public void close() {
-    cache.clear();
     saveTask.stop();
+    save();
+    cache.clear();
   }
 }

src/main/java/me/byteful/plugin/leveltools/LevelToolsPlugin.java

@@ -57,7 +57,13 @@ public void onAnvilRepair(PrepareAnvilEvent e) {
       return;
     }
 
+    // Use result item to create a new leveltools item instance so other plugins can modify the result and we can still attempt to work with that
+    // just read the lvl and xp from the original item so it doesnt get reset
+    final LevelToolsItem original = LevelToolsUtil.createLevelToolsItem(firstItem);
     final LevelToolsItem finalItem = LevelToolsUtil.createLevelToolsItem(result);
+    finalItem.setLevel(original.getLevel());
+    finalItem.setXp(original.getXp());
+    finalItem.setLastHandledReward(original.getLastHandledReward());
     e.setResult(finalItem.getItemStack()); // This has to be done to patch lore issues.
   }
 }

src/main/java/me/byteful/plugin/leveltools/api/block/BlockDataManagerFactory.java

@@ -273,14 +273,15 @@ private static void smartSetLore(@NotNull ItemMeta meta, @NotNull List<String> t
       return;
     }
 
-    final int start = findPrefixStart(lore);
+    final int[] bounds = findPrefixBounds(lore);
+    final int start = bounds[0];
+    final int end = bounds[1];
     if (start == -1) {
       lore.addAll(toAdd);
       meta.setLore(lore);
 
       return;
     }
-    final int end = start + toAdd.size();
     if (end > lore.size()) {
       meta.setLore(toAdd);
 
@@ -292,14 +293,20 @@ private static void smartSetLore(@NotNull ItemMeta meta, @NotNull List<String> t
     meta.setLore(lore);
   }
 
-  private static int findPrefixStart(@NotNull List<String> lore) {
+  private static int[] findPrefixBounds(@NotNull List<String> lore) {
+    final int[] arr = new int[]{-1, -1};
     for (int i = 0; i < lore.size(); i++) {
       if (decolorize(lore.get(i)).startsWith(LORE_PREFIX)) {
-        return i;
+        if (arr[0] == -1) {
+          arr[0] = i;
+          arr[1] = i;
+        } else {
+          arr[1] = i;
+        }
       }
     }
 
-    return -1;
+    return arr;
   }
 
   public static void handleReward(LevelToolsItem tool, Player player) {