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

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew.bat

@@ -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...");
 

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

@@ -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);
+        }
+    }
+}

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

@@ -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/api/block/impl/FileBlockDataManager.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/listeners/AnvilListener.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) {