Merge upstream v2.1.1 with local fixes

- Sync with byteful/LevelTools upstream (v2.1.1)
- Re-apply EventPriority.HIGH fix on new TriggerListener, AnvilListener, LegacyAnvilListener
- Update Java target to 21

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: JobsonMarinho

.run/Build.run.xml

@@ -10,8 +10,8 @@
       </option>
       <option name="taskNames">
         <list>
+          <option value="clean" />
           <option value="shadowJar" />
-          <option value="publishMavenPublicationToMavenLocal" />
         </list>
       </option>
       <option name="vmOptions" />

README.md

@@ -6,74 +6,92 @@
 <h5 align="center">Support/Help Server: https://discord.gg/G8BDgqsuyw</h5>
 <h5 align="center">WIKI: https://github.com/byteful/LevelTools/wiki</h5>
 
-![Logo](https://github.com/byteful/LevelTools/blob/master/LevelTools%20Large%20Logo.png?raw=true)
+![Logo](https://github.com/byteful/LevelTools/blob/main/LevelTools%20Large%20Logo.png?raw=true)
 
-<h3 align="center">A plugin that adds a leveling system to tools, swords, and bows.</h3>
+<h3 align="center">A plugin that adds a leveling system to any item.</h3>
 
 ## Features
 
 - Supports versions 1.8 - 1.21.
-- Supports Folia
+- Supports Folia.
 - No dependencies.
 - Super efficient, no lag.
 - Simple developer API.
+- Profile-based configuration system.
+- Any item can level up with custom triggers.
 - Commands & enchants on level up.
-- Supports blacklisting for blocks and items for XP.
+- Supports blacklisting/whitelisting for blocks, entities, and items.
 - ActionBar notifications.
 - Item lore modification.
 
-## Developer API
+## v2.0.0 - Profile System
+
+LevelTools v2.0 introduces a modular profile-based configuration system. Instead of hardcoded tool types, you can now configure any item to level up.
+
+### Profile Types
+
+| Profile Type | Purpose | File |
+|-------------|---------|------|
+| **Trigger Profiles** | Define how XP is gained | `trigger_profiles.yml` |
+| **Reward Profiles** | Define rewards per level | `reward_profiles.yml` |
+| **Display Profiles** | Define name, lore, action bar | `display_profiles.yml` |
+| **Item Profiles** | Tie everything together | `item_profiles.yml` |
 
-### Gradle:
+### Trigger Types
 
-```groovy
-repositories {
-    maven { url 'https://jitpack.io' }
-}
+- `BLOCK_BREAK` - XP when breaking blocks
+- `ENTITY_KILL` - XP when killing entities
+- `FISHING` - XP when catching items
+- `RIGHT_CLICK` / `LEFT_CLICK` - XP on click
+- `CONSUME` - XP when consuming items
+- `FARMING` - XP when tilling soil and breaking plants
 
-dependencies {
-    compileOnly 'com.github.byteful:LevelTools:Tag' // Replace Tag with the version. (Ex: v1.4.0)
-}
-```
+### Default Supported Items
 
-### Maven:
+Out of the box, LevelTools supports:
+- Pickaxes, Axes, Shovels (block mining)
+- Swords, Bows, Crossbows (combat)
+- Fishing Rods (fishing)
+- Hoes (farming)
 
-```xml
+Add any item by creating custom profiles. See the [Wiki](https://github.com/byteful/LevelTools/wiki) for details.
 
-<repositories>
-    <repository>
-        <id>jitpack.io</id>
-        <url>https://jitpack.io</url>
-    </repository>
-</repositories>
+### Migration from v1.x
 
-<dependency>
-    <groupId>com.github.byteful</groupId>
-    <artifactId>LevelTools</artifactId>
-    <version>Tag</version> <!-- Replace Tag with the version. (Ex: v1.4.0) -->
-</dependency>
-```
+Your old config will be automatically backed up to `old_config.yml` and migrated to the new profile system.
+
+## Commands
+
+| Command | Description | Permission |
+|---------|-------------|------------|
+| `/leveltools help` | Shows command help | None |
+| `/leveltools reload` | Reloads configuration | `leveltools.admin` |
+| `/leveltools reset <player>` | Reset hand item for player | `leveltools.admin` |
+| `/leveltools reset <player> --all` | Reset all items for player | `leveltools.admin` |
+| `/leveltools xp <amount>` | Set hand item XP | `leveltools.admin` |
+| `/leveltools level <level>` | Set hand item level | `leveltools.admin` |
+| `/leveltools levelup` | Increase hand item level by 1 | `leveltools.admin` |
+| `/leveltools debug` | Show debug information | `leveltools.admin` |
+
+## Developer API
 
-### Example Usage:
+**View detailed API usage [here](https://github.com/byteful/LevelTools/wiki/Developer-API).**
 
-```java
-// Items
+## PlaceholderAPI
 
-ItemStack hand = player.getInventory().getItemInMainHand();
-LevelToolsItem tool = LevelToolsUtil.createLevelToolsItem(hand);
-tool.setLevel(69);
-tool.setXp(420);
-player.getInventory().setItemInMainHand(tool.getItemStack());
+| Placeholder | Description |
+|-------------|-------------|
+| `%leveltools_level%` | Item level (main hand) |
+| `%leveltools_xp%` | Current XP (main hand) |
+| `%leveltools_max_xp%` | XP needed for next level |
+| `%leveltools_progress%` | Progress percentage |
 
-// Events
+## Wiki
 
-@EventHandler
-public void onLevelEvent(LevelToolsLevelIncreaseEvent event) {
-  event.setNewLevel(69);
-}
+Full documentation available at: https://github.com/byteful/LevelTools/wiki
 
-@EventHandler
-public void onXPEvent(LevelToolsXPIncreaseEvent event) {
-  event.setNewXp(420);
-}
-```
+- [Configuration](https://github.com/byteful/LevelTools/wiki/Configuration)
+- [Trigger Profiles](https://github.com/byteful/LevelTools/wiki/Trigger-Profiles)
+- [Reward Profiles](https://github.com/byteful/LevelTools/wiki/Reward-Profiles)
+- [Display Profiles](https://github.com/byteful/LevelTools/wiki/Display-Profiles)
+- [Item Profiles](https://github.com/byteful/LevelTools/wiki/Item-Profiles)

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,27 +37,26 @@ repositories {
 }
 
 dependencies {
-    implementation 'de.tr7zw:item-nbt-api:2.13.1'
-    implementation 'com.github.Redempt:RedLib:6.6.1'
+    implementation 'de.tr7zw:item-nbt-api:2.15.5'
     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.Sven65:Item-Names:1.0.2'
-    implementation 'org.bstats:bstats-bukkit:3.0.2'
-    implementation 'com.jeff_media:MorePersistentDataTypes:2.4.0'
+    implementation 'com.github.cryptomorin:XSeries:13.6.0'
+    implementation 'com.github.Revxrsal.Lamp:common:3.3.6'
+    implementation 'com.github.Revxrsal.Lamp:bukkit:3.3.6'
+    implementation 'org.bstats:bstats-bukkit:3.2.1'
+    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
+    compileOnly 'net.kyori:adventure-api:4.26.1'
+    compileOnly 'net.kyori:adventure-platform-bukkit:4.4.1'
     compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
-    compileOnly 'org.jetbrains:annotations:24.1.0'
+    compileOnly 'org.jetbrains:annotations:26.1.0'
     compileOnly 'me.clip:placeholderapi:2.11.6'
 }
 
 group = 'me.byteful.plugin'
-version = '1.4.0.2'
+version = '2.1.1'
 description = 'LevelTools'
-java.sourceCompatibility = JavaVersion.VERSION_17
+java.sourceCompatibility = JavaVersion.VERSION_21
 
 publishing {
     publications {
@@ -74,36 +73,31 @@ shadowJar {
 
     relocate "de.tr7zw.changeme.nbtapi", "me.byteful.plugin.leveltools.libs.nbtapi"
     relocate "com.cryptomorin.xseries", "me.byteful.plugin.leveltools.libs.xseries"
-    relocate "redempt.redlib", "me.byteful.plugin.leveltools.libs.redlib"
+    relocate "redempt.crunch", "me.byteful.plugin.leveltools.libs.crunch"
     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 = 17
+def targetJavaVersion = 21
 java {
-    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
-    sourceCompatibility = 17
-    targetCompatibility = 17
+    sourceCompatibility = 21
+    targetCompatibility = 21
 }
 
 tasks.withType(JavaCompile).configureEach {
-    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
-        options.release.set(targetJavaVersion)
-    }
+    options.release.set(targetJavaVersion)
 }
 
 processResources {
     def props = [version: version]
     inputs.properties props
     filteringCharset 'UTF-8'
-    filesMatching('*.yml') {
+    filesMatching('plugin.yml') {
         expand props
     }
 }
 
 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