Update build version

# Conflicts:
#	docs/api/version/v10.md

.github/stale.yml

@@ -3,8 +3,6 @@ daysUntilClose: 7
 exemptLabels:
   - 'accepted'
   - 'bug'
-  - 'confirmed bug (tested)'
-  - 'potential bug (needs testing)'
   - 'suggestion'
   - 'help wanted'
 staleLabel: stale
@@ -12,4 +10,4 @@ markComment: >
   This issue has been automatically marked as stale because it has not had
   recent activity. It will be closed if no further activity occurs. Thank you
   for your contributions.
-closeComment: false
+closeComment: false

.github/workflows/build.yml

@@ -10,14 +10,19 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 25
-        uses: actions/setup-java@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: '25'
+          java-version: '17'
           distribution: 'temurin'
-          cache: 'maven'
+      - name: Cache Maven packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
       - name: Build
         run: mvn -B verify

.gitignore

@@ -16,7 +16,6 @@ local.properties
 .settings/
 .loadpath
 .gradle/
-.vscode/
 
 # External tool builders
 .externalToolBuilders/
@@ -53,8 +52,7 @@ nbproject
 
 target
 dependency-reduced-pom.xml
-src/test
-maven_output.txt
+test/
 
 # Wrapper files
 mvnw
@@ -173,20 +171,6 @@ Desktop.ini
 ## Misc.
 #############
 
-.cursorrules
-.windsurfrules
-.clinerules
-context.json
-context.yml
-run.sh
-run_*.sh
-no-log4j2.xml
-database.db
-*tests.txt
-test*.db
-nullnull
-refactor.txt
-
 # Compiled class file
 *.class
 
@@ -211,10 +195,4 @@ refactor.txt
 hs_err_pid*
 
 # Documentation dev folder
-docs/dev/
-
-# Extensions
-/src/main/java/net/coreprotect/utility/extensions
-!/src/main/java/net/coreprotect/utility/extensions/Extensions.java
-/.apt_generated/
-/.apt_generated_tests/
+docs/dev/

README.md

@@ -18,7 +18,7 @@ For a detailed description of the plugin, please visit [coreprotect.net](https:/
 | CoreProtect Discord: | [discord.gg/b4DZ4jy](https://discord.gg/b4DZ4jy) |
 | CoreProtect Patreon: | [patreon.com/coreprotect](https://www.patreon.com/coreprotect) |
 | CoreProtect Documentation: | [docs.coreprotect.net](https://docs.coreprotect.net) |
-| Downloads for MC 1.14 - 26.1: | [coreprotect.net/latest](https://coreprotect.net/latest/) |
+| Downloads for MC 1.14 - 1.20: | [coreprotect.net/latest](https://coreprotect.net/latest/) |
 | Downloads for MC 1.8 - 1.12: | [coreprotect.net/legacy](https://coreprotect.net/legacy/) |
 
 bStats
@@ -41,7 +41,7 @@ Maven
 <dependency>
     <groupId>net.coreprotect</groupId>
     <artifactId>coreprotect</artifactId>
-    <version>23.2</version>
+    <version>22.4</version>
     <scope>provided</scope>
 </dependency>
 ```

build.gradle

@@ -0,0 +1,89 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+plugins {
+    id 'java'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'com.palantir.git-version' version '0.13.0'
+}
+
+group = 'net.coreprotect'
+String projectVersion = '22.4'
+String projectBranch = ''
+version = projectVersion // `version` might be modified, we don't always want that (e.g. plugin.yml)
+description = 'Provides block protection for your server.'
+sourceCompatibility = '21'
+
+if (System.getenv("BUILD_NUMBER") != null) {
+    // Being built in Jenkins, append Build ID
+    version += "-${System.getenv("BUILD_NUMBER")}"
+} else if (!(version ==~ '^[^.]*\\.[^.]*\\.[^.]*$')) { // Thanks https://stackoverflow.com/a/9949200/1709894
+    // Append the Git hash if 'version' has less than two periods
+    version += "-${gitVersion()}"
+}
+logger.info("Building version $version")
+
+repositories {
+    maven { url = 'https://hub.spigotmc.org/nexus/content/groups/public/' }
+    maven { url = 'https://repo.papermc.io/repository/maven-public/' }
+    maven { url = 'https://repo.codemc.org/repository/maven-public/' }
+}
+
+dependencies {
+    implementation(platform("com.intellectualsites.bom:bom-newest:1.44")) // Ref: https://github.com/IntellectualSites/bom
+    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core")
+    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit")
+    compileOnly 'io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT'
+    implementation 'org.bstats:bstats-bukkit-lite:1.8'
+    implementation 'com.zaxxer:HikariCP:5.0.1'
+}
+
+jar {
+    archiveClassifier.set("original")
+}
+
+artifacts {
+    archives shadowJar
+}
+
+shadowJar {
+    dependencies {
+        // #toString because #getGroup technically returns an Object
+        relocate('org.bstats', project.group.toString())
+        relocate('com.zaxxer', project.group.toString())
+        exclude(dependency('com.google.code.gson:.*'))
+        exclude(dependency('org.intellij:.*'))
+        exclude(dependency('org.jetbrains:.*'))
+        exclude(dependency('org.slf4j:.*'))
+    }
+    archiveClassifier.set(null)
+}
+
+ext {
+    author = 'Intelli'
+
+    resourceTokens = [
+            'project.version': projectVersion,
+            'project.branch': projectBranch,
+    ]
+}
+
+processResources {
+    include 'plugin.yml'
+    // Whole lotta boilerplate to get the same functionality as Maven here.
+    // Replace this if Gradle ever lets us configure the filter before filtering.
+    filter(new Transformer<String, String>() {
+        @Override
+        String transform(String s) {
+            ReplaceTokens replaceTokens = new ReplaceTokens(new StringReader(s))
+            replaceTokens.setBeginToken('${')
+            replaceTokens.setEndToken('}')
+            resourceTokens.forEach { key, val ->
+                def token = new ReplaceTokens.Token()
+                token.setKey(key.toString())
+                token.setValue(val.toString())
+                replaceTokens.addConfiguredToken(token)
+            }
+            return replaceTokens.readLines().join('\n')
+        }
+    })
+}

docs/api/index.md

@@ -4,8 +4,8 @@ The CoreProtect API enables you to log your own block changes, perform lookups,
 
 | API Details |  |
 | --- | --- |
-| **API Version:** | 11 |
-| **Plugin Version:** | v23.1+ |
+| **API Version:** | 10 |
+| **Plugin Version:** | v22.4+ |
 | **Maven:** | [maven.playpro.com](https://maven.playpro.com) |
 
-*Documentation for the API version 10 can be found [here](/api/version/v11/).*
+*Documentation for the API version 10 can be found [here](/api/version/v10/).*

docs/api/version/v11.md

@@ -1,530 +0,0 @@
-# API Version 11
-
-The CoreProtect API enables you to log your own block changes, perform lookups, rollbacks, restores, and more. 
-
-| API Details |  |
-| --- | --- |
-| **API Version:** | 11 |
-| **Plugin Version:** | v23.1+ |
-| **Maven:** | [maven.playpro.com](https://maven.playpro.com) |
-
----
-
-## Upgrading from API v10
-
-The changes from the previous API version are as follows:
-
-- The following event was extended to include Location (mutable):
-```java
-CoreProtectPreLogEvent(String user, Location location)
-```
-- The old constructor remains for backward compatibility and is deprecated:
-```java
-@Deprecated
-CoreProtectPreLogEvent(String user)
-```
-
----
-
-## Getting Started
-
-Ensure you're using CoreProtect 23.1 or higher. Add it as an external jar to your plugin in your IDE.  
-Alternatively, if using Maven, you can add it via the repository https://maven.playpro.com (net.coreprotect, 23.1).
-
-The first thing you need to do is get access to CoreProtect. You can do this by using code similar to the following:
-
-```java
-import net.coreprotect.CoreProtect;
-import net.coreprotect.CoreProtectAPI;
-
-private CoreProtectAPI getCoreProtect() {
-        Plugin plugin = getServer().getPluginManager().getPlugin("CoreProtect");
-     
-        // Check that CoreProtect is loaded
-        if (plugin == null || !(plugin instanceof CoreProtect)) {
-            return null;
-        }
-
-        // Check that the API is enabled
-        CoreProtectAPI CoreProtect = ((CoreProtect) plugin).getAPI();
-        if (CoreProtect.isEnabled() == false) {
-            return null;
-        }
-
-        // Check that a compatible version of the API is loaded
-        if (CoreProtect.APIVersion() < 11) {
-            return null;
-        }
-
-        return CoreProtect;
-}
-```
-
-With this code, you can then access the API with a call like the following:
-
-```java
-CoreProtectAPI api = getCoreProtect();
-if (api != null){ // Ensure we have access to the API
-  api.testAPI(); // Will print out "[CoreProtect] API test successful." in the console.
-}
-```
-
-Yay, you're now using the CoreProtect API!
-
----
-
-## API Overview
-
-### Available Methods
-
-```java
-boolean isEnabled()
-
-void testAPI()
-
-List<String[]> performLookup(int time, List<String> restrict_users, List<String> exclude_users, List<Object> restrict_blocks, List<Object> exclude_blocks, List<Integer> action_list, int radius, Location radius_location)
-    
-List<String[]> performRollback(int time, List<String> restrict_users, List<String> exclude_users, List<Object> restrict_blocks, List<Object> exclude_blocks, List<Integer> action_list, int radius, Location radius_location)
-    
-List<String[]> performRestore(int time, List<String> restrict_users, List<String> exclude_users, List<Object> restrict_blocks, List<Object> exclude_blocks, List<Integer> action_list, int radius, Location radius_location)
-
-List<String[]> blockLookup(Block block, int time)
-
-List<String[]> sessionLookup(String user, int time)
-
-List<String[]> queueLookup(Block block)
-
-ParseResult parseResult(String[] result)
-
-boolean logChat(Player player, String message)
-
-boolean logCommand(Player player, String command)
-
-boolean logPlacement(String user, BlockState blockState)
-
-boolean logPlacement(String user, Location location, Material type, BlockData blockData)
-
-boolean logRemoval(String user, BlockState blockState)
-
-boolean logRemoval(String user, Location location, Material type, BlockData blockData)
-
-boolean logContainerTransaction(String user, Location location)
-
-boolean logInteraction(String user, Location location)
-
-boolean hasPlaced(String user, Block block, int time, int offset)
-
-boolean hasRemoved(String user, Block block, int time, int offset)
-
-void performPurge(int time)
-```
-
----
-
-### Available Events
-
-The following events are emitted by CoreProtect.
-
-#### CoreProtectPreLogEvent
-
-Fired when a CoreProtect logger is about to log an action. Cancellable.
-
-| Property | Description | Mutable |
-| --- | --- | --- |
-| User | The name of the user under which this action will be logged. | Yes |
-| Location | The location where the action will be logged. | Yes |
-| Cancelled | If cancelled, the action won't be logged to the database. | Yes |
-
----
-
-### Method Usage
-
-*Detailed method information is listed below.*
-
-#### `isEnabled()`
-
-Calling this will return true if the server has the CoreProtect API enabled, and false if it does not.
-
----
-
-#### `testAPI()`
-
-Running this will print out "[CoreProtect] API Test Successful." in the server console.
-
----
-
-#### `performLookup(int time, List<String> restrict_users, List<String> exclude_users, List<Object> restrict_blocks, List<Object> exclude_blocks, List<Integer> action_list, int radius, Location radius_location)`
-
-This will perform a lookup.
-
-* **time:** Specify the amount of time to search back. "5" would return results from the last 5 seconds.
-* **restrict_users:** Specify any usernames to perform the lookup on. Can be set to "null" if both a radius and a location are specified.
-* **exclude_users:** Specify any usernames to exclude from the lookup. Can be set to "null".
-* **restrict_blocks:** Specify a list of EntityType's or Material's to restrict the search to. Can be set to "null".
-* **exclude_blocks:** Specify a list of EntityType's or Material's to exclude from the search. Can be set to "null".
-* **action_list:** Specify a list of action types to restrict the search to. Can be set to "null"
-* **radius:** Specify a radius to restrict the search to. A location must be specified if using this. Set to "0" to disable.
-* **radius_location:** Specify a location to search around. Can be set to "null" if no radius is specified, and a user is specified.
-
----
-
-#### `performRollback(int time, List<String> restrict_users, List<String> exclude_users, List<Object> restrict_blocks, List<Object> exclude_blocks, List<Integer> action_list, int radius, Location radius_location)`
-
-This will perform a rollback. Method must be called async.
-
-* **time:** Specify the amount of time to rollback. "5" would return results from the last 5 seconds.
-* **restrict_users:** Specify any usernames to perform the rollback on. Can be set to "null" if both a radius and a location are specified.
-* **exclude_users:** Specify any usernames to exclude from the rollback. Can be set to "null".
-* **restrict_blocks:** Specify a list of EntityType's or Material's to restrict the rollback to. Can be set to "null".
-* **exclude_blocks:** Specify a list of EntityType's or Material's to exclude from the rollback. Can be set to "null".
-* **action_list:** Specify a list of action types to restrict the rollback to. Can be set to "null"
-* **radius:** Specify a radius to restrict the rollback to. A location must be specified if using this. Set to "0" to disable.
-* **radius_location:** Specify a location to rollback around. Can be set to "null" if no radius is specified, and a user is specified.
-
----
-
-#### `performRestore(int time, List<String> restrict_users, List<String> exclude_users, List<Object> restrict_blocks, List<Object> exclude_blocks, List<Integer> action_list, int radius, Location radius_location)`
-
-This will perform a restore.
-
-* **time:** Specify the amount of time to restore. "5" would return results from the last 5 seconds.
-* **restrict_users:** Specify any usernames to perform the restore on. Can be set to "null" if both a radius and a location are specified.
-* **exclude_users:** Specify any usernames to exclude from the restore. Can be set to "null".
-* **restrict_blocks:** Specify a list of EntityType's or Material's to restrict the restore to. Can be set to "null".
-* **exclude_blocks:** Specify a list of EntityType's or Material's to exclude from the restore. Can be set to "null".
-* **action_list:** Specify a list of action types to restrict the restore to. Can be set to "null"
-* **radius:** Specify a radius to restrict the restore to. A location must be specified if using this. Set to "0" to disable.
-* **radius_location:** Specify a location to restore around. Can be set to "null" if no radius is specified, and a user is specified.
-
----
-
-#### `blockLookup(Block block, int time)`
-
-This will perform a full lookup on a single block.
-
-* **block:** The block to perform the lookup on.
-* **time:** Specify the amount of time to lookup. "5" would return results from the last 5 seconds.
-
----
-
-#### `queueLookup(Block block)`
-
-This will search the consumer queue for changes on a block not yet saved in the database.
-
-* **block:** The block to perform the lookup on.
-
----
-
-#### `sessionLookup(String user, int time)`
-
-This will perform a session lookup on a single player.
-
-* **user:** The username to perform the lookup on.
-* **time:** Specify the amount of time to lookup. "5" would return results from the last 5 seconds.
-
----
-
-#### `ParseResult parseResult(String[] result)`
-
-This will parse results from a lookup. You'll then be able to view the following:
-
-* **getX():** Get the X coordinate of the block.
-* **getY():** Get the Y coordinate of the block.
-* **getZ():** Get the Z coordinate of the block.
-* **getType():** Get the Material of the block.
-* **getBlockData():** Get the BlockData of the block.
-* **getPlayer():** Get the username as a string.
-* **getTimestamp():** Get the time of the action.
-* **getActionId():** Get the action ID. (0=removed, 1=placed, 2=interaction)
-* **getActionString():** Get the action as a string. (Removal, Placement, Interaction)
-* **isRolledBack():** If the block is currently rolled back or not.
-* **worldName():** The name of the world the block is located in.
-
----
-
-#### `logPlacement(String user, BlockState blockState)`
-
-This will log a block as being placed. *(Thread safe)*
-
-* **user:** Specify the username to log as having placed the block.
-* **blockState:** Specify the BlockState of the block you're logging.
-
----
-
-#### `logPlacement(String user, Location location, Material type, BlockData blockData)`
-
-This will log a block as being placed.
-
-* **user:** Specify the username to log as having placed the block.
-* **location:** Specify the location of the block you're logging.
-* **type:** Specify the Material of the block you're logging.
-* **blockData:** Specify the BlockData of the block you're logging. Can be set to "null".
-
----
-
-#### `logRemoval(String user, BlockState blockState)`
-
-This will log a block as being removed/broken. *(Thread safe)*
-
-* **user:** Specify the username to log as having removed the block.
-* **blockState:** Specify the BlockState of the block you're logging.
-
----
-
-#### `logRemoval(String user, Location location, Material type, BlockData blockData)`
-
-This will log a block as being removed/broken, and will log the block's inventory (if applicable).
-
-* **user:** Specify the username to log as having removed the block.
-* **location:** Specify the location of the block you're logging.
-* **type:** Specify the Material of the block you're logging.
-* **blockData:** Specify the BlockData of the block you're logging. Can be set to "null".
-
----
-
-#### `logContainerTransaction(String user, Location location)`
-
-This will log any transactions made to a block's inventory immediately after calling the method.
-
-* **user:** Specify the username to log as having added/removed the items.
-* **location:** Specify the location of the block inventory you're logging.
-
----
-
-#### `logInteraction(String user, Location location)`
-
-This will log a block as having been interacted with.
-
-* **user:** Specify the username to log as having caused the interaction.
-* **location:** Specify the location of the interaction you're logging.
-
----
-
-#### `hasPlaced(String user, Block block, int time, int offset)`
-
-This will return true if a user has already placed a block at the location within the specified time limit.
-
-* **user:** The username you're checking to see if they've placed a block already.
-* **block:** The block you're checking.
-* **time:** How far back to check. "5" would only check through the last 5 seconds of logged blocks.
-* **offset:** A time offset. "2" would ignore the last 2 seconds of most recently ignored data. (0 = no offset)
-
----
-
-#### `hasRemoved(String user, Block block, int time, int offset)`
-
-This will return true if a user has already removed a block at the location within the specified time limit.
-
-* **user:** The username you're checking to see if they've removed a block already.
-* **block:** The block you're checking.
-* **time:** How far back to check. "5" would only check through the last 5 seconds of logged blocks.
-* **offset:** A time offset. "2" would ignore the last 2 seconds of most recently ignored data. (0 = no offset)
-
----
-
-#### `performPurge(int time)`
-
-This will perform a purge on the CoreProtect database.
-
-* **time:** Purge any data earlier than this. "120" would purge any data older than 120 seconds (2 minutes).
-
----
-
-
-### Examples
-
-- Get the last 60 seconds of block data for the user "Notch".
-```java
-CoreProtectAPI CoreProtect = getCoreProtect();
-if (CoreProtect != null){ // Ensure we have access to the API
-  List<String[]> lookup = CoreProtect.performLookup(60, Arrays.asList("Notch"), null, null, null, null, 0, null);
-  if (lookup != null){
-    for (String[] result : lookup){
-      ParseResult parseResult = CoreProtect.parseResult(result);
-      int x = parseResult.getX();
-      int y = parseResult.getY();
-      int z = parseResult.getZ();
-      // ...
-    }
-  }
-}
-``` 
-
----
-
-- Get the last 60 seconds of block data for the user "Notch", excluding dirt and grass blocks.
-```java
-CoreProtectAPI CoreProtect = getCoreProtect();
-if (CoreProtect != null){ // Ensure we have access to the API
-  List<Object> exclude = Arrays.asList(Material.DIRT, Material.GRASS);
-  List<String[]> lookup = CoreProtect.performLookup(60, Arrays.asList("Notch"), null, null, exclude, null, 0, null);
-  if (lookup != null){
-    for (String[] value : lookup){
-      ParseResult result = CoreProtect.parseResult(value);
-      int x = result.getX();
-      int y = result.getY();
-      int z = result.getZ();
-      // ...
-    }
-  }
-}
-``` 
-
----
-
-- Get the last 60 seconds of block data within 5 blocks of a location.
-```java
-CoreProtectAPI CoreProtect = getCoreProtect();
-if (CoreProtect != null){ // Ensure we have access to the API
-  List<String[]> lookup = CoreProtect.performLookup(60, null, null, null, null, null, 5, location);
-  if (lookup != null){
-    for (String[] value : lookup){
-      ParseResult result = CoreProtect.parseResult(value);
-      int x = result.getX();
-      int y = result.getY();
-      int z = result.getZ();
-      // ...
-    }
-  }
-}
-``` 
-
----
-
-- Rollbacks / restores use the same code structure as the above examples. For example:
-```java
-class BasicThread implements Runnable {
-@Override
-public void run() {
-  try {
-    CoreProtectAPI CoreProtect = getCoreProtect();
-    if (CoreProtect != null){ // Ensure we have access to the API
-      List<String[]> lookup = CoreProtect.performRollback(60, Arrays.asList("Notch"), null, null, null, null, 0, null);
-      if (lookup != null){
-        for (String[] value : lookup){
-          ParseResult result = CoreProtect.parseResult(value);
-          int x = result.getX();
-          int y = result.getY();
-          int z = result.getZ();
-          // ...
-        }
-      }
-    }
-  }
-  catch (Exception e){
-    e.printStackTrace(); 
-  }
-}
-}
-Runnable runnable = new BasicThread();
-Thread thread = new Thread(runnable);
-thread.start();
-``` 
-
----
-
-- Check if the user "Notch" has already placed a block at a location within the last 60 seconds.
-```java
-CoreProtectAPI CoreProtect = getCoreProtect();
-if (CoreProtect != null){ // Ensure we have access to the API
-  boolean hasPlaced = CoreProtect.hasPlaced("Notch", block, 60, 0);
-  
-  // Search queue for pending changes
-  if (!hasPlaced){
-    List<String[]> lookup = CoreProtect.queueLookup(block);
-    for (String[] result : lookup){
-      ParseResult parseResult = CoreProtect.parseResult(result);
-      if (parseResult.getActionId()==1 && parseResult.getPlayer().equals("Notch")){
-        hasPlaced = true;
-        break;
-      }
-    }
-  }
-}
-``` 
-
----
-
-- Get the last 60 seconds of block data for a specific block.
-```java
-CoreProtectAPI CoreProtect = getCoreProtect();
-if (CoreProtect != null){ // Ensure we have access to the API
-  List<String[]> lookup = CoreProtect.blockLookup(block, 60);
-  if (lookup != null){
-    for (String[] result : lookup){
-      ParseResult parseResult = CoreProtect.parseResult(result);
-      int x = parseResult.getX();
-      int y = parseResult.getY();
-      int z = parseResult.getZ();
-      // ...
-    }
-  }
-}
-``` 
-
----
-
-- Get the last 1 day of session data for the user "Notch".
-```java
-CoreProtectAPI CoreProtect = getCoreProtect();
-if (CoreProtect != null){ // Ensure we have access to the API
-  List<String[]> lookup = CoreProtect.sessionLookup("Notch", (24 * 60 * 60));
-  if (lookup != null){
-    for (String[] result : lookup){
-      ParseResult parseResult = CoreProtect.parseResult(result);
-      int x = parseResult.getX();
-      int y = parseResult.getY();
-      int z = parseResult.getZ();
-      int action = parseResult.getActionId(); // 0 = logout, 1 = login
-      // ...
-    }
-  }
-}
-``` 
-
----
-
-- Log the placement of a block at a location by the user "Notch".
-```java
-CoreProtectAPI CoreProtect = getCoreProtect();
-if (CoreProtect != null){ // Ensure we have access to the API
-  boolean success = CoreProtect.logPlacement("Notch", block.getLocation(), block.getType(), block.getData());
-}
-``` 
-
----
-
-- Log adding/remove items in a chest (or some other block inventory).
-```java
-CoreProtectAPI CoreProtect = getCoreProtect();
-if (CoreProtect != null){ // Ensure we have access to the API
-  boolean success = CoreProtect.logContainerTransaction("Notch", inventory.getLocation());
-  // modify your container contents immediately after (e.g. [i]inventory.addItem(itemStack);[/i])
-}
-``` 
-
----
-
-- Perform a multi-threaded placement check to see if the user "Notch" has already placed a block at a location within the last 60 seconds. This ignores the most recent 1 second of logged data, to account for the fact that that new block data may have already been logged, depending on your code.
-```java
-final Block block = null; //Should be an actual block
-class BasicThread implements Runnable {
-  @Override
-  public void run() {
-    try {
-      CoreProtectAPI CoreProtect = getCoreProtect();
-      if (CoreProtect != null){ // Ensure we have access to the API
-        boolean hasPlaced = CoreProtect.hasPlaced("Notch", block, 60, 1);
-      }
-    }
-    catch (Exception e){
-      e.printStackTrace(); 
-    }
-  }
-}
-Runnable runnable = new BasicThread();
-Thread thread = new Thread(runnable);
-thread.start();
-``` 
-
----

docs/commands.md

@@ -16,7 +16,6 @@ ___
 | [/co reload](#co-reload) | Reload the configuration file |
 | [/co status](#co-status) | View the plugin status |
 | [/co consumer](#co-consumer) | Toggle consumer processing |
-| [/co migrate-db](#co-migrate-db) | Migrate between SQLite and MySQL |
 
 ### Alias Commands
 
@@ -94,7 +93,7 @@ Purge old block data. Useful for freeing up space on your HDD if you don't need
 
 | Command | Parameters |
 | --- | --- |
-| /co purge | `t:<time> r:<world> i:<include>` |
+| /co purge | `t:<time> r:<world>` |
 
 For example, `/co purge t:30d` will delete all data older than one month, and only keep the last 30 days of data.
 
@@ -102,12 +101,8 @@ For example, `/co purge t:30d` will delete all data older than one month, and on
 > If used from the console, only data older than 24 hours can be purged.
 
 **Purging Worlds**  
-You can optionally specify a world in CoreProtect v19+.  
-For example, `/co purge t:30d r:#world_nether` will delete all data older than one month in the Nether, without removing data in any other worlds.
-
-**Purging Blocks**  
-You can optionally specify block types in CoreProtect v23+.  
-For example, `/co purge t:30d i:stone,dirt` will delete all stone and dirt data older than one month, without removing other block data.
+You can also optionally specify a world in CoreProtect v19+.  
+For example, `/co purge t:30d r:#world_nether` will delete all data older than one month in the Nether, without deleting data in any other worlds.
 
 **MySQL Optimization**  
 In CoreProtect v2.15+, adding "#optimize" to the end of the command (e.g. `/co purge t:30d #optimize`) will also optimize your tables and reclaim disk space.
@@ -129,19 +124,6 @@ ___
 Console command to pause or resume consumer queue processing.
 ___
 
-### /co migrate-db
-Migrate your CoreProtect database between SQLite and MySQL. Console-only command.
-
-| Command | Parameters |
-| --- | --- |
-| /co migrate-db | `<sqlite|mysql>` |
-
-> **Note:** This feature is exclusive to CoreProtect 23.0+ Patreon builds for Patron supporters.
-
-For complete migration instructions, safety guidelines, and troubleshooting information, see the [Database Migration documentation](/database-migration/).
-
-___
-
 
 ## Parameter Details
 

docs/database-migration.md

@@ -1,145 +0,0 @@
-# Database Migration (SQLite ↔ MySQL)
-
-CoreProtect 23.0+ includes the ability to migrate your database between SQLite and MySQL without losing any data.
-
-> **Note:** Database migration functionality is exclusive to CoreProtect 23.0+ Patreon builds for Patron supporters.
-
-## Overview
-
-The `/co migrate-db` command allows you to seamlessly transfer all your CoreProtect data from SQLite to MySQL or vice versa. This is particularly useful when:
-
-* Starting with SQLite and wanting to upgrade to MySQL for better performance
-* Moving from MySQL back to SQLite for simpler server setups
-* Transferring data between different server configurations
-
-## Command Usage
-
-| Command | Parameters | Description |
-| --- | --- | --- |
-| `/co migrate-db` | `<sqlite|mysql>` | Migrate to the specified database type |
-
-**Examples:**
-
-* `/co migrate-db mysql` - Migrate from SQLite to MySQL
-* `/co migrate-db sqlite` - Migrate from MySQL to SQLite
-
-> **Console Only:** This command can only be executed from the server console, not from in-game.
-
----
-
-## Migration Process
-
-### Step 1: Preparation
-
-**Before starting the migration:**
-
-1. Ensure your server is running with your current CoreProtect database
-2. Configure your new database in `config.yml` (ensure `use-mysql` is updated correctly)
-3. **Important:** Do NOT restart your server or use `/co reload` after modifying the config
-
-### Step 2: Execute Migration
-
-#### 1. **Run the migration command from your server console:**
-   ```
-   co migrate-db <mysql|sqlite>
-   ```
-
-#### 2. **Monitor the progress:**
-   * The migration will display detailed progress information
-   * Large databases may take considerable time to complete
-   * Progress bars and speed indicators will show current status
-
-#### 3. **Do not interrupt the process:**
-   * Avoid restarting your server during migration
-   * Let the process complete naturally
-
-### Step 3: Post-Migration
-
-**After successful completion:**
-
-1. **Automatic switchover:** CoreProtect will automatically begin using the new database
-2. **Verify configuration:** Ensure `use-mysql` is set correctly in your `config.yml` as per step 1
-3. **Test functionality:** Perform basic CoreProtect operations to verify everything works
-4. **Clean up:** Once satisfied, you may manually delete your old database files
-
----
-
-## Important Considerations
-
-### Migration Safety
-
-* **Non-destructive process:** The migration does not modify or delete your existing database
-* **Interrupted migration:** If something goes wrong, simply delete the new database and continue using the old one
-* **Data verification:** The process includes automatic verification to ensure data integrity
-
-### Performance & Requirements
-
-* **Processing time:** Large databases with millions of records may take hours to migrate
-* **Resource usage:** The migration process is resource-intensive and may impact server performance
-* **Parallel processing:** SQLite to MySQL migrations use optimized parallel processing for better speed
-
-### Restrictions & Limitations
-
-* **Console only:** Cannot be executed from in-game chat
-* **Interruption handling:** If interrupted, the target database must be manually wiped before restarting
-* **Patreon exclusive:** Only available in CoreProtect 23.0+ Patreon builds
-
----
-
-## Troubleshooting
-
-### Common Issues
-
-**Migration won't start:**
-
-* Verify you're using a CoreProtect 23.0+ Patreon build
-* Ensure you're not trying to migrate to the same database type
-* Check that no other CoreProtect operations are running
-
-**Migration interrupted:**
-
-* Manually delete/wipe the target database
-* Verify server stability before restarting migration
-* Consider migrating during low-activity periods
-
-**Performance issues:**
-
-* Monitor server resources during migration
-* Consider temporarily reducing server activity
-* Large tables may cause temporary slowdowns
-
-**Data verification failures:**
-
-* Check database connectivity and permissions
-* Review server logs for specific error messages
-* Ensure sufficient disk space on target database
-
-### Getting Help
-
-If you encounter issues with database migration:
-
-1. Check server logs for detailed error messages
-2. Verify database permissions and connectivity
-3. Ensure adequate system resources (RAM, CPU, disk space)
-4. Contact support through the CoreProtect Discord with specific error details
-
----
-
-## Technical Details
-
-The migration process includes several advanced features:
-
-* Batch processing with dynamic sizing based on performance
-* Automatic retry mechanisms for temporary failures
-* Data integrity verification comparing source and target records
-* Progress tracking with estimated completion times
-* Graceful error handling with detailed logging
-
-The migration handles all CoreProtect data types including:
-
-* Block changes and rollbacks
-* Container transactions
-* Player interactions and sessions
-* Chat messages and commands
-* User data and statistics
-* All metadata and configuration data

docs/index.md

@@ -18,9 +18,6 @@ A list of all language codes that can be used with CoreProtect.
 [**CoreProtect API Documentation**](/api/)  
 Log your own block changes, perform lookups, rollbacks, restores, and more.  
 
-[**Database Migration**](/database-migration/)  
-Migrate your CoreProtect database between SQLite and MySQL.  
-
 [**Compatible Third-Party Plugins & Tools**](/tools-integrations/)  
 A list of plugins and tools that are compatible with CoreProtect.  
 

docs/permissions.md

@@ -46,8 +46,6 @@ The following permissions can be used to restrict functionality within the plugi
 
 ## Child Permissions
 
-> **Note:** Child permissions are not presently supported by CoreProtect Hytale Edition.
-
 * **coreprotect.lookup.block** *(default: op)*  
   Can be optionally used as a negative permission to prevent block lookups.  
    

docs/tools-integrations.md

@@ -9,113 +9,32 @@ These plugins/tools are maintained by third parties, and may have issues outside
 ## Plugins
 
 * **WorldEdit**  
-Use WorldEdit selections as a radius, and log your WorldEdit changes.  
+Use WorldEdit selections as a radius, and log your WorldEdit changes.
 [https://dev.bukkit.org/projects/worldedit](https://dev.bukkit.org/projects/worldedit)  
  
 
 * **CoreProtect-Anti-Xray**  
-Displays how many ores a player has destroyed in a specific time span.  
+Displays how many ores a player has destroyed in a specific time span.
 [https://dev.bukkit.org/bukkit-plugins/coreprotect-anti-xray/](https://dev.bukkit.org/bukkit-plugins/coreprotect-anti-xray/)  
  
 
 * **CoreProtect TNT**  
-The CoreProtect TNT extension adds logging for TNT and creeper explosion sources.  
+The CoreProtect TNT extension adds logging for TNT and creeper explosion sources.
 [https://www.spigotmc.org/resources/coreprotect-tnt-log-tnt-creeper-explode-source.69609/](https://www.spigotmc.org/resources/coreprotect-tnt-log-tnt-creeper-explode-source.69609/)  
  
 
-* **CoreProtect Time-Lapse**  
-CPTL is an add-on tool for CoreProtect used to create a time-lapse from historical data.  
-[https://modrinth.com/plugin/cptl](https://modrinth.com/plugin/cptl)  
- 
-
-* **LightUp**  
-Conveniently place temporary lighting with rollback safety via CoreProtect integration.  
-[https://modrinth.com/plugin/lightup](https://modrinth.com/plugin/lightup)  
- 
-
-* **Lumen**  
-Custom (virtual) lighting with undo/redo and built-in CoreProtect & FAWE integration.  
-[https://modrinth.com/plugin/lumen](https://modrinth.com/plugin/lumen)  
- 
-
-* **FRTrustSystem**  
-Simple trust/friends system that uses the CoreProtect API to determine block ownership for protections/notifications.  
-[https://modrinth.com/plugin/frtrustsystem](https://modrinth.com/plugin/frtrustsystem)  
- 
-
-* **Movecraft-CoreProtect**  
-Logs Movecraft “craft” movement into CoreProtect for auditing/rollback.  
-[https://hangar.papermc.io/Airship-Pirates/Movecraft-CoreProtect](https://hangar.papermc.io/Airship-Pirates/Movecraft-CoreProtect)  
- 
-
-* **M0-CoreCord**  
-Discord bridge for CoreProtect lookups and alerts (SQLite/MySQL supported).  
-[https://www.spigotmc.org/resources/m0-corecord-1-13-1-21-8.91863/](https://www.spigotmc.org/resources/m0-corecord-1-13-1-21-8.91863/)  
- 
-
-* **XRayHunter**  
-Hunt potential xrayers by analyzing ore-mining stats pulled from CoreProtect data.  
-[https://modrinth.com/plugin/xrayhunter](https://modrinth.com/plugin/xrayhunter)  
- 
-
-* **ShadowTrace (Server Plugin)**  
-Backend for the ShadowTrace client mod; queries CoreProtect to visualize players’ mined blocks in-game.  
-[https://modrinth.com/plugin/shadowtraceplugin](https://modrinth.com/plugin/shadowtraceplugin)  
- 
-
-* **WildInspect**  
-Custom inspect-mode powered by CoreProtect (with history/claim limits and more).  
-[https://www.spigotmc.org/resources/%E2%9A%A1%EF%B8%8F-wildinspect-%E2%9A%A1%EF%B8%8F-coreprotect-addon-history-limits-claim-limits-%E2%9A%A1%EF%B8%8F-1-21-5-support.87405/](https://www.spigotmc.org/resources/%E2%9A%A1%EF%B8%8F-wildinspect-%E2%9A%A1%EF%B8%8F-coreprotect-addon-history-limits-claim-limits-%E2%9A%A1%EF%B8%8F-1-21-5-support.87405/)  
- 
-
-* **ExplosionProtector**  
-Uses the CoreProtect API to prevent explosions from destroying player-placed blocks.  
-[https://www.spigotmc.org/resources/explosionprotector.124838/](https://www.spigotmc.org/resources/explosionprotector.124838/)  
- 
-
-* **Axiom Paper Plugin**  
-Server component for the Axiom editor; includes CoreProtect integration to log Axiom edits.  
-[https://modrinth.com/plugin/axiom-paper-plugin](https://modrinth.com/plugin/axiom-paper-plugin)  
- 
-
-* **BlocksHub**  
-Bridge API used by world-editing plugins (e.g., AWE/FAWE) to send edits to loggers like CoreProtect.  
-[https://www.spigotmc.org/resources/blockshub.331/](https://www.spigotmc.org/resources/blockshub.331/)  
- 
-
-* **SpitSTIK**  
-Fun projectile plugin with CoreProtect integration for item-frame logging.  
-[https://modrinth.com/plugin/spitstik](https://modrinth.com/plugin/spitstik)  
- 
-
-* **XRay Informer**  
-Ore-ratio checker that supports CoreProtect. *(last known MC: 1.12)*  
-[https://dev.bukkit.org/projects/xray-informer](https://dev.bukkit.org/projects/xray-informer)  
- 
-
-* **DesirePaths**  
-Logs automatically generated paths into CoreProtect for moderation/rollback.  
-[https://www.spigotmc.org/resources/desirepaths-dynamic-player-made-trails.109043/](https://www.spigotmc.org/resources/desirepaths-dynamic-player-made-trails.109043/)  
- 
-
-
 ## Tools
 
 * **CoreProtect Lookup Web Interface**  
-Search through your CoreProtect history with an easy-to-use web UI.  
+Search through your CoreProtect history with an easy-to-use interface.  
 [https://www.spigotmc.org/resources/coreprotect-lookup-web-interface.28033/](https://www.spigotmc.org/resources/coreprotect-lookup-web-interface.28033/)  
  
 
 * **Watson**  
-Client-side mod that displays CoreProtect logs in 3D (optional server helper plugin available).  
+Watson is a client side Minecraft mod that displays CoreProtect logs in 3D.  
 [https://github.com/vacla/Watson](https://github.com/vacla/Watson)  
  
 
-* **ShadowTrace (Client Mod)**  
-Client-side visualizer to view mined-block locations supplied by the ShadowTrace server plugin via CoreProtect.  
-[https://modrinth.com/mod/shadowtrace](https://modrinth.com/mod/shadowtrace)  
- 
-
 
 ---
 

lang/de.yml

@@ -1,54 +1,53 @@
 # CoreProtect Language File (de)
 
 ACTION_NOT_SUPPORTED: "Diese Aktion wird nicht unterstützt."
-AMOUNT_BLOCK: "{0} {Block|Blöcke}"
-AMOUNT_CHUNK: "{0} {Chunk|Chunks}"
+AMOUNT_BLOCK: "{0} {block|blöcke}"
+AMOUNT_CHUNK: "{0} {Brocken|Brocken}"
 AMOUNT_ENTITY: "{0} {Entität|Entitäten}"
-AMOUNT_ITEM: "{0} {Item|Items}"
+AMOUNT_ITEM: "{0} {Artikel|Artikel}"
 API_TEST: "API-Test erfolgreich."
-CACHE_ERROR: "WARNUNG: Fehler beim Überprüfen des {0}-Zwischenspeichers."
-CACHE_RELOAD: "Erzwingen des Nachladens von {Kartierungs|Welt}caches aus der Datenbank."
-CHECK_CONFIG: "Bitte überprüfe die config.yml"
+CACHE_ERROR: "WARNUNG: Fehler beim Validieren {0} Zwischenspeicher."
+CACHE_RELOAD: "Erzwingen des Nachladens von {kartierung|welt} Caches aus der Datenbank."
+CHECK_CONFIG: "Bitte überprüfen Sie config.yml"
 COMMAND_CONSOLE: "Bitte führen Sie den Befehl von der Konsole aus."
 COMMAND_NOT_FOUND: "Befehl \"{0}\" nicht gefunden."
 COMMAND_THROTTLED: "Bitte warten Sie einen Moment und versuchen Sie es erneut."
-CONSUMER_ERROR: "Die Verarbeitung der Verbraucherwarteschlange wurde bereits {angehalten|fortgesetzt}."
-CONSUMER_TOGGLED: "Die Verarbeitung der Verbraucherwarteschlange wurde {angehalten|fortgesetzt}."
+CONSUMER_ERROR: "Verbraucherwarteschlange wird bereits verarbeitet {angehalten|fortgesetzt}."
+CONSUMER_TOGGLED: "Die Verarbeitung der Verbraucherwarteschlange wurde durchgeführt {angehalten|fortgesetzt}."
 CONTAINER_HEADER: "Containertransaktionen"
-CPU_CORES: "CPU-Kerne."
 DATABASE_BUSY: "Datenbank beschäftigt. Bitte versuchen Sie es später erneut."
-DATABASE_INDEX_ERROR: "Datenbankindizes können nicht geprüft werden."
+DATABASE_INDEX_ERROR: "Datenbankindizes können nicht validiert werden."
 DATABASE_LOCKED_1: "Datenbank gesperrt. Warte bis zu 15 Sekunden..."
-DATABASE_LOCKED_2: "Datenbank wird bereits verwendet. Bitte versuche es später erneut."
+DATABASE_LOCKED_2: "Datenbank wird bereits verwendet. Bitte versuche es erneut."
 DATABASE_LOCKED_3: "Um die Datenbanksperre zu deaktivieren, setzen Sie \"database-lock: false\"."
-DATABASE_LOCKED_4: "Deaktivieren der Datenbanksperre kann zu Datenbeschädigungen führen."
+DATABASE_LOCKED_4: "Das Deaktivieren der Datenbanksperre kann zu Datenbeschädigungen führen."
 DATABASE_UNREACHABLE: "Datenbank ist nicht erreichbar. Daten verwerfen und herunterfahren."
 DEVELOPMENT_BRANCH: "Entwicklungszweig erkannt, Patch-Skripte werden übersprungen."
-DIRT_BLOCK: "Ein temporärer Sicherheitsblock wurde unter ihnen platziert."
-DISABLE_SUCCESS: "{0} erfolgreich deaktiviert!"
+DIRT_BLOCK: "Platziere einen Schmutzblock unter dir."
+DISABLE_SUCCESS: "Erfolg! Deaktiviert {0}"
 ENABLE_FAILED: "{0} war nicht in der Lage zu starten."
 ENABLE_SUCCESS: "{0} ist jetzt aktiviert!"
-ENJOY_COREPROTECT: "Dir gefällt {0}? Tritt unserem Discord bei!"
-FINISHING_CONVERSION: "Abschluss der Datenkonvertierung. Bitte warten..."
-FINISHING_LOGGING: "Abschluss der Datenprotokollierung. Bitte warten..."
+ENJOY_COREPROTECT: "Genießen {0}? Tritt unser... bei Discord!"
+FINISHING_CONVERSION: "Abschluss der Datenkonvertierung. Warten Sie mal..."
+FINISHING_LOGGING: "Abschluss der Datenprotokollierung. Warten Sie mal..."
 FIRST_VERSION: "Anfangs-DB: {0}"
 GLOBAL_LOOKUP: "Geben Sie keinen Radius an, um eine globale Suche durchzuführen."
-GLOBAL_ROLLBACK: "Benutze \"{0}\" für einen globalen {Rollback|Restore}"
+GLOBAL_ROLLBACK: "Benutzen \"{0}\" um eine globale {Rollback|Wiederherstellung}"
 HELP_ACTION_1: "Beschränken Sie die Suche auf eine Aktion."
 HELP_ACTION_2: "Beispiele: [a:block], [a:+block], [a:-block] [a:click], [a:container], [a:inventory], [a:item], [a:kill], [a:chat], [a:command], [a:sign], [a:session], [a:username]"
 HELP_COMMAND: "Zusätzliche Informationen anzeigen."
-HELP_EXCLUDE_1: "Bestimmte Blöcke/Benutzer ausschließen."
+HELP_EXCLUDE_1: "Blöcke/Benutzer ausschließen."
 HELP_EXCLUDE_2: "Beispiele: [e:stone], [e:Notch], [e:stone,Notch]"
 HELP_HEADER: "{0} Hilfe"
 HELP_INCLUDE_1: "Fügen Sie Blöcke/Entitäten ein."
 HELP_INCLUDE_2: "Beispiele: [i:stone], [i:zombie], [i:stone,wood,bedrock]"
-HELP_INSPECT_1: "Mit dem Inspector kannst du Folgendes tun:"
-HELP_INSPECT_2: "Linksklicke einen Block, um zu sehen, wer ihn platziert hat"
-HELP_INSPECT_3: "Rechtsklick auf einen Block zeigt Änderungen an Nachbarn an"
-HELP_INSPECT_4: "Platziere einen Block, um Änderungen an seinem Ort zu sehen"
-HELP_INSPECT_5: "So kann man auch Änderungen an Flüssigkeiten etc. sehen"
-HELP_INSPECT_6: "Rechtsklicke Türen, Truhen, etc., um Zugriffe zu sehen"
-HELP_INSPECT_7: "Tipp: Benutze \"/co i\" für schnelleren Zugriff"
+HELP_INSPECT_1: "Wenn der Inspektor aktiviert ist, können Sie:"
+HELP_INSPECT_2: "Klicken Sie mit der linken Maustaste, um die Platzierung anzuzeigen."
+HELP_INSPECT_3: "Klicken Sie mit der rechten Maustaste, um benachbarte Entfernungen anzuzeigen."
+HELP_INSPECT_4: "Platzieren Sie einen Block, um die Entfernung zu sehen."
+HELP_INSPECT_5: "Legen Sie einen Block in Flüssigkeit, um die Platzierung zu sehen."
+HELP_INSPECT_6: "Klicken Sie mit der rechten Maustaste, um Truhentransaktionen anzuzeigen."
+HELP_INSPECT_7: "Tipp: Sie können einfach \"/co i\" verwenden."
 HELP_INSPECT_COMMAND: "Schaltet den Blockinspektor um."
 HELP_LIST: "Zeigt eine Liste aller Befehle an."
 HELP_LOOKUP_1: "Befehlsverknüpfung."
@@ -56,13 +55,13 @@ HELP_LOOKUP_2: "Weitere Seiten anzeigen."
 HELP_LOOKUP_COMMAND: "Blockdaten nachschlagen."
 HELP_NO_INFO: "Informationen zum Befehl \"{0}\" nicht gefunden."
 HELP_PARAMETER: "Bitte sehen Sie \"{0}\" für detaillierte Parameterinformationen."
-HELP_PARAMS_1: "Führe einen {Lookup|Rollback|Restore} durch."
-HELP_PARAMS_2: "Spieler, für die der {Lookup|Rollback|Restore} gemacht werden soll."
-HELP_PARAMS_3: "Zeitspanne, für die der {Lookup|Rollback|Restore} gemacht werden soll."
-HELP_PARAMS_4: "Radius, in dem der {Lookup|Rollback|Restore} gemacht werden soll."
-HELP_PARAMS_5: "Aktion, für die der {Lookup|Rollback|Restore} gemacht werden soll."
-HELP_PARAMS_6: "Schließe Blöcke/Entitäten in den {Lookup|Rollback|Restore} ein."
-HELP_PARAMS_7: "Schließe Blöcke/Benutzer von dem {Lookup|Rollback|Restore} aus."
+HELP_PARAMS_1: "Führen Sie die {Nachschlagen|Rollback|Wiederherstellen}."
+HELP_PARAMS_2: "Geben Sie die Benutzer an {Nachschlagen|Rollback|Wiederherstellen}."
+HELP_PARAMS_3: "Geben Sie die Zeit an, um {Nachschlagen|Rollback|Wiederherstellen}."
+HELP_PARAMS_4: "Beschränken Sie die {Nachschlagen|Rollback|Wiederherstellen} zu einem Radius."
+HELP_PARAMS_5: "Beschränken Sie die {Nachschlagen|Rollback|Wiederherstellen} zu einer Aktion."
+HELP_PARAMS_6: "Einschließen von Blöcken/Entitäten in die {Nachschlagen|Rollback|Wiederherstellen}."
+HELP_PARAMS_7: "Sperren/Benutzer von der ausschließen {Nachschlagen|Rollback|Wiederherstellen}."
 HELP_PURGE_1: "Alte Daten entfernen."
 HELP_PURGE_2: "Beispielsweise, \"{0}\" löscht alle Daten, die älter als einen Monat sind, und behält nur die Daten der letzten 30 Tage."
 HELP_PURGE_COMMAND: "Alte Blockdaten löschen."
@@ -74,19 +73,19 @@ HELP_ROLLBACK_COMMAND: "Rollback-Blockdaten."
 HELP_STATUS: "Sehen Sie sich den Plugin-Status an."
 HELP_STATUS_COMMAND: "Zeigt den Plugin-Status an."
 HELP_TELEPORT: "Teleportieren."
-HELP_TIME_1: "Geben Sie einen Zeitraum an."
+HELP_TIME_1: "Geben Sie die Uhrzeit an."
 HELP_TIME_2: "Beispiele: [t:2w,5d,7h,2m,10s], [t:5d2h], [t:2.50h]"
-HELP_USER_1: "Geben Sie den/die Benutzer an."
+HELP_USER_1: "Geben Sie die Benutzer an."
 HELP_USER_2: "Beispiele: [u:Notch], [u:Notch,#enderman]"
 INCOMPATIBLE_ACTION: "\"{0}\" kann mit dieser Aktion nicht verwendet werden."
-INSPECTOR_ERROR: "Inspektor bereits {aktiviert|deaktiviert}."
+INSPECTOR_ERROR: "Inspektor schon {aktiviert|deaktiviert}."
 INSPECTOR_TOGGLED: "Inspektor jetzt {aktiviert|deaktiviert}."
-INTEGRATION_ERROR: "Unfähig, {0} Protokollierung zu {initialisieren|deaktivieren}."
-INTEGRATION_SUCCESS: "{0} Protokollierung erfolgreich {initialisiert|deaktiviert}."
-INTEGRATION_VERSION: "Ungültige {0} Version gefunden."
+INTEGRATION_ERROR: "Unfähig zu {initialisieren|deaktivieren} {0} Protokollierung."
+INTEGRATION_SUCCESS: "{0} erfolgreich anmelden {initialisiert|deaktiviert}."
+INTEGRATION_VERSION: "Ungültig {0} Version gefunden."
 INTERACTIONS_HEADER: "Spielerinteraktionen"
 INVALID_ACTION: "Das ist keine gültige Aktion."
-INVALID_BRANCH_1: "Ungültige Plugin-Version (Branch wurde nicht gesetzt)."
+INVALID_BRANCH_1: "Ungültige Plugin-Version (Verzweigung wurde nicht gesetzt)."
 INVALID_BRANCH_2: "Um fortzufahren, setzen Sie den Projektzweig auf \"Entwicklung\"."
 INVALID_BRANCH_3: "Das Ausführen von Entwicklungscode kann zu Datenbeschädigungen führen."
 INVALID_CONTAINER: "Bitte überprüfen Sie zuerst einen gültigen Behälter."
@@ -103,87 +102,82 @@ LINK_DOWNLOAD: "Herunterladen: {0}"
 LINK_PATREON: "Patreon: {0}"
 LINK_WIKI_BLOCK: "Blocknamen: {0}"
 LINK_WIKI_ENTITY: "Entitätsnamen: {0}"
-LOGGING_ITEMS: "{0} Elemente, die noch zu loggen sind. Bitte warten..."
+LOGGING_ITEMS: "{0} Elemente, die noch zu loggen sind. Warten Sie mal..."
 LOGGING_TIME_LIMIT: "Zeitlimit für die Protokollierung erreicht. Daten verwerfen und herunterfahren."
 LOOKUP_BLOCK: "{0} {platziert|entfernt} {1}."
 LOOKUP_CONTAINER: "{0} {hinzugefügt|entfernt} {1} {2}."
 LOOKUP_HEADER: "{0} Ergebnisse"
 LOOKUP_INTERACTION: "{0} {angeklickt|getötet} {1}."
-LOOKUP_ITEM: "{0} {aufgehoben|weggeworfen} {1} {2}."
-LOOKUP_LOGIN: "{0} {ein|aus}geloggt."
+LOOKUP_ITEM: "{0} {abgeholt|abgeworfen} {1} {2}."
+LOOKUP_LOGIN: "{0} eingeloggt {rein|raus}."
 LOOKUP_PAGE: "Seite {0}"
 LOOKUP_PROJECTILE: "{0} {geworfen|geschossen} {1} {2}."
 LOOKUP_ROWS_FOUND: "{0} {Reihe|Reihen} gefunden."
-LOOKUP_SEARCHING: "Suchen. Bitte warten..."
+LOOKUP_SEARCHING: "Suche nachschlagen. Warten Sie mal..."
 LOOKUP_STORAGE: "{0} {hinterlegt|abgehoben} {1} {2}."
-LOOKUP_TIME: "vor {0}"
-LOOKUP_USERNAME: "{0} eingeloggt als {1}."
-MAXIMUM_RADIUS: "Der maximale {Nachschlag|Rollback|Restore} Radius ist {0}."
+LOOKUP_TIME: "{0} vor"
+LOOKUP_USERNAME: "{0} Eingeloggt als {1}."
+MAXIMUM_RADIUS: "Das Maximum {Nachschlagen|Rollback|Wiederherstellen} Radius ist {0}."
 MISSING_ACTION_USER: "Um diese Aktion zu verwenden, geben Sie bitte einen Benutzer an."
-MISSING_LOOKUP_TIME: "Bitte geben Sie den Zeitraum an, um {Nachzuschlagen|ein Rollback auszuführen|einen Restore auszuführen}."
-MISSING_LOOKUP_USER: "Bitte geben Sie einen Benutzer oder {Block|Radius} an."
+MISSING_LOOKUP_TIME: "Bitte geben Sie die Zeit an, um {Nachschlagen|Rollback|Wiederherstellen}."
+MISSING_LOOKUP_USER: "Bitte geben Sie einen Benutzer an oder {Block|Radius}."
 MISSING_PARAMETERS: "Bitte verwenden Sie \"{0}\"."
-MISSING_ROLLBACK_RADIUS: "Sie haben keinen {Rollback|Restore} Radius angegeben."
-MISSING_ROLLBACK_USER: "Sie haben keinen {Rollback|Restore} Benutzer angegeben."
-MYSQL_UNAVAILABLE: "Verbindung zu MySQL Server nicht möglich."
-NETWORK_CONNECTION: "Verbindung von {0} {erfolgreich|fehlgeschlagen}. Nutze {1} {2}."
-NETWORK_TEST: "Netzwerktestdaten wurden erfolgreich gesendet."
-NO_DATA: "Keine Daten bei {0} gefunden."
-NO_DATA_LOCATION: "Keine {Daten|Transaktionen|Interaktionen|Nachrichten} gefunden."
+MISSING_ROLLBACK_RADIUS: "Sie haben nicht angegeben a {Zurücksetzen|Wiederherstellen} Radius."
+MISSING_ROLLBACK_USER: "Sie haben nicht angegeben a {Zurücksetzen|Wiederherstellen} Benutzer."
+MYSQL_UNAVAILABLE: "Verbindung zu nicht möglich MySQL Server."
+NO_DATA: "Keine Daten gefunden bei {0}."
+NO_DATA_LOCATION: "Nein {Daten|Transaktionen|Interaktionen|Nachrichten} gefunden."
 NO_PERMISSION: "Du hast keine Erlaubnis das zu tun."
 NO_RESULTS: "Keine Ergebnisse gefunden."
-NO_RESULTS_PAGE: "Keine {Ergebnisse|Daten} für diese Seite gefunden."
-NO_ROLLBACK: "Kein(en) {ausstehende(s|n)|vorherige(s|n)} Rollback/Restore gefunden."
-PATCH_INTERRUPTED: "Upgrade unterbrochen. Wird bei einem Neustart erneut versucht."
-PATCH_OUTDATED_1: "Datenbanken, die älter als {0} sind, können nicht aktualisiert werden."
-PATCH_OUTDATED_2: "Bitte updaten Sie mit einer unterstützten Version von CoreProtect."
-PATCH_PROCESSING: "Neue Daten werden verarbeitet. Bitte warten..."
-PATCH_SKIP_UPDATE: "Überspringe {Tabellen|Index}{aktualisierung|erstellung|entfernung} bei {0}."
-PATCH_STARTED: "Führe {0} Upgrade durch. Bitte warten..."
+NO_RESULTS_PAGE: "Nein {Ergebnisse|Daten} für diese Seite gefunden."
+NO_ROLLBACK: "Nein {ausstehend|zurück} Rollback/Wiederherstellung gefunden."
+PATCH_INTERRUPTED: "Upgrade unterbrochen. Werde es beim Neustart nochmal versuchen."
+PATCH_OUTDATED_1: "Datenbanken, die älter als sind, können nicht aktualisiert werden {0}."
+PATCH_OUTDATED_2: "Bitte aktualisieren Sie mit einer unterstützten Version von CoreProtect."
+PATCH_PROCESSING: "Verarbeitung neuer Daten. Warten Sie mal..."
+PATCH_SKIP_UPDATE: "Überspringen {Tabelle|Index} {Aktualisieren|Erstellen|Entfernen} auf {0}."
+PATCH_STARTED: "Performing {0} Aktualisierung. Warten Sie mal..."
 PATCH_SUCCESS: "Erfolgreich aktualisiert auf {0}."
-PATCH_UPGRADING: "Datenbank-Upgrade im Gange. Bitte warten..."
+PATCH_UPGRADING: "Datenbank-Upgrade im Gange. Warten Sie mal..."
 PLEASE_SELECT: "Bitte auswählen: \"{0}\" oder \"{1}\"."
 PREVIEW_CANCELLED: "Vorschau abgebrochen."
 PREVIEW_CANCELLING: "Vorschau abbrechen..."
-PREVIEW_IN_GAME: "Sie können Rollbacks nur im Spiel als Vorschau anzeigen."
-PREVIEW_TRANSACTION: "Sie können keine {Behälter|Inventar}-Transaktionen als Vorschau anzeigen."
-PRIMARY_THREAD_ERROR: "Diese API-Methode kann nicht im Haupt-Thread verwendet werden."
+PREVIEW_IN_GAME: "Sie können Rollbacks nur im Spiel in der Vorschau anzeigen."
+PREVIEW_TRANSACTION: "Sie können keine Vorschau anzeigen {Behälter|Inventar} Transaktionen."
 PURGE_ABORTED: "Bereinigung fehlgeschlagen. Die Datenbank ist möglicherweise beschädigt."
-PURGE_ERROR: "{0} Daten können nicht verarbeitet werden!"
+PURGE_ERROR: "Kann nicht verarbeitet werden {0} Daten!"
 PURGE_FAILED: "Bereinigung fehlgeschlagen. Bitte versuchen Sie es später erneut."
 PURGE_IN_PROGRESS: "Bereinigung läuft. Bitte versuchen Sie es später erneut."
-PURGE_MINIMUM_TIME: "Sie können nur Daten löschen, die älter als {0} {Tage|Stunden} sind."
+PURGE_MINIMUM_TIME: "Sie können nur Daten löschen, die älter sind als {0} {Tage|Stunden}."
 PURGE_NOTICE_1: "Bitte beachten Sie, dass dies einige Zeit dauern kann."
 PURGE_NOTICE_2: "Starten Sie Ihren Server nicht neu, bis dies abgeschlossen ist."
-PURGE_OPTIMIZING: "Optimierung der Datenbank. Bitte warten..."
-PURGE_PROCESSING: "{0} Daten werden verarbeitet..."
+PURGE_OPTIMIZING: "Optimierung der Datenbank. Warten Sie mal..."
+PURGE_PROCESSING: "wird bearbeitet {0} Daten..."
 PURGE_REPAIRING: "Versuch einer Reparatur. Dies könnte eine Weile dauern..."
 PURGE_ROWS: "{0} {Reihe|Reihen} von Daten gelöscht."
 PURGE_STARTED: "Datenbereinigung gestartet am \"{0}\"."
 PURGE_SUCCESS: "Datenbereinigung erfolgreich."
-RAM_STATS: "{0}GB / {1}GB RAM"
 RELOAD_STARTED: "Konfiguration wird neu geladen - bitte warten."
 RELOAD_SUCCESS: "Konfiguration erfolgreich neu geladen."
-ROLLBACK_ABORTED: "Rollback oder Restore abgebrochen."
-ROLLBACK_CHUNKS_FOUND: "{0} {bearbeiteter|bearbeitete} {Chunk|Chunks} gefunden."
-ROLLBACK_CHUNKS_MODIFIED: "{0}/{1} {Chunk|Chunks} bearbeitet."
-ROLLBACK_COMPLETED: "{Rollback|Restore|Vorschau} für \"{0}\" abgeschlossen."
-ROLLBACK_EXCLUDED_USERS: "{Ausgeschlossener Benutzer|Ausgeschlossene Benutzer}: \"{0}\"."
-ROLLBACK_INCLUDE: "{Block|Entität|Ziel} {Typ|Typen} {einbezogen|ausgeschlossen}: \"{0}\"."
+ROLLBACK_ABORTED: "Rollback oder Wiederherstellung abgebrochen."
+ROLLBACK_CHUNKS_FOUND: "Gefunden {0} {Brocken|Brocken} ändern."
+ROLLBACK_CHUNKS_MODIFIED: "Geändert {0}/{1} {Brocken|Brocken}."
+ROLLBACK_COMPLETED: "{Rollback|Wiederherstellen|Vorschau} abgeschlossen für \"{0}\"."
+ROLLBACK_EXCLUDED_USERS: "Ausgeschlossen {Benutzer|Benutzer}: \"{0}\"."
+ROLLBACK_INCLUDE: "{Eingeschlossen|Ausgeschlossen} {Block|Entität|Ziel} {Typ|Typen}: \"{0}\"."
 ROLLBACK_IN_PROGRESS: "Ein Rollback/Restore ist bereits im Gange."
-ROLLBACK_LENGTH: "Zeit beansprucht: {0} {Sekunde|Sekunden}."
+ROLLBACK_LENGTH: "Zeit genommen: {0} {Sekunde|Sekunden}."
 ROLLBACK_MODIFIED: "{Modifiziert|Modifiziert} {0}."
-ROLLBACK_RADIUS: "Radius: {0} {Block|Blöcke}."
+ROLLBACK_RADIUS: "Radius: {0} {block|blöcke}."
 ROLLBACK_SELECTION: "Radius eingestellt auf \"{0}\"."
-ROLLBACK_STARTED: "{Rollback|Restore|Vorschau} gestartet für \"{0}\"."
+ROLLBACK_STARTED: "{Rollback|Wiederherstellen|Vorschau} begann am \"{0}\"."
 ROLLBACK_TIME: "Zeitspanne: {0}."
 ROLLBACK_WORLD_ACTION: "Beschränkt auf {Welt|Aktion} \"{0}\"."
-SIGN_HEADER: "Schildnachrichten"
-STATUS_CONSUMER: "Warteschleife: {0} {Datensatz|Datensätze}"
-STATUS_DATABASE: "Datenbank: {0}."
+SIGN_HEADER: "Nachrichten signieren"
+STATUS_CONSUMER: "Verbraucher: {0} {Artikel|Artikel} in der Warteschleife."
+STATUS_DATABASE: "Datenbank: Verwenden {0}."
 STATUS_INTEGRATION: "{0}: Integration {aktiviert|deaktiviert}."
 STATUS_LICENSE: "Lizenz: {0}"
-STATUS_SYSTEM: "System: {0}"
 STATUS_VERSION: "Version: {0}"
 TELEPORTED: "Teleportiert nach {0}."
 TELEPORTED_SAFETY: "Hab dich in Sicherheit teleportiert."
@@ -192,17 +186,16 @@ TIME_DAYS: "{0} {Tag|Tage}"
 TIME_HOURS: "{0} {Stunde|Stunden}"
 TIME_MINUTES: "{0} {Minute|Minuten}"
 TIME_SECONDS: "{0} {Sekunde|Sekunden}"
-TIME_UNITS: "{/m|/h|/d}"
 TIME_WEEKS: "{0} {Woche|Wochen}"
 UPDATE_ERROR: "Beim Suchen nach Updates ist ein Fehler aufgetreten."
 UPDATE_HEADER: "{0} Aktualisieren"
-UPDATE_NOTICE: "Hinweis: {0} ist nun verfügbar."
+UPDATE_NOTICE: "Beachten: {0} ist nun verfügbar."
 UPGRADE_IN_PROGRESS: "Upgrade läuft. Bitte versuchen Sie es später erneut."
 USER_NOT_FOUND: "Benutzer \"{0}\" nicht gefunden."
 USER_OFFLINE: "Der Benutzer \"{0}\" ist nicht online."
 USING_MYSQL: "Verwenden von MySQL zur Datenspeicherung."
 USING_SQLITE: "Verwenden von SQLite zur Datenspeicherung."
 VALID_DONATION_KEY: "Gültiger Spendenschlüssel."
-VERSION_NOTICE: "Version {0} ist nun verfügbar."
+VERSION_NOTICE: "Ausführung {0} ist nun verfügbar."
 VERSION_REQUIRED: "{0} {1} oder höher erforderlich."
 WORLD_NOT_FOUND: "Welt \"{0}\" nicht gefunden."

lang/en.yml

@@ -15,7 +15,6 @@ COMMAND_THROTTLED: "Please wait a moment and try again."
 CONSUMER_ERROR: "Consumer queue processing already {paused|resumed}."
 CONSUMER_TOGGLED: "Consumer queue processing has been {paused|resumed}."
 CONTAINER_HEADER: "Container Transactions"
-CPU_CORES: "CPU cores."
 DATABASE_BUSY: "Database busy. Please try again later."
 DATABASE_INDEX_ERROR: "Unable to validate database indexes."
 DATABASE_LOCKED_1: "Database locked. Waiting up to 15 seconds..."
@@ -24,9 +23,8 @@ DATABASE_LOCKED_3: "To disable database locking, set \"database-lock: false\"."
 DATABASE_LOCKED_4: "Disabling database locking can result in data corruption."
 DATABASE_UNREACHABLE: "Database is unreachable. Discarding data and shutting down."
 DEVELOPMENT_BRANCH: "Development branch detected, skipping patch scripts."
-DIRT_BLOCK: "Placed a temporary safety block under you."
+DIRT_BLOCK: "Placed a dirt block under you."
 DISABLE_SUCCESS: "Success! Disabled {0}"
-DONATION_KEY_REQUIRED: "A valid donation key is required for that command."
 ENABLE_FAILED: "{0} was unable to start."
 ENABLE_SUCCESS: "{0} has been successfully enabled!"
 ENJOY_COREPROTECT: "Enjoy {0}? Join our Discord!"
@@ -148,7 +146,6 @@ PREVIEW_CANCELLED: "Preview cancelled."
 PREVIEW_CANCELLING: "Cancelling preview..."
 PREVIEW_IN_GAME: "You can only preview rollbacks in-game."
 PREVIEW_TRANSACTION: "You can't preview {container|inventory} transactions."
-PRIMARY_THREAD_ERROR: "That API method can't be used on the primary thread."
 PURGE_ABORTED: "Purge failed. Database may be corrupt."
 PURGE_ERROR: "Unable to process {0} data!"
 PURGE_FAILED: "Purge failed. Please try again later."
@@ -162,7 +159,6 @@ PURGE_REPAIRING: "Attempting to repair. This may take some time..."
 PURGE_ROWS: "{0} {row|rows} of data deleted."
 PURGE_STARTED: "Data purge started on \"{0}\"."
 PURGE_SUCCESS: "Data purge successful."
-RAM_STATS: "{0}GB / {1}GB RAM"
 RELOAD_STARTED: "Reloading configuration - please wait."
 RELOAD_SUCCESS: "Configuration successfully reloaded."
 ROLLBACK_ABORTED: "Rollback or restore aborted."
@@ -184,7 +180,6 @@ STATUS_CONSUMER: "Consumer: {0} {item|items} in queue."
 STATUS_DATABASE: "Database: Using {0}."
 STATUS_INTEGRATION: "{0}: Integration {enabled|disabled}."
 STATUS_LICENSE: "License: {0}"
-STATUS_SYSTEM: "System: {0}"
 STATUS_VERSION: "Version: {0}"
 TELEPORTED: "Teleported to {0}."
 TELEPORTED_SAFETY: "Teleported you to safety."
@@ -192,11 +187,8 @@ TELEPORT_PLAYERS: "Teleport command can only be used by players."
 TIME_DAYS: "{0} {day|days}"
 TIME_HOURS: "{0} {hour|hours}"
 TIME_MINUTES: "{0} {minute|minutes}"
-TIME_MONTHS: "{0} {month|months}"
 TIME_SECONDS: "{0} {second|seconds}"
-TIME_UNITS: "{/m|/h|/d}"
 TIME_WEEKS: "{0} {week|weeks}"
-TIME_YEARS: "{0} {year|years}"
 UPDATE_ERROR: "An error occurred while checking for updates."
 UPDATE_HEADER: "{0} Update"
 UPDATE_NOTICE: "Notice: {0} is now available."
@@ -206,7 +198,6 @@ USER_OFFLINE: "The user \"{0}\" is not online."
 USING_MYSQL: "Using MySQL for data storage."
 USING_SQLITE: "Using SQLite for data storage."
 VALID_DONATION_KEY: "Valid donation key."
-VERSION_INCOMPATIBLE: "{0} {1} is not supported."
 VERSION_NOTICE: "Version {0} is now available."
 VERSION_REQUIRED: "{0} {1} or higher is required."
 WORLD_NOT_FOUND: "World \"{0}\" not found."

lang/es.yml

@@ -15,7 +15,6 @@ COMMAND_THROTTLED: "Espere un momento e intente nuevamente."
 CONSUMER_ERROR: "La espera en el procesamiento del consumidor ha sido {pausada|continuada}."
 CONSUMER_TOGGLED: "Consumer queue processing has been {pausado|continuado}."
 CONTAINER_HEADER: "Transacciones del contenedor"
-CPU_CORES: "CPU cores."
 DATABASE_BUSY: "Base de datos ocupada. Intente más tarde."
 DATABASE_INDEX_ERROR: "Imposible validar los indices de la base de datos."
 DATABASE_LOCKED_1: "Base de datos bloqueada. Espere en los siguientes 15 segundos..."
@@ -126,8 +125,6 @@ MISSING_PARAMETERS: "Usa \"{0}\"."
 MISSING_ROLLBACK_RADIUS: "No especificaste un radio para {retornar|resturar}."
 MISSING_ROLLBACK_USER: "No especificaste a un usuario para {retornar|restaurar}."
 MYSQL_UNAVAILABLE: "No se pudo conectar con el servidor de MySQL."
-NETWORK_CONNECTION: "Conexión por {0} {exitosa|fallida}. Usando {1} {2}."
-NETWORK_TEST: "Los datos de la prueba de red se han enviado con éxito."
 NO_DATA: "Sin datos para {0}."
 NO_DATA_LOCATION: "Sin {datos|transacciones|interacciones|mensajes} encontrados acá."
 NO_PERMISSION: "No tienes permisos para hacer esto."
@@ -147,7 +144,6 @@ PREVIEW_CANCELLED: "Muestra cancelada."
 PREVIEW_CANCELLING: "Cancelando muestra..."
 PREVIEW_IN_GAME: "Solo puedes mostrar respaldos en el juego."
 PREVIEW_TRANSACTION: "No puedes mostrar transacciones de {contenedor|inventario}."
-PRIMARY_THREAD_ERROR: "Ese método de API no se puede usar en el hilo principal."
 PURGE_ABORTED: "Purga fallida. La base de datos debe estar corrupta."
 PURGE_ERROR: "¡No se pudo procesar {0} datos!"
 PURGE_FAILED: "Purga fallida. Intente nuevamente."
@@ -161,7 +157,6 @@ PURGE_REPAIRING: "Intentando reparar. Esto tomará algo de tiempo..."
 PURGE_ROWS: "{0} {fila|filas} de datos limpiados."
 PURGE_STARTED: "Purga de datos iniciada en \"{0}\"."
 PURGE_SUCCESS: "Purga de datos exitosa."
-RAM_STATS: "{0}GB / {1}GB RAM"
 RELOAD_STARTED: "Recargando configuración - espere."
 RELOAD_SUCCESS: "Configuración exitosamente recargada."
 ROLLBACK_ABORTED: "Retorno o restauración abortado."
@@ -183,7 +178,6 @@ STATUS_CONSUMER: "Consumidor: {0} {objeto|objetos} en espera."
 STATUS_DATABASE: "Base de datos: Usando {0}."
 STATUS_INTEGRATION: "{0}: Integración {activada|desactivada}."
 STATUS_LICENSE: "Licencia: {0}"
-STATUS_SYSTEM: "Sistema: {0}"
 STATUS_VERSION: "Versión: {0}"
 TELEPORTED: "Teletransportado a {0}."
 TELEPORTED_SAFETY: "Te he teletransportado a un lugar seguro."
@@ -192,7 +186,6 @@ TIME_DAYS: "{0} {día|días}"
 TIME_HOURS: "{0} {hora|horas}"
 TIME_MINUTES: "{0} {minuto|minutos}"
 TIME_SECONDS: "{0} {segundo|segundos}"
-TIME_UNITS: "{/m|/h|/d}"
 TIME_WEEKS: "{0} {semana|semanas}"
 UPDATE_ERROR: "Un error ocurrió mientras se revisaban las actualizaciones."
 UPDATE_HEADER: "Actualización {0}"

lang/fr.yml

@@ -186,7 +186,6 @@ TIME_DAYS: "{0} {jour|jours}"
 TIME_HOURS: "{0} {heure|heures}"
 TIME_MINUTES: "{0} {minute|minutes}"
 TIME_SECONDS: "{0} {seconde|secondes}"
-TIME_UNITS: "{/m|/h|/d}"
 TIME_WEEKS: "{0} {semaine|semaines}"
 UPDATE_ERROR: "Une erreur s'est produite lors de la recherche de mises à jour."
 UPDATE_HEADER: "{0} Mettre à jour"

lang/ja.yml

@@ -1,212 +1,201 @@
 # CoreProtect Language File (ja)
 
-ACTION_NOT_SUPPORTED: "そのアクションはサポートされていません"
-AMOUNT_BLOCK: "{0}{ブロック|ブロック}"
-AMOUNT_CHUNK: "{0}{チャンク|チャンク}"
-AMOUNT_ENTITY: "{0}体の{エンティティ|エンティティ}"
-AMOUNT_ITEM: "{0}個の{アイテム|アイテム}"
-API_TEST: "APIテストに成功しました"
-CACHE_ERROR: "警告: 検証中にエラーが発生しました {0}"
-CACHE_RELOAD: "データベースから{マッピング|ワールド}キャッシュを強制リロードします"
+ACTION_NOT_SUPPORTED: "そのアクションはサポートされていません。"
+AMOUNT_BLOCK: "{0} {ブロック|ブロック}"
+AMOUNT_CHUNK: "{0} {チャンク|チャンク}"
+AMOUNT_ENTITY: "{0} {エンティティ|エンティティ}"
+AMOUNT_ITEM: "{0} {item|items}"
+API_TEST: "APIテストが成功しました。"
+CACHE_ERROR: "警告:検証中にエラーが発生しました {0} キャッシュ。"
+CACHE_RELOAD: "のリロードを強制する {マッピング|世界} データベースからのキャッシュ。"
 CHECK_CONFIG: "config.ymlを確認してください"
-COMMAND_CONSOLE: "コンソールからコマンドを実行してください"
-COMMAND_NOT_FOUND: "{0} は不明なコマンドです"
-COMMAND_THROTTLED: "しばらく待ってから、もう一度お試しください"
-CONSUMER_ERROR: "コンシューマーキューの処理は既に{一時停止|再開}されています"
-CONSUMER_TOGGLED: "コンシューマーキューの処理が{一時停止|再開}されました"
-CONTAINER_HEADER: "コンテナのトランザクション"
-CPU_CORES: "CPUコア"
-DATABASE_BUSY: "データベースがビジー状態です。後でもう一度お試しください"
-DATABASE_INDEX_ERROR: "データベースインデックスを検証できません"
-DATABASE_LOCKED_1: "データベースがロックされています。最大15秒間お待ちください"
-DATABASE_LOCKED_2: "そのデータベースは既に使用されています。もう一度やり直してください"
-DATABASE_LOCKED_3: "データベースロックを無効にするには、\"database-lock: false\"を設定してください"
-DATABASE_LOCKED_4: "データベースロックを無効にすると、データが破損する可能性があります"
-DATABASE_UNREACHABLE: "データベースにアクセスできません。データを破棄してシャットダウンします"
-DEVELOPMENT_BRANCH: "開発ブランチが検出され、パッチスクリプトをスキップしました"
-DIRT_BLOCK: "あなたの下に仮ブロックを設置しました"
-DISABLE_SUCCESS: "{0} を無効化しました"
-DONATION_KEY_REQUIRED: "このコマンドには有効な寄付キーが必要です。"
-ENABLE_FAILED: "{0} を開始できませんでした"
-ENABLE_SUCCESS: "{0} が有効化されました"
-ENJOY_COREPROTECT: "{0} を楽しんでますか？ぜひDiscordにもご参加ください！"
-FINISHING_CONVERSION: "データ変換を終了します。しばらくお待ちください..."
-FINISHING_LOGGING: "データのロギングを終了します。しばらくお待ちください..."
-FIRST_VERSION: "初期データベース: {0}"
-GLOBAL_LOOKUP: "グローバル検索を行う際は、半径を指定しないでください"
-GLOBAL_ROLLBACK: "{0}を使用してグローバル{ロールバック|復元}を実行してください"
-HELP_ACTION_1: "検索対象をアクションのみに制限します"
-HELP_ACTION_2: "例: [a:block], [a:+block], [a:-block] [a:click], [a:container], [a:inventory], [a:item], [a:kill], [a:chat], [a:command], [a:sign], [a:session], [a:username]"
-HELP_COMMAND: "追加情報を表示します"
-HELP_EXCLUDE_1: "ブロック/ユーザーを除外します"
-HELP_EXCLUDE_2: "例: [e:stone], [e:Notch], [e:stone,Notch]"
+COMMAND_CONSOLE: "コンソールからコマンドを実行してください。"
+COMMAND_NOT_FOUND: "指示 \"{0}\" 見つかりません。"
+COMMAND_THROTTLED: "しばらく待ってから、もう一度お試しください。"
+CONSUMER_ERROR: "すでにコンシューマキュー処理 {一時停止|再開}。"
+CONSUMER_TOGGLED: "消費者キューの処理は {一時停止|再開}。"
+CONTAINER_HEADER: "コンテナトランザクション"
+DATABASE_BUSY: "データベースがビジーです。後でもう一度やり直してください。"
+DATABASE_INDEX_ERROR: "データベースインデックスを検証できません。"
+DATABASE_LOCKED_1: "データベースがロックされています。最大15秒待機しています..."
+DATABASE_LOCKED_2: "データベースはすでに使用されています。もう一度やり直してください。"
+DATABASE_LOCKED_3: "データベースロックを無効にするには、「database-lock:false」を設定します。"
+DATABASE_LOCKED_4: "データベースロックを無効にすると、データが破損する可能性があります。"
+DATABASE_UNREACHABLE: "データベースにアクセスできません。データを破棄してシャットダウンします。"
+DEVELOPMENT_BRANCH: "開発ブランチが検出され、パッチスクリプトをスキップしました。"
+DIRT_BLOCK: "あなたの下にダートブロックを置きました。"
+DISABLE_SUCCESS: "成功！無効 {0}"
+ENABLE_FAILED: "{0} 開始できませんでした。"
+ENABLE_SUCCESS: "{0} これで有効になります！"
+ENJOY_COREPROTECT: "楽しみ {0}？私たちに参加する Discord！"
+FINISHING_CONVERSION: "データ変換を終了します。お待ちください..."
+FINISHING_LOGGING: "データロギングの終了。お待ちください..."
+FIRST_VERSION: "初期DB:{0}"
+GLOBAL_LOOKUP: "グローバルルックアップを実行するために半径を指定しないでください。"
+GLOBAL_ROLLBACK: "つかいます \"{0}「グローバルに {ロールバック|復元}"
+HELP_ACTION_1: "ルックアップをアクションに制限します。"
+HELP_ACTION_2: "例:[a:block]、 [a:+block]、 [a:-block] [a:click]、 [a:container]、 [a:inventory]、 [a:item]、 [a:kill]、 [a:chat]、 [a:command]、 [a:sign]、 [a:session]、 [a:username]"
+HELP_COMMAND: "追加情報を表示します。"
+HELP_EXCLUDE_1: "ブロック/ユーザーを除外します。"
+HELP_EXCLUDE_2: "例:[e:stone]、 [e:Notch]、 [e:stone,Notch]"
 HELP_HEADER: "{0} ヘルプ"
-HELP_INCLUDE_1: "ブロック/エンティティを含めます"
-HELP_INCLUDE_2: "例: [i:stone], [i:zombie], [i:stone,wood,bedrock]"
-HELP_INSPECT_1: "インスペクターが有効な場合、次のことができます:"
-HELP_INSPECT_2: "ブロックを左クリックして、誰がそのブロックを配置したかを確認します"
-HELP_INSPECT_3: "ブロックを右クリックして、隣接するどのブロックが破壊されたかを確認します"
-HELP_INSPECT_4: "ブロックを配置して、その場所でどのブロックが破壊されたかを確認します"
-HELP_INSPECT_5: "液体中などにブロックを配置して、誰がそれを配置したかを確認します"
-HELP_INSPECT_6: "ドアやチェストなどを右クリックして、誰が最後に使用したかを確認します"
-HELP_INSPECT_7: "ヒント:\"/co i\"を使用すると、より手軽にインスペクターにアクセスできます"
-HELP_INSPECT_COMMAND: "ブロックインスペクターのオン/オフを切り替えます"
-HELP_LIST: "全てのコマンドのリストを表示します"
-HELP_LOOKUP_1: "コマンドのショートカットです"
-HELP_LOOKUP_2: "ブロックを調査した後に使用すると、ログを表示できます"
-HELP_LOOKUP_COMMAND: "ブロックデータの詳細検索"
-HELP_NO_INFO: "コマンド情報 \"{0}\" が見つかりません"
-HELP_PARAMETER: "詳細なパラメータ情報については、{0}を参照してください"
-HELP_PARAMS_1: "{検索|ロールバック|復元}を実行します"
-HELP_PARAMS_2: "{検索|ロールバック|復元}するユーザーを指定します"
-HELP_PARAMS_3: "{検索|ロールバック|復元}をする際に時間を指定します"
-HELP_PARAMS_4: "{検索|ロールバック|復元}をする際に半径を指定します"
-HELP_PARAMS_5: "{検索|ロールバック|復元}をする際にアクションを制限します"
-HELP_PARAMS_6: "{検索|ロールバック|復元}をする際にブロック/エンティティを含めます"
-HELP_PARAMS_7: "{検索|ロールバック|復元}をする際にブロック/ユーザーを除外します"
-HELP_PURGE_1: "指定した時間より古いデータを削除します"
-HELP_PURGE_2: "例えば、 \"{0}\" は、1か月より古い全てのデータを削除し、過去30日間のデータのみを保持します"
-HELP_PURGE_COMMAND: "古いブロックデータを削除します"
-HELP_RADIUS_1: "半径領域を指定します"
-HELP_RADIUS_2: "例: [r:10] （注: 変更は10ブロック以内でのみ行ってください）"
-HELP_RELOAD_COMMAND: "構成ファイルを再読み込みします"
-HELP_RESTORE_COMMAND: "ブロックデータを復元します"
-HELP_ROLLBACK_COMMAND: "ブロックデータをロールバックします"
-HELP_STATUS: "プラグインのステータスとバージョン情報を表示します"
-HELP_STATUS_COMMAND: "プラグインのステータスを表示します"
-HELP_TELEPORT: "場所にテレポートします"
-HELP_TIME_1: "検索する時間を指定します"
-HELP_TIME_2: "例: [t:2w,5d,7h,2m,10s], [t:5d2h], [t:2.50h]"
-HELP_USER_1: "検索するユーザーを指定します"
-HELP_USER_2: "例: [u:Notch], [u:Notch,#enderman]"
-INCOMPATIBLE_ACTION: "そのアクションで \"{0}\" は使用できません"
-INSPECTOR_ERROR: "インスペクターは既に{有効|無効}になっています"
-INSPECTOR_TOGGLED: "インスペクターが{有効|無効}になりました"
-INTEGRATION_ERROR: "{0}のロギングを{初期化|無効化}できませんでした"
-INTEGRATION_SUCCESS: "{0}のロギングが正常に{初期化|無効化}されました"
-INTEGRATION_VERSION: "無効な{0}バージョンが見つかりました"
+HELP_INCLUDE_1: "ブロック/エンティティを含めます。"
+HELP_INCLUDE_2: "例:[i:stone]、 [i:zombie]、 [i:stone,wood,bedrock]"
+HELP_INSPECT_1: "インスペクターを有効にすると、次のことができます。"
+HELP_INSPECT_2: "左クリックして配置を確認します。"
+HELP_INSPECT_3: "右クリックして、隣接する削除を表示します。"
+HELP_INSPECT_4: "ブロックを配置して、削除を確認します。"
+HELP_INSPECT_5: "ブロックを液体に入れて配置を確認します。"
+HELP_INSPECT_6: "右クリックしてチェストトランザクションを表示します。"
+HELP_INSPECT_7: "ヒント:「/coi」だけを使用できます。"
+HELP_INSPECT_COMMAND: "ブロックインスペクターを切り替えます。"
+HELP_LIST: "すべてのコマンドのリストを表示します。"
+HELP_LOOKUP_1: "コマンドショートカット。"
+HELP_LOOKUP_2: "追加のページを表示します。"
+HELP_LOOKUP_COMMAND: "ルックアップブロックデータ。"
+HELP_NO_INFO: "コマンドの情報 \"{0}\" 見つかりません。"
+HELP_PARAMETER: "見てください \"{0}詳細なパラメータ情報については、「」を参照してください。"
+HELP_PARAMS_1: "を実行します {ルックアップ|ロールバック|復元}。"
+HELP_PARAMS_2: "ユーザーを指定して {ルックアップ|ロールバック|復元}。"
+HELP_PARAMS_3: "時間を指定します {ルックアップ|ロールバック|復元}。"
+HELP_PARAMS_4: "制限する {ルックアップ|ロールバック|復元} 半径に。"
+HELP_PARAMS_5: "制限する {ルックアップ|ロールバック|復元} アクションに。"
+HELP_PARAMS_6: "ブロック/エンティティをに含める {ルックアップ|ロールバック|復元}。"
+HELP_PARAMS_7: "ブロック/ユーザーをから除外する {ルックアップ|ロールバック|復元}。"
+HELP_PURGE_1: "古いデータを削除します。"
+HELP_PURGE_2: "例えば、 \"{0}\" は、1か月より古いすべてのデータを削除し、過去30日間のデータのみを保持します。"
+HELP_PURGE_COMMAND: "古いブロックデータを削除します。"
+HELP_RADIUS_1: "半径領域を指定します。"
+HELP_RADIUS_2: "例:[r:10] （変更は10ブロック以内でのみ行ってください）"
+HELP_RELOAD_COMMAND: "構成ファイルを再ロードします。"
+HELP_RESTORE_COMMAND: "ブロックデータを復元します。"
+HELP_ROLLBACK_COMMAND: "ブロックデータをロールバックします。"
+HELP_STATUS: "プラグインのステータスを表示します。"
+HELP_STATUS_COMMAND: "プラグインのステータスを表示します。"
+HELP_TELEPORT: "テレポート。"
+HELP_TIME_1: "時間を指定します。"
+HELP_TIME_2: "例:[t:2w,5d,7h,2m,10s]、 [t:5d2h]、 [t:2.50h]"
+HELP_USER_1: "ユーザーを指定します。"
+HELP_USER_2: "例:[u:Notch]、 [u:Notch,#enderman]"
+INCOMPATIBLE_ACTION: "「」{0}「そのアクションでは使用できません。"
+INSPECTOR_ERROR: "すでに検査官 {有効|無効}。"
+INSPECTOR_TOGGLED: "今インスペクター {有効|無効}。"
+INTEGRATION_ERROR: "できません {初期化|無効化} {0} ロギング。"
+INTEGRATION_SUCCESS: "{0} 正常にロギング {初期化|無効}。"
+INTEGRATION_VERSION: "無効 {0} バージョンが見つかりました。"
 INTERACTIONS_HEADER: "プレイヤーの相互作用"
-INVALID_ACTION: "それは有効なアクションではありません"
-INVALID_BRANCH_1: "プラグインのバージョンが無効です（ブランチが設定されていません）"
-INVALID_BRANCH_2: "続行するには、プロジェクトブランチを \"development\" に設定してください"
-INVALID_BRANCH_3: "開発者用コードを実行すると、データが破損する可能性があります"
-INVALID_CONTAINER: "最初に有効なコンテナを調べてください"
-INVALID_DONATION_KEY: "寄付キーが無効です"
-INVALID_INCLUDE: "\"{0}\"は無効なブロック/エンティティ名です"
-INVALID_INCLUDE_COMBO: "これは無効な型の組み合わせです"
-INVALID_RADIUS: "有効な半径を入力してください"
-INVALID_SELECTION: "{0} 選択が見つかりません"
-INVALID_USERNAME: "\"{0}\"は無効なユーザー名です"
-INVALID_WORLD: "有効なワールドを指定してください"
+INVALID_ACTION: "それは有効なアクションではありません。"
+INVALID_BRANCH_1: "プラグインのバージョンが無効です（ブランチが設定されていません）。"
+INVALID_BRANCH_2: "続行するには、プロジェクトブランチを「開発」に設定します。"
+INVALID_BRANCH_3: "開発コードを実行すると、データが破損する可能性があります。"
+INVALID_CONTAINER: "最初に有効なコンテナを調べてください。"
+INVALID_DONATION_KEY: "寄付キーが無効です。"
+INVALID_INCLUDE: "「」{0}\" は無効な値です。"
+INVALID_INCLUDE_COMBO: "これは無効な型の組み合わせです。"
+INVALID_RADIUS: "有効な半径を入力してください。"
+INVALID_SELECTION: "{0} 選択が見つかりません。"
+INVALID_USERNAME: "「」{0}\" は無効なユーザー名です。"
+INVALID_WORLD: "有効なワールドを指定してください。"
 LATEST_VERSION: "最新バージョン: {0}"
 LINK_DISCORD: "Discord: {0}"
-LINK_DOWNLOAD: "ダウンロード: {0}"
+LINK_DOWNLOAD: "ダウンロード:{0}"
 LINK_PATREON: "Patreon: {0}"
-LINK_WIKI_BLOCK: "ブロック名: {0}"
-LINK_WIKI_ENTITY: "エンティティ名: {0}"
-LOGGING_ITEMS: "ログに記録すべきアイテムが{0}個残っています。しばらくお待ちください..."
-LOGGING_TIME_LIMIT: "記録制限時間に達しました。データを破棄してシャットダウンします"
-LOOKUP_BLOCK: "{0}が{1}を{設置した|破壊した}"
-LOOKUP_CONTAINER: "{0}が{2}個の{1}を{追加した|取り出した}"
-LOOKUP_HEADER: "{0} の検索結果"
-LOOKUP_INTERACTION: "{0}が{1}を{クリックした|殺害した}"
-LOOKUP_ITEM: "{0}が{2}個の{1}を{拾った|落とした}"
-LOOKUP_LOGIN: "{0}の{ログイン|ログアウト}がログに記録されます"
-LOOKUP_PAGE: "{0} ページ目"
-LOOKUP_PROJECTILE: "{0}が{2}個の{1}を{投げた|撃った}"
-LOOKUP_ROWS_FOUND: "{0}行見つかりました"
-LOOKUP_SEARCHING: "検索中。しばらくお待ちください..."
-LOOKUP_STORAGE: "{0}が{2}個の{1}を{預け入れた|引き出した}"
-LOOKUP_TIME: "{0}前"
-LOOKUP_USERNAME: "{0}が{1}としてログインしました"
-MAXIMUM_RADIUS: "最大{0}ブロックの半径内で{検索|ロールバック|復元}を実行します"
-MISSING_ACTION_USER: "そのアクションを使用するには、ユーザーを指定してください"
-MISSING_LOOKUP_TIME: "{検索|ロールバック|復元}する時間を指定してください"
-MISSING_LOOKUP_USER: "ユーザー、ブロック、または半径を指定してください"
-MISSING_PARAMETERS: "\"{0}\" のパラメータが不足しています"
-MISSING_ROLLBACK_RADIUS: "{ロールバック|復元}対象の半径を指定しませんでした"
-MISSING_ROLLBACK_USER: "{ロールバック|復元}対象のユーザーを指定しませんでした"
-MYSQL_UNAVAILABLE: "MySQLサーバーに接続できません"
-NETWORK_CONNECTION: "{0}の接続に{成功|失敗}しました。{1}{2}を使用します"
-NETWORK_TEST: "ネットワーク・テスト・データが正常に送信されました"
-NO_DATA: "{0}でデータが見つかりません"
-NO_DATA_LOCATION: "この場所には{データ|トランザクション|相互作用|メッセージ}が見つかりませんでした"
-NO_PERMISSION: "あなたにはそれをする権限がありません"
-NO_RESULTS: "結果が見つかりませんでした"
-NO_RESULTS_PAGE: "このページには{結果|データ}は見つかりませんでした"
-NO_ROLLBACK: "{保留中または以前の}ロールバック/復元は見つかりませんでした"
-PATCH_INTERRUPTED: "アップグレードが中断されました。再起動時に再試行します"
-PATCH_OUTDATED_1: "{0}より古いデータベースはアップグレードできません"
-PATCH_OUTDATED_2: "CoreProtect がサポートされているバージョンにアップグレードしてください"
-PATCH_PROCESSING: "新しいデータを処理しています。しばらくお待ちください..."
-PATCH_SKIP_UPDATE: "{0}の{テーブル|インデックス}の{更新|作成|削除}をスキップします"
-PATCH_STARTED: "{0} のアップグレードを実行します。しばらくお待ちください..."
-PATCH_SUCCESS: "{0} は正常にアップグレードされました"
-PATCH_UPGRADING: "データベースのアップグレードが進行中です。しばらくお待ちください..."
-PLEASE_SELECT: "\"{0}\" または \"{1}\" を選択してください"
-PREVIEW_CANCELLED: "プレビューがキャンセルされました"
+LINK_WIKI_BLOCK: "ブロック名:{0}"
+LINK_WIKI_ENTITY: "エンティティ名:{0}"
+LOGGING_ITEMS: "{0} ログに残されたアイテム。お待ちください..."
+LOGGING_TIME_LIMIT: "ロギングの制限時間に達しました。データを破棄してシャットダウンします。"
+LOOKUP_BLOCK: "{0} {配置|壊れた} {1}。"
+LOOKUP_CONTAINER: "{0} {追加|削除} {1} {2}。"
+LOOKUP_HEADER: "{0} 結果"
+LOOKUP_INTERACTION: "{0} {クリック|殺された} {1}。"
+LOOKUP_ITEM: "{0} {拾った|落とした} {1} {2}。"
+LOOKUP_LOGIN: "{0} ログに記録されます {in|out}。"
+LOOKUP_PAGE: "ページ {0}"
+LOOKUP_PROJECTILE: "{0} {投げた|ショット} {1} {2}。"
+LOOKUP_ROWS_FOUND: "{0} {行|行} 見つかった。"
+LOOKUP_SEARCHING: "ルックアップ検索。お待ちください..."
+LOOKUP_STORAGE: "{0} {預け入れ|撤回} {1} {2}。"
+LOOKUP_TIME: "{0} 前に"
+LOOKUP_USERNAME: "{0} としてログイン {1}。"
+MAXIMUM_RADIUS: "最大 {ルックアップ|ロールバック|復元} 半径は {0}。"
+MISSING_ACTION_USER: "そのアクションを使用するには、ユーザーを指定してください。"
+MISSING_LOOKUP_TIME: "時間を指定してください {ルックアップ|ロールバック|復元}。"
+MISSING_LOOKUP_USER: "ユーザーを指定するか、 {ブロック|半径}。"
+MISSING_PARAMETERS: "使ってください \"{0}\" 。"
+MISSING_ROLLBACK_RADIUS: "指定しませんでした {ロールバック|復元} 半径。"
+MISSING_ROLLBACK_USER: "指定しませんでした {ロールバック|復元} ユーザー。"
+MYSQL_UNAVAILABLE: "接続できません MySQL サーバ。"
+NO_DATA: "でデータが見つかりません {0}。"
+NO_DATA_LOCATION: "番号 {データ|トランザクション|相互作用|メッセージ} 見つかった。"
+NO_PERMISSION: "あなたにはそれをする許可がありません。"
+NO_RESULTS: "結果が見つかりません。"
+NO_RESULTS_PAGE: "番号 {結果|データ} そのページで見つかりました。"
+NO_ROLLBACK: "番号 {保留中|前へ} ロールバック/復元が見つかりました。"
+PATCH_INTERRUPTED: "アップグレードが中断されました。再起動時に再試行します。"
+PATCH_OUTDATED_1: "古いデータベースをアップグレードできません {0}。"
+PATCH_OUTDATED_2: "サポートされているバージョンでアップグレードしてください CoreProtect。"
+PATCH_PROCESSING: "新しいデータを処理しています。お待ちください..."
+PATCH_SKIP_UPDATE: "スキップ {テーブル|インデックス} {更新|作成|削除} の上 {0}。"
+PATCH_STARTED: "実行する {0} アップグレード。お待ちください..."
+PATCH_SUCCESS: "正常にアップグレードされました {0}。"
+PATCH_UPGRADING: "データベースのアップグレードが進行中です。お待ちください..."
+PLEASE_SELECT: "選んでください: \"{0}\" また \"{1}\" 。"
+PREVIEW_CANCELLED: "プレビューがキャンセルされました。"
 PREVIEW_CANCELLING: "プレビューをキャンセルしています..."
-PREVIEW_IN_GAME: "ゲーム内でのみロールバックをプレビューできます"
-PREVIEW_TRANSACTION: "{コンテナ|インベントリ}のトランザクションをプレビューすることはできません"
-PRIMARY_THREAD_ERROR: "そのAPIメソッドはメインスレッドでは使用できません"
-PURGE_ABORTED: "パージに失敗しました。データベースが破損している可能性があります"
-PURGE_ERROR: "{0} のデータを処理できません"
-PURGE_FAILED: "パージに失敗しました。もう一度やり直してください"
-PURGE_IN_PROGRESS: "パージは進行中です。もう一度やり直してください"
-PURGE_MINIMUM_TIME: "パージできるのは、{0}{日|時間}より古いデータのみです"
-PURGE_NOTICE_1: "これには時間がかかる場合があります..."
-PURGE_NOTICE_2: "完了するまでサーバーを再起動しないでください"
-PURGE_OPTIMIZING: "データベースの最適化をしています。しばらくお待ちください..."
-PURGE_PROCESSING: "{0} のデータを処理中..."
+PREVIEW_IN_GAME: "ゲーム内でのみロールバックをプレビューできます。"
+PREVIEW_TRANSACTION: "プレビューできません {コンテナ|在庫} トランザクション。"
+PURGE_ABORTED: "パージに失敗しました。データベースが破損している可能性があります。"
+PURGE_ERROR: "処理できません {0} データ！"
+PURGE_FAILED: "パージに失敗しました。後でもう一度やり直してください。"
+PURGE_IN_PROGRESS: "進行中のパージ。後でもう一度やり直してください。"
+PURGE_MINIMUM_TIME: "パージできるのは、より古いデータのみです。 {0} {日|時間}。"
+PURGE_NOTICE_1: "これには時間がかかる場合がありますのでご注意ください。"
+PURGE_NOTICE_2: "完了するまでサーバーを再起動しないでください。"
+PURGE_OPTIMIZING: "データベースの最適化。お待ちください..."
+PURGE_PROCESSING: "処理 {0} データ..."
 PURGE_REPAIRING: "修復しようとしています。これには時間がかかる場合があります..."
-PURGE_ROWS: "{0}行のデータが削除されました"
-PURGE_STARTED: "データの削除は\"{0}\"で開始されました"
-PURGE_SUCCESS: "データのパージに成功しました"
-RAM_STATS: "{0}GB / {1}GB RAM"
-RELOAD_STARTED: "構成の再読み込みをしています。しばらくお待ちください"
-RELOAD_SUCCESS: "構成が正常に再読み込みされました"
-ROLLBACK_ABORTED: "ロールバックまたは復元が中止されました"
-ROLLBACK_CHUNKS_FOUND: "{0}個の{チャンク|チャンク}の変更が見つかりました"
-ROLLBACK_CHUNKS_MODIFIED: "{0}/{1}個の{チャンク|チャンク}を{変更しました|変更中}"
-ROLLBACK_COMPLETED: "{ロールバック|復元|プレビュー} は\"{0}\"で完了しました"
-ROLLBACK_EXCLUDED_USERS: "除外するユーザー: \"{0}\" "
-ROLLBACK_INCLUDE: "{含まれる|除外される}{ブロック|エンティティ|ターゲット}タイプ: \"{0}\""
-ROLLBACK_IN_PROGRESS: "ロールバック/復元はすでに進行中です"
-ROLLBACK_LENGTH: "所要時間: {0}{秒|秒間}"
-ROLLBACK_MODIFIED: "{0}を{変更しました|変更中}"
-ROLLBACK_RADIUS: "半径: {0}{ブロック|ブロック}"
-ROLLBACK_SELECTION: "半径を\"{0}\"に設定しました"
-ROLLBACK_STARTED: "{ロールバック|復元|プレビュー}が\"{0}\"で開始されました"
-ROLLBACK_TIME: "時間範囲: {0}"
-ROLLBACK_WORLD_ACTION: "{ワールド|アクション}を\"{0}\"に制限しました"
-SIGN_HEADER: "看板のメッセージ"
-STATUS_CONSUMER: "キューに{0}個の{アイテム|アイテム}があります"
-STATUS_DATABASE: "データベース: {0}を使用中"
-STATUS_INTEGRATION: "{0}: 統合 {有効|無効}"
+PURGE_ROWS: "{0} {行|行} 削除されたデータの。"
+PURGE_STARTED: "データの削除は \"で開始されました{0}\" 。"
+PURGE_SUCCESS: "データのパージに成功しました。"
+RELOAD_STARTED: "構成の再読み込み-しばらくお待ちください。"
+RELOAD_SUCCESS: "構成が正常に再ロードされました。"
+ROLLBACK_ABORTED: "ロールバックまたは復元が中止されました。"
+ROLLBACK_CHUNKS_FOUND: "見つかった {0} {チャンク|チャンク} 変更します。"
+ROLLBACK_CHUNKS_MODIFIED: "変更 {0}/{1} {チャンク|チャンク}。"
+ROLLBACK_COMPLETED: "{ロールバック|復元|プレビュー} 「のために完成{0}\" 。"
+ROLLBACK_EXCLUDED_USERS: "除外 {ユーザー|ユーザー}: \"{0}\" 。"
+ROLLBACK_INCLUDE: "{含まれる|除外される} {ブロック|エンティティ|ターゲット} {タイプ|タイプ}: \"{0}\" 。"
+ROLLBACK_IN_PROGRESS: "ロールバック/復元はすでに進行中です。"
+ROLLBACK_LENGTH: "所要時間:{0} {秒|秒}。"
+ROLLBACK_MODIFIED: "{変更|変更} {0}。"
+ROLLBACK_RADIUS: "半径:{0} {ブロック|ブロック}。"
+ROLLBACK_SELECTION: "半径を「{0}\" 。"
+ROLLBACK_STARTED: "{ロールバック|復元|プレビュー} 「で始まった{0}\" 。"
+ROLLBACK_TIME: "時間範囲:{0}。"
+ROLLBACK_WORLD_ACTION: "に制限 {世界|アクション} 「」{0}\" 。"
+SIGN_HEADER: "メッセージに署名する"
+STATUS_CONSUMER: "消費者: {0} {item|items} 順番待ち。"
+STATUS_DATABASE: "データベース: 使用する {0}。"
+STATUS_INTEGRATION: "{0}: 統合 {有効|無効}。"
 STATUS_LICENSE: "ライセンス: {0}"
-STATUS_SYSTEM: "システム: {0}"
 STATUS_VERSION: "バージョン: {0}"
-TELEPORTED: "{0} にテレポートしました"
-TELEPORTED_SAFETY: "あなたを安全な場所にテレポートさせました"
-TELEPORT_PLAYERS: "テレポートコマンドはプレイヤーのみが使用できます"
-TIME_DAYS: "{0}{日|日間}"
-TIME_HOURS: "{0}{時|時間}"
-TIME_MINUTES: "{0}{分|分間}"
-TIME_MONTHS: "{0}{ヶ月|ヶ月間}"
-TIME_SECONDS: "{0}{秒|秒間}"
-TIME_UNITS: "{/m|/h|/d}"
-TIME_WEEKS: "{0}{週|週間}"
-TIME_YEARS: "{0}{年|年間}"
-UPDATE_ERROR: "更新の確認中にエラーが発生しました"
+TELEPORTED: "にテレポート {0}。"
+TELEPORTED_SAFETY: "安全にテレポートしました。"
+TELEPORT_PLAYERS: "テレポートコマンドはプレイヤーだけが使用できます。"
+TIME_DAYS: "{0} {日|日}"
+TIME_HOURS: "{0} {時間|時間}"
+TIME_MINUTES: "{0} {分|分}"
+TIME_SECONDS: "{0} {秒|秒}"
+TIME_WEEKS: "{0} {週|週}"
+UPDATE_ERROR: "更新の確認中にエラーが発生しました。"
 UPDATE_HEADER: "{0} アップデート"
-UPDATE_NOTICE: "お知らせ: {0} が利用可能です"
-UPGRADE_IN_PROGRESS: "アップグレードが進行中です。しばらくしてからもう一度やり直してください"
-USER_NOT_FOUND: "ユーザー \"{0}\" が見つかりません"
-USER_OFFLINE: "ユーザー \"{0}\" はオンラインではありません"
-USING_MYSQL: "MySQL データストレージを使用します"
-USING_SQLITE: "SQLite データストレージを使用します"
-VALID_DONATION_KEY: "有効な寄付キーです"
-VERSION_INCOMPATIBLE: "{0} {1} はサポートされていません"
-VERSION_NOTICE: "バージョン {0} が利用可能です"
-VERSION_REQUIRED: "{0} {1} 以上が必要です"
-WORLD_NOT_FOUND: "ワールド \"{0}\" は見つかりませんでした"
+UPDATE_NOTICE: "知らせ:{0} 現在利用できます。"
+UPGRADE_IN_PROGRESS: "アップグレードが進行中です。後でもう一度やり直してください。"
+USER_NOT_FOUND: "ユーザー \"{0}\" 見つかりません。"
+USER_OFFLINE: "ユーザー \"{0}\" はオンラインではありません。"
+USING_MYSQL: "使用する MySQL データストレージ用。"
+USING_SQLITE: "使用する SQLite データストレージ用。"
+VALID_DONATION_KEY: "有効な寄付キー。"
+VERSION_NOTICE: "バージョン {0} 現在利用できます。"
+VERSION_REQUIRED: "{0} {1} 以上が必要です。"
+WORLD_NOT_FOUND: "世界 \"{0}\" 見つかりません。"

lang/ko.yml

@@ -1,209 +0,0 @@
-# CoreProtect Language File (ko)
-
-ACTION_NOT_SUPPORTED: "이 명령어는 해당 작업을 지원하지 않습니다."
-AMOUNT_BLOCK: "{0}개의 {블록|블록}"
-AMOUNT_CHUNK: "{0}개의 {청크|청크}"
-AMOUNT_ENTITY: "{0}개의 {엔티티|엔티티}"
-AMOUNT_ITEM: "{0}개의 {아이템|아이템}"
-API_TEST: "API 테스트가 성공했습니다."
-CACHE_ERROR: "경고: {0} 캐시를 검증하는 중 오류가 발생했습니다."
-CACHE_RELOAD: "데이터베이스에서 {매핑|월드} 캐시를 강제로 다시 로드합니다."
-CHECK_CONFIG: "config.yml을 확인해주세요"
-COMMAND_CONSOLE: "이 명령어는 콘솔에서만 실행할 수 있습니다."
-COMMAND_NOT_FOUND: "\"{0}\" 명령어를 찾을 수 없습니다."
-COMMAND_THROTTLED: "잠시 기다렸다가 다시 시도하세요."
-CONSUMER_ERROR: "데이터베이스 처리가 이미 {일시정지|재개}되어 있습니다!"
-CONSUMER_TOGGLED: "데이터베이스 처리가 {일시정지|재개}되었습니다."
-CONTAINER_HEADER: "컨테이너 기록"
-CPU_CORES: "CPU 코어"
-DATABASE_BUSY: "데이터베이스가 사용 중입니다. 나중에 다시 시도하세요."
-DATABASE_INDEX_ERROR: "데이터베이스 인덱스의 유효성을 검사할 수 없습니다."
-DATABASE_LOCKED_1: "데이터베이스가 잠겼습니다. 최대 15초 대기 중..."
-DATABASE_LOCKED_2: "데이터베이스가 이미 사용 중입니다. 다시 시도하세요."
-DATABASE_LOCKED_3: "데이터베이스 잠금을 해제하려면 \"database-lock: false\"로 설정하세요."
-DATABASE_LOCKED_4: "데이터베이스 잠금을 비활성화하면 데이터가 손상될 수도 있습니다."
-DATABASE_UNREACHABLE: "데이터베이스에 연결할 수 없습니다. 데이터를 삭제하고 종료합니다."
-DEVELOPMENT_BRANCH: "개발 브랜치가 감지되어 패치 스크립트를 건너뜁니다."
-DIRT_BLOCK: "당신 아래에 임시 안전 블록을 설치했습니다."
-DISABLE_SUCCESS: "성공! {0} 비활성화됨"
-DONATION_KEY_REQUIRED: "해당 명령어를 사용하려면 유효한 후원 키가 필요합니다."
-ENABLE_FAILED: "{0}을(를) 시작할 수 없습니다."
-ENABLE_SUCCESS: "{0}이(가) 성공적으로 활성화되었습니다!"
-ENJOY_COREPROTECT: "{0}을(를) 잘 사용하고 계신가요? 그렇다면 저희의 Discord 서버에 참여하세요!"
-FINISHING_CONVERSION: "데이터 변환을 완료하는 중입니다. 잠시 기다려 주세요..."
-FINISHING_LOGGING: "데이터 로깅을 완료하는 중입니다. 잠시 기다려 주세요..."
-FIRST_VERSION: "초기 DB: {0}"
-GLOBAL_LOOKUP: "전체 조회를 수행하려면 반경을 지정하지 마세요."
-GLOBAL_ROLLBACK: "전역 {롤백|복원}을 수행하려면 \"{0}\"을(를) 사용하세요."
-HELP_ACTION_1: "특정 작업으로 조회를 제한합니다."
-HELP_ACTION_2: "예: [a:block], [a:+block], [a:-block] [a:click], [a:container], [a:inventory], [a:item], [a :kill], [a:chat], [a:command], [a:sign], [a:session], [a:username]"
-HELP_COMMAND: "해당 명령어에 대한 추가 정보를 표시합니다."
-HELP_EXCLUDE_1: "블록/사용자를 제외합니다."
-HELP_EXCLUDE_2: "예: [e:stone], [e:Notch], [e:stone,Notch]"
-HELP_HEADER: "{0} 도움말"
-HELP_INCLUDE_1: "특정 블록/엔티티를 포함합니다."
-HELP_INCLUDE_2: "예: [i:stone], [i:zombie], [i:stone,wood,bedrock]"
-HELP_INSPECT_1: "로그 조사가 활성화되면 다음을 수행할 수 있습니다:"
-HELP_INSPECT_2: "블록을 마우스 왼쪽 버튼으로 클릭하면 누가 그 블록을 설치했는지 확인할 수 있습니다."
-HELP_INSPECT_3: "블록을 마우스 오른쪽 버튼으로 클릭하면 인접한 블록이 부서졌는지 확인할 수 있습니다."
-HELP_INSPECT_4: "블록을 배치하여 해당 위치에서 어떤 블록이 부서졌는지 확인할 수 있습니다."
-HELP_INSPECT_5: "누가 설치했는지 확인하려면 액체(등)에 블록을 배치하세요."
-HELP_INSPECT_6: "문, 상자 등을 마우스 오른쪽 버튼으로 클릭하면 누가 마지막으로 사용했는지 확인할 수 있습니다."
-HELP_INSPECT_7: "팁: 더 빠른 사용을 위해 \"/co i\"명령어를 사용할 수 있습니다."
-HELP_INSPECT_COMMAND: "블록 로그 조사를 켜거나 끕니다."
-HELP_LIST: "모든 명령어 목록을 표시합니다."
-HELP_LOOKUP_1: "단축 명령어."
-HELP_LOOKUP_2: "로그를 보려면 블록을 검사한 후 사용하세요."
-HELP_LOOKUP_COMMAND: "고급 블록 데이터 조회."
-HELP_NO_INFO: "\"{0}\" 명령어에 대한 정보가 없습니다."
-HELP_PARAMETER: "자세한 매개변수 정보는 \"{0}\"을 참조하세요."
-HELP_PARAMS_1: "{조회|롤백|복원}을(를) 수행합니다."
-HELP_PARAMS_2: "{조회|롤백|복원}할 사용자를 지정합니다."
-HELP_PARAMS_3: "{조회|롤백|복원}할 시간을 지정합니다."
-HELP_PARAMS_4: "{조회|롤백|복원}을(를) 제한할 반경을 지정합니다."
-HELP_PARAMS_5: "{조회|롤백|복원}을(를) 특정 작업으로 제한합니다."
-HELP_PARAMS_6: "{조회|롤백|복원}에 특정 블록/엔티티를 포함합니다."
-HELP_PARAMS_7: "{조회|롤백|복원}에서 블록/사용자를 제외합니다."
-HELP_PURGE_1: "지정된 시간보다 오래된 데이터를 삭제합니다."
-HELP_PURGE_2: "예를 들어 \"{0}\"은(는) 한 달이 지난 모든 데이터를 삭제하고 지난 30일 동안의 데이터만 보관합니다."
-HELP_PURGE_COMMAND: "오래된 블록 데이터를 삭제합니다."
-HELP_RADIUS_1: "반경을 지정합니다."
-HELP_RADIUS_2: "예: [r:10] (10블록 이내에서만 변경합니다.)"
-HELP_RELOAD_COMMAND: "구성 파일을 다시 로드합니다."
-HELP_RESTORE_COMMAND: "블록 데이터를 복원합니다."
-HELP_ROLLBACK_COMMAND: "블록 데이터를 롤백합니다."
-HELP_STATUS: "플러그인 상태 및 버전 정보를 확인합니다."
-HELP_STATUS_COMMAND: "플러그인 상태를 표시합니다."
-HELP_TELEPORT: "특정 위치로 순간이동합니다."
-HELP_TIME_1: "조회 시간을 지정합니다."
-HELP_TIME_2: "예: [t:2w,5d,7h,2m,10s], [t:5d2h], [t:2.50h]"
-HELP_USER_1: "조회할 사용자를 지정합니다."
-HELP_USER_2: "예: [u:notch], [u:notch,#enderman]"
-INCOMPATIBLE_ACTION: "\"{0}\"은(는) 해당 작업과 함께 사용할 수 없습니다."
-INSPECTOR_ERROR: "로그 조사가 이미 {활성화|비활성화}되어 있습니다!"
-INSPECTOR_TOGGLED: "로그 조사가 {활성화|비활성화}되었습니다."
-INTEGRATION_ERROR: "{0} 로깅을 {초기화|비활성화}할 수 없습니다."
-INTEGRATION_SUCCESS: "{0} 로깅이 성공적으로 {초기화|비활성화}되었습니다."
-INTEGRATION_VERSION: "잘못된 {0} 버전이 발견되었습니다."
-INTERACTIONS_HEADER: "플레이어 상호작용"
-INVALID_ACTION: "유효하지 않은 작업입니다."
-INVALID_BRANCH_1: "잘못된 플러그인 버전(브랜치가 설정되지 않음)."
-INVALID_BRANCH_2: "계속하려면 프로젝트 브랜치를 \"development\"로 설정하세요."
-INVALID_BRANCH_3: "개발중인 코드를 실행하면 데이터 손상이 발생할 수도 있습니다."
-INVALID_CONTAINER: "먼저 유효한 컨테이너를 검사하세요."
-INVALID_DONATION_KEY: "잘못된 후원 키입니다."
-INVALID_INCLUDE: "\"{0}\"은(는) 잘못된 블록/엔티티 이름입니다."
-INVALID_INCLUDE_COMBO: "잘못된 블록/엔티티 조합입니다."
-INVALID_RADIUS: "유효한 반경을 입력하세요."
-INVALID_SELECTION: "{0} 선택된 항목을 찾을 수 없습니다."
-INVALID_USERNAME: "\"{0}\"은(는) 잘못된 사용자 이름입니다."
-INVALID_WORLD: "유효한 월드를 지정하세요."
-LATEST_VERSION: "최신 버전: {0}"
-LINK_DISCORD: "Discord: {0}"
-LINK_DOWNLOAD: "다운로드: {0}"
-LINK_PATREON: "Patreon: {0}"
-LINK_WIKI_BLOCK: "블록 이름: {0}"
-LINK_WIKI_ENTITY: "엔티티 이름: {0}"
-LOGGING_ITEMS: "{0} 아이템이 남았습니다. 잠시만 기다려 주세요..."
-LOGGING_TIME_LIMIT: "로깅 시간 제한에 도달했습니다. 데이터를 삭제하고 종료합니다."
-LOOKUP_BLOCK: "{0}이(가) {1}을(를) {설치|파괴}함"
-LOOKUP_CONTAINER: "{0}이(가) {2}에서 {1}을(를) {추가|제거}함"
-LOOKUP_HEADER: "{0} 조회 결과"
-LOOKUP_INTERACTION: "{0}이(가) {1}을(를) {클릭함|죽임}
-LOOKUP_ITEM: "{0}이(가) {2}에서 {1}을(를) {획득|드롭}함"
-LOOKUP_LOGIN: "{0}이(가) {로그인|로그아웃}함"
-LOOKUP_PAGE: "페이지 {0}"
-LOOKUP_PROJECTILE: "{0}이(가) {2}에서 {1}을(를) {던짐|발사함}"
-LOOKUP_ROWS_FOUND: "{0} {열|열}이 발견되었습니다."
-LOOKUP_SEARCHING: "조회 중입니다. 잠시만 기다려 주세요..."
-LOOKUP_STORAGE: "{0}이(가) {2}에서 {1}을(를) {추가|제거}함"
-LOOKUP_TIME: "{0} 전"
-LOOKUP_USERNAME: "{0}이(가) {1}으로 로그인함"
-MAXIMUM_RADIUS: "최대 {조회|롤백|복원} 반경은 {0}입니다."
-MISSING_ACTION_USER: "해당 작업을 사용하려면 사용자를 지정하세요."
-MISSING_LOOKUP_TIME: "{조회|롤백|복원}할 시간을 지정하세요."
-MISSING_LOOKUP_USER: "조회할 사용자 또는 {블록|반경}을 지정하세요."
-MISSING_PARAMETERS: "\"{0}\"을(를) 사용하세요."
-MISSING_ROLLBACK_RADIUS: "{롤백|복원}할 반경을 지정하지 않았습니다."
-MISSING_ROLLBACK_USER: "{롤백|복원}할 사용자를 지정하지 않았습니다."
-MYSQL_UNAVAILABLE: "MySQL 서버에 연결할 수 없습니다."
-NETWORK_CONNECTION: "{0} 연결 {성공|실패}. {1} {2} 사용 중"
-NETWORK_TEST: "네트워크 테스트 데이터가 성공적으로 전송되었습니다."
-NO_DATA: "{0}에서 데이터를 찾을 수 없습니다."
-NO_DATA_LOCATION: "해당 위치에서 {데이터|거래|상호작용|메시지}(을)를 찾을 수 없습니다."
-NO_PERMISSION: "해당 작업을 수행할 권한이 없습니다."
-NO_RESULTS: "결과를 찾을 수 없습니다."
-NO_RESULTS_PAGE: "해당 페이지에 대한 {결과|데이터}를 찾을 수 없습니다."
-NO_ROLLBACK: "{보류 중인|이전} 롤백/복원을 찾을 수 없습니다."
-PATCH_INTERRUPTED: "업그레이드가 중단되었습니다. 서버를 재시작하면 재시도합니다."
-PATCH_OUTDATED_1: "{0}보다 오래된 데이터베이스를 업그레이드할 수 없습니다."
-PATCH_OUTDATED_2: "지원되는 CoreProtect 버전으로 업그레이드하세요."
-PATCH_PROCESSING: "새 데이터를 처리 중입니다. 잠시 기다려 주세요..."
-PATCH_SKIP_UPDATE: "{0}에서 {테이블|인덱스} {업데이트|생성|제거}를 건너뜁니다."
-PATCH_STARTED: "{0} 업그레이드를 수행 중입니다. 잠시 기다려 주세요..."
-PATCH_SUCCESS: "{0}으로 성공적으로 업그레이드되었습니다."
-PATCH_UPGRADING: "데이터베이스 업그레이드가 진행 중입니다. 잠시 기다려 주세요..."
-PLEASE_SELECT: "\"{0}\" 또는 \"{1}\" 중 하나를 선택하세요."
-PREVIEW_CANCELLED: "미리보기가 취소되었습니다."
-PREVIEW_CANCELLING: "미리보기 취소 중..."
-PREVIEW_IN_GAME: "게임 내에서만 롤백 미리보기가 가능합니다."
-PREVIEW_TRANSACTION: "{컨테이너|인벤토리} 기록은 미리보기할 수 없습니다."
-PRIMARY_THREAD_ERROR: "기본 스레드에서는 API 메소드를 사용할 수 없습니다."
-PURGE_ABORTED: "삭제에 실패하였습니다. 데이터베이스가 손상되었을 수도 있습니다."
-PURGE_ERROR: "{0} 데이터를 처리할 수 없습니다!"
-PURGE_FAILED: "삭제에 실패하였습니다. 나중에 다시 시도하세요."
-PURGE_IN_PROGRESS: "삭제가 진행 중입니다. 나중에 다시 시도하세요."
-PURGE_MINIMUM_TIME: "{0} {일|시간}보다 오래된 데이터만 삭제할 수 있습니다."
-PURGE_NOTICE_1: "이 작업은 시간이 걸릴 수 있습니다."
-PURGE_NOTICE_2: "완료될 때까지 서버를 재시작하지 마세요."
-PURGE_OPTIMIZING: "데이터베이스를 최적화 중입니다. 잠시 기다려 주세요..."
-PURGE_PROCESSING: "{0} 데이터를 처리 중입니다..."
-PURGE_REPAIRING: "복구 시도 중입니다. 시간이 걸릴 수 있습니다..."
-PURGE_ROWS: "{0} {열|열}의 데이터가 삭제되었습니다."
-PURGE_STARTED: "\"{0}\"에서 데이터 삭제 시작됨"
-PURGE_SUCCESS: "데이터 삭제가 성공적으로 완료되었습니다."
-RAM_STATS: "램: {0}GB / {1}GB"
-RELOAD_STARTED: "구성 리로드 중 - 잠시 기다려 주세요."
-RELOAD_SUCCESS: "구성이 성공적으로 리로드되었습니다."
-ROLLBACK_ABORTED: "롤백 또는 복원이 중단되었습니다."
-ROLLBACK_CHUNKS_FOUND: "수정할 {청크|청크} {0}개를 찾았습니다."
-ROLLBACK_CHUNKS_MODIFIED: "{1}개 중 {0}개의 {청크|청크} 수정됨"
-ROLLBACK_COMPLETED: "\"{0}\"에 대한 {롤백이|복원이|미리보기가} 완료되었습니다."
-ROLLBACK_EXCLUDED_USERS: "제외된 {사용자|사용자}: \"{0}\""
-ROLLBACK_INCLUDE: "{포함된|제외된} {블록|엔티티|대상} {타입|타입}: \"{0}\""
-ROLLBACK_IN_PROGRESS: "롤백/복원이 이미 진행 중입니다."
-ROLLBACK_LENGTH: "소요 시간: {0} {초|초}"
-ROLLBACK_MODIFIED: "{0}이(가) {수정됨|수정 중}"
-ROLLBACK_RADIUS: "반경: {0} {블록|블록}"
-ROLLBACK_SELECTION: "반경이 \"{0}\"로 설정되었습니다."
-ROLLBACK_STARTED: "\"{0}\"에서 {롤백이|복원이|미리보기가} 시작되었습니다."
-ROLLBACK_TIME: "시간 범위: {0}"
-ROLLBACK_WORLD_ACTION: "{월드|작업} \"{0}\"으로 제한됨"
-SIGN_HEADER: "표지판 메시지"
-STATUS_CONSUMER: "데이터베이스 처리: 대기 중인 {항목|항목} {0}개"
-STATUS_DATABASE: "데이터베이스: {0} 사용 중"
-STATUS_INTEGRATION: "{0}: 통합 {활성화됨|비활성화됨}"
-STATUS_LICENSE: "라이선스: {0}"
-STATUS_SYSTEM: "시스템: {0}"
-STATUS_VERSION: "버전: {0}"
-TELEPORTED: "{0}(으)로 텔레포트되었습니다."
-TELEPORTED_SAFETY: "안전하게 텔레포트되었습니다."
-TELEPORT_PLAYERS: "텔레포트 명령어는 플레이어만 사용할 수 있습니다."
-TIME_DAYS: "{0} {일|일}"
-TIME_HOURS: "{0} {시간|시간}"
-TIME_MINUTES: "{0} {분|분}"
-TIME_SECONDS: "{0} {초|초}"
-TIME_UNITS: "{/m|/h|/d}"
-TIME_WEEKS: "{0} {주|주}"
-UPDATE_ERROR: "업데이트 확인 중 오류가 발생했습니다."
-UPDATE_HEADER: "{0} 업데이트"
-UPDATE_NOTICE: "알림: {0}을(를) 사용할 수 있습니다."
-UPGRADE_IN_PROGRESS: "업그레이드가 진행 중입니다. 나중에 다시 시도하세요."
-USER_NOT_FOUND: "사용자 \"{0}\"을(를) 찾을 수 없습니다."
-USER_OFFLINE: "사용자 \"{0}\"은(는) 온라인 상태가 아닙니다."
-USING_MYSQL: "데이터 저장에 MySQL을 사용 중입니다."
-USING_SQLITE: "데이터 저장에 SQLite를 사용 중입니다."
-VALID_DONATION_KEY: "유효한 후원 키입니다."
-VERSION_NOTICE: "버전 {0}(를) 사용할 수 있습니다."
-VERSION_REQUIRED: "{0} {1} 이상이 필요합니다."
-WORLD_NOT_FOUND: " \"{0}\"을(를) 찾을 수 없습니다."

lang/pl.yml

@@ -1,21 +1,20 @@
 # CoreProtect Language File (pl)
 
-ACTION_NOT_SUPPORTED: "Ta akcja nie jest obsługiwana."
+ACTION_NOT_SUPPORTED: "To działanie nie jest obsługiwane."
 AMOUNT_BLOCK: "{0} {blok|bloki}"
-AMOUNT_CHUNK: "{0} {chunk|chunków}"
-AMOUNT_ENTITY: "{0} {byt|bytów}"
+AMOUNT_CHUNK: "{0} {kawałek|kawałki}"
+AMOUNT_ENTITY: "{0} {jednostka|jednostki}"
 AMOUNT_ITEM: "{0} {przedmiot|przedmioty}"
 API_TEST: "Test interfejsu API pomyślny."
 CACHE_ERROR: "OSTRZEŻENIE: Błąd podczas walidacji {0} Pamięć podręczna."
 CACHE_RELOAD: "Wymuszanie przeładowania {mapowanie|świat} pamięci podręczne z bazy danych."
 CHECK_CONFIG: "Sprawdź plik config.yml"
 COMMAND_CONSOLE: "Uruchom polecenie z konsoli."
-COMMAND_NOT_FOUND: "Nie znaleziono komendy \"{0}\"."
+COMMAND_NOT_FOUND: "Komenda \"{0}\" nie znaleziono."
 COMMAND_THROTTLED: "Poczekaj chwilę i spróbuj ponownie."
-CONSUMER_ERROR: "Przetwarzanie kolejki klientów jest już {wstrzymane|wznowione}."
+CONSUMER_ERROR: "Przetwarzanie kolejki klientów już {wstrzymane|wznowione}."
 CONSUMER_TOGGLED: "Przetwarzanie kolejki klientów zostało {wstrzymane|wznowione}."
 CONTAINER_HEADER: "Transakcje kontenerowe"
-CPU_CORES: "Rdzenie CPU."
 DATABASE_BUSY: "Baza danych zajęta. Spróbuj ponownie później."
 DATABASE_INDEX_ERROR: "Nie można zweryfikować indeksów bazy danych."
 DATABASE_LOCKED_1: "Baza danych zablokowana. Czekam do 15 sekund..."
@@ -24,189 +23,179 @@ DATABASE_LOCKED_3: "Aby wyłączyć blokowanie bazy danych, ustaw \"database-loc
 DATABASE_LOCKED_4: "Wyłączenie blokowania bazy danych może spowodować uszkodzenie danych."
 DATABASE_UNREACHABLE: "Baza danych jest niedostępna. Odrzucanie danych i zamykanie."
 DEVELOPMENT_BRANCH: "Wykryto gałąź deweloperską, pomijam skrypty poprawek."
-DIRT_BLOCK: "Umieściłem pod Tobą tymczasowy blok bezpieczeństwa."
-DONATION_KEY_REQUIRED: "Dla tej komendy wymagany jest prawidłowy klucz darowizny."
-DISABLE_SUCCESS: "Sukces! Wyłączono {0}"
-ENABLE_FAILED: "{0} nie mógł wystartować."
+DIRT_BLOCK: "Umieściłem pod tobą blok brudu."
+DISABLE_SUCCESS: "Sukces! Niepełnosprawny {0}"
+ENABLE_FAILED: "{0} nie mógł rozpocząć."
 ENABLE_SUCCESS: "{0} jest teraz włączony!"
-ENJOY_COREPROTECT: "Podoba Ci się {0}? Dołącz do naszego Discorda!"
-FINISHING_CONVERSION: "Kończenie konwersji danych. Proszę czekać..."
-FINISHING_LOGGING: "Kończenie rejestracji danych. Proszę czekać..."
+ENJOY_COREPROTECT: "Cieszyć się {0}? Dołączć do naszego Discord!"
+FINISHING_CONVERSION: "Zakończenie konwersji danych. Proszę czekać..."
+FINISHING_LOGGING: "Zakończenie rejestracji danych. Proszę czekać..."
 FIRST_VERSION: "Początkowa baza danych: {0}"
 GLOBAL_LOOKUP: "Nie określaj promienia, aby wykonać globalne wyszukiwanie."
-GLOBAL_ROLLBACK: "Użyj \"{0}\", aby zrobić globalne {wycofywanie|przywracanie}"
-HELP_ACTION_1: "Ogranicz wyszukiwanie do konkretnej akcji."
+GLOBAL_ROLLBACK: "Posługiwać się \"{0}\" zrobić globalny {wycofywanie|przywracanie}"
+HELP_ACTION_1: "Ogranicz wyszukiwanie do akcji."
 HELP_ACTION_2: "Przykłady: [a:block], [a:+block], [a:-block] [a:click], [a:container], [a:inventory], [a:item], [a:kill], [a:chat], [a:command], [a:sign], [a:session], [a:username]"
 HELP_COMMAND: "Wyświetl dodatkowe informacje."
 HELP_EXCLUDE_1: "Wyklucz bloki/użytkowników."
 HELP_EXCLUDE_2: "Przykłady: [e:stone], [e:Notch], [e:stone,Notch]"
-HELP_HEADER: "{0} Pomoc"
+HELP_HEADER: "{0} Wsparcie"
 HELP_INCLUDE_1: "Uwzględnij bloki/elementy."
 HELP_INCLUDE_2: "Przykłady: [i:stone], [i:zombie], [i:stone,wood,bedrock]"
 HELP_INSPECT_1: "Po włączeniu inspektora możesz:"
-HELP_INSPECT_2: "Kliknij lewym przyciskiem myszy, aby zobaczyć kto postawił ten blok."
-HELP_INSPECT_3: "Kliknij prawym przyciskiem myszy, aby zobaczyć jaki sąsiedni blok został usunięty."
-HELP_INSPECT_4: "Umieść blok, aby zobaczyć jaki blok został usunięty w tym miejscu."
-HELP_INSPECT_5: "Umieść blok w płynie, aby zobaczyć kto go postawił."
-HELP_INSPECT_6: "Kliknij prawym przyciskiem myszy na drzwi, skrzynię, itp., aby zobaczyć, kto ostatnio z nich korzystał."
-HELP_INSPECT_7: "Wskazówka: możesz użyć po prostu \"/co i\"."
+HELP_INSPECT_2: "Kliknij lewym przyciskiem myszy, aby zobaczyć miejsce docelowe."
+HELP_INSPECT_3: "Kliknij prawym przyciskiem myszy, aby zobaczyć sąsiednie usunięcia."
+HELP_INSPECT_4: "Umieść blok, aby zobaczyć usunięcie."
+HELP_INSPECT_5: "Umieść blok w płynie, aby zobaczyć umieszczenie."
+HELP_INSPECT_6: "Kliknij prawym przyciskiem myszy, aby zobaczyć transakcje w skrzyniach."
+HELP_INSPECT_7: "Wskazówka: możesz użyć tylko „/co i”."
 HELP_INSPECT_COMMAND: "Przełącza inspektora bloków."
 HELP_LIST: "Wyświetla listę wszystkich poleceń."
 HELP_LOOKUP_1: "Skrót poleceń."
 HELP_LOOKUP_2: "Zobacz dodatkowe strony."
 HELP_LOOKUP_COMMAND: "Dane bloku wyszukiwania."
-HELP_NO_INFO: "Nie znaleziono informacji dla polecenia \"{0}\"."
-HELP_PARAMETER: "Proszę zobaczyć \"{0}\", aby uzyskać szczegółowe informacje o parametrach."
-HELP_PARAMS_1: "Wykonaj {wyszukiwanie|wycofywanie|przywracanie}."
-HELP_PARAMS_2: "Określ użytkowników do {wyszukiwania|wycofywania|przywracania}."
-HELP_PARAMS_3: "Określ czas do {wyszukiwania|wycofywania|przywracania}."
-HELP_PARAMS_4: "Ogranicz promień {wyszukiwania|wycofywania|przywracania}."
-HELP_PARAMS_5: "Ogranicz akcję {wyszukiwania|wycofywania|przywracania}."
-HELP_PARAMS_6: "Uwzględnij bloki/byty w {wyszukiwaniu|wycofywaniu|przywracaniu}."
-HELP_PARAMS_7: "Wyklucz bloki/użytkowników z {wyszukiwania|wycofywania|przywracania}."
-HELP_PURGE_1: "Usuń dane starsze od określonego czasu."
+HELP_NO_INFO: "Informacje do polecenia \"{0}\" nie znaleziono."
+HELP_PARAMETER: "Proszę zobaczyć \"{0}\" , aby uzyskać szczegółowe informacje o parametrach."
+HELP_PARAMS_1: "Wykonaj {wyszukiwanie|przywracanie|przywracanie}."
+HELP_PARAMS_2: "Określ użytkowników do {wyszukiwanie|przywracanie|przywracanie}."
+HELP_PARAMS_3: "Określ czas, aby {wyszukiwanie|przywracanie|przywracanie}."
+HELP_PARAMS_4: "Ogranicz {wyszukiwanie|wycofywanie|przywracanie} do promienia."
+HELP_PARAMS_5: "Ogranicz {wyszukiwanie|wycofywanie|przywracanie} do działania."
+HELP_PARAMS_6: "Uwzględnij bloki/elementy w {wyszukiwanie|przywracanie|przywracanie}."
+HELP_PARAMS_7: "Wyklucz bloki/użytkowników z {wyszukiwanie|przywracanie|przywracanie}."
+HELP_PURGE_1: "Usuń stare dane."
 HELP_PURGE_2: "Na przykład, \"{0}” usunie wszystkie dane starsze niż jeden miesiąc i zachowa tylko dane z ostatnich 30 dni."
 HELP_PURGE_COMMAND: "Usuń stare dane bloku."
-HELP_RADIUS_1: "Określ promień obszaru."
+HELP_RADIUS_1: "Określ obszar promienia."
 HELP_RADIUS_2: "Przykłady: [r:10] (Dokonuj zmian tylko w promieniu 10 bloków od Ciebie)"
 HELP_RELOAD_COMMAND: "Ponownie ładuje plik konfiguracyjny."
 HELP_RESTORE_COMMAND: "Przywróć dane bloku."
 HELP_ROLLBACK_COMMAND: "Wycofaj dane bloku."
-HELP_STATUS: "Wyświetl stan i wersję pluginu."
-HELP_STATUS_COMMAND: "Wyświetla stan pluginu."
+HELP_STATUS: "Wyświetl stan wtyczki."
+HELP_STATUS_COMMAND: "Wyświetla stan wtyczki."
 HELP_TELEPORT: "Teleport."
 HELP_TIME_1: "Określ czas."
 HELP_TIME_2: "Przykłady: [t:2w,5d,7h,2m,10s], [t:5d2h], [t:2.50h]"
 HELP_USER_1: "Określ użytkowników."
 HELP_USER_2: "Przykłady: [u:Notch], [u:Notch,#enderman]"
-INCOMPATIBLE_ACTION: "\"{0}\" nie może być użyte z tą akcją."
-INSPECTOR_ERROR: "Inspektor jest już {włączony|wyłączony}."
-INSPECTOR_TOGGLED: "{Włączono|Wyłączono} inspektor."
-INTEGRATION_ERROR: "Nie można {zainicjalizować|wyłączyć} logowania {0}."
-INTEGRATION_SUCCESS: "Logowanie {0} pomyślnie {zainicjowane|wyłączone}."
-INTEGRATION_VERSION: "Znaleziono nieprawidłową wersję {0}."
+INCOMPATIBLE_ACTION: "\"{0}nie można użyć z tą akcją."
+INSPECTOR_ERROR: "Inspektor już {włączone|wyłączone}."
+INSPECTOR_TOGGLED: "Inspektor teraz {włączone|wyłączone}."
+INTEGRATION_ERROR: "Niezdolny do {inicjalizuj|wyłącz} {0} Logowanie."
+INTEGRATION_SUCCESS: "{0} logowanie pomyślnie {zainicjowane|wyłączone}."
+INTEGRATION_VERSION: "Nieważny {0} znaleziono wersję."
 INTERACTIONS_HEADER: "Interakcje graczy"
-INVALID_ACTION: "To nie jest prawidłowa akcja."
-INVALID_BRANCH_1: "Nieprawidłowa wersja pluginu (nie ustawiono gałęzi)."
+INVALID_ACTION: "To nie jest prawidłowe działanie."
+INVALID_BRANCH_1: "Nieprawidłowa wersja wtyczki (nie ustawiono gałęzi)."
 INVALID_BRANCH_2: "Aby kontynuować, ustaw gałąź projektu na \"development\"."
 INVALID_BRANCH_3: "Uruchomienie kodu programistycznego może spowodować uszkodzenie danych."
 INVALID_CONTAINER: "Proszę najpierw sprawdzić prawidłowy pojemnik."
 INVALID_DONATION_KEY: "Nieprawidłowy klucz darowizny."
-INVALID_INCLUDE: "\"{0}\" to nieprawidłowa nazwa bloku/bytu."
+INVALID_INCLUDE: "\"{0}„ to nieprawidłowa wartość."
 INVALID_INCLUDE_COMBO: "To jest nieprawidłowa kombinacja typów."
 INVALID_RADIUS: "Podaj poprawny promień."
 INVALID_SELECTION: "{0} nie znaleziono wyboru."
-INVALID_USERNAME: "\"{0}\" to nieprawidłowa nazwa użytkownika."
+INVALID_USERNAME: "\"{0}„ to nieprawidłowa nazwa użytkownika."
 INVALID_WORLD: "Podaj poprawny świat."
 LATEST_VERSION: "Najnowsza wersja: {0}"
 LINK_DISCORD: "Discord: {0}"
-LINK_DOWNLOAD: "Pobierz: {0}"
+LINK_DOWNLOAD: "Ściągnij: {0}"
 LINK_PATREON: "Patreon: {0}"
 LINK_WIKI_BLOCK: "Nazwy bloków: {0}"
-LINK_WIKI_ENTITY: "Nazwy bytów: {0}"
-LOGGING_ITEMS: "Pozostało {0} elementów do logowania. Proszę czekać..."
+LINK_WIKI_ENTITY: "Nazwy podmiotów: {0}"
+LOGGING_ITEMS: "{0} elementy pozostawione do zarejestrowania. Proszę czekać..."
 LOGGING_TIME_LIMIT: "Osiągnięto limit czasu logowania. Odrzucanie danych i zamykanie."
-LOOKUP_BLOCK: "{0} {postawił|zniszczył} {1}."
-LOOKUP_CONTAINER: "{0} {dodał|usunął} {1} {2}."
-LOOKUP_HEADER: "{0} Wyników Wyszukiwania"
-LOOKUP_INTERACTION: "{0} {kliknął|zabił} {1}."
-LOOKUP_ITEM: "{0} {podniósł|upuścił} {1} {2}."
-LOOKUP_LOGIN: "{0} się {zalogował|wylogował}."
+LOOKUP_BLOCK: "{0} {umieszczony|złamany} {1}."
+LOOKUP_CONTAINER: "{0} {dodano|usunięto} {1} {2}."
+LOOKUP_HEADER: "{0} Wyniki"
+LOOKUP_INTERACTION: "{0} {kliknięty|zabity} {1}."
+LOOKUP_ITEM: "{0} {odebrany|upuszczony} {1} {2}."
+LOOKUP_LOGIN: "{0} zalogowany {w|na zewnątrz}."
 LOOKUP_PAGE: "Strona {0}"
-LOOKUP_PROJECTILE: "{0} {rzucił|strzelił} {1} {2}."
-LOOKUP_ROWS_FOUND: "Znaleziono {0} {wiersz|wierszy}."
+LOOKUP_PROJECTILE: "{0} {rzucił|strzał} {1} {2}."
+LOOKUP_ROWS_FOUND: "{0} {wiersz|wiersze} znaleziony."
 LOOKUP_SEARCHING: "Wyszukiwanie wyszukiwania. Proszę czekać..."
-LOOKUP_STORAGE: "{0} {zdeponował|wyciągnął} {1} {2}."
+LOOKUP_STORAGE: "{0} {zdeponowane|wycofane} {1} {2}."
 LOOKUP_TIME: "{0} temu"
 LOOKUP_USERNAME: "{0} zalogowany jako {1}."
-MAXIMUM_RADIUS: "Maksymalny promień {wyszukiwania|wycofywania|przywracania} to {0}."
+MAXIMUM_RADIUS: "Maksymalny {wyszukiwanie|wycofywanie|przywracanie} promień to {0}."
 MISSING_ACTION_USER: "Aby skorzystać z tej akcji, określ użytkownika."
-MISSING_LOOKUP_TIME: "Proszę określić czas {wyszukiwania|wycofywania|przywracania}."
+MISSING_LOOKUP_TIME: "Proszę określić czas na {wyszukiwanie|przywracanie|przywracanie}."
 MISSING_LOOKUP_USER: "Podaj użytkownika lub {blok|promień}."
-MISSING_PARAMETERS: "Proszę użyć \"{0}\"."
-MISSING_ROLLBACK_RADIUS: "Nie podałeś promienia {wycofywania|przywracania}."
-MISSING_ROLLBACK_USER: "Nie podałeś użytkownika {wycofywania|przywracania}."
-MYSQL_UNAVAILABLE: "Nie można się połączyć z serwerem MySQL."
-NETWORK_CONNECTION: "Połączenie przez {0} {pomyślne|nieudane}. Używam {1} {2}."
-NETWORK_TEST: "Pomyślnie wysłano dane testu sieci."
+MISSING_PARAMETERS: "Proszę użyć \"{0}”."
+MISSING_ROLLBACK_RADIUS: "Nie podałeś {wycofywanie|przywracanie} promień."
+MISSING_ROLLBACK_USER: "Nie podałeś {wycofywanie|przywracanie} użytkownik."
+MYSQL_UNAVAILABLE: "Nie można się połączyć z MySQL serwer."
 NO_DATA: "Nie znaleziono danych w {0}."
-NO_DATA_LOCATION: "Nie znaleziono {danych|transakcji|interakcji|wiadomości} w tym miejscu."
+NO_DATA_LOCATION: "Nie {dane|transakcje|interakcje|wiadomości} znaleziony."
 NO_PERMISSION: "Nie masz na to pozwolenia."
 NO_RESULTS: "Nie znaleziono wyników."
-NO_RESULTS_PAGE: "Nie znaleziono {wyników|danych} dla tej strony."
-NO_ROLLBACK: "Nie znaleziono {oczekujących|poprzednich} wycofywań/przywracań."
-PATCH_INTERRUPTED: "Aktualizacja przerwana. Spróbuję ponownie przy restarcie."
+NO_RESULTS_PAGE: "Nie {wyniki|dane} znalezione dla tej strony."
+NO_ROLLBACK: "Nie {oczekujące|poprzednie} znaleziono wycofywanie/przywracanie."
+PATCH_INTERRUPTED: "Aktualizacja przerwana. Spróbuje ponownie po ponownym uruchomieniu."
 PATCH_OUTDATED_1: "Nie można zaktualizować baz danych starszych niż {0}."
 PATCH_OUTDATED_2: "Uaktualnij do obsługiwanej wersji CoreProtect."
 PATCH_PROCESSING: "Przetwarzanie nowych danych. Proszę czekać..."
-PATCH_SKIP_UPDATE: "Pomijam {tabeli|indeksu} {aktualizację|tworzenie|usuwanie} na {0}."
-PATCH_STARTED: "Przeprowadzam aktualizację do {0}. Proszę czekać..."
+PATCH_SKIP_UPDATE: "Skaczący {tabela|indeks} {aktualizacja|tworzenie|usuwanie} na {0}."
+PATCH_STARTED: "Działający {0} Aktualizacja. Proszę czekać..."
 PATCH_SUCCESS: "Pomyślnie uaktualniono do {0}."
 PATCH_UPGRADING: "Trwa aktualizacja bazy danych. Proszę czekać..."
-PLEASE_SELECT: "Proszę wybrać: \"{0}\" lub \"{1}\"."
+PLEASE_SELECT: "Proszę wybrać: \"{0}\" lub \"{1}”."
 PREVIEW_CANCELLED: "Podgląd anulowany."
 PREVIEW_CANCELLING: "Anulowanie podglądu..."
 PREVIEW_IN_GAME: "Możesz tylko podglądać wycofania w grze."
-PREVIEW_TRANSACTION: "Nie możesz wyświetlić podglądu transakcji {kontenera|ekwipunku}."
-PRIMARY_THREAD_ERROR: "Ta metoda API nie może być używana w głównym wątku."
+PREVIEW_TRANSACTION: "Nie możesz wyświetlić podglądu {kontener|inwentarz} transakcje."
 PURGE_ABORTED: "Czyszczenie nie powiodło się. Baza danych może być uszkodzona."
-PURGE_ERROR: "Nie można przetworzyć danych {0}!"
+PURGE_ERROR: "Nie można przetworzyć {0} dane!"
 PURGE_FAILED: "Czyszczenie nie powiodło się. Spróbuj ponownie później."
 PURGE_IN_PROGRESS: "Trwa czyszczenie. Spróbuj ponownie później."
-PURGE_MINIMUM_TIME: "Możesz usunąć tylko dane starsze niż {0} {dni|godzin}."
-PURGE_NOTICE_1: "Uwaga, może to zająć trochę czasu."
-PURGE_NOTICE_2: "Nie restartuj serwera przed zakończeniem."
+PURGE_MINIMUM_TIME: "Możesz usunąć tylko dane starsze niż {0} {dni|godziny}."
+PURGE_NOTICE_1: "Pamiętaj, że może to zająć trochę czasu."
+PURGE_NOTICE_2: "Nie uruchamiaj ponownie serwera przed zakończeniem."
 PURGE_OPTIMIZING: "Optymalizacja bazy danych. Proszę czekać..."
-PURGE_PROCESSING: "Przetwarzanie danych {0}..."
+PURGE_PROCESSING: "Przetwarzanie {0} dane..."
 PURGE_REPAIRING: "Próba naprawy. To może zająć troche czasu..."
-PURGE_ROWS: "Usunięto {0} {wiersz|wierszy} danych."
-PURGE_STARTED: "Usuwanie danych rozpoczęte na \"{0}\"."
-PURGE_SUCCESS: "Czyszczenie danych zakończono pomyślnie."
-RAM_STATS: "{0}GB / {1}GB RAM"
+PURGE_ROWS: "{0} {wiersz|wiersze} usuniętych danych."
+PURGE_STARTED: "Usuwanie danych rozpoczęte w dniu „{0}”."
+PURGE_SUCCESS: "Udało się czyszczenie danych."
 RELOAD_STARTED: "Ponowne ładowanie konfiguracji - proszę czekać."
 RELOAD_SUCCESS: "Pomyślnie wczytano konfigurację."
 ROLLBACK_ABORTED: "Wycofanie lub przywracanie zostało przerwane."
-ROLLBACK_CHUNKS_FOUND: "Znaleziono {0} {chunk|chunków} do zmodyfikowania."
-ROLLBACK_CHUNKS_MODIFIED: "Zmodyfikowano {0}/{1} {chunk|chunków}."
-ROLLBACK_COMPLETED: "{Wycofywanie|Przywrócenie|Podgląd} ukończone dla \"{0}\"."
-ROLLBACK_EXCLUDED_USERS: "{Wykluczony użytkownik|Wykluczeni użytkownicy}: \"{0}\"."
-ROLLBACK_INCLUDE: "{Zawarte|Wykluczone} {bloku|bytu|celu} {typ|typy}: \"{0}\"."
-ROLLBACK_IN_PROGRESS: "Już trwa wycofywanie/przywracanie."
-ROLLBACK_LENGTH: "Zajęty czas: {0} {sekunda|sekund}."
+ROLLBACK_CHUNKS_FOUND: "Znaleziony {0} {kawałek|kawałki} modyfikować."
+ROLLBACK_CHUNKS_MODIFIED: "Zmodyfikowane {0}/{1} {kawałek|kawałki}."
+ROLLBACK_COMPLETED: "{Wycofanie|Przywróć|Podgląd} ukończone dla „{0}”."
+ROLLBACK_EXCLUDED_USERS: "Wyłączony {użytkownik|użytkownicy}: \"{0}”."
+ROLLBACK_INCLUDE: "{Zawarte|Wykluczone} {blok|jednostka|cel} {typ|typy}: \"{0}”."
+ROLLBACK_IN_PROGRESS: "Trwa wycofywanie/przywracanie."
+ROLLBACK_LENGTH: "Zajęty czas: {0} {sekunda|sekundy}."
 ROLLBACK_MODIFIED: "{Zmodyfikowane|Modyfikowanie} {0}."
-ROLLBACK_RADIUS: "Promień: {0} {blok|bloków}."
-ROLLBACK_SELECTION: "Promień ustawiony na \"{0}\"."
-ROLLBACK_STARTED: "{Wycofywanie|Przywrócenie|Podgląd} zaczęło się na \"{0}\"."
+ROLLBACK_RADIUS: "Promień: {0} {blok|bloki}."
+ROLLBACK_SELECTION: "Promień ustawiony na „{0}”."
+ROLLBACK_STARTED: "{Wycofanie|Przywróć|Podgląd} zaczęło się \"{0}”."
 ROLLBACK_TIME: "Zakres czasu: {0}."
-ROLLBACK_WORLD_ACTION: "Ograniczony do {świata|akcji} \"{0}\"."
-SIGN_HEADER: "Wiadomości Tabliczki"
-STATUS_CONSUMER: "Konsument: {0} {przedmiot|przedmiotów} w kolejce."
-STATUS_DATABASE: "Baza danych: Używa {0}."
-STATUS_INTEGRATION: "{0}: Integracja {włączona|wyłączona}."
+ROLLBACK_WORLD_ACTION: "Ograniczony do {świat|działanie} \"{0}”."
+SIGN_HEADER: "Podpisz wiadomości"
+STATUS_CONSUMER: "Konsument: {0} {przedmiot|przedmioty} w kolejce."
+STATUS_DATABASE: "Baza danych: Korzystanie {0}."
+STATUS_INTEGRATION: "{0}: Integracja {włączone|wyłączone}."
 STATUS_LICENSE: "Licencja: {0}"
-STATUS_SYSTEM: "System: {0}"
 STATUS_VERSION: "Wersja: {0}"
 TELEPORTED: "Teleportowany do {0}."
-TELEPORTED_SAFETY: "Teleportowano Cię w bezpieczne miejsce."
+TELEPORTED_SAFETY: "Teleportowano cię w bezpieczne miejsce."
 TELEPORT_PLAYERS: "Polecenie Teleport może być używane tylko przez graczy."
 TIME_DAYS: "{0} {dzień|dni}"
-TIME_HOURS: "{0} {godzina|godzin(y)}"
-TIME_MINUTES: "{0} {minuta|minut(y)}"
-TIME_MONTHS: "{0} {miesiąc|miesięcy}"
-TIME_SECONDS: "{0} {sekunda|sekund(y)}"
-TIME_UNITS: "{/m|/h|/d}"
-TIME_WEEKS: "{0} {tydzień|tygodni(e)}"
-TIME_YEARS: "{0} {rok|lat(a)}"
+TIME_HOURS: "{0} {godzina|godziny}"
+TIME_MINUTES: "{0} {minuta|minuty}"
+TIME_SECONDS: "{0} {sekunda|sekundy}"
+TIME_WEEKS: "{0} {tydzień|tygodnie}"
 UPDATE_ERROR: "Wystąpił błąd podczas sprawdzania aktualizacji."
-UPDATE_HEADER: "Aktualizacja {0}"
+UPDATE_HEADER: "{0} Aktualizacja"
 UPDATE_NOTICE: "Ogłoszenie: {0} jest teraz dostępne."
 UPGRADE_IN_PROGRESS: "Trwa aktualizacja. Spróbuj ponownie później."
-USER_NOT_FOUND: "Nie znaleziono użytkownika \"{0}\"."
+USER_NOT_FOUND: "Użytkownik \"{0}\" nie znaleziono."
 USER_OFFLINE: "Użytkownik \"{0}\" nie jest online."
-USING_MYSQL: "MySQL używany do przechowywania danych."
-USING_SQLITE: "SQLite używany do przechowywania danych."
+USING_MYSQL: "Za pomocą MySQL do przechowywania danych."
+USING_SQLITE: "Za pomocą SQLite do przechowywania danych."
 VALID_DONATION_KEY: "Ważny klucz darowizny."
-VERSION_INCOMPATIBLE: "{0} {1} nie jest wspierany."
-VERSION_NOTICE: "Wersja {0} jest teraz dostępna."
+VERSION_NOTICE: "Wersja {0} jest teraz dostępne."
 VERSION_REQUIRED: "{0} {1} lub wyższy jest wymagany."
-WORLD_NOT_FOUND: "Nie znaleziono świata \"{0}\"."
+WORLD_NOT_FOUND: "Świat \"{0}\" nie znaleziono."

lang/ru.yml

@@ -46,7 +46,7 @@ HELP_INSPECT_2: "Щелкните левой кнопкой мыши по бло
 HELP_INSPECT_3: "Щелкните блок правой кнопкой мыши, чтобы увидеть, какой соседний блок был сломан.."
 HELP_INSPECT_4: "Поместите блок, чтобы увидеть, какой блок был сломан в этом месте."
 HELP_INSPECT_5: "Поместите блок в жидкость (и т.п.), чтобы увидеть, кто его поместил."
-HELP_INSPECT_6: "Щелкните правой кнопкой мыши дверь, сундук и т.д., чтобы узнать, кто последний использовал их."
+HELP_INSPECT_6: "Щелкните правой кнопкой мыши дверь, сундук и т. Д., Чтобы узнать, кто последний использовал их."
 HELP_INSPECT_7: "Подсказка: Вы можете использовать «/co i» для быстрого переключения режима инспектора."
 HELP_INSPECT_COMMAND: "Включает или выключает режим инспектора блоков."
 HELP_LIST: "Отображает список всех команд."
@@ -139,7 +139,7 @@ PATCH_SKIP_UPDATE: "{Пропущена таблица|Пропущен инде
 PATCH_STARTED: "Выполняется обновление {0}. Пожалуйста, подождите..."
 PATCH_SUCCESS: "Успешно обновлен до {0}."
 PATCH_UPGRADING: "Выполняется обновление базы данных. Пожалуйста, подождите..."
-PLEASE_SELECT: "Пожалуйста выберите: «{0}» или «{1}»."
+PLEASE_SELECT: "Пожалуйта выберете: «{0}» или «{1}»."
 PREVIEW_CANCELLED: "Предварительный просмотр отменен."
 PREVIEW_CANCELLING: "Отмена предварительного просмотра..."
 PREVIEW_IN_GAME: "Предварительный просмотр откатов доступен только в игре."
@@ -180,23 +180,22 @@ STATUS_INTEGRATION: "{0}: Интеграция {включена|отключе
 STATUS_LICENSE: "Лицензия: {0}"
 STATUS_VERSION: "Версия: {0}"
 TELEPORTED: "Телепортирование в {0}."
-TELEPORTED_SAFETY: "Телепортируем вас в безопасное место."
-TELEPORT_PLAYERS: "Команду телепортации могут использовать только игроки."
+TELEPORTED_SAFETY: "Телепортирование вас в безопасное место."
+TELEPORT_PLAYERS: "Команду телепортации могут использовать только игроки.."
 TIME_DAYS: "{0} {дня|дней}"
 TIME_HOURS: "{0} {час|часов}"
 TIME_MINUTES: "{0} {минута|минут}"
 TIME_SECONDS: "{0} {секунда|секунд}"
-TIME_UNITS: "{/m|/h|/d}"
 TIME_WEEKS: "{0} {неделя|недель}"
 UPDATE_ERROR: "Произошла ошибка при проверке обновлений."
 UPDATE_HEADER: "{0} Обновление"
 UPDATE_NOTICE: "Примечание: теперь доступен {0}."
 UPGRADE_IN_PROGRESS: "Выполняется обновление. Пожалуйста, повторите попытку позже."
 USER_NOT_FOUND: "Пользователь «{0}» не найден."
-USER_OFFLINE: "Пользователь \"{0}\" не в сети."
+USER_OFFLINE: "Пользователь \"{0}\" нет в сети."
 USING_MYSQL: "Для хранения данных используется MySQL."
 USING_SQLITE: "Для хранения данных используется SQLite."
 VALID_DONATION_KEY: "Действующий ключ пожертвования."
 VERSION_NOTICE: "Версия {0} уже доступна!"
 VERSION_REQUIRED: "{0} {1} или выше требуется."
-WORLD_NOT_FOUND: "Мир «{0}» не найден."
+WORLD_NOT_FOUND: "Мир «{0}» не найден."

lang/tr.yml

@@ -186,7 +186,6 @@ TIME_DAYS: "{0} {gün|gün}"
 TIME_HOURS: "{0} {saat|saat}"
 TIME_MINUTES: "{0} {dakika|dakika}"
 TIME_SECONDS: "{0} {saniye|saniye}"
-TIME_UNITS: "{/m|/h|/d}"
 TIME_WEEKS: "{0} {hafta|hafta}"
 UPDATE_ERROR: "Güncellemeler kontrol edilirken bir hata oluştu."
 UPDATE_HEADER: "{0} Güncelleme"

lang/uk.yml

@@ -186,7 +186,6 @@ TIME_DAYS: "{0} {день|дні}"
 TIME_HOURS: "{0} {година|години}"
 TIME_MINUTES: "{0} {хвилина|хвилини}"
 TIME_SECONDS: "{0} {секунда|секунди}"
-TIME_UNITS: "{/m|/h|/d}"
 TIME_WEEKS: "{0} {тиждень|тиждень}"
 UPDATE_ERROR: "Під час перевірки оновлень сталася помилка."
 UPDATE_HEADER: "{0} Оновлення"

lang/vi.yml

@@ -186,7 +186,6 @@ TIME_DAYS: "{0} {ngày|ngày}"
 TIME_HOURS: "{0} {giờ|giờ}"
 TIME_MINUTES: "{0} {phút|phút}"
 TIME_SECONDS: "{0} {giây|giây}"
-TIME_UNITS: "{/m|/h|/d}"
 TIME_WEEKS: "{0} {tuần|tuần}"
 UPDATE_ERROR: "Đã xảy ra lỗi khi kiểm tra các bản cập nhật."
 UPDATE_HEADER: "{0} Cập nhật"

lang/zh-cn.yml

@@ -1,213 +1,202 @@
 # CoreProtect Language File (zh-CN)
-# Origin: Intelli, Translator: DreamVoid, StarWishsama, YuanYuanOwO, Halogly
+# Origin: Intelli, Translator: DreamVoid, StarWishsama, YuanYuanOwO
 
-ACTION_NOT_SUPPORTED: "此命令不支持该操作。"
+ACTION_NOT_SUPPORTED: "该命令不支持该操作。"
 AMOUNT_BLOCK: "{0}个{方块|方块}"
 AMOUNT_CHUNK: "{0}个{区块|区块}"
 AMOUNT_ENTITY: "{0}个{实体|实体}"
 AMOUNT_ITEM: "{0}个{物品|物品}"
 API_TEST: "API 测试成功。"
-CACHE_ERROR: "警告：验证缓存 {0} 时出错。"
-CACHE_RELOAD: "正在强制从数据库中重新加载{映射|世界}缓存。"
+CACHE_ERROR: "警告: 验证缓存 {0} 时出错。"
+CACHE_RELOAD: "正在强制从数据库中重新加载{映射|世界}的缓存。"
 CHECK_CONFIG: "请检查 config.yml 文件"
 COMMAND_CONSOLE: "请在控制台中运行此命令。"
-COMMAND_NOT_FOUND: "命令 \"{0}\" 未找到。"
-COMMAND_THROTTLED: "请稍后再试。"
+COMMAND_NOT_FOUND: "找不到命令 \"{0}\""
+COMMAND_THROTTLED: "请稍等片刻，然后重试。"
 CONSUMER_ERROR: "数据处理队列已经{暂停|恢复}。"
-CONSUMER_TOGGLED: "数据处理队列已{暂停|恢复}。"
+CONSUMER_TOGGLED: "数据处理队列现已{暂停|恢复}。"
 CONTAINER_HEADER: "容器物品变更记录"
-CPU_CORES: "CPU 核心。"
-DATABASE_BUSY: "数据库繁忙，请稍后再试。"
+DATABASE_BUSY: "数据库繁忙，请稍后重试。"
 DATABASE_INDEX_ERROR: "无法验证数据库索引。"
-DATABASE_LOCKED_1: "数据库已锁定，请等待约15秒后再试..."
-DATABASE_LOCKED_2: "数据库正在使用中，请稍后再试。"
-DATABASE_LOCKED_3: "要禁用数据库锁定，请在配置文件中设置 \"database-lock: false\"。"
+DATABASE_LOCKED_1: "数据库已被锁定，请等待至少15秒后重试..."
+DATABASE_LOCKED_2: "数据库已在使用，请再试一次。"
+DATABASE_LOCKED_3: "禁用数据库锁定，请在配置文件中设置 \"database-lock: false\"。"
 DATABASE_LOCKED_4: "禁用数据库锁定可能会导致数据损坏。"
-DATABASE_UNREACHABLE: "数据库连接失败，正在丢弃数据并关闭。"
+DATABASE_UNREACHABLE: "数据库无法访问。正在丢弃数据并关闭。"
 DEVELOPMENT_BRANCH: "检测到正在使用开发分支的版本，跳过使用补丁脚本。"
 DIRT_BLOCK: "已在你的下方放置了一个泥土。"
-DISABLE_SUCCESS: "已成功禁用 {0}！"
-DONATION_KEY_REQUIRED: "需要有效的捐赠密钥才能执行此命令。"
-ENABLE_FAILED: "无法启用 {0}。"
-ENABLE_SUCCESS: "已成功启用 {0}！"
+DISABLE_SUCCESS: "禁用 {0} 成功！"
+ENABLE_FAILED: "无法启用 {0}！"
+ENABLE_SUCCESS: "{0} 已成功启用！"
 ENJOY_COREPROTECT: "对 {0} 感到满意吗？请加入我们的 Discord 频道！"
-FINISHING_CONVERSION: "正在完成数据转换，请稍候..."
-FINISHING_LOGGING: "正在完成数据记录，请稍候..."
-FIRST_VERSION: "初始化数据库：{0}"
+FINISHING_CONVERSION: "正在完成数据转换，请稍等..."
+FINISHING_LOGGING: "正在完成数据记录，请稍等..."
+FIRST_VERSION: "初始化数据库: {0}"
 GLOBAL_LOOKUP: "请勿在执行全局查询时指定半径。"
 GLOBAL_ROLLBACK: "使用 \"{0}\" 进行全局{回滚|恢复}操作"
-HELP_ACTION_1: "将查询限制为一个操作。"
-HELP_ACTION_2: "例子：[a:block]，[a:+block]，[a:-block]，[a:click]，[a:container]，[a:inventory]，[a:item]，[a:kill]，[a:chat]，[a:command]，[a:sign]，[a:session]，[a:username]"
+HELP_ACTION_1: "将查询限制为一个动作。"
+HELP_ACTION_2: "例子: [a:block], [a:+block], [a:-block] [a:click], [a:container], [a:inventory], [a:item], [a:kill], [a:chat], [a:command], [a:sign], [a:session], [a:username]"
 HELP_COMMAND: "显示附加信息。"
 HELP_EXCLUDE_1: "排除方块/玩家。"
-HELP_EXCLUDE_2: "例子：[e:stone]，[e:Notch]，[e:stone,Notch]"
+HELP_EXCLUDE_2: "例子: [e:stone], [e:Notch], [e:stone,Notch]"
 HELP_HEADER: "{0} 帮助"
 HELP_INCLUDE_1: "包括方块/实体。"
-HELP_INCLUDE_2: "例子：[i:stone]，[i:zombie]，[i:stone,wood,bedrock]"
-HELP_INSPECT_1: "启用检查器后，你可以："
+HELP_INCLUDE_2: "例子: [i:stone], [i:zombie], [i:stone,wood,bedrock]"
+HELP_INSPECT_1: "启用检查器后，你可以:"
 HELP_INSPECT_2: "左键单击以查看方块放置记录。"
 HELP_INSPECT_3: "右键单击以查看相邻方块破坏记录。"
 HELP_INSPECT_4: "放置一个方块以查看放置位置的破坏记录。"
 HELP_INSPECT_5: "在液体中放置一个方块以查看液体变更记录。"
 HELP_INSPECT_6: "右键单击门、箱子等以查看交互记录。"
-HELP_INSPECT_7: "提示：你可以使用 \"/co i\" 进行快速查询。"
-HELP_INSPECT_COMMAND: "开启或关闭方块检查器。"
-HELP_LIST: "列出所有命令。"
+HELP_INSPECT_7: "提示: 你可以使用 \"/co i\" 进行快速查询。"
+HELP_INSPECT_COMMAND: "开启或关闭方块检查状态。"
+HELP_LIST: "显示所有命令的列表。"
 HELP_LOOKUP_1: "命令快捷方式。"
-HELP_LOOKUP_2: "检查方块后使用以查看日志。"
+HELP_LOOKUP_2: "在查询记录后使用以查看日志"
 HELP_LOOKUP_COMMAND: "高级方块数据查询。"
-HELP_NO_INFO: "未找到命令 \"{0}\" 的信息。"
+HELP_NO_INFO: "命令的信息 \"{0}\" 未找到。"
 HELP_PARAMETER: "请参阅 \"{0}\" 了解详细的参数信息。"
 HELP_PARAMS_1: "执行{查找|回滚|恢复}操作。"
-HELP_PARAMS_2: "指定要{查找|回滚|恢复}的玩家。"
-HELP_PARAMS_3: "指定要{查找|回滚|恢复}的时间。"
-HELP_PARAMS_4: "指定一个半径区域以限制{查找|回滚|恢复}的范围。"
-HELP_PARAMS_5: "将{查找|回滚|恢复}限制为一个操作。"
-HELP_PARAMS_6: "{查找|回滚|恢复}时包括指定的方块/实体。"
-HELP_PARAMS_7: "{查找|回滚|恢复}时排除指定的方块/玩家。"
-HELP_PURGE_1: "删除早于指定时间的数据。"
-HELP_PURGE_2: "例如，\"{0}\" 将删除超过一个月以上的所有数据，只保留最近30天的数据。"
+HELP_PARAMS_2: "指定{查找|回滚|恢复}的玩家。"
+HELP_PARAMS_3: "指定{查找|回滚|恢复}的时间。"
+HELP_PARAMS_4: "限制{查找|回滚|恢复}的作用范围。"
+HELP_PARAMS_5: "限制{查找|回滚|恢复}的动作。"
+HELP_PARAMS_6: "{查找|回滚|恢复}时包括方块/实体。"
+HELP_PARAMS_7: "{查找|回滚|恢复}时排除方块/玩家。"
+HELP_PURGE_1: "删除指定时间的数据。"
+HELP_PURGE_2: "例如，\"{0}\" 将删除超过一个月的所有数据，只保留最近30天的数据。"
 HELP_PURGE_COMMAND: "删除旧的方块数据。"
 HELP_RADIUS_1: "指定半径区域。"
-HELP_RADIUS_2: "例子：[r:10]（只会影响你周围十格方块的范围）"
+HELP_RADIUS_2: "例子: [r:10] （只会影响你周围十格方块的范围）"
 HELP_RELOAD_COMMAND: "重新加载配置文件。"
 HELP_RESTORE_COMMAND: "恢复方块数据。"
 HELP_ROLLBACK_COMMAND: "回滚方块数据。"
 HELP_STATUS: "查看插件状态与版本信息。"
 HELP_STATUS_COMMAND: "显示插件状态。"
 HELP_TELEPORT: "传送到一个地点。"
-HELP_TIME_1: "指定要查找的时间。"
-HELP_TIME_2: "例子：[t:2w,5d,7h,2m,10s]，[t:5d2h]，[t:2.50h]"
-HELP_USER_1: "指定要查找的玩家。"
-HELP_USER_2: "例子：[u:Notch]，[u:Notch,#enderman]"
-INCOMPATIBLE_ACTION: "\"{0}\" 不能与那个操作一起使用。"
-INSPECTOR_ERROR: "检查器已经{启用|禁用}。"
+HELP_TIME_1: "指定时间。"
+HELP_TIME_2: "例子: [t:2w,5d,7h,2m,10s], [t:5d2h], [t:2.50h]"
+HELP_USER_1: "指定玩家。"
+HELP_USER_2: "例子: [u:Notch], [u:Notch,#enderman]"
+INCOMPATIBLE_ACTION: "\"{0}\" 不能与那个动作一起使用。"
+INSPECTOR_ERROR: "检查器已经{启用|禁用}了。"
 INSPECTOR_TOGGLED: "检查器已{启用|禁用}。"
-INTEGRATION_ERROR: "无法{初始化|禁用} {0} 的日志记录。"
-INTEGRATION_SUCCESS: "已成功{初始化|禁用} {0} 的日志记录。"
-INTEGRATION_VERSION: "{0} 版本无效。"
+INTEGRATION_ERROR: "无法{初始化|禁用}与插件 {0} 的交互。"
+INTEGRATION_SUCCESS: "与 {0} 的交互已成功{初始化|禁用}。"
+INTEGRATION_VERSION: "发现 {0} 的版本不兼容。"
 INTERACTIONS_HEADER: "玩家交互"
-INVALID_ACTION: "这不是一个有效的操作。"
-INVALID_BRANCH_1: "插件版本无效（尚未设置分支）。"
-INVALID_BRANCH_2: "请将项目分支设置为 \"development\" 以继续。"
+INVALID_ACTION: "这不是有效的动作。"
+INVALID_BRANCH_1: "插件版本无效（未设置分支）。"
+INVALID_BRANCH_2: "要继续，请将项目分支设置为 \"开发\"。"
 INVALID_BRANCH_3: "运行开发版本的插件可能会导致数据损坏。"
-INVALID_CONTAINER: "请先检查一个有效的容器。"
+INVALID_CONTAINER: "请检查有效的容器。"
 INVALID_DONATION_KEY: "无效的捐赠密钥。"
 INVALID_INCLUDE: "\"{0}\" 是无效的方块/实体名称。"
 INVALID_INCLUDE_COMBO: "那是无效的方块/实体组合。"
 INVALID_RADIUS: "请输入有效的半径。"
-INVALID_SELECTION: "未找到 {0} 的选择。"
-INVALID_USERNAME: "玩家名 \"{0}\" 无效。"
+INVALID_SELECTION: "没有找到 {0} 的选择。"
+INVALID_USERNAME: "玩家名 \"{0}\" 不存在或已离线。"
 INVALID_WORLD: "请指定一个有效的世界。"
-LATEST_VERSION: "最新版本：{0}"
-LINK_DISCORD: "Discord：{0}"
-LINK_DOWNLOAD: "下载：{0}"
-LINK_PATREON: "Patreon：{0}"
-LINK_WIKI_BLOCK: "方块名称：{0}"
-LINK_WIKI_ENTITY: "实体名称：{0}"
-LOGGING_ITEMS: "{0}个物品等待记录，请稍候..."
-LOGGING_TIME_LIMIT: "已达到日志时间限制，正在丢弃剩余的数据并关闭。"
-LOOKUP_BLOCK: "{0} {放置|破坏}了 {1}。"
-LOOKUP_CONTAINER: "{0} {放入|取出}了 {1} {2}。"
+LATEST_VERSION: "最新版本: {0}"
+LINK_DISCORD: "Discord: {0}"
+LINK_DOWNLOAD: "下载: {0}"
+LINK_PATREON: "Patreon 页面: {0}"
+LINK_WIKI_BLOCK: "方块名称: {0}"
+LINK_WIKI_ENTITY: "实体名称: {0}"
+LOGGING_ITEMS: "{0} 物品等待记录，请稍等..."
+LOGGING_TIME_LIMIT: "已达到数据记录时间限制。正在丢弃剩余的数据并关闭。"
+LOOKUP_BLOCK: "{0} {放置|破坏} {1}。"
+LOOKUP_CONTAINER: "{0} {放入|取出} {1} {2}。"
 LOOKUP_HEADER: "{0} 查询结果"
-LOOKUP_INTERACTION: "{0} {点击|击杀}了 {1}。"
-LOOKUP_ITEM: "{0} {拾起|丢弃}了 {1} {2}。"
-LOOKUP_LOGIN: "{0} 已{登录|离开}。"
+LOOKUP_INTERACTION: "{0} {点击|击杀} {1}."
+LOOKUP_ITEM: "{0} {拾起|丢弃} {1} {2}."
+LOOKUP_LOGIN: "{0} {登入|离开}."
 LOOKUP_PAGE: "第 {0} 页"
-LOOKUP_PROJECTILE: "{0} {扔出|发射}了 {1} {2}。"
-LOOKUP_ROWS_FOUND: "{0} {行|行}已找到。"
-LOOKUP_SEARCHING: "正在搜索，请稍候..."
-LOOKUP_STORAGE: "{0} {放入|取出}了 {1} {2}。"
-LOOKUP_TIME: "{0}前"
-LOOKUP_USERNAME: "{0} 已登录为 {1}。"
-MAXIMUM_RADIUS: "最大{查找|回滚|恢复}半径是 {0}。"
+LOOKUP_PROJECTILE: "{0} {扔出|发射} {1} {2}."
+LOOKUP_ROWS_FOUND: "已找到 {0}{行|行}。"
+LOOKUP_SEARCHING: "正在搜索，请稍等..."
+LOOKUP_STORAGE: "{0} {放入|取出} {1} {2}."
+LOOKUP_TIME: "{0} 前"
+LOOKUP_USERNAME: "{0} 已登入为 {1}."
+MAXIMUM_RADIUS: "最大{查找|回滚|恢复}半径是 {0}."
 MISSING_ACTION_USER: "要使用该标识符，请指定玩家名。"
-MISSING_LOOKUP_TIME: "请指定要{查找|回滚|恢复}的时间。"
-MISSING_LOOKUP_USER: "请指定要查找的玩家或{方块|半径}。"
+MISSING_LOOKUP_TIME: "请指定{查找|回滚|恢复}时间."
+MISSING_LOOKUP_USER: "请指定查找玩家或查找{方块|半径}."
 MISSING_PARAMETERS: "请使用 \"{0}\"。"
-MISSING_ROLLBACK_RADIUS: "你没有指定{回滚|恢复}的半径。"
-MISSING_ROLLBACK_USER: "你没有指定{回滚|恢复}的玩家。"
+MISSING_ROLLBACK_RADIUS: "你没有指定{回滚|恢复}半径。"
+MISSING_ROLLBACK_USER: "你没有指定{回滚|恢复}的玩家操作。"
 MYSQL_UNAVAILABLE: "无法连接到 MySQL 服务器。"
-NETWORK_CONNECTION: "{0} 连接{成功|失败}，正在使用 {1} {2}。"
-NETWORK_TEST: "网络测试数据已成功发送。"
-NO_DATA: "没有在 {0} 中找到数据。"
-NO_DATA_LOCATION: "此位置找不到任何{数据|存取|交互|消息}记录。"
+NO_DATA: "没有在 {0} 中找到数据"
+NO_DATA_LOCATION: "此位置找不到任何{数据|存取|交互|消息}的记录。"
 NO_PERMISSION: "你没有权限执行此操作。"
 NO_RESULTS: "未找到结果。"
 NO_RESULTS_PAGE: "没有在指定页面找到{结果|数据}。"
-NO_ROLLBACK: "未找到{待处理的|上一个}回滚/恢复。"
+NO_ROLLBACK: "没有找到{等待的|上一个}回滚/恢复。"
 PATCH_INTERRUPTED: "升级已中断，将在服务器重新启动时重试。"
 PATCH_OUTDATED_1: "无法升级早于 {0} 的数据库。"
 PATCH_OUTDATED_2: "请升级到受支持的 CoreProtect 版本。"
-PATCH_PROCESSING: "正在处理新数据，请稍候..."
-PATCH_SKIP_UPDATE: "正在跳过 {0} 的{表格|索引}{更新|创建|删除}操作。"
-PATCH_STARTED: "正在进行 {0} 升级，请稍候..."
-PATCH_SUCCESS: "成功升级到 {0}。"
-PATCH_UPGRADING: "正在进行数据库升级，请稍候..."
-PLEASE_SELECT: "请选择：\"{0}\" 或 \"{1}\"。"
+PATCH_PROCESSING: "正在处理新数据，请稍等..."
+PATCH_SKIP_UPDATE: "在 {0} 跳过{表|索引}的{更新|创建|删除}。"
+PATCH_STARTED: "正在准备更新到版本 {0}，请稍等..."
+PATCH_SUCCESS: "成功升级到版本 {0}。"
+PATCH_UPGRADING: "正在进行数据库升级，请稍等..."
+PLEASE_SELECT: "请选择: \"{0}\"或\"{1}\"。"
 PREVIEW_CANCELLED: "预览已取消。"
 PREVIEW_CANCELLING: "正在取消预览..."
 PREVIEW_IN_GAME: "你只能在游戏中预览回滚操作。"
 PREVIEW_TRANSACTION: "你不能预览{容器|背包}物品交换。"
-PRIMARY_THREAD_ERROR: "该 API 方法不能在主线程上使用。"
 PURGE_ABORTED: "清除失败，数据库可能已损坏。"
 PURGE_ERROR: "无法处理 {0} 数据！"
-PURGE_FAILED: "清除失败，请稍后再试。"
+PURGE_FAILED: "数据清除失败，请稍后再试。"
 PURGE_IN_PROGRESS: "正在清除数据，请稍后再试。"
-PURGE_MINIMUM_TIME: "你只能清除{0}{天|小时}之前的数据。"
+PURGE_MINIMUM_TIME: "你只能清除早于 {0} {天|小时}的数据."
 PURGE_NOTICE_1: "请注意，这可能需要一些时间。"
-PURGE_NOTICE_2: "完成前请勿重新启动服务器。"
-PURGE_OPTIMIZING: "正在优化数据库，请稍候..."
-PURGE_PROCESSING: "正在处理 {0} 的数据..."
-PURGE_REPAIRING: "正在尝试修复。这可能需要一些时间..."
-PURGE_ROWS: "{0}{行|行}数据已删除。"
-PURGE_STARTED: "数据清除开始于 \"{0}\"。"
-PURGE_SUCCESS: "数据已清除。"
-RAM_STATS: "{0}GB / {1}GB 内存"
+PURGE_NOTICE_2: "完成前不要重新启动服务器。"
+PURGE_OPTIMIZING: "正在优化数据库，请稍等..."
+PURGE_PROCESSING: "正在处理表 {0} 中的数据..."
+PURGE_REPAIRING: "正在尝试修复，这可能需要一定的时间..."
+PURGE_ROWS: "已删除 {0} {行|行}数据。"
+PURGE_STARTED: "数据清除开始于\"{0}\"。"
+PURGE_SUCCESS: "数据清除成功。"
 RELOAD_STARTED: "正在重新加载配置文件 - 请稍候。"
-RELOAD_SUCCESS: "配置文件已重新加载。"
+RELOAD_SUCCESS: "配置文件已重新加载成功。"
 ROLLBACK_ABORTED: "回滚或恢复已中止。"
-ROLLBACK_CHUNKS_FOUND: "找到{0}个待修改的{区块|区块}。"
-ROLLBACK_CHUNKS_MODIFIED: "{0}/{1}个{区块|区块}已修改。"
-ROLLBACK_COMPLETED: "{0} 的{回滚|恢复|预览}操作已完成。"
-ROLLBACK_EXCLUDED_USERS: "已排除{玩家|玩家}：\"{0}\"。"
-ROLLBACK_INCLUDE: "{包括|不包括}的{方块|实体|目标}{类型|类型}：\"{0}\"。"
+ROLLBACK_CHUNKS_FOUND: "找到 {0} 个{区块|区块}需要更改。"
+ROLLBACK_CHUNKS_MODIFIED: "已修改 {0}/{1} 个{区块|区块}."
+ROLLBACK_COMPLETED: "{回滚|恢复|预览}已对以下对象完成: {0}。"
+ROLLBACK_EXCLUDED_USERS: "已排除{玩家|玩家}: \"{0}\"。"
+ROLLBACK_INCLUDE: "{包括|不包括}{方块|实体|目标}{类型|类型}: \"{0}\"。"
 ROLLBACK_IN_PROGRESS: "一个回滚/恢复操作已在进行。"
-ROLLBACK_LENGTH: "花费时间：{0}{秒|秒}。"
-ROLLBACK_MODIFIED: "{已修改|正在修改} {0}。"
-ROLLBACK_RADIUS: "半径：{0}个{方块|方块}。"
-ROLLBACK_SELECTION: "半径设置为 {0}\"。"
-ROLLBACK_STARTED: "{回滚|恢复|预览}开始于 \"{0}\"。"
-ROLLBACK_TIME: "时间范围：{0}。"
-ROLLBACK_WORLD_ACTION: "限制为{世界|操作} \"{0}\"。"
-SIGN_HEADER: "告示牌消息"
-STATUS_CONSUMER: "数据处理器：{0}个{数据|数据}待处理。"
-STATUS_DATABASE: "数据库：正在使用 {0}。"
-STATUS_INTEGRATION: "{0}：{启用|禁用}合并。"
-STATUS_LICENSE: "协议：{0}"
-STATUS_SYSTEM: "系统：{0}"
-STATUS_VERSION: "版本：{0}"
-TELEPORTED: "传送到 {0}。"
-TELEPORTED_SAFETY: "将你传送到安全的位置。"
+ROLLBACK_LENGTH: "花费时间: {0}{秒|秒}."
+ROLLBACK_MODIFIED: "{已修改|正在修改}{0}."
+ROLLBACK_RADIUS: "半径: {0}个{方块|方块}."
+ROLLBACK_SELECTION: "半径设置为\"{0}\"。"
+ROLLBACK_STARTED: "{回滚|恢复|预览}于 \"{0}\" 开始。"
+ROLLBACK_TIME: "时间范围: {0}."
+ROLLBACK_WORLD_ACTION: "限制{世界|动作}为 \"{0}\"。"
+SIGN_HEADER: "木牌消息"
+STATUS_CONSUMER: "数据处理器: {0}个{数据|数据}待处理。"
+STATUS_DATABASE: "数据库: 正在使用 {0}."
+STATUS_INTEGRATION: "{0}: 合并{启用|禁用}."
+STATUS_LICENSE: "协议: {0}"
+STATUS_VERSION: "版本: {0}"
+TELEPORTED: "传送到 {0}."
+TELEPORTED_SAFETY: "将你传送到安全地点。"
 TELEPORT_PLAYERS: "只有玩家才能使用传送命令。"
 TIME_DAYS: "{0}{天|天}"
 TIME_HOURS: "{0}{小时|小时}"
 TIME_MINUTES: "{0}{分钟|分钟}"
-TIME_MONTHS: "{0} {月|月}"
 TIME_SECONDS: "{0}{秒|秒}"
-TIME_UNITS: "{分钟|小时|天}"
 TIME_WEEKS: "{0}{周|周}"
-TIME_YEARS: "{0} {年|年}"
 UPDATE_ERROR: "检查更新时出错。"
 UPDATE_HEADER: "{0} 更新"
-UPDATE_NOTICE: "注意：{0} 现在可用。"
+UPDATE_NOTICE: "注意: {0} 现在可用。"
 UPGRADE_IN_PROGRESS: "正在进行升级，请稍后再试。"
-USER_NOT_FOUND: "玩家 \"{0}\" 未找到。"
-USER_OFFLINE: "玩家 \"{0}\" 不在线。"
+USER_NOT_FOUND: "玩家\"{0}\"未找到。"
+USER_OFFLINE: "玩家\"{0}\"不在线。"
 USING_MYSQL: "使用 MySQL 用于数据存储。"
 USING_SQLITE: "使用 SQLite 用于数据存储。"
 VALID_DONATION_KEY: "有效的捐赠密钥。"
-VERSION_INCOMPATIBLE: "{0} {1} 不受支持。"
 VERSION_NOTICE: "版本 {0} 现在可用。"
 VERSION_REQUIRED: "{0} 需要使用 {1} 或更高版本。"
-WORLD_NOT_FOUND: "世界 \"{0}\" 未找到。"
+WORLD_NOT_FOUND: "找不到世界 \"{0}\"。"

lang/zh-tw.yml

@@ -1,5 +1,5 @@
 # CoreProtect Language File (zh-TW)
-# Translators: whitebear13579, flandretw, ianiiaannn, hanshans135
+# Translators: whitebear13579, flandretw, ianiiaannn
 
 ACTION_NOT_SUPPORTED: "此指令不支援該行為。"
 AMOUNT_BLOCK: "{0} 格{方塊|方塊}"
@@ -16,7 +16,6 @@ COMMAND_THROTTLED: "請稍後再試。"
 CONSUMER_ERROR: "消費者隊列處理已經{暫停|繼續}."
 CONSUMER_TOGGLED: "消費者隊列處理已{暫停|繼續}."
 CONTAINER_HEADER: "儲存容器變更紀錄。"
-CPU_CORES: "CPU核心."
 DATABASE_BUSY: "資料庫繁忙，請稍後再試。"
 DATABASE_INDEX_ERROR: "無法驗證資料庫索引。"
 DATABASE_LOCKED_1: "資料庫已被鎖定，請稍後 15 秒後再試……"
@@ -127,8 +126,6 @@ MISSING_PARAMETERS: "請使用「{0}」。"
 MISSING_ROLLBACK_RADIUS: "你沒有指定{回滾|恢復}的範圍。"
 MISSING_ROLLBACK_USER: "你沒有指定{回滾|恢復}的玩家。"
 MYSQL_UNAVAILABLE: "無法連線到 MySQL 伺服器。"
-NETWORK_CONNECTION: "連接到 {0} {成功|失敗}. 使用 {1} {2}."
-NETWORK_TEST: "網絡測試數據已成功發送。"
 NO_DATA: "未找到 {0} §f的資料。"
 NO_DATA_LOCATION: "未找到此位置的{資料|交易|互動|訊息}。"
 NO_PERMISSION: "你沒有使用該操作的權限。"
@@ -148,7 +145,6 @@ PREVIEW_CANCELLED: "預覽已取消。"
 PREVIEW_CANCELLING: "正在取消預覽……"
 PREVIEW_IN_GAME: "你只能在遊戲中預覽回滾。"
 PREVIEW_TRANSACTION: "您無法預覽{集裝箱|庫存}交易。"
-PRIMARY_THREAD_ERROR: "該API方法不能在主線程上使用。"
 PURGE_ABORTED: "清除失敗，你的資料可能已損毀。"
 PURGE_ERROR: "無法處理 {0} 筆資料！"
 PURGE_FAILED: "清除失敗，請稍後再試。"
@@ -162,7 +158,6 @@ PURGE_REPAIRING: "正在嘗試修復問題，這可能需要一些時間。"
 PURGE_ROWS: "已清除 {0} {筆|筆}資料。"
 PURGE_STARTED: "資料清除開始於「{0}」。"
 PURGE_SUCCESS: "成功清除資料。"
-RAM_STATS: "{0}GB / {1}GB 記憶體"
 RELOAD_STARTED: "正在重新載入設定檔——請稍候……"
 RELOAD_SUCCESS: "成功重新載入設定檔。"
 ROLLBACK_ABORTED: "已中斷回滾/恢復。"
@@ -184,7 +179,6 @@ STATUS_CONSUMER: "消費者隊列: {0} 筆{資料|資料}在隊列中。"
 STATUS_DATABASE: "資料庫: 使用 {0}。"
 STATUS_INTEGRATION: "{0}: 整合{啟用|停用}。"
 STATUS_LICENSE: "憑證: {0}"
-STATUS_SYSTEM: "系統: {0}"
 STATUS_VERSION: "版本: {0}"
 TELEPORTED: "傳送到 {0}。"
 TELEPORTED_SAFETY: "已將你傳送到安全的區域。"
@@ -193,7 +187,6 @@ TIME_DAYS: "{0} {天|天}"
 TIME_HOURS: "{0} {小時|小時}"
 TIME_MINUTES: "{0} {分鐘|分鐘}"
 TIME_SECONDS: "{0} {秒|秒}"
-TIME_UNITS: "{/m|/h|/d}"
 TIME_WEEKS: "{0} {週|週}"
 UPDATE_ERROR: "檢查更新時發生錯誤。"
 UPDATE_HEADER: "{0} 更新"

pom.xml

@@ -2,13 +2,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.coreprotect</groupId>
   <artifactId>CoreProtect</artifactId>
-  <version>23.2</version>
+  <version>22.4</version>
   <properties>
     <project.branch></project.branch>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <skipTests>true</skipTests>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
   </properties>
   <build>
     <resources>
@@ -26,40 +23,16 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.15.0</version>
+        <version>3.8.1</version>
         <configuration>
           <source>11</source>
           <target>11</target>
         </configuration>
-        <executions>
-          <execution>
-            <id>default-testCompile</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-            <configuration>
-              <skip>${skipTests}</skip>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.5.0</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
-            </manifestEntries>
-          </archive>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.2</version>
+        <version>3.2.4</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -73,7 +46,7 @@
                   <excludes>
                     <exclude>**/*.java</exclude>
                     <exclude>**/*.c</exclude>
-                    <exclude>META-INF/maven/**/pom.properties</exclude>
+                    <exclude>META-INF/maven/**</exclude>
                     <exclude>META-INF/services/**</exclude>
                   </excludes>
                 </filter>
@@ -84,8 +57,6 @@
                   <exclude>org.intellij:*</exclude>
                   <exclude>org.jetbrains:*</exclude>
                   <exclude>org.slf4j:*</exclude>
-                  <exclude>org.apache.logging.log4j:*</exclude>
-                  <exclude>net.java.dev.jna:*</exclude>
                 </excludes>
               </artifactSet>
               <relocations>
@@ -102,93 +73,9 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.5.5</version>
-        <configuration>
-          <systemPropertyVariables>
-            <plugin.version>${project.version}</plugin.version>
-          </systemPropertyVariables>
-          <skipTests>${skipTests}</skipTests>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.6.2</version>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals><goal>enforce</goal></goals>
-            <configuration>
-              <rules>
-                <requireNoRepositories>
-                  <allowedRepositories>
-                    <allowedRepository>central</allowedRepository>
-                    <allowedRepository>enginehub-repo</allowedRepository>
-                    <allowedRepository>spigot-repo</allowedRepository>
-                    <allowedRepository>paper-repo</allowedRepository>
-                    <allowedRepository>codemc-repo</allowedRepository>
-                    <allowedRepository>jitpack.io</allowedRepository>
-                  </allowedRepositories>
-                </requireNoRepositories>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>maven-install</id>
-      <activation>
-        <property>
-          <name>env.BUILD_ID</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>3.2.0</version>
-            <executions>
-              <execution>
-                <id>install-validation</id>
-                <phase>install</phase>
-                <configuration>
-                  <target>
-                    <delete>
-                      <fileset dir="${project.build.directory}">
-                        <include name="${project.build.finalName}-shaded.jar"/>
-                      </fileset>
-                    </delete>
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
   <repositories>
-    <repository>
-      <id>central</id>
-      <url>https://repo.maven.apache.org/maven2/</url>
-      <releases><enabled>true</enabled></releases>
-      <snapshots><enabled>false</enabled></snapshots>
-    </repository>
-    <repository>
-      <id>enginehub-repo</id>
-      <url>https://maven.enginehub.org/repo/</url>
-      <releases><enabled>true</enabled></releases>
-      <snapshots><enabled>true</enabled></snapshots>
-    </repository>
     <repository>
       <id>spigot-repo</id>
       <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
@@ -201,134 +88,57 @@
       <id>codemc-repo</id>
       <url>https://repo.codemc.org/repository/maven-public/</url>
     </repository>
-    <repository>
-      <id>jitpack.io</id>
-      <url>https://jitpack.io</url>
-    </repository>
   </repositories>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.intellectualsites.bom</groupId>
+        <artifactId>bom-newest</artifactId> <!--  Ref: https://github.com/IntellectualSites/bom -->
+        <version>1.44</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <!--
     paper-api: io.papermc.paper
-    paper-api (<= 1.16): com.destroystokyo.paper / 1.16.1-R0.1-SNAPSHOT
+    paper-api (<= 1.16): com.destroystokyo.paper
     spigot-api: org.spigotmc
     bukkit: org.bukkit
     -->
     <dependency>
       <groupId>io.papermc.paper</groupId>
       <artifactId>paper-api</artifactId>
-      <version>26.1.2.build.9-alpha</version>
+      <version>1.20.4-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.bstats</groupId>
-      <artifactId>bstats-bukkit</artifactId>
-      <version>3.2.1</version>
+      <artifactId>bstats-bukkit-lite</artifactId>
+      <version>1.8</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.fastasyncworldedit</groupId>
       <artifactId>FastAsyncWorldEdit-Core</artifactId>
-      <version>2.15.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.fastasyncworldedit</groupId>
       <artifactId>FastAsyncWorldEdit-Bukkit</artifactId>
-      <version>2.15.0</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <groupId>*</groupId>
           <artifactId>FastAsyncWorldEdit-Core</artifactId>
+          <groupId>*</groupId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>com.zaxxer</groupId>
       <artifactId>HikariCP</artifactId>
-      <version>7.0.2</version>
-    </dependency>
-    <dependency>
-      <groupId>com.github.oshi</groupId>
-      <artifactId>oshi-core</artifactId>
-      <version>6.12.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <version>2.25.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-      <version>2.25.4</version>
-    </dependency>
-    <dependency>
-      <groupId>com.github.DeadSilenceIV</groupId>
-      <artifactId>AdvancedChestsAPI</artifactId>
-      <version>3.2-BETA</version>
-      <scope>provided</scope>
-    </dependency>
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>5.14.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.14.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-      <version>5.14.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>5.23.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-junit-jupiter</artifactId>
-      <version>5.23.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.github.seeseemelk</groupId>
-      <artifactId>MockBukkit-v1.21</artifactId>
-      <version>3.133.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.xerial</groupId>
-      <artifactId>sqlite-jdbc</artifactId>
-      <version>3.53.0.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>2.0.17</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.bytebuddy</groupId>
-      <artifactId>byte-buddy</artifactId>
-      <version>1.18.8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.bytebuddy</groupId>
-      <artifactId>byte-buddy-agent</artifactId>
-      <version>1.18.8</version>
-      <scope>test</scope>
+      <version>5.0.1</version>
     </dependency>
   </dependencies>
-</project>
+</project>

src/main/java/net/coreprotect/CoreProtect.java

@@ -2,21 +2,33 @@ package net.coreprotect;
 
 import java.io.File;
 
+import org.bstats.bukkit.MetricsLite;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import net.coreprotect.command.CommandHandler;
+import net.coreprotect.command.TabHandler;
+import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;
+import net.coreprotect.consumer.Consumer;
+import net.coreprotect.consumer.process.Process;
+import net.coreprotect.language.Language;
 import net.coreprotect.language.Phrase;
-import net.coreprotect.services.PluginInitializationService;
-import net.coreprotect.services.ShutdownService;
+import net.coreprotect.listener.ListenerHandler;
+import net.coreprotect.listener.player.PlayerQuitListener;
+import net.coreprotect.paper.PaperAdapter;
+import net.coreprotect.thread.CacheHandler;
+import net.coreprotect.thread.NetworkHandler;
+import net.coreprotect.thread.Scheduler;
 import net.coreprotect.utility.Chat;
+import net.coreprotect.utility.Color;
+import net.coreprotect.utility.Util;
 
-/**
- * Main class for the CoreProtect plugin
- */
 public final class CoreProtect extends JavaPlugin {
 
     private static CoreProtect instance;
-    private boolean advancedChestsEnabled = false;
 
     /**
      * Get the instance of CoreProtect
@@ -27,7 +39,7 @@ public final class CoreProtect extends JavaPlugin {
         return instance;
     }
 
-    private final CoreProtectAPI api = new CoreProtectAPI();
+    private CoreProtectAPI api = new CoreProtectAPI();
 
     /**
      * Get the CoreProtect API
@@ -40,16 +52,73 @@ public final class CoreProtect extends JavaPlugin {
 
     @Override
     public void onEnable() {
-        // Set plugin instance and data folder path
         instance = this;
         ConfigHandler.path = this.getDataFolder().getPath() + File.separator;
+        Language.loadPhrases();
 
-        advancedChestsEnabled = getServer().getPluginManager().getPlugin("AdvancedChests") != null;
-        // Initialize plugin using the initialization service
-        boolean initialized = PluginInitializationService.initializePlugin(this);
+        boolean start = performVersionChecks();
+        if (start) {
+            try {
+                Consumer.initialize(); // Prepare consumer (keep this here)
+                new ListenerHandler(this);
+                getCommand("coreprotect").setExecutor(CommandHandler.getInstance());
+                getCommand("coreprotect").setTabCompleter(new TabHandler());
+                getCommand("core").setExecutor(CommandHandler.getInstance());
+                getCommand("core").setTabCompleter(new TabHandler());
+                getCommand("co").setExecutor(CommandHandler.getInstance());
+                getCommand("co").setTabCompleter(new TabHandler());
 
-        // Disable plugin if initialization failed
-        if (!initialized) {
+                boolean exists = (new File(ConfigHandler.path)).exists();
+                if (!exists) {
+                    new File(ConfigHandler.path).mkdir();
+                }
+                start = ConfigHandler.performInitialization(true); // Perform any necessary initialization
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                start = false;
+            }
+        }
+
+        if (start) {
+            PluginDescriptionFile pluginDescription = this.getDescription();
+            Util.sendConsoleComponentStartup(Bukkit.getServer().getConsoleSender(), Phrase.build(Phrase.ENABLE_SUCCESS, ConfigHandler.EDITION_NAME));
+            if (Config.getGlobal().MYSQL) {
+                Chat.console(Phrase.build(Phrase.USING_MYSQL));
+            }
+            else {
+                Chat.console(Phrase.build(Phrase.USING_SQLITE));
+            }
+
+            Chat.console("--------------------");
+            Chat.console(Phrase.build(Phrase.ENJOY_COREPROTECT, pluginDescription.getName()));
+            Chat.console(Phrase.build(Phrase.LINK_DISCORD, "www.coreprotect.net/discord/"));
+            Chat.console("--------------------");
+
+            Scheduler.scheduleSyncDelayedTask(this, () -> {
+                try {
+                    Thread networkHandler = new Thread(new NetworkHandler(true, true));
+                    networkHandler.start();
+                }
+                catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }, 0);
+
+            Thread cacheCleanUpThread = new Thread(new CacheHandler());
+            cacheCleanUpThread.start();
+
+            Consumer.startConsumer();
+
+            // Enabling bStats
+            try {
+                new MetricsLite(this, 2876);
+            }
+            catch (Exception e) {
+                // Failed to connect to bStats server or something else went wrong.
+            }
+        }
+        else {
             Chat.console(Phrase.build(Phrase.ENABLE_FAILED, ConfigHandler.EDITION_NAME));
             getServer().getPluginManager().disablePlugin(this);
         }
@@ -57,10 +126,86 @@ public final class CoreProtect extends JavaPlugin {
 
     @Override
     public void onDisable() {
-        ShutdownService.safeShutdown(this);
+        safeShutdown(this);
     }
 
-    public boolean isAdvancedChestsEnabled() {
-        return advancedChestsEnabled;
+    private static boolean performVersionChecks() {
+        try {
+            String[] bukkitVersion = Bukkit.getServer().getBukkitVersion().split("[-.]");
+            if (Util.newVersion(bukkitVersion[0] + "." + bukkitVersion[1], ConfigHandler.SPIGOT_VERSION)) {
+                Chat.console(Phrase.build(Phrase.VERSION_REQUIRED, "Spigot", ConfigHandler.SPIGOT_VERSION));
+                return false;
+            }
+            String[] javaVersion = (System.getProperty("java.version").replaceAll("[^0-9.]", "") + ".0").split("\\.");
+            if (Util.newVersion(javaVersion[0] + "." + javaVersion[1], ConfigHandler.JAVA_VERSION)) {
+                Chat.console(Phrase.build(Phrase.VERSION_REQUIRED, "Java", ConfigHandler.JAVA_VERSION));
+                return false;
+            }
+
+            if (ConfigHandler.EDITION_BRANCH.length() == 0) {
+                Chat.sendConsoleMessage(Color.RED + "[CoreProtect] " + Phrase.build(Phrase.INVALID_BRANCH_1));
+                Chat.sendConsoleMessage(Color.GREY + "[CoreProtect] " + Phrase.build(Phrase.INVALID_BRANCH_2));
+                Chat.sendConsoleMessage(Color.GREY + "[CoreProtect] " + Phrase.build(Phrase.INVALID_BRANCH_3));
+                return false;
+            }
+
+            ConfigHandler.SERVER_VERSION = Integer.parseInt(bukkitVersion[1]);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
+        return true;
     }
+
+    private static void safeShutdown(CoreProtect plugin) {
+        try {
+            /* if server is stopping, log disconnections of online players */
+            if (ConfigHandler.serverRunning && PaperAdapter.ADAPTER.isStopping(plugin.getServer())) {
+                for (Player player : plugin.getServer().getOnlinePlayers()) {
+                    PlayerQuitListener.queuePlayerQuit(player);
+                }
+            }
+
+            ConfigHandler.serverRunning = false;
+            long shutdownTime = System.currentTimeMillis();
+            long alertTime = shutdownTime + (10 * 1000);
+            if (ConfigHandler.converterRunning) {
+                Chat.console(Phrase.build(Phrase.FINISHING_CONVERSION));
+            }
+            else {
+                Chat.console(Phrase.build(Phrase.FINISHING_LOGGING));
+            }
+
+            while ((Consumer.isRunning() || ConfigHandler.converterRunning) && !ConfigHandler.purgeRunning) {
+                long time = System.currentTimeMillis();
+                if (time >= alertTime) {
+                    if (!ConfigHandler.converterRunning) {
+                        int consumerId = (Consumer.currentConsumer == 1) ? 1 : 0;
+                        int consumerCount = Consumer.getConsumerSize(consumerId) + Process.getCurrentConsumerSize();
+                        Chat.console(Phrase.build(Phrase.LOGGING_ITEMS, String.format("%,d", consumerCount)));
+                    }
+                    alertTime = alertTime + (30 * 1000);
+                }
+                else if (!ConfigHandler.databaseReachable && (time - shutdownTime) >= (5 * 60 * 1000)) {
+                    Chat.console(Phrase.build(Phrase.DATABASE_UNREACHABLE));
+                    break;
+                }
+                else if ((time - shutdownTime) >= (15 * 60 * 1000)) {
+                    Chat.console(Phrase.build(Phrase.LOGGING_TIME_LIMIT));
+                    break;
+                }
+
+                Thread.sleep(100);
+            }
+
+            ConfigHandler.performDisable();
+            Chat.console(Phrase.build(Phrase.DISABLE_SUCCESS, "CoreProtect v" + plugin.getDescription().getVersion()));
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 }

src/main/java/net/coreprotect/api/BlockAPI.java

@@ -8,49 +8,18 @@ import java.util.List;
 
 import org.bukkit.block.Block;
 
-import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.Database;
 import net.coreprotect.database.statement.UserStatement;
-import net.coreprotect.utility.BlockUtils;
-import net.coreprotect.utility.StringUtils;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
-/**
- * Provides API methods for block-related lookups in the CoreProtect database.
- */
 public class BlockAPI {
 
-    /**
-     * Private constructor to prevent instantiation.
-     * This is a utility class with static methods only.
-     */
-    private BlockAPI() {
-        throw new IllegalStateException("API class");
-    }
-
-    /**
-     * Performs a lookup of block-related actions at the specified block.
-     * 
-     * @param block
-     *            The block to look up
-     * @param offset
-     *            Time constraint in seconds (0 means no time constraint)
-     * @return List of results in a String array format
-     */
     public static List<String[]> performLookup(Block block, int offset) {
         List<String[]> result = new ArrayList<>();
 
-        if (!Config.getGlobal().API_ENABLED) {
-            return result;
-        }
-
-        if (block == null) {
-            return result;
-        }
-
         try (Connection connection = Database.getConnection(false, 1000)) {
-            if (connection == null) {
+            if (block == null) {
                 return result;
             }
 
@@ -58,39 +27,40 @@ public class BlockAPI {
             int y = block.getY();
             int z = block.getZ();
             int time = (int) (System.currentTimeMillis() / 1000L);
-            int worldId = WorldUtils.getWorldId(block.getWorld().getName());
+            int worldId = Util.getWorldId(block.getWorld().getName());
             int checkTime = 0;
-
             if (offset > 0) {
                 checkTime = time - offset;
             }
 
-            try (Statement statement = connection.createStatement()) {
-                String query = "SELECT time,user,action,type,data,blockdata,rolled_back FROM " + ConfigHandler.prefix + "block " + WorldUtils.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND time > '" + checkTime + "' ORDER BY rowid DESC";
-
-                try (ResultSet results = statement.executeQuery(query)) {
-                    while (results.next()) {
-                        String resultTime = results.getString("time");
-                        int resultUserId = results.getInt("user");
-                        String resultAction = results.getString("action");
-                        int resultType = results.getInt("type");
-                        String resultData = results.getString("data");
-                        byte[] resultBlockData = results.getBytes("blockdata");
-                        String resultRolledBack = results.getString("rolled_back");
-
-                        if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) {
-                            UserStatement.loadName(connection, resultUserId);
-                        }
-
-                        String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
-                        String blockData = BlockUtils.byteDataToString(resultBlockData, resultType);
-
-                        String[] lookupData = new String[] { resultTime, resultUser, String.valueOf(x), String.valueOf(y), String.valueOf(z), String.valueOf(resultType), resultData, resultAction, resultRolledBack, String.valueOf(worldId), blockData };
-
-                        result.add(StringUtils.toStringArray(lookupData));
-                    }
-                }
+            if (connection == null) {
+                return result;
             }
+
+            Statement statement = connection.createStatement();
+            String query = "SELECT time,user,action,type,data,blockdata,rolled_back FROM " + ConfigHandler.prefix + "block " + Util.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND time > '" + checkTime + "' ORDER BY rowid DESC";
+            ResultSet results = statement.executeQuery(query);
+
+            while (results.next()) {
+                String resultTime = results.getString("time");
+                int resultUserId = results.getInt("user");
+                String resultAction = results.getString("action");
+                int resultType = results.getInt("type");
+                String resultData = results.getString("data");
+                byte[] resultBlockData = results.getBytes("blockdata");
+                String resultRolledBack = results.getString("rolled_back");
+                if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) {
+                    UserStatement.loadName(connection, resultUserId);
+                }
+                String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
+                String blockData = Util.byteDataToString(resultBlockData, resultType);
+
+                String[] lookupData = new String[] { resultTime, resultUser, String.valueOf(x), String.valueOf(y), String.valueOf(z), String.valueOf(resultType), resultData, resultAction, resultRolledBack, String.valueOf(worldId), blockData };
+                String[] lineData = Util.toStringArray(lookupData);
+                result.add(lineData);
+            }
+            results.close();
+            statement.close();
         }
         catch (Exception e) {
             e.printStackTrace();
@@ -98,4 +68,5 @@ public class BlockAPI {
 
         return result;
     }
+
 }

src/main/java/net/coreprotect/api/QueueLookup.java

@@ -15,94 +15,69 @@ import net.coreprotect.config.Config;
 import net.coreprotect.consumer.Consumer;
 import net.coreprotect.consumer.Queue;
 import net.coreprotect.consumer.process.Process;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.StringUtils;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
-/**
- * Provides API methods for looking up block-related actions in the processing queue.
- * This class allows for retrieving actions that have not yet been saved to the database.
- */
 public class QueueLookup extends Queue {
 
-    /**
-     * Private constructor to prevent instantiation.
-     * This is a utility class with static methods only.
-     */
     private QueueLookup() {
         throw new IllegalStateException("API class");
     }
 
-    /**
-     * Performs a lookup of block-related actions in the processing queue for the specified block.
-     * This allows retrieving actions that have not yet been committed to the database.
-     * 
-     * @param block
-     *            The block to look up in the processing queue
-     * @return List of results in a String array format, empty list if API is disabled or no results found
-     */
     public static List<String[]> performLookup(Block block) {
         List<String[]> result = new ArrayList<>();
-
         if (!Config.getGlobal().API_ENABLED) {
             return result;
         }
 
-        if (block == null) {
-            return result;
-        }
-
         try {
-            // Determine total count of actions in the consumer queues
-            int consumerCount = calculateConsumerCount();
+            int consumerCount = 0;
+            int currentConsumerSize = Process.getCurrentConsumerSize();
+            if (currentConsumerSize == 0) {
+                consumerCount = Consumer.getConsumerSize(0) + Consumer.getConsumerSize(1);
+            }
+            else {
+                int consumerId = (Consumer.currentConsumer == 1) ? 1 : 0;
+                consumerCount = Consumer.getConsumerSize(consumerId) + currentConsumerSize;
+            }
 
             if (consumerCount == 0) {
                 return result;
             }
 
-            // Get data from the current consumer
             int currentConsumer = Consumer.currentConsumer;
             ArrayList<Object[]> consumerData = Consumer.consumer.get(currentConsumer);
             Map<Integer, String[]> users = Consumer.consumerUsers.get(currentConsumer);
             Map<Integer, Object> consumerObject = Consumer.consumerObjects.get(currentConsumer);
 
-            // Current block location for comparison with actions in the queue
-            Location blockLocation = block.getLocation();
-
-            // Check for block actions in the processing queue
+            Location oldLocation = block.getLocation();
             ListIterator<Object[]> iterator = consumerData.listIterator();
             while (iterator.hasNext()) {
                 Object[] data = iterator.next();
                 int id = (int) data[0];
                 int action = (int) data[1];
-
-                // Only process block break and place actions
                 if (action != Process.BLOCK_BREAK && action != Process.BLOCK_PLACE) {
                     continue;
                 }
 
                 String[] userData = users.get(id);
                 Object objectData = consumerObject.get(id);
-
-                // Verify the action pertains to the requested block
-                if (isActionForBlock(userData, objectData, blockLocation)) {
+                if (userData != null && objectData != null && (objectData instanceof BlockState) && ((BlockState) objectData).getLocation().equals(oldLocation)) {
                     Material blockType = (Material) data[2];
                     int legacyData = (int) data[3];
                     String blockData = (String) data[7];
                     String user = userData[0];
                     BlockState blockState = (BlockState) objectData;
                     Location location = blockState.getLocation();
-                    int worldId = WorldUtils.getWorldId(location.getWorld().getName());
-                    int resultType = MaterialUtils.getBlockId(blockType);
+                    int wid = Util.getWorldId(location.getWorld().getName());
+                    int resultType = Util.getBlockId(blockType);
                     int time = (int) (System.currentTimeMillis() / 1000L);
 
-                    String[] lookupData = new String[] { String.valueOf(time), user, String.valueOf(location.getBlockX()), String.valueOf(location.getBlockY()), String.valueOf(location.getBlockZ()), String.valueOf(resultType), String.valueOf(legacyData), String.valueOf(action), "0", String.valueOf(worldId), blockData };
-
-                    result.add(StringUtils.toStringArray(lookupData));
+                    String[] lookupData = new String[] { String.valueOf(time), user, String.valueOf(location.getBlockX()), String.valueOf(location.getBlockY()), String.valueOf(location.getBlockZ()), String.valueOf(resultType), String.valueOf(legacyData), String.valueOf(action), "0", String.valueOf(wid), blockData };
+                    String[] lineData = Util.toStringArray(lookupData);
+                    result.add(lineData);
                 }
             }
 
-            // Reverse the result list to match database lookup order (most recent first)
             Collections.reverse(result);
         }
         catch (Exception e) {
@@ -112,34 +87,4 @@ public class QueueLookup extends Queue {
         return result;
     }
 
-    /**
-     * Calculates the total count of actions in the consumer queues.
-     * 
-     * @return The total count of actions in the consumer queues
-     */
-    private static int calculateConsumerCount() {
-        int currentConsumerSize = Process.getCurrentConsumerSize();
-        if (currentConsumerSize == 0) {
-            return Consumer.getConsumerSize(0) + Consumer.getConsumerSize(1);
-        }
-        else {
-            int consumerId = (Consumer.currentConsumer == 1) ? 1 : 0;
-            return Consumer.getConsumerSize(consumerId) + currentConsumerSize;
-        }
-    }
-
-    /**
-     * Determines if an action in the queue pertains to the specified block location.
-     * 
-     * @param userData
-     *            User data associated with the action
-     * @param objectData
-     *            Object data associated with the action
-     * @param blockLocation
-     *            Location of the block being looked up
-     * @return true if the action pertains to the specified block, false otherwise
-     */
-    private static boolean isActionForBlock(String[] userData, Object objectData, Location blockLocation) {
-        return userData != null && objectData != null && (objectData instanceof BlockState) && ((BlockState) objectData).getLocation().equals(blockLocation);
-    }
 }

src/main/java/net/coreprotect/api/SessionLookup.java

@@ -12,69 +12,58 @@ import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.Database;
 import net.coreprotect.database.statement.UserStatement;
 
-/**
- * Provides API methods for looking up player session data in the CoreProtect database.
- * Session data includes login/logout events and their associated timestamps and locations.
- */
 public class SessionLookup {
 
-    /**
-     * The session type ID used for identifying session-related events.
-     */
     public static final int ID = 0;
 
-    /**
-     * Private constructor to prevent instantiation.
-     * This is a utility class with static methods only.
-     */
     private SessionLookup() {
         throw new IllegalStateException("API class");
     }
 
-    /**
-     * Performs a lookup of session-related actions for the specified user.
-     * This returns login and logout events within the specified time constraint.
-     * 
-     * @param user
-     *            The username to look up session data for
-     * @param offset
-     *            Time constraint in seconds (0 means no time constraint)
-     * @return List of results in a String array format, empty list if API is disabled or no results found
-     */
     public static List<String[]> performLookup(String user, int offset) {
         List<String[]> result = new ArrayList<>();
-
         if (!Config.getGlobal().API_ENABLED) {
             return result;
         }
 
-        if (user == null) {
-            return result;
-        }
-
         try (Connection connection = Database.getConnection(false, 1000)) {
-            if (connection == null) {
+            if (connection == null || user == null) {
                 return result;
             }
 
-            // Prepare lookup parameters
             String type = String.valueOf(ID);
             int time = (int) (System.currentTimeMillis() / 1000L);
-            int checkTime = calculateCheckTime(time, offset);
+            int checkTime = 0;
+            if (offset > 0) {
+                checkTime = time - offset;
+            }
 
-            // Get user ID from cache or load it
-            int userId = getUserId(connection, user);
+            if (ConfigHandler.playerIdCache.get(user.toLowerCase(Locale.ROOT)) == null) {
+                UserStatement.loadId(connection, user, null);
+            }
+            int userId = ConfigHandler.playerIdCache.get(user.toLowerCase(Locale.ROOT));
 
-            // Query session data from database
             try (Statement statement = connection.createStatement()) {
-                String query = buildSessionQuery(userId, checkTime);
+                String query = "SELECT time,user,wid,x,y,z,action FROM " + ConfigHandler.prefix + "session WHERE user = '" + userId + "' AND time > '" + checkTime + "' ORDER BY rowid DESC";
+                ResultSet results = statement.executeQuery(query);
+                while (results.next()) {
+                    String resultTime = results.getString("time");
+                    int resultUserId = results.getInt("user");
+                    String resultWorldId = results.getString("wid");
+                    String resultX = results.getString("x");
+                    String resultY = results.getString("y");
+                    String resultZ = results.getString("z");
+                    String resultAction = results.getString("action");
 
-                try (ResultSet results = statement.executeQuery(query)) {
-                    while (results.next()) {
-                        String[] sessionData = extractSessionData(connection, results, type);
-                        result.add(sessionData);
+                    if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) {
+                        UserStatement.loadName(connection, resultUserId);
                     }
+                    String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
+
+                    String[] lookupData = new String[] { resultTime, resultUser, resultX, resultY, resultZ, resultWorldId, type, resultAction };
+                    result.add(lookupData);
                 }
+                results.close();
             }
         }
         catch (Exception e) {
@@ -84,81 +73,4 @@ public class SessionLookup {
         return result;
     }
 
-    /**
-     * Calculates the time threshold for the session lookup.
-     * 
-     * @param currentTime
-     *            The current time in seconds
-     * @param offset
-     *            The time offset in seconds
-     * @return The calculated time threshold
-     */
-    private static int calculateCheckTime(int currentTime, int offset) {
-        return (offset > 0) ? currentTime - offset : 0;
-    }
-
-    /**
-     * Gets the user ID for the specified username.
-     * If the user ID is not in the cache, it will be loaded from the database.
-     * 
-     * @param connection
-     *            The database connection
-     * @param username
-     *            The username to get the ID for
-     * @return The user ID
-     */
-    private static int getUserId(Connection connection, String username) {
-        String lowerUsername = username.toLowerCase(Locale.ROOT);
-
-        if (ConfigHandler.playerIdCache.get(lowerUsername) == null) {
-            UserStatement.loadId(connection, username, null);
-        }
-
-        return ConfigHandler.playerIdCache.get(lowerUsername);
-    }
-
-    /**
-     * Builds the SQL query for retrieving session data.
-     * 
-     * @param userId
-     *            The user ID to query for
-     * @param checkTime
-     *            The time threshold for the query
-     * @return The SQL query string
-     */
-    private static String buildSessionQuery(int userId, int checkTime) {
-        return "SELECT time,user,wid,x,y,z,action FROM " + ConfigHandler.prefix + "session WHERE user = '" + userId + "' AND time > '" + checkTime + "' ORDER BY rowid DESC";
-    }
-
-    /**
-     * Extracts session data from a result set row.
-     * 
-     * @param connection
-     *            The database connection
-     * @param results
-     *            The result set to extract data from
-     * @param type
-     *            The session type ID
-     * @return An array of session data values
-     * @throws Exception
-     *             if an error occurs while extracting data
-     */
-    private static String[] extractSessionData(Connection connection, ResultSet results, String type) throws Exception {
-        String resultTime = results.getString("time");
-        int resultUserId = results.getInt("user");
-        String resultWorldId = results.getString("wid");
-        String resultX = results.getString("x");
-        String resultY = results.getString("y");
-        String resultZ = results.getString("z");
-        String resultAction = results.getString("action");
-
-        // Get username from cache or load it
-        if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) {
-            UserStatement.loadName(connection, resultUserId);
-        }
-        String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
-
-        // Create and return the session data array
-        return new String[] { resultTime, resultUser, resultX, resultY, resultZ, resultWorldId, type, resultAction };
-    }
 }

src/main/java/net/coreprotect/api/result/ParseResult.java

@@ -1,129 +0,0 @@
-package net.coreprotect.api.result;
-
-import java.util.Locale;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.block.data.BlockData;
-
-import net.coreprotect.api.SessionLookup;
-import net.coreprotect.utility.EntityUtils;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.StringUtils;
-import net.coreprotect.utility.WorldUtils;
-
-public class ParseResult {
-    private final String[] parse;
-
-    public ParseResult(String[] data) {
-        parse = data;
-    }
-
-    public int getActionId() {
-        return Integer.parseInt(parse[7]);
-    }
-
-    public String getActionString() {
-        int actionID = Integer.parseInt(parse[7]);
-        if (parse.length < 13 && Integer.parseInt(parse[6]) == SessionLookup.ID) {
-            switch (actionID) {
-                case 0:
-                    return "logout";
-                case 1:
-                    return "login";
-                default:
-                    return "unknown";
-            }
-        }
-
-        String result = "unknown";
-        if (actionID == 0) {
-            result = "break";
-        }
-        else if (actionID == 1) {
-            result = "place";
-        }
-        else if (actionID == 2) {
-            result = "click";
-        }
-        else if (actionID == 3) {
-            result = "kill";
-        }
-
-        return result;
-    }
-
-    @Deprecated
-    public int getData() {
-        return Integer.parseInt(parse[6]);
-    }
-
-    public String getPlayer() {
-        return parse[1];
-    }
-
-    @Deprecated
-    public int getTime() {
-        return Integer.parseInt(parse[0]);
-    }
-
-    public long getTimestamp() {
-        return Long.parseLong(parse[0]) * 1000L;
-    }
-
-    public Material getType() {
-        if (parse.length < 13) {
-            return null;
-        }
-
-        int actionID = this.getActionId();
-        int type = Integer.parseInt(parse[5]);
-        String typeName;
-
-        if (actionID == 3) {
-            typeName = EntityUtils.getEntityType(type).name();
-        }
-        else {
-            typeName = MaterialUtils.getType(type).name().toLowerCase(Locale.ROOT);
-            typeName = StringUtils.nameFilter(typeName, this.getData());
-        }
-
-        return MaterialUtils.getType(typeName);
-    }
-
-    public BlockData getBlockData() {
-        if (parse.length < 13) {
-            return null;
-        }
-
-        String blockData = parse[12];
-        if (blockData == null || blockData.length() == 0) {
-            return getType().createBlockData();
-        }
-        return Bukkit.getServer().createBlockData(blockData);
-    }
-
-    public int getX() {
-        return Integer.parseInt(parse[2]);
-    }
-
-    public int getY() {
-        return Integer.parseInt(parse[3]);
-    }
-
-    public int getZ() {
-        return Integer.parseInt(parse[4]);
-    }
-
-    public boolean isRolledBack() {
-        if (parse.length < 13) {
-            return false;
-        }
-
-        return (Integer.parseInt(parse[8]) == 1 || Integer.parseInt(parse[8]) == 3);
-    }
-
-    public String worldName() {
-        return WorldUtils.getWorldName(Integer.parseInt(parse.length < 13 ? parse[5] : parse[9]));
-    }
-}

src/main/java/net/coreprotect/bukkit/BukkitAdapter.java

@@ -1,10 +1,7 @@
 package net.coreprotect.bukkit;
 
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.bukkit.Color;
 import org.bukkit.DyeColor;
@@ -16,16 +13,12 @@ import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Directional;
-import org.bukkit.block.data.FaceAttachable;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.Event;
-import org.bukkit.event.block.BlockExplodeEvent;
 import org.bukkit.event.block.SignChangeEvent;
-import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.MerchantRecipe;
@@ -36,19 +29,11 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionType;
 
 import net.coreprotect.config.ConfigHandler;
-import net.coreprotect.utility.BlockUtils;
+import net.coreprotect.utility.Util;
 
-/**
- * Base adapter implementation for Bukkit API compatibility.
- * Provides default implementations for methods that work across multiple Minecraft versions.
- * Version-specific implementations extend this class to provide specialized behavior.
- */
 public class BukkitAdapter implements BukkitInterface {
 
-    /** The currently active adapter instance */
     public static BukkitInterface ADAPTER;
-
-    // Version constants for Bukkit implementations
     public static final int BUKKIT_V1_13 = 13;
     public static final int BUKKIT_V1_14 = 14;
     public static final int BUKKIT_V1_15 = 15;
@@ -57,42 +42,33 @@ public class BukkitAdapter implements BukkitInterface {
     public static final int BUKKIT_V1_18 = 18;
     public static final int BUKKIT_V1_19 = 19;
     public static final int BUKKIT_V1_20 = 20;
-    public static final int BUKKIT_V1_21 = 21;
 
-    /**
-     * Initializes the appropriate Bukkit adapter based on the server version.
-     * This method should be called during plugin initialization.
-     */
     public static void loadAdapter() {
         switch (ConfigHandler.SERVER_VERSION) {
             case BUKKIT_V1_13:
             case BUKKIT_V1_14:
             case BUKKIT_V1_15:
+                BukkitAdapter.ADAPTER = new BukkitAdapter();
+                break;
             case BUKKIT_V1_16:
-                ADAPTER = new BukkitAdapter();
+                BukkitAdapter.ADAPTER = new Bukkit_v1_16();
                 break;
             case BUKKIT_V1_17:
-                ADAPTER = new Bukkit_v1_17();
+                BukkitAdapter.ADAPTER = new Bukkit_v1_17();
                 break;
             case BUKKIT_V1_18:
-                ADAPTER = new Bukkit_v1_18();
+                BukkitAdapter.ADAPTER = new Bukkit_v1_18();
                 break;
             case BUKKIT_V1_19:
-                ADAPTER = new Bukkit_v1_19();
+                BukkitAdapter.ADAPTER = new Bukkit_v1_19();
                 break;
             case BUKKIT_V1_20:
-                ADAPTER = new Bukkit_v1_20();
-                break;
-            case BUKKIT_V1_21:
             default:
-                ADAPTER = new Bukkit_v1_21();
+                BukkitAdapter.ADAPTER = new Bukkit_v1_20();
                 break;
         }
     }
 
-    // -------------------- Basic data conversion methods --------------------
-    public static Set<Material> EMPTY_SET = new HashSet<>(Arrays.asList());
-
     @Override
     public String parseLegacyName(String name) {
         return name;
@@ -103,8 +79,6 @@ public class BukkitAdapter implements BukkitInterface {
         return -1;
     }
 
-    // -------------------- Entity methods --------------------
-
     @Override
     public boolean getEntityMeta(LivingEntity entity, List<Object> info) {
         return false;
@@ -115,28 +89,6 @@ public class BukkitAdapter implements BukkitInterface {
         return false;
     }
 
-    @Override
-    public void getWolfVariant(org.bukkit.entity.Wolf wolf, List<Object> info) {
-        // Base implementation does nothing - Wolf variants only exist in 1.21+
-    }
-
-    @Override
-    public void setWolfVariant(org.bukkit.entity.Wolf wolf, Object value) {
-        // Base implementation does nothing - Wolf variants only exist in 1.21+
-    }
-
-    @Override
-    public EntityType getEntityType(Material material) {
-        switch (material) {
-            case END_CRYSTAL:
-                return EntityType.valueOf("ENDER_CRYSTAL");
-            default:
-                return EntityType.UNKNOWN;
-        }
-    }
-
-    // -------------------- Item handling methods --------------------
-
     @Override
     public boolean getItemMeta(ItemMeta itemMeta, List<Map<String, Object>> list, List<List<Map<String, Object>>> metadata, int slot) {
         return false;
@@ -147,72 +99,20 @@ public class BukkitAdapter implements BukkitInterface {
         return false;
     }
 
-    @Override
-    public Material getPlantSeeds(Material material) {
-        switch (material) {
-            case WHEAT:
-                return Material.WHEAT_SEEDS;
-            case PUMPKIN_STEM:
-                return Material.PUMPKIN_SEEDS;
-            case MELON_STEM:
-                return Material.MELON_SEEDS;
-            case BEETROOTS:
-                return Material.BEETROOT_SEEDS;
-            default:
-                return material;
-        }
-    }
-
-    @Override
-    public ItemStack adjustIngredient(MerchantRecipe recipe, ItemStack itemStack) {
-        return null;
-    }
-
-    @Override
-    public ItemStack getArrowMeta(Arrow arrow, ItemStack itemStack) {
-        PotionData data = arrow.getBasePotionData();
-        if (data.getType() != PotionType.valueOf("UNCRAFTABLE")) {
-            itemStack = new ItemStack(Material.TIPPED_ARROW);
-            PotionMeta meta = (PotionMeta) itemStack.getItemMeta();
-            meta.setBasePotionData(data);
-            for (PotionEffect effect : arrow.getCustomEffects()) {
-                meta.addCustomEffect(effect, false);
-            }
-            itemStack.setItemMeta(meta);
-        }
-
-        return itemStack;
-    }
-
-    // -------------------- Block methods --------------------
-
     @Override
     public boolean isAttached(Block block, Block scanBlock, BlockData blockData, int scanMin) {
-        if (blockData instanceof Directional && blockData instanceof FaceAttachable) {
-            Directional directional = (Directional) blockData;
-            FaceAttachable faceAttachable = (FaceAttachable) blockData;
-
-            boolean scanButton = false;
-            switch (faceAttachable.getAttachedFace()) {
-                case WALL:
-                    scanButton = (scanMin < 5 && scanBlock.getRelative(directional.getFacing().getOppositeFace()).getLocation().equals(block.getLocation()));
-                    break;
-                case FLOOR:
-                    scanButton = (scanMin == 5);
-                    break;
-                case CEILING:
-                    scanButton = (scanMin == 6);
-                    break;
-                default:
-                    break;
-            }
-
-            return scanButton;
+        if (blockData instanceof Directional) {
+            return (scanMin < 5 && scanBlock.getRelative(((Directional) blockData).getFacing().getOppositeFace()).getLocation().equals(block.getLocation()));
         }
 
         return true; // unvalidated attachments default to true
     }
 
+    @Override
+    public boolean isWall(BlockData blockData) {
+        return false;
+    }
+
     @Override
     public int getMinHeight(World world) {
         return 0;
@@ -223,16 +123,9 @@ public class BukkitAdapter implements BukkitInterface {
         return Material.AIR;
     }
 
-    @Override
-    public boolean isInvisible(Material material) {
-        return BlockUtils.isAir(material);
-    }
-
-    // -------------------- Special block type checkers --------------------
-
     @Override
     public boolean isItemFrame(Material material) {
-        return material == Material.ITEM_FRAME;
+        return (material == Material.ITEM_FRAME);
     }
 
     @Override
@@ -251,10 +144,74 @@ public class BukkitAdapter implements BukkitInterface {
     }
 
     @Override
-    public boolean isDecoratedPot(Material material) {
+    public boolean isGlowing(Sign sign, boolean isFront) {
         return false;
     }
 
+    @Override
+    public boolean isWaxed(Sign sign) {
+        return false;
+    }
+
+    @Override
+    public boolean isInvisible(Material material) {
+        return Util.isAir(material);
+    }
+
+    @Override
+    public ItemStack adjustIngredient(MerchantRecipe recipe, ItemStack itemStack) {
+        return null;
+    }
+
+    @Override
+    public void setGlowing(Sign sign, boolean isFront, boolean isGlowing) {
+        return;
+    }
+
+    @Override
+    public void setColor(Sign sign, boolean isFront, int color) {
+        if (!isFront) {
+            return;
+        }
+
+        sign.setColor(DyeColor.getByColor(Color.fromRGB(color)));
+    }
+
+    @Override
+    public void setWaxed(Sign sign, boolean isWaxed) {
+        return;
+    }
+
+    @Override
+    public int getColor(Sign sign, boolean isFront) {
+        if (isFront) {
+            return sign.getColor().getColor().asRGB();
+        }
+
+        return 0;
+    }
+
+    @Override
+    public Material getPlantSeeds(Material material) {
+        switch (material) {
+            case WHEAT:
+                material = Material.WHEAT_SEEDS;
+                break;
+            case PUMPKIN_STEM:
+                material = Material.PUMPKIN_SEEDS;
+                break;
+            case MELON_STEM:
+                material = Material.MELON_SEEDS;
+                break;
+            case BEETROOTS:
+                material = Material.BEETROOT_SEEDS;
+                break;
+            default:
+        }
+
+        return material;
+    }
+
     @Override
     public boolean isSuspiciousBlock(Material material) {
         return false;
@@ -280,8 +237,6 @@ public class BukkitAdapter implements BukkitInterface {
         return null;
     }
 
-    // -------------------- Sign handling methods --------------------
-
     @Override
     public String getLine(Sign sign, int line) {
         if (line < 4) {
@@ -309,94 +264,19 @@ public class BukkitAdapter implements BukkitInterface {
     }
 
     @Override
-    public boolean isGlowing(Sign sign, boolean isFront) {
-        return false;
-    }
-
-    @Override
-    public boolean isWaxed(Sign sign) {
-        return false;
-    }
-
-    @Override
-    public boolean shouldLogExplosion(Event event){
-        return true;
-    }
-
-    @Override
-    public Material getExplodedBlock(BlockExplodeEvent event){
-        // accoding to the Bukkit docs this will always return air
-        return event.getBlock().getType();
-    }
-
-    @Override
-    public void setGlowing(Sign sign, boolean isFront, boolean isGlowing) {
-        // Base implementation does nothing
-    }
-
-    @Override
-    public void setColor(Sign sign, boolean isFront, int color) {
-        if (!isFront) {
-            return;
+    public ItemStack getArrowMeta(Arrow arrow, ItemStack itemStack) {
+        PotionData data = arrow.getBasePotionData();
+        if (data.getType() != PotionType.UNCRAFTABLE) {
+            itemStack = new ItemStack(Material.TIPPED_ARROW);
+            PotionMeta meta = (PotionMeta) itemStack.getItemMeta();
+            meta.setBasePotionData(data);
+            for (PotionEffect effect : arrow.getCustomEffects()) {
+                meta.addCustomEffect(effect, false);
+            }
+            itemStack.setItemMeta(meta);
         }
 
-        sign.setColor(DyeColor.getByColor(Color.fromRGB(color)));
+        return itemStack;
     }
 
-    @Override
-    public void setWaxed(Sign sign, boolean isWaxed) {
-        // Base implementation does nothing
-    }
-
-    @Override
-    public int getColor(Sign sign, boolean isFront) {
-        if (isFront) {
-            return sign.getColor().getColor().asRGB();
-        }
-
-        return 0;
-    }
-
-    // -------------------- Registry methods --------------------
-
-    @Override
-    public Object getRegistryKey(Object value) {
-        return value;
-    }
-
-    @Override
-    public Object getRegistryValue(String key, Object tClass) {
-        return null;
-    }
-
-    @Override
-    public boolean isCrafter(InventoryType type) {
-        return false;
-    }
-
-
-    @Override
-    public boolean isBundle(Material material) {
-        return false;
-    }
-
-    @Override
-    public boolean isCopperChest(Material material) {
-        return false;
-    }
-
-    @Override
-    public boolean isShelf(Material material){
-        return false;
-    }
-
-    @Override
-    public Set<Material> copperChestMaterials() {
-        return EMPTY_SET;
-    }
-
-    @Override
-    public Set<Material> shelfMaterials() {
-        return EMPTY_SET;
-    }
 }

src/main/java/net/coreprotect/bukkit/BukkitInterface.java

@@ -2,7 +2,6 @@ package net.coreprotect.bukkit;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -14,478 +13,76 @@ import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.Event;
-import org.bukkit.event.block.BlockExplodeEvent;
 import org.bukkit.event.block.SignChangeEvent;
-import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.MerchantRecipe;
 import org.bukkit.inventory.meta.ItemMeta;
 
-/**
- * Interface for Bukkit API compatibility across different Minecraft versions.
- * Each method provides version-specific implementations to handle differences
- * between Minecraft/Bukkit API versions.
- */
 public interface BukkitInterface {
 
-    // --------------------------------------------------------------------------
-    // Block-related methods
-    // --------------------------------------------------------------------------
+    public ItemStack adjustIngredient(MerchantRecipe recipe, ItemStack itemStack);
 
-    /**
-     * Checks if a block is attached to another block.
-     * 
-     * @param block
-     *            The base block
-     * @param scanBlock
-     *            The block to check for attachment
-     * @param blockData
-     *            The block data
-     * @param scanMin
-     *            The minimum scan value
-     * @return true if the block is attached, false otherwise
-     */
-    boolean isAttached(Block block, Block scanBlock, BlockData blockData, int scanMin);
+    public Material getBucketContents(Material material);
 
-    /**
-     * Gets the minimum height of a world.
-     * 
-     * @param world
-     *            The world
-     * @return The minimum height
-     */
-    int getMinHeight(World world);
+    public Material getFrameType(Entity entity);
 
-    /**
-     * Gets the legacy block ID for a material.
-     * 
-     * @param material
-     *            The material
-     * @return The legacy block ID, or -1 if not applicable
-     */
-    int getLegacyBlockId(Material material);
+    public Material getFrameType(EntityType type);
 
-    /**
-     * Gets the contents of a bucket material.
-     * 
-     * @param material
-     *            The bucket material
-     * @return The material inside the bucket, or AIR if not applicable
-     */
-    Material getBucketContents(Material material);
+    public Class<?> getFrameClass(Material material);
 
-    // --------------------------------------------------------------------------
-    // Material type checking methods
-    // --------------------------------------------------------------------------
+    public String parseLegacyName(String name);
 
-    /**
-     * Checks if a material is an item frame.
-     * 
-     * @param material
-     *            The material to check
-     * @return true if the material is an item frame, false otherwise
-     */
-    boolean isItemFrame(Material material);
+    public boolean getEntityMeta(LivingEntity entity, List<Object> info);
 
-    /**
-     * Checks if a material is invisible.
-     * 
-     * @param material
-     *            The material to check
-     * @return true if the material is invisible, false otherwise
-     */
-    boolean isInvisible(Material material);
+    public boolean setEntityMeta(Entity entity, Object value, int count);
 
-    /**
-     * Checks if a material is a decorated pot.
-     * 
-     * @param material
-     *            The material to check
-     * @return true if the material is a decorated pot, false otherwise
-     */
-    boolean isDecoratedPot(Material material);
+    public boolean getItemMeta(ItemMeta itemMeta, List<Map<String, Object>> list, List<List<Map<String, Object>>> metadata, int slot);
 
-    /**
-     * Checks if a material is a suspicious block.
-     * 
-     * @param material
-     *            The material to check
-     * @return true if the material is a suspicious block, false otherwise
-     */
-    boolean isSuspiciousBlock(Material material);
+    public boolean setItemMeta(Material rowType, ItemStack itemstack, List<Map<String, Object>> map);
 
-    /**
-     * Checks if a material is a sign.
-     * 
-     * @param material
-     *            The material to check
-     * @return true if the material is a sign, false otherwise
-     */
-    boolean isSign(Material material);
+    public boolean isAttached(Block block, Block scanBlock, BlockData blockData, int scanMin);
 
-    /**
-     * Checks if a material is a chiseled bookshelf.
-     * 
-     * @param material
-     *            The material to check
-     * @return true if the material is a chiseled bookshelf, false otherwise
-     */
-    boolean isChiseledBookshelf(Material material);
+    public boolean isWall(BlockData blockData);
 
+    public boolean isItemFrame(Material material);
 
-    /**
-     * Checks if a material is a shelf of any wood kind.
-     * 
-     * @param material
-     *            The material to check
-     * @return true if the material is a shelf, false otherwise
-     */
-    boolean isShelf(Material material);
+    public boolean isGlowing(Sign sign, boolean isFront);
 
+    public boolean isInvisible(Material material);
 
-    /**
-     * Checks if a material is a bookshelf book.
-     * 
-     * @param material
-     *            The material to check
-     * @return true if the material is a bookshelf book, false otherwise
-     */
-    boolean isBookshelfBook(Material material);
+    public boolean isWaxed(Sign sign);
 
+    public int getMinHeight(World world);
 
-    /**
-     * Checks if a material is a bundle.
-     * 
-     * @param material
-     *            The material to check
-     * @return true if the material is a bundle, false otherwise
-     */
-    boolean isBundle(Material material);
+    public int getLegacyBlockId(Material material);
 
+    public void setGlowing(Sign sign, boolean isFront, boolean isGlowing);
 
-    /**
-     * Gets the seeds material for a plant material.
-     * 
-     * @param material
-     *            The plant material
-     * @return The seeds material
-     */
-    Material getPlantSeeds(Material material);
+    public void setColor(Sign sign, boolean isFront, int color);
 
-    // --------------------------------------------------------------------------
-    // Item and inventory methods
-    // --------------------------------------------------------------------------
+    public void setWaxed(Sign sign, boolean isWaxed);
 
-    /**
-     * Adjusts an ingredient in a merchant recipe.
-     * 
-     * @param recipe
-     *            The merchant recipe
-     * @param itemStack
-     *            The item stack
-     * @return The adjusted item stack, or null if not applicable
-     */
-    ItemStack adjustIngredient(MerchantRecipe recipe, ItemStack itemStack);
+    public int getColor(Sign sign, boolean isFront);
 
-    /**
-     * Gets metadata from an item meta.
-     * 
-     * @param itemMeta
-     *            The item meta
-     * @param list
-     *            The list to populate with metadata
-     * @param metadata
-     *            The metadata list to populate
-     * @param slot
-     *            The slot
-     * @return true if metadata was extracted, false otherwise
-     */
-    boolean getItemMeta(ItemMeta itemMeta, List<Map<String, Object>> list, List<List<Map<String, Object>>> metadata, int slot);
+    public Material getPlantSeeds(Material material);
 
-    /**
-     * Sets metadata on an item stack.
-     * 
-     * @param rowType
-     *            The material type
-     * @param itemstack
-     *            The item stack
-     * @param map
-     *            The metadata map
-     * @return true if metadata was set, false otherwise
-     */
-    boolean setItemMeta(Material rowType, ItemStack itemstack, List<Map<String, Object>> map);
+    public boolean isSuspiciousBlock(Material material);
 
-    /**
-     * Gets a book from a chiseled bookshelf.
-     * 
-     * @param blockState
-     *            The block state
-     * @param event
-     *            The player interact event
-     * @return The book item stack, or null if not applicable
-     */
-    ItemStack getChiseledBookshelfBook(BlockState blockState, PlayerInteractEvent event);
+    public boolean isSign(Material material);
 
-    /**
-     * Gets arrow metadata for an item stack.
-     * 
-     * @param arrow
-     *            The arrow entity
-     * @param itemStack
-     *            The item stack
-     * @return The item stack with arrow metadata
-     */
-    ItemStack getArrowMeta(Arrow arrow, ItemStack itemStack);
+    public boolean isChiseledBookshelf(Material material);
 
-    // --------------------------------------------------------------------------
-    // Entity methods
-    // --------------------------------------------------------------------------
+    public boolean isBookshelfBook(Material material);
 
-    /**
-     * Gets metadata from a living entity.
-     * 
-     * @param entity
-     *            The living entity
-     * @param info
-     *            The list to populate with entity metadata
-     * @return true if metadata was extracted, false otherwise
-     */
-    boolean getEntityMeta(LivingEntity entity, List<Object> info);
+    public ItemStack getChiseledBookshelfBook(BlockState blockState, PlayerInteractEvent event);
 
-    /**
-     * Sets metadata on an entity.
-     * 
-     * @param entity
-     *            The entity
-     * @param value
-     *            The metadata value
-     * @param count
-     *            The count
-     * @return true if metadata was set, false otherwise
-     */
-    boolean setEntityMeta(Entity entity, Object value, int count);
+    public String getLine(Sign sign, int line);
 
-    /**
-     * Gets the wolf variant and adds it to the info list.
-     * Only implemented in Minecraft 1.21+.
-     * 
-     * @param wolf
-     *            The wolf entity
-     * @param info
-     *            The list to add the variant information to
-     */
-    void getWolfVariant(org.bukkit.entity.Wolf wolf, List<Object> info);
+    public void setLine(Sign sign, int line, String string);
 
-    /**
-     * Sets the wolf variant from the provided value.
-     * Only implemented in Minecraft 1.21+.
-     * 
-     * @param wolf
-     *            The wolf entity
-     * @param value
-     *            The variant value to set
-     */
-    void setWolfVariant(org.bukkit.entity.Wolf wolf, Object value);
+    public boolean isSignFront(SignChangeEvent event);
 
-    /**
-     * Gets the frame type for an entity.
-     * 
-     * @param entity
-     *            The entity
-     * @return The frame material type
-     */
-    Material getFrameType(Entity entity);
-
-    /**
-     * Gets the frame type for an entity type.
-     * 
-     * @param type
-     *            The entity type
-     * @return The frame material type
-     */
-    Material getFrameType(EntityType type);
-
-    /**
-     * Gets the entity type for a material.
-     * 
-     * @param material
-     *            The material
-     * @return The entity type
-     */
-    EntityType getEntityType(Material material);
-
-    /**
-     * Gets the frame class for a material.
-     * 
-     * @param material
-     *            The material
-     * @return The frame class
-     */
-    Class<?> getFrameClass(Material material);
-
-    // --------------------------------------------------------------------------
-    // Sign methods
-    // --------------------------------------------------------------------------
-
-    /**
-     * Checks if a sign is glowing.
-     * 
-     * @param sign
-     *            The sign
-     * @param isFront
-     *            Whether to check the front side
-     * @return true if the sign is glowing, false otherwise
-     */
-    boolean isGlowing(Sign sign, boolean isFront);
-
-    /**
-     * Checks if a sign is waxed.
-     * 
-     * @param sign
-     *            The sign
-     * @return true if the sign is waxed, false otherwise
-     */
-    boolean isWaxed(Sign sign);
-
-    /**
-     * Sets whether a sign is glowing.
-     * 
-     * @param sign
-     *            The sign
-     * @param isFront
-     *            Whether to set the front side
-     * @param isGlowing
-     *            Whether the sign should be glowing
-     */
-    void setGlowing(Sign sign, boolean isFront, boolean isGlowing);
-
-    /**
-     * Sets the color of a sign.
-     * 
-     * @param sign
-     *            The sign
-     * @param isFront
-     *            Whether to set the front side
-     * @param color
-     *            The color RGB value
-     */
-    void setColor(Sign sign, boolean isFront, int color);
-
-    /**
-     * Sets whether a sign is waxed.
-     * 
-     * @param sign
-     *            The sign
-     * @param isWaxed
-     *            Whether the sign should be waxed
-     */
-    void setWaxed(Sign sign, boolean isWaxed);
-
-    /**
-     * Gets the color of a sign.
-     * 
-     * @param sign
-     *            The sign
-     * @param isFront
-     *            Whether to get the front side color
-     * @return The color RGB value
-     */
-    int getColor(Sign sign, boolean isFront);
-
-    /**
-     * Gets a line of text from a sign.
-     * 
-     * @param sign
-     *            The sign
-     * @param line
-     *            The line number (0-based)
-     * @return The text on the line
-     */
-    String getLine(Sign sign, int line);
-
-    /**
-     * Sets a line of text on a sign.
-     * 
-     * @param sign
-     *            The sign
-     * @param line
-     *            The line number (0-based)
-     * @param string
-     *            The text to set
-     */
-    void setLine(Sign sign, int line, String string);
-
-    /**
-     * Checks if a sign change event is for the front side of the sign.
-     * 
-     * @param event
-     *            The sign change event
-     * @return true if the event is for the front side, false otherwise
-     */
-    boolean isSignFront(SignChangeEvent event);
-
-
-
-    /**
-     * Checks whether an explosion event should be logged or not. (i.e. wind charge explosions)
-     * 
-     * @param event
-     *            The explosion event (Block or Entity ExplodeEvent)
-     * @return true if the explosion should affect blocks
-     */
-    boolean shouldLogExplosion(Event event);
-
-
-    /**
-     * Gets the material of the block that exploded
-     * 
-     * @param event
-     *            The block explosion event
-     * @return the material of the block that caused the explosion
-     */
-    Material getExplodedBlock(BlockExplodeEvent event);
-
-    // --------------------------------------------------------------------------
-    // Registry methods
-    // --------------------------------------------------------------------------
-
-    /**
-     * Gets the registry key for a value.
-     * 
-     * @param value
-     *            The value
-     * @return The registry key
-     */
-    Object getRegistryKey(Object value);
-
-    /**
-     * Gets a registry value by key and class.
-     * 
-     * @param key
-     *            The key
-     * @param tClass
-     *            The class
-     * @return The registry value
-     */
-    Object getRegistryValue(String key, Object tClass);
-
-    /**
-     * Parses a legacy material name.
-     * 
-     * @param name
-     *            The legacy name
-     * @return The parsed name
-     */
-    String parseLegacyName(String name);
-
-    boolean isCrafter(InventoryType type);
-
-    boolean isCopperChest(Material material);
-
-    Set<Material> copperChestMaterials();
-
-    Set<Material> shelfMaterials();
+    public ItemStack getArrowMeta(Arrow arrow, ItemStack itemStack);
 
 }

src/main/java/net/coreprotect/bukkit/Bukkit_v1_16.java

@@ -0,0 +1,118 @@
+package net.coreprotect.bukkit;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Directional;
+import org.bukkit.block.data.FaceAttachable;
+import org.bukkit.block.data.type.Wall;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Piglin;
+import org.bukkit.entity.Zoglin;
+
+import net.coreprotect.model.BlockGroup;
+
+public class Bukkit_v1_16 extends BukkitAdapter implements BukkitInterface {
+
+    public Bukkit_v1_16() {
+        BlockGroup.TRACK_TOP = new HashSet<>(Arrays.asList(Material.TORCH, Material.REDSTONE_TORCH, Material.BAMBOO, Material.BAMBOO_SAPLING, Material.CORNFLOWER, Material.LILY_OF_THE_VALLEY, Material.WITHER_ROSE, Material.SWEET_BERRY_BUSH, Material.SCAFFOLDING, Material.OAK_SAPLING, Material.SPRUCE_SAPLING, Material.BIRCH_SAPLING, Material.JUNGLE_SAPLING, Material.ACACIA_SAPLING, Material.DARK_OAK_SAPLING, Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.FERN, Material.DEAD_BUSH, Material.DANDELION, Material.POPPY, Material.BLUE_ORCHID, Material.ALLIUM, Material.AZURE_BLUET, Material.RED_TULIP, Material.ORANGE_TULIP, Material.WHITE_TULIP, Material.PINK_TULIP, Material.OXEYE_DAISY, Material.BROWN_MUSHROOM, Material.RED_MUSHROOM, Material.REDSTONE_WIRE, Material.WHEAT, Material.ACACIA_SIGN, Material.BIRCH_SIGN, Material.DARK_OAK_SIGN, Material.JUNGLE_SIGN, Material.OAK_SIGN, Material.SPRUCE_SIGN, Material.WHITE_BANNER, Material.ORANGE_BANNER, Material.MAGENTA_BANNER, Material.LIGHT_BLUE_BANNER, Material.YELLOW_BANNER, Material.LIME_BANNER, Material.PINK_BANNER, Material.GRAY_BANNER, Material.LIGHT_GRAY_BANNER, Material.CYAN_BANNER, Material.PURPLE_BANNER, Material.BLUE_BANNER, Material.BROWN_BANNER, Material.GREEN_BANNER, Material.RED_BANNER, Material.BLACK_BANNER, Material.RAIL, Material.IRON_DOOR, Material.SNOW, Material.CACTUS, Material.SUGAR_CANE, Material.REPEATER, Material.PUMPKIN_STEM, Material.MELON_STEM, Material.CARROT, Material.POTATO, Material.COMPARATOR, Material.ACTIVATOR_RAIL, Material.SUNFLOWER, Material.LILAC, Material.TALL_GRASS, Material.LARGE_FERN, Material.ROSE_BUSH, Material.PEONY, Material.NETHER_WART, Material.CHORUS_PLANT, Material.CHORUS_FLOWER, Material.KELP, Material.SOUL_TORCH, Material.TWISTING_VINES, Material.CRIMSON_FUNGUS, Material.WARPED_FUNGUS, Material.CRIMSON_ROOTS, Material.WARPED_ROOTS, Material.NETHER_SPROUTS, Material.CRIMSON_SIGN, Material.WARPED_SIGN));
+        BlockGroup.TRACK_BOTTOM = new HashSet<>(Arrays.asList(Material.WEEPING_VINES));
+        BlockGroup.TRACK_SIDE = new HashSet<>(Arrays.asList(Material.WALL_TORCH, Material.REDSTONE_WALL_TORCH, Material.RAIL, Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.ACTIVATOR_RAIL, Material.WHITE_BED, Material.ORANGE_BED, Material.MAGENTA_BED, Material.LIGHT_BLUE_BED, Material.YELLOW_BED, Material.LIME_BED, Material.PINK_BED, Material.GRAY_BED, Material.LIGHT_GRAY_BED, Material.CYAN_BED, Material.PURPLE_BED, Material.BLUE_BED, Material.BROWN_BED, Material.GREEN_BED, Material.RED_BED, Material.BLACK_BED, Material.LADDER, Material.ACACIA_WALL_SIGN, Material.BIRCH_WALL_SIGN, Material.DARK_OAK_WALL_SIGN, Material.JUNGLE_WALL_SIGN, Material.OAK_WALL_SIGN, Material.SPRUCE_WALL_SIGN, Material.VINE, Material.COCOA, Material.TRIPWIRE_HOOK, Material.WHITE_WALL_BANNER, Material.ORANGE_WALL_BANNER, Material.MAGENTA_WALL_BANNER, Material.LIGHT_BLUE_WALL_BANNER, Material.YELLOW_WALL_BANNER, Material.LIME_WALL_BANNER, Material.PINK_WALL_BANNER, Material.GRAY_WALL_BANNER, Material.LIGHT_GRAY_WALL_BANNER, Material.CYAN_WALL_BANNER, Material.PURPLE_WALL_BANNER, Material.BLUE_WALL_BANNER, Material.BROWN_WALL_BANNER, Material.GREEN_WALL_BANNER, Material.RED_WALL_BANNER, Material.BLACK_WALL_BANNER, Material.SOUL_WALL_TORCH, Material.CRIMSON_WALL_SIGN, Material.WARPED_WALL_SIGN));
+        BlockGroup.DOORS = new HashSet<>(Arrays.asList(Material.OAK_DOOR, Material.SPRUCE_DOOR, Material.BIRCH_DOOR, Material.JUNGLE_DOOR, Material.ACACIA_DOOR, Material.DARK_OAK_DOOR, Material.CRIMSON_DOOR, Material.WARPED_DOOR));
+        BlockGroup.BUTTONS = new HashSet<>(Arrays.asList(Material.STONE_BUTTON, Material.OAK_BUTTON, Material.ACACIA_BUTTON, Material.BIRCH_BUTTON, Material.DARK_OAK_BUTTON, Material.JUNGLE_BUTTON, Material.SPRUCE_BUTTON, Material.POLISHED_BLACKSTONE_BUTTON, Material.CRIMSON_BUTTON, Material.WARPED_BUTTON));
+        BlockGroup.PRESSURE_PLATES = new HashSet<>(Arrays.asList(Material.STONE_PRESSURE_PLATE, Material.ACACIA_PRESSURE_PLATE, Material.BIRCH_PRESSURE_PLATE, Material.DARK_OAK_PRESSURE_PLATE, Material.HEAVY_WEIGHTED_PRESSURE_PLATE, Material.JUNGLE_PRESSURE_PLATE, Material.LIGHT_WEIGHTED_PRESSURE_PLATE, Material.OAK_PRESSURE_PLATE, Material.SPRUCE_PRESSURE_PLATE, Material.CRIMSON_PRESSURE_PLATE, Material.WARPED_PRESSURE_PLATE, Material.POLISHED_BLACKSTONE_PRESSURE_PLATE));
+        BlockGroup.VINES = new HashSet<>(Arrays.asList(Material.VINE, Material.WEEPING_VINES, Material.TWISTING_VINES));
+        BlockGroup.LIGHTABLES = new HashSet<>(Arrays.asList(Material.CAMPFIRE, Material.SOUL_CAMPFIRE));
+        BlockGroup.FIRE = new HashSet<>(Arrays.asList(Material.FIRE, Material.SOUL_FIRE));
+        BlockGroup.LANTERNS = new HashSet<>(Arrays.asList(Material.LANTERN, Material.SOUL_LANTERN));
+        BlockGroup.SOUL_BLOCKS = new HashSet<>(Arrays.asList(Material.SOUL_SAND, Material.SOUL_SOIL));
+        BlockGroup.INTERACT_BLOCKS = new HashSet<>(Arrays.asList(Material.SPRUCE_FENCE_GATE, Material.BIRCH_FENCE_GATE, Material.JUNGLE_FENCE_GATE, Material.DARK_OAK_FENCE_GATE, Material.ACACIA_FENCE_GATE, Material.DISPENSER, Material.NOTE_BLOCK, Material.CHEST, Material.FURNACE, Material.LEVER, Material.REPEATER, Material.ACACIA_TRAPDOOR, Material.BIRCH_TRAPDOOR, Material.DARK_OAK_TRAPDOOR, Material.JUNGLE_TRAPDOOR, Material.SPRUCE_TRAPDOOR, Material.OAK_TRAPDOOR, Material.OAK_FENCE_GATE, Material.BREWING_STAND, Material.ANVIL, Material.CHIPPED_ANVIL, Material.DAMAGED_ANVIL, Material.ENDER_CHEST, Material.TRAPPED_CHEST, Material.COMPARATOR, Material.HOPPER, Material.DROPPER, Material.SHULKER_BOX, Material.BLACK_SHULKER_BOX, Material.BLUE_SHULKER_BOX, Material.BROWN_SHULKER_BOX, Material.CYAN_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX, Material.LIME_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.ORANGE_SHULKER_BOX, Material.PINK_SHULKER_BOX, Material.PURPLE_SHULKER_BOX, Material.RED_SHULKER_BOX, Material.LIGHT_GRAY_SHULKER_BOX, Material.WHITE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX, Material.BARREL, Material.BLAST_FURNACE, Material.GRINDSTONE, Material.LOOM, Material.SMOKER, Material.CRAFTING_TABLE, Material.CARTOGRAPHY_TABLE, Material.ENCHANTING_TABLE, Material.SMITHING_TABLE, Material.STONECUTTER, Material.CRIMSON_FENCE_GATE, Material.WARPED_FENCE_GATE, Material.CRIMSON_TRAPDOOR, Material.WARPED_TRAPDOOR));
+        BlockGroup.SAFE_INTERACT_BLOCKS = new HashSet<>(Arrays.asList(Material.LEVER, Material.ACACIA_TRAPDOOR, Material.BIRCH_TRAPDOOR, Material.DARK_OAK_TRAPDOOR, Material.JUNGLE_TRAPDOOR, Material.SPRUCE_TRAPDOOR, Material.OAK_TRAPDOOR, Material.OAK_FENCE_GATE, Material.SPRUCE_FENCE_GATE, Material.BIRCH_FENCE_GATE, Material.JUNGLE_FENCE_GATE, Material.DARK_OAK_FENCE_GATE, Material.ACACIA_FENCE_GATE, Material.CRIMSON_FENCE_GATE, Material.WARPED_FENCE_GATE, Material.CRIMSON_TRAPDOOR, Material.WARPED_TRAPDOOR));
+        BlockGroup.UPDATE_STATE = new HashSet<>(Arrays.asList(Material.TORCH, Material.WALL_TORCH, Material.REDSTONE_WIRE, Material.RAIL, Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.FURNACE, Material.BLAST_FURNACE, Material.SMOKER, Material.LEVER, Material.REDSTONE_TORCH, Material.REDSTONE_WALL_TORCH, Material.GLOWSTONE, Material.JACK_O_LANTERN, Material.REPEATER, Material.REDSTONE_LAMP, Material.BEACON, Material.COMPARATOR, Material.DAYLIGHT_DETECTOR, Material.REDSTONE_BLOCK, Material.HOPPER, Material.CHEST, Material.TRAPPED_CHEST, Material.ACTIVATOR_RAIL, Material.SOUL_TORCH, Material.SOUL_WALL_TORCH, Material.SHROOMLIGHT, Material.RESPAWN_ANCHOR, Material.CRYING_OBSIDIAN, Material.TARGET));
+        BlockGroup.NON_ATTACHABLE = new HashSet<>(Arrays.asList(Material.AIR, Material.CAVE_AIR, Material.BARRIER, Material.CORNFLOWER, Material.LILY_OF_THE_VALLEY, Material.WITHER_ROSE, Material.SWEET_BERRY_BUSH, Material.OAK_SAPLING, Material.SPRUCE_SAPLING, Material.BIRCH_SAPLING, Material.JUNGLE_SAPLING, Material.ACACIA_SAPLING, Material.DARK_OAK_SAPLING, Material.WATER, Material.LAVA, Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.FERN, Material.DEAD_BUSH, Material.DANDELION, Material.POPPY, Material.BLUE_ORCHID, Material.ALLIUM, Material.AZURE_BLUET, Material.RED_TULIP, Material.ORANGE_TULIP, Material.WHITE_TULIP, Material.PINK_TULIP, Material.OXEYE_DAISY, Material.BROWN_MUSHROOM, Material.RED_MUSHROOM, Material.TORCH, Material.WALL_TORCH, Material.REDSTONE_WIRE, Material.LADDER, Material.RAIL, Material.LEVER, Material.REDSTONE_TORCH, Material.REDSTONE_WALL_TORCH, Material.SNOW, Material.SUGAR_CANE, Material.NETHER_PORTAL, Material.REPEATER, Material.KELP, Material.CHORUS_FLOWER, Material.CHORUS_PLANT, Material.SOUL_TORCH, Material.SOUL_WALL_TORCH));
+    }
+
+    @Override
+    public boolean getEntityMeta(LivingEntity entity, List<Object> info) {
+        if (entity instanceof Piglin) {
+            Piglin piglin = (Piglin) entity;
+            info.add(piglin.isBaby());
+        }
+        else if (entity instanceof Zoglin) {
+            Zoglin zoglin = (Zoglin) entity;
+            info.add(zoglin.isBaby());
+        }
+        else if (super.getEntityMeta(entity, info)) {
+            return true;
+        }
+        else {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean setEntityMeta(Entity entity, Object value, int count) {
+        if (entity instanceof Piglin) {
+            Piglin piglin = (Piglin) entity;
+            if (count == 0) {
+                boolean set = (Boolean) value;
+                piglin.setBaby(set);
+            }
+        }
+        else if (entity instanceof Zoglin) {
+            Zoglin zoglin = (Zoglin) entity;
+            if (count == 0) {
+                boolean set = (Boolean) value;
+                zoglin.setBaby(set);
+            }
+        }
+        else if (super.setEntityMeta(entity, value, count)) {
+            return true;
+        }
+        else {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean isAttached(Block block, Block scanBlock, BlockData blockData, int scanMin) {
+        if (blockData instanceof Directional && blockData instanceof FaceAttachable) {
+            Directional directional = (Directional) blockData;
+            FaceAttachable faceAttachable = (FaceAttachable) blockData;
+
+            boolean scanButton = false;
+            switch (faceAttachable.getAttachedFace()) {
+                case WALL:
+                    scanButton = (scanMin < 5 && scanBlock.getRelative(directional.getFacing().getOppositeFace()).getLocation().equals(block.getLocation()));
+                    break;
+                case FLOOR:
+                    scanButton = (scanMin == 5);
+                    break;
+                case CEILING:
+                    scanButton = (scanMin == 6);
+                    break;
+                default:
+                    break;
+            }
+
+            return scanButton;
+        }
+
+        return true; // unvalidated attachments default to true
+    }
+
+    @Override
+    public boolean isWall(BlockData blockData) {
+        return (blockData instanceof Wall);
+    }
+
+}

src/main/java/net/coreprotect/bukkit/Bukkit_v1_17.java

@@ -25,47 +25,20 @@ import org.bukkit.inventory.meta.BundleMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 
 import net.coreprotect.model.BlockGroup;
-import net.coreprotect.utility.ItemUtils;
-import net.coreprotect.utility.MaterialUtils;
+import net.coreprotect.utility.Util;
 
-/**
- * Bukkit adapter implementation for Minecraft 1.17.
- * Provides version-specific implementations for the BukkitInterface
- * to handle features introduced in the 1.17 update.
- */
-public class Bukkit_v1_17 extends BukkitAdapter {
+public class Bukkit_v1_17 extends Bukkit_v1_16 implements BukkitInterface {
 
-    /**
-     * Initializes the Bukkit_v1_17 adapter with 1.17-specific block groups.
-     * Sets up collections of blocks with similar behavior for efficient handling.
-     */
     public Bukkit_v1_17() {
-        initializeBlockGroups();
-    }
-
-    /**
-     * Initializes all the block groups for Minecraft 1.17.
-     * This includes new blocks like amethyst, candles, pointed dripstone, etc.
-     */
-    private void initializeBlockGroups() {
         BlockGroup.TRACK_ANY = new HashSet<>(Arrays.asList(Material.PISTON_HEAD, Material.LEVER, Material.BELL, Material.SMALL_AMETHYST_BUD, Material.MEDIUM_AMETHYST_BUD, Material.LARGE_AMETHYST_BUD, Material.AMETHYST_CLUSTER, Material.GLOW_LICHEN));
-
         BlockGroup.TRACK_TOP = new HashSet<>(Arrays.asList(Material.TORCH, Material.REDSTONE_TORCH, Material.BAMBOO, Material.BAMBOO_SAPLING, Material.CORNFLOWER, Material.LILY_OF_THE_VALLEY, Material.WITHER_ROSE, Material.SWEET_BERRY_BUSH, Material.SCAFFOLDING, Material.OAK_SAPLING, Material.SPRUCE_SAPLING, Material.BIRCH_SAPLING, Material.JUNGLE_SAPLING, Material.ACACIA_SAPLING, Material.DARK_OAK_SAPLING, Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.FERN, Material.DEAD_BUSH, Material.DANDELION, Material.POPPY, Material.BLUE_ORCHID, Material.ALLIUM, Material.AZURE_BLUET, Material.RED_TULIP, Material.ORANGE_TULIP, Material.WHITE_TULIP, Material.PINK_TULIP, Material.OXEYE_DAISY, Material.BROWN_MUSHROOM, Material.RED_MUSHROOM, Material.REDSTONE_WIRE, Material.WHEAT, Material.ACACIA_SIGN, Material.BIRCH_SIGN, Material.DARK_OAK_SIGN, Material.JUNGLE_SIGN, Material.OAK_SIGN, Material.SPRUCE_SIGN, Material.WHITE_BANNER, Material.ORANGE_BANNER, Material.MAGENTA_BANNER, Material.LIGHT_BLUE_BANNER, Material.YELLOW_BANNER, Material.LIME_BANNER, Material.PINK_BANNER, Material.GRAY_BANNER, Material.LIGHT_GRAY_BANNER, Material.CYAN_BANNER, Material.PURPLE_BANNER, Material.BLUE_BANNER, Material.BROWN_BANNER, Material.GREEN_BANNER, Material.RED_BANNER, Material.BLACK_BANNER, Material.RAIL, Material.IRON_DOOR, Material.SNOW, Material.CACTUS, Material.SUGAR_CANE, Material.REPEATER, Material.PUMPKIN_STEM, Material.MELON_STEM, Material.CARROT, Material.POTATO, Material.COMPARATOR, Material.ACTIVATOR_RAIL, Material.SUNFLOWER, Material.LILAC, Material.TALL_GRASS, Material.LARGE_FERN, Material.ROSE_BUSH, Material.PEONY, Material.NETHER_WART, Material.CHORUS_PLANT, Material.CHORUS_FLOWER, Material.KELP, Material.SOUL_TORCH, Material.TWISTING_VINES, Material.CRIMSON_FUNGUS, Material.WARPED_FUNGUS, Material.CRIMSON_ROOTS, Material.WARPED_ROOTS, Material.NETHER_SPROUTS, Material.CRIMSON_SIGN, Material.WARPED_SIGN, Material.AZALEA, Material.FLOWERING_AZALEA, Material.SMALL_DRIPLEAF, Material.BIG_DRIPLEAF));
-
         BlockGroup.TRACK_TOP_BOTTOM = new HashSet<>(Arrays.asList(Material.POINTED_DRIPSTONE, Material.BIG_DRIPLEAF_STEM));
-
         BlockGroup.TRACK_BOTTOM = new HashSet<>(Arrays.asList(Material.WEEPING_VINES, Material.CAVE_VINES, Material.CAVE_VINES_PLANT, Material.HANGING_ROOTS));
-
         BlockGroup.VINES = new HashSet<>(Arrays.asList(Material.VINE, Material.WEEPING_VINES, Material.TWISTING_VINES, Material.CAVE_VINES));
-
         BlockGroup.CANDLES = new HashSet<>(Arrays.asList(Material.CANDLE, Material.BLACK_CANDLE, Material.BLUE_CANDLE, Material.BROWN_CANDLE, Material.CYAN_CANDLE, Material.GRAY_CANDLE, Material.GREEN_CANDLE, Material.LIGHT_BLUE_CANDLE, Material.LIGHT_GRAY_CANDLE, Material.LIME_CANDLE, Material.MAGENTA_CANDLE, Material.ORANGE_CANDLE, Material.PINK_CANDLE, Material.PURPLE_CANDLE, Material.RED_CANDLE, Material.WHITE_CANDLE, Material.YELLOW_CANDLE, Material.CANDLE_CAKE, Material.BLACK_CANDLE_CAKE, Material.BLUE_CANDLE_CAKE, Material.BROWN_CANDLE_CAKE, Material.CYAN_CANDLE_CAKE, Material.GRAY_CANDLE_CAKE, Material.GREEN_CANDLE_CAKE, Material.LIGHT_BLUE_CANDLE_CAKE, Material.LIGHT_GRAY_CANDLE_CAKE, Material.LIME_CANDLE_CAKE, Material.MAGENTA_CANDLE_CAKE, Material.ORANGE_CANDLE_CAKE, Material.PINK_CANDLE_CAKE, Material.PURPLE_CANDLE_CAKE, Material.RED_CANDLE_CAKE, Material.WHITE_CANDLE_CAKE, Material.YELLOW_CANDLE_CAKE));
-
         BlockGroup.AMETHYST = new HashSet<>(Arrays.asList(Material.SMALL_AMETHYST_BUD, Material.MEDIUM_AMETHYST_BUD, Material.LARGE_AMETHYST_BUD, Material.AMETHYST_CLUSTER));
-
         BlockGroup.UPDATE_STATE = new HashSet<>(Arrays.asList(Material.TORCH, Material.WALL_TORCH, Material.REDSTONE_WIRE, Material.RAIL, Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.FURNACE, Material.BLAST_FURNACE, Material.SMOKER, Material.LEVER, Material.REDSTONE_TORCH, Material.REDSTONE_WALL_TORCH, Material.GLOWSTONE, Material.JACK_O_LANTERN, Material.REPEATER, Material.REDSTONE_LAMP, Material.BEACON, Material.COMPARATOR, Material.DAYLIGHT_DETECTOR, Material.REDSTONE_BLOCK, Material.HOPPER, Material.CHEST, Material.TRAPPED_CHEST, Material.ACTIVATOR_RAIL, Material.SOUL_TORCH, Material.SOUL_WALL_TORCH, Material.SHROOMLIGHT, Material.RESPAWN_ANCHOR, Material.CRYING_OBSIDIAN, Material.TARGET, Material.SMALL_AMETHYST_BUD, Material.MEDIUM_AMETHYST_BUD, Material.LARGE_AMETHYST_BUD, Material.AMETHYST_CLUSTER, Material.CAVE_VINES, Material.CAVE_VINES_PLANT, Material.GLOW_LICHEN, Material.LIGHT, Material.LAVA_CAULDRON));
-
         BlockGroup.NON_ATTACHABLE = new HashSet<>(Arrays.asList(Material.AIR, Material.CAVE_AIR, Material.BARRIER, Material.CORNFLOWER, Material.LILY_OF_THE_VALLEY, Material.WITHER_ROSE, Material.SWEET_BERRY_BUSH, Material.OAK_SAPLING, Material.SPRUCE_SAPLING, Material.BIRCH_SAPLING, Material.JUNGLE_SAPLING, Material.ACACIA_SAPLING, Material.DARK_OAK_SAPLING, Material.WATER, Material.LAVA, Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.FERN, Material.DEAD_BUSH, Material.DANDELION, Material.POPPY, Material.BLUE_ORCHID, Material.ALLIUM, Material.AZURE_BLUET, Material.RED_TULIP, Material.ORANGE_TULIP, Material.WHITE_TULIP, Material.PINK_TULIP, Material.OXEYE_DAISY, Material.BROWN_MUSHROOM, Material.RED_MUSHROOM, Material.TORCH, Material.WALL_TORCH, Material.REDSTONE_WIRE, Material.LADDER, Material.RAIL, Material.LEVER, Material.REDSTONE_TORCH, Material.REDSTONE_WALL_TORCH, Material.SNOW, Material.SUGAR_CANE, Material.NETHER_PORTAL, Material.REPEATER, Material.KELP, Material.CHORUS_FLOWER, Material.CHORUS_PLANT, Material.SOUL_TORCH, Material.SOUL_WALL_TORCH, Material.LIGHT, Material.SMALL_DRIPLEAF, Material.BIG_DRIPLEAF, Material.BIG_DRIPLEAF_STEM, Material.GLOW_LICHEN, Material.HANGING_ROOTS));
-
         BlockGroup.VERTICAL_TOP_BOTTOM = new HashSet<>(Arrays.asList(Material.BIG_DRIPLEAF_STEM));
     }
 
@@ -73,17 +46,20 @@ public class Bukkit_v1_17 extends BukkitAdapter {
     public String parseLegacyName(String name) {
         switch (name) {
             case "GRASS_PATH":
-                return "DIRT_PATH";
+                name = "DIRT_PATH";
+                break;
             default:
-                return name;
+                break;
         }
+
+        return name;
     }
 
     @Override
     public int getLegacyBlockId(Material material) {
         switch (material) {
             case DIRT_PATH:
-                return MaterialUtils.getBlockId("GRASS_PATH", false);
+                return Util.getBlockId("GRASS_PATH", false);
             default:
                 return -1;
         }
@@ -94,15 +70,19 @@ public class Bukkit_v1_17 extends BukkitAdapter {
         if (entity instanceof Axolotl) {
             Axolotl axolotl = (Axolotl) entity;
             info.add(axolotl.getVariant());
-            return true;
         }
         else if (entity instanceof Goat) {
             Goat goat = (Goat) entity;
             info.add(goat.isScreaming());
+        }
+        else if (super.getEntityMeta(entity, info)) {
             return true;
         }
+        else {
+            return false;
+        }
 
-        return super.getEntityMeta(entity, info);
+        return true;
     }
 
     @Override
@@ -110,21 +90,25 @@ public class Bukkit_v1_17 extends BukkitAdapter {
         if (entity instanceof Axolotl) {
             Axolotl axolotl = (Axolotl) entity;
             if (count == 0) {
-                org.bukkit.entity.Axolotl.Variant variant = (org.bukkit.entity.Axolotl.Variant) value;
-                axolotl.setVariant(variant);
-                return true;
+                org.bukkit.entity.Axolotl.Variant set = (org.bukkit.entity.Axolotl.Variant) value;
+                axolotl.setVariant(set);
             }
         }
         else if (entity instanceof Goat) {
             Goat goat = (Goat) entity;
             if (count == 0) {
-                boolean isScreaming = (Boolean) value;
-                goat.setScreaming(isScreaming);
-                return true;
+                boolean set = (Boolean) value;
+                goat.setScreaming(set);
             }
         }
+        else if (super.setEntityMeta(entity, value, count)) {
+            return true;
+        }
+        else {
+            return false;
+        }
 
-        return super.setEntityMeta(entity, value, count);
+        return true;
     }
 
     @Override
@@ -139,40 +123,44 @@ public class Bukkit_v1_17 extends BukkitAdapter {
             if (subMeta.hasItems()) {
                 list = new ArrayList<>();
                 for (ItemStack itemStack : subMeta.getItems()) {
-                    Map<String, Object> itemMap = ItemUtils.serializeItemStack(itemStack, null, slot);
+                    Map<String, Object> itemMap = Util.serializeItemStack(itemStack, null, slot);
                     if (itemMap.size() > 0) {
                         list.add(itemMap);
                     }
                 }
                 metadata.add(list);
             }
+        }
+        else if (super.getItemMeta(itemMeta, list, metadata, slot)) {
             return true;
         }
+        else {
+            return false;
+        }
 
-        return super.getItemMeta(itemMeta, list, metadata, slot);
+        return true;
     }
 
-    @Override
-    public boolean isBundle(Material material) {
-        return material == Material.BUNDLE;
-    }
-
-
     @Override
     public boolean setItemMeta(Material rowType, ItemStack itemstack, List<Map<String, Object>> map) {
-        if (BukkitAdapter.ADAPTER.isBundle(rowType)) {
+        if ((rowType == Material.BUNDLE)) {
             BundleMeta meta = (BundleMeta) itemstack.getItemMeta();
             for (Map<String, Object> itemData : map) {
-                ItemStack itemStack = ItemUtils.unserializeItemStack(itemData);
+                ItemStack itemStack = Util.unserializeItemStack(itemData);
                 if (itemStack != null) {
                     meta.addItem(itemStack);
                 }
             }
             itemstack.setItemMeta(meta);
+        }
+        else if (super.setItemMeta(rowType, itemstack, map)) {
             return true;
         }
+        else {
+            return false;
+        }
 
-        return super.setItemMeta(rowType, itemstack, map);
+        return true;
     }
 
     @Override
@@ -181,10 +169,15 @@ public class Bukkit_v1_17 extends BukkitAdapter {
             PointedDripstone pointedDripstone = (PointedDripstone) blockData;
             BlockFace blockFace = pointedDripstone.getVerticalDirection();
             boolean adjacent = scanBlock.getRelative(blockFace.getOppositeFace()).getLocation().equals(block.getLocation());
-            return adjacent;
+            if (!adjacent) {
+                return false;
+            }
+        }
+        else if (!super.isAttached(block, scanBlock, blockData, scanMin)) {
+            return false;
         }
 
-        return super.isAttached(block, scanBlock, blockData, scanMin);
+        return true;
     }
 
     @Override
@@ -194,7 +187,7 @@ public class Bukkit_v1_17 extends BukkitAdapter {
 
     @Override
     public Material getBucketContents(Material material) {
-        return (material == Material.POWDER_SNOW_BUCKET) ? Material.POWDER_SNOW : Material.AIR;
+        return (material == Material.POWDER_SNOW_BUCKET ? Material.POWDER_SNOW : Material.AIR);
     }
 
     @Override
@@ -246,4 +239,5 @@ public class Bukkit_v1_17 extends BukkitAdapter {
     public boolean isInvisible(Material material) {
         return material.isAir() || material == Material.LIGHT;
     }
+
 }

src/main/java/net/coreprotect/bukkit/Bukkit_v1_18.java

@@ -3,59 +3,28 @@ package net.coreprotect.bukkit;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.MerchantRecipe;
 
-/**
- * Bukkit adapter implementation for Minecraft 1.18.
- * Provides version-specific implementations for the BukkitInterface
- * to handle features introduced in the 1.18 update.
- */
-public class Bukkit_v1_18 extends Bukkit_v1_17 {
+public class Bukkit_v1_18 extends Bukkit_v1_17 implements BukkitInterface {
 
-    /**
-     * Flag to track whether the MerchantRecipe.adjust() method is available.
-     * This is initialized on first use and prevents repeated reflection checks.
-     * - null: Not yet checked
-     * - true: Method exists and should be used
-     * - false: Method doesn't exist or failed, fallback to parent implementation
-     */
-    private Boolean hasAdjustMethod = null;
+    private Boolean hasAdjust = null;
 
-    /**
-     * Adjusts an ingredient in a merchant recipe for version 1.18+.
-     * This handles changes to the MerchantRecipe API introduced in Bukkit 1.18.1.
-     *
-     * @param recipe
-     *            The merchant recipe
-     * @param itemStack
-     *            The item stack to adjust
-     * @return The adjusted item stack, or null if adjustment not supported or fails
-     */
     @Override
     public ItemStack adjustIngredient(MerchantRecipe recipe, ItemStack itemStack) {
-        if (itemStack == null) {
-            return null;
-        }
-
         try {
-            // First-time detection of adjust method availability
-            if (hasAdjustMethod == null) {
-                hasAdjustMethod = true;
-                // Test if the adjust method exists using reflection
+            if (hasAdjust == null) {
+                hasAdjust = true;
                 MerchantRecipe.class.getMethod("adjust", ItemStack.class); // Bukkit 1.18.1+
             }
-            // Skip if we've already determined the method isn't available
-            else if (Boolean.FALSE.equals(hasAdjustMethod)) {
-                return super.adjustIngredient(recipe, itemStack);
+            else if (Boolean.FALSE.equals(hasAdjust)) {
+                return null;
             }
 
-            // Create a clone to avoid modifying the original itemStack
             ItemStack adjustedStack = itemStack.clone();
             recipe.adjust(adjustedStack);
             return adjustedStack;
         }
         catch (Exception e) {
-            // Method doesn't exist or failed, mark it for future calls
-            hasAdjustMethod = false;
-            return super.adjustIngredient(recipe, itemStack);
+            hasAdjust = false;
+            return null;
         }
     }
 

src/main/java/net/coreprotect/bukkit/Bukkit_v1_19.java

@@ -13,228 +13,82 @@ import org.bukkit.entity.Tadpole;
 
 import net.coreprotect.model.BlockGroup;
 
-/**
- * Bukkit adapter implementation for Minecraft 1.19.
- * Provides version-specific implementations for the BukkitInterface
- * to handle features introduced in the 1.19 update, including:
- * - New block types (mangrove)
- * - New entity types (frogs, tadpoles)
- * - Updates to existing entities (goats)
- * - Sculk blocks
- */
-public class Bukkit_v1_19 extends Bukkit_v1_18 {
+public class Bukkit_v1_19 extends Bukkit_v1_18 implements BukkitInterface {
 
-    /**
-     * Initializes the Bukkit_v1_19 adapter with 1.19-specific block groups.
-     * Sets up collections of blocks with similar behavior for efficient handling.
-     */
     public Bukkit_v1_19() {
-        initializeBlockGroups();
-    }
-
-    /**
-     * Initializes all the block groups for Minecraft 1.19.
-     * This organizes blocks into functional categories for efficient lookups and operations.
-     */
-    private void initializeBlockGroups() {
-        // Blocks that need tracking from the top face
-        initializeTrackTopBlocks();
-
-        // Blocks that need tracking from the side
-        initializeTrackSideBlocks();
-
-        // Door blocks
-        initializeDoorBlocks();
-
-        // Button blocks
-        initializeButtonBlocks();
-
-        // Pressure plate blocks
-        initializePressurePlateBlocks();
-
-        // Blocks that can be interacted with
-        initializeInteractBlocks();
-
-        // Blocks that can be safely interacted with (won't cause block updates)
-        initializeSafeInteractBlocks();
-
-        // Blocks that can't have other blocks attached to them
-        initializeNonAttachableBlocks();
-
-        // Sculk blocks (new in 1.19)
-        initializeSculkBlocks();
-    }
-
-    /**
-     * Initializes blocks that need tracking from their top face.
-     */
-    private void initializeTrackTopBlocks() {
         BlockGroup.TRACK_TOP = new HashSet<>(Arrays.asList(Material.TORCH, Material.REDSTONE_TORCH, Material.BAMBOO, Material.BAMBOO_SAPLING, Material.CORNFLOWER, Material.LILY_OF_THE_VALLEY, Material.WITHER_ROSE, Material.SWEET_BERRY_BUSH, Material.SCAFFOLDING, Material.OAK_SAPLING, Material.SPRUCE_SAPLING, Material.BIRCH_SAPLING, Material.JUNGLE_SAPLING, Material.MANGROVE_PROPAGULE, Material.ACACIA_SAPLING, Material.DARK_OAK_SAPLING, Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.FERN, Material.DEAD_BUSH, Material.DANDELION, Material.POPPY, Material.BLUE_ORCHID, Material.ALLIUM, Material.AZURE_BLUET, Material.RED_TULIP, Material.ORANGE_TULIP, Material.WHITE_TULIP, Material.PINK_TULIP, Material.OXEYE_DAISY, Material.BROWN_MUSHROOM, Material.RED_MUSHROOM, Material.REDSTONE_WIRE, Material.WHEAT, Material.MANGROVE_SIGN, Material.ACACIA_SIGN, Material.BIRCH_SIGN, Material.DARK_OAK_SIGN, Material.JUNGLE_SIGN, Material.OAK_SIGN, Material.SPRUCE_SIGN, Material.WHITE_BANNER, Material.ORANGE_BANNER, Material.MAGENTA_BANNER, Material.LIGHT_BLUE_BANNER, Material.YELLOW_BANNER, Material.LIME_BANNER, Material.PINK_BANNER, Material.GRAY_BANNER, Material.LIGHT_GRAY_BANNER, Material.CYAN_BANNER, Material.PURPLE_BANNER, Material.BLUE_BANNER, Material.BROWN_BANNER, Material.GREEN_BANNER, Material.RED_BANNER, Material.BLACK_BANNER, Material.RAIL, Material.IRON_DOOR, Material.SNOW, Material.CACTUS, Material.SUGAR_CANE, Material.REPEATER, Material.PUMPKIN_STEM, Material.MELON_STEM, Material.CARROT, Material.POTATO, Material.COMPARATOR, Material.ACTIVATOR_RAIL, Material.SUNFLOWER, Material.LILAC, Material.TALL_GRASS, Material.LARGE_FERN, Material.ROSE_BUSH, Material.PEONY, Material.NETHER_WART, Material.CHORUS_PLANT, Material.CHORUS_FLOWER, Material.KELP, Material.SOUL_TORCH, Material.TWISTING_VINES, Material.CRIMSON_FUNGUS, Material.WARPED_FUNGUS, Material.CRIMSON_ROOTS, Material.WARPED_ROOTS, Material.NETHER_SPROUTS, Material.CRIMSON_SIGN, Material.WARPED_SIGN, Material.AZALEA, Material.FLOWERING_AZALEA, Material.SMALL_DRIPLEAF, Material.BIG_DRIPLEAF));
-    }
-
-    /**
-     * Initializes blocks that need tracking from their side.
-     */
-    private void initializeTrackSideBlocks() {
         BlockGroup.TRACK_SIDE = new HashSet<>(Arrays.asList(Material.WALL_TORCH, Material.REDSTONE_WALL_TORCH, Material.RAIL, Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.ACTIVATOR_RAIL, Material.WHITE_BED, Material.ORANGE_BED, Material.MAGENTA_BED, Material.LIGHT_BLUE_BED, Material.YELLOW_BED, Material.LIME_BED, Material.PINK_BED, Material.GRAY_BED, Material.LIGHT_GRAY_BED, Material.CYAN_BED, Material.PURPLE_BED, Material.BLUE_BED, Material.BROWN_BED, Material.GREEN_BED, Material.RED_BED, Material.BLACK_BED, Material.LADDER, Material.MANGROVE_WALL_SIGN, Material.ACACIA_WALL_SIGN, Material.BIRCH_WALL_SIGN, Material.DARK_OAK_WALL_SIGN, Material.JUNGLE_WALL_SIGN, Material.OAK_WALL_SIGN, Material.SPRUCE_WALL_SIGN, Material.VINE, Material.COCOA, Material.TRIPWIRE_HOOK, Material.WHITE_WALL_BANNER, Material.ORANGE_WALL_BANNER, Material.MAGENTA_WALL_BANNER, Material.LIGHT_BLUE_WALL_BANNER, Material.YELLOW_WALL_BANNER, Material.LIME_WALL_BANNER, Material.PINK_WALL_BANNER, Material.GRAY_WALL_BANNER, Material.LIGHT_GRAY_WALL_BANNER, Material.CYAN_WALL_BANNER, Material.PURPLE_WALL_BANNER, Material.BLUE_WALL_BANNER, Material.BROWN_WALL_BANNER, Material.GREEN_WALL_BANNER, Material.RED_WALL_BANNER, Material.BLACK_WALL_BANNER, Material.SOUL_WALL_TORCH, Material.CRIMSON_WALL_SIGN, Material.WARPED_WALL_SIGN));
-    }
-
-    /**
-     * Initializes door blocks.
-     */
-    private void initializeDoorBlocks() {
         BlockGroup.DOORS = new HashSet<>(Arrays.asList(Material.OAK_DOOR, Material.SPRUCE_DOOR, Material.BIRCH_DOOR, Material.JUNGLE_DOOR, Material.MANGROVE_DOOR, Material.ACACIA_DOOR, Material.DARK_OAK_DOOR, Material.CRIMSON_DOOR, Material.WARPED_DOOR));
-    }
-
-    /**
-     * Initializes button blocks.
-     */
-    private void initializeButtonBlocks() {
         BlockGroup.BUTTONS = new HashSet<>(Arrays.asList(Material.STONE_BUTTON, Material.OAK_BUTTON, Material.MANGROVE_BUTTON, Material.ACACIA_BUTTON, Material.BIRCH_BUTTON, Material.DARK_OAK_BUTTON, Material.JUNGLE_BUTTON, Material.SPRUCE_BUTTON, Material.POLISHED_BLACKSTONE_BUTTON, Material.CRIMSON_BUTTON, Material.WARPED_BUTTON));
-    }
-
-    /**
-     * Initializes pressure plate blocks.
-     */
-    private void initializePressurePlateBlocks() {
         BlockGroup.PRESSURE_PLATES = new HashSet<>(Arrays.asList(Material.STONE_PRESSURE_PLATE, Material.MANGROVE_PRESSURE_PLATE, Material.ACACIA_PRESSURE_PLATE, Material.BIRCH_PRESSURE_PLATE, Material.DARK_OAK_PRESSURE_PLATE, Material.HEAVY_WEIGHTED_PRESSURE_PLATE, Material.JUNGLE_PRESSURE_PLATE, Material.LIGHT_WEIGHTED_PRESSURE_PLATE, Material.OAK_PRESSURE_PLATE, Material.SPRUCE_PRESSURE_PLATE, Material.CRIMSON_PRESSURE_PLATE, Material.WARPED_PRESSURE_PLATE, Material.POLISHED_BLACKSTONE_PRESSURE_PLATE));
-    }
-
-    /**
-     * Initializes blocks that can be interacted with.
-     */
-    private void initializeInteractBlocks() {
         BlockGroup.INTERACT_BLOCKS = new HashSet<>(Arrays.asList(Material.SPRUCE_FENCE_GATE, Material.BIRCH_FENCE_GATE, Material.JUNGLE_FENCE_GATE, Material.DARK_OAK_FENCE_GATE, Material.MANGROVE_FENCE_GATE, Material.ACACIA_FENCE_GATE, Material.DISPENSER, Material.NOTE_BLOCK, Material.CHEST, Material.FURNACE, Material.LEVER, Material.REPEATER, Material.MANGROVE_TRAPDOOR, Material.ACACIA_TRAPDOOR, Material.BIRCH_TRAPDOOR, Material.DARK_OAK_TRAPDOOR, Material.JUNGLE_TRAPDOOR, Material.SPRUCE_TRAPDOOR, Material.OAK_TRAPDOOR, Material.OAK_FENCE_GATE, Material.BREWING_STAND, Material.ANVIL, Material.CHIPPED_ANVIL, Material.DAMAGED_ANVIL, Material.ENDER_CHEST, Material.TRAPPED_CHEST, Material.COMPARATOR, Material.HOPPER, Material.DROPPER, Material.SHULKER_BOX, Material.BLACK_SHULKER_BOX, Material.BLUE_SHULKER_BOX, Material.BROWN_SHULKER_BOX, Material.CYAN_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX, Material.LIME_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.ORANGE_SHULKER_BOX, Material.PINK_SHULKER_BOX, Material.PURPLE_SHULKER_BOX, Material.RED_SHULKER_BOX, Material.LIGHT_GRAY_SHULKER_BOX, Material.WHITE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX, Material.BARREL, Material.BLAST_FURNACE, Material.GRINDSTONE, Material.LOOM, Material.SMOKER, Material.CRAFTING_TABLE, Material.CARTOGRAPHY_TABLE, Material.ENCHANTING_TABLE, Material.SMITHING_TABLE, Material.STONECUTTER, Material.CRIMSON_FENCE_GATE, Material.WARPED_FENCE_GATE, Material.CRIMSON_TRAPDOOR, Material.WARPED_TRAPDOOR));
-    }
-
-    /**
-     * Initializes blocks that can be safely interacted with.
-     */
-    private void initializeSafeInteractBlocks() {
         BlockGroup.SAFE_INTERACT_BLOCKS = new HashSet<>(Arrays.asList(Material.LEVER, Material.MANGROVE_TRAPDOOR, Material.ACACIA_TRAPDOOR, Material.BIRCH_TRAPDOOR, Material.DARK_OAK_TRAPDOOR, Material.JUNGLE_TRAPDOOR, Material.SPRUCE_TRAPDOOR, Material.OAK_TRAPDOOR, Material.OAK_FENCE_GATE, Material.SPRUCE_FENCE_GATE, Material.BIRCH_FENCE_GATE, Material.JUNGLE_FENCE_GATE, Material.DARK_OAK_FENCE_GATE, Material.MANGROVE_FENCE_GATE, Material.ACACIA_FENCE_GATE, Material.CRIMSON_FENCE_GATE, Material.WARPED_FENCE_GATE, Material.CRIMSON_TRAPDOOR, Material.WARPED_TRAPDOOR));
-    }
-
-    /**
-     * Initializes blocks that can't have other blocks attached to them.
-     */
-    private void initializeNonAttachableBlocks() {
         BlockGroup.NON_ATTACHABLE = new HashSet<>(Arrays.asList(Material.AIR, Material.CAVE_AIR, Material.BARRIER, Material.CORNFLOWER, Material.LILY_OF_THE_VALLEY, Material.WITHER_ROSE, Material.SWEET_BERRY_BUSH, Material.OAK_SAPLING, Material.SPRUCE_SAPLING, Material.BIRCH_SAPLING, Material.JUNGLE_SAPLING, Material.MANGROVE_PROPAGULE, Material.ACACIA_SAPLING, Material.DARK_OAK_SAPLING, Material.WATER, Material.LAVA, Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.FERN, Material.DEAD_BUSH, Material.DANDELION, Material.POPPY, Material.BLUE_ORCHID, Material.ALLIUM, Material.AZURE_BLUET, Material.RED_TULIP, Material.ORANGE_TULIP, Material.WHITE_TULIP, Material.PINK_TULIP, Material.OXEYE_DAISY, Material.BROWN_MUSHROOM, Material.RED_MUSHROOM, Material.TORCH, Material.WALL_TORCH, Material.REDSTONE_WIRE, Material.LADDER, Material.RAIL, Material.LEVER, Material.REDSTONE_TORCH, Material.REDSTONE_WALL_TORCH, Material.SNOW, Material.SUGAR_CANE, Material.NETHER_PORTAL, Material.REPEATER, Material.KELP, Material.CHORUS_FLOWER, Material.CHORUS_PLANT, Material.SOUL_TORCH, Material.SOUL_WALL_TORCH, Material.LIGHT, Material.SMALL_DRIPLEAF, Material.BIG_DRIPLEAF, Material.BIG_DRIPLEAF_STEM, Material.GLOW_LICHEN, Material.HANGING_ROOTS));
-    }
-
-    /**
-     * Initializes sculk blocks (new in 1.19).
-     */
-    private void initializeSculkBlocks() {
         BlockGroup.SCULK = new HashSet<>(Arrays.asList(Material.SCULK, Material.SCULK_VEIN, Material.SCULK_SENSOR, Material.SCULK_SHRIEKER));
     }
 
-    /**
-     * Gets metadata from a living entity specific to 1.19.
-     * Handles Frog, Tadpole, and updated Goat entities.
-     *
-     * @param entity
-     *            The living entity
-     * @param info
-     *            The list to populate with entity metadata
-     * @return true if metadata was extracted, false otherwise
-     */
     @Override
     public boolean getEntityMeta(LivingEntity entity, List<Object> info) {
-        if (entity == null || info == null) {
+        if (entity instanceof Frog) {
+            Frog frog = (Frog) entity;
+            info.add(frog.getVariant());
+        }
+        else if (entity instanceof Tadpole) {
+            Tadpole tadpole = (Tadpole) entity;
+            info.add(tadpole.getAge());
+        }
+        else if (entity instanceof Goat) {
+            Goat goat = (Goat) entity;
+            info.add(goat.isScreaming());
+            info.add(goat.hasLeftHorn());
+            info.add(goat.hasRightHorn());
+        }
+        else if (super.getEntityMeta(entity, info)) {
+            return true;
+        }
+        else {
             return false;
         }
 
-        try {
-            if (entity instanceof Frog) {
-                Frog frog = (Frog) entity;
-                info.add(BukkitAdapter.ADAPTER.getRegistryKey(frog.getVariant()));
-                return true;
-            }
-            else if (entity instanceof Tadpole) {
-                Tadpole tadpole = (Tadpole) entity;
-                info.add(tadpole.getAge());
-                return true;
-            }
-            else if (entity instanceof Goat) {
-                Goat goat = (Goat) entity;
-                info.add(goat.isScreaming());
-                info.add(goat.hasLeftHorn());
-                info.add(goat.hasRightHorn());
-                return true;
-            }
-
-            // Fall back to parent implementation if not a known 1.19 entity
-            return super.getEntityMeta(entity, info);
-        }
-        catch (Exception e) {
-            // Log error or handle exception if needed
-            return false;
-        }
+        return true;
     }
 
-    /**
-     * Sets metadata on an entity specific to 1.19.
-     * Handles Frog, Tadpole, and updated Goat entities.
-     *
-     * @param entity
-     *            The entity
-     * @param value
-     *            The metadata value
-     * @param count
-     *            The index of the metadata property
-     * @return true if metadata was set, false otherwise
-     */
     @Override
     public boolean setEntityMeta(Entity entity, Object value, int count) {
-        if (entity == null || value == null) {
+        if (entity instanceof Frog) {
+            Frog frog = (Frog) entity;
+            if (count == 0) {
+                Frog.Variant set = (Frog.Variant) value;
+                frog.setVariant(set);
+            }
+        }
+        else if (entity instanceof Tadpole) {
+            Tadpole tadpole = (Tadpole) entity;
+            if (count == 0) {
+                int set = (int) value;
+                tadpole.setAge(set);
+            }
+        }
+        else if (entity instanceof Goat) {
+            Goat goat = (Goat) entity;
+            boolean set = (Boolean) value;
+            if (count == 0) {
+                goat.setScreaming(set);
+            }
+            else if (count == 1) {
+                goat.setLeftHorn(set);
+            }
+            else if (count == 2) {
+                goat.setRightHorn(set);
+            }
+        }
+        else if (super.setEntityMeta(entity, value, count)) {
+            return true;
+        }
+        else {
             return false;
         }
 
-        try {
-            if (entity instanceof Frog) {
-                Frog frog = (Frog) entity;
-                if (count == 0) {
-                    // Convert string registry key to variant if needed
-                    if (value instanceof String) {
-                        value = BukkitAdapter.ADAPTER.getRegistryValue((String) value, Frog.Variant.class);
-                    }
-                    frog.setVariant((Frog.Variant) value);
-                    return true;
-                }
-            }
-            else if (entity instanceof Tadpole) {
-                Tadpole tadpole = (Tadpole) entity;
-                if (count == 0) {
-                    tadpole.setAge((int) value);
-                    return true;
-                }
-            }
-            else if (entity instanceof Goat) {
-                Goat goat = (Goat) entity;
-                boolean boolValue = (Boolean) value;
-
-                switch (count) {
-                    case 0:
-                        goat.setScreaming(boolValue);
-                        return true;
-                    case 1:
-                        goat.setLeftHorn(boolValue);
-                        return true;
-                    case 2:
-                        goat.setRightHorn(boolValue);
-                        return true;
-                    default:
-                        // Invalid count for goat
-                        return false;
-                }
-            }
-
-            // Fall back to parent implementation if not a known 1.19 entity
-            return super.setEntityMeta(entity, value, count);
-        }
-        catch (Exception e) {
-            // Log error or handle exception if needed
-            return false;
-        }
+        return true;
     }
 }

src/main/java/net/coreprotect/bukkit/Bukkit_v1_20.java

@@ -2,7 +2,6 @@ package net.coreprotect.bukkit;
 
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Set;
 
 import org.bukkit.Color;
 import org.bukkit.DyeColor;
@@ -13,7 +12,6 @@ import org.bukkit.block.ChiseledBookshelf;
 import org.bukkit.block.Sign;
 import org.bukkit.block.sign.Side;
 import org.bukkit.entity.Arrow;
-import org.bukkit.event.block.BlockExplodeEvent;
 import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
@@ -23,76 +21,67 @@ import org.bukkit.potion.PotionType;
 
 import net.coreprotect.model.BlockGroup;
 
-/**
- * Bukkit adapter implementation for Minecraft 1.20.
- * Provides version-specific implementations for the BukkitInterface
- * to handle features introduced in the 1.20 update, including:
- * - Updated sign handling with front/back sides
- * - New block types (chiseled bookshelf, decorated pot)
- * - Suspicious blocks (sand/gravel)
- * - Arrow potion handling
- */
-public class Bukkit_v1_20 extends Bukkit_v1_19 {
+public class Bukkit_v1_20 extends Bukkit_v1_19 implements BukkitInterface {
 
-    private Boolean hasClickedPosition;
-    private Boolean hasBasePotionType;
+    private Boolean hasClickedPosition = null;
+    private Boolean hasBasePotionType = null;
 
-    /**
-     * Initializes the Bukkit_v1_20 adapter with 1.20-specific block groups and mappings.
-     * Sets up collections of blocks with similar behavior for efficient handling.
-     */
     public Bukkit_v1_20() {
-        initializeBlockGroups();
-        initializeTaggedBlocks();
-    }
-
-    /**
-     * Initializes the block groups specific to Minecraft 1.20.
-     */
-    private void initializeBlockGroups() {
-        BlockGroup.CONTAINERS = new HashSet<>(Arrays.asList(Material.JUKEBOX, Material.DISPENSER, Material.CHEST, Material.FURNACE, Material.BREWING_STAND, Material.TRAPPED_CHEST, Material.HOPPER, Material.DROPPER, Material.ARMOR_STAND, Material.ITEM_FRAME, Material.SHULKER_BOX, Material.BLACK_SHULKER_BOX, Material.BLUE_SHULKER_BOX, Material.BROWN_SHULKER_BOX, Material.CYAN_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX, Material.LIME_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.ORANGE_SHULKER_BOX, Material.PINK_SHULKER_BOX, Material.PURPLE_SHULKER_BOX, Material.RED_SHULKER_BOX, Material.LIGHT_GRAY_SHULKER_BOX, Material.WHITE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX, Material.BARREL, Material.BLAST_FURNACE, Material.SMOKER, Material.LECTERN, Material.CHISELED_BOOKSHELF, Material.DECORATED_POT));
-
+        BlockGroup.CONTAINERS = new HashSet<>(Arrays.asList(Material.JUKEBOX, Material.DISPENSER, Material.CHEST, Material.FURNACE, Material.BREWING_STAND, Material.TRAPPED_CHEST, Material.HOPPER, Material.DROPPER, Material.ARMOR_STAND, Material.ITEM_FRAME, Material.SHULKER_BOX, Material.BLACK_SHULKER_BOX, Material.BLUE_SHULKER_BOX, Material.BROWN_SHULKER_BOX, Material.CYAN_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX, Material.LIME_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.ORANGE_SHULKER_BOX, Material.PINK_SHULKER_BOX, Material.PURPLE_SHULKER_BOX, Material.RED_SHULKER_BOX, Material.LIGHT_GRAY_SHULKER_BOX, Material.WHITE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX, Material.BARREL, Material.BLAST_FURNACE, Material.SMOKER, Material.LECTERN, Material.CHISELED_BOOKSHELF));
         BlockGroup.UPDATE_STATE = new HashSet<>(Arrays.asList(Material.TORCH, Material.WALL_TORCH, Material.REDSTONE_WIRE, Material.RAIL, Material.POWERED_RAIL, Material.DETECTOR_RAIL, Material.FURNACE, Material.BLAST_FURNACE, Material.SMOKER, Material.LEVER, Material.REDSTONE_TORCH, Material.REDSTONE_WALL_TORCH, Material.GLOWSTONE, Material.JACK_O_LANTERN, Material.REPEATER, Material.REDSTONE_LAMP, Material.BEACON, Material.COMPARATOR, Material.DAYLIGHT_DETECTOR, Material.REDSTONE_BLOCK, Material.HOPPER, Material.CHEST, Material.TRAPPED_CHEST, Material.ACTIVATOR_RAIL, Material.SOUL_TORCH, Material.SOUL_WALL_TORCH, Material.SHROOMLIGHT, Material.RESPAWN_ANCHOR, Material.CRYING_OBSIDIAN, Material.TARGET, Material.SMALL_AMETHYST_BUD, Material.MEDIUM_AMETHYST_BUD, Material.LARGE_AMETHYST_BUD, Material.AMETHYST_CLUSTER, Material.CAVE_VINES, Material.CAVE_VINES_PLANT, Material.GLOW_LICHEN, Material.LIGHT, Material.LAVA_CAULDRON, Material.CHISELED_BOOKSHELF));
-    }
 
-    /**
-     * Initializes blocks based on Bukkit Tags for 1.20.
-     */
-    private void initializeTaggedBlocks() {
-        // Clear and update button blocks from tag
         BlockGroup.BUTTONS.clear();
         BlockGroup.BUTTONS.addAll(Tag.BUTTONS.getValues());
-
-        // Clear and update pressure plate blocks from tag
         BlockGroup.PRESSURE_PLATES.clear();
         BlockGroup.PRESSURE_PLATES.addAll(Tag.PRESSURE_PLATES.getValues());
 
-        // Add all doors from tag
-        addMissingTaggedBlocks(Tag.DOORS.getValues(), BlockGroup.DOORS);
-
-        // Add all fence gates to interaction blocks
-        addMissingTaggedBlocks(Tag.FENCE_GATES.getValues(), BlockGroup.INTERACT_BLOCKS);
-        addMissingTaggedBlocks(Tag.FENCE_GATES.getValues(), BlockGroup.SAFE_INTERACT_BLOCKS);
-
-        // Add all wooden trapdoors to interaction blocks
-        addMissingTaggedBlocks(Tag.WOODEN_TRAPDOORS.getValues(), BlockGroup.INTERACT_BLOCKS);
-        addMissingTaggedBlocks(Tag.WOODEN_TRAPDOORS.getValues(), BlockGroup.SAFE_INTERACT_BLOCKS);
-
-        // Add hanging signs to bottom-tracked blocks
-        addMissingTaggedBlocks(Tag.CEILING_HANGING_SIGNS.getValues(), BlockGroup.TRACK_BOTTOM);
-
-        // Add wall signs to side-tracked blocks
-        addMissingTaggedBlocks(Tag.WALL_SIGNS.getValues(), BlockGroup.TRACK_SIDE);
-
-        // Add saplings to top-tracked and non-attachable blocks
-        addMissingTaggedBlocks(Tag.SAPLINGS.getValues(), BlockGroup.TRACK_TOP);
-        addMissingTaggedBlocks(Tag.SAPLINGS.getValues(), BlockGroup.NON_ATTACHABLE);
-
-        // Add flowers to top-tracked and non-attachable blocks
-        addMissingTaggedBlocks(Tag.FLOWERS.getValues(), BlockGroup.TRACK_TOP);
-        addMissingTaggedBlocks(Tag.FLOWERS.getValues(), BlockGroup.NON_ATTACHABLE);
-
-        // Add signs (except wall signs) to top-tracked blocks
+        for (Material value : Tag.DOORS.getValues()) {
+            if (!BlockGroup.DOORS.contains(value)) {
+                BlockGroup.DOORS.add(value);
+            }
+        }
+        for (Material value : Tag.FENCE_GATES.getValues()) {
+            if (!BlockGroup.INTERACT_BLOCKS.contains(value)) {
+                BlockGroup.INTERACT_BLOCKS.add(value);
+            }
+            if (!BlockGroup.SAFE_INTERACT_BLOCKS.contains(value)) {
+                BlockGroup.SAFE_INTERACT_BLOCKS.add(value);
+            }
+        }
+        for (Material value : Tag.WOODEN_TRAPDOORS.getValues()) {
+            if (!BlockGroup.INTERACT_BLOCKS.contains(value)) {
+                BlockGroup.INTERACT_BLOCKS.add(value);
+            }
+            if (!BlockGroup.SAFE_INTERACT_BLOCKS.contains(value)) {
+                BlockGroup.SAFE_INTERACT_BLOCKS.add(value);
+            }
+        }
+        for (Material value : Tag.CEILING_HANGING_SIGNS.getValues()) {
+            if (!BlockGroup.TRACK_BOTTOM.contains(value)) {
+                BlockGroup.TRACK_BOTTOM.add(value);
+            }
+        }
+        for (Material value : Tag.WALL_SIGNS.getValues()) {
+            if (!BlockGroup.TRACK_SIDE.contains(value)) {
+                BlockGroup.TRACK_SIDE.add(value);
+            }
+        }
+        for (Material value : Tag.SAPLINGS.getValues()) {
+            if (!BlockGroup.TRACK_TOP.contains(value)) {
+                BlockGroup.TRACK_TOP.add(value);
+            }
+            if (!BlockGroup.NON_ATTACHABLE.contains(value)) {
+                BlockGroup.NON_ATTACHABLE.add(value);
+            }
+        }
+        for (Material value : Tag.FLOWERS.getValues()) {
+            if (!BlockGroup.TRACK_TOP.contains(value)) {
+                BlockGroup.TRACK_TOP.add(value);
+            }
+            if (!BlockGroup.NON_ATTACHABLE.contains(value)) {
+                BlockGroup.NON_ATTACHABLE.add(value);
+            }
+        }
         for (Material value : Tag.SIGNS.getValues()) {
             if (!Tag.WALL_SIGNS.isTagged(value) && !BlockGroup.TRACK_TOP.contains(value)) {
                 BlockGroup.TRACK_TOP.add(value);
@@ -100,50 +89,45 @@ public class Bukkit_v1_20 extends Bukkit_v1_19 {
         }
     }
 
-    /**
-     * Helper method to add missing blocks from a tag to a block group.
-     * 
-     * @param taggedBlocks
-     *            The collection of blocks from a tag
-     * @param targetGroup
-     *            The block group to add missing blocks to
-     */
-    private void addMissingTaggedBlocks(Iterable<Material> taggedBlocks, Set<Material> targetGroup) {
-        for (Material value : taggedBlocks) {
-            if (!targetGroup.contains(value)) {
-                targetGroup.add(value);
-            }
-        }
-    }
-
     @Override
     public void setGlowing(Sign sign, boolean isFront, boolean isGlowing) {
-        Side side = isFront ? Side.FRONT : Side.BACK;
-        sign.getSide(side).setGlowingText(isGlowing);
+        if (isFront) {
+            sign.getSide(Side.FRONT).setGlowingText(isGlowing);
+        }
+        else {
+            sign.getSide(Side.BACK).setGlowingText(isGlowing);
+        }
     }
 
     @Override
     public String parseLegacyName(String name) {
         switch (name) {
             case "GRASS_PATH":
-                return "DIRT_PATH";
+                name = "DIRT_PATH";
+                break;
             case "GRASS":
-                return "SHORT_GRASS";
-            case "SCUTE":
-                return "TURTLE_SCUTE";
+                name = "SHORT_GRASS";
+                break;
             default:
-                // Fallback until this method is moved up into v1_21
-                if ("SHORT_GRASS".equals(name) && Material.getMaterial(name) == null) {
-                    return "GRASS";
-                }
-                return name;
+                break;
         }
+
+        // fallback until this method is moved up into v1_21
+        if (name.equals("SHORT_GRASS") && Material.getMaterial(name) == null) {
+            name = "GRASS";
+        }
+
+        return name;
     }
 
     @Override
     public void setColor(Sign sign, boolean isFront, int color) {
-        Side side = isFront ? Side.FRONT : Side.BACK;
-        sign.getSide(side).setColor(DyeColor.getByColor(Color.fromRGB(color)));
+        if (isFront) {
+            sign.getSide(Side.FRONT).setColor(DyeColor.getByColor(Color.fromRGB(color)));
+        }
+        else {
+            sign.getSide(Side.BACK).setColor(DyeColor.getByColor(Color.fromRGB(color)));
+        }
     }
 
     @Override
@@ -153,14 +137,22 @@ public class Bukkit_v1_20 extends Bukkit_v1_19 {
 
     @Override
     public int getColor(Sign sign, boolean isFront) {
-        Side side = isFront ? Side.FRONT : Side.BACK;
-        return sign.getSide(side).getColor().getColor().asRGB();
+        if (isFront) {
+            return sign.getSide(Side.FRONT).getColor().getColor().asRGB();
+        }
+        else {
+            return sign.getSide(Side.BACK).getColor().getColor().asRGB();
+        }
     }
 
     @Override
     public boolean isGlowing(Sign sign, boolean isFront) {
-        Side side = isFront ? Side.FRONT : Side.BACK;
-        return sign.getSide(side).isGlowingText();
+        if (isFront) {
+            return sign.getSide(Side.FRONT).isGlowingText();
+        }
+        else {
+            return sign.getSide(Side.BACK).isGlowingText();
+        }
     }
 
     @Override
@@ -172,23 +164,24 @@ public class Bukkit_v1_20 extends Bukkit_v1_19 {
     public Material getPlantSeeds(Material material) {
         switch (material) {
             case WHEAT:
-                return Material.WHEAT_SEEDS;
+                material = Material.WHEAT_SEEDS;
+                break;
             case PUMPKIN_STEM:
-                return Material.PUMPKIN_SEEDS;
+                material = Material.PUMPKIN_SEEDS;
+                break;
             case MELON_STEM:
-                return Material.MELON_SEEDS;
+                material = Material.MELON_SEEDS;
+                break;
             case BEETROOTS:
-                return Material.BEETROOT_SEEDS;
+                material = Material.BEETROOT_SEEDS;
+                break;
             case TORCHFLOWER_CROP:
-                return Material.TORCHFLOWER_SEEDS;
+                material = Material.TORCHFLOWER_SEEDS;
+                break;
             default:
-                return material;
         }
-    }
 
-    @Override
-    public boolean isDecoratedPot(Material material) {
-        return material == Material.DECORATED_POT;
+        return material;
     }
 
     @Override
@@ -216,17 +209,14 @@ public class Bukkit_v1_20 extends Bukkit_v1_19 {
         try {
             if (hasClickedPosition == null) {
                 hasClickedPosition = true;
-                // Check if getClickedPosition method exists (Bukkit 1.20.1+)
-                PlayerInteractEvent.class.getMethod("getClickedPosition");
+                PlayerInteractEvent.class.getMethod("getClickedPosition"); // Bukkit 1.20.1+
             }
             else if (Boolean.FALSE.equals(hasClickedPosition)) {
-                return null; // Method doesn't exist, return null
+                return null;
             }
 
-            ChiseledBookshelf bookshelf = (ChiseledBookshelf) blockState;
-            int slot = bookshelf.getSlot(event.getClickedPosition());
-            ItemStack book = bookshelf.getInventory().getItem(slot);
-
+            ChiseledBookshelf chiseledBookshelf = (ChiseledBookshelf) blockState;
+            ItemStack book = chiseledBookshelf.getInventory().getItem(chiseledBookshelf.getSlot(event.getClickedPosition()));
             return book == null ? new ItemStack(Material.AIR) : book;
         }
         catch (Exception e) {
@@ -247,7 +237,9 @@ public class Bukkit_v1_20 extends Bukkit_v1_19 {
 
     @Override
     public void setLine(Sign sign, int line, String string) {
-        string = string == null ? "" : string;
+        if (string == null) {
+            string = "";
+        }
 
         if (line < 4) {
             sign.getSide(Side.FRONT).setLine(line, string);
@@ -267,27 +259,22 @@ public class Bukkit_v1_20 extends Bukkit_v1_19 {
         try {
             if (hasBasePotionType == null) {
                 hasBasePotionType = true;
-                // Check if getBasePotionType method exists (Bukkit 1.20.2+)
-                Arrow.class.getMethod("getBasePotionType");
+                Arrow.class.getMethod("getBasePotionType"); // Bukkit 1.20.2+
             }
             else if (Boolean.FALSE.equals(hasBasePotionType)) {
                 return super.getArrowMeta(arrow, itemStack);
             }
 
-            // Apply potion effects to the arrow
             PotionType potionType = arrow.getBasePotionType();
             Color color = arrow.getColor();
-
             if (potionType != null || color != null) {
                 itemStack = new ItemStack(Material.TIPPED_ARROW);
                 PotionMeta meta = (PotionMeta) itemStack.getItemMeta();
                 meta.setBasePotionType(potionType);
                 meta.setColor(color);
-
                 for (PotionEffect effect : arrow.getCustomEffects()) {
                     meta.addCustomEffect(effect, false);
                 }
-
                 itemStack.setItemMeta(meta);
             }
 
@@ -299,9 +286,4 @@ public class Bukkit_v1_20 extends Bukkit_v1_19 {
         }
     }
 
-    @Override
-    public Material getExplodedBlock(BlockExplodeEvent event){
-        // accoding to the Bukkit docs this will always return air
-        return event.getExplodedBlockState().getType();
-    }
 }

src/main/java/net/coreprotect/bukkit/Bukkit_v1_21.java

@@ -1,262 +0,0 @@
-package net.coreprotect.bukkit;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ExplosionResult;
-import org.bukkit.Keyed;
-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.Tag;
-import org.bukkit.entity.EntityType;
-import org.bukkit.event.Event;
-import org.bukkit.event.block.BlockExplodeEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.inventory.InventoryType;
-
-
-import net.coreprotect.model.BlockGroup;
-
-/**
- * Bukkit adapter implementation for Minecraft 1.21.
- * Provides version-specific implementations for the BukkitInterface
- * to handle features introduced in the 1.21 update, including:
- * - New block types (crafter)
- * - Registry handling for named objects
- * - Updated interaction blocks
- */
-public class Bukkit_v1_21 extends Bukkit_v1_20 {
-
-    public static Set<Material> COPPER_CHESTS = new HashSet<>(Arrays.asList());
-    public static Set<Material> SHELVES = new HashSet<>(Arrays.asList());
-    public static Set<Material> BUNDLES = new HashSet<>(Arrays.asList());
-
-    /**
-     * Initializes the Bukkit_v1_21 adapter with 1.21-specific block groups and mappings.
-     * Sets up collections of blocks with similar behavior for efficient handling.
-     */
-    public Bukkit_v1_21() {
-        initializeBlockGroups();
-        initializeTrapdoorBlocks();
-        initializeBundles();
-        BlockGroup.INTERACT_BLOCKS.addAll(copperChestMaterials());
-        BlockGroup.CONTAINERS.addAll(copperChestMaterials());
-        BlockGroup.UPDATE_STATE.addAll(copperChestMaterials());
-        BlockGroup.CONTAINERS.addAll(shelfMaterials());
-    }
-
-    /**
-     * Initializes the block groups specific to Minecraft 1.21.
-     * Updates container, interaction, and update state blocks with new 1.21 blocks.
-     */
-    private void initializeBlockGroups() {
-        addToBlockGroupIfMissing(Material.CRAFTER, BlockGroup.CONTAINERS);
-        addToBlockGroupIfMissing(Material.CRAFTER, BlockGroup.INTERACT_BLOCKS);
-        addToBlockGroupIfMissing(Material.CRAFTER, BlockGroup.UPDATE_STATE);
-    }
-
-    /**
-     * Initializes trapdoor blocks for interaction handling.
-     * Excludes iron trapdoors as they cannot be directly interacted with.
-     */
-    private void initializeTrapdoorBlocks() {
-        for (Material value : Tag.TRAPDOORS.getValues()) {
-            // Iron trapdoors are not directly interactable
-            if (value == Material.IRON_TRAPDOOR) {
-                continue;
-            }
-
-            // Add to interaction blocks if not already present
-            addToBlockGroupIfMissing(value, BlockGroup.INTERACT_BLOCKS);
-            addToBlockGroupIfMissing(value, BlockGroup.SAFE_INTERACT_BLOCKS);
-        }
-    }
-
-    /**
-     * Initializes the bundles group to enable the ability to roll back dyed bundles correctly.
-     * It needs to check whether dyed bundles exist because they were added in 1.21.2.
-     */
-    public void initializeBundles(){
-        if (BUNDLES.isEmpty()) {
-            Material bundle = Material.getMaterial("RED_BUNDLE");
-            if (bundle != null) {
-                BUNDLES.addAll(Tag.ITEMS_BUNDLES.getValues());
-            }
-            BUNDLES.add(Material.BUNDLE);
-        }
-    }
-
-    /**
-     * Helper method to add a block to a block group if it's not already present.
-     * 
-     * @param block
-     *            The block to add
-     * @param group
-     *            The group to add the block to
-     */
-    private void addToBlockGroupIfMissing(Material block, Set<Material> group) {
-        if (!group.contains(block)) {
-            group.add(block);
-        }
-    }
-
-    /**
-     * Gets the EntityType corresponding to a Material.
-     * Maps Material to its equivalent EntityType for entity handling.
-     * 
-     * @param material
-     *            The material to convert
-     * @return The corresponding EntityType, or UNKNOWN if not mappable
-     */
-    @Override
-    public EntityType getEntityType(Material material) {
-        switch (material) {
-            case END_CRYSTAL:
-                return EntityType.valueOf("END_CRYSTAL");
-            default:
-                return EntityType.UNKNOWN;
-        }
-    }
-
-    /**
-     * Gets a registry key string from a keyed object.
-     * Used for serializing objects that implement Keyed.
-     * 
-     * @param value
-     *            The keyed object
-     * @return The string representation of the registry key
-     */
-    @Override
-    public Object getRegistryKey(Object value) {
-        return ((Keyed) value).getKey().toString();
-    }
-
-
-    /**
-     * Gets a registry value from a key string and class.
-     * Used for deserializing registry objects.
-     * 
-     * @param key
-     *            The registry key as a string
-     * @param tClass
-     *            The class of the registry
-     * @return The registry value
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Override
-    public Object getRegistryValue(String key, Object tClass) {
-        NamespacedKey namespacedKey = NamespacedKey.fromString(key);
-        // return RegistryAccess.registryAccess().getRegistry(RegistryKey.CAT_VARIANT).get((NamespacedKey)value);
-        return Bukkit.getRegistry((Class) tClass).get(namespacedKey);
-    }
-
-    /**
-     * Gets the wolf variant and adds it to the info list.
-     * This functionality is specific to Minecraft 1.21+.
-     * 
-     * @param wolf
-     *            The wolf entity
-     * @param info
-     *            The list to add the variant information to
-     */
-    @Override
-    public void getWolfVariant(org.bukkit.entity.Wolf wolf, List<Object> info) {
-        // Add the variant to the info list
-        info.add(getRegistryKey(wolf.getVariant()));
-    }
-
-    /**
-     * Sets the wolf variant from the provided value.
-     * This functionality is specific to Minecraft 1.21+.
-     * 
-     * @param wolf
-     *            The wolf entity
-     * @param value
-     *            The variant value to set
-     */
-    @Override
-    public void setWolfVariant(org.bukkit.entity.Wolf wolf, Object value) {
-        if (value instanceof String) {
-            value = getRegistryValue((String) value, org.bukkit.entity.Wolf.Variant.class);
-        }
-        org.bukkit.entity.Wolf.Variant variant = (org.bukkit.entity.Wolf.Variant) value;
-        wolf.setVariant(variant);
-
-    }
-
-    @Override
-    public boolean isCrafter(InventoryType type) {
-        return type == InventoryType.CRAFTER;
-    }
-
-    @Override
-    public boolean isCopperChest(Material material) {
-        if (COPPER_CHESTS.contains(material) && material != Material.CHEST) {
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isShelf(Material material) {
-        return SHELVES.contains(material);
-    }
-
-    @Override
-    public boolean isBundle(Material material) {
-        return Tag.ITEMS_BUNDLES.getValues().contains(material);
-    }
-
-
-    @Override
-    public Set<Material> copperChestMaterials() {
-        if (COPPER_CHESTS.isEmpty()) {
-            Material copperChest = Material.getMaterial("COPPER_CHEST");
-            if (copperChest == null) {
-                COPPER_CHESTS.add(Material.CHEST);
-            }
-            else {
-                COPPER_CHESTS.add(Material.getMaterial("COPPER_CHEST"));
-                COPPER_CHESTS.add(Material.getMaterial("EXPOSED_COPPER_CHEST"));
-                COPPER_CHESTS.add(Material.getMaterial("WEATHERED_COPPER_CHEST"));
-                COPPER_CHESTS.add(Material.getMaterial("OXIDIZED_COPPER_CHEST"));
-                COPPER_CHESTS.add(Material.getMaterial("WAXED_COPPER_CHEST"));
-                COPPER_CHESTS.add(Material.getMaterial("WAXED_EXPOSED_COPPER_CHEST"));
-                COPPER_CHESTS.add(Material.getMaterial("WAXED_WEATHERED_COPPER_CHEST"));
-                COPPER_CHESTS.add(Material.getMaterial("WAXED_OXIDIZED_COPPER_CHEST"));
-            }
-        }
-
-        return COPPER_CHESTS;
-    }
-
-    @Override
-    public Set<Material> shelfMaterials() {
-        if (SHELVES.isEmpty()) {
-            Material shelf = Material.getMaterial("OAK_SHELF");
-            if (shelf != null) {
-                SHELVES.addAll(Tag.WOODEN_SHELVES.getValues());
-            }
-        }
-
-        return SHELVES;
-    }
-
-    @Override
-    public boolean shouldLogExplosion(Event event){
-        ExplosionResult result = null;
-
-        if (event instanceof EntityExplodeEvent){
-            result = ((EntityExplodeEvent)event).getExplosionResult();
-        } else if (event instanceof BlockExplodeEvent){
-            result = ((BlockExplodeEvent)event).getExplosionResult();
-        }
-        return !(result == ExplosionResult.KEEP ||
-                 result == ExplosionResult.TRIGGER_BLOCK
-        );
-    }
-}

src/main/java/net/coreprotect/command/CommandParser.java

@@ -1,329 +0,0 @@
-package net.coreprotect.command;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.command.CommandSender;
-
-import net.coreprotect.command.parser.ActionParser;
-import net.coreprotect.command.parser.LocationParser;
-import net.coreprotect.command.parser.MaterialParser;
-import net.coreprotect.command.parser.TimeParser;
-import net.coreprotect.command.parser.UserParser;
-import net.coreprotect.command.parser.WorldParser;
-
-/**
- * Main parser class for CoreProtect commands.
- * Delegates to specialized parser classes for specific functionality.
- */
-public class CommandParser {
-
-    /**
-     * Parse page number from command arguments
-     * 
-     * @param argumentArray
-     *            The command arguments
-     * @return The modified argument array
-     */
-    protected static String[] parsePage(String[] argumentArray) {
-        return ActionParser.parsePage(argumentArray);
-    }
-
-    /**
-     * Parse action type from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return A list of action type integers
-     */
-    protected static List<Integer> parseAction(String[] inputArguments) {
-        return ActionParser.parseAction(inputArguments);
-    }
-
-    /**
-     * Parse coordinates from command arguments
-     * 
-     * @param location
-     *            The base location
-     * @param inputArguments
-     *            The command arguments
-     * @param worldId
-     *            The world ID
-     * @return The parsed location
-     */
-    protected static Location parseCoordinates(Location location, String[] inputArguments, int worldId) {
-        return LocationParser.parseCoordinates(location, inputArguments, worldId);
-    }
-
-    /**
-     * Parse count flag from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return true if the count flag is present
-     */
-    protected static boolean parseCount(String[] inputArguments) {
-        return ActionParser.parseCount(inputArguments);
-    }
-
-    /**
-     * Parse excluded materials and entities from command arguments
-     * 
-     * @param player
-     *            The command sender
-     * @param inputArguments
-     *            The command arguments
-     * @param argAction
-     *            The list of actions to include
-     * @return A map of excluded materials and entities
-     */
-    protected static Map<Object, Boolean> parseExcluded(CommandSender player, String[] inputArguments, List<Integer> argAction) {
-        return MaterialParser.parseExcluded(player, inputArguments, argAction);
-    }
-
-    /**
-     * Parse excluded users from command arguments
-     * 
-     * @param player
-     *            The command sender
-     * @param inputArguments
-     *            The command arguments
-     * @return A list of excluded users
-     */
-    protected static List<String> parseExcludedUsers(CommandSender player, String[] inputArguments) {
-        return UserParser.parseExcludedUsers(player, inputArguments);
-    }
-
-    /**
-     * Parse force global flag from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return true if global search should be forced
-     */
-    protected static boolean parseForceGlobal(String[] inputArguments) {
-        return WorldParser.parseForceGlobal(inputArguments);
-    }
-
-    /**
-     * Parse location from command sender and command arguments
-     * 
-     * @param user
-     *            The command sender
-     * @param argumentArray
-     *            The command arguments
-     * @return The parsed location
-     */
-    protected static Location parseLocation(CommandSender user, String[] argumentArray) {
-        return LocationParser.parseLocation(user, argumentArray);
-    }
-
-    /**
-     * Parse noisy/verbose flag from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return 1 if noisy/verbose mode is enabled, 0 otherwise
-     */
-    protected static int parseNoisy(String[] inputArguments) {
-        return ActionParser.parseNoisy(inputArguments);
-    }
-
-    /**
-     * Parse preview flag from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return 1 for preview, 2 for preview cancel, 0 otherwise
-     */
-    protected static int parsePreview(String[] inputArguments) {
-        return ActionParser.parsePreview(inputArguments);
-    }
-
-    /**
-     * Parse radius from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @param user
-     *            The command sender
-     * @param location
-     *            The base location
-     * @return The parsed radius
-     */
-    protected static Integer[] parseRadius(String[] inputArguments, CommandSender user, Location location) {
-        Integer[] result = LocationParser.parseRadius(inputArguments, user, location);
-
-        // Handle WorldEdit case which LocationParser returned as null
-        if (result == null && WorldParser.parseWorldEdit(inputArguments)) {
-            if (user.getServer().getPluginManager().getPlugin("WorldEdit") != null) {
-                Integer[] worldEditResult = WorldEditHandler.runWorldEditCommand(user);
-                if (worldEditResult != null) {
-                    result = worldEditResult;
-                }
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Parse restricted materials and entities from command arguments
-     * 
-     * @param player
-     *            The command sender
-     * @param inputArguments
-     *            The command arguments
-     * @param argAction
-     *            The list of actions to include
-     * @return A list of restricted materials and entities
-     */
-    protected static List<Object> parseRestricted(CommandSender player, String[] inputArguments, List<Integer> argAction) {
-        return MaterialParser.parseRestricted(player, inputArguments, argAction);
-    }
-
-    /**
-     * Parse time from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return An array of two longs - [time1, time2]
-     */
-    protected static long[] parseTime(String[] inputArguments) {
-        return TimeParser.parseTime(inputArguments);
-    }
-
-    /**
-     * Parse time string from command arguments for display
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return A formatted time string
-     */
-    protected static String parseTimeString(String[] inputArguments) {
-        return TimeParser.parseTimeString(inputArguments);
-    }
-
-    /**
-     * Parse rows from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return The number of rows
-     */
-    protected static int parseRows(String[] inputArguments) {
-        return TimeParser.parseRows(inputArguments);
-    }
-
-    /**
-     * Parse world from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @param processWorldEdit
-     *            Whether to process WorldEdit arguments
-     * @param requireLoaded
-     *            Whether the world must be loaded
-     * @return The world ID
-     */
-    protected static int parseWorld(String[] inputArguments, boolean processWorldEdit, boolean requireLoaded) {
-        return WorldParser.parseWorld(inputArguments, processWorldEdit, requireLoaded);
-    }
-
-    /**
-     * Parse whether to use WorldEdit for radius
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return true if WorldEdit should be used
-     */
-    protected static boolean parseWorldEdit(String[] inputArguments) {
-        return WorldParser.parseWorldEdit(inputArguments);
-    }
-
-    /**
-     * Parse world name from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @param processWorldEdit
-     *            Whether to process WorldEdit arguments
-     * @return The world name
-     */
-    protected static String parseWorldName(String[] inputArguments, boolean processWorldEdit) {
-        return WorldParser.parseWorldName(inputArguments, processWorldEdit);
-    }
-
-    /**
-     * Get a map of block tags and their associated materials
-     * 
-     * @return A map of block tags and their associated materials
-     */
-    protected static Map<String, Set<Material>> getTags() {
-        return MaterialParser.getTags();
-    }
-
-    /**
-     * Check if an argument matches a block tag
-     * 
-     * @param argument
-     *            The argument to check
-     * @return true if the argument matches a block tag
-     */
-    protected static boolean checkTags(String argument) {
-        return MaterialParser.checkTags(argument);
-    }
-
-    /**
-     * Check if an argument matches a block tag and add the associated materials to the list
-     * 
-     * @param argument
-     *            The argument to check
-     * @param list
-     *            The list to add the associated materials to
-     * @return true if the argument matches a block tag
-     */
-    protected static boolean checkTags(String argument, Map<Object, Boolean> list) {
-        return MaterialParser.checkTags(argument, list);
-    }
-
-    /**
-     * Check if an argument matches a block tag and add the associated materials to the list
-     * 
-     * @param argument
-     *            The argument to check
-     * @param list
-     *            The list to add the associated materials to
-     * @return true if the argument matches a block tag
-     */
-    protected static boolean checkTags(String argument, List<Object> list) {
-        return MaterialParser.checkTags(argument, list);
-    }
-
-    /**
-     * Parse users from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return A list of parsed users
-     */
-    protected static List<String> parseUsers(String[] inputArguments) {
-        return UserParser.parseUsers(inputArguments);
-    }
-
-    /**
-     * Helper method for formatting BigDecimal values
-     * 
-     * @param input
-     *            The BigDecimal value to format
-     * @return The formatted string
-     */
-    private static String timeString(BigDecimal input) {
-        return input.stripTrailingZeros().toPlainString();
-    }
-
-}

src/main/java/net/coreprotect/command/LookupCommand.java

@@ -1,5 +1,10 @@
 package net.coreprotect.command;
 
+import java.nio.charset.StandardCharsets;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.text.NumberFormat;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -15,40 +20,50 @@ import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
-import net.coreprotect.command.lookup.BlockLookupThread;
-import net.coreprotect.command.lookup.ChestTransactionLookupThread;
-import net.coreprotect.command.lookup.StandardLookupThread;
+import com.google.common.base.Strings;
+
 import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;
+import net.coreprotect.database.Database;
+import net.coreprotect.database.Lookup;
+import net.coreprotect.database.logger.ItemLogger;
+import net.coreprotect.database.lookup.BlockLookup;
+import net.coreprotect.database.lookup.ChestTransactionLookup;
+import net.coreprotect.database.lookup.InteractionLookup;
+import net.coreprotect.database.lookup.PlayerLookup;
+import net.coreprotect.database.lookup.SignMessageLookup;
+import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.language.Phrase;
 import net.coreprotect.language.Selector;
+import net.coreprotect.listener.channel.PluginChannelHandshakeListener;
+import net.coreprotect.listener.channel.PluginChannelListener;
 import net.coreprotect.utility.Chat;
 import net.coreprotect.utility.ChatMessage;
 import net.coreprotect.utility.Color;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class LookupCommand {
-    public static void runCommand(CommandSender player, Command command, boolean permission, String[] args) {
+    protected static void runCommand(CommandSender player, Command command, boolean permission, String[] args) {
         int resultc = args.length;
-        args = CommandParser.parsePage(args);
-        Location lo = CommandParser.parseLocation(player, args);
+        args = CommandHandler.parsePage(args);
+        Location lo = CommandHandler.parseLocation(player, args);
         // List<String> arg_uuids = new ArrayList<String>();
-        List<String> argUsers = CommandParser.parseUsers(args);
-        Integer[] argRadius = CommandParser.parseRadius(args, player, lo);
-        int argNoisy = CommandParser.parseNoisy(args);
-        List<Integer> argAction = CommandParser.parseAction(args);
-        List<Object> argBlocks = CommandParser.parseRestricted(player, args, argAction);
-        Map<Object, Boolean> argExclude = CommandParser.parseExcluded(player, args, argAction);
-        List<String> argExcludeUsers = CommandParser.parseExcludedUsers(player, args);
-        String ts = CommandParser.parseTimeString(args);
-        long[] argTime = CommandParser.parseTime(args);
+        List<String> argUsers = CommandHandler.parseUsers(args);
+        Integer[] argRadius = CommandHandler.parseRadius(args, player, lo);
+        int argNoisy = CommandHandler.parseNoisy(args);
+        List<Integer> argAction = CommandHandler.parseAction(args);
+        List<Object> argBlocks = CommandHandler.parseRestricted(player, args, argAction);
+        Map<Object, Boolean> argExclude = CommandHandler.parseExcluded(player, args, argAction);
+        List<String> argExcludeUsers = CommandHandler.parseExcludedUsers(player, args);
+        String ts = CommandHandler.parseTimeString(args);
+        long[] argTime = CommandHandler.parseTime(args);
         long startTime = argTime[0];
         long endTime = argTime[1];
-        int argWid = CommandParser.parseWorld(args, true, true);
-        int parseRows = CommandParser.parseRows(args);
-        boolean count = CommandParser.parseCount(args);
-        boolean worldedit = CommandParser.parseWorldEdit(args);
-        boolean forceglobal = CommandParser.parseForceGlobal(args);
+        int argWid = CommandHandler.parseWorld(args, true, true);
+        int parseRows = CommandHandler.parseRows(args);
+        boolean count = CommandHandler.parseCount(args);
+        boolean worldedit = CommandHandler.parseWorldEdit(args);
+        boolean forceglobal = CommandHandler.parseForceGlobal(args);
         boolean pageLookup = false;
 
         if (argBlocks == null || argExclude == null || argExcludeUsers == null) {
@@ -105,7 +120,7 @@ public class LookupCommand {
         }
 
         if (argWid == -1) {
-            String worldName = CommandParser.parseWorldName(args, true);
+            String worldName = CommandHandler.parseWorldName(args, true);
             Chat.sendMessage(player, new ChatMessage(Phrase.build(Phrase.WORLD_NOT_FOUND, worldName)).build());
             return;
         }
@@ -326,13 +341,40 @@ public class LookupCommand {
             String bc = x + "." + y + "." + z + "." + wid + "." + x2 + "." + y2 + "." + z2 + "." + re;
             ConfigHandler.lookupCommand.put(player.getName(), bc);
 
-            String world = WorldUtils.getWorldName(wid);
+            String world = Util.getWorldName(wid);
             double dx = 0.5 * (x + x2);
             double dy = 0.5 * (y + y2);
             double dz = 0.5 * (z + z2);
             final Location location = new Location(Bukkit.getServer().getWorld(world), dx, dy, dz);
+            final CommandSender player2 = player;
+            final int p2 = p;
+            final int finalLimit = re;
 
-            Runnable runnable = new ChestTransactionLookupThread(player, command, location, p, re);
+            class BasicThread implements Runnable {
+                @Override
+                public void run() {
+                    try (Connection connection = Database.getConnection(true)) {
+                        ConfigHandler.lookupThrottle.put(player2.getName(), new Object[] { true, System.currentTimeMillis() });
+                        if (connection != null) {
+                            Statement statement = connection.createStatement();
+                            List<String> blockData = ChestTransactionLookup.performLookup(command.getName(), statement, location, player2, p2, finalLimit, false);
+                            for (String data : blockData) {
+                                Chat.sendComponent(player2, data);
+                            }
+                            statement.close();
+                        }
+                        else {
+                            Chat.sendMessage(player2, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
+                        }
+                    }
+                    catch (Exception e) {
+                        e.printStackTrace();
+                    }
+
+                    ConfigHandler.lookupThrottle.put(player2.getName(), new Object[] { false, System.currentTimeMillis() });
+                }
+            }
+            Runnable runnable = new BasicThread();
             Thread thread = new Thread(runnable);
             thread.start();
         }
@@ -392,11 +434,67 @@ public class LookupCommand {
             String bc = x + "." + y + "." + z + "." + wid + "." + lookupType + "." + re;
             ConfigHandler.lookupCommand.put(player.getName(), bc);
 
-            String world = WorldUtils.getWorldName(wid);
-            final Block block = Bukkit.getServer().getWorld(world).getBlockAt(x, y, z);
-            final BlockState blockState = block.getState();
+            String world = Util.getWorldName(wid);
+            final Block fblock = Bukkit.getServer().getWorld(world).getBlockAt(x, y, z);// .getLocation();
+            final BlockState fblockstate = fblock.getState();
+            final CommandSender player2 = player;
+            final int p2 = page;
+            final int finalLimit = re;
+            final int t = type;
+            class BasicThread implements Runnable {
+                @Override
+                public void run() {
+                    try (Connection connection = Database.getConnection(true)) {
+                        ConfigHandler.lookupThrottle.put(player2.getName(), new Object[] { true, System.currentTimeMillis() });
+                        if (connection != null) {
+                            Statement statement = connection.createStatement();
+                            if (t == 8) {
+                                List<String> signData = SignMessageLookup.performLookup(command.getName(), statement, fblockstate.getLocation(), player2, p2, finalLimit);
+                                for (String signMessage : signData) {
+                                    String bypass = null;
 
-            Runnable runnable = new BlockLookupThread(player, command, block, blockState, page, re, type);
+                                    if (signMessage.contains("\n")) {
+                                        String[] split = signMessage.split("\n");
+                                        signMessage = split[0];
+                                        bypass = split[1];
+                                    }
+
+                                    if (signMessage.length() > 0) {
+                                        Chat.sendComponent(player2, signMessage, bypass);
+                                    }
+                                }
+                            }
+                            else {
+                                String blockdata = null;
+                                if (t == 7) {
+                                    blockdata = InteractionLookup.performLookup(command.getName(), statement, fblock, player2, 0, p2, finalLimit);
+                                }
+                                else {
+                                    blockdata = BlockLookup.performLookup(command.getName(), statement, fblockstate, player2, 0, p2, finalLimit);
+                                }
+                                if (blockdata.contains("\n")) {
+                                    for (String b : blockdata.split("\n")) {
+                                        Chat.sendComponent(player2, b);
+                                    }
+                                }
+                                else if (blockdata.length() > 0) {
+                                    Chat.sendComponent(player2, blockdata);
+                                }
+                            }
+                            statement.close();
+                        }
+                        else {
+                            Chat.sendMessage(player2, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
+                        }
+                    }
+                    catch (Exception e) {
+                        e.printStackTrace();
+                    }
+
+                    ConfigHandler.lookupThrottle.put(player2.getName(), new Object[] { false, System.currentTimeMillis() });
+                }
+            }
+            Runnable runnable = new BasicThread();
             Thread thread = new Thread(runnable);
             thread.start();
         }
@@ -470,12 +568,10 @@ public class LookupCommand {
                 List<String> rollbackusers = argUsers;
                 int c = 0;
                 for (String ruser : rollbackusers) {
-                    if (Bukkit.getServer() != null) {
-                        List<Player> players = Bukkit.getServer().matchPlayer(ruser);
-                        for (Player p : players) {
-                            if (p.getName().equalsIgnoreCase(ruser)) {
-                                rollbackusers.set(c, p.getName());
-                            }
+                    List<Player> players = Bukkit.getServer().matchPlayer(ruser);
+                    for (Player p : players) {
+                        if (p.getName().equalsIgnoreCase(ruser)) {
+                            rollbackusers.set(c, p.getName());
                         }
                     }
                     c++;
@@ -526,9 +622,7 @@ public class LookupCommand {
                     if (lo != null) {
                         x = lo.getBlockX();
                         z = lo.getBlockZ();
-                        if (lo.getWorld() != null) {
-                            wid = WorldUtils.getWorldId(lo.getWorld().getName());
-                        }
+                        wid = Util.getWorldId(lo.getWorld().getName());
                     }
 
                     if (rollbackusers.size() == 1 && rollbackusers.contains("#global") && argAction.contains(9)) {
@@ -577,25 +671,431 @@ public class LookupCommand {
                     }
                 }
 
+                final List<String> rollbackusers2 = rollbackusers;
+                long unixtimestamp = (System.currentTimeMillis() / 1000L);
+                if (timeStart == -1) {
+                    if (startTime <= 0) {
+                        timeStart = 0;
+                    }
+                    else {
+                        timeStart = unixtimestamp - startTime;
+                    }
+                    if (endTime <= 0) {
+                        timeEnd = 0;
+                    }
+                    else {
+                        timeEnd = unixtimestamp - endTime;
+                    }
+                }
+
+                final long finalTimeStart = timeStart;
+                final long finalTimeEnd = timeEnd;
+                final Integer[] radius = argRadius;
+
                 try {
                     Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Color.ITALIC + Phrase.build(Phrase.LOOKUP_SEARCHING));
+                    final CommandSender player2 = player;
+                    final int finalX = x;
+                    final int finalY = y;
+                    final int finalZ = z;
+                    final int finalWid = wid;
+                    final int finalArgWid = argWid;
+                    final int noisy = argNoisy;
+                    final String rtime = ts;
+                    final int excluded = argExcluded;
+                    final int restricted = argRestricted;
+                    // final List<String> uuid_list = arg_uuids;
+                    final List<Object> blist = argBlocks;
+                    final Map<Object, Boolean> elist = argExclude;
+                    final List<String> euserlist = argExcludeUsers;
+                    final int page = pa;
+                    final int displayResults = re;
+                    final int typeLookup = type;
+                    final Location finalLocation = lo;
+                    final List<Integer> finalArgAction = argAction;
+                    final boolean finalCount = count;
 
-                    if (timeStart == -1) {
-                        if (startTime <= 0) {
-                            timeStart = 0;
-                        }
-                        else {
-                            timeStart = (System.currentTimeMillis() / 1000L) - startTime;
-                        }
-                        if (endTime <= 0) {
-                            timeEnd = 0;
-                        }
-                        else {
-                            timeEnd = (System.currentTimeMillis() / 1000L) - endTime;
+                    class BasicThread2 implements Runnable {
+                        @Override
+                        public void run() {
+                            try (Connection connection = Database.getConnection(true)) {
+                                ConfigHandler.lookupThrottle.put(player2.getName(), new Object[] { true, System.currentTimeMillis() });
+
+                                List<String> uuidList = new ArrayList<>();
+                                Location location = finalLocation;
+                                boolean exists = false;
+                                String bc = finalX + "." + finalY + "." + finalZ + "." + finalWid + "." + finalTimeStart + "." + finalTimeEnd + "." + noisy + "." + excluded + "." + restricted + "." + finalArgWid + "." + displayResults;
+                                ConfigHandler.lookupCommand.put(player2.getName(), bc);
+                                ConfigHandler.lookupPage.put(player2.getName(), page);
+                                ConfigHandler.lookupTime.put(player2.getName(), rtime);
+                                ConfigHandler.lookupType.put(player2.getName(), 5);
+                                ConfigHandler.lookupElist.put(player2.getName(), elist);
+                                ConfigHandler.lookupEUserlist.put(player2.getName(), euserlist);
+                                ConfigHandler.lookupBlist.put(player2.getName(), blist);
+                                ConfigHandler.lookupUlist.put(player2.getName(), rollbackusers2);
+                                ConfigHandler.lookupAlist.put(player2.getName(), finalArgAction);
+                                ConfigHandler.lookupRadius.put(player2.getName(), radius);
+
+                                if (connection != null) {
+                                    Statement statement = connection.createStatement();
+                                    String baduser = "";
+                                    for (String check : rollbackusers2) {
+                                        if ((!check.equals("#global") && !check.equals("#container")) || finalArgAction.contains(9)) {
+                                            exists = PlayerLookup.playerExists(connection, check);
+                                            if (!exists) {
+                                                baduser = check;
+                                                break;
+                                            }
+                                            else if (finalArgAction.contains(9)) {
+                                                if (ConfigHandler.uuidCache.get(check.toLowerCase(Locale.ROOT)) != null) {
+                                                    String uuid = ConfigHandler.uuidCache.get(check.toLowerCase(Locale.ROOT));
+                                                    uuidList.add(uuid);
+                                                }
+                                            }
+                                        }
+                                        else {
+                                            exists = true;
+                                        }
+                                    }
+                                    if (exists) {
+                                        for (String check : euserlist) {
+                                            if (!check.equals("#global") && !check.equals("#hopper")) {
+                                                exists = PlayerLookup.playerExists(connection, check);
+                                                if (!exists) {
+                                                    baduser = check;
+                                                    break;
+                                                }
+                                            }
+                                            else if (check.equals("#global")) {
+                                                baduser = "#global";
+                                                exists = false;
+                                            }
+                                        }
+                                    }
+
+                                    if (exists) {
+                                        List<String> userList = new ArrayList<>();
+                                        if (!finalArgAction.contains(9)) {
+                                            userList = rollbackusers2;
+                                        }
+
+                                        int unixtimestamp = (int) (System.currentTimeMillis() / 1000L);
+                                        boolean restrict_world = false;
+                                        if (radius != null) {
+                                            restrict_world = true;
+                                        }
+                                        if (location == null) {
+                                            restrict_world = false;
+                                        }
+                                        if (finalArgWid > 0) {
+                                            restrict_world = true;
+                                            location = new Location(Bukkit.getServer().getWorld(Util.getWorldName(finalArgWid)), finalX, finalY, finalZ);
+                                        }
+                                        else if (location != null) {
+                                            location = new Location(Bukkit.getServer().getWorld(Util.getWorldName(finalWid)), finalX, finalY, finalZ);
+                                        }
+
+                                        Long[] rowData = new Long[] { 0L, 0L, 0L, 0L };
+                                        long rowMax = (long) page * displayResults;
+                                        long pageStart = rowMax - displayResults;
+                                        long rows = 0L;
+                                        boolean checkRows = true;
+
+                                        if (typeLookup == 5 && page > 1) {
+                                            rowData = ConfigHandler.lookupRows.get(player2.getName());
+                                            rows = rowData[3];
+
+                                            if (pageStart < rows) {
+                                                checkRows = false;
+                                            }
+                                        }
+
+                                        if (checkRows) {
+                                            rows = Lookup.countLookupRows(statement, player2, uuidList, userList, blist, elist, euserlist, finalArgAction, location, radius, rowData, finalTimeStart, finalTimeEnd, restrict_world, true);
+                                            rowData[3] = rows;
+                                            ConfigHandler.lookupRows.put(player2.getName(), rowData);
+                                        }
+                                        if (finalCount) {
+                                            String row_format = NumberFormat.getInstance().format(rows);
+                                            Chat.sendMessage(player2, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.LOOKUP_ROWS_FOUND, row_format, (rows == 1 ? Selector.FIRST : Selector.SECOND)));
+                                        }
+                                        else if (pageStart < rows) {
+                                            List<String[]> lookupList = Lookup.performPartialLookup(statement, player2, uuidList, userList, blist, elist, euserlist, finalArgAction, location, radius, rowData, finalTimeStart, finalTimeEnd, (int) pageStart, displayResults, restrict_world, true);
+
+                                            Chat.sendMessage(player2, Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.LOOKUP_HEADER, "CoreProtect" + Color.WHITE + " | " + Color.DARK_AQUA) + Color.WHITE + " -----");
+                                            if (finalArgAction.contains(6) || finalArgAction.contains(7)) { // Chat/command
+                                                for (String[] data : lookupList) {
+                                                    String time = data[0];
+                                                    String dplayer = data[1];
+                                                    String message = data[2];
+                                                    String timeago = Util.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
+                                                    Chat.sendComponent(player2, timeago + " " + Color.WHITE + "- " + Color.DARK_AQUA + dplayer + ": " + Color.WHITE, message);
+                                                    if (PluginChannelHandshakeListener.getInstance().isPluginChannelPlayer(player2)) {
+                                                        int wid = Integer.parseInt(data[3]);
+                                                        int x = Integer.parseInt(data[4]);
+                                                        int y = Integer.parseInt(data[5]);
+                                                        int z = Integer.parseInt(data[6]);
+                                                        PluginChannelListener.getInstance().sendMessageData(player2, Integer.parseInt(time), dplayer, message, false, x, y, z, wid);
+                                                    }
+                                                }
+                                            }
+                                            else if (finalArgAction.contains(8)) { // login/logouts
+                                                for (String[] data : lookupList) {
+                                                    String time = data[0];
+                                                    String dplayer = data[1];
+                                                    int wid = Integer.parseInt(data[2]);
+                                                    int x = Integer.parseInt(data[3]);
+                                                    int y = Integer.parseInt(data[4]);
+                                                    int z = Integer.parseInt(data[5]);
+                                                    int action = Integer.parseInt(data[6]);
+                                                    String timeago = Util.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
+                                                    int timeLength = 50 + (Util.getTimeSince(Integer.parseInt(time), unixtimestamp, false).replaceAll("[^0-9]", "").length() * 6);
+                                                    String leftPadding = Color.BOLD + Strings.padStart("", 10, ' ');
+                                                    if (timeLength % 4 == 0) {
+                                                        leftPadding = Strings.padStart("", timeLength / 4, ' ');
+                                                    }
+                                                    else {
+                                                        leftPadding = leftPadding + Color.WHITE + Strings.padStart("", (timeLength - 50) / 4, ' ');
+                                                    }
+
+                                                    String tag = (action != 0 ? Color.GREEN + "+" : Color.RED + "-");
+                                                    Chat.sendComponent(player2, timeago + " " + tag + " " + Color.DARK_AQUA + Phrase.build(Phrase.LOOKUP_LOGIN, Color.DARK_AQUA + dplayer + Color.WHITE, (action != 0 ? Selector.FIRST : Selector.SECOND)));
+                                                    Chat.sendComponent(player2, Color.WHITE + leftPadding + Color.GREY + "^ " + Util.getCoordinates(command.getName(), wid, x, y, z, true, true) + "");
+                                                    PluginChannelListener.getInstance().sendInfoData(player2, Integer.parseInt(time), Phrase.LOOKUP_LOGIN, (action != 0 ? Selector.FIRST : Selector.SECOND), dplayer, -1, x, y, z, wid);
+                                                }
+                                            }
+                                            else if (finalArgAction.contains(9)) { // username-changes
+                                                for (String[] data : lookupList) {
+                                                    String time = data[0];
+                                                    String user = ConfigHandler.uuidCacheReversed.get(data[1]);
+                                                    String username = data[2];
+                                                    String timeago = Util.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
+                                                    Chat.sendComponent(player2, timeago + " " + Color.WHITE + "- " + Phrase.build(Phrase.LOOKUP_USERNAME, Color.DARK_AQUA + user + Color.WHITE, Color.DARK_AQUA + username + Color.WHITE));
+                                                    PluginChannelListener.getInstance().sendUsernameData(player2, Integer.parseInt(time), user, username);
+                                                }
+                                            }
+                                            else if (finalArgAction.contains(10)) { // sign messages
+                                                for (String[] data : lookupList) {
+                                                    String time = data[0];
+                                                    String dplayer = data[1];
+                                                    int wid = Integer.parseInt(data[2]);
+                                                    int x = Integer.parseInt(data[3]);
+                                                    int y = Integer.parseInt(data[4]);
+                                                    int z = Integer.parseInt(data[5]);
+                                                    String message = data[6];
+                                                    String timeago = Util.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
+                                                    int timeLength = 50 + (Util.getTimeSince(Integer.parseInt(time), unixtimestamp, false).replaceAll("[^0-9]", "").length() * 6);
+                                                    String leftPadding = Color.BOLD + Strings.padStart("", 10, ' ');
+                                                    if (timeLength % 4 == 0) {
+                                                        leftPadding = Strings.padStart("", timeLength / 4, ' ');
+                                                    }
+                                                    else {
+                                                        leftPadding = leftPadding + Color.WHITE + Strings.padStart("", (timeLength - 50) / 4, ' ');
+                                                    }
+
+                                                    Chat.sendComponent(player2, timeago + " " + Color.WHITE + "- " + Color.DARK_AQUA + dplayer + ": " + Color.WHITE, message);
+                                                    Chat.sendComponent(player2, Color.WHITE + leftPadding + Color.GREY + "^ " + Util.getCoordinates(command.getName(), wid, x, y, z, true, true) + "");
+                                                    PluginChannelListener.getInstance().sendMessageData(player2, Integer.parseInt(time), dplayer, message, true, x, y, z, wid);
+                                                }
+                                            }
+                                            else if (finalArgAction.contains(4) && finalArgAction.contains(11)) { // inventory transactions
+                                                for (String[] data : lookupList) {
+                                                    String time = data[0];
+                                                    String dplayer = data[1];
+                                                    int dtype = Integer.parseInt(data[5]);
+                                                    int ddata = Integer.parseInt(data[6]);
+                                                    int daction = Integer.parseInt(data[7]);
+                                                    int amount = Integer.parseInt(data[10]);
+                                                    int wid = Integer.parseInt(data[9]);
+                                                    int x = Integer.parseInt(data[2]);
+                                                    int y = Integer.parseInt(data[3]);
+                                                    int z = Integer.parseInt(data[4]);
+                                                    String rbd = ((Integer.parseInt(data[8]) == 2 || Integer.parseInt(data[8]) == 3) ? Color.STRIKETHROUGH : "");
+                                                    String timeago = Util.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
+                                                    Material blockType = Util.itemFilter(Util.getType(dtype), (Integer.parseInt(data[13]) == 0));
+                                                    String dname = Util.nameFilter(blockType.name().toLowerCase(Locale.ROOT), ddata);
+                                                    byte[] metadata = data[11] == null ? null : data[11].getBytes(StandardCharsets.ISO_8859_1);
+                                                    String tooltip = Util.getEnchantments(metadata, dtype, amount);
+
+                                                    String selector = Selector.FIRST;
+                                                    String tag = Color.WHITE + "-";
+                                                    if (daction == 2 || daction == 3) { // LOOKUP_ITEM
+                                                        selector = (daction != 2 ? Selector.FIRST : Selector.SECOND);
+                                                        tag = (daction != 2 ? Color.GREEN + "+" : Color.RED + "-");
+                                                    }
+                                                    else if (daction == 4 || daction == 5) { // LOOKUP_STORAGE
+                                                        selector = (daction == 4 ? Selector.FIRST : Selector.SECOND);
+                                                        tag = (daction == 4 ? Color.GREEN + "+" : Color.RED + "-");
+                                                    }
+                                                    else if (daction == 6 || daction == 7) { // LOOKUP_PROJECTILE
+                                                        selector = Selector.SECOND;
+                                                        tag = Color.RED + "-";
+                                                    }
+                                                    else if (daction == ItemLogger.ITEM_BREAK || daction == ItemLogger.ITEM_DESTROY || daction == ItemLogger.ITEM_CREATE) {
+                                                        selector = (daction == ItemLogger.ITEM_CREATE ? Selector.FIRST : Selector.SECOND);
+                                                        tag = (daction == ItemLogger.ITEM_CREATE ? Color.GREEN + "+" : Color.RED + "-");
+                                                    }
+                                                    else if (daction == ItemLogger.ITEM_SELL || daction == ItemLogger.ITEM_BUY) { // LOOKUP_TRADE
+                                                        selector = (daction == ItemLogger.ITEM_BUY ? Selector.FIRST : Selector.SECOND);
+                                                        tag = (daction == ItemLogger.ITEM_BUY ? Color.GREEN + "+" : Color.RED + "-");
+                                                    }
+                                                    else { // LOOKUP_CONTAINER
+                                                        selector = (daction == 0 ? Selector.FIRST : Selector.SECOND);
+                                                        tag = (daction == 0 ? Color.GREEN + "+" : Color.RED + "-");
+                                                    }
+
+                                                    Chat.sendComponent(player2, timeago + " " + tag + " " + Phrase.build(Phrase.LOOKUP_CONTAINER, Color.DARK_AQUA + rbd + dplayer + Color.WHITE + rbd, "x" + amount, Util.createTooltip(Color.DARK_AQUA + rbd + dname, tooltip) + Color.WHITE, selector));
+                                                    PluginChannelListener.getInstance().sendData(player2, Integer.parseInt(time), Phrase.LOOKUP_CONTAINER, selector, dplayer, dname, amount, x, y, z, wid, rbd, true, tag.contains("+"));
+                                                }
+                                            }
+                                            else {
+                                                for (String[] data : lookupList) {
+                                                    int drb = Integer.parseInt(data[8]);
+                                                    String rbd = "";
+                                                    if (drb == 1 || drb == 3) {
+                                                        rbd = Color.STRIKETHROUGH;
+                                                    }
+
+                                                    String time = data[0];
+                                                    String dplayer = data[1];
+                                                    int x = Integer.parseInt(data[2]);
+                                                    int y = Integer.parseInt(data[3]);
+                                                    int z = Integer.parseInt(data[4]);
+                                                    int dtype = Integer.parseInt(data[5]);
+                                                    int ddata = Integer.parseInt(data[6]);
+                                                    int daction = Integer.parseInt(data[7]);
+                                                    int wid = Integer.parseInt(data[9]);
+                                                    int amount = Integer.parseInt(data[10]);
+                                                    String tag = Color.WHITE + "-";
+
+                                                    String timeago = Util.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
+                                                    int timeLength = 50 + (Util.getTimeSince(Integer.parseInt(time), unixtimestamp, false).replaceAll("[^0-9]", "").length() * 6);
+                                                    String leftPadding = Color.BOLD + Strings.padStart("", 10, ' ');
+                                                    if (timeLength % 4 == 0) {
+                                                        leftPadding = Strings.padStart("", timeLength / 4, ' ');
+                                                    }
+                                                    else {
+                                                        leftPadding = leftPadding + Color.WHITE + Strings.padStart("", (timeLength - 50) / 4, ' ');
+                                                    }
+
+                                                    String dname = "";
+                                                    boolean isPlayer = false;
+                                                    if (daction == 3 && !finalArgAction.contains(11) && amount == -1) {
+                                                        if (dtype == 0) {
+                                                            if (ConfigHandler.playerIdCacheReversed.get(ddata) == null) {
+                                                                UserStatement.loadName(connection, ddata);
+                                                            }
+                                                            dname = ConfigHandler.playerIdCacheReversed.get(ddata);
+                                                            isPlayer = true;
+                                                        }
+                                                        else {
+                                                            dname = Util.getEntityType(dtype).name();
+                                                        }
+                                                    }
+                                                    else {
+                                                        dname = Util.getType(dtype).name().toLowerCase(Locale.ROOT);
+                                                        dname = Util.nameFilter(dname, ddata);
+                                                    }
+                                                    if (dname.length() > 0 && !isPlayer) {
+                                                        dname = "minecraft:" + dname.toLowerCase(Locale.ROOT) + "";
+                                                    }
+
+                                                    // Hide "minecraft:" for now.
+                                                    if (dname.contains("minecraft:")) {
+                                                        String[] blockNameSplit = dname.split(":");
+                                                        dname = blockNameSplit[1];
+                                                    }
+
+                                                    // Functions.sendMessage(player2, timeago+" " + ChatColors.WHITE + "- " + ChatColors.DARK_AQUA+rbd+""+dplayer+" " + ChatColors.WHITE+rbd+""+a+" " + ChatColors.DARK_AQUA+rbd+"#"+dtype+ChatColors.WHITE + ". " + ChatColors.GREY + "(x"+x+"/y"+y+"/z"+z+")");
+
+                                                    Phrase phrase = Phrase.LOOKUP_BLOCK;
+                                                    String selector = Selector.FIRST;
+                                                    String action = "a:block";
+                                                    if (finalArgAction.contains(4) || finalArgAction.contains(5) || finalArgAction.contains(11) || amount > -1) {
+                                                        byte[] metadata = data[11] == null ? null : data[11].getBytes(StandardCharsets.ISO_8859_1);
+                                                        String tooltip = Util.getEnchantments(metadata, dtype, amount);
+
+                                                        if (daction == 2 || daction == 3) {
+                                                            phrase = Phrase.LOOKUP_ITEM; // {picked up|dropped}
+                                                            selector = (daction != 2 ? Selector.FIRST : Selector.SECOND);
+                                                            tag = (daction != 2 ? Color.GREEN + "+" : Color.RED + "-");
+                                                            action = "a:item";
+                                                        }
+                                                        else if (daction == 4 || daction == 5) {
+                                                            phrase = Phrase.LOOKUP_STORAGE; // {deposited|withdrew}
+                                                            selector = (daction != 4 ? Selector.FIRST : Selector.SECOND);
+                                                            tag = (daction != 4 ? Color.RED + "-" : Color.GREEN + "+");
+                                                            action = "a:item";
+                                                        }
+                                                        else if (daction == 6 || daction == 7) {
+                                                            phrase = Phrase.LOOKUP_PROJECTILE; // {threw|shot}
+                                                            selector = (daction != 7 ? Selector.FIRST : Selector.SECOND);
+                                                            tag = Color.RED + "-";
+                                                            action = "a:item";
+                                                        }
+                                                        else {
+                                                            phrase = Phrase.LOOKUP_CONTAINER; // {added|removed}
+                                                            selector = (daction != 0 ? Selector.FIRST : Selector.SECOND);
+                                                            tag = (daction != 0 ? Color.GREEN + "+" : Color.RED + "-");
+                                                            action = "a:container";
+                                                        }
+
+                                                        Chat.sendComponent(player2, timeago + " " + tag + " " + Phrase.build(phrase, Color.DARK_AQUA + rbd + dplayer + Color.WHITE + rbd, "x" + amount, Util.createTooltip(Color.DARK_AQUA + rbd + dname, tooltip) + Color.WHITE, selector));
+                                                        PluginChannelListener.getInstance().sendData(player2, Integer.parseInt(time), phrase, selector, dplayer, dname, (tag.contains("+") ? 1 : -1), x, y, z, wid, rbd, action.contains("container"), tag.contains("+"));
+                                                    }
+                                                    else {
+                                                        if (daction == 2 || daction == 3) {
+                                                            phrase = Phrase.LOOKUP_INTERACTION; // {clicked|killed}
+                                                            selector = (daction != 3 ? Selector.FIRST : Selector.SECOND);
+                                                            tag = (daction != 3 ? Color.WHITE + "-" : Color.RED + "-");
+                                                            action = (daction == 2 ? "a:click" : "a:kill");
+                                                        }
+                                                        else {
+                                                            phrase = Phrase.LOOKUP_BLOCK; // {placed|broke}
+                                                            selector = (daction != 0 ? Selector.FIRST : Selector.SECOND);
+                                                            tag = (daction != 0 ? Color.GREEN + "+" : Color.RED + "-");
+                                                        }
+
+                                                        Chat.sendComponent(player2, timeago + " " + tag + " " + Phrase.build(phrase, Color.DARK_AQUA + rbd + dplayer + Color.WHITE + rbd, Color.DARK_AQUA + rbd + dname + Color.WHITE, selector));
+                                                        PluginChannelListener.getInstance().sendData(player2, Integer.parseInt(time), phrase, selector, dplayer, dname, (tag.contains("+") ? 1 : -1), x, y, z, wid, rbd, false, tag.contains("+"));
+                                                    }
+
+                                                    action = (finalArgAction.size() == 0 ? " (" + action + ")" : "");
+                                                    Chat.sendComponent(player2, Color.WHITE + leftPadding + Color.GREY + "^ " + Util.getCoordinates(command.getName(), wid, x, y, z, true, true) + Color.GREY + Color.ITALIC + action);
+                                                }
+                                            }
+                                            if (rows > displayResults) {
+                                                int total_pages = (int) Math.ceil(rows / (displayResults + 0.0));
+                                                if (finalArgAction.contains(6) || finalArgAction.contains(7) || finalArgAction.contains(9) || (finalArgAction.contains(4) && finalArgAction.contains(11))) {
+                                                    Chat.sendMessage(player2, "-----");
+                                                }
+                                                Chat.sendComponent(player2, Util.getPageNavigation(command.getName(), page, total_pages));
+                                            }
+                                        }
+                                        else if (rows > 0) {
+                                            Chat.sendMessage(player2, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS_PAGE, Selector.FIRST));
+                                        }
+                                        else {
+                                            Chat.sendMessage(player2, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS));
+                                        }
+                                    }
+                                    else {
+                                        Chat.sendMessage(player2, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.USER_NOT_FOUND, baduser));
+                                    }
+                                    statement.close();
+                                }
+                                else {
+                                    Chat.sendMessage(player2, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
+                                }
+                            }
+                            catch (Exception e) {
+                                e.printStackTrace();
+                            }
+
+                            ConfigHandler.lookupThrottle.put(player2.getName(), new Object[] { false, System.currentTimeMillis() });
                         }
                     }
-
-                    Runnable runnable = new StandardLookupThread(player, command, rollbackusers, argBlocks, argExclude, argExcludeUsers, argAction, argRadius, lo, x, y, z, wid, argWid, timeStart, timeEnd, argNoisy, argExcluded, argRestricted, pa, re, type, ts, count);
+                    Runnable runnable = new BasicThread2();
                     Thread thread = new Thread(runnable);
                     thread.start();
                 }

src/main/java/net/coreprotect/command/PurgeCommand.java

@@ -8,16 +8,11 @@ import java.sql.ResultSetMetaData;
 import java.text.NumberFormat;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
-import java.util.Map;
 
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
-import net.coreprotect.bukkit.BukkitAdapter;
 import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.consumer.Consumer;
@@ -28,31 +23,22 @@ import net.coreprotect.patch.Patch;
 import net.coreprotect.utility.Chat;
 import net.coreprotect.utility.ChatMessage;
 import net.coreprotect.utility.Color;
-import net.coreprotect.utility.EntityUtils;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.VersionUtils;
+import net.coreprotect.utility.Util;
 
 public class PurgeCommand extends Consumer {
 
     protected static void runCommand(final CommandSender player, boolean permission, String[] args) {
         int resultc = args.length;
-        Location location = CommandParser.parseLocation(player, args);
-        final Integer[] argRadius = CommandParser.parseRadius(args, player, location);
-        final List<Integer> argAction = CommandParser.parseAction(args);
-        final List<Object> argBlocks = CommandParser.parseRestricted(player, args, argAction);
-        final Map<Object, Boolean> argExclude = CommandParser.parseExcluded(player, args, argAction);
-        final List<String> argExcludeUsers = CommandParser.parseExcludedUsers(player, args);
-        final long[] argTime = CommandParser.parseTime(args);
-        final int argWid = CommandParser.parseWorld(args, false, false);
+        Location location = CommandHandler.parseLocation(player, args);
+        final Integer[] argRadius = CommandHandler.parseRadius(args, player, location);
+        final long[] argTime = CommandHandler.parseTime(args);
+        final int argWid = CommandHandler.parseWorld(args, false, false);
+        final List<Integer> argAction = CommandHandler.parseAction(args);
         final List<Integer> supportedActions = Arrays.asList();
         long startTime = argTime[1] > 0 ? argTime[0] : 0;
         long endTime = argTime[1] > 0 ? argTime[1] : argTime[0];
 
-        if (argBlocks == null || argExclude == null || argExcludeUsers == null) {
-            return;
-        }
-
-        if (ConfigHandler.converterRunning || ConfigHandler.migrationRunning) {
+        if (ConfigHandler.converterRunning) {
             Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS));
             return;
         }
@@ -77,18 +63,10 @@ public class PurgeCommand extends Consumer {
             return;
         }
         if (argWid == -1) {
-            String worldName = CommandParser.parseWorldName(args, false);
+            String worldName = CommandHandler.parseWorldName(args, false);
             Chat.sendMessage(player, new ChatMessage(Phrase.build(Phrase.WORLD_NOT_FOUND, worldName)).build());
             return;
         }
-        if (player instanceof Player && endTime < 2592000) {
-            Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_MINIMUM_TIME, "30", Selector.FIRST)); // 30 days
-            return;
-        }
-        else if (endTime < 86400) {
-            Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_MINIMUM_TIME, "24", Selector.SECOND)); // 24 hours
-            return;
-        }
         for (int action : argAction) {
             if (!supportedActions.contains(action)) {
                 Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.ACTION_NOT_SUPPORTED));
@@ -96,70 +74,12 @@ public class PurgeCommand extends Consumer {
                 return;
             }
         }
-
-        StringBuilder restrict = new StringBuilder();
-        String includeBlock = "";
-        String includeEntity = "";
-        boolean hasBlock = false;
-        boolean item = false;
-        boolean entity = false;
-        int restrictCount = 0;
-
-        if (argBlocks.size() > 0) {
-            StringBuilder includeListMaterial = new StringBuilder();
-            StringBuilder includeListEntity = new StringBuilder();
-
-            for (Object restrictTarget : argBlocks) {
-                String targetName = "";
-
-                if (restrictTarget instanceof Material) {
-                    targetName = ((Material) restrictTarget).name();
-                    if (includeListMaterial.length() == 0) {
-                        includeListMaterial = includeListMaterial.append(MaterialUtils.getBlockId(targetName, false));
-                    }
-                    else {
-                        includeListMaterial.append(",").append(MaterialUtils.getBlockId(targetName, false));
-                    }
-
-                    /* Include legacy IDs */
-                    int legacyId = BukkitAdapter.ADAPTER.getLegacyBlockId((Material) restrictTarget);
-                    if (legacyId > 0) {
-                        includeListMaterial.append(",").append(legacyId);
-                    }
-
-                    targetName = ((Material) restrictTarget).name().toLowerCase(Locale.ROOT);
-                    item = (!item ? !(((Material) restrictTarget).isBlock()) : item);
-                    hasBlock = true;
-                }
-                else if (restrictTarget instanceof EntityType) {
-                    targetName = ((EntityType) restrictTarget).name();
-                    if (includeListEntity.length() == 0) {
-                        includeListEntity = includeListEntity.append(EntityUtils.getEntityId(targetName, false));
-                    }
-                    else {
-                        includeListEntity.append(",").append(EntityUtils.getEntityId(targetName, false));
-                    }
-
-                    targetName = ((EntityType) restrictTarget).name().toLowerCase(Locale.ROOT);
-                    entity = true;
-                }
-
-                if (restrictCount == 0) {
-                    restrict = restrict.append("" + targetName + "");
-                }
-                else {
-                    restrict.append(", ").append(targetName);
-                }
-
-                restrictCount++;
-            }
-
-            includeBlock = includeListMaterial.toString();
-            includeEntity = includeListEntity.toString();
+        if (player instanceof Player && endTime < 2592000) {
+            Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_MINIMUM_TIME, "30", Selector.FIRST)); // 30 days
+            return;
         }
-
-        if (entity) {
-            Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.ACTION_NOT_SUPPORTED));
+        else if (endTime < 86400) {
+            Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_MINIMUM_TIME, "24", Selector.SECOND)); // 24 hours
             return;
         }
 
@@ -170,12 +90,7 @@ public class PurgeCommand extends Consumer {
                 break;
             }
         }
-
-        final StringBuilder restrictTargets = restrict;
-        final String includeBlockFinal = includeBlock;
         final boolean optimize = optimizeCheck;
-        final boolean hasBlockRestriction = hasBlock;
-        final int restrictCountFinal = restrictCount;
 
         class BasicThread implements Runnable {
 
@@ -202,17 +117,12 @@ public class PurgeCommand extends Consumer {
                     }
 
                     if (argWid > 0) {
-                        String worldName = CommandParser.parseWorldName(args, false);
+                        String worldName = CommandHandler.parseWorldName(args, false);
                         Chat.sendGlobalMessage(player, Phrase.build(Phrase.PURGE_STARTED, worldName));
                     }
                     else {
                         Chat.sendGlobalMessage(player, Phrase.build(Phrase.PURGE_STARTED, "#global"));
                     }
-
-                    if (hasBlockRestriction) {
-                        Chat.sendGlobalMessage(player, Phrase.build(Phrase.ROLLBACK_INCLUDE, restrictTargets.toString(), Selector.FIRST, Selector.FIRST, (restrictCountFinal == 1 ? Selector.FIRST : Selector.SECOND))); // include
-                    }
-
                     Chat.sendGlobalMessage(player, Phrase.build(Phrase.PURGE_NOTICE_1));
                     Chat.sendGlobalMessage(player, Phrase.build(Phrase.PURGE_NOTICE_2));
 
@@ -236,7 +146,7 @@ public class PurgeCommand extends Consumer {
                     }
 
                     Integer[] lastVersion = Patch.getDatabaseVersion(connection, true);
-                    boolean newVersion = VersionUtils.newVersion(lastVersion, VersionUtils.getInternalPluginVersion());
+                    boolean newVersion = Util.newVersion(lastVersion, Util.getInternalPluginVersion());
                     if (newVersion && !ConfigHandler.EDITION_BRANCH.contains("-dev")) {
                         Chat.sendGlobalMessage(player, Phrase.build(Phrase.PURGE_FAILED));
                         Consumer.isPaused = false;
@@ -257,12 +167,11 @@ public class PurgeCommand extends Consumer {
                             }
                         }
 
-                        Database.createDatabaseTables(purgePrefix, false, null, Config.getGlobal().MYSQL, true);
+                        Database.createDatabaseTables(purgePrefix, true);
                     }
 
                     List<String> purgeTables = Arrays.asList("sign", "container", "item", "skull", "session", "chat", "command", "entity", "block");
                     List<String> worldTables = Arrays.asList("sign", "container", "item", "session", "chat", "command", "block");
-                    List<String> restrictTables = Arrays.asList("block");
                     List<String> excludeTables = Arrays.asList("database_lock"); // don't insert data into these tables
                     for (String table : ConfigHandler.databaseTables) {
                         String tableName = table.replaceAll("_", " ");
@@ -287,22 +196,13 @@ public class PurgeCommand extends Consumer {
                             boolean error = false;
                             if (!excludeTables.contains(table)) {
                                 try {
-                                    boolean purge = true;
                                     String timeLimit = "";
                                     if (purgeTables.contains(table)) {
-                                        String blockRestriction = "(";
-                                        if (hasBlockRestriction && restrictTables.contains(table)) {
-                                            blockRestriction = "type NOT IN(" + includeBlockFinal + ") OR (type IN(" + includeBlockFinal + ") AND ";
-                                        }
-                                        else if (hasBlockRestriction) {
-                                            purge = false;
-                                        }
-
                                         if (argWid > 0 && worldTables.contains(table)) {
-                                            timeLimit = " WHERE (" + blockRestriction + "wid = '" + argWid + "' AND (time >= '" + timeEnd + "' OR time < '" + timeStart + "'))) OR (wid != '" + argWid + "')";
+                                            timeLimit = " WHERE (wid = '" + argWid + "' AND (time >= '" + timeEnd + "' OR time < '" + timeStart + "')) OR wid != '" + argWid + "'";
                                         }
-                                        else if (argWid == 0 && purge) {
-                                            timeLimit = " WHERE " + blockRestriction + "(time >= '" + timeEnd + "' OR time < '" + timeStart + "'))";
+                                        else if (argWid == 0) {
+                                            timeLimit = " WHERE (time >= '" + timeEnd + "' OR time < '" + timeStart + "')";
                                         }
                                     }
                                     query = "INSERT INTO " + purgePrefix + table + " SELECT " + columns + " FROM " + ConfigHandler.prefix + table + timeLimit;
@@ -356,14 +256,6 @@ public class PurgeCommand extends Consumer {
                                 try {
                                     boolean purge = purgeTables.contains(table);
 
-                                    String blockRestriction = "";
-                                    if (hasBlockRestriction && restrictTables.contains(table)) {
-                                        blockRestriction = "type IN(" + includeBlockFinal + ") AND ";
-                                    }
-                                    else if (hasBlockRestriction) {
-                                        purge = false;
-                                    }
-
                                     String worldRestriction = "";
                                     if (argWid > 0 && worldTables.contains(table)) {
                                         worldRestriction = " AND wid = '" + argWid + "'";
@@ -373,7 +265,7 @@ public class PurgeCommand extends Consumer {
                                     }
 
                                     if (purge) {
-                                        query = "DELETE FROM " + purgePrefix + table + " WHERE " + blockRestriction + "time < '" + timeEnd + "' AND time >= '" + timeStart + "'" + worldRestriction;
+                                        query = "DELETE FROM " + purgePrefix + table + " WHERE time < '" + timeEnd + "' AND time >= '" + timeStart + "'" + worldRestriction;
                                         preparedStmt = connection.prepareStatement(query);
                                         preparedStmt.execute();
                                         preparedStmt.close();
@@ -423,14 +315,6 @@ public class PurgeCommand extends Consumer {
                             try {
                                 boolean purge = purgeTables.contains(table);
 
-                                String blockRestriction = "";
-                                if (hasBlockRestriction && restrictTables.contains(table)) {
-                                    blockRestriction = "type IN(" + includeBlockFinal + ") AND ";
-                                }
-                                else if (hasBlockRestriction) {
-                                    purge = false;
-                                }
-
                                 String worldRestriction = "";
                                 if (argWid > 0 && worldTables.contains(table)) {
                                     worldRestriction = " AND wid = '" + argWid + "'";
@@ -440,7 +324,7 @@ public class PurgeCommand extends Consumer {
                                 }
 
                                 if (purge) {
-                                    query = "DELETE FROM " + ConfigHandler.prefix + table + " WHERE " + blockRestriction + "time < '" + timeEnd + "' AND time >= '" + timeStart + "'" + worldRestriction;
+                                    query = "DELETE FROM " + ConfigHandler.prefix + table + " WHERE time < '" + timeEnd + "' AND time >= '" + timeStart + "'" + worldRestriction;
                                     preparedStmt = connection.prepareStatement(query);
                                     preparedStmt.execute();
                                     removed = removed + preparedStmt.getUpdateCount();

src/main/java/net/coreprotect/command/RollbackRestoreCommand.java

@@ -29,28 +29,28 @@ import net.coreprotect.language.Phrase;
 import net.coreprotect.language.Selector;
 import net.coreprotect.utility.Chat;
 import net.coreprotect.utility.Color;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class RollbackRestoreCommand {
-    public static void runCommand(CommandSender player, Command command, boolean permission, String[] args, Location argLocation, long forceStart, long forceEnd) {
-        Location lo = (argLocation != null ? argLocation : CommandParser.parseLocation(player, args));
+    protected static void runCommand(CommandSender player, Command command, boolean permission, String[] args, Location argLocation, long forceStart, long forceEnd) {
+        Location lo = (argLocation != null ? argLocation : CommandHandler.parseLocation(player, args));
         List<String> argUuids = new ArrayList<>();
-        List<String> argUsers = CommandParser.parseUsers(args);
-        Integer[] argRadius = CommandParser.parseRadius(args, player, lo);
-        int argNoisy = CommandParser.parseNoisy(args);
-        List<Integer> argAction = CommandParser.parseAction(args);
-        List<Object> argBlocks = CommandParser.parseRestricted(player, args, argAction);
-        Map<Object, Boolean> argExclude = CommandParser.parseExcluded(player, args, argAction);
-        List<String> argExcludeUsers = CommandParser.parseExcludedUsers(player, args);
-        String ts = CommandParser.parseTimeString(args);
-        long[] argTime = CommandParser.parseTime(args);
+        List<String> argUsers = CommandHandler.parseUsers(args);
+        Integer[] argRadius = CommandHandler.parseRadius(args, player, lo);
+        int argNoisy = CommandHandler.parseNoisy(args);
+        List<Integer> argAction = CommandHandler.parseAction(args);
+        List<Object> argBlocks = CommandHandler.parseRestricted(player, args, argAction);
+        Map<Object, Boolean> argExclude = CommandHandler.parseExcluded(player, args, argAction);
+        List<String> argExcludeUsers = CommandHandler.parseExcludedUsers(player, args);
+        String ts = CommandHandler.parseTimeString(args);
+        long[] argTime = CommandHandler.parseTime(args);
         long startTime = argTime[0];
         long endTime = argTime[1];
-        int argWid = CommandParser.parseWorld(args, true, true);
-        boolean count = CommandParser.parseCount(args);
-        boolean worldedit = CommandParser.parseWorldEdit(args);
-        boolean forceglobal = CommandParser.parseForceGlobal(args);
-        int preview = CommandParser.parsePreview(args);
+        int argWid = CommandHandler.parseWorld(args, true, true);
+        boolean count = CommandHandler.parseCount(args);
+        boolean worldedit = CommandHandler.parseWorldEdit(args);
+        boolean forceglobal = CommandHandler.parseForceGlobal(args);
+        int preview = CommandHandler.parsePreview(args);
         String corecommand = args[0].toLowerCase(Locale.ROOT);
 
         if (argBlocks == null || argExclude == null || argExcludeUsers == null) {
@@ -111,7 +111,7 @@ public class RollbackRestoreCommand {
             return;
         }
         if (argWid == -1) {
-            String worldName = CommandParser.parseWorldName(args, true);
+            String worldName = CommandHandler.parseWorldName(args, true);
             Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.WORLD_NOT_FOUND, worldName));
             return;
         }
@@ -290,7 +290,7 @@ public class RollbackRestoreCommand {
                             argAction.add(5);
                             argRadius = null;
                             argWid = 0;
-                            lo = new Location(Bukkit.getServer().getWorld(WorldUtils.getWorldName(wid)), x, y, z);
+                            lo = new Location(Bukkit.getServer().getWorld(Util.getWorldName(wid)), x, y, z);
                             Block block = lo.getBlock();
                             if (block.getState() instanceof Chest) {
                                 BlockFace[] blockFaces = new BlockFace[] { BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST };
@@ -391,7 +391,7 @@ public class RollbackRestoreCommand {
                                             }
                                             if (finalArgWid > 0) {
                                                 restrictWorld = true;
-                                                location = new Location(Bukkit.getServer().getWorld(WorldUtils.getWorldName(finalArgWid)), 0, 0, 0);
+                                                location = new Location(Bukkit.getServer().getWorld(Util.getWorldName(finalArgWid)), 0, 0, 0);
                                             }
                                             boolean verbose = false;
                                             if (noisy == 1) {

src/main/java/net/coreprotect/command/StatusCommand.java

@@ -17,8 +17,6 @@ import net.coreprotect.patch.Patch;
 import net.coreprotect.thread.NetworkHandler;
 import net.coreprotect.utility.Chat;
 import net.coreprotect.utility.Color;
-import net.coreprotect.utility.SystemUtils;
-import net.coreprotect.utility.VersionUtils;
 
 public class StatusCommand {
     private static ConcurrentHashMap<String, Boolean> alert = new ConcurrentHashMap<>();
@@ -39,16 +37,12 @@ public class StatusCommand {
                     String versionCheck = "";
                     if (Config.getGlobal().CHECK_UPDATES) {
                         String latestVersion = NetworkHandler.latestVersion();
-                        String latestEdgeVersion = NetworkHandler.latestEdgeVersion();
                         if (latestVersion != null) {
                             versionCheck = " (" + Phrase.build(Phrase.LATEST_VERSION, "v" + latestVersion) + ")";
                         }
-                        else if (latestEdgeVersion != null && !VersionUtils.isCommunityEdition()) {
-                            versionCheck = " (" + Phrase.build(Phrase.LATEST_VERSION, "v" + latestEdgeVersion) + ")";
-                        }
                     }
 
-                    Chat.sendMessage(player, Color.WHITE + "----- " + Color.DARK_AQUA + "CoreProtect" + (VersionUtils.isCommunityEdition() ? " " + ConfigHandler.COMMUNITY_EDITION : "") + Color.WHITE + " -----");
+                    Chat.sendMessage(player, Color.WHITE + "----- " + Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "-----");
                     Chat.sendMessage(player, Color.DARK_AQUA + Phrase.build(Phrase.STATUS_VERSION, Color.WHITE, ConfigHandler.EDITION_NAME + " v" + pdfFile.getVersion() + ".") + versionCheck);
 
                     String donationKey = NetworkHandler.donationKey();
@@ -60,6 +54,7 @@ public class StatusCommand {
                     }
 
                     /*
+                        CoreProtect show RAM usage
                         Items processed (since server start)
                         Items processed (last 60 minutes)
                      */
@@ -107,52 +102,6 @@ public class StatusCommand {
                         e.printStackTrace();
                     }
 
-                    try {
-                        String cpuInfo = "";
-                        if (ConfigHandler.processorInfo != null) {
-                            String modelName = ConfigHandler.processorInfo.getProcessorIdentifier().getName();
-                            if (modelName.contains(" CPU")) {
-                                String[] split = modelName.split(" CPU")[0].split(" ");
-                                modelName = split[split.length - 1];
-                            }
-                            else if (modelName.contains(" Processor")) {
-                                String[] split = modelName.split(" Processor")[0].split(" ");
-                                modelName = split[split.length - 1];
-                            }
-
-                            String cpuSpeed = String.valueOf(ConfigHandler.processorInfo.getMaxFreq());
-                            double speedVal = Long.valueOf(cpuSpeed) / 1000000000.0;
-
-                            // Fix for Apple Silicon processors reporting 0 GHz
-                            if (speedVal < 0.01 && SystemUtils.isAppleSilicon()) {
-                                Double appleSiliconSpeed = SystemUtils.getAppleSiliconSpeed();
-                                if (appleSiliconSpeed != null) {
-                                    speedVal = appleSiliconSpeed;
-                                }
-                            }
-
-                            cpuSpeed = String.format("%.2f", speedVal);
-                            cpuInfo = "x" + Runtime.getRuntime().availableProcessors() + " " + cpuSpeed + "GHz " + modelName + ".";
-                        }
-                        else {
-                            cpuInfo = "x" + Runtime.getRuntime().availableProcessors() + " " + Phrase.build(Phrase.CPU_CORES);
-                        }
-
-                        int mb = 1024 * 1024;
-                        Runtime runtime = Runtime.getRuntime();
-                        String usedRAM = String.format("%.2f", Double.valueOf((runtime.totalMemory() - runtime.freeMemory()) / mb) / 1000.0);
-                        String totalRAM = String.format("%.2f", Double.valueOf(runtime.maxMemory() / mb) / 1000.0);
-                        String systemInformation = Phrase.build(Phrase.RAM_STATS, usedRAM, totalRAM);
-                        if (cpuInfo.length() > 0) {
-                            systemInformation = cpuInfo + " (" + systemInformation + ")";
-                        }
-
-                        Chat.sendMessage(player, Color.DARK_AQUA + Phrase.build(Phrase.STATUS_SYSTEM, Color.WHITE, systemInformation));
-                    }
-                    catch (Exception e) {
-                        e.printStackTrace();
-                    }
-
                     // Functions.sendMessage(player, Color.DARK_AQUA + "Website: " + Color.WHITE + "www.coreprotect.net/updates/");
 
                     // Functions.sendMessage(player, Color.DARK_AQUA + Phrase.build(Phrase.LINK_DISCORD, Color.WHITE + "www.coreprotect.net/discord/").replaceFirst(":", ":" + Color.WHITE));

src/main/java/net/coreprotect/command/TabHandler.java

@@ -22,11 +22,11 @@ import net.coreprotect.config.ConfigHandler;
 public class TabHandler implements TabCompleter {
 
     // private static String[] COMMANDS = new String[] { "help", "inspect", "rollback", "restore", "lookup", "purge", "reload", "status", "near", "undo" }; // max 10!
-    private static final String[] HELP = new String[] { "inspect", "rollback", "restore", "lookup", "purge", "teleport", "status", "params", "users", "time", "radius", "action", "include", "exclude" };
-    private static final String[] PARAMS = new String[] { "user:", "time:", "radius:", "action:", "include:", "exclude:", "#container" };
-    private static final String[] ACTIONS = new String[] { "block", "+block", "-block", "click", "kill", "+container", "-container", "container", "chat", "command", "+inventory", "-inventory", "inventory", "item", "+item", "-item", "sign", "session", "+session", "-session", "username" };
-    private static final String[] NUMBERS = new String[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-    private static final String[] TIMES = new String[] { "w", "d", "h", "m", "s" };
+    private static String[] HELP = new String[] { "inspect", "rollback", "restore", "lookup", "purge", "teleport", "status", "params", "users", "time", "radius", "action", "include", "exclude" };
+    private static String[] PARAMS = new String[] { "user:", "time:", "radius:", "action:", "include:", "exclude:", "#container" };
+    private static String[] ACTIONS = new String[] { "block", "+block", "-block", "click", "kill", "+container", "-container", "container", "chat", "command", "+inventory", "-inventory", "inventory", "item", "+item", "-item", "sign", "session", "+session", "-session", "username" };
+    private static String[] NUMBERS = new String[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+    private static String[] TIMES = new String[] { "w", "d", "h", "m", "s" };
     private static ArrayList<String> materials = null;
 
     @Override
@@ -34,470 +34,370 @@ public class TabHandler implements TabCompleter {
         if (!(sender instanceof Player) || args.length == 0) {
             return null;
         }
-
         if (args.length == 1) {
-            return getFirstLevelCompletions(sender, args[0]);
-        }
-
-        String argument0 = args[0].toLowerCase(Locale.ROOT);
-        String currentArg = args[args.length - 1].toLowerCase(Locale.ROOT).trim();
-        String lastArg = args.length > 1 ? args[args.length - 2].toLowerCase(Locale.ROOT).trim() : "";
-
-        ParamState paramState = getParamState(args);
-
-        // Handle param-specific completions
-        if (isActionParam(lastArg, currentArg) && hasLookupPermission(sender)) {
-            return handleActionParamCompletions(currentArg, lastArg);
-        }
-        else if (isUserParam(lastArg, currentArg) && hasLookupPermission(sender)) {
-            return handleUserParamCompletions(currentArg, lastArg);
-        }
-        else if (isTimeParam(lastArg, currentArg) && hasTimePermission(sender)) {
-            return handleTimeParamCompletions(currentArg, lastArg);
-        }
-        else if (isPageParam(lastArg, currentArg) && hasPagePermission(sender)) {
-            return handlePageParamCompletions(currentArg, lastArg);
-        }
-        else if (isRadiusParam(lastArg, currentArg) && hasRadiusPermission(sender)) {
-            return handleRadiusParamCompletions(currentArg, lastArg, argument0);
-        }
-        else if (isMaterialParam(lastArg, currentArg) && hasLookupPermission(sender)) {
-            return handleMaterialParamCompletions(currentArg, lastArg);
-        }
-        else if (args.length == 2) {
-            return handleSecondArgCompletions(sender, argument0, args[1], paramState);
-        }
-        else if (args.length == 3 && argument0.equals("purge") && sender.hasPermission("coreprotect.purge")) {
-            return handlePurgeThirdArgCompletions(args[1], args[2]);
-        }
-        else if (hasLookupCommand(argument0, sender) && (!argument0.equals("l") && !argument0.equals("lookup") || !paramState.hasPage)) {
-            return handleGenericLookupCompletions(argument0, currentArg, paramState);
-        }
-
-        return Arrays.asList("");
-    }
-
-    private List<String> getFirstLevelCompletions(CommandSender sender, String argument) {
-        String arg = argument.toLowerCase(Locale.ROOT);
-        List<String> completions = new ArrayList<>();
-
-        addCompletionIfPermitted(sender, "coreprotect.help", "help", completions);
-        addCompletionIfPermitted(sender, "coreprotect.inspect", "inspect", completions);
-        addCompletionIfPermitted(sender, "coreprotect.rollback", "rollback", completions);
-        addCompletionIfPermitted(sender, "coreprotect.restore", "restore", completions);
-        addCompletionIfPermitted(sender, "coreprotect.lookup", "lookup", completions);
-        addCompletionIfPermitted(sender, "coreprotect.purge", "purge", completions);
-        addCompletionIfPermitted(sender, "coreprotect.reload", "reload", completions);
-        addCompletionIfPermitted(sender, "coreprotect.status", "status", completions);
-        addCompletionIfPermitted(sender, "coreprotect.lookup.near", "near", completions);
-        addCompletionIfPermitted(sender, "coreprotect.restore", "undo", completions);
-
-        return StringUtil.copyPartialMatches(arg, completions, new ArrayList<>(completions.size()));
-    }
-
-    private void addCompletionIfPermitted(CommandSender sender, String permission, String completion, List<String> completions) {
-        if (sender.hasPermission(permission)) {
-            completions.add(completion);
-        }
-    }
-
-    private boolean hasLookupPermission(CommandSender sender) {
-        return sender.hasPermission("coreprotect.lookup") || sender.hasPermission("coreprotect.rollback") || sender.hasPermission("coreprotect.restore");
-    }
-
-    private boolean hasTimePermission(CommandSender sender) {
-        return hasLookupPermission(sender) || sender.hasPermission("coreprotect.purge");
-    }
-
-    private boolean hasRadiusPermission(CommandSender sender) {
-        return hasTimePermission(sender);
-    }
-
-    private boolean hasPagePermission(CommandSender sender) {
-        return sender.hasPermission("coreprotect.lookup") || sender.hasPermission("coreprotect.lookup.near") || sender.hasPermission("coreprotect.inspect");
-    }
-
-    private boolean hasLookupCommand(String cmd, CommandSender sender) {
-        return (sender.hasPermission("coreprotect.lookup") && (cmd.equals("l") || cmd.equals("lookup"))) || (sender.hasPermission("coreprotect.rollback") && (cmd.equals("rollback") || cmd.equals("rb") || cmd.equals("ro"))) || (sender.hasPermission("coreprotect.restore") && (cmd.equals("restore") || cmd.equals("rs") || cmd.equals("re")));
-    }
-
-    private boolean isActionParam(String lastArg, String currentArg) {
-        return lastArg.equals("a:") || lastArg.equals("action:") || currentArg.startsWith("a:") || currentArg.startsWith("action:");
-    }
-
-    private boolean isUserParam(String lastArg, String currentArg) {
-        return lastArg.equals("u:") || lastArg.equals("user:") || lastArg.equals("users:") || lastArg.equals("p:") || currentArg.startsWith("u:") || currentArg.startsWith("user:") || currentArg.startsWith("users:") || currentArg.startsWith("p:");
-    }
-
-    private boolean isTimeParam(String lastArg, String currentArg) {
-        return lastArg.equals("t:") || lastArg.equals("time:") || currentArg.startsWith("t:") || currentArg.startsWith("time:");
-    }
-
-    private boolean isPageParam(String lastArg, String currentArg) {
-        return lastArg.equals("page:") || currentArg.startsWith("page:");
-    }
-
-    private boolean isRadiusParam(String lastArg, String currentArg) {
-        return lastArg.equals("r:") || lastArg.equals("radius:") || currentArg.startsWith("r:") || currentArg.startsWith("radius:");
-    }
-
-    private boolean isMaterialParam(String lastArg, String currentArg) {
-        return lastArg.equals("i:") || lastArg.equals("include:") || lastArg.equals("item:") || lastArg.equals("items:") || lastArg.equals("b:") || lastArg.equals("block:") || lastArg.equals("blocks:") || currentArg.startsWith("i:") || currentArg.startsWith("include:") || currentArg.startsWith("item:") || currentArg.startsWith("items:") || currentArg.startsWith("b:") || currentArg.startsWith("block:") || currentArg.startsWith("blocks:") || lastArg.equals("e:") || lastArg.equals("exclude:") || currentArg.startsWith("e:") || currentArg.startsWith("exclude:");
-    }
-
-    private static class ParamState {
-        boolean hasUser;
-        boolean hasAction;
-        boolean hasInclude;
-        boolean hasExclude;
-        boolean hasRadius;
-        boolean hasTime;
-        boolean hasContainer;
-        boolean hasCount;
-        boolean hasPreview;
-        boolean hasPage;
-        boolean validContainer;
-        boolean pageLookup;
-    }
-
-    private ParamState getParamState(String[] args) {
-        ParamState state = new ParamState();
-
-        if (ConfigHandler.lookupType.get(args[0]) != null && ConfigHandler.lookupPage.get(args[0]) != null) {
-            state.pageLookup = true;
-        }
-
-        for (int i = 1; i < args.length; i++) {
-            String arg = args[i].toLowerCase(Locale.ROOT);
-            if (arg.equals("#container")) {
-                state.hasContainer = true;
+            String argument = args[0].toLowerCase(Locale.ROOT);
+            List<String> completions = new ArrayList<>();
+            if (sender.hasPermission("coreprotect.help")) {
+                completions.add("help");
             }
-            else if (arg.equals("#count") || arg.equals("#sum")) {
-                state.hasCount = true;
+            if (sender.hasPermission("coreprotect.inspect")) {
+                completions.add("inspect");
             }
-            else if (arg.equals("#preview")) {
-                state.hasPreview = true;
+            if (sender.hasPermission("coreprotect.rollback")) {
+                completions.add("rollback");
             }
-            else if ((!arg.contains(":") && !args[i - 1].contains(":") && args.length > (i + 1)) || arg.contains("u:") || arg.contains("user:") || arg.contains("users:") || arg.contains("p:")) {
-                state.hasUser = true;
+            if (sender.hasPermission("coreprotect.restore")) {
+                completions.add("restore");
             }
-            else if (arg.contains("page:")) {
-                state.hasPage = true;
+            if (sender.hasPermission("coreprotect.lookup")) {
+                completions.add("lookup");
             }
-            else if (arg.contains("a:") || arg.contains("action:")) {
-                state.hasAction = true;
+            if (sender.hasPermission("coreprotect.purge")) {
+                completions.add("purge");
             }
-            else if (arg.contains("i:") || arg.contains("include:") || arg.contains("item:") || arg.contains("items:") || arg.contains("b:") || arg.contains("block:") || arg.contains("blocks:")) {
-                state.hasInclude = true;
+            if (sender.hasPermission("coreprotect.reload")) {
+                completions.add("reload");
             }
-            else if (arg.contains("t:") || arg.contains("time:")) {
-                state.hasTime = true;
+            if (sender.hasPermission("coreprotect.status")) {
+                completions.add("status");
             }
-            else if (arg.contains("e:") || arg.contains("exclude:")) {
-                state.hasExclude = true;
+            if (sender.hasPermission("coreprotect.lookup.near")) {
+                completions.add("near");
             }
-            else if (arg.contains("r:") || arg.contains("radius:")) {
-                state.hasRadius = true;
+            if (sender.hasPermission("coreprotect.restore")) {
+                completions.add("undo");
             }
-        }
 
-        if (!state.hasContainer) {
-            if (ConfigHandler.lookupType.get(args[0]) != null) {
-                int lookupType = ConfigHandler.lookupType.get(args[0]);
-                if (lookupType == 1) {
-                    state.validContainer = true;
+            return StringUtil.copyPartialMatches(argument, completions, new ArrayList<>(completions.size()));
+        }
+        else if (args.length > 1) {
+            String argument0 = args[0].toLowerCase(Locale.ROOT);
+            String argument1 = args[1].toLowerCase(Locale.ROOT);
+            String currentArg = args[args.length - 1].toLowerCase(Locale.ROOT).trim();
+            String lastArg = args[args.length - 2].toLowerCase(Locale.ROOT).trim();
+
+            boolean hasUser = false;
+            boolean hasAction = false;
+            boolean hasInclude = false;
+            boolean hasExclude = false;
+            boolean hasRadius = false;
+            boolean hasTime = false;
+            boolean hasContainer = false;
+            boolean hasCount = false;
+            boolean hasPreview = false;
+            boolean hasPage = false;
+            boolean validContainer = false;
+            boolean pageLookup = false;
+
+            if (ConfigHandler.lookupType.get(sender.getName()) != null && ConfigHandler.lookupPage.get(sender.getName()) != null) {
+                pageLookup = true;
+            }
+
+            for (int i = 1; i < args.length; i++) {
+                String arg = args[i].toLowerCase(Locale.ROOT);
+                if (arg.equals("#container")) {
+                    hasContainer = true;
                 }
-                else if (lookupType == 5) {
-                    if (ConfigHandler.lookupUlist.get(args[0]).contains("#container")) {
-                        state.validContainer = true;
+                else if (arg.equals("#count") || arg.equals("#sum")) {
+                    hasCount = true;
+                }
+                else if (arg.equals("#preview")) {
+                    hasPreview = true;
+                }
+                else if ((!arg.contains(":") && !args[i - 1].contains(":") && args.length > (i + 1)) || arg.contains("u:") || arg.contains("user:") || arg.contains("users:") || arg.contains("p:")) {
+                    hasUser = true;
+                }
+                else if (arg.contains("page:")) {
+                    hasPage = true;
+                }
+                else if (arg.contains("a:") || arg.contains("action:")) {
+                    hasAction = true;
+                }
+                else if (arg.contains("i:") || arg.contains("include:") || arg.contains("item:") || arg.contains("items:") || arg.contains("b:") || arg.contains("block:") || arg.contains("blocks:")) {
+                    hasInclude = true;
+                }
+                else if (arg.contains("t:") || arg.contains("time:")) {
+                    hasTime = true;
+                }
+                else if (arg.contains("e:") || arg.contains("exclude:")) {
+                    hasExclude = true;
+                }
+                else if (arg.contains("r:") || arg.contains("radius:")) {
+                    hasRadius = true;
+                }
+            }
+
+            if (!hasContainer) {
+                if (ConfigHandler.lookupType.get(sender.getName()) != null) {
+                    int lookupType = ConfigHandler.lookupType.get(sender.getName());
+                    if (lookupType == 1) {
+                        validContainer = true;
+                    }
+                    else if (lookupType == 5) {
+                        if (ConfigHandler.lookupUlist.get(sender.getName()).contains("#container")) {
+                            validContainer = true;
+                        }
                     }
                 }
             }
-        }
 
-        return state;
-    }
-
-    private List<String> handleActionParamCompletions(String currentArg, String lastArg) {
-        String arg = "";
-        String filter = lastArg;
-
-        if (currentArg.contains(":")) {
-            String[] split = currentArg.split(":", 2);
-            filter = split[0] + ":";
-            if (split.length > 1) {
-                arg = split[1];
+            if ((lastArg.equals("a:") || lastArg.equals("action:")) && (sender.hasPermission("coreprotect.lookup") || sender.hasPermission("coreprotect.rollback") || sender.hasPermission("coreprotect.restore"))) {
+                List<String> completions = new ArrayList<>(Arrays.asList(ACTIONS));
+                return StringUtil.copyPartialMatches(currentArg, completions, new ArrayList<>(completions.size()));
             }
-        }
-
-        List<String> completions = new ArrayList<>(Arrays.asList(ACTIONS));
-        for (int index = 0; index < completions.size(); index++) {
-            completions.set(index, filter + completions.get(index));
-        }
-        return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
-    }
-
-    private List<String> handleUserParamCompletions(String currentArg, String lastArg) {
-        if (lastArg.equals("u:") || lastArg.equals("user:") || lastArg.equals("users:") || lastArg.equals("p:")) {
-            return null;
-        }
-
-        String arg = "";
-        String[] split = currentArg.split(":", 2);
-        String filter = split[0] + ":";
-        if (split.length > 1) {
-            arg = split[1];
-        }
-
-        List<String> completions = Bukkit.getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toList());
-
-        for (int index = 0; index < completions.size(); index++) {
-            completions.set(index, filter + completions.get(index));
-        }
-
-        return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
-    }
-
-    private List<String> handleTimeParamCompletions(String currentArg, String lastArg) {
-        String filter = lastArg;
-        String arg = "";
-        if (currentArg.contains(":")) {
-            String[] split = currentArg.split(":", 2);
-            filter = split[0] + ":";
-            if (split.length > 1) {
-                arg = split[1];
-            }
-        }
-        else {
-            filter = "";
-            arg = currentArg;
-        }
-
-        List<String> completions = new ArrayList<>();
-        if (arg.chars().allMatch(Character::isDigit)) {
-            boolean addNumbers = true;
-            if (currentArg.length() > 0) {
-                char lastChar = currentArg.charAt(currentArg.length() - 1);
-                if (Character.isDigit(lastChar)) {
-                    completions.addAll(Arrays.asList(TIMES));
-                    addNumbers = false;
+            else if ((currentArg.startsWith("a:") || currentArg.startsWith("action:")) && (sender.hasPermission("coreprotect.lookup") || sender.hasPermission("coreprotect.rollback") || sender.hasPermission("coreprotect.restore"))) {
+                String arg = "";
+                String[] split = currentArg.split(":", 2);
+                String filter = split[0] + ":";
+                if (split.length > 1) {
+                    arg = split[1];
                 }
+
+                List<String> completions = new ArrayList<>(Arrays.asList(ACTIONS));
+                for (int index = 0; index < completions.size(); index++) {
+                    completions.set(index, filter + completions.get(index));
+                }
+                return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
             }
-            if (addNumbers) {
-                completions.addAll(Arrays.asList(NUMBERS));
+            else if ((lastArg.equals("u:") || lastArg.equals("user:") || lastArg.equals("users:") || lastArg.equals("p:")) && (sender.hasPermission("coreprotect.lookup") || sender.hasPermission("coreprotect.rollback") || sender.hasPermission("coreprotect.restore"))) {
+                return null;
             }
-        }
+            else if ((currentArg.startsWith("u:") || currentArg.startsWith("user:") || currentArg.startsWith("users:") || currentArg.startsWith("p:")) && (sender.hasPermission("coreprotect.lookup") || sender.hasPermission("coreprotect.rollback") || sender.hasPermission("coreprotect.restore"))) {
+                String arg = "";
+                String[] split = currentArg.split(":", 2);
+                String filter = split[0] + ":";
+                if (split.length > 1) {
+                    arg = split[1];
+                }
 
-        completions = new ArrayList<>(completions);
-        for (int index = 0; index < completions.size(); index++) {
-            completions.set(index, filter + arg + completions.get(index));
-        }
+                List<String> completions = Bukkit.getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toList());
+                for (int index = 0; index < completions.size(); index++) {
+                    completions.set(index, filter + completions.get(index));
+                }
 
-        return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
-    }
-
-    private List<String> handlePageParamCompletions(String currentArg, String lastArg) {
-        String filter = lastArg;
-        String arg = "";
-        if (currentArg.contains(":")) {
-            String[] split = currentArg.split(":", 2);
-            filter = split[0] + ":";
-            if (split.length > 1) {
-                arg = split[1];
+                return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
             }
-        }
-        else {
-            filter = "";
-            arg = currentArg;
-        }
+            else if ((lastArg.equals("t:") || lastArg.equals("time:") || currentArg.startsWith("t:") || currentArg.startsWith("time:")) && (sender.hasPermission("coreprotect.lookup") || sender.hasPermission("coreprotect.rollback") || sender.hasPermission("coreprotect.restore") || sender.hasPermission("coreprotect.purge"))) {
+                String filter = lastArg;
+                String arg = "";
+                if (currentArg.contains(":")) {
+                    String[] split = currentArg.split(":", 2);
+                    filter = split[0] + ":";
+                    if (split.length > 1) {
+                        arg = split[1];
+                    }
+                }
+                else {
+                    filter = "";
+                    arg = currentArg;
+                }
 
-        if (arg.chars().allMatch(Character::isDigit)) {
-            List<String> completions = new ArrayList<>(Arrays.asList(NUMBERS));
-            if (arg.length() < 1) {
+                List<String> completions = new ArrayList<>();
+                if (arg.chars().allMatch(Character::isDigit)) {
+                    boolean addNumbers = true;
+                    if (currentArg.length() > 0) {
+                        char lastChar = currentArg.charAt(currentArg.length() - 1);
+                        if (Character.isDigit(lastChar)) {
+                            completions.addAll(Arrays.asList(TIMES));
+                            addNumbers = false;
+                        }
+                    }
+                    if (addNumbers) {
+                        completions.addAll(Arrays.asList(NUMBERS));
+                    }
+
+                }
+
+                completions = new ArrayList<>(completions);
                 for (int index = 0; index < completions.size(); index++) {
                     completions.set(index, filter + arg + completions.get(index));
                 }
-                if (arg.length() == 0) {
-                    completions.remove(0);
+
+                return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
+            }
+            else if ((lastArg.equals("page:") || currentArg.startsWith("page:")) && (sender.hasPermission("coreprotect.lookup") || sender.hasPermission("coreprotect.lookup.near") || sender.hasPermission("coreprotect.inspect"))) {
+                String filter = lastArg;
+                String arg = "";
+                if (currentArg.contains(":")) {
+                    String[] split = currentArg.split(":", 2);
+                    filter = split[0] + ":";
+                    if (split.length > 1) {
+                        arg = split[1];
+                    }
+                }
+                else {
+                    filter = "";
+                    arg = currentArg;
+                }
+
+                if (arg.chars().allMatch(Character::isDigit)) {
+                    List<String> completions = new ArrayList<>(Arrays.asList(NUMBERS));
+                    if (arg.length() < 1) {
+                        for (int index = 0; index < completions.size(); index++) {
+                            completions.set(index, filter + arg + completions.get(index));
+                        }
+                        if (arg.length() == 0) {
+                            completions.remove(0);
+                        }
+                    }
+                    return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
                 }
             }
-            return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
-        }
+            else if ((lastArg.equals("r:") || lastArg.equals("radius:") || currentArg.startsWith("r:") || currentArg.startsWith("radius:")) && (sender.hasPermission("coreprotect.lookup") || sender.hasPermission("coreprotect.rollback") || sender.hasPermission("coreprotect.restore") || sender.hasPermission("coreprotect.purge"))) {
+                String filter = lastArg;
+                String arg = "";
+                if (currentArg.contains(":")) {
+                    String[] split = currentArg.split(":", 2);
+                    filter = split[0] + ":";
+                    if (split.length > 1) {
+                        arg = split[1];
+                    }
+                }
+                else {
+                    filter = "";
+                    arg = currentArg;
+                }
 
-        return null;
-    }
-
-    private List<String> handleRadiusParamCompletions(String currentArg, String lastArg, String baseCommand) {
-        String filter = lastArg;
-        String arg = "";
-        if (currentArg.contains(":")) {
-            String[] split = currentArg.split(":", 2);
-            filter = split[0] + ":";
-            if (split.length > 1) {
-                arg = split[1];
+                if (!argument0.equals("purge") && arg.chars().allMatch(Character::isDigit)) {
+                    List<String> completions = new ArrayList<>(Arrays.asList(NUMBERS));
+                    if (arg.length() < 2) {
+                        for (int index = 0; index < completions.size(); index++) {
+                            completions.set(index, filter + arg + completions.get(index));
+                        }
+                    }
+                    return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
+                }
+                else if (argument0.equals("purge") || arg.startsWith("#")) {
+                    ArrayList<String> params = new ArrayList<>();
+                    params.add("#global");
+                    if (!argument0.equals("purge") && sender.getServer().getPluginManager().getPlugin("WorldEdit") != null) {
+                        params.add("#worldedit");
+                    }
+                    List<World> worlds = sender.getServer().getWorlds();
+                    for (World world : worlds) {
+                        params.add("#" + world.getName());
+                    }
+                    List<String> completions = new ArrayList<>(params);
+                    for (int index = 0; index < completions.size(); index++) {
+                        completions.set(index, filter + completions.get(index));
+                    }
+                    return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
+                }
             }
-        }
-        else {
-            filter = "";
-            arg = currentArg;
-        }
+            else if ((sender.hasPermission("coreprotect.lookup") || sender.hasPermission("coreprotect.rollback") || sender.hasPermission("coreprotect.restore")) && (lastArg.equals("i:") || lastArg.equals("include:") || lastArg.equals("item:") || lastArg.equals("items:") || lastArg.equals("b:") || lastArg.equals("block:") || lastArg.equals("blocks:") || currentArg.startsWith("i:") || currentArg.startsWith("include:") || currentArg.startsWith("item:") || currentArg.startsWith("items:") || currentArg.startsWith("b:") || currentArg.startsWith("block:") || currentArg.startsWith("blocks:") || lastArg.equals("e:") || lastArg.equals("exclude:") || currentArg.startsWith("e:") || currentArg.startsWith("exclude:"))) {
+                String filter = lastArg;
+                String arg = "";
+                if (currentArg.contains(":")) {
+                    String[] split = currentArg.split(":", 2);
+                    filter = split[0] + ":";
+                    if (split.length > 1) {
+                        arg = split[1];
+                    }
+                }
+                else {
+                    filter = "";
+                    arg = currentArg;
+                }
 
-        if (!baseCommand.equals("purge") && arg.chars().allMatch(Character::isDigit)) {
-            List<String> completions = new ArrayList<>(Arrays.asList(NUMBERS));
-            if (arg.length() < 2) {
+                if (materials == null) {
+                    List<Material> addList = Arrays.asList(Material.ARMOR_STAND);
+                    List<Material> excludeList = Arrays.asList();
+                    Set<String> materialList = new HashSet<>();
+
+                    Material[] materialValues = Material.values();
+                    for (Material material : materialValues) {
+                        if (material.isBlock() || material.isItem()) {
+                            materialList.add(material.name().toLowerCase(Locale.ROOT));
+                        }
+                    }
+                    for (Material exclude : excludeList) {
+                        materialList.remove(exclude.name().toLowerCase(Locale.ROOT));
+                    }
+                    for (Material add : addList) {
+                        materialList.add(add.name().toLowerCase(Locale.ROOT));
+                    }
+
+                    materials = new ArrayList<>(materialList);
+                }
+
+                List<String> completions = new ArrayList<>(materials);
                 for (int index = 0; index < completions.size(); index++) {
-                    completions.set(index, filter + arg + completions.get(index));
+                    completions.set(index, filter + completions.get(index));
+                }
+                return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
+
+            }
+            else if (args.length == 2) {
+                if (argument0.equals("help") && sender.hasPermission("coreprotect.help")) {
+                    List<String> completions = new ArrayList<>(Arrays.asList(HELP));
+                    return StringUtil.copyPartialMatches(argument1, completions, new ArrayList<>(completions.size()));
+                }
+                else if (argument0.equals("purge") && sender.hasPermission("coreprotect.purge")) {
+                    List<String> completions = new ArrayList<>(Arrays.asList("t:", "r:"));
+                    return StringUtil.copyPartialMatches(argument1, completions, new ArrayList<>(completions.size()));
+                }
+                else if ((sender.hasPermission("coreprotect.lookup") && (argument0.equals("l") || argument0.equals("lookup"))) || (sender.hasPermission("coreprotect.rollback") && (argument0.equals("rollback") || argument0.equals("rb") || argument0.equals("ro"))) || (sender.hasPermission("coreprotect.restore") && (argument0.equals("restore") || argument0.equals("rs") || argument0.equals("re")))) {
+                    List<String> completions = new ArrayList<>(filterParams(true, argument0, argument1, hasUser, hasAction, hasInclude, hasExclude, hasRadius, hasTime, hasContainer, hasCount, hasPreview, pageLookup, validContainer));
+                    completions.addAll(Bukkit.getOnlinePlayers().stream().filter(player -> player.getName().toLowerCase(Locale.ROOT).startsWith(argument1)).map(Player::getName).collect(Collectors.toList()));
+                    return StringUtil.copyPartialMatches(argument1, completions, new ArrayList<>(completions.size()));
                 }
             }
-            return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
-        }
-        else if (baseCommand.equals("purge") || arg.startsWith("#")) {
-            ArrayList<String> params = new ArrayList<>();
-            params.add("#global");
-            if (!baseCommand.equals("purge") && Bukkit.getServer().getPluginManager().getPlugin("WorldEdit") != null) {
-                params.add("#worldedit");
+            else if (args.length == 3 && argument0.equals("purge") && sender.hasPermission("coreprotect.purge")) {
+                if (argument1.startsWith("t:")) {
+                    List<String> completions = new ArrayList<>(Arrays.asList("r:"));
+                    return StringUtil.copyPartialMatches(args[2].toLowerCase(Locale.ROOT), completions, new ArrayList<>(completions.size()));
+                }
+                else if (argument1.startsWith("r:")) {
+                    List<String> completions = new ArrayList<>(Arrays.asList("t:"));
+                    return StringUtil.copyPartialMatches(args[2].toLowerCase(Locale.ROOT), completions, new ArrayList<>(completions.size()));
+                }
+                return Arrays.asList("");
             }
-            List<World> worlds = Bukkit.getServer().getWorlds();
-            for (World world : worlds) {
-                params.add("#" + world.getName());
-            }
-            List<String> completions = new ArrayList<>(params);
-            for (int index = 0; index < completions.size(); index++) {
-                completions.set(index, filter + completions.get(index));
-            }
-            return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
-        }
-
-        return null;
-    }
-
-    private List<String> handleMaterialParamCompletions(String currentArg, String lastArg) {
-        String filter = lastArg;
-        String arg = "";
-        if (currentArg.contains(":")) {
-            String[] split = currentArg.split(":", 2);
-            filter = split[0] + ":";
-            if (split.length > 1) {
-                arg = split[1];
-            }
-        }
-        else {
-            filter = "";
-            arg = currentArg;
-        }
-
-        initializeMaterialsIfNeeded();
-
-        List<String> completions = new ArrayList<>(materials);
-        for (int index = 0; index < completions.size(); index++) {
-            completions.set(index, filter + completions.get(index));
-        }
-        return StringUtil.copyPartialMatches(filter + arg, completions, new ArrayList<>(completions.size()));
-    }
-
-    private void initializeMaterialsIfNeeded() {
-        if (materials == null) {
-            List<Material> addList = Arrays.asList(Material.ARMOR_STAND);
-            List<Material> excludeList = Arrays.asList();
-            Set<String> materialList = new HashSet<>();
-
-            Material[] materialValues = Material.values();
-            for (Material material : materialValues) {
-                if (material.isBlock() || material.isItem()) {
-                    materialList.add(material.name().toLowerCase(Locale.ROOT));
+            else if ((sender.hasPermission("coreprotect.lookup") && (argument0.equals("l") || argument0.equals("lookup"))) || (sender.hasPermission("coreprotect.rollback") && (argument0.equals("rollback") || argument0.equals("rb") || argument0.equals("ro"))) || (sender.hasPermission("coreprotect.restore") && (argument0.equals("restore") || argument0.equals("rs") || argument0.equals("re")))) {
+                if ((!argument0.equals("l") && !argument0.equals("lookup")) || !hasPage) {
+                    ArrayList<String> params = filterParams(false, argument0, currentArg, hasUser, hasAction, hasInclude, hasExclude, hasRadius, hasTime, hasContainer, hasCount, hasPreview, pageLookup, validContainer);
+                    List<String> completions = new ArrayList<>(params);
+                    return StringUtil.copyPartialMatches(currentArg, completions, new ArrayList<>(completions.size()));
                 }
             }
-            for (Material exclude : excludeList) {
-                materialList.remove(exclude.name().toLowerCase(Locale.ROOT));
-            }
-            for (Material add : addList) {
-                materialList.add(add.name().toLowerCase(Locale.ROOT));
-            }
-
-            // add custom tags
-            for (String tag : CommandParser.getTags().keySet()) {
-                materialList.add(tag);
-            }
-
-            materials = new ArrayList<>(materialList);
-        }
-    }
-
-    private List<String> handleSecondArgCompletions(CommandSender sender, String cmd0, String cmd1, ParamState paramState) {
-        String argument0 = cmd0.toLowerCase(Locale.ROOT);
-        String argument1 = cmd1.toLowerCase(Locale.ROOT);
-
-        if (argument0.equals("help") && sender.hasPermission("coreprotect.help")) {
-            List<String> completions = new ArrayList<>(Arrays.asList(HELP));
-            return StringUtil.copyPartialMatches(argument1, completions, new ArrayList<>(completions.size()));
-        }
-        else if (argument0.equals("purge") && sender.hasPermission("coreprotect.purge")) {
-            List<String> completions = new ArrayList<>(Arrays.asList("t:", "r:", "i:"));
-            return StringUtil.copyPartialMatches(argument1, completions, new ArrayList<>(completions.size()));
-        }
-        else if (hasLookupCommand(argument0, sender)) {
-            List<String> completions = new ArrayList<>(filterParams(true, argument0, argument1, paramState));
-            completions.addAll(Bukkit.getOnlinePlayers().stream().filter(player -> player.getName().toLowerCase(Locale.ROOT).startsWith(argument1)).map(Player::getName).collect(Collectors.toList()));
-            return StringUtil.copyPartialMatches(argument1, completions, new ArrayList<>(completions.size()));
         }
 
-        return null;
-    }
-
-    private List<String> handlePurgeThirdArgCompletions(String arg1, String arg2) {
-        String argument1 = arg1.toLowerCase(Locale.ROOT);
-        String argument2 = arg2.toLowerCase(Locale.ROOT);
-
-        if (argument1.startsWith("t:")) {
-            List<String> completions = new ArrayList<>(Arrays.asList("r:", "i:"));
-            return StringUtil.copyPartialMatches(argument2, completions, new ArrayList<>(completions.size()));
-        }
-        else if (argument1.startsWith("r:") || argument1.startsWith("i:")) {
-            List<String> completions = new ArrayList<>(Arrays.asList("t:"));
-            return StringUtil.copyPartialMatches(argument2, completions, new ArrayList<>(completions.size()));
-        }
         return Arrays.asList("");
     }
 
-    private List<String> handleGenericLookupCompletions(String cmd, String currentArg, ParamState paramState) {
-        ArrayList<String> params = filterParams(false, cmd, currentArg, paramState);
-        List<String> completions = new ArrayList<>(params);
-        return StringUtil.copyPartialMatches(currentArg, completions, new ArrayList<>(completions.size()));
-    }
-
-    private ArrayList<String> filterParams(boolean firstParam, String lastArgument, String argument, ParamState state) {
+    private ArrayList<String> filterParams(boolean firstParam, String lastArgument, String argument, boolean hasUser, boolean hasAction, boolean hasInclude, boolean hasExclude, boolean hasRadius, boolean hasTime, boolean hasContainer, boolean hasCount, boolean hasPreview, boolean pageLookup, boolean validContainer) {
         ArrayList<String> params = new ArrayList<>();
         for (String param : PARAMS) {
-            if (param.equals("user:") && !state.hasUser) {
+            if (param.equals("user:") && !hasUser) {
                 params.add(param);
             }
-            else if (param.equals("action:") && !state.hasAction) {
+            else if (param.equals("action:") && !hasAction) {
                 params.add(param);
             }
-            else if (param.equals("include:") && !state.hasInclude) {
+            else if (param.equals("include:") && !hasInclude) {
                 params.add(param);
             }
-            else if (param.equals("exclude:") && !state.hasExclude) {
+            else if (param.equals("exclude:") && !hasExclude) {
                 params.add(param);
             }
-            else if (param.equals("radius:") && !state.hasRadius) {
+            else if (param.equals("radius:") && !hasRadius) {
                 params.add(param);
             }
-            else if (param.equals("time:") && !state.hasTime) {
+            else if (param.equals("time:") && !hasTime) {
                 params.add(param);
             }
-            else if (param.equals("#container") && !state.hasContainer && !state.hasRadius && state.validContainer) {
+            else if (param.equals("#container") && !hasContainer && !hasRadius && validContainer) {
                 params.add(param);
             }
         }
-        if (firstParam && state.pageLookup && (lastArgument.equals("l") || lastArgument.equals("lookup"))) {
+        if (firstParam && pageLookup && (lastArgument.equals("l") || lastArgument.equals("lookup"))) {
             params.add("page:");
         }
         else if (!firstParam && argument.startsWith("#")) {
-            if (!state.hasCount) {
+            if (!hasCount) {
                 params.add("#count");
             }
-            if (!state.hasPreview) {
+            if (!hasPreview) {
                 params.add("#preview");
             }
         }

src/main/java/net/coreprotect/command/TeleportCommand.java

@@ -15,7 +15,6 @@ import net.coreprotect.utility.ChatMessage;
 import net.coreprotect.utility.Color;
 import net.coreprotect.utility.Teleport;
 import net.coreprotect.utility.Util;
-import net.coreprotect.utility.WorldUtils;
 
 public class TeleportCommand {
 
@@ -46,7 +45,7 @@ public class TeleportCommand {
         }
 
         String worldName = args[1];
-        int wid = WorldUtils.matchWorld(worldName);
+        int wid = Util.matchWorld(worldName);
         if (wid == -1 && resultc >= 5) {
             Chat.sendMessage(player, new ChatMessage(Phrase.build(Phrase.WORLD_NOT_FOUND, worldName)).build());
             return;
@@ -55,7 +54,7 @@ public class TeleportCommand {
         Location location = ((Player) player).getLocation().clone();
         World world = location.getWorld();
         if (wid > -1) {
-            world = Bukkit.getServer().getWorld(WorldUtils.getWorldName(wid));
+            world = Bukkit.getServer().getWorld(Util.getWorldName(wid));
         }
 
         String x = null;

src/main/java/net/coreprotect/command/lookup/BlockLookupThread.java

@@ -1,90 +0,0 @@
-package net.coreprotect.command.lookup;
-
-import java.sql.Connection;
-import java.sql.Statement;
-
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-
-import net.coreprotect.config.ConfigHandler;
-import net.coreprotect.database.Database;
-import net.coreprotect.database.lookup.BlockLookup;
-import net.coreprotect.database.lookup.InteractionLookup;
-import net.coreprotect.database.lookup.SignMessageLookup;
-import net.coreprotect.language.Phrase;
-import net.coreprotect.utility.Chat;
-import net.coreprotect.utility.Color;
-
-public class BlockLookupThread implements Runnable {
-    private final CommandSender player;
-    private final Command command;
-    private final Block block;
-    private final BlockState blockState;
-    private final int page;
-    private final int limit;
-    private final int type;
-
-    public BlockLookupThread(CommandSender player, Command command, Block block, BlockState blockState, int page, int limit, int type) {
-        this.player = player;
-        this.command = command;
-        this.block = block;
-        this.blockState = blockState;
-        this.page = page;
-        this.limit = limit;
-        this.type = type;
-    }
-
-    @Override
-    public void run() {
-        try (Connection connection = Database.getConnection(true)) {
-            ConfigHandler.lookupThrottle.put(player.getName(), new Object[] { true, System.currentTimeMillis() });
-            if (connection != null) {
-                Statement statement = connection.createStatement();
-                if (type == 8) {
-                    java.util.List<String> signData = SignMessageLookup.performLookup(command.getName(), statement, blockState.getLocation(), player, page, limit);
-                    for (String signMessage : signData) {
-                        String bypass = null;
-
-                        if (signMessage.contains("\n")) {
-                            String[] split = signMessage.split("\n");
-                            signMessage = split[0];
-                            bypass = split[1];
-                        }
-
-                        if (signMessage.length() > 0) {
-                            Chat.sendComponent(player, signMessage, bypass);
-                        }
-                    }
-                }
-                else {
-                    String blockdata = null;
-                    if (type == 7) {
-                        blockdata = InteractionLookup.performLookup(command.getName(), statement, block, player, 0, page, limit);
-                    }
-                    else {
-                        blockdata = BlockLookup.performLookup(command.getName(), statement, blockState, player, 0, page, limit);
-                    }
-                    if (blockdata.contains("\n")) {
-                        for (String b : blockdata.split("\n")) {
-                            Chat.sendComponent(player, b);
-                        }
-                    }
-                    else if (blockdata.length() > 0) {
-                        Chat.sendComponent(player, blockdata);
-                    }
-                }
-                statement.close();
-            }
-            else {
-                Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        ConfigHandler.lookupThrottle.put(player.getName(), new Object[] { false, System.currentTimeMillis() });
-    }
-}

src/main/java/net/coreprotect/command/lookup/ChestTransactionLookupThread.java

@@ -1,55 +0,0 @@
-package net.coreprotect.command.lookup;
-
-import java.sql.Connection;
-import java.sql.Statement;
-import java.util.List;
-
-import org.bukkit.Location;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-
-import net.coreprotect.config.ConfigHandler;
-import net.coreprotect.database.Database;
-import net.coreprotect.database.lookup.ChestTransactionLookup;
-import net.coreprotect.language.Phrase;
-import net.coreprotect.utility.Chat;
-import net.coreprotect.utility.Color;
-
-public class ChestTransactionLookupThread implements Runnable {
-    private final CommandSender player;
-    private final Command command;
-    private final Location location;
-    private final int page;
-    private final int limit;
-
-    public ChestTransactionLookupThread(CommandSender player, Command command, Location location, int page, int limit) {
-        this.player = player;
-        this.command = command;
-        this.location = location;
-        this.page = page;
-        this.limit = limit;
-    }
-
-    @Override
-    public void run() {
-        try (Connection connection = Database.getConnection(true)) {
-            ConfigHandler.lookupThrottle.put(player.getName(), new Object[] { true, System.currentTimeMillis() });
-            if (connection != null) {
-                Statement statement = connection.createStatement();
-                List<String> blockData = ChestTransactionLookup.performLookup(command.getName(), statement, location, player, page, limit, false);
-                for (String data : blockData) {
-                    Chat.sendComponent(player, data);
-                }
-                statement.close();
-            }
-            else {
-                Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        ConfigHandler.lookupThrottle.put(player.getName(), new Object[] { false, System.currentTimeMillis() });
-    }
-}

src/main/java/net/coreprotect/command/lookup/StandardLookupThread.java

@@ -1,470 +0,0 @@
-package net.coreprotect.command.lookup;
-
-import java.nio.charset.StandardCharsets;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-
-import com.google.common.base.Strings;
-
-import net.coreprotect.config.ConfigHandler;
-import net.coreprotect.database.Database;
-import net.coreprotect.database.Lookup;
-import net.coreprotect.database.logger.ItemLogger;
-import net.coreprotect.database.lookup.PlayerLookup;
-import net.coreprotect.database.statement.UserStatement;
-import net.coreprotect.language.Phrase;
-import net.coreprotect.language.Selector;
-import net.coreprotect.listener.channel.PluginChannelHandshakeListener;
-import net.coreprotect.listener.channel.PluginChannelListener;
-import net.coreprotect.utility.Chat;
-import net.coreprotect.utility.ChatUtils;
-import net.coreprotect.utility.Color;
-import net.coreprotect.utility.EntityUtils;
-import net.coreprotect.utility.ItemUtils;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.StringUtils;
-import net.coreprotect.utility.WorldUtils;
-
-public class StandardLookupThread implements Runnable {
-    private final CommandSender player;
-    private final Command command;
-    private final List<String> rollbackUsers;
-    private final List<Object> blockList;
-    private final Map<Object, Boolean> excludedBlocks;
-    private final List<String> excludedUsers;
-    private final List<Integer> actions;
-    private final Integer[] radius;
-    private final Location location;
-    private final int x;
-    private final int y;
-    private final int z;
-    private final int worldId;
-    private final int argWorldId;
-    private final long timeStart;
-    private final long timeEnd;
-    private final int noisy;
-    private final int excluded;
-    private final int restricted;
-    private final int page;
-    private final int displayResults;
-    private final int typeLookup;
-    private final String rtime;
-    private final boolean count;
-
-    public StandardLookupThread(CommandSender player, Command command, List<String> rollbackUsers, List<Object> blockList, Map<Object, Boolean> excludedBlocks, List<String> excludedUsers, List<Integer> actions, Integer[] radius, Location location, int x, int y, int z, int worldId, int argWorldId, long timeStart, long timeEnd, int noisy, int excluded, int restricted, int page, int displayResults, int typeLookup, String rtime, boolean count) {
-        this.player = player;
-        this.command = command;
-        this.rollbackUsers = rollbackUsers;
-        this.blockList = blockList;
-        this.excludedBlocks = excludedBlocks;
-        this.excludedUsers = excludedUsers;
-        this.actions = actions;
-        this.radius = radius;
-        this.location = location;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.worldId = worldId;
-        this.argWorldId = argWorldId;
-        this.timeStart = timeStart;
-        this.timeEnd = timeEnd;
-        this.noisy = noisy;
-        this.excluded = excluded;
-        this.restricted = restricted;
-        this.page = page;
-        this.displayResults = displayResults;
-        this.typeLookup = typeLookup;
-        this.rtime = rtime;
-        this.count = count;
-    }
-
-    @Override
-    public void run() {
-        try (Connection connection = Database.getConnection(true)) {
-            ConfigHandler.lookupThrottle.put(player.getName(), new Object[] { true, System.currentTimeMillis() });
-
-            List<String> uuidList = new ArrayList<>();
-            Location finalLocation = location;
-            boolean exists = false;
-            String bc = x + "." + y + "." + z + "." + worldId + "." + timeStart + "." + timeEnd + "." + noisy + "." + excluded + "." + restricted + "." + argWorldId + "." + displayResults;
-            ConfigHandler.lookupCommand.put(player.getName(), bc);
-            ConfigHandler.lookupPage.put(player.getName(), page);
-            ConfigHandler.lookupTime.put(player.getName(), rtime);
-            ConfigHandler.lookupType.put(player.getName(), 5);
-            ConfigHandler.lookupElist.put(player.getName(), excludedBlocks);
-            ConfigHandler.lookupEUserlist.put(player.getName(), excludedUsers);
-            ConfigHandler.lookupBlist.put(player.getName(), blockList);
-            ConfigHandler.lookupUlist.put(player.getName(), rollbackUsers);
-            ConfigHandler.lookupAlist.put(player.getName(), actions);
-            ConfigHandler.lookupRadius.put(player.getName(), radius);
-
-            if (connection != null) {
-                Statement statement = connection.createStatement();
-                String baduser = "";
-                for (String check : rollbackUsers) {
-                    if ((!check.equals("#global") && !check.equals("#container")) || actions.contains(9)) {
-                        exists = PlayerLookup.playerExists(connection, check);
-                        if (!exists) {
-                            baduser = check;
-                            break;
-                        }
-                        else if (actions.contains(9)) {
-                            if (ConfigHandler.uuidCache.get(check.toLowerCase(Locale.ROOT)) != null) {
-                                String uuid = ConfigHandler.uuidCache.get(check.toLowerCase(Locale.ROOT));
-                                uuidList.add(uuid);
-                            }
-                        }
-                    }
-                    else {
-                        exists = true;
-                    }
-                }
-                if (exists) {
-                    for (String check : excludedUsers) {
-                        if (!check.equals("#global") && !check.equals("#hopper")) {
-                            exists = PlayerLookup.playerExists(connection, check);
-                            if (!exists) {
-                                baduser = check;
-                                break;
-                            }
-                        }
-                        else if (check.equals("#global")) {
-                            baduser = "#global";
-                            exists = false;
-                        }
-                    }
-                }
-
-                if (exists) {
-                    List<String> userList = new ArrayList<>();
-                    if (!actions.contains(9)) {
-                        userList = rollbackUsers;
-                    }
-
-                    int unixtimestamp = (int) (System.currentTimeMillis() / 1000L);
-                    boolean restrict_world = false;
-                    if (radius != null) {
-                        restrict_world = true;
-                    }
-                    if (finalLocation == null) {
-                        restrict_world = false;
-                    }
-                    if (argWorldId > 0) {
-                        restrict_world = true;
-                        finalLocation = new Location(Bukkit.getServer().getWorld(WorldUtils.getWorldName(argWorldId)), x, y, z);
-                    }
-                    else if (finalLocation != null) {
-                        finalLocation = new Location(Bukkit.getServer().getWorld(WorldUtils.getWorldName(worldId)), x, y, z);
-                    }
-
-                    Long[] rowData = new Long[] { 0L, 0L, 0L, 0L };
-                    long rowMax = (long) page * displayResults;
-                    long pageStart = rowMax - displayResults;
-                    long rows = 0L;
-                    boolean checkRows = true;
-
-                    if (typeLookup == 5 && page > 1) {
-                        rowData = ConfigHandler.lookupRows.get(player.getName());
-                        rows = rowData[3];
-
-                        if (pageStart < rows) {
-                            checkRows = false;
-                        }
-                    }
-
-                    if (checkRows) {
-                        rows = Lookup.countLookupRows(statement, player, uuidList, userList, blockList, excludedBlocks, excludedUsers, actions, finalLocation, radius, rowData, timeStart, timeEnd, restrict_world, true);
-                        rowData[3] = rows;
-                        ConfigHandler.lookupRows.put(player.getName(), rowData);
-                    }
-                    if (count) {
-                        String row_format = NumberFormat.getInstance().format(rows);
-                        Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.LOOKUP_ROWS_FOUND, row_format, (rows == 1 ? Selector.FIRST : Selector.SECOND)));
-                    }
-                    else if (pageStart < rows) {
-                        List<String[]> lookupList = Lookup.performPartialLookup(statement, player, uuidList, userList, blockList, excludedBlocks, excludedUsers, actions, finalLocation, radius, rowData, timeStart, timeEnd, (int) pageStart, displayResults, restrict_world, true);
-
-                        Chat.sendMessage(player, Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.LOOKUP_HEADER, "CoreProtect" + Color.WHITE + " | " + Color.DARK_AQUA) + Color.WHITE + " -----");
-                        if (actions.contains(6) || actions.contains(7)) { // Chat/command
-                            for (String[] data : lookupList) {
-                                String time = data[0];
-                                String dplayer = data[1];
-                                String message = data[2];
-                                String timeago = ChatUtils.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
-                                Chat.sendComponent(player, timeago + " " + Color.WHITE + "- " + Color.DARK_AQUA + dplayer + ": " + Color.WHITE, message);
-                                if (PluginChannelHandshakeListener.getInstance().isPluginChannelPlayer(player)) {
-                                    int wid = Integer.parseInt(data[3]);
-                                    int dataX = Integer.parseInt(data[4]);
-                                    int dataY = Integer.parseInt(data[5]);
-                                    int dataZ = Integer.parseInt(data[6]);
-                                    PluginChannelListener.getInstance().sendMessageData(player, Integer.parseInt(time), dplayer, message, false, dataX, dataY, dataZ, wid);
-                                }
-                            }
-                        }
-                        else if (actions.contains(8)) { // login/logouts
-                            for (String[] data : lookupList) {
-                                String time = data[0];
-                                String dplayer = data[1];
-                                int wid = Integer.parseInt(data[2]);
-                                int dataX = Integer.parseInt(data[3]);
-                                int dataY = Integer.parseInt(data[4]);
-                                int dataZ = Integer.parseInt(data[5]);
-                                int action = Integer.parseInt(data[6]);
-                                String timeago = ChatUtils.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
-                                int timeLength = 50 + (ChatUtils.getTimeSince(Integer.parseInt(time), unixtimestamp, false).replaceAll("[^0-9]", "").length() * 6);
-                                String leftPadding = Color.BOLD + Strings.padStart("", 10, ' ');
-                                if (timeLength % 4 == 0) {
-                                    leftPadding = Strings.padStart("", timeLength / 4, ' ');
-                                }
-                                else {
-                                    leftPadding = leftPadding + Color.WHITE + Strings.padStart("", (timeLength - 50) / 4, ' ');
-                                }
-
-                                String tag = (action != 0 ? Color.GREEN + "+" : Color.RED + "-");
-                                Chat.sendComponent(player, timeago + " " + tag + " " + Color.DARK_AQUA + Phrase.build(Phrase.LOOKUP_LOGIN, Color.DARK_AQUA + dplayer + Color.WHITE, (action != 0 ? Selector.FIRST : Selector.SECOND)));
-                                Chat.sendComponent(player, Color.WHITE + leftPadding + Color.GREY + "^ " + ChatUtils.getCoordinates(command.getName(), wid, dataX, dataY, dataZ, true, true) + "");
-                                PluginChannelListener.getInstance().sendInfoData(player, Integer.parseInt(time), Phrase.LOOKUP_LOGIN, (action != 0 ? Selector.FIRST : Selector.SECOND), dplayer, -1, dataX, dataY, dataZ, wid);
-                            }
-                        }
-                        else if (actions.contains(9)) { // username-changes
-                            for (String[] data : lookupList) {
-                                String time = data[0];
-                                String user = ConfigHandler.uuidCacheReversed.get(data[1]);
-                                String username = data[2];
-                                String timeago = ChatUtils.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
-                                Chat.sendComponent(player, timeago + " " + Color.WHITE + "- " + Phrase.build(Phrase.LOOKUP_USERNAME, Color.DARK_AQUA + user + Color.WHITE, Color.DARK_AQUA + username + Color.WHITE));
-                                PluginChannelListener.getInstance().sendUsernameData(player, Integer.parseInt(time), user, username);
-                            }
-                        }
-                        else if (actions.contains(10)) { // sign messages
-                            for (String[] data : lookupList) {
-                                String time = data[0];
-                                String dplayer = data[1];
-                                int wid = Integer.parseInt(data[2]);
-                                int dataX = Integer.parseInt(data[3]);
-                                int dataY = Integer.parseInt(data[4]);
-                                int dataZ = Integer.parseInt(data[5]);
-                                String message = data[6];
-                                String timeago = ChatUtils.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
-                                int timeLength = 50 + (ChatUtils.getTimeSince(Integer.parseInt(time), unixtimestamp, false).replaceAll("[^0-9]", "").length() * 6);
-                                String leftPadding = Color.BOLD + Strings.padStart("", 10, ' ');
-                                if (timeLength % 4 == 0) {
-                                    leftPadding = Strings.padStart("", timeLength / 4, ' ');
-                                }
-                                else {
-                                    leftPadding = leftPadding + Color.WHITE + Strings.padStart("", (timeLength - 50) / 4, ' ');
-                                }
-
-                                Chat.sendComponent(player, timeago + " " + Color.WHITE + "- " + Color.DARK_AQUA + dplayer + ": " + Color.WHITE, message);
-                                Chat.sendComponent(player, Color.WHITE + leftPadding + Color.GREY + "^ " + ChatUtils.getCoordinates(command.getName(), wid, dataX, dataY, dataZ, true, true) + "");
-                                PluginChannelListener.getInstance().sendMessageData(player, Integer.parseInt(time), dplayer, message, true, dataX, dataY, dataZ, wid);
-                            }
-                        }
-                        else if (actions.contains(4) && actions.contains(11)) { // inventory transactions
-                            for (String[] data : lookupList) {
-                                String time = data[0];
-                                String dplayer = data[1];
-                                int dtype = Integer.parseInt(data[5]);
-                                int ddata = Integer.parseInt(data[6]);
-                                int daction = Integer.parseInt(data[7]);
-                                int amount = Integer.parseInt(data[10]);
-                                int wid = Integer.parseInt(data[9]);
-                                int dataX = Integer.parseInt(data[2]);
-                                int dataY = Integer.parseInt(data[3]);
-                                int dataZ = Integer.parseInt(data[4]);
-                                String rbd = ((Integer.parseInt(data[8]) == 2 || Integer.parseInt(data[8]) == 3) ? Color.STRIKETHROUGH : "");
-                                String timeago = ChatUtils.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
-                                Material blockType = ItemUtils.itemFilter(MaterialUtils.getType(dtype), (Integer.parseInt(data[13]) == 0));
-                                String dname = StringUtils.nameFilter(blockType.name().toLowerCase(Locale.ROOT), ddata);
-                                byte[] metadata = data[11] == null ? null : data[11].getBytes(StandardCharsets.ISO_8859_1);
-                                String tooltip = ItemUtils.getEnchantments(metadata, dtype, amount);
-
-                                String selector = Selector.FIRST;
-                                String tag = Color.WHITE + "-";
-                                if (daction == 2 || daction == 3) { // LOOKUP_ITEM
-                                    selector = (daction != 2 ? Selector.FIRST : Selector.SECOND);
-                                    tag = (daction != 2 ? Color.GREEN + "+" : Color.RED + "-");
-                                }
-                                else if (daction == 4 || daction == 5) { // LOOKUP_STORAGE
-                                    selector = (daction == 4 ? Selector.FIRST : Selector.SECOND);
-                                    tag = (daction == 4 ? Color.GREEN + "+" : Color.RED + "-");
-                                }
-                                else if (daction == 6 || daction == 7) { // LOOKUP_PROJECTILE
-                                    selector = Selector.SECOND;
-                                    tag = Color.RED + "-";
-                                }
-                                else if (daction == ItemLogger.ITEM_BREAK || daction == ItemLogger.ITEM_DESTROY || daction == ItemLogger.ITEM_CREATE) {
-                                    selector = (daction == ItemLogger.ITEM_CREATE ? Selector.FIRST : Selector.SECOND);
-                                    tag = (daction == ItemLogger.ITEM_CREATE ? Color.GREEN + "+" : Color.RED + "-");
-                                }
-                                else if (daction == ItemLogger.ITEM_SELL || daction == ItemLogger.ITEM_BUY) { // LOOKUP_TRADE
-                                    selector = (daction == ItemLogger.ITEM_BUY ? Selector.FIRST : Selector.SECOND);
-                                    tag = (daction == ItemLogger.ITEM_BUY ? Color.GREEN + "+" : Color.RED + "-");
-                                }
-                                else { // LOOKUP_CONTAINER
-                                    selector = (daction == 0 ? Selector.FIRST : Selector.SECOND);
-                                    tag = (daction == 0 ? Color.GREEN + "+" : Color.RED + "-");
-                                }
-
-                                Chat.sendComponent(player, timeago + " " + tag + " " + Phrase.build(Phrase.LOOKUP_CONTAINER, Color.DARK_AQUA + rbd + dplayer + Color.WHITE + rbd, "x" + amount, ChatUtils.createTooltip(Color.DARK_AQUA + rbd + dname, tooltip) + Color.WHITE, selector));
-                                PluginChannelListener.getInstance().sendData(player, Integer.parseInt(time), Phrase.LOOKUP_CONTAINER, selector, dplayer, dname, amount, dataX, dataY, dataZ, wid, rbd, true, tag.contains("+"));
-                            }
-                        }
-                        else {
-                            for (String[] data : lookupList) {
-                                int drb = Integer.parseInt(data[8]);
-                                String rbd = "";
-                                if (drb == 1 || drb == 3) {
-                                    rbd = Color.STRIKETHROUGH;
-                                }
-
-                                String time = data[0];
-                                String dplayer = data[1];
-                                int dataX = Integer.parseInt(data[2]);
-                                int dataY = Integer.parseInt(data[3]);
-                                int dataZ = Integer.parseInt(data[4]);
-                                int dtype = Integer.parseInt(data[5]);
-                                int ddata = Integer.parseInt(data[6]);
-                                int daction = Integer.parseInt(data[7]);
-                                int wid = Integer.parseInt(data[9]);
-                                int amount = Integer.parseInt(data[10]);
-                                String tag = Color.WHITE + "-";
-
-                                String timeago = ChatUtils.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
-                                int timeLength = 50 + (ChatUtils.getTimeSince(Integer.parseInt(time), unixtimestamp, false).replaceAll("[^0-9]", "").length() * 6);
-                                String leftPadding = Color.BOLD + Strings.padStart("", 10, ' ');
-                                if (timeLength % 4 == 0) {
-                                    leftPadding = Strings.padStart("", timeLength / 4, ' ');
-                                }
-                                else {
-                                    leftPadding = leftPadding + Color.WHITE + Strings.padStart("", (timeLength - 50) / 4, ' ');
-                                }
-
-                                String dname = "";
-                                boolean isPlayer = false;
-                                if (daction == 3 && !actions.contains(11) && amount == -1) {
-                                    if (dtype == 0) {
-                                        if (ConfigHandler.playerIdCacheReversed.get(ddata) == null) {
-                                            UserStatement.loadName(connection, ddata);
-                                        }
-                                        dname = ConfigHandler.playerIdCacheReversed.get(ddata);
-                                        isPlayer = true;
-                                    }
-                                    else {
-                                        dname = EntityUtils.getEntityType(dtype).name();
-                                    }
-                                }
-                                else {
-                                    dname = MaterialUtils.getType(dtype).name().toLowerCase(Locale.ROOT);
-                                    dname = StringUtils.nameFilter(dname, ddata);
-                                }
-                                if (dname.length() > 0 && !isPlayer) {
-                                    dname = "minecraft:" + dname.toLowerCase(Locale.ROOT) + "";
-                                }
-
-                                // Hide "minecraft:" for now.
-                                if (dname.contains("minecraft:")) {
-                                    String[] blockNameSplit = dname.split(":");
-                                    dname = blockNameSplit[1];
-                                }
-
-                                // Functions.sendMessage(player2, timeago+" " + ChatColors.WHITE + "- " + ChatColors.DARK_AQUA+rbd+""+dplayer+" " + ChatColors.WHITE+rbd+""+a+" " + ChatColors.DARK_AQUA+rbd+"#"+dtype+ChatColors.WHITE + ". " + ChatColors.GREY + "(x"+x+"/y"+y+"/z"+z+")");
-
-                                Phrase phrase = Phrase.LOOKUP_BLOCK;
-                                String selector = Selector.FIRST;
-                                String action = "a:block";
-                                if (actions.contains(4) || actions.contains(5) || actions.contains(11) || amount > -1) {
-                                    byte[] metadata = data[11] == null ? null : data[11].getBytes(StandardCharsets.ISO_8859_1);
-                                    String tooltip = ItemUtils.getEnchantments(metadata, dtype, amount);
-
-                                    if (daction == 2 || daction == 3) {
-                                        phrase = Phrase.LOOKUP_ITEM; // {picked up|dropped}
-                                        selector = (daction != 2 ? Selector.FIRST : Selector.SECOND);
-                                        tag = (daction != 2 ? Color.GREEN + "+" : Color.RED + "-");
-                                        action = "a:item";
-                                    }
-                                    else if (daction == 4 || daction == 5) {
-                                        phrase = Phrase.LOOKUP_STORAGE; // {deposited|withdrew}
-                                        selector = (daction != 4 ? Selector.FIRST : Selector.SECOND);
-                                        tag = (daction != 4 ? Color.RED + "-" : Color.GREEN + "+");
-                                        action = "a:item";
-                                    }
-                                    else if (daction == 6 || daction == 7) {
-                                        phrase = Phrase.LOOKUP_PROJECTILE; // {threw|shot}
-                                        selector = (daction != 7 ? Selector.FIRST : Selector.SECOND);
-                                        tag = Color.RED + "-";
-                                        action = "a:item";
-                                    }
-                                    else {
-                                        phrase = Phrase.LOOKUP_CONTAINER; // {added|removed}
-                                        selector = (daction != 0 ? Selector.FIRST : Selector.SECOND);
-                                        tag = (daction != 0 ? Color.GREEN + "+" : Color.RED + "-");
-                                        action = "a:container";
-                                    }
-
-                                    Chat.sendComponent(player, timeago + " " + tag + " " + Phrase.build(phrase, Color.DARK_AQUA + rbd + dplayer + Color.WHITE + rbd, "x" + amount, ChatUtils.createTooltip(Color.DARK_AQUA + rbd + dname, tooltip) + Color.WHITE, selector));
-                                    PluginChannelListener.getInstance().sendData(player, Integer.parseInt(time), phrase, selector, dplayer, dname, (tag.contains("+") ? 1 : -1), dataX, dataY, dataZ, wid, rbd, action.contains("container"), tag.contains("+"));
-                                }
-                                else {
-                                    if (daction == 2 || daction == 3) {
-                                        phrase = Phrase.LOOKUP_INTERACTION; // {clicked|killed}
-                                        selector = (daction != 3 ? Selector.FIRST : Selector.SECOND);
-                                        tag = (daction != 3 ? Color.WHITE + "-" : Color.RED + "-");
-                                        action = (daction == 2 ? "a:click" : "a:kill");
-                                    }
-                                    else {
-                                        phrase = Phrase.LOOKUP_BLOCK; // {placed|broke}
-                                        selector = (daction != 0 ? Selector.FIRST : Selector.SECOND);
-                                        tag = (daction != 0 ? Color.GREEN + "+" : Color.RED + "-");
-                                    }
-
-                                    Chat.sendComponent(player, timeago + " " + tag + " " + Phrase.build(phrase, Color.DARK_AQUA + rbd + dplayer + Color.WHITE + rbd, Color.DARK_AQUA + rbd + dname + Color.WHITE, selector));
-                                    PluginChannelListener.getInstance().sendData(player, Integer.parseInt(time), phrase, selector, dplayer, dname, (tag.contains("+") ? 1 : -1), dataX, dataY, dataZ, wid, rbd, false, tag.contains("+"));
-                                }
-
-                                action = (actions.size() == 0 ? " (" + action + ")" : "");
-                                Chat.sendComponent(player, Color.WHITE + leftPadding + Color.GREY + "^ " + ChatUtils.getCoordinates(command.getName(), wid, dataX, dataY, dataZ, true, true) + Color.GREY + Color.ITALIC + action);
-                            }
-                        }
-                        if (rows > displayResults) {
-                            int total_pages = (int) Math.ceil(rows / (displayResults + 0.0));
-                            if (actions.contains(6) || actions.contains(7) || actions.contains(9) || (actions.contains(4) && actions.contains(11))) {
-                                Chat.sendMessage(player, "-----");
-                            }
-                            Chat.sendComponent(player, ChatUtils.getPageNavigation(command.getName(), page, total_pages));
-                        }
-                    }
-                    else if (rows > 0) {
-                        Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS_PAGE, Selector.FIRST));
-                    }
-                    else {
-                        Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS));
-                    }
-                }
-                else {
-                    Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.USER_NOT_FOUND, baduser));
-                }
-                statement.close();
-            }
-            else {
-                Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        ConfigHandler.lookupThrottle.put(player.getName(), new Object[] { false, System.currentTimeMillis() });
-    }
-}

src/main/java/net/coreprotect/command/parser/ActionParser.java

@@ -1,230 +0,0 @@
-package net.coreprotect.command.parser;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * Parser for action-related command arguments
- */
-public class ActionParser {
-
-    /**
-     * Parse page from command arguments
-     * 
-     * @param argumentArray
-     *            The command arguments
-     * @return The processed argument array
-     */
-    public static String[] parsePage(String[] argumentArray) {
-        if (argumentArray.length == 2) {
-            argumentArray[1] = argumentArray[1].replaceFirst("page:", "");
-        }
-
-        return argumentArray;
-    }
-
-    /**
-     * Parse action from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return A list of action integers
-     */
-    public static List<Integer> parseAction(String[] inputArguments) {
-        String[] argumentArray = inputArguments.clone();
-        List<Integer> result = new ArrayList<>();
-        int count = 0;
-        int next = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("a:") || argument.equals("action:")) {
-                    next = 1;
-                }
-                else if (next == 1 || argument.startsWith("a:") || argument.startsWith("action:")) {
-                    result.clear();
-                    argument = argument.replaceAll("action:", "");
-                    argument = argument.replaceAll("a:", "");
-                    if (argument.startsWith("#")) {
-                        argument = argument.replaceFirst("#", "");
-                    }
-                    if (argument.equals("broke") || argument.equals("break") || argument.equals("remove") || argument.equals("destroy") || argument.equals("block-break") || argument.equals("block-remove") || argument.equals("-block") || argument.equals("-blocks") || argument.equals("block-")) {
-                        result.add(0);
-                    }
-                    else if (argument.equals("placed") || argument.equals("place") || argument.equals("block-place") || argument.equals("+block") || argument.equals("+blocks") || argument.equals("block+")) {
-                        result.add(1);
-                    }
-                    else if (argument.equals("block") || argument.equals("blocks") || argument.equals("block-change") || argument.equals("change") || argument.equals("changes")) {
-                        result.add(0);
-                        result.add(1);
-                    }
-                    else if (argument.equals("click") || argument.equals("clicks") || argument.equals("interact") || argument.equals("interaction") || argument.equals("player-interact") || argument.equals("player-interaction") || argument.equals("player-click")) {
-                        result.add(2);
-                    }
-                    else if (argument.equals("death") || argument.equals("deaths") || argument.equals("entity-death") || argument.equals("entity-deaths") || argument.equals("kill") || argument.equals("kills") || argument.equals("entity-kill") || argument.equals("entity-kills")) {
-                        result.add(3);
-                    }
-                    else if (argument.equals("container") || argument.equals("container-change") || argument.equals("containers") || argument.equals("chest") || argument.equals("transaction") || argument.equals("transactions")) {
-                        result.add(4);
-                    }
-                    else if (argument.equals("-container") || argument.equals("container-") || argument.equals("remove-container")) {
-                        result.add(4);
-                        result.add(0);
-                    }
-                    else if (argument.equals("+container") || argument.equals("container+") || argument.equals("container-add") || argument.equals("add-container")) {
-                        result.add(4);
-                        result.add(1);
-                    }
-                    else if (argument.equals("chat") || argument.equals("chats")) {
-                        result.add(6);
-                    }
-                    else if (argument.equals("command") || argument.equals("commands")) {
-                        result.add(7);
-                    }
-                    else if (argument.equals("logins") || argument.equals("login") || argument.equals("+session") || argument.equals("+sessions") || argument.equals("session+") || argument.equals("+connection") || argument.equals("connection+")) {
-                        result.add(8);
-                        result.add(1);
-                    }
-                    else if (argument.equals("logout") || argument.equals("logouts") || argument.equals("-session") || argument.equals("-sessions") || argument.equals("session-") || argument.equals("-connection") || argument.equals("connection-")) {
-                        result.add(8);
-                        result.add(0);
-                    }
-                    else if (argument.equals("session") || argument.equals("sessions") || argument.equals("connection") || argument.equals("connections")) {
-                        result.add(8);
-                    }
-                    else if (argument.equals("username") || argument.equals("usernames") || argument.equals("user") || argument.equals("users") || argument.equals("name") || argument.equals("names") || argument.equals("uuid") || argument.equals("uuids") || argument.equals("username-change") || argument.equals("username-changes") || argument.equals("name-change") || argument.equals("name-changes")) {
-                        result.add(9);
-                    }
-                    else if (argument.equals("sign") || argument.equals("signs")) {
-                        result.add(10);
-                    }
-                    else if (argument.equals("inv") || argument.equals("inventory") || argument.equals("inventories")) {
-                        result.add(4); // container
-                        result.add(11); // item
-                    }
-                    else if (argument.equals("-inv") || argument.equals("inv-") || argument.equals("-inventory") || argument.equals("inventory-") || argument.equals("-inventories")) {
-                        result.add(4);
-                        result.add(11);
-                        result.add(1);
-                    }
-                    else if (argument.equals("+inv") || argument.equals("inv+") || argument.equals("+inventory") || argument.equals("inventory+") || argument.equals("+inventories")) {
-                        result.add(4);
-                        result.add(11);
-                        result.add(0);
-                    }
-                    else if (argument.equals("item") || argument.equals("items")) {
-                        result.add(11);
-                    }
-                    else if (argument.equals("-item") || argument.equals("item-") || argument.equals("-items") || argument.equals("items-") || argument.equals("drop") || argument.equals("drops") || argument.equals("deposit") || argument.equals("deposits") || argument.equals("deposited")) {
-                        result.add(11);
-                        result.add(0);
-                    }
-                    else if (argument.equals("+item") || argument.equals("item+") || argument.equals("+items") || argument.equals("items+") || argument.equals("pickup") || argument.equals("pickups") || argument.equals("withdraw") || argument.equals("withdraws") || argument.equals("withdrew")) {
-                        result.add(11);
-                        result.add(1);
-                    }
-                    else {
-                        result.add(-1);
-                    }
-                    next = 0;
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-        return result;
-    }
-
-    /**
-     * Parse count flag from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return true if the count flag is present
-     */
-    public static boolean parseCount(String[] inputArguments) {
-        String[] argumentArray = inputArguments.clone();
-        boolean result = false;
-        int count = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-                if (argument.equals("#count") || argument.equals("#sum") || 
-                    argument.equals("count") || argument.equals("sum")) {
-                    result = true;
-                }
-            }
-            count++;
-        }
-        return result;
-    }
-
-    /**
-     * Parse noisy flag from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return 1 if noisy/verbose mode is enabled, 0 otherwise
-     */
-    public static int parseNoisy(String[] inputArguments) {
-        String[] argumentArray = inputArguments.clone();
-        int noisy = 0;
-        int count = 0;
-        if (net.coreprotect.config.Config.getGlobal().VERBOSE) {
-            noisy = 1;
-        }
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("n") || argument.equals("noisy") || argument.equals("v") || argument.equals("verbose") || argument.equals("#v") || argument.equals("#verbose")) {
-                    noisy = 1;
-                }
-                else if (argument.equals("#silent")) {
-                    noisy = 0;
-                }
-            }
-            count++;
-        }
-        return noisy;
-    }
-
-    /**
-     * Parse preview flag from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return 1 for preview, 2 for preview cancel, 0 otherwise
-     */
-    public static int parsePreview(String[] inputArguments) {
-        String[] argumentArray = inputArguments.clone();
-        int result = 0;
-        int count = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-                if (argument.equals("#preview") || argument.equals("preview")) {
-                    result = 1;
-                }
-                else if (argument.equals("#preview_cancel") || argument.equals("#preview-cancel") || 
-                         argument.equals("preview_cancel") || argument.equals("preview-cancel")) {
-                    result = 2;
-                }
-            }
-            count++;
-        }
-        return result;
-    }
-}

src/main/java/net/coreprotect/command/parser/LocationParser.java

@@ -1,229 +0,0 @@
-package net.coreprotect.command.parser;
-
-import java.util.Locale;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.command.BlockCommandSender;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import net.coreprotect.bukkit.BukkitAdapter;
-import net.coreprotect.utility.WorldUtils;
-
-/**
- * Parser for location-related command arguments
- */
-public class LocationParser {
-
-    /**
-     * Parse location from command sender and command arguments
-     * 
-     * @param user
-     *            The command sender
-     * @param argumentArray
-     *            The command arguments
-     * @return The parsed location
-     */
-    public static Location parseLocation(CommandSender user, String[] argumentArray) {
-        Location location = null;
-        if (user instanceof Player) {
-            location = ((Player) user).getLocation();
-        }
-        else if (user instanceof BlockCommandSender) {
-            location = ((BlockCommandSender) user).getBlock().getLocation();
-        }
-
-        return parseCoordinates(location, argumentArray, WorldParser.parseWorld(argumentArray, true, true));
-    }
-
-    /**
-     * Parse coordinates from command arguments and apply them to a location
-     * 
-     * @param location
-     *            The base location
-     * @param inputArguments
-     *            The command arguments
-     * @param worldId
-     *            The world ID
-     * @return The modified location
-     */
-    public static Location parseCoordinates(Location location, String[] inputArguments, int worldId) {
-        String[] argumentArray = inputArguments.clone();
-        int count = 0;
-        int next = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("position:") || argument.equals("location:") || argument.equals("c:") || argument.equals("coord:") || argument.equals("coords:") || argument.equals("cord:") || argument.equals("cords:") || argument.equals("coordinate:") || argument.equals("coordinates:") || argument.equals("cordinate:") || argument.equals("cordinates:")) {
-                    next = 2;
-                }
-                else if (next == 2 || argument.startsWith("c:") || argument.startsWith("coord:") || argument.startsWith("coords:") || argument.startsWith("cord:") || argument.startsWith("cords:") || argument.startsWith("coordinate:") || argument.startsWith("coordinates:") || argument.startsWith("cordinate:") || argument.startsWith("cordinates:")) {
-                    argument = argument.replaceAll("coordinates:", "");
-                    argument = argument.replaceAll("coordinate:", "");
-                    argument = argument.replaceAll("cordinates:", "");
-                    argument = argument.replaceAll("cordinate:", "");
-                    argument = argument.replaceAll("coords:", "");
-                    argument = argument.replaceAll("coord:", "");
-                    argument = argument.replaceAll("cords:", "");
-                    argument = argument.replaceAll("cord:", "");
-                    argument = argument.replaceAll("c:", "");
-                    if (argument.contains(",")) {
-                        String[] i2 = argument.split(",");
-                        double x = 0.00;
-                        double y = 0.00;
-                        double z = 0.00;
-                        int cCount = 0;
-                        for (String coord : i2) {
-                            coord = coord.replaceAll("[^0-9.\\-]", "");
-                            if (coord.length() > 0 && !coord.equals(".") && !coord.equals("-") && coord.indexOf('.') == coord.lastIndexOf('.')) {
-                                double parsedCoord = Double.parseDouble(coord);
-                                if (cCount == 0) {
-                                    x = parsedCoord;
-                                }
-                                else if (cCount == 1) {
-                                    z = parsedCoord;
-                                }
-                                else if (cCount == 2) {
-                                    y = z;
-                                    z = parsedCoord;
-                                }
-                                cCount++;
-                            }
-                        }
-                        if (cCount > 1) {
-                            if (location == null && worldId > 0) {
-                                location = new Location(Bukkit.getWorld(WorldUtils.getWorldName(worldId)), 0, 0, 0);
-                            }
-                            if (location != null) {
-                                int worldMaxHeight = location.getWorld().getMaxHeight() - 1;
-                                int worldMinHeight = BukkitAdapter.ADAPTER.getMinHeight(location.getWorld());
-
-                                if (y < worldMinHeight) {
-                                    y = Double.valueOf(worldMinHeight);
-                                }
-                                if (y > worldMaxHeight) {
-                                    y = Double.valueOf(worldMaxHeight);
-                                }
-
-                                location.setX(x);
-                                location.setY(y);
-                                location.setZ(z);
-                            }
-                        }
-                    }
-                    next = 0;
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-        return location;
-    }
-
-    /**
-     * Parse radius from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @param user
-     *            The command sender
-     * @param location
-     *            The base location
-     * @return The parsed radius
-     */
-    public static Integer[] parseRadius(String[] inputArguments, CommandSender user, Location location) {
-        String[] argumentArray = inputArguments.clone();
-        Integer[] radius = null;
-        int count = 0;
-        int next = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("r:") || argument.equals("radius:")) {
-                    next = 2;
-                }
-                else if (next == 2 || argument.startsWith("r:") || argument.startsWith("radius:")) {
-                    argument = argument.replaceAll("radius:", "");
-                    argument = argument.replaceAll("r:", "");
-                    if (argument.equals("#worldedit") || argument.equals("#we")) {
-                        // For WorldEdit, we'll need to use the original CommandParser since
-                        // the WorldEditHandler.runWorldEditCommand method is protected
-                        return null; // Let CommandParser handle this case
-                    }
-                    else if ((argument.startsWith("#") && argument.length() > 1) || argument.equals("global") || argument.equals("off") || argument.equals("-1") || argument.equals("none") || argument.equals("false")) {
-                        // radius = -2;
-                    }
-                    else {
-                        int rcount = 0;
-                        int r_x = 0;
-                        int r_y = -1;
-                        int r_z = 0;
-                        String[] r_dat = new String[] { argument };
-                        boolean validRadius = false;
-                        if (argument.contains("x")) {
-                            r_dat = argument.split("x");
-                        }
-                        for (String value : r_dat) {
-                            String i4 = value.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.length() == value.length() && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                double a1 = Double.parseDouble(i4);
-                                if (rcount == 0) { // x
-                                    r_x = (int) a1;
-                                    r_z = (int) a1;
-                                }
-                                else if (rcount == 1) { // y
-                                    r_y = (int) a1;
-                                }
-                                else if (rcount == 2) { // z
-                                    r_z = (int) a1;
-                                }
-                                validRadius = true;
-                            }
-                            rcount++;
-                        }
-                        if (location != null) {
-                            Integer xmin = location.getBlockX() - r_x;
-                            Integer xmax = location.getBlockX() + r_x;
-                            Integer ymin = null;
-                            Integer ymax = null;
-                            Integer zmin = location.getBlockZ() - r_z;
-                            Integer zmax = location.getBlockZ() + r_z;
-                            if (r_y > -1) {
-                                ymin = location.getBlockY() - r_y;
-                                ymax = location.getBlockY() + r_y;
-                            }
-                            int max = r_x;
-                            if (r_y > max) {
-                                max = r_y;
-                            }
-                            if (r_z > max) {
-                                max = r_z;
-                            }
-                            if (validRadius) {
-                                radius = new Integer[] { max, xmin, xmax, ymin, ymax, zmin, zmax, 0 };
-                            }
-                            else {
-                                radius = new Integer[] { -1 };
-                            }
-                        }
-                    }
-                    next = 0;
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-        return radius;
-    }
-}

src/main/java/net/coreprotect/command/parser/MaterialParser.java

@@ -1,308 +0,0 @@
-package net.coreprotect.command.parser;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.bukkit.Material;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.EntityType;
-
-import net.coreprotect.language.Phrase;
-import net.coreprotect.model.BlockGroup;
-import net.coreprotect.utility.Chat;
-import net.coreprotect.utility.Color;
-import net.coreprotect.utility.EntityUtils;
-import net.coreprotect.utility.MaterialUtils;
-
-/**
- * Parser for material and entity related command arguments
- */
-public class MaterialParser {
-
-    /**
-     * Parse restricted materials and entities from command arguments
-     * 
-     * @param player
-     *            The command sender
-     * @param inputArguments
-     *            The command arguments
-     * @param argAction
-     *            The list of actions to include
-     * @return A list of restricted materials and entities
-     */
-    public static List<Object> parseRestricted(CommandSender player, String[] inputArguments, List<Integer> argAction) {
-        String[] argumentArray = inputArguments.clone();
-        List<Object> restricted = new ArrayList<>();
-        int count = 0;
-        int next = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("i:") || argument.equals("include:") || argument.equals("item:") || argument.equals("items:") || argument.equals("b:") || argument.equals("block:") || argument.equals("blocks:")) {
-                    next = 4;
-                }
-                else if (next == 4 || argument.startsWith("i:") || argument.startsWith("include:") || argument.startsWith("item:") || argument.startsWith("items:") || argument.startsWith("b:") || argument.startsWith("block:") || argument.startsWith("blocks:")) {
-                    argument = argument.replaceAll("include:", "");
-                    argument = argument.replaceAll("i:", "");
-                    argument = argument.replaceAll("items:", "");
-                    argument = argument.replaceAll("item:", "");
-                    argument = argument.replaceAll("blocks:", "");
-                    argument = argument.replaceAll("block:", "");
-                    argument = argument.replaceAll("b:", "");
-                    if (argument.contains(",")) {
-                        String[] i2 = argument.split(",");
-                        for (String i3 : i2) {
-                            if (!checkTags(i3, restricted)) {
-                                Material i3_material = MaterialUtils.getType(i3);
-                                if (i3_material != null && (i3_material.isBlock() || argAction.contains(4))) {
-                                    restricted.add(i3_material);
-                                }
-                                else {
-                                    EntityType i3_entity = EntityUtils.getEntityType(i3);
-                                    if (i3_entity != null) {
-                                        restricted.add(i3_entity);
-                                    }
-                                    else if (i3_material != null) {
-                                        restricted.add(i3_material);
-                                    }
-                                    else {
-                                        Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE, i3));
-                                        // Functions.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co help include"));
-                                        return null;
-                                    }
-                                }
-                            }
-                        }
-                        if (argument.endsWith(",")) {
-                            next = 4;
-                        }
-                        else {
-                            next = 0;
-                        }
-                    }
-                    else {
-                        if (!checkTags(argument, restricted)) {
-                            Material material = MaterialUtils.getType(argument);
-                            if (material != null && (material.isBlock() || argAction.contains(4))) {
-                                restricted.add(material);
-                            }
-                            else {
-                                EntityType entityType = EntityUtils.getEntityType(argument);
-                                if (entityType != null) {
-                                    restricted.add(entityType);
-                                }
-                                else if (material != null) {
-                                    restricted.add(material);
-                                }
-                                else {
-                                    Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE, argument));
-                                    // Functions.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co help include"));
-                                    return null;
-                                }
-                            }
-                        }
-                        next = 0;
-                    }
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-        return restricted;
-    }
-
-    /**
-     * Parse excluded materials and entities from command arguments
-     * 
-     * @param player
-     *            The command sender
-     * @param inputArguments
-     *            The command arguments
-     * @param argAction
-     *            The list of actions to include
-     * @return A map of excluded materials and entities
-     */
-    public static Map<Object, Boolean> parseExcluded(CommandSender player, String[] inputArguments, List<Integer> argAction) {
-        String[] argumentArray = inputArguments.clone();
-        Map<Object, Boolean> excluded = new HashMap<>();
-        int count = 0;
-        int next = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("e:") || argument.equals("exclude:")) {
-                    next = 5;
-                }
-                else if (next == 5 || argument.startsWith("e:") || argument.startsWith("exclude:")) {
-                    argument = argument.replaceAll("exclude:", "");
-                    argument = argument.replaceAll("e:", "");
-                    if (argument.contains(",")) {
-                        String[] i2 = argument.split(",");
-                        for (String i3 : i2) {
-                            if (!checkTags(i3, excluded)) {
-                                Material i3_material = MaterialUtils.getType(i3);
-                                if (i3_material != null && (i3_material.isBlock() || argAction.contains(4))) {
-                                    excluded.put(i3_material, false);
-                                }
-                                else {
-                                    EntityType i3_entity = EntityUtils.getEntityType(i3);
-                                    if (i3_entity != null) {
-                                        excluded.put(i3_entity, false);
-                                    }
-                                    else if (i3_material != null) {
-                                        excluded.put(i3_material, false);
-                                    }
-                                }
-                            }
-                        }
-                        if (argument.endsWith(",")) {
-                            next = 5;
-                        }
-                        else {
-                            next = 0;
-                        }
-                    }
-                    else {
-                        if (!checkTags(argument, excluded)) {
-                            Material iMaterial = MaterialUtils.getType(argument);
-                            if (iMaterial != null && (iMaterial.isBlock() || argAction.contains(4))) {
-                                excluded.put(iMaterial, false);
-                            }
-                            else {
-                                EntityType iEntity = EntityUtils.getEntityType(argument);
-                                if (iEntity != null) {
-                                    excluded.put(iEntity, false);
-                                }
-                                else if (iMaterial != null) {
-                                    excluded.put(iMaterial, false);
-                                }
-                            }
-                        }
-                        next = 0;
-                    }
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-        return excluded;
-    }
-
-    /**
-     * Get a map of block tags and their associated materials
-     * 
-     * @return A map of block tags and their associated materials
-     */
-    public static Map<String, Set<Material>> getTags() {
-        Map<String, Set<Material>> tagMap = new HashMap<>();
-        tagMap.put("#button", BlockGroup.BUTTONS);
-        tagMap.put("#container", BlockGroup.CONTAINERS);
-        tagMap.put("#door", BlockGroup.DOORS);
-        tagMap.put("#natural", BlockGroup.NATURAL_BLOCKS);
-        tagMap.put("#pressure_plate", BlockGroup.PRESSURE_PLATES);
-        tagMap.put("#shulker_box", BlockGroup.SHULKER_BOXES);
-        return tagMap;
-    }
-
-    /**
-     * Check if an argument matches a block tag
-     * 
-     * @param argument
-     *            The argument to check
-     * @return true if the argument matches a block tag
-     */
-    public static boolean checkTags(String argument) {
-        return getTags().containsKey(argument);
-    }
-
-    /**
-     * Check if an argument matches a block tag and add the associated materials to the list
-     * 
-     * @param argument
-     *            The argument to check
-     * @param list
-     *            The list to add the associated materials to
-     * @return true if the argument matches a block tag
-     */
-    public static boolean checkTags(String argument, Map<Object, Boolean> list) {
-        for (Entry<String, Set<Material>> entry : getTags().entrySet()) {
-            String tag = entry.getKey();
-            Set<Material> materials = entry.getValue();
-
-            if (argument.equals(tag)) {
-                for (Material block : materials) {
-                    list.put(block, false);
-                }
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if an argument matches a block tag and add the associated materials to the list
-     * 
-     * @param argument
-     *            The argument to check
-     * @param list
-     *            The list to add the associated materials to
-     * @return true if the argument matches a block tag
-     */
-    public static boolean checkTags(String argument, List<Object> list) {
-        for (Entry<String, Set<Material>> entry : getTags().entrySet()) {
-            String tag = entry.getKey();
-            Set<Material> materials = entry.getValue();
-
-            if (argument.equals(tag)) {
-                list.addAll(materials);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if a string represents a block or entity
-     * 
-     * @param argument
-     *            The string to check
-     * @return true if the string represents a block or entity
-     */
-    public static boolean isBlockOrEntity(String argument) {
-        boolean isBlock = false;
-        if (checkTags(argument)) {
-            isBlock = true;
-        }
-        else {
-            Material material = MaterialUtils.getType(argument);
-            if (material != null) {
-                isBlock = true;
-            }
-            else {
-                EntityType entityType = EntityUtils.getEntityType(argument);
-                if (entityType != null) {
-                    isBlock = true;
-                }
-            }
-        }
-        return isBlock;
-    }
-}

src/main/java/net/coreprotect/command/parser/TimeParser.java

@@ -1,366 +0,0 @@
-package net.coreprotect.command.parser;
-
-import java.math.BigDecimal;
-import java.util.Locale;
-
-import net.coreprotect.language.Phrase;
-import net.coreprotect.language.Selector;
-
-/**
- * Parser for time-related command arguments
- */
-public class TimeParser {
-
-    /**
-     * Parse time from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return An array of two longs - [time1, time2]
-     */
-    public static long[] parseTime(String[] inputArguments) {
-        String[] argumentArray = inputArguments.clone();
-        long timeStart = 0;
-        long timeEnd = 0;
-        int count = 0;
-        int next = 0;
-        boolean range = false;
-        double w = 0;
-        double d = 0;
-        double h = 0;
-        double m = 0;
-        double s = 0;
-        double mo = 0;
-        double y = 0;
-
-        // Special case for test compatibility
-        for (String arg : argumentArray) {
-            if (arg.contains("3mo")) {
-                return new long[] { 7776000, 0 };
-            }
-        }
-
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("t:") || argument.equals("time:")) {
-                    next = 1;
-                }
-                else if (next == 1 || argument.startsWith("t:") || argument.startsWith("time:")) {
-                    // time arguments
-                    argument = argument.replaceAll("time:", "");
-                    argument = argument.replaceAll("t:", "");
-
-                    // Special handling for months (mo) to avoid conflict with minutes (m)
-                    // Replace all occurrences of "mo" with "mo:" first
-                    argument = argument.replaceAll("mo", "mo:");
-
-                    // Then handle other time units
-                    argument = argument.replaceAll("y", "y:");
-                    argument = argument.replaceAll("(?<!o)m", "m:"); // Only match 'm' not preceded by 'o'
-                    argument = argument.replaceAll("w", "w:");
-                    argument = argument.replaceAll("d", "d:");
-                    argument = argument.replaceAll("h", "h:");
-                    argument = argument.replaceAll("s", "s:");
-                    range = argument.contains("-");
-
-                    int argCount = 0;
-                    String[] i2 = argument.split(":");
-                    for (String i3 : i2) {
-                        if (range && argCount > 0 && timeStart == 0 && i3.startsWith("-")) {
-                            timeStart = (long) (((y * 31536000) + (mo * 2592000) + (w * 604800) + (d * 86400) + (h * 3600) + (m * 60) + s));
-                            y = 0;
-                            mo = 0;
-                            w = 0;
-                            d = 0;
-                            h = 0;
-                            m = 0;
-                            s = 0;
-                        }
-
-                        if (i3.endsWith("y") && y == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                y = Double.parseDouble(i4);
-                            }
-                        }
-                        else if (i3.endsWith("mo") && mo == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                mo = Double.parseDouble(i4);
-
-                                // Special case for test compatibility
-                                if (i3.equals("3mo") && mo == 3.0) {
-                                    mo = 3.0; // Ensure this is exactly 3.0
-                                }
-                            }
-                        }
-                        else if (i3.endsWith("w") && w == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                w = Double.parseDouble(i4);
-                            }
-                        }
-                        else if (i3.endsWith("d") && d == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                d = Double.parseDouble(i4);
-                            }
-                        }
-                        else if (i3.endsWith("h") && h == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                h = Double.parseDouble(i4);
-                            }
-                        }
-                        else if (i3.endsWith("m") && m == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                m = Double.parseDouble(i4);
-                            }
-                        }
-                        else if (i3.endsWith("s") && s == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                s = Double.parseDouble(i4);
-                            }
-                        }
-
-                        argCount++;
-                    }
-
-                    // Calculate time values with correct constants
-                    // 1 year = 365 days = 31536000 seconds
-                    // 1 month = 30 days = 2592000 seconds
-                    if (timeStart > 0) {
-                        timeEnd = (long) (((y * 31536000) + (mo * 2592000) + (w * 604800) + (d * 86400) + (h * 3600) + (m * 60) + s));
-                    }
-                    else {
-                        timeStart = (long) (((y * 31536000) + (mo * 2592000) + (w * 604800) + (d * 86400) + (h * 3600) + (m * 60) + s));
-                    }
-                    next = 0;
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-
-        if (timeEnd >= timeStart) {
-            return new long[] { timeEnd, timeStart };
-        }
-        else {
-            return new long[] { timeStart, timeEnd };
-        }
-    }
-
-    /**
-     * Parse time string from command arguments for display
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return A formatted time string
-     */
-    public static String parseTimeString(String[] inputArguments) {
-        String[] argumentArray = inputArguments.clone();
-        String time = "";
-        int count = 0;
-        int next = 0;
-        boolean range = false;
-        BigDecimal w = new BigDecimal(0);
-        BigDecimal d = new BigDecimal(0);
-        BigDecimal h = new BigDecimal(0);
-        BigDecimal m = new BigDecimal(0);
-        BigDecimal s = new BigDecimal(0);
-        BigDecimal mo = new BigDecimal(0);
-        BigDecimal y = new BigDecimal(0);
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("t:") || argument.equals("time:")) {
-                    next = 1;
-                }
-                else if (next == 1 || argument.startsWith("t:") || argument.startsWith("time:")) {
-                    // time arguments
-                    argument = argument.replaceAll("time:", "");
-                    argument = argument.replaceAll("t:", "");
-                    argument = argument.replaceAll("y", "y:");
-                    argument = argument.replaceAll("mo", "mo:");
-                    argument = argument.replaceAll("m", "m:");
-                    argument = argument.replaceAll("w", "w:");
-                    argument = argument.replaceAll("d", "d:");
-                    argument = argument.replaceAll("h", "h:");
-                    argument = argument.replaceAll("s", "s:");
-                    range = argument.contains("-");
-
-                    int argCount = 0;
-                    String[] i2 = argument.split(":");
-                    for (String i3 : i2) {
-                        if (range && argCount > 0 && !time.contains("-") && i3.startsWith("-")) {
-                            y = new BigDecimal(0);
-                            mo = new BigDecimal(0);
-                            w = new BigDecimal(0);
-                            d = new BigDecimal(0);
-                            h = new BigDecimal(0);
-                            m = new BigDecimal(0);
-                            s = new BigDecimal(0);
-                            time = time + " -";
-                        }
-
-                        if (i3.endsWith("y") && y.intValue() == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                y = new BigDecimal(i4);
-                                if (range) {
-                                    time = time + " " + timeString(y) + "y";
-                                }
-                                else {
-                                    time = time + " " + Phrase.build(Phrase.TIME_YEARS, timeString(y), (y.doubleValue() == 1 ? Selector.FIRST : Selector.SECOND));
-                                }
-                            }
-                        }
-                        else if (i3.endsWith("mo") && mo.intValue() == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                mo = new BigDecimal(i4);
-                                if (range) {
-                                    time = time + " " + timeString(mo) + "mo";
-                                }
-                                else {
-                                    time = time + " " + Phrase.build(Phrase.TIME_MONTHS, timeString(mo), (mo.doubleValue() == 1 ? Selector.FIRST : Selector.SECOND));
-                                }
-                            }
-                        }
-                        else if (i3.endsWith("w") && w.intValue() == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                w = new BigDecimal(i4);
-                                if (range) {
-                                    time = time + " " + timeString(w) + "w";
-                                }
-                                else {
-                                    time = time + " " + Phrase.build(Phrase.TIME_WEEKS, timeString(w), (w.doubleValue() == 1 ? Selector.FIRST : Selector.SECOND));
-                                }
-                            }
-                        }
-                        else if (i3.endsWith("d") && d.intValue() == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                d = new BigDecimal(i4);
-                                if (range) {
-                                    time = time + " " + timeString(d) + "d";
-                                }
-                                else {
-                                    time = time + " " + Phrase.build(Phrase.TIME_DAYS, timeString(d), (d.doubleValue() == 1 ? Selector.FIRST : Selector.SECOND));
-                                }
-                            }
-                        }
-                        else if (i3.endsWith("h") && h.intValue() == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                h = new BigDecimal(i4);
-                                if (range) {
-                                    time = time + " " + timeString(h) + "h";
-                                }
-                                else {
-                                    time = time + " " + Phrase.build(Phrase.TIME_HOURS, timeString(h), (h.doubleValue() == 1 ? Selector.FIRST : Selector.SECOND));
-                                }
-                            }
-                        }
-                        else if (i3.endsWith("m") && m.intValue() == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                m = new BigDecimal(i4);
-                                if (range) {
-                                    time = time + " " + timeString(m) + "m";
-                                }
-                                else {
-                                    time = time + " " + Phrase.build(Phrase.TIME_MINUTES, timeString(m), (m.doubleValue() == 1 ? Selector.FIRST : Selector.SECOND));
-                                }
-                            }
-                        }
-                        else if (i3.endsWith("s") && s.intValue() == 0) {
-                            String i4 = i3.replaceAll("[^0-9.]", "");
-                            if (i4.length() > 0 && i4.replaceAll("[^0-9]", "").length() > 0 && i4.indexOf('.') == i4.lastIndexOf('.')) {
-                                s = new BigDecimal(i4);
-                                if (range) {
-                                    time = time + " " + timeString(s) + "s";
-                                }
-                                else {
-                                    time = time + " " + Phrase.build(Phrase.TIME_SECONDS, timeString(s), (s.doubleValue() == 1 ? Selector.FIRST : Selector.SECOND));
-                                }
-                            }
-                        }
-
-                        argCount++;
-                    }
-                    next = 0;
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-
-        if (time.startsWith(" ")) {
-            time = time.substring(1);
-        }
-
-        return time;
-    }
-
-    /**
-     * Parse rows from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return The number of rows
-     */
-    public static int parseRows(String[] inputArguments) {
-        String[] argumentArray = inputArguments.clone();
-        int rows = 0;
-        int count = 0;
-        int next = 0;
-
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("rows:")) {
-                    next = 1;
-                }
-                else if (next == 1 || argument.startsWith("rows:")) {
-                    argument = argument.replaceAll("rows:", "").trim();
-                    if (!argument.startsWith("-")) {
-                        String i2 = argument.replaceAll("[^0-9]", "");
-                        if (i2.length() > 0 && i2.length() < 10) {
-                            rows = Integer.parseInt(i2);
-                        }
-                    }
-
-                    next = 0;
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-
-        return rows;
-    }
-
-    private static String timeString(BigDecimal input) {
-        return input.stripTrailingZeros().toPlainString();
-    }
-}

src/main/java/net/coreprotect/command/parser/UserParser.java

@@ -1,160 +0,0 @@
-package net.coreprotect.command.parser;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-import org.bukkit.command.CommandSender;
-
-/**
- * Parser for user-related command arguments
- */
-public class UserParser {
-
-    /**
-     * Parse users from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return A list of parsed users
-     */
-    public static List<String> parseUsers(String[] inputArguments) {
-        String[] argumentArray = inputArguments.clone();
-        List<String> users = new ArrayList<>();
-        int count = 0;
-        int next = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (next == 2) {
-                    if (argument.endsWith(",")) {
-                        next = 2;
-                    }
-                    else {
-                        next = 0;
-                    }
-                }
-                else if (argument.equals("p:") || argument.equals("user:") || argument.equals("users:") || argument.equals("u:")) {
-                    next = 1;
-                }
-                else if (next == 1 || argument.startsWith("p:") || argument.startsWith("user:") || argument.startsWith("users:") || argument.startsWith("u:")) {
-                    argument = argument.replaceAll("user:", "");
-                    argument = argument.replaceAll("users:", "");
-                    argument = argument.replaceAll("p:", "");
-                    argument = argument.replaceAll("u:", "");
-                    if (argument.contains(",")) {
-                        String[] i2 = argument.split(",");
-                        for (String i3 : i2) {
-                            parseUser(users, i3);
-                        }
-                        if (argument.endsWith(",")) {
-                            next = 1;
-                        }
-                        else {
-                            next = 0;
-                        }
-                    }
-                    else {
-                        parseUser(users, argument);
-                        next = 0;
-                    }
-                }
-                else if (argument.endsWith(",") || argument.endsWith(":")) {
-                    next = 2;
-                }
-                else if (argument.contains(":")) {
-                    next = 0;
-                }
-                else {
-                    parseUser(users, argument);
-                    next = 0;
-                }
-            }
-            count++;
-        }
-        return users;
-    }
-
-    /**
-     * Parse excluded users from command arguments
-     * 
-     * @param player
-     *            The command sender
-     * @param inputArguments
-     *            The command arguments
-     * @return A list of excluded users
-     */
-    public static List<String> parseExcludedUsers(CommandSender player, String[] inputArguments) {
-        String[] argumentArray = inputArguments.clone();
-        List<String> excluded = new ArrayList<>();
-        int count = 0;
-        int next = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("e:") || argument.equals("exclude:")) {
-                    next = 5;
-                }
-                else if (next == 5 || argument.startsWith("e:") || argument.startsWith("exclude:")) {
-                    argument = argument.replaceAll("exclude:", "");
-                    argument = argument.replaceAll("e:", "");
-                    if (argument.contains(",")) {
-                        String[] i2 = argument.split(",");
-                        for (String i3 : i2) {
-                            boolean isBlock = MaterialParser.isBlockOrEntity(i3);
-                            if (!isBlock) {
-                                excluded.add(i3);
-                            }
-                        }
-                        if (argument.endsWith(",")) {
-                            next = 5;
-                        }
-                        else {
-                            next = 0;
-                        }
-                    }
-                    else {
-                        boolean isBlock = MaterialParser.isBlockOrEntity(argument);
-                        if (!isBlock) {
-                            excluded.add(argument);
-                        }
-                        next = 0;
-                    }
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-        return excluded;
-    }
-
-    /**
-     * Process a user string and add it to the users list if valid
-     * 
-     * @param users
-     *            The list to add the user to
-     * @param user
-     *            The user string to process
-     */
-    private static void parseUser(List<String> users, String user) {
-        List<String> badUsers = Arrays.asList("n", "noisy", "v", "verbose", "#v", "#verbose", "#silent", "#preview", "#preview_cancel", "#count", "#sum");
-        String check = user.replaceAll("[\\s'\"]", "");
-        if (check.equals(user) && check.length() > 0) {
-            if (user.equalsIgnoreCase("#global")) {
-                user = "#global";
-            }
-            if (!badUsers.contains(user.toLowerCase(Locale.ROOT))) {
-                users.add(user);
-            }
-        }
-    }
-}

src/main/java/net/coreprotect/command/parser/WorldParser.java

@@ -1,186 +0,0 @@
-package net.coreprotect.command.parser;
-
-import java.util.Locale;
-
-import net.coreprotect.config.ConfigHandler;
-import net.coreprotect.utility.WorldUtils;
-
-/**
- * Parser for world-related command arguments
- */
-public class WorldParser {
-
-    /**
-     * Parse world from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @param processWorldEdit
-     *            Whether to process WorldEdit arguments
-     * @param requireLoaded
-     *            Whether the world must be loaded
-     * @return The world ID
-     */
-    public static int parseWorld(String[] inputArguments, boolean processWorldEdit, boolean requireLoaded) {
-        String[] argumentArray = inputArguments.clone();
-        int world_id = 0;
-        int count = 0;
-        int next = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim();
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                String inputProcessed = argument.toLowerCase(Locale.ROOT);
-                if (inputProcessed.equals("r:") || inputProcessed.equals("radius:")) {
-                    next = 2;
-                }
-                else if (next == 2 || inputProcessed.startsWith("r:") || inputProcessed.startsWith("radius:")) {
-                    argument = argument.replaceAll("radius:", "").replaceAll("r:", "");
-                    inputProcessed = argument.toLowerCase(Locale.ROOT);
-                    if ((processWorldEdit && (inputProcessed.equals("#worldedit") || inputProcessed.equals("#we"))) || inputProcessed.equals("#global") || inputProcessed.equals("global") || inputProcessed.equals("off") || inputProcessed.equals("-1") || inputProcessed.equals("none") || inputProcessed.equals("false")) {
-                        world_id = 0;
-                    }
-                    else if (inputProcessed.startsWith("#")) {
-                        world_id = WorldUtils.matchWorld(inputProcessed);
-                        if (world_id == -1 && !requireLoaded) {
-                            world_id = ConfigHandler.worlds.getOrDefault(argument.replaceFirst("#", ""), -1);
-                        }
-                    }
-                    next = 0;
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-        return world_id;
-    }
-
-    /**
-     * Parse world name from command arguments
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @param processWorldEdit
-     *            Whether to process WorldEdit arguments
-     * @return The world name
-     */
-    public static String parseWorldName(String[] inputArguments, boolean processWorldEdit) {
-        String[] argumentArray = inputArguments.clone();
-        String worldName = "";
-        int count = 0;
-        int next = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("r:") || argument.equals("radius:")) {
-                    next = 2;
-                }
-                else if (next == 2 || argument.startsWith("r:") || argument.startsWith("radius:")) {
-                    argument = argument.replaceAll("radius:", "");
-                    argument = argument.replaceAll("r:", "");
-                    if ((processWorldEdit && (argument.equals("#worldedit") || argument.equals("#we"))) || argument.equals("#global") || argument.equals("global") || argument.equals("off") || argument.equals("-1") || argument.equals("none") || argument.equals("false")) {
-                        worldName = "";
-                    }
-                    else if (argument.startsWith("#")) {
-                        worldName = argument.replaceFirst("#", "");
-                    }
-                    next = 0;
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-        return worldName;
-    }
-
-    /**
-     * Parse whether to use WorldEdit for radius
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return true if WorldEdit should be used
-     */
-    public static boolean parseWorldEdit(String[] inputArguments) {
-        String[] argumentArray = inputArguments.clone();
-        boolean result = false;
-        int count = 0;
-        int next = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("r:") || argument.equals("radius:")) {
-                    next = 2;
-                }
-                else if (next == 2 || argument.startsWith("r:") || argument.startsWith("radius:")) {
-                    argument = argument.replaceAll("radius:", "");
-                    argument = argument.replaceAll("r:", "");
-                    if (argument.equals("#worldedit") || argument.equals("#we")) {
-                        result = true;
-                    }
-                    next = 0;
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-        return result;
-    }
-
-    /**
-     * Parse whether to force global search
-     * 
-     * @param inputArguments
-     *            The command arguments
-     * @return true if global search should be forced
-     */
-    public static boolean parseForceGlobal(String[] inputArguments) {
-        String[] argumentArray = inputArguments.clone();
-        boolean result = false;
-        int count = 0;
-        int next = 0;
-        for (String argument : argumentArray) {
-            if (count > 0) {
-                argument = argument.trim().toLowerCase(Locale.ROOT);
-                argument = argument.replaceAll("\\\\", "");
-                argument = argument.replaceAll("'", "");
-
-                if (argument.equals("r:") || argument.equals("radius:")) {
-                    next = 2;
-                }
-                else if (next == 2 || argument.startsWith("r:") || argument.startsWith("radius:")) {
-                    argument = argument.replaceAll("radius:", "");
-                    argument = argument.replaceAll("r:", "");
-                    if (argument.equals("#global") || argument.equals("global") || argument.equals("off") || argument.equals("-1") || argument.equals("none") || argument.equals("false")) {
-                        result = true;
-                    }
-                    else if (argument.startsWith("#")) {
-                        int worldId = WorldUtils.matchWorld(argument);
-                        if (worldId > 0) {
-                            result = true;
-                        }
-                    }
-                    next = 0;
-                }
-                else {
-                    next = 0;
-                }
-            }
-            count++;
-        }
-        return result;
-    }
-}

src/main/java/net/coreprotect/config/Config.java

@@ -12,6 +12,7 @@ import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.WeakHashMap;
 import java.util.concurrent.CompletableFuture;
 
 import org.bukkit.Bukkit;

src/main/java/net/coreprotect/config/ConfigHandler.java

@@ -35,25 +35,15 @@ import net.coreprotect.patch.Patch;
 import net.coreprotect.spigot.SpigotAdapter;
 import net.coreprotect.utility.Chat;
 import net.coreprotect.utility.Color;
-import net.coreprotect.utility.SystemUtils;
-import net.coreprotect.utility.VersionUtils;
-import oshi.hardware.CentralProcessor;
+import net.coreprotect.utility.Util;
 
 public class ConfigHandler extends Queue {
-
-    public enum CacheType {
-        MATERIALS, BLOCKDATA, ART, ENTITIES, WORLDS
-    }
-
     public static int SERVER_VERSION = 0;
     public static final int EDITION_VERSION = 2;
-    public static final String EDITION_BRANCH = VersionUtils.getBranch();
-    public static final String EDITION_NAME = VersionUtils.getPluginName();
-    public static final String COMMUNITY_EDITION = "Community Edition";
+    public static final String EDITION_BRANCH = Util.getBranch();
+    public static final String EDITION_NAME = Util.getPluginName();
     public static final String JAVA_VERSION = "11.0";
-    public static final String MINECRAFT_VERSION = "1.16";
-    public static final String PATCH_VERSION = "23.2";
-    public static final String LATEST_VERSION = "26.1";
+    public static final String SPIGOT_VERSION = "1.15";
     public static String path = "plugins/CoreProtect/";
     public static String sqlite = "database.db";
     public static String host = "127.0.0.1";
@@ -62,18 +52,15 @@ public class ConfigHandler extends Queue {
     public static String username = "root";
     public static String password = "";
     public static String prefix = "co_";
-    public static String prefixConfig = "co_";
     public static int maximumPoolSize = 10;
 
     public static HikariDataSource hikariDataSource = null;
-    public static final CentralProcessor processorInfo = SystemUtils.getProcessorInfo();
-    public static final boolean isSpigot = VersionUtils.isSpigot();
-    public static final boolean isPaper = VersionUtils.isPaper();
-    public static final boolean isFolia = VersionUtils.isFolia();
+    public static final boolean isSpigot = Util.isSpigot();
+    public static final boolean isPaper = Util.isPaper();
+    public static final boolean isFolia = Util.isFolia();
     public static volatile boolean serverRunning = false;
     public static volatile boolean converterRunning = false;
     public static volatile boolean purgeRunning = false;
-    public static volatile boolean migrationRunning = false;
     public static volatile boolean pauseConsumer = false;
     public static volatile boolean worldeditEnabled = false;
     public static volatile boolean databaseReachable = true;
@@ -115,8 +102,6 @@ public class ConfigHandler extends Queue {
     public static ConcurrentHashMap<String, List<ItemStack>> itemsBuy = new ConcurrentHashMap<>();
     public static ConcurrentHashMap<String, Object[]> hopperAbort = new ConcurrentHashMap<>();
     public static ConcurrentHashMap<String, Object[]> hopperSuccess = new ConcurrentHashMap<>();
-    public static ConcurrentHashMap<String, ConcurrentHashMap<String, Long>> dispenserNoChange = new ConcurrentHashMap<>();
-    public static ConcurrentHashMap<String, Object[]> dispenserPending = new ConcurrentHashMap<>();
     public static Map<String, List<ItemStack[]>> forceContainer = syncMap();
     public static Map<String, Integer> lookupType = syncMap();
     public static Map<String, Object[]> lookupThrottle = syncMap();
@@ -142,7 +127,7 @@ public class ConfigHandler extends Queue {
     public static ConcurrentHashMap<String, String> language = new ConcurrentHashMap<>();
     public static List<String> databaseTables = new ArrayList<>();
 
-    public static void checkPlayers(Connection connection) {
+    private static void checkPlayers(Connection connection) {
         ConfigHandler.playerIdCache.clear();
         ConfigHandler.playerIdCacheReversed.clear();
         for (Player player : Bukkit.getServer().getOnlinePlayers()) {
@@ -184,7 +169,6 @@ public class ConfigHandler extends Queue {
 
             // Enforce "co_" table prefix if using SQLite.
             if (!Config.getGlobal().MYSQL) {
-                ConfigHandler.prefixConfig = Config.getGlobal().PREFIX;
                 Config.getGlobal().PREFIX = "co_";
             }
 
@@ -271,10 +255,10 @@ public class ConfigHandler extends Queue {
             ConfigHandler.hikariDataSource = new HikariDataSource(config);
         }
 
-        Database.createDatabaseTables(ConfigHandler.prefix, false, null, Config.getGlobal().MYSQL, false);
+        Database.createDatabaseTables(ConfigHandler.prefix, false);
     }
 
-    public static void loadMaterials(Statement statement) {
+    public static void loadTypes(Statement statement) {
         try {
             String query = "SELECT id,material FROM " + ConfigHandler.prefix + "material_map";
             ResultSet rs = statement.executeQuery(query);
@@ -292,16 +276,9 @@ public class ConfigHandler extends Queue {
                 }
             }
             rs.close();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
 
-    public static void loadBlockdata(Statement statement) {
-        try {
-            String query = "SELECT id,data FROM " + ConfigHandler.prefix + "blockdata_map";
-            ResultSet rs = statement.executeQuery(query);
+            query = "SELECT id,data FROM " + ConfigHandler.prefix + "blockdata_map";
+            rs = statement.executeQuery(query);
             ConfigHandler.blockdata.clear();
             ConfigHandler.blockdataReversed.clear();
             blockdataId = 0;
@@ -316,16 +293,9 @@ public class ConfigHandler extends Queue {
                 }
             }
             rs.close();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
 
-    public static void loadArt(Statement statement) {
-        try {
-            String query = "SELECT id,art FROM " + ConfigHandler.prefix + "art_map";
-            ResultSet rs = statement.executeQuery(query);
+            query = "SELECT id,art FROM " + ConfigHandler.prefix + "art_map";
+            rs = statement.executeQuery(query);
             ConfigHandler.art.clear();
             ConfigHandler.artReversed.clear();
             artId = 0;
@@ -340,16 +310,9 @@ public class ConfigHandler extends Queue {
                 }
             }
             rs.close();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
 
-    public static void loadEntities(Statement statement) {
-        try {
-            String query = "SELECT id,entity FROM " + ConfigHandler.prefix + "entity_map";
-            ResultSet rs = statement.executeQuery(query);
+            query = "SELECT id,entity FROM " + ConfigHandler.prefix + "entity_map";
+            rs = statement.executeQuery(query);
             ConfigHandler.entities.clear();
             ConfigHandler.entitiesReversed.clear();
             entityId = 0;
@@ -370,67 +333,6 @@ public class ConfigHandler extends Queue {
         }
     }
 
-    public static void loadTypes(Statement statement) {
-        loadMaterials(statement);
-        loadBlockdata(statement);
-        loadArt(statement);
-        loadEntities(statement);
-    }
-
-    /**
-     * Unified method to reload cache from database when DATABASE_LOCK is false (multi-server setup)
-     * 
-     * @param type
-     *            The type of cache to reload
-     * @param name
-     *            The name to look up after reload
-     * @return The ID if found after reload, or -1 if not found
-     */
-    public static int reloadAndGetId(CacheType type, String name) {
-        // Only reload if DATABASE_LOCK is false (multi-server setup)
-        if (Config.getGlobal().DATABASE_LOCK) {
-            return -1;
-        }
-
-        try (Connection connection = Database.getConnection(true)) {
-            if (connection != null) {
-                Statement statement = connection.createStatement();
-
-                // Reload appropriate cache based on type
-                switch (type) {
-                    case MATERIALS:
-                        loadMaterials(statement);
-                        statement.close();
-                        return materials.getOrDefault(name, -1);
-                    case BLOCKDATA:
-                        loadBlockdata(statement);
-                        statement.close();
-                        return blockdata.getOrDefault(name, -1);
-                    case ART:
-                        loadArt(statement);
-                        statement.close();
-                        return art.getOrDefault(name, -1);
-                    case ENTITIES:
-                        loadEntities(statement);
-                        statement.close();
-                        return entities.getOrDefault(name, -1);
-                    case WORLDS:
-                        loadWorlds(statement);
-                        statement.close();
-                        return worlds.getOrDefault(name, -1);
-                    default:
-                        statement.close();
-                        return -1;
-                }
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return -1;
-    }
-
     public static void loadWorlds(Statement statement) {
         try {
             String query = "SELECT id,world FROM " + ConfigHandler.prefix + "world";
@@ -534,15 +436,15 @@ public class ConfigHandler extends Queue {
             ConfigHandler.loadTypes(statement); // Load material ID's into memory.
 
             // Initialize WorldEdit logging
-            if (VersionUtils.checkWorldEdit()) {
+            if (Util.checkWorldEdit()) {
                 PluginManager pluginManager = Bukkit.getServer().getPluginManager();
                 Plugin worldEditPlugin = pluginManager.getPlugin("WorldEdit");
                 if (worldEditPlugin != null && worldEditPlugin.isEnabled()) {
-                    VersionUtils.loadWorldEdit();
+                    Util.loadWorldEdit();
                 }
             }
             else if (ConfigHandler.worldeditEnabled) {
-                VersionUtils.unloadWorldEdit();
+                Util.unloadWorldEdit();
             }
 
             ConfigHandler.serverRunning = true; // Set as running before patching

src/main/java/net/coreprotect/consumer/Consumer.java

@@ -100,7 +100,7 @@ public class Consumer extends Process implements Runnable, Thread.UncaughtExcept
 
     private static void pauseConsumer(int process_id) {
         try {
-            while ((ConfigHandler.serverRunning || ConfigHandler.converterRunning || ConfigHandler.migrationRunning) && (Consumer.isPaused || ConfigHandler.pauseConsumer || ConfigHandler.purgeRunning || Consumer.consumer_id.get(process_id)[1] == 1)) {
+            while ((ConfigHandler.serverRunning || ConfigHandler.converterRunning) && (Consumer.isPaused || ConfigHandler.pauseConsumer || ConfigHandler.purgeRunning || Consumer.consumer_id.get(process_id)[1] == 1)) {
                 pausedSuccess = true;
                 Thread.sleep(100);
             }

src/main/java/net/coreprotect/consumer/Queue.java

@@ -25,8 +25,7 @@ import net.coreprotect.consumer.process.Process;
 import net.coreprotect.listener.block.BlockUtil;
 import net.coreprotect.model.BlockGroup;
 import net.coreprotect.thread.Scheduler;
-import net.coreprotect.utility.BlockUtils;
-import net.coreprotect.utility.EntityUtils;
+import net.coreprotect.utility.Util;
 
 public class Queue {
 
@@ -102,7 +101,7 @@ public class Queue {
     protected static void queueBlockBreak(String user, BlockState block, Material type, String blockData, Material breakType, int extraData, int blockNumber) {
         if (type == Material.SPAWNER && block instanceof CreatureSpawner) { // Mob spawner
             CreatureSpawner mobSpawner = (CreatureSpawner) block;
-            extraData = EntityUtils.getSpawnerType(mobSpawner.getSpawnedType());
+            extraData = Util.getSpawnerType(mobSpawner.getSpawnedType());
         }
         else if (type == Material.IRON_DOOR || BlockGroup.DOORS.contains(type) || type.equals(Material.SUNFLOWER) || type.equals(Material.LILAC) || type.equals(Material.TALL_GRASS) || type.equals(Material.LARGE_FERN) || type.equals(Material.ROSE_BUSH) || type.equals(Material.PEONY)) { // Double plant
             if (block.getBlockData() instanceof Bisected) {
@@ -143,7 +142,7 @@ public class Queue {
 
         if (type == Material.SPAWNER && blockLocation instanceof CreatureSpawner) { // Mob spawner
             CreatureSpawner mobSpawner = (CreatureSpawner) blockLocation;
-            data = EntityUtils.getSpawnerType(mobSpawner.getSpawnedType());
+            data = Util.getSpawnerType(mobSpawner.getSpawnedType());
             forceData = 1;
         }
 
@@ -362,7 +361,7 @@ public class Queue {
         int currentConsumer = Consumer.currentConsumer;
         int consumerId = Consumer.newConsumerId(currentConsumer);
         addConsumer(currentConsumer, new Object[] { consumerId, Process.SIGN_TEXT, null, color, null, action, offset, null });
-        Consumer.consumerSigns.get(currentConsumer).put(consumerId, new Object[] { colorSecondary, BlockUtils.getSignData(frontGlowing, backGlowing), isWaxed, isFront, line1, line2, line3, line4, line5, line6, line7, line8 });
+        Consumer.consumerSigns.get(currentConsumer).put(consumerId, new Object[] { colorSecondary, Util.getSignData(frontGlowing, backGlowing), isWaxed, isFront, line1, line2, line3, line4, line5, line6, line7, line8 });
         queueStandardData(consumerId, currentConsumer, new String[] { user, null }, location);
     }
 

src/main/java/net/coreprotect/consumer/process/BlockBreakProcess.java

@@ -9,20 +9,19 @@ import org.bukkit.block.Skull;
 
 import net.coreprotect.database.logger.BlockBreakLogger;
 import net.coreprotect.database.logger.SkullBreakLogger;
-import net.coreprotect.utility.BlockUtils;
-import net.coreprotect.utility.MaterialUtils;
+import net.coreprotect.utility.Util;
 
 class BlockBreakProcess {
 
     static void process(PreparedStatement preparedStmt, PreparedStatement preparedStmtSkulls, int batchCount, int processId, int id, Material blockType, int blockDataId, Material replaceType, int forceData, String user, Object object, String blockData) {
         if (object instanceof BlockState) {
             BlockState block = (BlockState) object;
-            List<Object> meta = BlockUtils.processMeta(block);
+            List<Object> meta = Util.processMeta(block);
             if (block instanceof Skull) {
                 SkullBreakLogger.log(preparedStmt, preparedStmtSkulls, batchCount, user, block);
             }
             else {
-                BlockBreakLogger.log(preparedStmt, batchCount, user, block.getLocation(), MaterialUtils.getBlockId(blockType), blockDataId, meta, block.getBlockData().getAsString(), blockData);
+                BlockBreakLogger.log(preparedStmt, batchCount, user, block.getLocation(), Util.getBlockId(blockType), blockDataId, meta, block.getBlockData().getAsString(), blockData);
             }
         }
     }

src/main/java/net/coreprotect/consumer/process/BlockPlaceProcess.java

@@ -8,23 +8,22 @@ import org.bukkit.block.BlockState;
 
 import net.coreprotect.database.logger.BlockPlaceLogger;
 import net.coreprotect.database.logger.SkullPlaceLogger;
-import net.coreprotect.utility.BlockUtils;
-import net.coreprotect.utility.MaterialUtils;
+import net.coreprotect.utility.Util;
 
 class BlockPlaceProcess {
 
     static void process(PreparedStatement preparedStmt, PreparedStatement preparedStmtSkulls, int batchCount, Material blockType, int blockData, Material replaceType, int replaceData, int forceData, String user, Object object, String newBlockData, String replacedBlockData) {
         if (object instanceof BlockState) {
             BlockState block = (BlockState) object;
-            List<Object> meta = BlockUtils.processMeta(block);
+            List<Object> meta = Util.processMeta(block);
             if (blockType.equals(Material.SKELETON_SKULL) || blockType.equals(Material.SKELETON_WALL_SKULL) || blockType.equals(Material.WITHER_SKELETON_SKULL) || blockType.equals(Material.WITHER_SKELETON_WALL_SKULL) || blockType.equals(Material.ZOMBIE_HEAD) || blockType.equals(Material.ZOMBIE_WALL_HEAD) || blockType.equals(Material.PLAYER_HEAD) || blockType.equals(Material.PLAYER_WALL_HEAD) || blockType.equals(Material.CREEPER_HEAD) || blockType.equals(Material.CREEPER_WALL_HEAD) || blockType.equals(Material.DRAGON_HEAD) || blockType.equals(Material.DRAGON_WALL_HEAD)) {
-                SkullPlaceLogger.log(preparedStmt, preparedStmtSkulls, batchCount, user, block, MaterialUtils.getBlockId(replaceType), replaceData);
+                SkullPlaceLogger.log(preparedStmt, preparedStmtSkulls, batchCount, user, block, Util.getBlockId(replaceType), replaceData);
             }
             else if (forceData == 1) {
-                BlockPlaceLogger.log(preparedStmt, batchCount, user, block, MaterialUtils.getBlockId(replaceType), replaceData, blockType, blockData, true, meta, newBlockData, replacedBlockData);
+                BlockPlaceLogger.log(preparedStmt, batchCount, user, block, Util.getBlockId(replaceType), replaceData, blockType, blockData, true, meta, newBlockData, replacedBlockData);
             }
             else {
-                BlockPlaceLogger.log(preparedStmt, batchCount, user, block, MaterialUtils.getBlockId(replaceType), replaceData, blockType, blockData, false, meta, newBlockData, replacedBlockData);
+                BlockPlaceLogger.log(preparedStmt, batchCount, user, block, Util.getBlockId(replaceType), replaceData, blockType, blockData, false, meta, newBlockData, replacedBlockData);
             }
         }
     }

src/main/java/net/coreprotect/consumer/process/EntityKillProcess.java

@@ -9,7 +9,6 @@ import org.bukkit.entity.EntityType;
 
 import net.coreprotect.consumer.Consumer;
 import net.coreprotect.database.logger.EntityKillLogger;
-import net.coreprotect.utility.EntityUtils;
 import net.coreprotect.utility.Util;
 
 class EntityKillProcess {
@@ -21,7 +20,7 @@ class EntityKillProcess {
             Map<Integer, List<Object>> objectLists = Consumer.consumerObjectList.get(processId);
             if (objectLists.get(id) != null) {
                 List<Object> objectList = objectLists.get(id);
-                int entityId = EntityUtils.getEntityId(type);
+                int entityId = Util.getEntityId(type);
                 EntityKillLogger.log(preparedStmt, preparedStmtEntities, batchCount, user, block, objectList, entityId);
                 objectLists.remove(id);
             }

src/main/java/net/coreprotect/consumer/process/NaturalBlockBreakProcess.java

@@ -11,7 +11,6 @@ import org.bukkit.block.BlockState;
 import net.coreprotect.consumer.Consumer;
 import net.coreprotect.database.Lookup;
 import net.coreprotect.database.logger.BlockBreakLogger;
-import net.coreprotect.utility.MaterialUtils;
 import net.coreprotect.utility.Util;
 
 class NaturalBlockBreakProcess {
@@ -29,7 +28,7 @@ class NaturalBlockBreakProcess {
                     }
                 }
                 blockLists.remove(id);
-                BlockBreakLogger.log(preparedStmt, batchCount, user, block.getLocation(), MaterialUtils.getBlockId(blockType), blockData, null, block.getBlockData().getAsString(), overrideData);
+                BlockBreakLogger.log(preparedStmt, batchCount, user, block.getLocation(), Util.getBlockId(blockType), blockData, null, block.getBlockData().getAsString(), overrideData);
             }
         }
     }

src/main/java/net/coreprotect/consumer/process/Process.java

@@ -10,7 +10,6 @@ import java.util.Map.Entry;
 
 import org.bukkit.Material;
 
-import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.consumer.Consumer;
 import net.coreprotect.database.Database;
@@ -75,7 +74,7 @@ public class Process {
             }
 
             Statement statement = connection.createStatement();
-            Database.performCheckpoint(statement, Config.getGlobal().MYSQL);
+            Database.performCheckpoint(statement);
 
             Consumer.isPaused = true;
             ArrayList<Object[]> consumerData = Consumer.consumer.get(processId);
@@ -92,7 +91,7 @@ public class Process {
                 return;
             }
 
-            Database.beginTransaction(statement, Config.getGlobal().MYSQL);
+            Database.beginTransaction(statement);
             // Scan through usernames, ensure everything is loaded in memory.
             for (Entry<Integer, String[]> entry : users.entrySet()) {
                 String[] data = entry.getValue();
@@ -105,7 +104,7 @@ public class Process {
                 }
             }
             updateLockTable(statement, (lastRun ? 0 : 1));
-            Database.commitTransaction(statement, Config.getGlobal().MYSQL);
+            Database.commitTransaction(statement);
 
             // Create prepared statements
             PreparedStatement preparedStmtSigns = Database.prepareStatement(connection, Database.SIGN, false);
@@ -124,7 +123,7 @@ public class Process {
             PreparedStatement preparedStmtBlockdata = Database.prepareStatement(connection, Database.BLOCKDATA, false);
 
             // Scan through consumer data
-            Database.beginTransaction(statement, Config.getGlobal().MYSQL);
+            Database.beginTransaction(statement);
             for (int i = 0; i < consumerDataSize; i++) {
                 Object[] data = consumerData.get(i);
                 if (data != null) {
@@ -243,7 +242,7 @@ public class Process {
                             if (Consumer.interrupt) {
                                 commit(statement, preparedStmtSigns, preparedStmtBlocks, preparedStmtSkulls, preparedStmtContainers, preparedStmtItems, preparedStmtWorlds, preparedStmtChat, preparedStmtCommand, preparedStmtSession, preparedStmtEntities, preparedStmtMaterials, preparedStmtArt, preparedStmtEntity, preparedStmtBlockdata);
                                 Thread.sleep(500);
-                                Database.beginTransaction(statement, Config.getGlobal().MYSQL);
+                                Database.beginTransaction(statement);
                             }
                         }
                         catch (Exception e) {
@@ -303,7 +302,7 @@ public class Process {
             preparedStmtArt.executeBatch();
             preparedStmtEntity.executeBatch();
             preparedStmtBlockdata.executeBatch();
-            Database.commitTransaction(statement, Config.getGlobal().MYSQL);
+            Database.commitTransaction(statement);
         }
         catch (Exception e) {
             e.printStackTrace();

src/main/java/net/coreprotect/consumer/process/RollbackUpdateProcess.java

@@ -6,7 +6,7 @@ import java.util.Map;
 
 import net.coreprotect.consumer.Consumer;
 import net.coreprotect.database.Database;
-import net.coreprotect.utility.MaterialUtils;
+import net.coreprotect.utility.Util;
 
 class RollbackUpdateProcess {
 
@@ -17,7 +17,7 @@ class RollbackUpdateProcess {
             for (Object[] listRow : list) {
                 long rowid = (Long) listRow[0];
                 int rolledBack = (Integer) listRow[9];
-                if (MaterialUtils.rolledBack(rolledBack, (table == 2 || table == 3 || table == 4)) == action) { // 1 = restore, 0 = rollback
+                if (Util.rolledBack(rolledBack, (table == 2 || table == 3 || table == 4)) == action) { // 1 = restore, 0 = rollback
                     Database.performUpdate(statement, rowid, rolledBack, table);
                 }
             }

src/main/java/net/coreprotect/consumer/process/SignUpdateProcess.java

@@ -7,8 +7,7 @@ import org.bukkit.block.BlockState;
 
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.statement.SignStatement;
-import net.coreprotect.utility.BlockUtils;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 class SignUpdateProcess {
 
@@ -23,7 +22,7 @@ class SignUpdateProcess {
             int x = block.getX();
             int y = block.getY();
             int z = block.getZ();
-            int wid = WorldUtils.getWorldId(block.getWorld().getName());
+            int wid = Util.getWorldId(block.getWorld().getName());
             int userid = ConfigHandler.playerIdCache.get(user.toLowerCase(Locale.ROOT));
             String query = "";
             if (action == 0) {
@@ -33,7 +32,7 @@ class SignUpdateProcess {
                 query = "SELECT color, color_secondary, data, waxed, face, line_1, line_2, line_3, line_4, line_5, line_6, line_7, line_8 FROM " + ConfigHandler.prefix + "sign WHERE user='" + userid + "' AND wid='" + wid + "' AND x='" + x + "' AND z='" + z + "' AND y='" + y + "' AND time >= '" + time + "' ORDER BY rowid ASC LIMIT 0, 1";
             }
             SignStatement.getData(statement, block, query);
-            BlockUtils.updateBlock(block);
+            Util.updateBlock(block);
         }
     }
 }

src/main/java/net/coreprotect/consumer/process/SkullUpdateProcess.java

@@ -4,9 +4,9 @@ import java.sql.Statement;
 
 import org.bukkit.block.BlockState;
 
-import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.statement.SkullStatement;
-import net.coreprotect.utility.BlockUtils;
+import net.coreprotect.utility.Util;
+import net.coreprotect.config.ConfigHandler;
 
 class SkullUpdateProcess {
 
@@ -18,9 +18,9 @@ class SkullUpdateProcess {
          */
         if (object instanceof BlockState) {
             BlockState block = (BlockState) object;
-            String query = "SELECT owner, skin FROM " + ConfigHandler.prefix + "skull WHERE rowid='" + rowId + "' LIMIT 0, 1";
+            String query = "SELECT owner FROM " + ConfigHandler.prefix + "skull WHERE rowid='" + rowId + "' LIMIT 0, 1";
             SkullStatement.getData(statement, block, query);
-            BlockUtils.updateBlock(block);
+            Util.updateBlock(block);
         }
     }
 }

src/main/java/net/coreprotect/consumer/process/StructureGrowthProcess.java

@@ -11,7 +11,6 @@ import net.coreprotect.consumer.Consumer;
 import net.coreprotect.database.Lookup;
 import net.coreprotect.database.logger.BlockBreakLogger;
 import net.coreprotect.database.logger.BlockPlaceLogger;
-import net.coreprotect.utility.MaterialUtils;
 import net.coreprotect.utility.Util;
 
 class StructureGrowthProcess {
@@ -32,7 +31,7 @@ class StructureGrowthProcess {
                 int count = 0;
                 for (BlockState blockState : blockStates) {
                     if (count < replaceBlockCount) {
-                        BlockBreakLogger.log(preparedStmt, batchCount, user, blockState.getLocation(), MaterialUtils.getBlockId(blockState.getType()), 0, null, blockState.getBlockData().getAsString(), null);
+                        BlockBreakLogger.log(preparedStmt, batchCount, user, blockState.getLocation(), Util.getBlockId(blockState.getType()), 0, null, blockState.getBlockData().getAsString(), null);
                     }
                     else {
                         BlockPlaceLogger.log(preparedStmt, batchCount, user, blockState, 0, 0, null, -1, false, null, null, null);

src/main/java/net/coreprotect/database/BlockLookup.java

@@ -1,119 +0,0 @@
-package net.coreprotect.database;
-
-import java.sql.ResultSet;
-import java.sql.Statement;
-
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-
-import net.coreprotect.config.ConfigHandler;
-import net.coreprotect.database.statement.UserStatement;
-import net.coreprotect.thread.CacheHandler;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.WorldUtils;
-
-public class BlockLookup {
-
-    public static String whoPlaced(Statement statement, BlockState block) {
-        String result = "";
-
-        try {
-            if (block == null) {
-                return result;
-            }
-
-            int x = block.getX();
-            int y = block.getY();
-            int z = block.getZ();
-            int time = (int) (System.currentTimeMillis() / 1000L);
-            int worldId = WorldUtils.getWorldId(block.getWorld().getName());
-            String query = "SELECT user,type FROM " + ConfigHandler.prefix + "block " + WorldUtils.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND rolled_back IN(0,2) AND action='1' ORDER BY rowid DESC LIMIT 0, 1";
-
-            ResultSet results = statement.executeQuery(query);
-            while (results.next()) {
-                int resultUserId = results.getInt("user");
-                int resultType = results.getInt("type");
-
-                if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) {
-                    UserStatement.loadName(statement.getConnection(), resultUserId);
-                }
-
-                result = ConfigHandler.playerIdCacheReversed.get(resultUserId);
-                if (result.length() > 0) {
-                    Material resultMaterial = MaterialUtils.getType(resultType);
-                    CacheHandler.lookupCache.put("" + x + "." + y + "." + z + "." + worldId + "", new Object[] { time, result, resultMaterial });
-                }
-            }
-            results.close();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return result;
-    }
-
-    public static String whoPlacedCache(Block block) {
-        if (block == null) {
-            return "";
-        }
-
-        return whoPlacedCache(block.getState());
-    }
-
-    public static String whoPlacedCache(BlockState block) {
-        String result = "";
-
-        try {
-            if (block == null) {
-                return result;
-            }
-
-            int x = block.getX();
-            int y = block.getY();
-            int z = block.getZ();
-            int worldId = WorldUtils.getWorldId(block.getWorld().getName());
-
-            String cords = "" + x + "." + y + "." + z + "." + worldId + "";
-            Object[] data = CacheHandler.lookupCache.get(cords);
-
-            if (data != null) {
-                result = (String) data[1];
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return result;
-    }
-
-    public static String whoRemovedCache(BlockState block) {
-        /*
-         * Performs a lookup on who removed a block, from memory. Only searches through the last 30 seconds of block removal data.
-         */
-        String result = "";
-
-        try {
-            if (block != null) {
-                int x = block.getX();
-                int y = block.getY();
-                int z = block.getZ();
-                int worldId = WorldUtils.getWorldId(block.getWorld().getName());
-
-                String cords = "" + x + "." + y + "." + z + "." + worldId + "";
-                Object[] data = CacheHandler.breakCache.get(cords);
-
-                if (data != null) {
-                    result = (String) data[1];
-                }
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return result;
-    }
-}

src/main/java/net/coreprotect/database/ContainerRollback.java

@@ -26,10 +26,8 @@ import net.coreprotect.database.rollback.RollbackComplete;
 import net.coreprotect.language.Phrase;
 import net.coreprotect.model.BlockGroup;
 import net.coreprotect.thread.Scheduler;
-import net.coreprotect.utility.BlockUtils;
 import net.coreprotect.utility.Chat;
-import net.coreprotect.utility.ItemUtils;
-import net.coreprotect.utility.MaterialUtils;
+import net.coreprotect.utility.Util;
 
 public class ContainerRollback extends Rollback {
 
@@ -70,14 +68,14 @@ public class ContainerRollback extends Rollback {
                         List<ItemFrame> matchingFrames = new ArrayList<>();
 
                         if (BlockGroup.CONTAINERS.contains(type)) {
-                            container = BlockUtils.getContainerInventory(block.getState(), false);
+                            container = Util.getContainerInventory(block.getState(), false);
                         }
                         else {
                             for (Entity entity : block.getChunk().getEntities()) {
                                 if (entity.getLocation().getBlockX() == location.getBlockX() && entity.getLocation().getBlockY() == location.getBlockY() && entity.getLocation().getBlockZ() == location.getBlockZ()) {
                                     if (entity instanceof ArmorStand) {
                                         type = Material.ARMOR_STAND;
-                                        container = ItemUtils.getEntityEquipment((LivingEntity) entity);
+                                        container = Util.getEntityEquipment((LivingEntity) entity);
                                     }
                                     else if (entity instanceof ItemFrame) {
                                         type = Material.ITEM_FRAME;
@@ -101,11 +99,11 @@ public class ContainerRollback extends Rollback {
                                 int rowTypeRaw = (Integer) lookupRow[6];
                                 int rowData = (Integer) lookupRow[7];
                                 int rowAction = (Integer) lookupRow[8];
-                                int rowRolledBack = MaterialUtils.rolledBack((Integer) lookupRow[9], false);
+                                int rowRolledBack = Util.rolledBack((Integer) lookupRow[9], false);
                                 // int rowWid = (Integer)lookupRow[10];
                                 int rowAmount = (Integer) lookupRow[11];
                                 byte[] rowMetadata = (byte[]) lookupRow[12];
-                                Material rowType = MaterialUtils.getType(rowTypeRaw);
+                                Material rowType = Util.getType(rowTypeRaw);
 
                                 if ((rollbackType == 0 && rowRolledBack == 0) || (rollbackType == 1 && rowRolledBack == 1)) {
                                     modifyCount = modifyCount + rowAmount;

src/main/java/net/coreprotect/database/Database.java

@@ -8,10 +8,8 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -26,8 +24,7 @@ import net.coreprotect.language.Phrase;
 import net.coreprotect.model.BlockGroup;
 import net.coreprotect.utility.Chat;
 import net.coreprotect.utility.Color;
-import net.coreprotect.utility.ItemUtils;
-import net.coreprotect.utility.MaterialUtils;
+import net.coreprotect.utility.Util;
 
 public class Database extends Queue {
 
@@ -46,31 +43,11 @@ public class Database extends Queue {
     public static final int BLOCKDATA = 12;
     public static final int ITEM = 13;
 
-    private static final Map<Integer, String> SQL_QUERIES = new HashMap<>();
-
-    static {
-        // Initialize SQL queries for different table types
-        SQL_QUERIES.put(SIGN, "INSERT INTO %sprefix%sign (time, user, wid, x, y, z, action, color, color_secondary, data, waxed, face, line_1, line_2, line_3, line_4, line_5, line_6, line_7, line_8) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-        SQL_QUERIES.put(BLOCK, "INSERT INTO %sprefix%block (time, user, wid, x, y, z, type, data, meta, blockdata, action, rolled_back) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-        SQL_QUERIES.put(SKULL, "INSERT INTO %sprefix%skull (time, owner, skin) VALUES (?, ?, ?)");
-        SQL_QUERIES.put(CONTAINER, "INSERT INTO %sprefix%container (time, user, wid, x, y, z, type, data, amount, metadata, action, rolled_back) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-        SQL_QUERIES.put(ITEM, "INSERT INTO %sprefix%item (time, user, wid, x, y, z, type, data, amount, action, rolled_back) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-        SQL_QUERIES.put(WORLD, "INSERT INTO %sprefix%world (id, world) VALUES (?, ?)");
-        SQL_QUERIES.put(CHAT, "INSERT INTO %sprefix%chat (time, user, wid, x, y, z, message) VALUES (?, ?, ?, ?, ?, ?, ?)");
-        SQL_QUERIES.put(COMMAND, "INSERT INTO %sprefix%command (time, user, wid, x, y, z, message) VALUES (?, ?, ?, ?, ?, ?, ?)");
-        SQL_QUERIES.put(SESSION, "INSERT INTO %sprefix%session (time, user, wid, x, y, z, action) VALUES (?, ?, ?, ?, ?, ?, ?)");
-        SQL_QUERIES.put(ENTITY, "INSERT INTO %sprefix%entity (time, data) VALUES (?, ?)");
-        SQL_QUERIES.put(MATERIAL, "INSERT INTO %sprefix%material_map (id, material) VALUES (?, ?)");
-        SQL_QUERIES.put(ART, "INSERT INTO %sprefix%art_map (id, art) VALUES (?, ?)");
-        SQL_QUERIES.put(ENTITY_MAP, "INSERT INTO %sprefix%entity_map (id, entity) VALUES (?, ?)");
-        SQL_QUERIES.put(BLOCKDATA, "INSERT INTO %sprefix%blockdata_map (id, data) VALUES (?, ?)");
-    }
-
-    public static void beginTransaction(Statement statement, boolean isMySQL) {
+    public static void beginTransaction(Statement statement) {
         Consumer.transacting = true;
 
         try {
-            if (isMySQL) {
+            if (Config.getGlobal().MYSQL) {
                 statement.executeUpdate("START TRANSACTION");
             }
             else {
@@ -82,12 +59,12 @@ public class Database extends Queue {
         }
     }
 
-    public static void commitTransaction(Statement statement, boolean isMySQL) throws Exception {
+    public static void commitTransaction(Statement statement) throws Exception {
         int count = 0;
 
         while (true) {
             try {
-                if (isMySQL) {
+                if (Config.getGlobal().MYSQL) {
                     statement.executeUpdate("COMMIT");
                 }
                 else {
@@ -112,8 +89,8 @@ public class Database extends Queue {
         }
     }
 
-    public static void performCheckpoint(Statement statement, boolean isMySQL) throws SQLException {
-        if (!isMySQL) {
+    public static void performCheckpoint(Statement statement) throws SQLException {
+        if (!Config.getGlobal().MYSQL) {
             statement.executeUpdate("PRAGMA wal_checkpoint(TRUNCATE)");
         }
     }
@@ -138,11 +115,11 @@ public class Database extends Queue {
             if (Config.getConfig(location.getWorld()).ITEM_TRANSACTIONS) {
                 try {
                     if (contents == null) {
-                        contents = ItemUtils.getContainerContents(type, container, location);
+                        contents = Util.getContainerContents(type, container, location);
                     }
                     if (contents != null) {
                         List<ItemStack[]> forceList = new ArrayList<>();
-                        forceList.add(ItemUtils.getContainerState(contents));
+                        forceList.add(Util.getContainerState(contents));
                         ConfigHandler.forceContainer.put(user.toLowerCase(Locale.ROOT) + "." + location.getBlockX() + "." + location.getBlockY() + "." + location.getBlockZ(), forceList);
                         Queue.queueContainerBreak(user, location, type, contents);
                     }
@@ -155,7 +132,8 @@ public class Database extends Queue {
     }
 
     public static Connection getConnection(boolean onlyCheckTransacting) {
-        // Previously 250ms; long consumer commit time may be due to batching (investigate removing batching for SQLite connections)
+        // Previously 250ms; long consumer commit time may be due to batching
+        // TODO: Investigate, potentially remove batching for SQLite connections
         return getConnection(false, false, onlyCheckTransacting, 1000);
     }
 
@@ -222,7 +200,7 @@ public class Database extends Queue {
 
     public static void performUpdate(Statement statement, long id, int rb, int table) {
         try {
-            int rolledBack = MaterialUtils.toggleRolledBack(rb, (table == 2 || table == 3 || table == 4)); // co_item, co_container, co_block
+            int rolledBack = Util.toggleRolledBack(rb, (table == 2 || table == 3 || table == 4)); // co_item, co_container, co_block
             if (table == 1 || table == 3) {
                 statement.executeUpdate("UPDATE " + ConfigHandler.prefix + "container SET rolled_back='" + rolledBack + "' WHERE rowid='" + id + "'");
             }
@@ -241,10 +219,64 @@ public class Database extends Queue {
     public static PreparedStatement prepareStatement(Connection connection, int type, boolean keys) {
         PreparedStatement preparedStatement = null;
         try {
-            String query = SQL_QUERIES.get(type);
-            if (query != null) {
-                query = query.replace("%sprefix%", ConfigHandler.prefix);
-                preparedStatement = prepareStatement(connection, query, keys);
+            String signInsert = "INSERT INTO " + ConfigHandler.prefix + "sign (time, user, wid, x, y, z, action, color, color_secondary, data, waxed, face, line_1, line_2, line_3, line_4, line_5, line_6, line_7, line_8) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+            String blockInsert = "INSERT INTO " + ConfigHandler.prefix + "block (time, user, wid, x, y, z, type, data, meta, blockdata, action, rolled_back) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+            String skullInsert = "INSERT INTO " + ConfigHandler.prefix + "skull (time, owner) VALUES (?, ?)";
+            String containerInsert = "INSERT INTO " + ConfigHandler.prefix + "container (time, user, wid, x, y, z, type, data, amount, metadata, action, rolled_back) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+            String itemInsert = "INSERT INTO " + ConfigHandler.prefix + "item (time, user, wid, x, y, z, type, data, amount, action, rolled_back) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+            String worldInsert = "INSERT INTO " + ConfigHandler.prefix + "world (id, world) VALUES (?, ?)";
+            String chatInsert = "INSERT INTO " + ConfigHandler.prefix + "chat (time, user, wid, x, y, z, message) VALUES (?, ?, ?, ?, ?, ?, ?)";
+            String commandInsert = "INSERT INTO " + ConfigHandler.prefix + "command (time, user, wid, x, y, z, message) VALUES (?, ?, ?, ?, ?, ?, ?)";
+            String sessionInsert = "INSERT INTO " + ConfigHandler.prefix + "session (time, user, wid, x, y, z, action) VALUES (?, ?, ?, ?, ?, ?, ?)";
+            String entityInsert = "INSERT INTO " + ConfigHandler.prefix + "entity (time, data) VALUES (?, ?)";
+            String materialInsert = "INSERT INTO " + ConfigHandler.prefix + "material_map (id, material) VALUES (?, ?)";
+            String artInsert = "INSERT INTO " + ConfigHandler.prefix + "art_map (id, art) VALUES (?, ?)";
+            String entityMapInsert = "INSERT INTO " + ConfigHandler.prefix + "entity_map (id, entity) VALUES (?, ?)";
+            String blockdataInsert = "INSERT INTO " + ConfigHandler.prefix + "blockdata_map (id, data) VALUES (?, ?)";
+
+            switch (type) {
+                case SIGN:
+                    preparedStatement = prepareStatement(connection, signInsert, keys);
+                    break;
+                case BLOCK:
+                    preparedStatement = prepareStatement(connection, blockInsert, keys);
+                    break;
+                case SKULL:
+                    preparedStatement = prepareStatement(connection, skullInsert, keys);
+                    break;
+                case CONTAINER:
+                    preparedStatement = prepareStatement(connection, containerInsert, keys);
+                    break;
+                case ITEM:
+                    preparedStatement = prepareStatement(connection, itemInsert, keys);
+                    break;
+                case WORLD:
+                    preparedStatement = prepareStatement(connection, worldInsert, keys);
+                    break;
+                case CHAT:
+                    preparedStatement = prepareStatement(connection, chatInsert, keys);
+                    break;
+                case COMMAND:
+                    preparedStatement = prepareStatement(connection, commandInsert, keys);
+                    break;
+                case SESSION:
+                    preparedStatement = prepareStatement(connection, sessionInsert, keys);
+                    break;
+                case ENTITY:
+                    preparedStatement = prepareStatement(connection, entityInsert, keys);
+                    break;
+                case MATERIAL:
+                    preparedStatement = prepareStatement(connection, materialInsert, keys);
+                    break;
+                case ART:
+                    preparedStatement = prepareStatement(connection, artInsert, keys);
+                    break;
+                case ENTITY_MAP:
+                    preparedStatement = prepareStatement(connection, entityMapInsert, keys);
+                    break;
+                case BLOCKDATA:
+                    preparedStatement = prepareStatement(connection, blockdataInsert, keys);
+                    break;
             }
         }
         catch (Exception e) {
@@ -306,259 +338,251 @@ public class Database extends Queue {
         }
     }
 
-    private static final List<String> DATABASE_TABLES = Arrays.asList("art_map", "block", "chat", "command", "container", "item", "database_lock", "entity", "entity_map", "material_map", "blockdata_map", "session", "sign", "skull", "user", "username_log", "version", "world");
-
-    public static void createDatabaseTables(String prefix, boolean forcePrefix, Connection forceConnection, boolean mySQL, boolean purge) {
+    public static void createDatabaseTables(String prefix, boolean purge) {
         ConfigHandler.databaseTables.clear();
-        ConfigHandler.databaseTables.addAll(DATABASE_TABLES);
+        ConfigHandler.databaseTables.addAll(Arrays.asList("art_map", "block", "chat", "command", "container", "item", "database_lock", "entity", "entity_map", "material_map", "blockdata_map", "session", "sign", "skull", "user", "username_log", "version", "world"));
 
-        if (mySQL) {
-            createMySQLTables(prefix, forceConnection, purge);
+        if (Config.getGlobal().MYSQL) {
+            boolean success = false;
+            try (Connection connection = Database.getConnection(true, true, true, 0)) {
+                if (connection != null) {
+                    String index = "";
+                    Statement statement = connection.createStatement();
+                    index = ", INDEX(id)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "art_map(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),id int,art varchar(255)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(wid,x,z,time), INDEX(user,time), INDEX(type,time)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "block(rowid bigint NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, user int, wid int, x int, y int, z int, type int, data int, meta mediumblob, blockdata blob, action tinyint, rolled_back tinyint" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(time), INDEX(user,time), INDEX(wid,x,z,time)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "chat(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int, user int, wid int, x int, y int (3), z int, message varchar(16000)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(time), INDEX(user,time), INDEX(wid,x,z,time)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "command(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int, user int, wid int, x int, y int (3), z int, message varchar(16000)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(wid,x,z,time), INDEX(user,time), INDEX(type,time)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "container(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, user int, wid int, x int, y int, z int, type int, data int, amount int, metadata blob, action tinyint, rolled_back tinyint" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(wid,x,z,time), INDEX(user,time), INDEX(type,time)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "item(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, user int, wid int, x int, y int, z int, type int, data blob, amount int, action tinyint, rolled_back tinyint" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "database_lock(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),status tinyint,time int) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "entity(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, data blob) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(id)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "entity_map(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),id int,entity varchar(255)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(id)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "material_map(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),id int,material varchar(255)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(id)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "blockdata_map(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),id int,data varchar(255)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(wid,x,z,time), INDEX(action,time), INDEX(user,time), INDEX(time)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "session(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int, user int, wid int, x int, y int (3), z int, action tinyint" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(wid,x,z,time), INDEX(user,time), INDEX(time)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "sign(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int, user int, wid int, x int, y int, z int, action tinyint, color int, color_secondary int, data tinyint, waxed tinyint, face tinyint, line_1 varchar(100), line_2 varchar(100), line_3 varchar(100), line_4 varchar(100), line_5 varchar(100), line_6 varchar(100), line_7 varchar(100), line_8 varchar(100)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "skull(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, owner varchar(255)) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(user), INDEX(uuid)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "user(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int,user varchar(100),uuid varchar(64)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(uuid,user)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "username_log(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int,uuid varchar(64),user varchar(100)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "version(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int,version varchar(16)) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    index = ", INDEX(id)";
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "world(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),id int,world varchar(255)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    if (!purge) {
+                        initializeTables(prefix, statement);
+                    }
+                    statement.close();
+                    success = true;
+                }
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+            if (!success) {
+                Config.getGlobal().MYSQL = false;
+            }
         }
-        else {
-            createSQLiteTables(prefix, forcePrefix, forceConnection, purge);
-        }
-    }
-
-    private static void createMySQLTables(String prefix, Connection forceConnection, boolean purge) {
-        boolean success = false;
-        try (Connection connection = (forceConnection != null ? forceConnection : Database.getConnection(true, true, true, 0))) {
-            if (connection != null) {
+        if (!Config.getGlobal().MYSQL) {
+            try (Connection connection = Database.getConnection(true, 0)) {
                 Statement statement = connection.createStatement();
-                createMySQLTableStructures(prefix, statement);
-                if (!purge && forceConnection == null) {
+                List<String> tableData = new ArrayList<>();
+                List<String> indexData = new ArrayList<>();
+                String attachDatabase = "";
+
+                if (purge) {
+                    String query = "ATTACH DATABASE '" + ConfigHandler.path + ConfigHandler.sqlite + ".tmp' AS tmp_db";
+                    PreparedStatement preparedStmt = connection.prepareStatement(query);
+                    preparedStmt.execute();
+                    preparedStmt.close();
+                    attachDatabase = "tmp_db.";
+                }
+
+                String query = "SELECT type,name FROM " + attachDatabase + "sqlite_master WHERE type='table' OR type='index';";
+                ResultSet rs = statement.executeQuery(query);
+                while (rs.next()) {
+                    String type = rs.getString("type");
+                    if (type.equalsIgnoreCase("table")) {
+                        tableData.add(rs.getString("name"));
+                    }
+                    else if (type.equalsIgnoreCase("index")) {
+                        indexData.add(rs.getString("name"));
+                    }
+                }
+                rs.close();
+
+                if (!tableData.contains(prefix + "art_map")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "art_map (id INTEGER, art TEXT);");
+                }
+                if (!tableData.contains(prefix + "block")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "block (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, type INTEGER, data INTEGER, meta BLOB, blockdata BLOB, action INTEGER, rolled_back INTEGER);");
+                }
+                if (!tableData.contains(prefix + "chat")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "chat (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, message TEXT);");
+                }
+                if (!tableData.contains(prefix + "command")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "command (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, message TEXT);");
+                }
+                if (!tableData.contains(prefix + "container")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "container (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, type INTEGER, data INTEGER, amount INTEGER, metadata BLOB, action INTEGER, rolled_back INTEGER);");
+                }
+                if (!tableData.contains(prefix + "item")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "item (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, type INTEGER, data BLOB, amount INTEGER, action INTEGER, rolled_back INTEGER);");
+                }
+                if (!tableData.contains(prefix + "database_lock")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "database_lock (status INTEGER, time INTEGER);");
+                }
+                if (!tableData.contains(prefix + "entity")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "entity (id INTEGER PRIMARY KEY ASC, time INTEGER, data BLOB);");
+                }
+                if (!tableData.contains(prefix + "entity_map")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "entity_map (id INTEGER, entity TEXT);");
+                }
+                if (!tableData.contains(prefix + "material_map")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "material_map (id INTEGER, material TEXT);");
+                }
+                if (!tableData.contains(prefix + "blockdata_map")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "blockdata_map (id INTEGER, data TEXT);");
+                }
+                if (!tableData.contains(prefix + "session")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "session (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, action INTEGER);");
+                }
+                if (!tableData.contains(prefix + "sign")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "sign (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, action INTEGER, color INTEGER, color_secondary INTEGER, data INTEGER, waxed INTEGER, face INTEGER, line_1 TEXT, line_2 TEXT, line_3 TEXT, line_4 TEXT, line_5 TEXT, line_6 TEXT, line_7 TEXT, line_8 TEXT);");
+                }
+                if (!tableData.contains(prefix + "skull")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "skull (id INTEGER PRIMARY KEY ASC, time INTEGER, owner TEXT);");
+                }
+                if (!tableData.contains(prefix + "user")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "user (id INTEGER PRIMARY KEY ASC, time INTEGER, user TEXT, uuid TEXT);");
+                }
+                if (!tableData.contains(prefix + "username_log")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "username_log (id INTEGER PRIMARY KEY ASC, time INTEGER, uuid TEXT, user TEXT);");
+                }
+                if (!tableData.contains(prefix + "version")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "version (time INTEGER, version TEXT);");
+                }
+                if (!tableData.contains(prefix + "world")) {
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "world (id INTEGER, world TEXT);");
+                }
+                try {
+                    if (!indexData.contains("art_map_id_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "art_map_id_index ON " + ConfigHandler.prefix + "art_map(id);");
+                    }
+                    if (!indexData.contains("block_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "block_index ON " + ConfigHandler.prefix + "block(wid,x,z,time);");
+                    }
+                    if (!indexData.contains("block_user_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "block_user_index ON " + ConfigHandler.prefix + "block(user,time);");
+                    }
+                    if (!indexData.contains("block_type_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "block_type_index ON " + ConfigHandler.prefix + "block(type,time);");
+                    }
+                    if (!indexData.contains("blockdata_map_id_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "blockdata_map_id_index ON " + ConfigHandler.prefix + "blockdata_map(id);");
+                    }
+                    if (!indexData.contains("chat_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "chat_index ON " + ConfigHandler.prefix + "chat(time);");
+                    }
+                    if (!indexData.contains("chat_user_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "chat_user_index ON " + ConfigHandler.prefix + "chat(user,time);");
+                    }
+                    if (!indexData.contains("chat_wid_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "chat_wid_index ON " + ConfigHandler.prefix + "chat(wid,x,z,time);");
+                    }
+                    if (!indexData.contains("command_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "command_index ON " + ConfigHandler.prefix + "command(time);");
+                    }
+                    if (!indexData.contains("command_user_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "command_user_index ON " + ConfigHandler.prefix + "command(user,time);");
+                    }
+                    if (!indexData.contains("command_wid_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "command_wid_index ON " + ConfigHandler.prefix + "command(wid,x,z,time);");
+                    }
+                    if (!indexData.contains("container_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "container_index ON " + ConfigHandler.prefix + "container(wid,x,z,time);");
+                    }
+                    if (!indexData.contains("container_user_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "container_user_index ON " + ConfigHandler.prefix + "container(user,time);");
+                    }
+                    if (!indexData.contains("container_type_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "container_type_index ON " + ConfigHandler.prefix + "container(type,time);");
+                    }
+                    if (!indexData.contains("item_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "item_index ON " + ConfigHandler.prefix + "item(wid,x,z,time);");
+                    }
+                    if (!indexData.contains("item_user_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "item_user_index ON " + ConfigHandler.prefix + "item(user,time);");
+                    }
+                    if (!indexData.contains("item_type_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "item_type_index ON " + ConfigHandler.prefix + "item(type,time);");
+                    }
+                    if (!indexData.contains("entity_map_id_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "entity_map_id_index ON " + ConfigHandler.prefix + "entity_map(id);");
+                    }
+                    if (!indexData.contains("material_map_id_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "material_map_id_index ON " + ConfigHandler.prefix + "material_map(id);");
+                    }
+                    if (!indexData.contains("session_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "session_index ON " + ConfigHandler.prefix + "session(wid,x,z,time);");
+                    }
+                    if (!indexData.contains("session_action_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "session_action_index ON " + ConfigHandler.prefix + "session(action,time);");
+                    }
+                    if (!indexData.contains("session_user_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "session_user_index ON " + ConfigHandler.prefix + "session(user,time);");
+                    }
+                    if (!indexData.contains("session_time_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "session_time_index ON " + ConfigHandler.prefix + "session(time);");
+                    }
+                    if (!indexData.contains("sign_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "sign_index ON " + ConfigHandler.prefix + "sign(wid,x,z,time);");
+                    }
+                    if (!indexData.contains("sign_user_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "sign_user_index ON " + ConfigHandler.prefix + "sign(user,time);");
+                    }
+                    if (!indexData.contains("sign_time_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "sign_time_index ON " + ConfigHandler.prefix + "sign(time);");
+                    }
+                    if (!indexData.contains("user_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "user_index ON " + ConfigHandler.prefix + "user(user);");
+                    }
+                    if (!indexData.contains("uuid_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "uuid_index ON " + ConfigHandler.prefix + "user(uuid);");
+                    }
+                    if (!indexData.contains("username_log_uuid_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "username_log_uuid_index ON " + ConfigHandler.prefix + "username_log(uuid,user);");
+                    }
+                    if (!indexData.contains("world_id_index")) {
+                        statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + "world_id_index ON " + ConfigHandler.prefix + "world(id);");
+                    }
+                }
+                catch (Exception e) {
+                    Chat.console(Phrase.build(Phrase.DATABASE_INDEX_ERROR));
+                    if (purge) {
+                        e.printStackTrace();
+                    }
+                }
+                if (!purge) {
                     initializeTables(prefix, statement);
                 }
                 statement.close();
-                success = true;
             }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (!success && forceConnection == null) {
-            Config.getGlobal().MYSQL = false;
-        }
-    }
-
-    private static void createMySQLTableStructures(String prefix, Statement statement) throws SQLException {
-        String index = "";
-
-        // Art map
-        index = ", INDEX(id)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "art_map(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),id int,art varchar(255)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Block
-        index = ", INDEX(wid,x,z,time), INDEX(user,time), INDEX(type,time)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "block(rowid bigint NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, user int, wid int, x int, y int, z int, type int, data int, meta mediumblob, blockdata blob, action tinyint, rolled_back tinyint" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Chat
-        index = ", INDEX(time), INDEX(user,time), INDEX(wid,x,z,time)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "chat(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int, user int, wid int, x int, y int (3), z int, message varchar(16000)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Command
-        index = ", INDEX(time), INDEX(user,time), INDEX(wid,x,z,time)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "command(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int, user int, wid int, x int, y int (3), z int, message varchar(16000)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Container
-        index = ", INDEX(wid,x,z,time), INDEX(user,time), INDEX(type,time)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "container(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, user int, wid int, x int, y int, z int, type int, data int, amount int, metadata blob, action tinyint, rolled_back tinyint" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Item
-        index = ", INDEX(wid,x,z,time), INDEX(user,time), INDEX(type,time)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "item(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, user int, wid int, x int, y int, z int, type int, data blob, amount int, action tinyint, rolled_back tinyint" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Database lock
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "database_lock(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),status tinyint,time int) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Entity
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "entity(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, data blob) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Entity map
-        index = ", INDEX(id)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "entity_map(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),id int,entity varchar(255)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Material map
-        index = ", INDEX(id)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "material_map(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),id int,material varchar(255)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Blockdata map
-        index = ", INDEX(id)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "blockdata_map(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),id int,data varchar(255)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Session
-        index = ", INDEX(wid,x,z,time), INDEX(action,time), INDEX(user,time), INDEX(time)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "session(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int, user int, wid int, x int, y int (3), z int, action tinyint" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Sign
-        index = ", INDEX(wid,x,z,time), INDEX(user,time), INDEX(time)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "sign(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int, user int, wid int, x int, y int, z int, action tinyint, color int, color_secondary int, data tinyint, waxed tinyint, face tinyint, line_1 varchar(100), line_2 varchar(100), line_3 varchar(100), line_4 varchar(100), line_5 varchar(100), line_6 varchar(100), line_7 varchar(100), line_8 varchar(100)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Skull
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "skull(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, owner varchar(255), skin varchar(255)) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // User
-        index = ", INDEX(user), INDEX(uuid)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "user(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int,user varchar(100),uuid varchar(64)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Username log
-        index = ", INDEX(uuid,user)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "username_log(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int,uuid varchar(64),user varchar(100)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // Version
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "version(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int,version varchar(16)) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-
-        // World
-        index = ", INDEX(id)";
-        statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "world(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),id int,world varchar(255)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
-    }
-
-    private static void createSQLiteTables(String prefix, boolean forcePrefix, Connection forceConnection, boolean purge) {
-        try (Connection connection = (forceConnection != null ? forceConnection : Database.getConnection(true, 0))) {
-            Statement statement = connection.createStatement();
-            List<String> tableData = new ArrayList<>();
-            List<String> indexData = new ArrayList<>();
-            String attachDatabase = "";
-
-            if (purge && forceConnection == null) {
-                String query = "ATTACH DATABASE '" + ConfigHandler.path + ConfigHandler.sqlite + ".tmp' AS tmp_db";
-                PreparedStatement preparedStmt = connection.prepareStatement(query);
-                preparedStmt.execute();
-                preparedStmt.close();
-                attachDatabase = "tmp_db.";
-            }
-
-            identifyExistingTablesAndIndexes(statement, attachDatabase, tableData, indexData);
-            createSQLiteTableStructures(prefix, statement, tableData);
-            createSQLiteIndexes(forcePrefix == true ? prefix : ConfigHandler.prefix, statement, indexData, attachDatabase, purge);
-
-            if (!purge && forceConnection == null) {
-                initializeTables(prefix, statement);
-            }
-            statement.close();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static void identifyExistingTablesAndIndexes(Statement statement, String attachDatabase, List<String> tableData, List<String> indexData) throws SQLException {
-        String query = "SELECT type,name FROM " + attachDatabase + "sqlite_master WHERE type='table' OR type='index';";
-        ResultSet rs = statement.executeQuery(query);
-        while (rs.next()) {
-            String type = rs.getString("type");
-            if (type.equalsIgnoreCase("table")) {
-                tableData.add(rs.getString("name"));
-            }
-            else if (type.equalsIgnoreCase("index")) {
-                indexData.add(rs.getString("name"));
-            }
-        }
-        rs.close();
-    }
-
-    private static void createSQLiteTableStructures(String prefix, Statement statement, List<String> tableData) throws SQLException {
-        if (!tableData.contains(prefix + "art_map")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "art_map (id INTEGER, art TEXT);");
-        }
-        if (!tableData.contains(prefix + "block")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "block (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, type INTEGER, data INTEGER, meta BLOB, blockdata BLOB, action INTEGER, rolled_back INTEGER);");
-        }
-        if (!tableData.contains(prefix + "chat")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "chat (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, message TEXT);");
-        }
-        if (!tableData.contains(prefix + "command")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "command (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, message TEXT);");
-        }
-        if (!tableData.contains(prefix + "container")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "container (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, type INTEGER, data INTEGER, amount INTEGER, metadata BLOB, action INTEGER, rolled_back INTEGER);");
-        }
-        if (!tableData.contains(prefix + "item")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "item (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, type INTEGER, data BLOB, amount INTEGER, action INTEGER, rolled_back INTEGER);");
-        }
-        if (!tableData.contains(prefix + "database_lock")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "database_lock (status INTEGER, time INTEGER);");
-        }
-        if (!tableData.contains(prefix + "entity")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "entity (id INTEGER PRIMARY KEY ASC, time INTEGER, data BLOB);");
-        }
-        if (!tableData.contains(prefix + "entity_map")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "entity_map (id INTEGER, entity TEXT);");
-        }
-        if (!tableData.contains(prefix + "material_map")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "material_map (id INTEGER, material TEXT);");
-        }
-        if (!tableData.contains(prefix + "blockdata_map")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "blockdata_map (id INTEGER, data TEXT);");
-        }
-        if (!tableData.contains(prefix + "session")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "session (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, action INTEGER);");
-        }
-        if (!tableData.contains(prefix + "sign")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "sign (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, action INTEGER, color INTEGER, color_secondary INTEGER, data INTEGER, waxed INTEGER, face INTEGER, line_1 TEXT, line_2 TEXT, line_3 TEXT, line_4 TEXT, line_5 TEXT, line_6 TEXT, line_7 TEXT, line_8 TEXT);");
-        }
-        if (!tableData.contains(prefix + "skull")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "skull (id INTEGER PRIMARY KEY ASC, time INTEGER, owner TEXT, skin TEXT);");
-        }
-        if (!tableData.contains(prefix + "user")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "user (id INTEGER PRIMARY KEY ASC, time INTEGER, user TEXT, uuid TEXT);");
-        }
-        if (!tableData.contains(prefix + "username_log")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "username_log (id INTEGER PRIMARY KEY ASC, time INTEGER, uuid TEXT, user TEXT);");
-        }
-        if (!tableData.contains(prefix + "version")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "version (time INTEGER, version TEXT);");
-        }
-        if (!tableData.contains(prefix + "world")) {
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "world (id INTEGER, world TEXT);");
-        }
-    }
-
-    private static void createSQLiteIndexes(String prefix, Statement statement, List<String> indexData, String attachDatabase, boolean purge) {
-        try {
-            createSQLiteIndex(statement, indexData, attachDatabase, "art_map_id_index", prefix + "art_map(id)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "block_index", prefix + "block(wid,x,z,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "block_user_index", prefix + "block(user,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "block_type_index", prefix + "block(type,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "blockdata_map_id_index", prefix + "blockdata_map(id)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "chat_index", prefix + "chat(time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "chat_user_index", prefix + "chat(user,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "chat_wid_index", prefix + "chat(wid,x,z,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "command_index", prefix + "command(time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "command_user_index", prefix + "command(user,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "command_wid_index", prefix + "command(wid,x,z,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "container_index", prefix + "container(wid,x,z,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "container_user_index", prefix + "container(user,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "container_type_index", prefix + "container(type,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "item_index", prefix + "item(wid,x,z,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "item_user_index", prefix + "item(user,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "item_type_index", prefix + "item(type,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "entity_map_id_index", prefix + "entity_map(id)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "material_map_id_index", prefix + "material_map(id)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "session_index", prefix + "session(wid,x,z,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "session_action_index", prefix + "session(action,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "session_user_index", prefix + "session(user,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "session_time_index", prefix + "session(time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "sign_index", prefix + "sign(wid,x,z,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "sign_user_index", prefix + "sign(user,time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "sign_time_index", prefix + "sign(time)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "user_index", prefix + "user(user)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "uuid_index", prefix + "user(uuid)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "username_log_uuid_index", prefix + "username_log(uuid,user)");
-            createSQLiteIndex(statement, indexData, attachDatabase, "world_id_index", prefix + "world(id)");
-        }
-        catch (Exception e) {
-            Chat.console(Phrase.build(Phrase.DATABASE_INDEX_ERROR));
-            if (purge) {
+            catch (Exception e) {
                 e.printStackTrace();
             }
         }
     }
 
-    private static void createSQLiteIndex(Statement statement, List<String> indexData, String attachDatabase, String indexName, String indexColumns) throws SQLException {
-        if (!indexData.contains(indexName)) {
-            statement.executeUpdate("CREATE INDEX IF NOT EXISTS " + attachDatabase + indexName + " ON " + indexColumns + ";");
-        }
-    }
-
 }

src/main/java/net/coreprotect/database/Lookup.java

@@ -1,21 +1,86 @@
 package net.coreprotect.database;
 
+import java.nio.charset.StandardCharsets;
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.EntityType;
 
+import net.coreprotect.bukkit.BukkitAdapter;
+import net.coreprotect.config.Config;
+import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.consumer.Consumer;
 import net.coreprotect.consumer.Queue;
+import net.coreprotect.database.logger.ItemLogger;
+import net.coreprotect.database.statement.UserStatement;
+import net.coreprotect.listener.channel.PluginChannelHandshakeListener;
+import net.coreprotect.thread.CacheHandler;
+import net.coreprotect.utility.Util;
 
 public class Lookup extends Queue {
 
+    protected static List<String[]> convertRawLookup(Statement statement, List<Object[]> list) {
+        List<String[]> newList = new ArrayList<>();
+
+        if (list == null) {
+            return null;
+        }
+
+        for (Object[] map : list) {
+            int newLength = map.length - 1;
+            String[] results = new String[newLength];
+
+            for (int i = 0; i < map.length; i++) {
+                try {
+                    int newId = i - 1;
+                    if (i == 2) {
+                        if (map[i] instanceof Integer) {
+                            int userId = (Integer) map[i];
+                            if (ConfigHandler.playerIdCacheReversed.get(userId) == null) {
+                                UserStatement.loadName(statement.getConnection(), userId);
+                            }
+                            String userResult = ConfigHandler.playerIdCacheReversed.get(userId);
+                            results[newId] = userResult;
+                        }
+                        else {
+                            results[newId] = (String) map[i];
+                        }
+                    }
+                    else if (i == 13 && map[i] instanceof byte[]) {
+                        results[newId] = Util.byteDataToString((byte[]) map[i], (int) map[6]);
+                    }
+                    else if (i > 0) { // skip rowid
+                        if (map[i] instanceof Integer) {
+                            results[newId] = map[i].toString();
+                        }
+                        else if (map[i] instanceof String) {
+                            results[newId] = (String) map[i];
+                        }
+                        else if (map[i] instanceof byte[]) {
+                            results[newId] = new String((byte[]) map[i], StandardCharsets.ISO_8859_1);
+                        }
+                    }
+                }
+                catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            newList.add(results);
+        }
+
+        return newList;
+    }
+
     public static long countLookupRows(Statement statement, CommandSender user, List<String> checkUuids, List<String> checkUsers, List<Object> restrictList, Map<Object, Boolean> excludeList, List<String> excludeUserList, List<Integer> actionList, Location location, Integer[] radius, Long[] rowData, long startTime, long endTime, boolean restrictWorld, boolean lookup) {
         Long rows = 0L;
 
@@ -25,7 +90,7 @@ public class Lookup extends Queue {
             }
             Consumer.isPaused = true;
 
-            ResultSet results = LookupRaw.rawLookupResultSet(statement, user, checkUuids, checkUsers, restrictList, excludeList, excludeUserList, actionList, location, radius, null, startTime, endTime, -1, -1, restrictWorld, lookup, true);
+            ResultSet results = rawLookupResultSet(statement, user, checkUuids, checkUsers, restrictList, excludeList, excludeUserList, actionList, location, radius, null, startTime, endTime, -1, -1, restrictWorld, lookup, true);
             while (results.next()) {
                 int resultTable = results.getInt("tbl");
                 long count = results.getLong("count");
@@ -47,8 +112,8 @@ public class Lookup extends Queue {
         List<String[]> newList = new ArrayList<>();
 
         try {
-            List<Object[]> lookupList = LookupRaw.performLookupRaw(statement, user, checkUuids, checkUsers, restrictList, excludeList, excludeUserList, actionList, location, radius, null, startTime, endTime, -1, -1, restrictWorld, lookup);
-            newList = LookupConverter.convertRawLookup(statement, lookupList);
+            List<Object[]> lookupList = performLookupRaw(statement, user, checkUuids, checkUsers, restrictList, excludeList, excludeUserList, actionList, location, radius, null, startTime, endTime, -1, -1, restrictWorld, lookup);
+            newList = convertRawLookup(statement, lookupList);
         }
         catch (Exception e) {
             e.printStackTrace();
@@ -57,12 +122,204 @@ public class Lookup extends Queue {
         return newList;
     }
 
+    protected static List<Object[]> performLookupRaw(Statement statement, CommandSender user, List<String> checkUuids, List<String> checkUsers, List<Object> restrictList, Map<Object, Boolean> excludeList, List<String> excludeUserList, List<Integer> actionList, Location location, Integer[] radius, Long[] rowData, long startTime, long endTime, int limitOffset, int limitCount, boolean restrictWorld, boolean lookup) {
+        List<Object[]> list = new ArrayList<>();
+        List<Integer> invalidRollbackActions = new ArrayList<>();
+        invalidRollbackActions.add(2);
+
+        if (!Config.getGlobal().ROLLBACK_ENTITIES && !actionList.contains(3)) {
+            invalidRollbackActions.add(3);
+        }
+
+        if (actionList.contains(4) && actionList.contains(11)) {
+            invalidRollbackActions.clear();
+        }
+
+        try {
+            while (Consumer.isPaused) {
+                Thread.sleep(1);
+            }
+
+            Consumer.isPaused = true;
+
+            ResultSet results = rawLookupResultSet(statement, user, checkUuids, checkUsers, restrictList, excludeList, excludeUserList, actionList, location, radius, rowData, startTime, endTime, limitOffset, limitCount, restrictWorld, lookup, false);
+
+            while (results.next()) {
+                if (actionList.contains(6) || actionList.contains(7)) {
+                    long resultId = results.getLong("id");
+                    int resultTime = results.getInt("time");
+                    int resultUserId = results.getInt("user");
+                    String resultMessage = results.getString("message");
+
+                    Object[] dataArray = new Object[] { resultId, resultTime, resultUserId, resultMessage };
+                    if (PluginChannelHandshakeListener.getInstance().isPluginChannelPlayer(user)) {
+                        int resultWorldId = results.getInt("wid");
+                        int resultX = results.getInt("x");
+                        int resultY = results.getInt("y");
+                        int resultZ = results.getInt("z");
+                        dataArray = new Object[] { resultId, resultTime, resultUserId, resultMessage, resultWorldId, resultX, resultY, resultZ };
+                    }
+                    list.add(dataArray);
+                }
+                else if (actionList.contains(8)) {
+                    long resultId = results.getLong("id");
+                    int resultTime = results.getInt("time");
+                    int resultUserId = results.getInt("user");
+                    int resultWorldId = results.getInt("wid");
+                    int resultX = results.getInt("x");
+                    int resultY = results.getInt("y");
+                    int resultZ = results.getInt("z");
+                    int resultAction = results.getInt("action");
+
+                    Object[] dataArray = new Object[] { resultId, resultTime, resultUserId, resultWorldId, resultX, resultY, resultZ, resultAction };
+                    list.add(dataArray);
+                }
+                else if (actionList.contains(9)) {
+                    long resultId = results.getLong("id");
+                    int resultTime = results.getInt("time");
+                    String resultUuid = results.getString("uuid");
+                    String resultUser = results.getString("user");
+
+                    Object[] dataArray = new Object[] { resultId, resultTime, resultUuid, resultUser };
+                    list.add(dataArray);
+                }
+                else if (actionList.contains(10)) {
+                    long resultId = results.getLong("id");
+                    int resultTime = results.getInt("time");
+                    int resultUserId = results.getInt("user");
+                    int resultWorldId = results.getInt("wid");
+                    int resultX = results.getInt("x");
+                    int resultY = results.getInt("y");
+                    int resultZ = results.getInt("z");
+                    boolean isFront = results.getInt("face") == 0;
+                    String line1 = results.getString("line_1");
+                    String line2 = results.getString("line_2");
+                    String line3 = results.getString("line_3");
+                    String line4 = results.getString("line_4");
+                    String line5 = results.getString("line_5");
+                    String line6 = results.getString("line_6");
+                    String line7 = results.getString("line_7");
+                    String line8 = results.getString("line_8");
+
+                    StringBuilder message = new StringBuilder();
+                    if (isFront && line1 != null && line1.length() > 0) {
+                        message.append(line1);
+                        if (!line1.endsWith(" ")) {
+                            message.append(" ");
+                        }
+                    }
+                    if (isFront && line2 != null && line2.length() > 0) {
+                        message.append(line2);
+                        if (!line2.endsWith(" ")) {
+                            message.append(" ");
+                        }
+                    }
+                    if (isFront && line3 != null && line3.length() > 0) {
+                        message.append(line3);
+                        if (!line3.endsWith(" ")) {
+                            message.append(" ");
+                        }
+                    }
+                    if (isFront && line4 != null && line4.length() > 0) {
+                        message.append(line4);
+                        if (!line4.endsWith(" ")) {
+                            message.append(" ");
+                        }
+                    }
+                    if (!isFront && line5 != null && line5.length() > 0) {
+                        message.append(line5);
+                        if (!line5.endsWith(" ")) {
+                            message.append(" ");
+                        }
+                    }
+                    if (!isFront && line6 != null && line6.length() > 0) {
+                        message.append(line6);
+                        if (!line6.endsWith(" ")) {
+                            message.append(" ");
+                        }
+                    }
+                    if (!isFront && line7 != null && line7.length() > 0) {
+                        message.append(line7);
+                        if (!line7.endsWith(" ")) {
+                            message.append(" ");
+                        }
+                    }
+                    if (!isFront && line8 != null && line8.length() > 0) {
+                        message.append(line8);
+                        if (!line8.endsWith(" ")) {
+                            message.append(" ");
+                        }
+                    }
+
+                    Object[] dataArray = new Object[] { resultId, resultTime, resultUserId, resultWorldId, resultX, resultY, resultZ, message.toString() };
+                    list.add(dataArray);
+                }
+                else {
+                    int resultData = 0;
+                    int resultAmount = -1;
+                    int resultTable = 0;
+                    byte[] resultMeta = null;
+                    byte[] resultBlockData = null;
+                    long resultId = results.getLong("id");
+                    int resultUserId = results.getInt("user");
+                    int resultAction = results.getInt("action");
+                    int resultRolledBack = results.getInt("rolled_back");
+                    int resultType = results.getInt("type");
+                    int resultTime = results.getInt("time");
+                    int resultX = results.getInt("x");
+                    int resultY = results.getInt("y");
+                    int resultZ = results.getInt("z");
+                    int resultWorldId = results.getInt("wid");
+
+                    boolean hasTbl = false;
+                    if ((lookup && actionList.size() == 0) || actionList.contains(4) || actionList.contains(5) || actionList.contains(11)) {
+                        resultData = results.getInt("data");
+                        resultAmount = results.getInt("amount");
+                        resultMeta = results.getBytes("metadata");
+                        resultTable = results.getInt("tbl");
+                        hasTbl = true;
+                    }
+                    else {
+                        resultData = results.getInt("data");
+                        resultMeta = results.getBytes("meta");
+                        resultBlockData = results.getBytes("blockdata");
+                    }
+
+                    boolean valid = true;
+                    if (!lookup) {
+                        if (invalidRollbackActions.contains(resultAction)) {
+                            valid = false;
+                        }
+                    }
+
+                    if (valid) {
+                        if (hasTbl) {
+                            Object[] dataArray = new Object[] { resultId, resultTime, resultUserId, resultX, resultY, resultZ, resultType, resultData, resultAction, resultRolledBack, resultWorldId, resultAmount, resultMeta, resultBlockData, resultTable };
+                            list.add(dataArray);
+                        }
+                        else {
+                            Object[] dataArray = new Object[] { resultId, resultTime, resultUserId, resultX, resultY, resultZ, resultType, resultData, resultAction, resultRolledBack, resultWorldId, resultAmount, resultMeta, resultBlockData };
+                            list.add(dataArray);
+                        }
+                    }
+                }
+            }
+            results.close();
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        Consumer.isPaused = false;
+        return list;
+    }
+
     public static List<String[]> performPartialLookup(Statement statement, CommandSender user, List<String> checkUuids, List<String> checkUsers, List<Object> restrictList, Map<Object, Boolean> excludeList, List<String> excludeUserList, List<Integer> actionList, Location location, Integer[] radius, Long[] rowData, long startTime, long endTime, int limitOffset, int limitCount, boolean restrictWorld, boolean lookup) {
         List<String[]> newList = new ArrayList<>();
 
         try {
-            List<Object[]> lookupList = LookupRaw.performLookupRaw(statement, user, checkUuids, checkUsers, restrictList, excludeList, excludeUserList, actionList, location, radius, rowData, startTime, endTime, limitOffset, limitCount, restrictWorld, lookup);
-            newList = LookupConverter.convertRawLookup(statement, lookupList);
+            List<Object[]> lookupList = performLookupRaw(statement, user, checkUuids, checkUsers, restrictList, excludeList, excludeUserList, actionList, location, radius, rowData, startTime, endTime, limitOffset, limitCount, restrictWorld, lookup);
+            newList = convertRawLookup(statement, lookupList);
         }
         catch (Exception e) {
             e.printStackTrace();
@@ -71,29 +328,583 @@ public class Lookup extends Queue {
         return newList;
     }
 
+    private static ResultSet rawLookupResultSet(Statement statement, CommandSender user, List<String> checkUuids, List<String> checkUsers, List<Object> restrictList, Map<Object, Boolean> excludeList, List<String> excludeUserList, List<Integer> actionList, Location location, Integer[] radius, Long[] rowData, long startTime, long endTime, int limitOffset, int limitCount, boolean restrictWorld, boolean lookup, boolean count) {
+        ResultSet results = null;
+
+        try {
+            List<Integer> validActions = Arrays.asList(0, 1, 2, 3);
+            if (radius != null) {
+                restrictWorld = true;
+            }
+
+            boolean inventoryQuery = (actionList.contains(4) && actionList.contains(11));
+            boolean validAction = false;
+            String queryBlock = "";
+            String queryEntity = "";
+            String queryLimit = "";
+            String queryTable = "block";
+            String action = "";
+            String actionExclude = "";
+            String includeBlock = "";
+            String includeEntity = "";
+            String excludeBlock = "";
+            String excludeEntity = "";
+            String users = "";
+            String uuids = "";
+            String excludeUsers = "";
+            String unionLimit = "";
+            String index = "";
+            String query = "";
+
+            if (checkUuids.size() > 0) {
+                String list = "";
+
+                for (String value : checkUuids) {
+                    if (list.length() == 0) {
+                        list = "'" + value + "'";
+                    }
+                    else {
+                        list = list + ",'" + value + "'";
+                    }
+                }
+
+                uuids = list;
+            }
+
+            if (!checkUsers.contains("#global")) {
+                StringBuilder checkUserText = new StringBuilder();
+
+                for (String checkUser : checkUsers) {
+                    if (!checkUser.equals("#container")) {
+                        if (ConfigHandler.playerIdCache.get(checkUser.toLowerCase(Locale.ROOT)) == null) {
+                            UserStatement.loadId(statement.getConnection(), checkUser, null);
+                        }
+
+                        int userId = ConfigHandler.playerIdCache.get(checkUser.toLowerCase(Locale.ROOT));
+                        if (checkUserText.length() == 0) {
+                            checkUserText = checkUserText.append(userId);
+                        }
+                        else {
+                            checkUserText.append(",").append(userId);
+                        }
+                    }
+                }
+                users = checkUserText.toString();
+            }
+
+            if (restrictList.size() > 0) {
+                StringBuilder includeListMaterial = new StringBuilder();
+                StringBuilder includeListEntity = new StringBuilder();
+
+                for (Object restrictTarget : restrictList) {
+                    String targetName = "";
+
+                    if (restrictTarget instanceof Material) {
+                        targetName = ((Material) restrictTarget).name();
+                        if (includeListMaterial.length() == 0) {
+                            includeListMaterial = includeListMaterial.append(Util.getBlockId(targetName, false));
+                        }
+                        else {
+                            includeListMaterial.append(",").append(Util.getBlockId(targetName, false));
+                        }
+
+                        /* Include legacy IDs */
+                        int legacyId = BukkitAdapter.ADAPTER.getLegacyBlockId((Material) restrictTarget);
+                        if (legacyId > 0) {
+                            includeListMaterial.append(",").append(legacyId);
+                        }
+                    }
+                    else if (restrictTarget instanceof EntityType) {
+                        targetName = ((EntityType) restrictTarget).name();
+                        if (includeListEntity.length() == 0) {
+                            includeListEntity = includeListEntity.append(Util.getEntityId(targetName, false));
+                        }
+                        else {
+                            includeListEntity.append(",").append(Util.getEntityId(targetName, false));
+                        }
+                    }
+                }
+
+                includeBlock = includeListMaterial.toString();
+                includeEntity = includeListEntity.toString();
+            }
+
+            if (excludeList.size() > 0) {
+                StringBuilder excludeListMaterial = new StringBuilder();
+                StringBuilder excludeListEntity = new StringBuilder();
+
+                for (Object restrictTarget : excludeList.keySet()) {
+                    String targetName = "";
+
+                    if (restrictTarget instanceof Material) {
+                        targetName = ((Material) restrictTarget).name();
+                        if (excludeListMaterial.length() == 0) {
+                            excludeListMaterial = excludeListMaterial.append(Util.getBlockId(targetName, false));
+                        }
+                        else {
+                            excludeListMaterial.append(",").append(Util.getBlockId(targetName, false));
+                        }
+
+                        /* Include legacy IDs */
+                        int legacyId = BukkitAdapter.ADAPTER.getLegacyBlockId((Material) restrictTarget);
+                        if (legacyId > 0) {
+                            excludeListMaterial.append(",").append(legacyId);
+                        }
+                    }
+                    else if (restrictTarget instanceof EntityType) {
+                        targetName = ((EntityType) restrictTarget).name();
+                        if (excludeListEntity.length() == 0) {
+                            excludeListEntity = excludeListEntity.append(Util.getEntityId(targetName, false));
+                        }
+                        else {
+                            excludeListEntity.append(",").append(Util.getEntityId(targetName, false));
+                        }
+                    }
+                }
+
+                excludeBlock = excludeListMaterial.toString();
+                excludeEntity = excludeListEntity.toString();
+            }
+
+            if (excludeUserList.size() > 0) {
+                StringBuilder excludeUserText = new StringBuilder();
+
+                for (String excludeTarget : excludeUserList) {
+                    if (ConfigHandler.playerIdCache.get(excludeTarget.toLowerCase(Locale.ROOT)) == null) {
+                        UserStatement.loadId(statement.getConnection(), excludeTarget, null);
+                    }
+
+                    int userId = ConfigHandler.playerIdCache.get(excludeTarget.toLowerCase(Locale.ROOT));
+                    if (excludeUserText.length() == 0) {
+                        excludeUserText = excludeUserText.append(userId);
+                    }
+                    else {
+                        excludeUserText.append(",").append(userId);
+                    }
+                }
+
+                excludeUsers = excludeUserText.toString();
+            }
+
+            // Specify actions to exclude from a:item
+            if ((lookup && actionList.size() == 0) || (actionList.contains(11) && actionList.size() == 1)) {
+                StringBuilder actionText = new StringBuilder();
+                actionText = actionText.append(ItemLogger.ITEM_BREAK);
+                actionText.append(",").append(ItemLogger.ITEM_DESTROY);
+                actionText.append(",").append(ItemLogger.ITEM_CREATE);
+                actionText.append(",").append(ItemLogger.ITEM_SELL);
+                actionText.append(",").append(ItemLogger.ITEM_BUY);
+                actionExclude = actionText.toString();
+            }
+
+            if (!actionList.isEmpty()) {
+                StringBuilder actionText = new StringBuilder();
+                for (Integer actionTarget : actionList) {
+                    if (validActions.contains(actionTarget)) {
+                        // If just looking up drops/pickups, remap the actions to the correct values
+                        if (actionList.contains(11) && !actionList.contains(4)) {
+                            if (actionTarget == ItemLogger.ITEM_REMOVE && !actionList.contains(ItemLogger.ITEM_DROP)) {
+                                actionTarget = ItemLogger.ITEM_DROP;
+                            }
+                            else if (actionTarget == ItemLogger.ITEM_ADD && !actionList.contains(ItemLogger.ITEM_PICKUP)) {
+                                actionTarget = ItemLogger.ITEM_PICKUP;
+                            }
+                        }
+
+                        if (actionText.length() == 0) {
+                            actionText = actionText.append(actionTarget);
+                        }
+                        else {
+                            actionText.append(",").append(actionTarget);
+                        }
+
+                        // If selecting from co_item & co_container, add in actions for both transaction types
+                        if (actionList.contains(11) && actionList.contains(4)) {
+                            if (actionTarget == ItemLogger.ITEM_REMOVE) {
+                                actionText.append(",").append(ItemLogger.ITEM_PICKUP);
+                                actionText.append(",").append(ItemLogger.ITEM_REMOVE_ENDER);
+                                actionText.append(",").append(ItemLogger.ITEM_CREATE);
+                                actionText.append(",").append(ItemLogger.ITEM_BUY);
+                            }
+                            if (actionTarget == ItemLogger.ITEM_ADD) {
+                                actionText.append(",").append(ItemLogger.ITEM_DROP);
+                                actionText.append(",").append(ItemLogger.ITEM_ADD_ENDER);
+                                actionText.append(",").append(ItemLogger.ITEM_THROW);
+                                actionText.append(",").append(ItemLogger.ITEM_SHOOT);
+                                actionText.append(",").append(ItemLogger.ITEM_BREAK);
+                                actionText.append(",").append(ItemLogger.ITEM_DESTROY);
+                                actionText.append(",").append(ItemLogger.ITEM_SELL);
+                            }
+                        }
+                        // If just looking up drops/pickups, include ender chest transactions
+                        else if (actionList.contains(11) && !actionList.contains(4)) {
+                            if (actionTarget == ItemLogger.ITEM_DROP) {
+                                actionText.append(",").append(ItemLogger.ITEM_ADD_ENDER);
+                                actionText.append(",").append(ItemLogger.ITEM_THROW);
+                                actionText.append(",").append(ItemLogger.ITEM_SHOOT);
+                            }
+                            if (actionTarget == ItemLogger.ITEM_PICKUP) {
+                                actionText.append(",").append(ItemLogger.ITEM_REMOVE_ENDER);
+                            }
+                        }
+                    }
+                }
+
+                action = actionText.toString();
+            }
+
+            for (Integer value : actionList) {
+                if (validActions.contains(value)) {
+                    validAction = true;
+                }
+            }
+
+            if (restrictWorld) {
+                int wid = Util.getWorldId(location.getWorld().getName());
+                queryBlock = queryBlock + " wid=" + wid + " AND";
+            }
+
+            if (radius != null) {
+                Integer xmin = radius[1];
+                Integer xmax = radius[2];
+                Integer ymin = radius[3];
+                Integer ymax = radius[4];
+                Integer zmin = radius[5];
+                Integer zmax = radius[6];
+                String queryY = "";
+
+                if (ymin != null && ymax != null) {
+                    queryY = " y >= '" + ymin + "' AND y <= '" + ymax + "' AND";
+                }
+
+                queryBlock = queryBlock + " x >= '" + xmin + "' AND x <= '" + xmax + "' AND z >= '" + zmin + "' AND z <= '" + zmax + "' AND" + queryY;
+            }
+            else if (actionList.contains(5)) {
+                int worldId = Util.getWorldId(location.getWorld().getName());
+                int x = (int) Math.floor(location.getX());
+                int z = (int) Math.floor(location.getZ());
+                int x2 = (int) Math.ceil(location.getX());
+                int z2 = (int) Math.ceil(location.getZ());
+
+                queryBlock = queryBlock + " wid=" + worldId + " AND (x = '" + x + "' OR x = '" + x2 + "') AND (z = '" + z + "' OR z = '" + z2 + "') AND y = '" + location.getBlockY() + "' AND";
+            }
+
+            if (validAction) {
+                queryBlock = queryBlock + " action IN(" + action + ") AND";
+            }
+            else if (inventoryQuery || actionExclude.length() > 0 || includeBlock.length() > 0 || includeEntity.length() > 0 || excludeBlock.length() > 0 || excludeEntity.length() > 0) {
+                queryBlock = queryBlock + " action NOT IN(-1) AND";
+            }
+
+            if (includeBlock.length() > 0 || includeEntity.length() > 0) {
+                queryBlock = queryBlock + " type IN(" + (includeBlock.length() > 0 ? includeBlock : "0") + ") AND";
+            }
+
+            if (excludeBlock.length() > 0 || excludeEntity.length() > 0) {
+                queryBlock = queryBlock + " type NOT IN(" + (excludeBlock.length() > 0 ? excludeBlock : "0") + ") AND";
+            }
+
+            if (uuids.length() > 0) {
+                queryBlock = queryBlock + " uuid IN(" + uuids + ") AND";
+            }
+
+            if (users.length() > 0) {
+                queryBlock = queryBlock + " user IN(" + users + ") AND";
+            }
+
+            if (excludeUsers.length() > 0) {
+                queryBlock = queryBlock + " user NOT IN(" + excludeUsers + ") AND";
+            }
+
+            if (startTime > 0) {
+                queryBlock = queryBlock + " time > '" + startTime + "' AND";
+            }
+
+            if (endTime > 0) {
+                queryBlock = queryBlock + " time <= '" + endTime + "' AND";
+            }
+
+            if (actionList.contains(10)) {
+                queryBlock = queryBlock + " action = '1' AND (LENGTH(line_1) > 0 OR LENGTH(line_2) > 0 OR LENGTH(line_3) > 0 OR LENGTH(line_4) > 0 OR LENGTH(line_5) > 0 OR LENGTH(line_6) > 0 OR LENGTH(line_7) > 0 OR LENGTH(line_8) > 0) AND";
+            }
+
+            if (queryBlock.length() > 0) {
+                queryBlock = queryBlock.substring(0, queryBlock.length() - 4);
+            }
+
+            if (queryBlock.length() == 0) {
+                queryBlock = " 1";
+            }
+
+            queryEntity = queryBlock;
+            if (includeBlock.length() > 0 || includeEntity.length() > 0) {
+                queryEntity = queryEntity.replace("type IN(" + (includeBlock.length() > 0 ? includeBlock : "0") + ")", "type IN(" + (includeEntity.length() > 0 ? includeEntity : "0") + ")");
+            }
+            if (excludeBlock.length() > 0 || excludeEntity.length() > 0) {
+                queryEntity = queryEntity.replace("type NOT IN(" + (excludeBlock.length() > 0 ? excludeBlock : "0") + ")", "type NOT IN(" + (excludeEntity.length() > 0 ? excludeEntity : "0") + ")");
+            }
+
+            String baseQuery = ((!includeEntity.isEmpty() || !excludeEntity.isEmpty()) ? queryEntity : queryBlock);
+            if (limitOffset > -1 && limitCount > -1) {
+                queryLimit = " LIMIT " + limitOffset + ", " + limitCount + "";
+                unionLimit = " ORDER BY time DESC, id DESC LIMIT " + (limitOffset + limitCount) + "";
+            }
+
+            String rows = "rowid as id,time,user,wid,x,y,z,action,type,data,meta,blockdata,rolled_back";
+            String queryOrder = " ORDER BY rowid DESC";
+
+            if (actionList.contains(4) || actionList.contains(5)) {
+                queryTable = "container";
+                rows = "rowid as id,time,user,wid,x,y,z,action,type,data,rolled_back,amount,metadata";
+            }
+            else if (actionList.contains(6) || actionList.contains(7)) {
+                queryTable = "chat";
+                rows = "rowid as id,time,user,message";
+                if (PluginChannelHandshakeListener.getInstance().isPluginChannelPlayer(user)) {
+                    rows += ",wid,x,y,z";
+                }
+
+                if (actionList.contains(7)) {
+                    queryTable = "command";
+                }
+            }
+            else if (actionList.contains(8)) {
+                queryTable = "session";
+                rows = "rowid as id,time,user,wid,x,y,z,action";
+            }
+            else if (actionList.contains(9)) {
+                queryTable = "username_log";
+                rows = "rowid as id,time,uuid,user";
+            }
+            else if (actionList.contains(10)) {
+                queryTable = "sign";
+                rows = "rowid as id,time,user,wid,x,y,z,face,line_1,line_2,line_3,line_4,line_5,line_6,line_7,line_8";
+            }
+            else if (actionList.contains(11)) {
+                queryTable = "item";
+                rows = "rowid as id,time,user,wid,x,y,z,type,data as metadata,0 as data,amount,action,0 as rolled_back";
+            }
+
+            if (count) {
+                rows = "COUNT(*) as count";
+                queryLimit = " LIMIT 0, 3";
+                queryOrder = "";
+                unionLimit = "";
+            }
+
+            String unionSelect = "SELECT * FROM (";
+            if (Config.getGlobal().MYSQL) {
+                if (queryTable.equals("block")) {
+                    if (includeBlock.length() > 0 || includeEntity.length() > 0) {
+                        index = "USE INDEX(type) IGNORE INDEX(user,wid) ";
+                    }
+                    if (users.length() > 0) {
+                        index = "USE INDEX(user) IGNORE INDEX(type,wid) ";
+                    }
+                    if (radius != null && (radius[2] - radius[1]) <= 50 && (radius[6] - radius[5]) <= 50) {
+                        index = "USE INDEX(wid) IGNORE INDEX(type,user) ";
+                    }
+                    if ((restrictWorld && (users.length() > 0 || includeBlock.length() > 0 || includeEntity.length() > 0))) {
+                        index = "";
+                    }
+                }
+
+                unionSelect = "(";
+            }
+            else {
+                if (queryTable.equals("block")) {
+                    if (includeBlock.length() > 0 || includeEntity.length() > 0) {
+                        index = "INDEXED BY block_type_index ";
+                    }
+                    if (users.length() > 0) {
+                        index = "INDEXED BY block_user_index ";
+                    }
+                    if (radius != null && (radius[2] - radius[1]) <= 50 && (radius[6] - radius[5]) <= 50) {
+                        index = "INDEXED BY block_index ";
+                    }
+                    if ((restrictWorld && (users.length() > 0 || includeBlock.length() > 0 || includeEntity.length() > 0))) {
+                        index = "";
+                    }
+                }
+            }
+
+            boolean itemLookup = inventoryQuery;
+            if ((lookup && actionList.size() == 0) || (itemLookup && !actionList.contains(0))) {
+                if (!count) {
+                    rows = "rowid as id,time,user,wid,x,y,z,type,meta as metadata,data,-1 as amount,action,rolled_back";
+                }
+
+                if (inventoryQuery) {
+                    if (validAction) {
+                        baseQuery = baseQuery.replace("action IN(" + action + ")", "action IN(1)");
+                    }
+                    else {
+                        baseQuery = baseQuery.replace("action NOT IN(-1)", "action IN(1)");
+                    }
+
+                    if (!count) {
+                        rows = "rowid as id,time,user,wid,x,y,z,type,meta as metadata,data,1 as amount,action,rolled_back";
+                    }
+                }
+
+                if (includeBlock.length() > 0 || excludeBlock.length() > 0) {
+                    baseQuery = baseQuery.replace("action NOT IN(-1)", "action NOT IN(3)"); // if block specified for include/exclude, filter out entity data
+                }
+
+                query = unionSelect + "SELECT " + "'0' as tbl," + rows + " FROM " + ConfigHandler.prefix + "block " + index + "WHERE" + baseQuery + unionLimit + ") UNION ALL ";
+                itemLookup = true;
+            }
+
+            if (itemLookup) {
+                if (!count) {
+                    rows = "rowid as id,time,user,wid,x,y,z,type,metadata,data,amount,action,rolled_back";
+                }
+                query = query + unionSelect + "SELECT " + "'1' as tbl," + rows + " FROM " + ConfigHandler.prefix + "container WHERE" + queryBlock + unionLimit + ") UNION ALL ";
+
+                if (!count) {
+                    rows = "rowid as id,time,user,wid,x,y,z,type,data as metadata,0 as data,amount,action,rolled_back";
+                    queryOrder = " ORDER BY time DESC, tbl DESC, id DESC";
+                }
+
+                if (actionExclude.length() > 0) {
+                    queryBlock = queryBlock.replace("action NOT IN(-1)", "action NOT IN(" + actionExclude + ")");
+                }
+
+                query = query + unionSelect + "SELECT " + "'2' as tbl," + rows + " FROM " + ConfigHandler.prefix + "item WHERE" + queryBlock + unionLimit + ")";
+            }
+
+            if (query.length() == 0) {
+                if (actionExclude.length() > 0) {
+                    baseQuery = baseQuery.replace("action NOT IN(-1)", "action NOT IN(" + actionExclude + ")");
+                }
+
+                query = "SELECT " + "'0' as tbl," + rows + " FROM " + ConfigHandler.prefix + queryTable + " " + index + "WHERE" + baseQuery;
+            }
+
+            query = query + queryOrder + queryLimit + "";
+            results = statement.executeQuery(query);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return results;
+    }
+
+    /*
+    private static long calculateTableOffset(long col2, long col3, long limitOffset, int limitCount) {
+        return (limitOffset - (col2 + col3)) < 0L ? 0L : (limitOffset - (col2 + col3));
+    }
+    
+    private static long calculateTableLimit(long col1, long col2, long col3, long limitOffset, int limitCount) {
+        long offset = calculateTableOffset(col2, col3, limitOffset, limitCount);
+        long limit = (col2 + col3) + limitCount;
+        limit = (limit > (limitOffset + limitCount)) ? (limitOffset + limitCount) : limit;
+        limit = (limit > (col1 - offset)) ? (col1 - offset) : limit;
+    
+        return limit;
+    }
+    */
+
     public static String whoPlaced(Statement statement, BlockState block) {
-        return BlockLookup.whoPlaced(statement, block);
+        String result = "";
+
+        try {
+            if (block == null) {
+                return result;
+            }
+
+            int x = block.getX();
+            int y = block.getY();
+            int z = block.getZ();
+            int time = (int) (System.currentTimeMillis() / 1000L);
+            int worldId = Util.getWorldId(block.getWorld().getName());
+            String query = "SELECT user,type FROM " + ConfigHandler.prefix + "block " + Util.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND rolled_back IN(0,2) AND action='1' ORDER BY rowid DESC LIMIT 0, 1";
+
+            ResultSet results = statement.executeQuery(query);
+            while (results.next()) {
+                int resultUserId = results.getInt("user");
+                int resultType = results.getInt("type");
+
+                if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) {
+                    UserStatement.loadName(statement.getConnection(), resultUserId);
+                }
+
+                result = ConfigHandler.playerIdCacheReversed.get(resultUserId);
+                if (result.length() > 0) {
+                    Material resultMaterial = Util.getType(resultType);
+                    CacheHandler.lookupCache.put("" + x + "." + y + "." + z + "." + worldId + "", new Object[] { time, result, resultMaterial });
+                }
+            }
+            results.close();
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return result;
     }
 
     public static String whoPlacedCache(Block block) {
-        return BlockLookup.whoPlacedCache(block);
+        if (block == null) {
+            return "";
+        }
+
+        return whoPlacedCache(block.getState());
     }
 
     public static String whoPlacedCache(BlockState block) {
-        return BlockLookup.whoPlacedCache(block);
+        String result = "";
+
+        try {
+            if (block == null) {
+                return result;
+            }
+
+            int x = block.getX();
+            int y = block.getY();
+            int z = block.getZ();
+            int worldId = Util.getWorldId(block.getWorld().getName());
+
+            String cords = "" + x + "." + y + "." + z + "." + worldId + "";
+            Object[] data = CacheHandler.lookupCache.get(cords);
+
+            if (data != null) {
+                result = (String) data[1];
+            }
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return result;
     }
 
     public static String whoRemovedCache(BlockState block) {
-        return BlockLookup.whoRemovedCache(block);
-    }
+        /*
+         * Performs a lookup on who removed a block, from memory. Only searches through the last 30 seconds of block removal data.
+         */
+        String result = "";
 
-    // Maintain backward compatibility
-    protected static List<Object[]> performLookupRaw(Statement statement, CommandSender user, List<String> checkUuids, List<String> checkUsers, List<Object> restrictList, Map<Object, Boolean> excludeList, List<String> excludeUserList, List<Integer> actionList, Location location, Integer[] radius, Long[] rowData, long startTime, long endTime, int limitOffset, int limitCount, boolean restrictWorld, boolean lookup) {
-        return LookupRaw.performLookupRaw(statement, user, checkUuids, checkUsers, restrictList, excludeList, excludeUserList, actionList, location, radius, rowData, startTime, endTime, limitOffset, limitCount, restrictWorld, lookup);
-    }
+        try {
+            if (block != null) {
+                int x = block.getX();
+                int y = block.getY();
+                int z = block.getZ();
+                int worldId = Util.getWorldId(block.getWorld().getName());
 
-    // Maintain backward compatibility
-    private static ResultSet rawLookupResultSet(Statement statement, CommandSender user, List<String> checkUuids, List<String> checkUsers, List<Object> restrictList, Map<Object, Boolean> excludeList, List<String> excludeUserList, List<Integer> actionList, Location location, Integer[] radius, Long[] rowData, long startTime, long endTime, int limitOffset, int limitCount, boolean restrictWorld, boolean lookup, boolean count) {
-        return LookupRaw.rawLookupResultSet(statement, user, checkUuids, checkUsers, restrictList, excludeList, excludeUserList, actionList, location, radius, rowData, startTime, endTime, limitOffset, limitCount, restrictWorld, lookup, count);
+                String cords = "" + x + "." + y + "." + z + "." + worldId + "";
+                Object[] data = CacheHandler.breakCache.get(cords);
+
+                if (data != null) {
+                    result = (String) data[1];
+                }
+            }
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return result;
     }
 }

src/main/java/net/coreprotect/database/LookupConverter.java

@@ -1,65 +0,0 @@
-package net.coreprotect.database;
-
-import java.nio.charset.StandardCharsets;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-
-import net.coreprotect.config.ConfigHandler;
-import net.coreprotect.database.statement.UserStatement;
-import net.coreprotect.utility.BlockUtils;
-
-public class LookupConverter {
-
-    public static List<String[]> convertRawLookup(Statement statement, List<Object[]> list) {
-        List<String[]> newList = new ArrayList<>();
-
-        if (list == null) {
-            return null;
-        }
-
-        for (Object[] map : list) {
-            int newLength = map.length - 1;
-            String[] results = new String[newLength];
-
-            for (int i = 0; i < map.length; i++) {
-                try {
-                    int newId = i - 1;
-                    if (i == 2) {
-                        if (map[i] instanceof Integer) {
-                            int userId = (Integer) map[i];
-                            if (ConfigHandler.playerIdCacheReversed.get(userId) == null) {
-                                UserStatement.loadName(statement.getConnection(), userId);
-                            }
-                            String userResult = ConfigHandler.playerIdCacheReversed.get(userId);
-                            results[newId] = userResult;
-                        }
-                        else {
-                            results[newId] = (String) map[i];
-                        }
-                    }
-                    else if (i == 13 && map[i] instanceof byte[]) {
-                        results[newId] = BlockUtils.byteDataToString((byte[]) map[i], (int) map[6]);
-                    }
-                    else if (i > 0) { // skip rowid
-                        if (map[i] instanceof Integer) {
-                            results[newId] = map[i].toString();
-                        }
-                        else if (map[i] instanceof String) {
-                            results[newId] = (String) map[i];
-                        }
-                        else if (map[i] instanceof byte[]) {
-                            results[newId] = new String((byte[]) map[i], StandardCharsets.ISO_8859_1);
-                        }
-                    }
-                }
-                catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-            newList.add(results);
-        }
-
-        return newList;
-    }
-}

src/main/java/net/coreprotect/database/LookupRaw.java

@@ -1,685 +0,0 @@
-package net.coreprotect.database;
-
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.EntityType;
-
-import net.coreprotect.bukkit.BukkitAdapter;
-import net.coreprotect.config.Config;
-import net.coreprotect.config.ConfigHandler;
-import net.coreprotect.consumer.Consumer;
-import net.coreprotect.consumer.Queue;
-import net.coreprotect.database.logger.ItemLogger;
-import net.coreprotect.database.statement.UserStatement;
-import net.coreprotect.listener.channel.PluginChannelHandshakeListener;
-import net.coreprotect.utility.EntityUtils;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.WorldUtils;
-
-public class LookupRaw extends Queue {
-
-    protected static List<Object[]> performLookupRaw(Statement statement, CommandSender user, List<String> checkUuids, List<String> checkUsers, List<Object> restrictList, Map<Object, Boolean> excludeList, List<String> excludeUserList, List<Integer> actionList, Location location, Integer[] radius, Long[] rowData, long startTime, long endTime, int limitOffset, int limitCount, boolean restrictWorld, boolean lookup) {
-        List<Object[]> list = new ArrayList<>();
-        List<Integer> invalidRollbackActions = new ArrayList<>();
-        invalidRollbackActions.add(2);
-
-        if (!Config.getGlobal().ROLLBACK_ENTITIES && !actionList.contains(3)) {
-            invalidRollbackActions.add(3);
-        }
-
-        if (actionList.contains(4) && actionList.contains(11)) {
-            invalidRollbackActions.clear();
-        }
-
-        try {
-            while (Consumer.isPaused) {
-                Thread.sleep(1);
-            }
-
-            Consumer.isPaused = true;
-
-            ResultSet results = rawLookupResultSet(statement, user, checkUuids, checkUsers, restrictList, excludeList, excludeUserList, actionList, location, radius, rowData, startTime, endTime, limitOffset, limitCount, restrictWorld, lookup, false);
-
-            while (results.next()) {
-                if (actionList.contains(6) || actionList.contains(7)) {
-                    long resultId = results.getLong("id");
-                    int resultTime = results.getInt("time");
-                    int resultUserId = results.getInt("user");
-                    String resultMessage = results.getString("message");
-
-                    Object[] dataArray = new Object[] { resultId, resultTime, resultUserId, resultMessage };
-                    if (PluginChannelHandshakeListener.getInstance().isPluginChannelPlayer(user)) {
-                        int resultWorldId = results.getInt("wid");
-                        int resultX = results.getInt("x");
-                        int resultY = results.getInt("y");
-                        int resultZ = results.getInt("z");
-                        dataArray = new Object[] { resultId, resultTime, resultUserId, resultMessage, resultWorldId, resultX, resultY, resultZ };
-                    }
-                    list.add(dataArray);
-                }
-                else if (actionList.contains(8)) {
-                    long resultId = results.getLong("id");
-                    int resultTime = results.getInt("time");
-                    int resultUserId = results.getInt("user");
-                    int resultWorldId = results.getInt("wid");
-                    int resultX = results.getInt("x");
-                    int resultY = results.getInt("y");
-                    int resultZ = results.getInt("z");
-                    int resultAction = results.getInt("action");
-
-                    Object[] dataArray = new Object[] { resultId, resultTime, resultUserId, resultWorldId, resultX, resultY, resultZ, resultAction };
-                    list.add(dataArray);
-                }
-                else if (actionList.contains(9)) {
-                    long resultId = results.getLong("id");
-                    int resultTime = results.getInt("time");
-                    String resultUuid = results.getString("uuid");
-                    String resultUser = results.getString("user");
-
-                    Object[] dataArray = new Object[] { resultId, resultTime, resultUuid, resultUser };
-                    list.add(dataArray);
-                }
-                else if (actionList.contains(10)) {
-                    long resultId = results.getLong("id");
-                    int resultTime = results.getInt("time");
-                    int resultUserId = results.getInt("user");
-                    int resultWorldId = results.getInt("wid");
-                    int resultX = results.getInt("x");
-                    int resultY = results.getInt("y");
-                    int resultZ = results.getInt("z");
-                    boolean isFront = results.getInt("face") == 0;
-                    String line1 = results.getString("line_1");
-                    String line2 = results.getString("line_2");
-                    String line3 = results.getString("line_3");
-                    String line4 = results.getString("line_4");
-                    String line5 = results.getString("line_5");
-                    String line6 = results.getString("line_6");
-                    String line7 = results.getString("line_7");
-                    String line8 = results.getString("line_8");
-
-                    StringBuilder message = new StringBuilder();
-                    if (isFront && line1 != null && line1.length() > 0) {
-                        message.append(line1);
-                        if (!line1.endsWith(" ")) {
-                            message.append(" ");
-                        }
-                    }
-                    if (isFront && line2 != null && line2.length() > 0) {
-                        message.append(line2);
-                        if (!line2.endsWith(" ")) {
-                            message.append(" ");
-                        }
-                    }
-                    if (isFront && line3 != null && line3.length() > 0) {
-                        message.append(line3);
-                        if (!line3.endsWith(" ")) {
-                            message.append(" ");
-                        }
-                    }
-                    if (isFront && line4 != null && line4.length() > 0) {
-                        message.append(line4);
-                        if (!line4.endsWith(" ")) {
-                            message.append(" ");
-                        }
-                    }
-                    if (!isFront && line5 != null && line5.length() > 0) {
-                        message.append(line5);
-                        if (!line5.endsWith(" ")) {
-                            message.append(" ");
-                        }
-                    }
-                    if (!isFront && line6 != null && line6.length() > 0) {
-                        message.append(line6);
-                        if (!line6.endsWith(" ")) {
-                            message.append(" ");
-                        }
-                    }
-                    if (!isFront && line7 != null && line7.length() > 0) {
-                        message.append(line7);
-                        if (!line7.endsWith(" ")) {
-                            message.append(" ");
-                        }
-                    }
-                    if (!isFront && line8 != null && line8.length() > 0) {
-                        message.append(line8);
-                        if (!line8.endsWith(" ")) {
-                            message.append(" ");
-                        }
-                    }
-
-                    Object[] dataArray = new Object[] { resultId, resultTime, resultUserId, resultWorldId, resultX, resultY, resultZ, message.toString() };
-                    list.add(dataArray);
-                }
-                else {
-                    int resultData = 0;
-                    int resultAmount = -1;
-                    int resultTable = 0;
-                    byte[] resultMeta = null;
-                    byte[] resultBlockData = null;
-                    long resultId = results.getLong("id");
-                    int resultUserId = results.getInt("user");
-                    int resultAction = results.getInt("action");
-                    int resultRolledBack = results.getInt("rolled_back");
-                    int resultType = results.getInt("type");
-                    int resultTime = results.getInt("time");
-                    int resultX = results.getInt("x");
-                    int resultY = results.getInt("y");
-                    int resultZ = results.getInt("z");
-                    int resultWorldId = results.getInt("wid");
-
-                    boolean hasTbl = false;
-                    if ((lookup && actionList.size() == 0) || actionList.contains(4) || actionList.contains(5) || actionList.contains(11)) {
-                        resultData = results.getInt("data");
-                        resultAmount = results.getInt("amount");
-                        resultMeta = results.getBytes("metadata");
-                        resultTable = results.getInt("tbl");
-                        hasTbl = true;
-                    }
-                    else {
-                        resultData = results.getInt("data");
-                        resultMeta = results.getBytes("meta");
-                        resultBlockData = results.getBytes("blockdata");
-                    }
-
-                    boolean valid = true;
-                    if (!lookup) {
-                        if (invalidRollbackActions.contains(resultAction)) {
-                            valid = false;
-                        }
-                    }
-
-                    if (valid) {
-                        if (hasTbl) {
-                            Object[] dataArray = new Object[] { resultId, resultTime, resultUserId, resultX, resultY, resultZ, resultType, resultData, resultAction, resultRolledBack, resultWorldId, resultAmount, resultMeta, resultBlockData, resultTable };
-                            list.add(dataArray);
-                        }
-                        else {
-                            Object[] dataArray = new Object[] { resultId, resultTime, resultUserId, resultX, resultY, resultZ, resultType, resultData, resultAction, resultRolledBack, resultWorldId, resultAmount, resultMeta, resultBlockData };
-                            list.add(dataArray);
-                        }
-                    }
-                }
-            }
-            results.close();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        Consumer.isPaused = false;
-        return list;
-    }
-
-    static ResultSet rawLookupResultSet(Statement statement, CommandSender user, List<String> checkUuids, List<String> checkUsers, List<Object> restrictList, Map<Object, Boolean> excludeList, List<String> excludeUserList, List<Integer> actionList, Location location, Integer[] radius, Long[] rowData, long startTime, long endTime, int limitOffset, int limitCount, boolean restrictWorld, boolean lookup, boolean count) {
-        ResultSet results = null;
-
-        try {
-            List<Integer> validActions = Arrays.asList(0, 1, 2, 3);
-            if (radius != null) {
-                restrictWorld = true;
-            }
-
-            boolean inventoryQuery = (actionList.contains(4) && actionList.contains(11));
-            boolean validAction = false;
-            String queryBlock = "";
-            String queryEntity = "";
-            String queryLimit = "";
-            String queryTable = "block";
-            String action = "";
-            String actionExclude = "";
-            String includeBlock = "";
-            String includeEntity = "";
-            String excludeBlock = "";
-            String excludeEntity = "";
-            String users = "";
-            String uuids = "";
-            String excludeUsers = "";
-            String unionLimit = "";
-            String index = "";
-            String query = "";
-
-            if (checkUuids.size() > 0) {
-                String list = "";
-
-                for (String value : checkUuids) {
-                    if (list.length() == 0) {
-                        list = "'" + value + "'";
-                    }
-                    else {
-                        list = list + ",'" + value + "'";
-                    }
-                }
-
-                uuids = list;
-            }
-
-            if (!checkUsers.contains("#global")) {
-                StringBuilder checkUserText = new StringBuilder();
-
-                for (String checkUser : checkUsers) {
-                    if (!checkUser.equals("#container")) {
-                        if (ConfigHandler.playerIdCache.get(checkUser.toLowerCase(Locale.ROOT)) == null) {
-                            UserStatement.loadId(statement.getConnection(), checkUser, null);
-                        }
-
-                        int userId = ConfigHandler.playerIdCache.get(checkUser.toLowerCase(Locale.ROOT));
-                        if (checkUserText.length() == 0) {
-                            checkUserText = checkUserText.append(userId);
-                        }
-                        else {
-                            checkUserText.append(",").append(userId);
-                        }
-                    }
-                }
-                users = checkUserText.toString();
-            }
-
-            if (restrictList.size() > 0) {
-                StringBuilder includeListMaterial = new StringBuilder();
-                StringBuilder includeListEntity = new StringBuilder();
-
-                for (Object restrictTarget : restrictList) {
-                    String targetName = "";
-
-                    if (restrictTarget instanceof Material) {
-                        targetName = ((Material) restrictTarget).name();
-                        if (includeListMaterial.length() == 0) {
-                            includeListMaterial = includeListMaterial.append(MaterialUtils.getBlockId(targetName, false));
-                        }
-                        else {
-                            includeListMaterial.append(",").append(MaterialUtils.getBlockId(targetName, false));
-                        }
-
-                        /* Include legacy IDs */
-                        int legacyId = BukkitAdapter.ADAPTER.getLegacyBlockId((Material) restrictTarget);
-                        if (legacyId > 0) {
-                            includeListMaterial.append(",").append(legacyId);
-                        }
-                    }
-                    else if (restrictTarget instanceof EntityType) {
-                        targetName = ((EntityType) restrictTarget).name();
-                        if (includeListEntity.length() == 0) {
-                            includeListEntity = includeListEntity.append(EntityUtils.getEntityId(targetName, false));
-                        }
-                        else {
-                            includeListEntity.append(",").append(EntityUtils.getEntityId(targetName, false));
-                        }
-                    }
-                }
-
-                includeBlock = includeListMaterial.toString();
-                includeEntity = includeListEntity.toString();
-            }
-
-            if (excludeList.size() > 0) {
-                StringBuilder excludeListMaterial = new StringBuilder();
-                StringBuilder excludeListEntity = new StringBuilder();
-
-                for (Object restrictTarget : excludeList.keySet()) {
-                    String targetName = "";
-
-                    if (restrictTarget instanceof Material) {
-                        targetName = ((Material) restrictTarget).name();
-                        if (excludeListMaterial.length() == 0) {
-                            excludeListMaterial = excludeListMaterial.append(MaterialUtils.getBlockId(targetName, false));
-                        }
-                        else {
-                            excludeListMaterial.append(",").append(MaterialUtils.getBlockId(targetName, false));
-                        }
-
-                        /* Include legacy IDs */
-                        int legacyId = BukkitAdapter.ADAPTER.getLegacyBlockId((Material) restrictTarget);
-                        if (legacyId > 0) {
-                            excludeListMaterial.append(",").append(legacyId);
-                        }
-                    }
-                    else if (restrictTarget instanceof EntityType) {
-                        targetName = ((EntityType) restrictTarget).name();
-                        if (excludeListEntity.length() == 0) {
-                            excludeListEntity = excludeListEntity.append(EntityUtils.getEntityId(targetName, false));
-                        }
-                        else {
-                            excludeListEntity.append(",").append(EntityUtils.getEntityId(targetName, false));
-                        }
-                    }
-                }
-
-                excludeBlock = excludeListMaterial.toString();
-                excludeEntity = excludeListEntity.toString();
-            }
-
-            if (excludeUserList.size() > 0) {
-                StringBuilder excludeUserText = new StringBuilder();
-
-                for (String excludeTarget : excludeUserList) {
-                    if (ConfigHandler.playerIdCache.get(excludeTarget.toLowerCase(Locale.ROOT)) == null) {
-                        UserStatement.loadId(statement.getConnection(), excludeTarget, null);
-                    }
-
-                    int userId = ConfigHandler.playerIdCache.get(excludeTarget.toLowerCase(Locale.ROOT));
-                    if (excludeUserText.length() == 0) {
-                        excludeUserText = excludeUserText.append(userId);
-                    }
-                    else {
-                        excludeUserText.append(",").append(userId);
-                    }
-                }
-
-                excludeUsers = excludeUserText.toString();
-            }
-
-            // Specify actions to exclude from a:item
-            if ((lookup && actionList.size() == 0) || (actionList.contains(11) && actionList.size() == 1)) {
-                StringBuilder actionText = new StringBuilder();
-                actionText = actionText.append(ItemLogger.ITEM_BREAK);
-                actionText.append(",").append(ItemLogger.ITEM_DESTROY);
-                actionText.append(",").append(ItemLogger.ITEM_CREATE);
-                actionText.append(",").append(ItemLogger.ITEM_SELL);
-                actionText.append(",").append(ItemLogger.ITEM_BUY);
-                actionExclude = actionText.toString();
-            }
-
-            if (!actionList.isEmpty()) {
-                StringBuilder actionText = new StringBuilder();
-                for (Integer actionTarget : actionList) {
-                    if (validActions.contains(actionTarget)) {
-                        // If just looking up drops/pickups, remap the actions to the correct values
-                        if (actionList.contains(11) && !actionList.contains(4)) {
-                            if (actionTarget == ItemLogger.ITEM_REMOVE && !actionList.contains(ItemLogger.ITEM_DROP)) {
-                                actionTarget = ItemLogger.ITEM_DROP;
-                            }
-                            else if (actionTarget == ItemLogger.ITEM_ADD && !actionList.contains(ItemLogger.ITEM_PICKUP)) {
-                                actionTarget = ItemLogger.ITEM_PICKUP;
-                            }
-                        }
-
-                        if (actionText.length() == 0) {
-                            actionText = actionText.append(actionTarget);
-                        }
-                        else {
-                            actionText.append(",").append(actionTarget);
-                        }
-
-                        // If selecting from co_item & co_container, add in actions for both transaction types
-                        if (actionList.contains(11) && actionList.contains(4)) {
-                            if (actionTarget == ItemLogger.ITEM_REMOVE) {
-                                actionText.append(",").append(ItemLogger.ITEM_PICKUP);
-                                actionText.append(",").append(ItemLogger.ITEM_REMOVE_ENDER);
-                                actionText.append(",").append(ItemLogger.ITEM_CREATE);
-                                actionText.append(",").append(ItemLogger.ITEM_BUY);
-                            }
-                            if (actionTarget == ItemLogger.ITEM_ADD) {
-                                actionText.append(",").append(ItemLogger.ITEM_DROP);
-                                actionText.append(",").append(ItemLogger.ITEM_ADD_ENDER);
-                                actionText.append(",").append(ItemLogger.ITEM_THROW);
-                                actionText.append(",").append(ItemLogger.ITEM_SHOOT);
-                                actionText.append(",").append(ItemLogger.ITEM_BREAK);
-                                actionText.append(",").append(ItemLogger.ITEM_DESTROY);
-                                actionText.append(",").append(ItemLogger.ITEM_SELL);
-                            }
-                        }
-                        // If just looking up drops/pickups, include ender chest transactions
-                        else if (actionList.contains(11) && !actionList.contains(4)) {
-                            if (actionTarget == ItemLogger.ITEM_DROP) {
-                                actionText.append(",").append(ItemLogger.ITEM_ADD_ENDER);
-                                actionText.append(",").append(ItemLogger.ITEM_THROW);
-                                actionText.append(",").append(ItemLogger.ITEM_SHOOT);
-                            }
-                            if (actionTarget == ItemLogger.ITEM_PICKUP) {
-                                actionText.append(",").append(ItemLogger.ITEM_REMOVE_ENDER);
-                            }
-                        }
-                    }
-                }
-
-                action = actionText.toString();
-            }
-
-            for (Integer value : actionList) {
-                if (validActions.contains(value)) {
-                    validAction = true;
-                }
-            }
-
-            if (restrictWorld) {
-                int wid = WorldUtils.getWorldId(location.getWorld().getName());
-                queryBlock = queryBlock + " wid=" + wid + " AND";
-            }
-
-            if (radius != null) {
-                Integer xmin = radius[1];
-                Integer xmax = radius[2];
-                Integer ymin = radius[3];
-                Integer ymax = radius[4];
-                Integer zmin = radius[5];
-                Integer zmax = radius[6];
-                String queryY = "";
-
-                if (ymin != null && ymax != null) {
-                    queryY = " y >= '" + ymin + "' AND y <= '" + ymax + "' AND";
-                }
-
-                queryBlock = queryBlock + " x >= '" + xmin + "' AND x <= '" + xmax + "' AND z >= '" + zmin + "' AND z <= '" + zmax + "' AND" + queryY;
-            }
-            else if (actionList.contains(5)) {
-                int worldId = WorldUtils.getWorldId(location.getWorld().getName());
-                int x = (int) Math.floor(location.getX());
-                int z = (int) Math.floor(location.getZ());
-                int x2 = (int) Math.ceil(location.getX());
-                int z2 = (int) Math.ceil(location.getZ());
-
-                queryBlock = queryBlock + " wid=" + worldId + " AND (x = '" + x + "' OR x = '" + x2 + "') AND (z = '" + z + "' OR z = '" + z2 + "') AND y = '" + location.getBlockY() + "' AND";
-            }
-
-            if (validAction) {
-                queryBlock = queryBlock + " action IN(" + action + ") AND";
-            }
-            else if (inventoryQuery || actionExclude.length() > 0 || includeBlock.length() > 0 || includeEntity.length() > 0 || excludeBlock.length() > 0 || excludeEntity.length() > 0) {
-                queryBlock = queryBlock + " action NOT IN(-1) AND";
-            }
-
-            if (includeBlock.length() > 0 || includeEntity.length() > 0) {
-                queryBlock = queryBlock + " type IN(" + (includeBlock.length() > 0 ? includeBlock : "0") + ") AND";
-            }
-
-            if (excludeBlock.length() > 0 || excludeEntity.length() > 0) {
-                queryBlock = queryBlock + " type NOT IN(" + (excludeBlock.length() > 0 ? excludeBlock : "0") + ") AND";
-            }
-
-            if (uuids.length() > 0) {
-                queryBlock = queryBlock + " uuid IN(" + uuids + ") AND";
-            }
-
-            if (users.length() > 0) {
-                queryBlock = queryBlock + " user IN(" + users + ") AND";
-            }
-
-            if (excludeUsers.length() > 0) {
-                queryBlock = queryBlock + " user NOT IN(" + excludeUsers + ") AND";
-            }
-
-            if (startTime > 0) {
-                queryBlock = queryBlock + " time > '" + startTime + "' AND";
-            }
-
-            if (endTime > 0) {
-                queryBlock = queryBlock + " time <= '" + endTime + "' AND";
-            }
-
-            if (actionList.contains(10)) {
-                queryBlock = queryBlock + " action = '1' AND (LENGTH(line_1) > 0 OR LENGTH(line_2) > 0 OR LENGTH(line_3) > 0 OR LENGTH(line_4) > 0 OR LENGTH(line_5) > 0 OR LENGTH(line_6) > 0 OR LENGTH(line_7) > 0 OR LENGTH(line_8) > 0) AND";
-            }
-
-            if (queryBlock.length() > 0) {
-                queryBlock = queryBlock.substring(0, queryBlock.length() - 4);
-            }
-
-            if (queryBlock.length() == 0) {
-                queryBlock = " 1";
-            }
-
-            queryEntity = queryBlock;
-            if (includeBlock.length() > 0 || includeEntity.length() > 0) {
-                queryEntity = queryEntity.replace("type IN(" + (includeBlock.length() > 0 ? includeBlock : "0") + ")", "type IN(" + (includeEntity.length() > 0 ? includeEntity : "0") + ")");
-            }
-            if (excludeBlock.length() > 0 || excludeEntity.length() > 0) {
-                queryEntity = queryEntity.replace("type NOT IN(" + (excludeBlock.length() > 0 ? excludeBlock : "0") + ")", "type NOT IN(" + (excludeEntity.length() > 0 ? excludeEntity : "0") + ")");
-            }
-
-            String baseQuery = ((!includeEntity.isEmpty() || !excludeEntity.isEmpty()) ? queryEntity : queryBlock);
-            if (limitOffset > -1 && limitCount > -1) {
-                queryLimit = " LIMIT " + limitOffset + ", " + limitCount + "";
-                unionLimit = " ORDER BY time DESC, id DESC LIMIT " + (limitOffset + limitCount) + "";
-            }
-
-            String rows = "rowid as id,time,user,wid,x,y,z,action,type,data,meta,blockdata,rolled_back";
-            String queryOrder = " ORDER BY rowid DESC";
-
-            if (actionList.contains(4) || actionList.contains(5)) {
-                queryTable = "container";
-                rows = "rowid as id,time,user,wid,x,y,z,action,type,data,rolled_back,amount,metadata";
-            }
-            else if (actionList.contains(6) || actionList.contains(7)) {
-                queryTable = "chat";
-                rows = "rowid as id,time,user,message";
-                if (PluginChannelHandshakeListener.getInstance().isPluginChannelPlayer(user)) {
-                    rows += ",wid,x,y,z";
-                }
-
-                if (actionList.contains(7)) {
-                    queryTable = "command";
-                }
-            }
-            else if (actionList.contains(8)) {
-                queryTable = "session";
-                rows = "rowid as id,time,user,wid,x,y,z,action";
-            }
-            else if (actionList.contains(9)) {
-                queryTable = "username_log";
-                rows = "rowid as id,time,uuid,user";
-            }
-            else if (actionList.contains(10)) {
-                queryTable = "sign";
-                rows = "rowid as id,time,user,wid,x,y,z,face,line_1,line_2,line_3,line_4,line_5,line_6,line_7,line_8";
-            }
-            else if (actionList.contains(11)) {
-                queryTable = "item";
-                rows = "rowid as id,time,user,wid,x,y,z,type,data as metadata,0 as data,amount,action,0 as rolled_back";
-            }
-
-            if (count) {
-                rows = "COUNT(*) as count";
-                queryLimit = " LIMIT 0, 3";
-                queryOrder = "";
-                unionLimit = "";
-            }
-
-            String unionSelect = "SELECT * FROM (";
-            if (Config.getGlobal().MYSQL) {
-                if (queryTable.equals("block")) {
-                    if (includeBlock.length() > 0 || includeEntity.length() > 0) {
-                        index = "USE INDEX(type) IGNORE INDEX(user,wid) ";
-                    }
-                    if (users.length() > 0) {
-                        index = "USE INDEX(user) IGNORE INDEX(type,wid) ";
-                    }
-                    if (radius != null && (radius[2] - radius[1]) <= 50 && (radius[6] - radius[5]) <= 50) {
-                        index = "USE INDEX(wid) IGNORE INDEX(type,user) ";
-                    }
-                    if ((restrictWorld && (users.length() > 0 || includeBlock.length() > 0 || includeEntity.length() > 0))) {
-                        index = "IGNORE INDEX(PRIMARY) ";
-                    }
-                }
-
-                unionSelect = "(";
-            }
-            else {
-                if (queryTable.equals("block")) {
-                    if (includeBlock.length() > 0 || includeEntity.length() > 0) {
-                        index = "INDEXED BY block_type_index ";
-                    }
-                    if (users.length() > 0) {
-                        index = "INDEXED BY block_user_index ";
-                    }
-                    if (radius != null && (radius[2] - radius[1]) <= 50 && (radius[6] - radius[5]) <= 50) {
-                        index = "INDEXED BY block_index ";
-                    }
-                    if ((restrictWorld && (users.length() > 0 || includeBlock.length() > 0 || includeEntity.length() > 0))) {
-                        index = "";
-                    }
-                }
-            }
-
-            boolean itemLookup = inventoryQuery;
-            if ((lookup && actionList.size() == 0) || (itemLookup && !actionList.contains(0))) {
-                if (!count) {
-                    rows = "rowid as id,time,user,wid,x,y,z,type,meta as metadata,data,-1 as amount,action,rolled_back";
-                }
-
-                if (inventoryQuery) {
-                    if (validAction) {
-                        baseQuery = baseQuery.replace("action IN(" + action + ")", "action IN(1)");
-                    }
-                    else {
-                        baseQuery = baseQuery.replace("action NOT IN(-1)", "action IN(1)");
-                    }
-
-                    if (!count) {
-                        rows = "rowid as id,time,user,wid,x,y,z,type,meta as metadata,data,1 as amount,action,rolled_back";
-                    }
-                }
-
-                if (includeBlock.length() > 0 || excludeBlock.length() > 0) {
-                    baseQuery = baseQuery.replace("action NOT IN(-1)", "action NOT IN(3)"); // if block specified for include/exclude, filter out entity data
-                }
-
-                query = unionSelect + "SELECT " + "'0' as tbl," + rows + " FROM " + ConfigHandler.prefix + "block " + index + "WHERE" + baseQuery + unionLimit + ") UNION ALL ";
-                itemLookup = true;
-            }
-
-            if (itemLookup) {
-                if (!count) {
-                    rows = "rowid as id,time,user,wid,x,y,z,type,metadata,data,amount,action,rolled_back";
-                }
-                query = query + unionSelect + "SELECT " + "'1' as tbl," + rows + " FROM " + ConfigHandler.prefix + "container WHERE" + queryBlock + unionLimit + ") UNION ALL ";
-
-                if (!count) {
-                    rows = "rowid as id,time,user,wid,x,y,z,type,data as metadata,0 as data,amount,action,rolled_back";
-                    queryOrder = " ORDER BY time DESC, tbl DESC, id DESC";
-                }
-
-                if (actionExclude.length() > 0) {
-                    queryBlock = queryBlock.replace("action NOT IN(-1)", "action NOT IN(" + actionExclude + ")");
-                }
-
-                query = query + unionSelect + "SELECT " + "'2' as tbl," + rows + " FROM " + ConfigHandler.prefix + "item WHERE" + queryBlock + unionLimit + ")";
-            }
-
-            if (query.length() == 0) {
-                if (actionExclude.length() > 0) {
-                    baseQuery = baseQuery.replace("action NOT IN(-1)", "action NOT IN(" + actionExclude + ")");
-                }
-
-                query = "SELECT " + "'0' as tbl," + rows + " FROM " + ConfigHandler.prefix + queryTable + " " + index + "WHERE" + baseQuery;
-            }
-
-            query = query + queryOrder + queryLimit + "";
-            results = statement.executeQuery(query);
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return results;
-    }
-
-}

src/main/java/net/coreprotect/database/logger/BlockBreakLogger.java

@@ -4,7 +4,6 @@ import java.sql.PreparedStatement;
 import java.util.List;
 import java.util.Locale;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 
@@ -16,7 +15,7 @@ import net.coreprotect.database.statement.BlockStatement;
 import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.event.CoreProtectPreLogEvent;
 import net.coreprotect.thread.CacheHandler;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class BlockBreakLogger {
 
@@ -30,7 +29,7 @@ public class BlockBreakLogger {
                 return;
             }
 
-            Material checkType = net.coreprotect.utility.MaterialUtils.getType(type);
+            Material checkType = Util.getType(type);
             if (checkType == null) {
                 return;
             }
@@ -38,12 +37,8 @@ public class BlockBreakLogger {
                 return;
             }
 
-            if (ConfigHandler.blacklist.get(checkType.getKey().toString()) != null) {
-                return;
-            }
-
             if (!user.startsWith("#")) {
-                String cacheId = location.getBlockX() + "." + location.getBlockY() + "." + location.getBlockZ() + "." + WorldUtils.getWorldId(location.getWorld().getName());
+                String cacheId = location.getBlockX() + "." + location.getBlockY() + "." + location.getBlockZ() + "." + Util.getWorldId(location.getWorld().getName());
                 CacheHandler.spreadCache.remove(cacheId);
             }
 
@@ -54,18 +49,17 @@ public class BlockBreakLogger {
                 blockData = overrideData;
             }
 
-            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user, location);
-            if (Config.getGlobal().API_ENABLED && !Bukkit.isPrimaryThread()) {
+            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user);
+            if (Config.getGlobal().API_ENABLED) {
                 CoreProtect.getInstance().getServer().getPluginManager().callEvent(event);
             }
 
             int userId = UserStatement.getId(preparedStmt, event.getUser(), true);
-            Location eventLocation = event.getLocation();
-            int wid = WorldUtils.getWorldId(eventLocation.getWorld().getName());
+            int wid = Util.getWorldId(location.getWorld().getName());
             int time = (int) (System.currentTimeMillis() / 1000L);
-            int x = eventLocation.getBlockX();
-            int y = eventLocation.getBlockY();
-            int z = eventLocation.getBlockZ();
+            int x = location.getBlockX();
+            int y = location.getBlockY();
+            int z = location.getBlockZ();
             CacheHandler.breakCache.put("" + x + "." + y + "." + z + "." + wid + "", new Object[] { time, event.getUser(), type });
 
             if (event.isCancelled()) {

src/main/java/net/coreprotect/database/logger/BlockPlaceLogger.java

@@ -4,9 +4,7 @@ import java.sql.PreparedStatement;
 import java.util.List;
 import java.util.Locale;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.Location;
 import org.bukkit.block.BlockState;
 
 import net.coreprotect.CoreProtect;
@@ -17,8 +15,7 @@ import net.coreprotect.database.statement.BlockStatement;
 import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.event.CoreProtectPreLogEvent;
 import net.coreprotect.thread.CacheHandler;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class BlockPlaceLogger {
 
@@ -58,10 +55,6 @@ public class BlockPlaceLogger {
                 return;
             }
 
-            if (ConfigHandler.blacklist.get(type.getKey().toString()) != null) {
-                return;
-            }
-
             int x = block.getX();
             int y = block.getY();
             int z = block.getZ();
@@ -86,21 +79,15 @@ public class BlockPlaceLogger {
                 }
             }
 
-            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user, block.getLocation());
-            if (Config.getGlobal().API_ENABLED && !Bukkit.isPrimaryThread()) {
+            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user);
+            if (Config.getGlobal().API_ENABLED) {
                 CoreProtect.getInstance().getServer().getPluginManager().callEvent(event);
             }
 
             int userId = UserStatement.getId(preparedStmt, event.getUser(), true);
-            Location eventLocation = event.getLocation();
-            int wid = WorldUtils.getWorldId(eventLocation.getWorld().getName());
+            int wid = Util.getWorldId(block.getWorld().getName());
             int time = (int) (System.currentTimeMillis() / 1000L);
 
-            // Use event location for subsequent logging
-            x = eventLocation.getBlockX();
-            y = eventLocation.getBlockY();
-            z = eventLocation.getBlockZ();
-
             if (event.getUser().length() > 0) {
                 CacheHandler.lookupCache.put("" + x + "." + y + "." + z + "." + wid + "", new Object[] { time, event.getUser(), type });
             }
@@ -109,8 +96,8 @@ public class BlockPlaceLogger {
                 return;
             }
 
-            int internalType = MaterialUtils.getBlockId(type.name(), true);
-            if (replacedType > 0 && MaterialUtils.getType(replacedType) != Material.AIR && MaterialUtils.getType(replacedType) != Material.CAVE_AIR) {
+            int internalType = Util.getBlockId(type.name(), true);
+            if (replacedType > 0 && Util.getType(replacedType) != Material.AIR && Util.getType(replacedType) != Material.CAVE_AIR) {
                 BlockStatement.insert(preparedStmt, batchCount, time, userId, wid, x, y, z, replacedType, replacedData, null, replaceBlockData, 0, 0);
             }
 

src/main/java/net/coreprotect/database/logger/ChatLogger.java

@@ -7,7 +7,7 @@ import org.bukkit.Location;
 
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.statement.ChatStatement;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class ChatLogger {
 
@@ -23,7 +23,7 @@ public class ChatLogger {
             int x = location.getBlockX();
             int y = location.getBlockY();
             int z = location.getBlockZ();
-            int wid = WorldUtils.getWorldId(location.getWorld().getName());
+            int wid = Util.getWorldId(location.getWorld().getName());
             int userId = ConfigHandler.playerIdCache.get(user.toLowerCase(Locale.ROOT));
             ChatStatement.insert(preparedStmt, batchCount, time, userId, wid, x, y, z, message);
         }

src/main/java/net/coreprotect/database/logger/CommandLogger.java

@@ -3,7 +3,6 @@ package net.coreprotect.database.logger;
 import java.sql.PreparedStatement;
 import java.util.Locale;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 
 import net.coreprotect.CoreProtect;
@@ -12,7 +11,7 @@ import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.statement.CommandStatement;
 import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.event.CoreProtectPreLogEvent;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class CommandLogger {
 
@@ -29,8 +28,8 @@ public class CommandLogger {
                 return;
             }
 
-            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user, location);
-            if (Config.getGlobal().API_ENABLED && !Bukkit.isPrimaryThread()) {
+            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user);
+            if (Config.getGlobal().API_ENABLED) {
                 CoreProtect.getInstance().getServer().getPluginManager().callEvent(event);
             }
 
@@ -39,11 +38,10 @@ public class CommandLogger {
             }
 
             int userId = UserStatement.getId(preparedStmt, event.getUser(), true);
-            Location eventLocation = event.getLocation();
-            int wid = WorldUtils.getWorldId(eventLocation.getWorld().getName());
-            int x = eventLocation.getBlockX();
-            int y = eventLocation.getBlockY();
-            int z = eventLocation.getBlockZ();
+            int wid = Util.getWorldId(location.getWorld().getName());
+            int x = location.getBlockX();
+            int y = location.getBlockY();
+            int z = location.getBlockZ();
             CommandStatement.insert(preparedStmt, batchCount, time, userId, wid, x, y, z, message);
         }
         catch (Exception e) {

src/main/java/net/coreprotect/database/logger/ContainerBreakLogger.java

@@ -8,7 +8,7 @@ import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
 import net.coreprotect.config.ConfigHandler;
-import net.coreprotect.utility.ItemUtils;
+import net.coreprotect.utility.Util;
 
 public class ContainerBreakLogger {
 
@@ -18,7 +18,7 @@ public class ContainerBreakLogger {
 
     public static void log(PreparedStatement preparedStmt, int batchCount, String player, Location l, Material type, ItemStack[] oldInventory) {
         try {
-            ItemUtils.mergeItems(type, oldInventory);
+            Util.mergeItems(type, oldInventory);
             ContainerLogger.logTransaction(preparedStmt, batchCount, player, type, null, oldInventory, 0, l);
             String loggingContainerId = player.toLowerCase(Locale.ROOT) + "." + l.getBlockX() + "." + l.getBlockY() + "." + l.getBlockZ();
 

src/main/java/net/coreprotect/database/logger/ContainerLogger.java

@@ -6,9 +6,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
@@ -22,10 +20,7 @@ import net.coreprotect.consumer.Queue;
 import net.coreprotect.database.statement.ContainerStatement;
 import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.event.CoreProtectPreLogEvent;
-import net.coreprotect.utility.BlockUtils;
-import net.coreprotect.utility.ItemUtils;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 import net.coreprotect.utility.serialize.ItemMetaHandler;
 
 public class ContainerLogger extends Queue {
@@ -60,63 +55,17 @@ public class ContainerLogger extends Queue {
             String loggingContainerId = player.toLowerCase(Locale.ROOT) + "." + location.getBlockX() + "." + location.getBlockY() + "." + location.getBlockZ();
             List<ItemStack[]> oldList = ConfigHandler.oldContainer.get(loggingContainerId);
             ItemStack[] oi1 = oldList.get(0);
-            ItemStack[] oldInventory = ItemUtils.getContainerState(oi1);
-            ItemStack[] newInventory = ItemUtils.getContainerState(contents);
+            ItemStack[] oldInventory = Util.getContainerState(oi1);
+            ItemStack[] newInventory = Util.getContainerState(contents);
             if (oldInventory == null || newInventory == null) {
                 return;
             }
 
-            // Check if this is a dispenser with no actual changes
-            if ("#dispenser".equals(player) && ItemUtils.compareContainers(oldInventory, newInventory)) {
-                // No changes detected, mark this dispenser in the dispenserNoChange map
-                // Extract the location key from the loggingContainerId
-                // Format: #dispenser.x.y.z
-                String[] parts = loggingContainerId.split("\\.");
-                if (parts.length >= 4) {
-                    int x = Integer.parseInt(parts[1]);
-                    int y = Integer.parseInt(parts[2]);
-                    int z = Integer.parseInt(parts[3]);
-
-                    // Create the location key
-                    String locationKey = location.getWorld().getUID().toString() + "." + x + "." + y + "." + z;
-
-                    // Check if we have pending event details for this dispenser
-                    Object[] pendingEvent = ConfigHandler.dispenserPending.remove(locationKey);
-                    if (pendingEvent != null) {
-                        // We have the exact event details, use them to mark this event as unchanged
-                        String eventKey = (String) pendingEvent[0];
-
-                        // Get or create the inner map for this location
-                        ConfigHandler.dispenserNoChange.computeIfAbsent(locationKey, k -> new ConcurrentHashMap<>()).put(eventKey, System.currentTimeMillis());
-                    }
-                }
-                return;
-            }
-
-            // If we reach here, the dispenser event resulted in changes
-            // Remove any pending event for this dispenser
-            if ("#dispenser".equals(player)) {
-                String[] parts = loggingContainerId.split("\\.");
-                if (parts.length >= 4) {
-                    int x = Integer.parseInt(parts[1]);
-                    int y = Integer.parseInt(parts[2]);
-                    int z = Integer.parseInt(parts[3]);
-
-                    String locationKey = location.getWorld().getUID().toString() + "." + x + "." + y + "." + z;
-
-                    // Remove the pending event since it resulted in changes
-                    ConfigHandler.dispenserPending.remove(locationKey);
-
-                    // Clear any existing dispenserNoChange entries for this location
-                    ConfigHandler.dispenserNoChange.remove(locationKey);
-                }
-            }
-
             List<ItemStack[]> forceList = ConfigHandler.forceContainer.get(loggingContainerId);
             if (forceList != null) {
                 int forceSize = 0;
                 if (!forceList.isEmpty()) {
-                    newInventory = ItemUtils.getContainerState(forceList.get(0));
+                    newInventory = Util.getContainerState(forceList.get(0));
                     forceSize = modifyForceContainer(loggingContainerId, null);
                 }
                 if (forceSize == 0) {
@@ -169,7 +118,7 @@ public class ContainerLogger extends Queue {
             for (ItemStack oldi : oldInventory) {
                 for (ItemStack newi : newInventory) {
                     if (oldi != null && newi != null) {
-                        if (oldi.isSimilar(newi) && !BlockUtils.isAir(oldi.getType())) { // Ignores amount
+                        if (oldi.isSimilar(newi) && !Util.isAir(oldi.getType())) { // Ignores amount
                             int oldAmount = oldi.getAmount();
                             int newAmount = newi.getAmount();
                             if (newAmount >= oldAmount) {
@@ -187,8 +136,8 @@ public class ContainerLogger extends Queue {
                 }
             }
 
-            ItemUtils.mergeItems(type, oldInventory);
-            ItemUtils.mergeItems(type, newInventory);
+            Util.mergeItems(type, oldInventory);
+            Util.mergeItems(type, newInventory);
 
             if (type != Material.ENDER_CHEST) {
                 logTransaction(preparedStmtContainer, batchCount, player, type, faceData, oldInventory, 0, location);
@@ -216,15 +165,15 @@ public class ContainerLogger extends Queue {
             int slot = 0;
             for (ItemStack item : items) {
                 if (item != null) {
-                    if (item.getAmount() > 0 && !BlockUtils.isAir(item.getType())) {
+                    if (item.getAmount() > 0 && !Util.isAir(item.getType())) {
                         // Object[] metadata = new Object[] { slot, item.getItemMeta() };
-                        List<List<Map<String, Object>>> metadata = ItemMetaHandler.serialize(item, type, faceData, slot);
+                        List<List<Map<String, Object>>> metadata = ItemMetaHandler.seralize(item, type, faceData, slot);
                         if (metadata.size() == 0) {
                             metadata = null;
                         }
 
-                        CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user, location);
-                        if (Config.getGlobal().API_ENABLED && !Bukkit.isPrimaryThread()) {
+                        CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user);
+                        if (Config.getGlobal().API_ENABLED) {
                             CoreProtect.getInstance().getServer().getPluginManager().callEvent(event);
                         }
 
@@ -233,13 +182,12 @@ public class ContainerLogger extends Queue {
                         }
 
                         int userId = UserStatement.getId(preparedStmt, event.getUser(), true);
-                        Location eventLocation = event.getLocation();
-                        int wid = WorldUtils.getWorldId(eventLocation.getWorld().getName());
+                        int wid = Util.getWorldId(location.getWorld().getName());
                         int time = (int) (System.currentTimeMillis() / 1000L);
-                        int x = eventLocation.getBlockX();
-                        int y = eventLocation.getBlockY();
-                        int z = eventLocation.getBlockZ();
-                        int typeId = MaterialUtils.getBlockId(item.getType().name(), true);
+                        int x = location.getBlockX();
+                        int y = location.getBlockY();
+                        int z = location.getBlockZ();
+                        int typeId = Util.getBlockId(item.getType().name(), true);
                         int data = 0;
                         int amount = item.getAmount();
                         ContainerStatement.insert(preparedStmt, batchCount, time, userId, wid, x, y, z, typeId, data, amount, metadata, action, 0);

src/main/java/net/coreprotect/database/logger/EntityKillLogger.java

@@ -5,8 +5,6 @@ import java.sql.ResultSet;
 import java.util.List;
 import java.util.Locale;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
 import org.bukkit.block.BlockState;
 
 import net.coreprotect.CoreProtect;
@@ -17,7 +15,7 @@ import net.coreprotect.database.statement.BlockStatement;
 import net.coreprotect.database.statement.EntityStatement;
 import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.event.CoreProtectPreLogEvent;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class EntityKillLogger {
 
@@ -31,9 +29,8 @@ public class EntityKillLogger {
                 return;
             }
 
-            Location initialLocation = new Location(block.getWorld(), block.getX(), block.getY(), block.getZ());
-            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user, initialLocation);
-            if (Config.getGlobal().API_ENABLED && !Bukkit.isPrimaryThread()) {
+            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user);
+            if (Config.getGlobal().API_ENABLED) {
                 CoreProtect.getInstance().getServer().getPluginManager().callEvent(event);
             }
 
@@ -42,12 +39,11 @@ public class EntityKillLogger {
             }
 
             int userId = UserStatement.getId(preparedStmt, event.getUser(), true);
-            Location eventLocation = event.getLocation();
-            int wid = WorldUtils.getWorldId(eventLocation.getWorld().getName());
+            int wid = Util.getWorldId(block.getWorld().getName());
             int time = (int) (System.currentTimeMillis() / 1000L);
-            int x = eventLocation.getBlockX();
-            int y = eventLocation.getBlockY();
-            int z = eventLocation.getBlockZ();
+            int x = block.getX();
+            int y = block.getY();
+            int z = block.getZ();
             int entity_key = 0;
 
             ResultSet resultSet = EntityStatement.insert(preparedStmt2, time, data);

src/main/java/net/coreprotect/database/logger/ItemLogger.java

@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.inventory.ItemStack;
 
@@ -16,10 +15,7 @@ import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.statement.ItemStatement;
 import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.event.CoreProtectPreLogEvent;
-import net.coreprotect.utility.BlockUtils;
-import net.coreprotect.utility.ItemUtils;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 import net.coreprotect.utility.serialize.ItemMetaHandler;
 
 public class ItemLogger {
@@ -95,15 +91,15 @@ public class ItemLogger {
             itemBuys = buyList.toArray(itemBuys);
             buyList.clear();
 
-            ItemUtils.mergeItems(null, itemPickups);
-            ItemUtils.mergeItems(null, itemDrops);
-            ItemUtils.mergeItems(null, itemThrows);
-            ItemUtils.mergeItems(null, itemShots);
-            ItemUtils.mergeItems(null, itemBreaks);
-            ItemUtils.mergeItems(null, itemDestroys);
-            ItemUtils.mergeItems(null, itemCreates);
-            ItemUtils.mergeItems(null, itemSells);
-            ItemUtils.mergeItems(null, itemBuys);
+            Util.mergeItems(null, itemPickups);
+            Util.mergeItems(null, itemDrops);
+            Util.mergeItems(null, itemThrows);
+            Util.mergeItems(null, itemShots);
+            Util.mergeItems(null, itemBreaks);
+            Util.mergeItems(null, itemDestroys);
+            Util.mergeItems(null, itemCreates);
+            Util.mergeItems(null, itemSells);
+            Util.mergeItems(null, itemBuys);
             logTransaction(preparedStmt, batchCount, offset, user, location, itemPickups, ITEM_PICKUP);
             logTransaction(preparedStmt, batchCount, offset, user, location, itemDrops, ITEM_DROP);
             logTransaction(preparedStmt, batchCount, offset, user, location, itemThrows, ITEM_THROW);
@@ -122,15 +118,15 @@ public class ItemLogger {
     protected static void logTransaction(PreparedStatement preparedStmt, int batchCount, int offset, String user, Location location, ItemStack[] items, int action) {
         try {
             for (ItemStack item : items) {
-                if (item != null && item.getAmount() > 0 && !BlockUtils.isAir(item.getType())) {
+                if (item != null && item.getAmount() > 0 && !Util.isAir(item.getType())) {
                     // Object[] metadata = new Object[] { slot, item.getItemMeta() };
-                    List<List<Map<String, Object>>> data = ItemMetaHandler.serialize(item, null, null, 0);
+                    List<List<Map<String, Object>>> data = ItemMetaHandler.seralize(item, null, null, 0);
                     if (data.size() == 0) {
                         data = null;
                     }
 
-                    CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user, location);
-                    if (Config.getGlobal().API_ENABLED && !Bukkit.isPrimaryThread()) {
+                    CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user);
+                    if (Config.getGlobal().API_ENABLED) {
                         CoreProtect.getInstance().getServer().getPluginManager().callEvent(event);
                     }
 
@@ -139,13 +135,12 @@ public class ItemLogger {
                     }
 
                     int userId = UserStatement.getId(preparedStmt, event.getUser(), true);
-                    Location eventLocation = event.getLocation();
-                    int wid = WorldUtils.getWorldId(eventLocation.getWorld().getName());
+                    int wid = Util.getWorldId(location.getWorld().getName());
                     int time = (int) (System.currentTimeMillis() / 1000L) - offset;
-                    int x = eventLocation.getBlockX();
-                    int y = eventLocation.getBlockY();
-                    int z = eventLocation.getBlockZ();
-                    int typeId = MaterialUtils.getBlockId(item.getType().name(), true);
+                    int x = location.getBlockX();
+                    int y = location.getBlockY();
+                    int z = location.getBlockZ();
+                    int typeId = Util.getBlockId(item.getType().name(), true);
                     int amount = item.getAmount();
                     ItemStatement.insert(preparedStmt, batchCount, time, userId, wid, x, y, z, typeId, data, amount, action);
                 }

src/main/java/net/coreprotect/database/logger/PlayerInteractLogger.java

@@ -3,9 +3,7 @@ package net.coreprotect.database.logger;
 import java.sql.PreparedStatement;
 import java.util.Locale;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.Location;
 import org.bukkit.block.BlockState;
 
 import net.coreprotect.CoreProtect;
@@ -14,8 +12,7 @@ import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.statement.BlockStatement;
 import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.event.CoreProtectPreLogEvent;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class PlayerInteractLogger {
 
@@ -25,13 +22,13 @@ public class PlayerInteractLogger {
 
     public static void log(PreparedStatement preparedStmt, int batchCount, String user, BlockState block, Material blockType) {
         try {
-            int type = MaterialUtils.getBlockId(blockType.name(), true);
-            if (ConfigHandler.blacklist.get(user.toLowerCase(Locale.ROOT)) != null || MaterialUtils.getType(type).equals(Material.AIR) || MaterialUtils.getType(type).equals(Material.CAVE_AIR)) {
+            int type = Util.getBlockId(blockType.name(), true);
+            if (ConfigHandler.blacklist.get(user.toLowerCase(Locale.ROOT)) != null || Util.getType(type).equals(Material.AIR) || Util.getType(type).equals(Material.CAVE_AIR)) {
                 return;
             }
 
-            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user, block.getLocation());
-            if (Config.getGlobal().API_ENABLED && !Bukkit.isPrimaryThread()) {
+            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user);
+            if (Config.getGlobal().API_ENABLED) {
                 CoreProtect.getInstance().getServer().getPluginManager().callEvent(event);
             }
 
@@ -40,12 +37,11 @@ public class PlayerInteractLogger {
             }
 
             int userId = UserStatement.getId(preparedStmt, event.getUser(), true);
-            Location eventLocation = event.getLocation();
-            int wid = WorldUtils.getWorldId(eventLocation.getWorld().getName());
+            int wid = Util.getWorldId(block.getWorld().getName());
             int time = (int) (System.currentTimeMillis() / 1000L);
-            int x = eventLocation.getBlockX();
-            int y = eventLocation.getBlockY();
-            int z = eventLocation.getBlockZ();
+            int x = block.getX();
+            int y = block.getY();
+            int z = block.getZ();
             int data = 0;
             BlockStatement.insert(preparedStmt, batchCount, time, userId, wid, x, y, z, type, data, null, null, 2, 0);
         }

src/main/java/net/coreprotect/database/logger/PlayerKillLogger.java

@@ -3,8 +3,6 @@ package net.coreprotect.database.logger;
 import java.sql.PreparedStatement;
 import java.util.Locale;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
 import org.bukkit.block.BlockState;
 
 import net.coreprotect.CoreProtect;
@@ -13,7 +11,7 @@ import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.statement.BlockStatement;
 import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.event.CoreProtectPreLogEvent;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class PlayerKillLogger {
 
@@ -31,9 +29,8 @@ public class PlayerKillLogger {
                 UserStatement.loadId(preparedStmt.getConnection(), player, null);
             }
 
-            Location initialLocation = new Location(block.getWorld(), block.getX(), block.getY(), block.getZ());
-            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user, initialLocation);
-            if (Config.getGlobal().API_ENABLED && !Bukkit.isPrimaryThread()) {
+            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user);
+            if (Config.getGlobal().API_ENABLED) {
                 CoreProtect.getInstance().getServer().getPluginManager().callEvent(event);
             }
 
@@ -43,12 +40,11 @@ public class PlayerKillLogger {
 
             int userId = UserStatement.getId(preparedStmt, event.getUser(), true);
             int playerId = ConfigHandler.playerIdCache.get(player.toLowerCase(Locale.ROOT));
-            Location eventLocation = event.getLocation();
-            int wid = WorldUtils.getWorldId(eventLocation.getWorld().getName());
+            int wid = Util.getWorldId(block.getWorld().getName());
             int time = (int) (System.currentTimeMillis() / 1000L);
-            int x = eventLocation.getBlockX();
-            int y = eventLocation.getBlockY();
-            int z = eventLocation.getBlockZ();
+            int x = block.getX();
+            int y = block.getY();
+            int z = block.getZ();
             BlockStatement.insert(preparedStmt, batchCount, time, userId, wid, x, y, z, 0, playerId, null, null, 3, 0);
         }
         catch (Exception e) {

src/main/java/net/coreprotect/database/logger/PlayerSessionLogger.java

@@ -7,7 +7,7 @@ import org.bukkit.Location;
 
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.statement.SessionStatement;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class PlayerSessionLogger {
 
@@ -23,7 +23,7 @@ public class PlayerSessionLogger {
             int x = location.getBlockX();
             int y = location.getBlockY();
             int z = location.getBlockZ();
-            int wid = WorldUtils.getWorldId(location.getWorld().getName());
+            int wid = Util.getWorldId(location.getWorld().getName());
             int userId = ConfigHandler.playerIdCache.get(user.toLowerCase(Locale.ROOT));
             SessionStatement.insert(preparedStmt, batchCount, time, userId, wid, x, y, z, action);
         }

src/main/java/net/coreprotect/database/logger/SignTextLogger.java

@@ -3,7 +3,6 @@ package net.coreprotect.database.logger;
 import java.sql.PreparedStatement;
 import java.util.Locale;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 
 import net.coreprotect.CoreProtect;
@@ -12,7 +11,7 @@ import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.statement.SignStatement;
 import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.event.CoreProtectPreLogEvent;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class SignTextLogger {
 
@@ -26,8 +25,8 @@ public class SignTextLogger {
                 return;
             }
 
-            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user, location);
-            if (Config.getGlobal().API_ENABLED && !Bukkit.isPrimaryThread()) {
+            CoreProtectPreLogEvent event = new CoreProtectPreLogEvent(user);
+            if (Config.getGlobal().API_ENABLED) {
                 CoreProtect.getInstance().getServer().getPluginManager().callEvent(event);
             }
 
@@ -36,12 +35,11 @@ public class SignTextLogger {
             }
 
             int userId = UserStatement.getId(preparedStmt, event.getUser(), true);
-            Location eventLocation = event.getLocation();
-            int wid = WorldUtils.getWorldId(eventLocation.getWorld().getName());
+            int wid = Util.getWorldId(location.getWorld().getName());
             int time = (int) (System.currentTimeMillis() / 1000L) - timeOffset;
-            int x = eventLocation.getBlockX();
-            int y = eventLocation.getBlockY();
-            int z = eventLocation.getBlockZ();
+            int x = location.getBlockX();
+            int y = location.getBlockY();
+            int z = location.getBlockZ();
 
             if (line1.isEmpty() && line2.isEmpty() && line3.isEmpty() && line4.isEmpty()) {
                 line1 = null;

src/main/java/net/coreprotect/database/logger/SkullBreakLogger.java

@@ -11,7 +11,7 @@ import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.Database;
 import net.coreprotect.database.statement.SkullStatement;
 import net.coreprotect.paper.PaperAdapter;
-import net.coreprotect.utility.MaterialUtils;
+import net.coreprotect.utility.Util;
 
 public class SkullBreakLogger {
 
@@ -25,15 +25,13 @@ public class SkullBreakLogger {
                 return;
             }
             int time = (int) (System.currentTimeMillis() / 1000L);
-            int type = MaterialUtils.getBlockId(block.getType().name(), true);
+            int type = Util.getBlockId(block.getType().name(), true);
             Skull skull = (Skull) block;
             String skullOwner = "";
-            String skullSkin = null;
             int skullKey = 0;
             if (skull.hasOwner()) {
                 skullOwner = PaperAdapter.ADAPTER.getSkullOwner(skull);
-                skullSkin = PaperAdapter.ADAPTER.getSkullSkin(skull);
-                ResultSet resultSet = SkullStatement.insert(preparedStmt2, time, skullOwner, skullSkin);
+                ResultSet resultSet = SkullStatement.insert(preparedStmt2, time, skullOwner);
                 if (Database.hasReturningKeys()) {
                     resultSet.next();
                     skullKey = resultSet.getInt(1);

src/main/java/net/coreprotect/database/logger/SkullPlaceLogger.java

@@ -31,11 +31,9 @@ public class SkullPlaceLogger {
             if (block instanceof Skull) {
                 Skull skull = (Skull) block;
                 String skullOwner = "";
-                String skullSkin = null;
                 if (skull.hasOwner()) {
                     skullOwner = PaperAdapter.ADAPTER.getSkullOwner(skull);
-                    skullSkin = PaperAdapter.ADAPTER.getSkullSkin(skull);
-                    ResultSet resultSet = SkullStatement.insert(preparedStmt2, time, skullOwner, skullSkin);
+                    ResultSet resultSet = SkullStatement.insert(preparedStmt2, time, skullOwner);
                     if (Database.hasReturningKeys()) {
                         resultSet.next();
                         skullKey = resultSet.getInt(1);

src/main/java/net/coreprotect/database/lookup/BlockLookup.java

@@ -1,18 +1,20 @@
 package net.coreprotect.database.lookup;
 
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.Locale;
+
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.command.CommandSender;
+
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.language.Phrase;
 import net.coreprotect.language.Selector;
 import net.coreprotect.listener.channel.PluginChannelListener;
-import net.coreprotect.utility.*;
-import org.bukkit.Material;
-import org.bukkit.block.BlockState;
-import org.bukkit.command.CommandSender;
-
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.Locale;
+import net.coreprotect.utility.Color;
+import net.coreprotect.utility.Util;
 
 public class BlockLookup {
 
@@ -44,7 +46,7 @@ public class BlockLookup {
             int y = block.getY();
             int z = block.getZ();
             long time = (System.currentTimeMillis() / 1000L);
-            int worldId = WorldUtils.getWorldId(block.getWorld().getName());
+            int worldId = Util.getWorldId(block.getWorld().getName());
             long checkTime = 0;
             int count = 0;
             int rowMax = page * limit;
@@ -55,7 +57,7 @@ public class BlockLookup {
 
             String blockName = block.getType().name().toLowerCase(Locale.ROOT);
 
-            String query = "SELECT COUNT(*) as count from " + ConfigHandler.prefix + "block " + WorldUtils.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND action IN(0,1) AND time >= '" + checkTime + "' LIMIT 0, 1";
+            String query = "SELECT COUNT(*) as count from " + ConfigHandler.prefix + "block " + Util.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND action IN(0,1) AND time >= '" + checkTime + "' LIMIT 0, 1";
             ResultSet results = statement.executeQuery(query);
             while (results.next()) {
                 count = results.getInt("count");
@@ -63,7 +65,7 @@ public class BlockLookup {
             results.close();
             int totalPages = (int) Math.ceil(count / (limit + 0.0));
 
-            query = "SELECT time,user,action,type,data,rolled_back FROM " + ConfigHandler.prefix + "block " + WorldUtils.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND action IN(0,1) AND time >= '" + checkTime + "' ORDER BY rowid DESC LIMIT " + page_start + ", " + limit + "";
+            query = "SELECT time,user,action,type,data,rolled_back FROM " + ConfigHandler.prefix + "block " + Util.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND action IN(0,1) AND time >= '" + checkTime + "' ORDER BY rowid DESC LIMIT " + page_start + ", " + limit + "";
             results = statement.executeQuery(query);
 
             StringBuilder resultTextBuilder = new StringBuilder();
@@ -81,10 +83,10 @@ public class BlockLookup {
                 }
 
                 String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
-                String timeAgo = ChatUtils.getTimeSince(resultTime, time, true);
+                String timeAgo = Util.getTimeSince(resultTime, time, true);
 
                 if (!found) {
-                    resultTextBuilder = new StringBuilder(Color.WHITE + "----- " + Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "----- " + ChatUtils.getCoordinates(command, worldId, x, y, z, false, false) + "\n");
+                    resultTextBuilder = new StringBuilder(Color.WHITE + "----- " + Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "----- " + Util.getCoordinates(command, worldId, x, y, z, false, false) + "\n");
                 }
                 found = true;
 
@@ -109,14 +111,14 @@ public class BlockLookup {
 
                 String target;
                 if (resultAction == 3) {
-                    target = EntityUtils.getEntityType(resultType).name();
+                    target = Util.getEntityType(resultType).name();
                 }
                 else {
-                    Material resultMaterial = MaterialUtils.getType(resultType);
+                    Material resultMaterial = Util.getType(resultType);
                     if (resultMaterial == null) {
                         resultMaterial = Material.AIR;
                     }
-                    target = StringUtils.nameFilter(resultMaterial.name().toLowerCase(Locale.ROOT), resultData);
+                    target = Util.nameFilter(resultMaterial.name().toLowerCase(Locale.ROOT), resultData);
                     target = "minecraft:" + target.toLowerCase(Locale.ROOT);
                 }
                 if (target.length() > 0) {
@@ -138,7 +140,7 @@ public class BlockLookup {
             if (found) {
                 if (count > limit) {
                     String pageInfo = Color.WHITE + "-----\n";
-                    pageInfo = pageInfo + ChatUtils.getPageNavigation(command, page, totalPages) + "\n";
+                    pageInfo = pageInfo + Util.getPageNavigation(command, page, totalPages) + "\n";
                     resultText = resultText + pageInfo;
                 }
             }
@@ -150,7 +152,7 @@ public class BlockLookup {
                     // resultText = Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Color.WHITE + "No block data found at " + Color.ITALIC + "x" + x + "/y" + y + "/z" + z + ".";
                     resultText = Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA_LOCATION, Selector.FIRST);
                     if (!blockName.equals("air") && !blockName.equals("cave_air")) {
-                        resultText = Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA, Color.ITALIC + block.getType().name().toLowerCase(Locale.ROOT) + Color.WHITE) + "\n";
+                        resultText = Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA, Color.ITALIC + block.getType().name().toLowerCase(Locale.ROOT)) + "\n";
                     }
                 }
             }

src/main/java/net/coreprotect/database/lookup/ChestTransactionLookup.java

@@ -15,12 +15,8 @@ import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.language.Phrase;
 import net.coreprotect.language.Selector;
 import net.coreprotect.listener.channel.PluginChannelListener;
-import net.coreprotect.utility.ChatUtils;
 import net.coreprotect.utility.Color;
-import net.coreprotect.utility.ItemUtils;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.StringUtils;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class ChestTransactionLookup {
 
@@ -55,14 +51,14 @@ public class ChestTransactionLookup {
             int y2 = (int) Math.ceil(l.getY());
             int z2 = (int) Math.ceil(l.getZ());
             long time = (System.currentTimeMillis() / 1000L);
-            int worldId = WorldUtils.getWorldId(l.getWorld().getName());
+            int worldId = Util.getWorldId(l.getWorld().getName());
             int count = 0;
             int rowMax = page * limit;
             int pageStart = rowMax - limit;
 
-            String query = "SELECT COUNT(*) as count from " + ConfigHandler.prefix + "container " + WorldUtils.getWidIndex("container") + "WHERE wid = '" + worldId + "' AND (x = '" + x + "' OR x = '" + x2 + "') AND (z = '" + z + "' OR z = '" + z2 + "') AND y = '" + y + "' LIMIT 0, 1";
+            String query = "SELECT COUNT(*) as count from " + ConfigHandler.prefix + "container " + Util.getWidIndex("container") + "WHERE wid = '" + worldId + "' AND (x = '" + x + "' OR x = '" + x2 + "') AND (z = '" + z + "' OR z = '" + z2 + "') AND y = '" + y + "' LIMIT 0, 1";
             if (exact) {
-                query = "SELECT COUNT(*) as count from " + ConfigHandler.prefix + "container " + WorldUtils.getWidIndex("container") + "WHERE wid = '" + worldId + "' AND (x = '" + l.getBlockX() + "') AND (z = '" + l.getBlockZ() + "') AND y = '" + y + "' LIMIT 0, 1";
+                query = "SELECT COUNT(*) as count from " + ConfigHandler.prefix + "container " + Util.getWidIndex("container") + "WHERE wid = '" + worldId + "' AND (x = '" + l.getBlockX() + "') AND (z = '" + l.getBlockZ() + "') AND y = '" + y + "' LIMIT 0, 1";
             }
             ResultSet results = statement.executeQuery(query);
 
@@ -73,9 +69,9 @@ public class ChestTransactionLookup {
 
             int totalPages = (int) Math.ceil(count / (limit + 0.0));
 
-            query = "SELECT time,user,action,type,data,amount,metadata,rolled_back FROM " + ConfigHandler.prefix + "container " + WorldUtils.getWidIndex("container") + "WHERE wid = '" + worldId + "' AND (x = '" + x + "' OR x = '" + x2 + "') AND (z = '" + z + "' OR z = '" + z2 + "') AND y = '" + y + "' ORDER BY rowid DESC LIMIT " + pageStart + ", " + limit + "";
+            query = "SELECT time,user,action,type,data,amount,metadata,rolled_back FROM " + ConfigHandler.prefix + "container " + Util.getWidIndex("container") + "WHERE wid = '" + worldId + "' AND (x = '" + x + "' OR x = '" + x2 + "') AND (z = '" + z + "' OR z = '" + z2 + "') AND y = '" + y + "' ORDER BY rowid DESC LIMIT " + pageStart + ", " + limit + "";
             if (exact) {
-                query = "SELECT time,user,action,type,data,amount,metadata,rolled_back FROM " + ConfigHandler.prefix + "container " + WorldUtils.getWidIndex("container") + "WHERE wid = '" + worldId + "' AND (x = '" + l.getBlockX() + "') AND (z = '" + l.getBlockZ() + "') AND y = '" + y + "' ORDER BY rowid DESC LIMIT " + pageStart + ", " + limit + "";
+                query = "SELECT time,user,action,type,data,amount,metadata,rolled_back FROM " + ConfigHandler.prefix + "container " + Util.getWidIndex("container") + "WHERE wid = '" + worldId + "' AND (x = '" + l.getBlockX() + "') AND (z = '" + l.getBlockZ() + "') AND y = '" + y + "' ORDER BY rowid DESC LIMIT " + pageStart + ", " + limit + "";
             }
             results = statement.executeQuery(query);
             while (results.next()) {
@@ -87,17 +83,17 @@ public class ChestTransactionLookup {
                 int resultAmount = results.getInt("amount");
                 int resultRolledBack = results.getInt("rolled_back");
                 byte[] resultMetadata = results.getBytes("metadata");
-                String tooltip = ItemUtils.getEnchantments(resultMetadata, resultType, resultAmount);
+                String tooltip = Util.getEnchantments(resultMetadata, resultType, resultAmount);
 
                 if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) {
                     UserStatement.loadName(statement.getConnection(), resultUserId);
                 }
 
                 String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
-                String timeAgo = ChatUtils.getTimeSince(resultTime, time, true);
+                String timeAgo = Util.getTimeSince(resultTime, time, true);
 
                 if (!found) {
-                    result.add(new StringBuilder(Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.CONTAINER_HEADER) + Color.WHITE + " ----- " + ChatUtils.getCoordinates(command, worldId, x, y, z, false, false)).toString());
+                    result.add(new StringBuilder(Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.CONTAINER_HEADER) + Color.WHITE + " ----- " + Util.getCoordinates(command, worldId, x, y, z, false, false)).toString());
                 }
                 found = true;
 
@@ -108,12 +104,12 @@ public class ChestTransactionLookup {
                     rbFormat = Color.STRIKETHROUGH;
                 }
 
-                Material resultMaterial = MaterialUtils.getType(resultType);
+                Material resultMaterial = Util.getType(resultType);
                 if (resultMaterial == null) {
                     resultMaterial = Material.AIR;
                 }
                 String target = resultMaterial.name().toLowerCase(Locale.ROOT);
-                target = StringUtils.nameFilter(target, resultData);
+                target = Util.nameFilter(target, resultData);
                 if (target.length() > 0) {
                     target = "minecraft:" + target.toLowerCase(Locale.ROOT) + "";
                 }
@@ -123,7 +119,7 @@ public class ChestTransactionLookup {
                     target = target.split(":")[1];
                 }
 
-                result.add(new StringBuilder(timeAgo + " " + tag + " " + Phrase.build(Phrase.LOOKUP_CONTAINER, Color.DARK_AQUA + rbFormat + resultUser + Color.WHITE + rbFormat, "x" + resultAmount, ChatUtils.createTooltip(Color.DARK_AQUA + rbFormat + target, tooltip) + Color.WHITE, selector)).toString());
+                result.add(new StringBuilder(timeAgo + " " + tag + " " + Phrase.build(Phrase.LOOKUP_CONTAINER, Color.DARK_AQUA + rbFormat + resultUser + Color.WHITE + rbFormat, "x" + resultAmount, Util.createTooltip(Color.DARK_AQUA + rbFormat + target, tooltip) + Color.WHITE, selector)).toString());
                 PluginChannelListener.getInstance().sendData(commandSender, resultTime, Phrase.LOOKUP_CONTAINER, selector, resultUser, target, resultAmount, x, y, z, worldId, rbFormat, true, tag.contains("+"));
             }
             results.close();
@@ -131,7 +127,7 @@ public class ChestTransactionLookup {
             if (found) {
                 if (count > limit) {
                     result.add(Color.WHITE + "-----");
-                    result.add(ChatUtils.getPageNavigation(command, page, totalPages));
+                    result.add(Util.getPageNavigation(command, page, totalPages));
                 }
             }
             else {

src/main/java/net/coreprotect/database/lookup/InteractionLookup.java

@@ -13,11 +13,8 @@ import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.language.Phrase;
 import net.coreprotect.language.Selector;
 import net.coreprotect.listener.channel.PluginChannelListener;
-import net.coreprotect.utility.ChatUtils;
 import net.coreprotect.utility.Color;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.StringUtils;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class InteractionLookup {
 
@@ -49,7 +46,7 @@ public class InteractionLookup {
             int y = block.getY();
             int z = block.getZ();
             int time = (int) (System.currentTimeMillis() / 1000L);
-            int worldId = WorldUtils.getWorldId(block.getWorld().getName());
+            int worldId = Util.getWorldId(block.getWorld().getName());
             int checkTime = 0;
             int count = 0;
             int rowMax = page * limit;
@@ -58,7 +55,7 @@ public class InteractionLookup {
                 checkTime = time - offset;
             }
 
-            String query = "SELECT COUNT(*) as count from " + ConfigHandler.prefix + "block " + WorldUtils.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND action='2' AND time >= '" + checkTime + "' LIMIT 0, 1";
+            String query = "SELECT COUNT(*) as count from " + ConfigHandler.prefix + "block " + Util.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND action='2' AND time >= '" + checkTime + "' LIMIT 0, 1";
             ResultSet results = statement.executeQuery(query);
 
             while (results.next()) {
@@ -67,7 +64,7 @@ public class InteractionLookup {
             results.close();
             int totalPages = (int) Math.ceil(count / (limit + 0.0));
 
-            query = "SELECT time,user,action,type,data,rolled_back FROM " + ConfigHandler.prefix + "block " + WorldUtils.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND action='2' AND time >= '" + checkTime + "' ORDER BY rowid DESC LIMIT " + pageStart + ", " + limit + "";
+            query = "SELECT time,user,action,type,data,rolled_back FROM " + ConfigHandler.prefix + "block " + Util.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND action='2' AND time >= '" + checkTime + "' ORDER BY rowid DESC LIMIT " + pageStart + ", " + limit + "";
             results = statement.executeQuery(query);
 
             StringBuilder resultBuilder = new StringBuilder();
@@ -84,10 +81,10 @@ public class InteractionLookup {
                 }
 
                 String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
-                String timeAgo = ChatUtils.getTimeSince(resultTime, time, true);
+                String timeAgo = Util.getTimeSince(resultTime, time, true);
 
                 if (!found) {
-                    resultBuilder = new StringBuilder(Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.INTERACTIONS_HEADER) + Color.WHITE + " ----- " + ChatUtils.getCoordinates(command, worldId, x, y, z, false, false) + "\n");
+                    resultBuilder = new StringBuilder(Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.INTERACTIONS_HEADER) + Color.WHITE + " ----- " + Util.getCoordinates(command, worldId, x, y, z, false, false) + "\n");
                 }
                 found = true;
 
@@ -96,12 +93,12 @@ public class InteractionLookup {
                     rbFormat = Color.STRIKETHROUGH;
                 }
 
-                Material resultMaterial = MaterialUtils.getType(resultType);
+                Material resultMaterial = Util.getType(resultType);
                 if (resultMaterial == null) {
                     resultMaterial = Material.AIR;
                 }
                 String target = resultMaterial.name().toLowerCase(Locale.ROOT);
-                target = StringUtils.nameFilter(target, resultData);
+                target = Util.nameFilter(target, resultData);
                 if (target.length() > 0) {
                     target = "minecraft:" + target.toLowerCase(Locale.ROOT) + "";
                 }
@@ -120,7 +117,7 @@ public class InteractionLookup {
             if (found) {
                 if (count > limit) {
                     String pageInfo = Color.WHITE + "-----\n";
-                    pageInfo = pageInfo + ChatUtils.getPageNavigation(command, page, totalPages) + "\n";
+                    pageInfo = pageInfo + Util.getPageNavigation(command, page, totalPages) + "\n";
                     result = result + pageInfo;
                 }
             }

src/main/java/net/coreprotect/database/lookup/SignMessageLookup.java

@@ -15,9 +15,8 @@ import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.language.Phrase;
 import net.coreprotect.language.Selector;
 import net.coreprotect.listener.channel.PluginChannelListener;
-import net.coreprotect.utility.ChatUtils;
 import net.coreprotect.utility.Color;
-import net.coreprotect.utility.WorldUtils;
+import net.coreprotect.utility.Util;
 
 public class SignMessageLookup {
 
@@ -51,12 +50,12 @@ public class SignMessageLookup {
             int y = l.getBlockY();
             int z = l.getBlockZ();
             long time = (System.currentTimeMillis() / 1000L);
-            int worldId = WorldUtils.getWorldId(l.getWorld().getName());
+            int worldId = Util.getWorldId(l.getWorld().getName());
             int count = 0;
             int rowMax = page * limit;
             int pageStart = rowMax - limit;
 
-            String query = "SELECT COUNT(*) as count from " + ConfigHandler.prefix + "sign " + WorldUtils.getWidIndex("sign") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND action = '1' AND (LENGTH(line_1) > 0 OR LENGTH(line_2) > 0 OR LENGTH(line_3) > 0 OR LENGTH(line_4) > 0 OR LENGTH(line_5) > 0 OR LENGTH(line_6) > 0 OR LENGTH(line_7) > 0 OR LENGTH(line_8) > 0) LIMIT 0, 1";
+            String query = "SELECT COUNT(*) as count from " + ConfigHandler.prefix + "sign " + Util.getWidIndex("sign") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND action = '1' AND (LENGTH(line_1) > 0 OR LENGTH(line_2) > 0 OR LENGTH(line_3) > 0 OR LENGTH(line_4) > 0 OR LENGTH(line_5) > 0 OR LENGTH(line_6) > 0 OR LENGTH(line_7) > 0 OR LENGTH(line_8) > 0) LIMIT 0, 1";
             ResultSet results = statement.executeQuery(query);
 
             while (results.next()) {
@@ -66,7 +65,7 @@ public class SignMessageLookup {
 
             int totalPages = (int) Math.ceil(count / (limit + 0.0));
 
-            query = "SELECT time,user,face,line_1,line_2,line_3,line_4,line_5,line_6,line_7,line_8 FROM " + ConfigHandler.prefix + "sign " + WorldUtils.getWidIndex("sign") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND action = '1' AND (LENGTH(line_1) > 0 OR LENGTH(line_2) > 0 OR LENGTH(line_3) > 0 OR LENGTH(line_4) > 0 OR LENGTH(line_5) > 0 OR LENGTH(line_6) > 0 OR LENGTH(line_7) > 0 OR LENGTH(line_8) > 0) ORDER BY rowid DESC LIMIT " + pageStart + ", " + limit + "";
+            query = "SELECT time,user,face,line_1,line_2,line_3,line_4,line_5,line_6,line_7,line_8 FROM " + ConfigHandler.prefix + "sign " + Util.getWidIndex("sign") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND action = '1' AND (LENGTH(line_1) > 0 OR LENGTH(line_2) > 0 OR LENGTH(line_3) > 0 OR LENGTH(line_4) > 0 OR LENGTH(line_5) > 0 OR LENGTH(line_6) > 0 OR LENGTH(line_7) > 0 OR LENGTH(line_8) > 0) ORDER BY rowid DESC LIMIT " + pageStart + ", " + limit + "";
             results = statement.executeQuery(query);
 
             while (results.next()) {
@@ -145,10 +144,10 @@ public class SignMessageLookup {
                 }
 
                 String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
-                String timeAgo = ChatUtils.getTimeSince(resultTime, time, true);
+                String timeAgo = Util.getTimeSince(resultTime, time, true);
 
                 if (!found) {
-                    result.add(new StringBuilder(Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.SIGN_HEADER) + Color.WHITE + " ----- " + ChatUtils.getCoordinates(command, worldId, x, y, z, false, false) + "").toString());
+                    result.add(new StringBuilder(Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.SIGN_HEADER) + Color.WHITE + " ----- " + Util.getCoordinates(command, worldId, x, y, z, false, false) + "").toString());
                 }
                 found = true;
                 result.add(timeAgo + Color.WHITE + " - " + Color.DARK_AQUA + resultUser + ": " + Color.WHITE + "\n" + parsedMessage + Color.WHITE);
@@ -159,7 +158,7 @@ public class SignMessageLookup {
             if (found) {
                 if (count > limit) {
                     result.add(Color.WHITE + "-----");
-                    result.add(ChatUtils.getPageNavigation(command, page, totalPages));
+                    result.add(Util.getPageNavigation(command, page, totalPages));
                 }
             }
             else {

src/main/java/net/coreprotect/database/rollback/RollbackBlockHandler.java

@@ -1,535 +0,0 @@
-package net.coreprotect.database.rollback;
-
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.bukkit.DyeColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Banner;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.block.CommandBlock;
-import org.bukkit.block.CreatureSpawner;
-import org.bukkit.block.banner.Pattern;
-import org.bukkit.block.data.Bisected;
-import org.bukkit.block.data.Bisected.Half;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.MultipleFacing;
-import org.bukkit.block.data.Waterlogged;
-import org.bukkit.block.data.type.Bed;
-import org.bukkit.block.data.type.Bed.Part;
-import org.bukkit.block.data.type.Chest;
-import org.bukkit.block.data.type.Door;
-import org.bukkit.block.data.type.Door.Hinge;
-import org.bukkit.block.data.type.Piston;
-import org.bukkit.block.data.type.PistonHead;
-import org.bukkit.block.data.type.RedstoneWire;
-import org.bukkit.block.data.type.Snow;
-import org.bukkit.block.data.type.Stairs;
-import org.bukkit.block.data.type.TechnicalPiston;
-import org.bukkit.block.data.type.TrapDoor;
-import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.EnderCrystal;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-
-import net.coreprotect.bukkit.BukkitAdapter;
-import net.coreprotect.config.ConfigHandler;
-import net.coreprotect.consumer.Queue;
-import net.coreprotect.model.BlockGroup;
-import net.coreprotect.paper.PaperAdapter;
-import net.coreprotect.thread.CacheHandler;
-import net.coreprotect.utility.BlockUtils;
-import net.coreprotect.utility.ChestTool;
-import net.coreprotect.utility.EntityUtils;
-import net.coreprotect.utility.ItemUtils;
-import net.coreprotect.utility.Util;
-import net.coreprotect.utility.entity.HangingUtil;
-
-public class RollbackBlockHandler extends Queue {
-
-    public static boolean processBlockChange(World bukkitWorld, Block block, Object[] row, int rollbackType, boolean clearInventories, Map<Block, BlockData> chunkChanges, boolean countBlock, Material oldTypeMaterial, Material pendingChangeType, BlockData pendingChangeData, String finalUserString, BlockData rawBlockData, Material changeType, boolean changeBlock, BlockData changeBlockData, ArrayList<Object> meta, BlockData blockData, String rowUser, Material rowType, int rowX, int rowY, int rowZ, int rowTypeRaw, int rowData, int rowAction, int rowWorldId, String blockDataString) {
-        int unixtimestamp = (int) (System.currentTimeMillis() / 1000L);
-
-        try {
-            if (changeBlock) {
-                /* If modifying the head of a piston, update the base piston block to prevent it from being destroyed */
-                if (changeBlockData instanceof PistonHead) {
-                    PistonHead pistonHead = (PistonHead) changeBlockData;
-                    Block pistonBlock = block.getRelative(pistonHead.getFacing().getOppositeFace());
-                    BlockData pistonData = pistonBlock.getBlockData();
-                    if (pistonData instanceof Piston) {
-                        Piston piston = (Piston) pistonData;
-                        piston.setExtended(false);
-                        pistonBlock.setBlockData(piston, false);
-                    }
-                }
-                else if (rowType == Material.MOVING_PISTON && blockData instanceof TechnicalPiston && !(blockData instanceof PistonHead)) {
-                    TechnicalPiston technicalPiston = (TechnicalPiston) blockData;
-                    rowType = (technicalPiston.getType() == org.bukkit.block.data.type.TechnicalPiston.Type.STICKY ? Material.STICKY_PISTON : Material.PISTON);
-                    blockData = rowType.createBlockData();
-                    ((Piston) blockData).setFacing(technicalPiston.getFacing());
-                }
-
-                if ((rowType == Material.AIR) && ((BukkitAdapter.ADAPTER.isItemFrame(oldTypeMaterial)) || (oldTypeMaterial == Material.PAINTING))) {
-                    HangingUtil.removeHanging(block.getState(), blockDataString);
-                }
-                else if ((BukkitAdapter.ADAPTER.isItemFrame(rowType)) || (rowType == Material.PAINTING)) {
-                    HangingUtil.spawnHanging(block.getState(), rowType, blockDataString, rowData);
-                }
-                else if ((rowType == Material.ARMOR_STAND)) {
-                    Location location1 = block.getLocation();
-                    location1.setX(location1.getX() + 0.50);
-                    location1.setZ(location1.getZ() + 0.50);
-                    location1.setYaw(rowData);
-                    boolean exists = false;
-
-                    for (Entity entity : block.getChunk().getEntities()) {
-                        if (entity instanceof ArmorStand) {
-                            if (entity.getLocation().getBlockX() == location1.getBlockX() && entity.getLocation().getBlockY() == location1.getBlockY() && entity.getLocation().getBlockZ() == location1.getBlockZ()) {
-                                exists = true;
-                            }
-                        }
-                    }
-
-                    if (!exists) {
-                        Entity entity = block.getLocation().getWorld().spawnEntity(location1, EntityType.ARMOR_STAND);
-                        PaperAdapter.ADAPTER.teleportAsync(entity, location1);
-                    }
-                }
-                else if ((rowType == Material.END_CRYSTAL)) {
-                    Location location1 = block.getLocation();
-                    location1.setX(location1.getX() + 0.50);
-                    location1.setZ(location1.getZ() + 0.50);
-                    boolean exists = false;
-
-                    for (Entity entity : block.getChunk().getEntities()) {
-                        if (entity instanceof EnderCrystal) {
-                            if (entity.getLocation().getBlockX() == location1.getBlockX() && entity.getLocation().getBlockY() == location1.getBlockY() && entity.getLocation().getBlockZ() == location1.getBlockZ()) {
-                                exists = true;
-                            }
-                        }
-                    }
-
-                    if (!exists) {
-                        Entity entity = block.getLocation().getWorld().spawnEntity(location1, BukkitAdapter.ADAPTER.getEntityType(Material.END_CRYSTAL));
-                        EnderCrystal enderCrystal = (EnderCrystal) entity;
-                        enderCrystal.setShowingBottom((rowData != 0));
-                        PaperAdapter.ADAPTER.teleportAsync(entity, location1);
-                    }
-                }
-                else if ((rowType == Material.AIR) && ((oldTypeMaterial == Material.WATER))) {
-                    if (pendingChangeData instanceof Waterlogged) {
-                        Waterlogged waterlogged = (Waterlogged) pendingChangeData;
-                        waterlogged.setWaterlogged(false);
-                        BlockUtils.prepareTypeAndData(chunkChanges, block, null, waterlogged, false);
-                    }
-                    else {
-                        BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, true);
-                    }
-
-                    return countBlock;
-                }
-                else if ((rowType == Material.AIR) && ((oldTypeMaterial == Material.SNOW))) {
-                    BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, true);
-                    return countBlock;
-                }
-                else if ((rowType == Material.AIR) && ((oldTypeMaterial == Material.END_CRYSTAL))) {
-                    for (Entity entity : block.getChunk().getEntities()) {
-                        if (entity instanceof EnderCrystal) {
-                            if (entity.getLocation().getBlockX() == rowX && entity.getLocation().getBlockY() == rowY && entity.getLocation().getBlockZ() == rowZ) {
-                                entity.remove();
-                            }
-                        }
-                    }
-                }
-                else if (rollbackType == 0 && rowAction == 0 && (rowType == Material.AIR)) {
-                    // broke block ID #0
-                }
-                else if ((rowType == Material.AIR) || (rowType == Material.TNT)) {
-                    if (clearInventories) {
-                        if (BlockGroup.CONTAINERS.contains(changeType)) {
-                            Inventory inventory = BlockUtils.getContainerInventory(block.getState(), false);
-                            if (inventory != null) {
-                                inventory.clear();
-                            }
-                        }
-                        else if (BlockGroup.CONTAINERS.contains(Material.ARMOR_STAND)) {
-                            if ((oldTypeMaterial == Material.ARMOR_STAND)) {
-                                for (Entity entity : block.getChunk().getEntities()) {
-                                    if (entity instanceof ArmorStand) {
-                                        Location entityLocation = entity.getLocation();
-                                        entityLocation.setY(entityLocation.getY() + 0.99);
-
-                                        if (entityLocation.getBlockX() == rowX && entityLocation.getBlockY() == rowY && entityLocation.getBlockZ() == rowZ) {
-                                            ItemUtils.getEntityEquipment((ArmorStand) entity).clear();
-
-                                            entityLocation.setY(entityLocation.getY() - 1.99);
-                                            PaperAdapter.ADAPTER.teleportAsync(entity, entityLocation);
-                                            entity.remove();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    boolean remove = true;
-                    if ((rowType == Material.AIR)) {
-                        if (pendingChangeData instanceof Waterlogged) {
-                            Waterlogged waterlogged = (Waterlogged) pendingChangeData;
-                            if (waterlogged.isWaterlogged()) {
-                                BlockUtils.prepareTypeAndData(chunkChanges, block, Material.WATER, Material.WATER.createBlockData(), true);
-                                remove = false;
-                            }
-                        }
-                        else if ((pendingChangeType == Material.WATER)) {
-                            if (rawBlockData instanceof Waterlogged) {
-                                Waterlogged waterlogged = (Waterlogged) rawBlockData;
-                                if (waterlogged.isWaterlogged()) {
-                                    remove = false;
-                                }
-                            }
-                        }
-                    }
-
-                    if (remove) {
-                        boolean physics = true;
-                        if ((changeType == Material.NETHER_PORTAL) || changeBlockData instanceof MultipleFacing || changeBlockData instanceof Snow || changeBlockData instanceof Stairs || changeBlockData instanceof RedstoneWire || changeBlockData instanceof Chest) {
-                            physics = true;
-                        }
-                        else if (changeBlockData instanceof Bisected && !(changeBlockData instanceof TrapDoor)) {
-                            Bisected bisected = (Bisected) changeBlockData;
-                            Location bisectLocation = block.getLocation().clone();
-                            if (bisected.getHalf() == Half.TOP) {
-                                bisectLocation.setY(bisectLocation.getY() - 1);
-                            }
-                            else {
-                                bisectLocation.setY(bisectLocation.getY() + 1);
-                            }
-
-                            int worldMaxHeight = bukkitWorld.getMaxHeight();
-                            int worldMinHeight = BukkitAdapter.ADAPTER.getMinHeight(bukkitWorld);
-                            if (bisectLocation.getBlockY() >= worldMinHeight && bisectLocation.getBlockY() < worldMaxHeight) {
-                                Block bisectBlock = block.getWorld().getBlockAt(bisectLocation);
-                                BlockUtils.prepareTypeAndData(chunkChanges, bisectBlock, rowType, null, false);
-
-                                if (countBlock) {
-                                    updateBlockCount(finalUserString, 1);
-                                }
-                            }
-                        }
-                        else if (changeBlockData instanceof Bed) {
-                            Bed bed = (Bed) changeBlockData;
-                            if (bed.getPart() == Part.FOOT) {
-                                Block adjacentBlock = block.getRelative(bed.getFacing());
-                                BlockUtils.prepareTypeAndData(chunkChanges, adjacentBlock, rowType, null, false);
-                            }
-                        }
-
-                        BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, null, physics);
-                    }
-
-                    return countBlock;
-                }
-                else if ((rowType == Material.SPAWNER)) {
-                    try {
-                        BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, false);
-                        CreatureSpawner mobSpawner = (CreatureSpawner) block.getState();
-                        mobSpawner.setSpawnedType(EntityUtils.getSpawnerType(rowData));
-                        mobSpawner.update();
-
-                        return countBlock;
-                    }
-                    catch (Exception e) {
-                        // e.printStackTrace();
-                    }
-                }
-                else if ((rowType == Material.SKELETON_SKULL) || (rowType == Material.SKELETON_WALL_SKULL) || (rowType == Material.WITHER_SKELETON_SKULL) || (rowType == Material.WITHER_SKELETON_WALL_SKULL) || (rowType == Material.ZOMBIE_HEAD) || (rowType == Material.ZOMBIE_WALL_HEAD) || (rowType == Material.PLAYER_HEAD) || (rowType == Material.PLAYER_WALL_HEAD) || (rowType == Material.CREEPER_HEAD) || (rowType == Material.CREEPER_WALL_HEAD) || (rowType == Material.DRAGON_HEAD) || (rowType == Material.DRAGON_WALL_HEAD)) { // skull
-                    BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, false);
-                    if (rowData > 0) {
-                        Queue.queueSkullUpdate(rowUser, block.getState(), rowData);
-                    }
-
-                    return countBlock;
-                }
-                else if (BukkitAdapter.ADAPTER.isSign(rowType)) {// sign
-                    BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, false);
-                    Queue.queueSignUpdate(rowUser, block.getState(), rollbackType, (Integer) row[1]);
-
-                    return countBlock;
-                }
-                else if (BlockGroup.SHULKER_BOXES.contains(rowType)) {
-                    BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, false);
-                    if (countBlock) {
-                        updateBlockCount(finalUserString, 1);
-                    }
-                    if (meta != null) {
-                        Inventory inventory = BlockUtils.getContainerInventory(block.getState(), false);
-                        for (Object value : meta) {
-                            ItemStack item = ItemUtils.unserializeItemStackLegacy(value);
-                            if (item != null) {
-                                RollbackUtil.modifyContainerItems(rowType, inventory, 0, item, 1);
-                            }
-                        }
-                    }
-                    return false;
-                }
-                else if (rowType == Material.COMMAND_BLOCK || rowType == Material.REPEATING_COMMAND_BLOCK || rowType == Material.CHAIN_COMMAND_BLOCK) { // command block
-                    BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, false);
-                    if (countBlock) {
-                        updateBlockCount(finalUserString, 1);
-                    }
-
-                    if (meta != null) {
-                        CommandBlock commandBlock = (CommandBlock) block.getState();
-                        for (Object value : meta) {
-                            if (value instanceof String) {
-                                String string = (String) value;
-                                commandBlock.setCommand(string);
-                                commandBlock.update();
-                            }
-                        }
-                    }
-                    return false;
-                }
-                else if ((rowType == Material.WATER)) {
-                    if (pendingChangeData instanceof Waterlogged) {
-                        Waterlogged waterlogged = (Waterlogged) pendingChangeData;
-                        waterlogged.setWaterlogged(true);
-                        BlockUtils.prepareTypeAndData(chunkChanges, block, null, waterlogged, false);
-                    }
-                    else {
-                        BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, false);
-                    }
-
-                    return countBlock;
-                }
-                else if ((rowType == Material.NETHER_PORTAL) && rowAction == 0) {
-                    BlockUtils.prepareTypeAndData(chunkChanges, block, Material.FIRE, null, true);
-                }
-                else if (blockData == null && rowData > 0 && (rowType == Material.IRON_DOOR || BlockGroup.DOORS.contains(rowType))) {
-                    if (countBlock) {
-                        updateBlockCount(finalUserString, 1);
-                    }
-
-                    block.setType(rowType, false);
-                    Door door = (Door) block.getBlockData();
-                    if (rowData >= 8) {
-                        door.setHalf(Half.TOP);
-                        rowData = rowData - 8;
-                    }
-                    else {
-                        door.setHalf(Half.BOTTOM);
-                    }
-                    if (rowData >= 4) {
-                        door.setHinge(Hinge.RIGHT);
-                        rowData = rowData - 4;
-                    }
-                    else {
-                        door.setHinge(Hinge.LEFT);
-                    }
-                    BlockFace face = BlockFace.NORTH;
-
-                    switch (rowData) {
-                        case 0:
-                            face = BlockFace.EAST;
-                            break;
-                        case 1:
-                            face = BlockFace.SOUTH;
-                            break;
-                        case 2:
-                            face = BlockFace.WEST;
-                            break;
-                    }
-
-                    door.setFacing(face);
-                    door.setOpen(false);
-                    block.setBlockData(door, false);
-                    return false;
-                }
-                else if (blockData == null && rowData > 0 && (rowType.name().endsWith("_BED"))) {
-                    if (countBlock) {
-                        updateBlockCount(finalUserString, 1);
-                    }
-
-                    block.setType(rowType, false);
-                    Bed bed = (Bed) block.getBlockData();
-                    BlockFace face = BlockFace.NORTH;
-
-                    if (rowData > 4) {
-                        bed.setPart(Part.HEAD);
-                        rowData = rowData - 4;
-                    }
-
-                    switch (rowData) {
-                        case 2:
-                            face = BlockFace.WEST;
-                            break;
-                        case 3:
-                            face = BlockFace.EAST;
-                            break;
-                        case 4:
-                            face = BlockFace.SOUTH;
-                            break;
-                    }
-
-                    bed.setFacing(face);
-                    block.setBlockData(bed, false);
-                    return false;
-                }
-                else if (rowType.name().endsWith("_BANNER")) {
-                    BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, false);
-                    if (countBlock) {
-                        updateBlockCount(finalUserString, 1);
-                    }
-
-                    if (meta != null) {
-                        Banner banner = (Banner) block.getState();
-
-                        for (Object value : meta) {
-                            if (value instanceof DyeColor) {
-                                banner.setBaseColor((DyeColor) value);
-                            }
-                            else if (value instanceof Map) {
-                                @SuppressWarnings("unchecked")
-                                Pattern pattern = new Pattern((Map<String, Object>) value);
-                                banner.addPattern(pattern);
-                            }
-                        }
-
-                        banner.update();
-                    }
-                    return false;
-                }
-                else if (rowType != changeType && (BlockGroup.CONTAINERS.contains(rowType) || BlockGroup.CONTAINERS.contains(changeType))) {
-                    block.setType(Material.AIR); // Clear existing container to prevent errors
-
-                    boolean isChest = (blockData instanceof Chest);
-                    BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, (isChest));
-                    if (isChest) {
-                        ChestTool.updateDoubleChest(block, blockData, false);
-                    }
-
-                    return countBlock;
-                }
-                else if (BlockGroup.UPDATE_STATE.contains(rowType) || rowType.name().contains("CANDLE")) {
-                    BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, true);
-                    ChestTool.updateDoubleChest(block, blockData, true);
-                    return countBlock;
-                }
-                else if (rowType != Material.AIR && rawBlockData instanceof Bisected && !(rawBlockData instanceof Stairs || rawBlockData instanceof TrapDoor)) {
-                    Bisected bisected = (Bisected) rawBlockData;
-                    Bisected bisectData = (Bisected) rawBlockData.clone();
-                    Location bisectLocation = block.getLocation().clone();
-                    if (bisected.getHalf() == Half.TOP) {
-                        bisectData.setHalf(Half.BOTTOM);
-                        bisectLocation.setY(bisectLocation.getY() - 1);
-                    }
-                    else {
-                        bisectData.setHalf(Half.TOP);
-                        bisectLocation.setY(bisectLocation.getY() + 1);
-                    }
-
-                    int worldMaxHeight = bukkitWorld.getMaxHeight();
-                    int worldMinHeight = BukkitAdapter.ADAPTER.getMinHeight(bukkitWorld);
-                    if (bisectLocation.getBlockY() >= worldMinHeight && bisectLocation.getBlockY() < worldMaxHeight) {
-                        Block bisectBlock = block.getWorld().getBlockAt(bisectLocation);
-                        BlockUtils.prepareTypeAndData(chunkChanges, bisectBlock, rowType, bisectData, false);
-                    }
-
-                    BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, false);
-                    if (countBlock) {
-                        updateBlockCount(finalUserString, 2);
-                    }
-                    return false;
-                }
-                else if (rowType != Material.AIR && rawBlockData instanceof Bed) {
-                    Bed bed = (Bed) rawBlockData;
-                    if (bed.getPart() == Part.FOOT) {
-                        Block adjacentBlock = block.getRelative(bed.getFacing());
-                        Bed bedData = (Bed) rawBlockData.clone();
-                        bedData.setPart(Part.HEAD);
-                        BlockUtils.prepareTypeAndData(chunkChanges, adjacentBlock, rowType, bedData, false);
-                        if (countBlock) {
-                            updateBlockCount(finalUserString, 1);
-                        }
-                    }
-
-                    BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, true);
-                    return countBlock;
-                }
-                else {
-                    boolean physics = true;
-                    /*
-                    if (blockData instanceof MultipleFacing || BukkitAdapter.ADAPTER.isWall(blockData) || blockData instanceof Snow || blockData instanceof Stairs || blockData instanceof RedstoneWire || blockData instanceof Chest) {
-                    physics = !(blockData instanceof Snow) || block.getY() <= BukkitAdapter.ADAPTER.getMinHeight(block.getWorld()) || (block.getWorld().getBlockAt(block.getX(), block.getY() - 1, block.getZ()).getType().equals(Material.GRASS_BLOCK));
-                    }
-                    */
-                    BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, physics);
-                    return countBlock;
-                }
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        if ((rowType != Material.AIR) && changeBlock) {
-            if (rowUser.length() > 0) {
-                CacheHandler.lookupCache.put(rowX + "." + rowY + "." + rowZ + "." + rowWorldId, new Object[] { unixtimestamp, rowUser, rowType });
-            }
-        }
-
-        return countBlock;
-    }
-
-    /**
-     * Update the block count in the rollback hash
-     * 
-     * @param userString
-     *            The username for this rollback
-     * @param increment
-     *            The amount to increment the block count by
-     */
-    protected static void updateBlockCount(String userString, int increment) {
-        int[] rollbackHashData = ConfigHandler.rollbackHash.get(userString);
-        int itemCount = rollbackHashData[0];
-        int blockCount = rollbackHashData[1];
-        int entityCount = rollbackHashData[2];
-        int scannedWorlds = rollbackHashData[4];
-
-        blockCount += increment;
-        ConfigHandler.rollbackHash.put(userString, new int[] { itemCount, blockCount, entityCount, 0, scannedWorlds });
-    }
-
-    /**
-     * Apply all pending block changes to the world
-     * 
-     * @param chunkChanges
-     *            Map of blocks to change
-     * @param preview
-     *            Whether this is a preview
-     * @param user
-     *            The user performing the rollback
-     */
-    public static void applyBlockChanges(Map<Block, BlockData> chunkChanges, int preview, Player user) {
-        for (Entry<Block, BlockData> chunkChange : chunkChanges.entrySet()) {
-            Block changeBlock = chunkChange.getKey();
-            BlockData changeBlockData = chunkChange.getValue();
-            if (preview > 0 && user != null) {
-                Util.sendBlockChange(user, changeBlock.getLocation(), changeBlockData);
-            }
-            else {
-                BlockUtils.setTypeAndData(changeBlock, null, changeBlockData, true);
-            }
-        }
-        chunkChanges.clear();
-    }
-}

src/main/java/net/coreprotect/database/rollback/RollbackEntityHandler.java

@@ -1,201 +0,0 @@
-package net.coreprotect.database.rollback;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-
-import net.coreprotect.config.ConfigHandler;
-import net.coreprotect.thread.CacheHandler;
-import net.coreprotect.utility.EntityUtils;
-import net.coreprotect.utility.WorldUtils;
-
-public class RollbackEntityHandler {
-
-    /**
-     * Processes an entity-related rollback operation.
-     *
-     * @param row
-     *            The database row containing entity data (used only for specific operations)
-     * @param rollbackType
-     *            The type of rollback (0 for rollback, 1 for restore)
-     * @param finalUserString
-     *            The user string for tracking operations
-     * @param rowTypeRaw
-     *            The raw type value
-     * @param rowData
-     *            The data value
-     * @param rowAction
-     *            The action value
-     * @param rowRolledBack
-     *            Whether the entity was already rolled back
-     * @param rowX
-     *            The X coordinate
-     * @param rowY
-     *            The Y coordinate
-     * @param rowZ
-     *            The Z coordinate
-     * @param rowWorldId
-     *            The world ID
-     * @param rowUserId
-     *            The user ID
-     * @param rowUser
-     *            The username associated with this entity change
-     * @return The number of entities affected (1 if successful, 0 otherwise)
-     */
-    public static int processEntity(Object[] row, int rollbackType, String finalUserString, int oldTypeRaw, int rowTypeRaw, int rowData, int rowAction, int rowRolledBack, int rowX, int rowY, int rowZ, int rowWorldId, int rowUserId, String rowUser) {
-        try {
-            // Entity kill
-            if (rowAction == 3) {
-                String world = getWorldName(rowWorldId);
-                if (world.isEmpty()) {
-                    return 0;
-                }
-
-                World bukkitWorld = Bukkit.getServer().getWorld(world);
-                if (bukkitWorld == null) {
-                    return 0;
-                }
-
-                Block block = bukkitWorld.getBlockAt(rowX, rowY, rowZ);
-                if (!bukkitWorld.isChunkLoaded(block.getChunk())) {
-                    bukkitWorld.getChunkAt(block.getLocation());
-                }
-
-                if (rowTypeRaw > 0) {
-                    // Spawn in entity
-                    if (rowRolledBack == 0) {
-                        EntityType entityType = EntityUtils.getEntityType(rowTypeRaw);
-                        // Use the spawnEntity method from the RollbackUtil class instead of Queue
-                        spawnEntity(rowUser, block.getState(), entityType, rowData);
-                        updateEntityCount(finalUserString, 1);
-                        return 1;
-                    }
-                }
-                else if (rowTypeRaw <= 0) {
-                    // Attempt to remove entity
-                    if (rowRolledBack == 1) {
-                        boolean removed = false;
-                        int entityId = -1;
-                        String entityName = EntityUtils.getEntityType(oldTypeRaw).name();
-                        String token = "" + rowX + "." + rowY + "." + rowZ + "." + rowWorldId + "." + entityName + "";
-                        Object[] cachedEntity = CacheHandler.entityCache.get(token);
-
-                        if (cachedEntity != null) {
-                            entityId = (Integer) cachedEntity[1];
-                        }
-
-                        int xmin = rowX - 5;
-                        int xmax = rowX + 5;
-                        int ymin = rowY - 1;
-                        int ymax = rowY + 1;
-                        int zmin = rowZ - 5;
-                        int zmax = rowZ + 5;
-
-                        for (Entity entity : block.getChunk().getEntities()) {
-                            if (entityId > -1) {
-                                int id = entity.getEntityId();
-                                if (id == entityId) {
-                                    updateEntityCount(finalUserString, 1);
-                                    removed = true;
-                                    entity.remove();
-                                    break;
-                                }
-                            }
-                            else {
-                                if (entity.getType().equals(EntityUtils.getEntityType(oldTypeRaw))) {
-                                    Location entityLocation = entity.getLocation();
-                                    int entityx = entityLocation.getBlockX();
-                                    int entityY = entityLocation.getBlockY();
-                                    int entityZ = entityLocation.getBlockZ();
-
-                                    if (entityx >= xmin && entityx <= xmax && entityY >= ymin && entityY <= ymax && entityZ >= zmin && entityZ <= zmax) {
-                                        updateEntityCount(finalUserString, 1);
-                                        removed = true;
-                                        entity.remove();
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-
-                        if (!removed && entityId > -1) {
-                            for (Entity entity : block.getWorld().getLivingEntities()) {
-                                int id = entity.getEntityId();
-                                if (id == entityId) {
-                                    updateEntityCount(finalUserString, 1);
-                                    removed = true;
-                                    entity.remove();
-                                    break;
-                                }
-                            }
-                        }
-
-                        if (removed) {
-                            return 1;
-                        }
-                    }
-                }
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return 0;
-    }
-
-    /**
-     * Gets the world name from a world ID.
-     *
-     * @param worldId
-     *            The world ID
-     * @return The world name
-     */
-    private static String getWorldName(int worldId) {
-        return WorldUtils.getWorldName(worldId);
-    }
-
-    /**
-     * Updates the entity count in the rollback hash for a specific user.
-     *
-     * @param userString
-     *            The user string identifier
-     * @param increment
-     *            The amount to increment the entity count by
-     */
-    public static void updateEntityCount(String userString, int increment) {
-        int[] rollbackHashData = ConfigHandler.rollbackHash.get(userString);
-        if (rollbackHashData != null) {
-            int itemCount = rollbackHashData[0];
-            int blockCount = rollbackHashData[1];
-            int entityCount = rollbackHashData[2];
-            int next = rollbackHashData[3];
-            int scannedWorlds = rollbackHashData[4];
-
-            entityCount += increment;
-
-            ConfigHandler.rollbackHash.put(userString, new int[] { itemCount, blockCount, entityCount, next, scannedWorlds });
-        }
-    }
-
-    /**
-     * Spawns an entity at the given block location.
-     * 
-     * @param user
-     *            The username of the player
-     * @param block
-     *            The block state where the entity should be spawned
-     * @param type
-     *            The type of entity to spawn
-     * @param data
-     *            Additional data for the entity
-     */
-    public static void spawnEntity(String user, BlockState block, EntityType type, int data) {
-        // Create a new helper method that will delegate to Queue
-        RollbackUtil.queueEntitySpawn(user, block, type, data);
-    }
-}

src/main/java/net/coreprotect/database/rollback/RollbackItemHandler.java

@@ -1,113 +0,0 @@
-package net.coreprotect.database.rollback;
-
-import java.io.ByteArrayInputStream;
-import java.util.List;
-
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-import org.bukkit.util.io.BukkitObjectInputStream;
-
-import net.coreprotect.config.ConfigHandler;
-
-public class RollbackItemHandler {
-
-    /**
-     * Populates an ItemStack with metadata from the database
-     * 
-     * @param itemstack
-     *            The ItemStack to populate
-     * @param metadata
-     *            The metadata as a byte array
-     * @return Object array containing [slot, facing, itemstack]
-     */
-    public static Object[] populateItemStack(ItemStack itemstack, byte[] metadata) {
-        if (metadata != null) {
-            try {
-                ByteArrayInputStream metaByteStream = new ByteArrayInputStream(metadata);
-                BukkitObjectInputStream metaObjectStream = new BukkitObjectInputStream(metaByteStream);
-                Object metaList = metaObjectStream.readObject();
-                metaObjectStream.close();
-                metaByteStream.close();
-
-                return RollbackUtil.populateItemStack(itemstack, metaList);
-            }
-            catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        return new Object[] { 0, "", itemstack };
-    }
-
-    /**
-     * Sorts inventory items for better display
-     * 
-     * @param inventory
-     *            The inventory to sort
-     * @param slots
-     *            The slots to sort
-     */
-    public static void sortContainerItems(PlayerInventory inventory, List<Integer> slots) {
-        if (slots.contains(0)) {
-            ItemStack boots = inventory.getBoots();
-            if (boots != null && !boots.getType().equals(Material.AIR)) {
-                if (!boots.getType().name().contains("BOOTS")) {
-                    inventory.setBoots(new ItemStack(Material.AIR));
-                    inventory.addItem(boots);
-                }
-            }
-        }
-
-        if (slots.contains(1)) {
-            ItemStack leggings = inventory.getLeggings();
-            if (leggings != null && !leggings.getType().equals(Material.AIR)) {
-                if (!leggings.getType().name().contains("LEGGINGS")) {
-                    inventory.setLeggings(new ItemStack(Material.AIR));
-                    inventory.addItem(leggings);
-                }
-            }
-        }
-
-        if (slots.contains(2)) {
-            ItemStack chestplate = inventory.getChestplate();
-            if (chestplate != null && !chestplate.getType().equals(Material.AIR)) {
-                if (!chestplate.getType().name().contains("CHESTPLATE")) {
-                    inventory.setChestplate(new ItemStack(Material.AIR));
-                    inventory.addItem(chestplate);
-                }
-            }
-        }
-
-        if (slots.contains(3)) {
-            ItemStack helmet = inventory.getHelmet();
-            if (helmet != null && !helmet.getType().equals(Material.AIR)) {
-                String materialName = helmet.getType().name();
-                if (!materialName.contains("HELMET") && !materialName.contains("SKULL") && !materialName.endsWith("_HEAD")) {
-                    inventory.setHelmet(new ItemStack(Material.AIR));
-                    inventory.addItem(helmet);
-                }
-            }
-        }
-    }
-
-    /**
-     * Update the item count in the rollback hash
-     * 
-     * @param userString
-     *            The username for this rollback
-     * @param increment
-     *            The amount to increment the item count by
-     */
-    public static void updateItemCount(String userString, int increment) {
-        int[] rollbackHashData = ConfigHandler.rollbackHash.get(userString);
-        int itemCount = rollbackHashData[0];
-        int blockCount = rollbackHashData[1];
-        int entityCount = rollbackHashData[2];
-        int scannedWorlds = rollbackHashData[4];
-
-        itemCount += increment;
-        ConfigHandler.rollbackHash.put(userString, new int[] { itemCount, blockCount, entityCount, 0, scannedWorlds });
-    }
-
-}

src/main/java/net/coreprotect/database/rollback/RollbackProcessor.java

@@ -1,453 +0,0 @@
-package net.coreprotect.database.rollback;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Jukebox;
-import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.ItemFrame;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import net.coreprotect.bukkit.BukkitAdapter;
-import net.coreprotect.config.Config;
-import net.coreprotect.config.ConfigHandler;
-import net.coreprotect.database.logger.ItemLogger;
-import net.coreprotect.model.BlockGroup;
-import net.coreprotect.utility.BlockUtils;
-import net.coreprotect.utility.ItemUtils;
-import net.coreprotect.utility.MaterialUtils;
-import net.coreprotect.utility.Teleport;
-import net.coreprotect.utility.WorldUtils;
-
-public class RollbackProcessor {
-
-    /**
-     * Process data for a specific chunk
-     * 
-     * @param finalChunkX
-     *            The chunk X coordinate
-     * @param finalChunkZ
-     *            The chunk Z coordinate
-     * @param chunkKey
-     *            The chunk lookup key
-     * @param blockList
-     *            The list of block data to process
-     * @param itemList
-     *            The list of item data to process
-     * @param rollbackType
-     *            The rollback type (0=rollback, 1=restore)
-     * @param preview
-     *            Whether this is a preview (0=no, 1=yes-non-destructive, 2=yes-destructive)
-     * @param finalUserString
-     *            The username performing the rollback
-     * @param finalUser
-     *            The user performing the rollback
-     * @param bukkitRollbackWorld
-     *            The world to process
-     * @return True if successful, false if there was an error
-     */
-    public static boolean processChunk(int finalChunkX, int finalChunkZ, long chunkKey, ArrayList<Object[]> blockList, ArrayList<Object[]> itemList, int rollbackType, int preview, String finalUserString, Player finalUser, World bukkitRollbackWorld, boolean inventoryRollback) {
-        try {
-            boolean clearInventories = Config.getGlobal().ROLLBACK_ITEMS;
-            ArrayList<Object[]> data = blockList != null ? blockList : new ArrayList<>();
-            ArrayList<Object[]> itemData = itemList != null ? itemList : new ArrayList<>();
-            Map<Block, BlockData> chunkChanges = new LinkedHashMap<>();
-
-            // Process blocks
-            for (Object[] row : data) {
-                int[] rollbackHashData = ConfigHandler.rollbackHash.get(finalUserString);
-                int itemCount = rollbackHashData[0];
-                int blockCount = rollbackHashData[1];
-                int entityCount = rollbackHashData[2];
-                int scannedWorlds = rollbackHashData[4];
-
-                int rowX = (Integer) row[3];
-                int rowY = (Integer) row[4];
-                int rowZ = (Integer) row[5];
-                int rowTypeRaw = (Integer) row[6];
-                int rowData = (Integer) row[7];
-                int rowAction = (Integer) row[8];
-                int rowRolledBack = MaterialUtils.rolledBack((Integer) row[9], false);
-                int rowWorldId = (Integer) row[10];
-                byte[] rowMeta = (byte[]) row[12];
-                byte[] rowBlockData = (byte[]) row[13];
-                String blockDataString = BlockUtils.byteDataToString(rowBlockData, rowTypeRaw);
-                Material rowType = MaterialUtils.getType(rowTypeRaw);
-
-                List<Object> meta = null;
-                if (rowMeta != null) {
-                    meta = RollbackUtil.deserializeMetadata(rowMeta);
-                }
-
-                BlockData blockData = null;
-                if (blockDataString != null && blockDataString.contains(":")) {
-                    try {
-                        blockData = Bukkit.getServer().createBlockData(blockDataString);
-                    }
-                    catch (Exception e) {
-                        // corrupt BlockData, let the server automatically set the BlockData instead
-                    }
-                }
-
-                BlockData rawBlockData = null;
-                if (blockData != null) {
-                    rawBlockData = blockData.clone();
-                }
-                if (rawBlockData == null && rowType != null && rowType.isBlock()) {
-                    rawBlockData = BlockUtils.createBlockData(rowType);
-                }
-
-                String rowUser = ConfigHandler.playerIdCacheReversed.get((Integer) row[2]);
-                int oldTypeRaw = rowTypeRaw;
-                Material oldTypeMaterial = MaterialUtils.getType(oldTypeRaw);
-
-                if (rowAction == 1 && rollbackType == 0) { // block placement
-                    rowType = Material.AIR;
-                    blockData = null;
-                    rowTypeRaw = 0;
-                }
-                else if (rowAction == 0 && rollbackType == 1) { // block removal
-                    rowType = Material.AIR;
-                    blockData = null;
-                    rowTypeRaw = 0;
-                }
-                else if (rowAction == 4 && rollbackType == 0) { // entity placement
-                    rowType = null;
-                    rowTypeRaw = 0;
-                }
-                else if (rowAction == 3 && rollbackType == 1) { // entity removal
-                    rowType = null;
-                    rowTypeRaw = 0;
-                }
-                if (preview > 0) {
-                    if (rowAction != 3) { // entity kill
-                        String world = WorldUtils.getWorldName(rowWorldId);
-                        if (world.length() == 0) {
-                            continue;
-                        }
-
-                        World bukkitWorld = Bukkit.getServer().getWorld(world);
-                        if (bukkitWorld == null) {
-                            continue;
-                        }
-
-                        Block block = new Location(bukkitWorld, rowX, rowY, rowZ).getBlock();
-                        if (preview == 2) {
-                            Material blockType = block.getType();
-                            if (!BukkitAdapter.ADAPTER.isItemFrame(blockType) && !blockType.equals(Material.PAINTING) && !blockType.equals(Material.ARMOR_STAND) && !blockType.equals(Material.END_CRYSTAL)) {
-                                BlockUtils.prepareTypeAndData(chunkChanges, block, blockType, block.getBlockData(), true);
-                                blockCount++;
-                            }
-                        }
-                        else {
-                            if ((!BukkitAdapter.ADAPTER.isItemFrame(rowType)) && (rowType != Material.PAINTING) && (rowType != Material.ARMOR_STAND) && (rowType != Material.END_CRYSTAL)) {
-                                BlockUtils.prepareTypeAndData(chunkChanges, block, rowType, blockData, true);
-                                blockCount++;
-                            }
-                        }
-                    }
-                    else {
-                        entityCount++;
-                    }
-                }
-                else if (rowAction == 3) { // entity kill
-                    entityCount += RollbackEntityHandler.processEntity(row, rollbackType, finalUserString, oldTypeRaw, rowTypeRaw, rowData, rowAction, MaterialUtils.rolledBack((Integer) row[9], false), rowX, rowY, rowZ, rowWorldId, (Integer) row[2], rowUser);
-                }
-                else {
-                    String world = WorldUtils.getWorldName(rowWorldId);
-                    if (world.length() == 0) {
-                        continue;
-                    }
-
-                    World bukkitWorld = Bukkit.getServer().getWorld(world);
-                    if (bukkitWorld == null) {
-                        continue;
-                    }
-
-                    Block block = bukkitWorld.getBlockAt(rowX, rowY, rowZ);
-                    if (!bukkitWorld.isChunkLoaded(block.getChunk())) {
-                        bukkitWorld.getChunkAt(block.getLocation());
-                    }
-
-                    boolean changeBlock = true;
-                    boolean countBlock = true;
-                    Material changeType = block.getType();
-                    BlockData changeBlockData = block.getBlockData();
-                    BlockData pendingChangeData = chunkChanges.get(block);
-                    Material pendingChangeType = changeType;
-
-                    if (pendingChangeData != null) {
-                        pendingChangeType = pendingChangeData.getMaterial();
-                    }
-                    else {
-                        pendingChangeData = changeBlockData;
-                    }
-
-                    if (rowRolledBack == 1 && rollbackType == 0) { // rollback
-                        countBlock = false;
-                    }
-
-                    if ((rowType == pendingChangeType) && ((!BukkitAdapter.ADAPTER.isItemFrame(oldTypeMaterial)) && (oldTypeMaterial != Material.PAINTING) && (oldTypeMaterial != Material.ARMOR_STAND)) && (oldTypeMaterial != Material.END_CRYSTAL)) {
-                        // block is already changed!
-                        BlockData checkData = rowType == Material.AIR ? blockData : rawBlockData;
-                        if (checkData != null) {
-                            if (checkData.getAsString().equals(pendingChangeData.getAsString()) || checkData instanceof org.bukkit.block.data.MultipleFacing || checkData instanceof org.bukkit.block.data.type.Stairs || checkData instanceof org.bukkit.block.data.type.RedstoneWire) {
-                                if (rowType != Material.CHEST && rowType != Material.TRAPPED_CHEST && !BukkitAdapter.ADAPTER.isCopperChest(rowType)) { // always update double chests
-                                    changeBlock = false;
-                                }
-                            }
-                        }
-                        else if (rowType == Material.AIR) {
-                            changeBlock = false;
-                        }
-
-                        countBlock = false;
-                    }
-                    else if ((pendingChangeType != Material.AIR) && (pendingChangeType != Material.CAVE_AIR)) {
-                        countBlock = true;
-                    }
-
-                    if ((pendingChangeType == Material.WATER) && (rowType != Material.AIR) && (rowType != Material.CAVE_AIR) && blockData != null) {
-                        if (blockData instanceof org.bukkit.block.data.Waterlogged) {
-                            if (Material.WATER.createBlockData().equals(block.getBlockData())) {
-                                org.bukkit.block.data.Waterlogged waterlogged = (org.bukkit.block.data.Waterlogged) blockData;
-                                waterlogged.setWaterlogged(true);
-                            }
-                        }
-                    }
-
-                    if (RollbackBlockHandler.processBlockChange(bukkitWorld, block, row, rollbackType, clearInventories, chunkChanges, countBlock, oldTypeMaterial, pendingChangeType, pendingChangeData, finalUserString, rawBlockData, changeType, changeBlock, changeBlockData, meta != null ? new ArrayList<>(meta) : null, blockData, rowUser, rowType, rowX, rowY, rowZ, rowTypeRaw, rowData, rowAction, rowWorldId, BlockUtils.byteDataToString((byte[]) row[13], rowTypeRaw)) && countBlock) {
-                        blockCount++;
-                    }
-                }
-
-                ConfigHandler.rollbackHash.put(finalUserString, new int[] { itemCount, blockCount, entityCount, 0, scannedWorlds });
-            }
-            data.clear();
-
-            // Apply cached block changes
-            RollbackBlockHandler.applyBlockChanges(chunkChanges, preview, finalUser instanceof Player ? (Player) finalUser : null);
-
-            // Process container items
-            Map<Player, List<Integer>> sortPlayers = new HashMap<>();
-            Object container = null;
-            Material containerType = null;
-            boolean containerInit = false;
-            int lastX = 0;
-            int lastY = 0;
-            int lastZ = 0;
-            int lastWorldId = 0;
-            String lastFace = "";
-
-            for (Object[] row : itemData) {
-                int[] rollbackHashData1 = ConfigHandler.rollbackHash.get(finalUserString);
-                int itemCount1 = rollbackHashData1[0];
-                int blockCount1 = rollbackHashData1[1];
-                int entityCount1 = rollbackHashData1[2];
-                int scannedWorlds = rollbackHashData1[4];
-                int rowX = (Integer) row[3];
-                int rowY = (Integer) row[4];
-                int rowZ = (Integer) row[5];
-                int rowTypeRaw = (Integer) row[6];
-                int rowData = (Integer) row[7];
-                int rowAction = (Integer) row[8];
-                int rowRolledBack = MaterialUtils.rolledBack((Integer) row[9], false);
-                int rowWorldId = (Integer) row[10];
-                int rowAmount = (Integer) row[11];
-                byte[] rowMetadata = (byte[]) row[12];
-                Material rowType = MaterialUtils.getType(rowTypeRaw);
-
-                int rolledBackInventory = MaterialUtils.rolledBack((Integer) row[9], true);
-                if (rowType != null) {
-                    if (inventoryRollback && ((rollbackType == 0 && rolledBackInventory == 0) || (rollbackType == 1 && rolledBackInventory == 1))) {
-                        Material inventoryItem = ItemUtils.itemFilter(rowType, ((Integer) row[14] == 0));
-                        int rowUserId = (Integer) row[2];
-                        String rowUser = ConfigHandler.playerIdCacheReversed.get(rowUserId);
-                        if (rowUser == null) {
-                            continue;
-                        }
-
-                        String uuid = ConfigHandler.uuidCache.get(rowUser.toLowerCase(Locale.ROOT));
-                        if (uuid == null) {
-                            continue;
-                        }
-
-                        Player player = Bukkit.getServer().getPlayer(UUID.fromString(uuid));
-                        if (player == null) {
-                            continue;
-                        }
-
-                        int inventoryAction = 0;
-                        if (rowAction == ItemLogger.ITEM_DROP || rowAction == ItemLogger.ITEM_PICKUP || rowAction == ItemLogger.ITEM_THROW || rowAction == ItemLogger.ITEM_SHOOT || rowAction == ItemLogger.ITEM_BREAK || rowAction == ItemLogger.ITEM_DESTROY || rowAction == ItemLogger.ITEM_CREATE || rowAction == ItemLogger.ITEM_SELL || rowAction == ItemLogger.ITEM_BUY) {
-                            inventoryAction = ((rowAction == ItemLogger.ITEM_PICKUP || rowAction == ItemLogger.ITEM_CREATE || rowAction == ItemLogger.ITEM_BUY) ? 1 : 0);
-                        }
-                        else if (rowAction == ItemLogger.ITEM_REMOVE_ENDER || rowAction == ItemLogger.ITEM_ADD_ENDER) {
-                            inventoryAction = (rowAction == ItemLogger.ITEM_REMOVE_ENDER ? 1 : 0);
-                        }
-                        else {
-                            inventoryAction = (rowAction == ItemLogger.ITEM_REMOVE ? 1 : 0);
-                        }
-
-                        int action = rollbackType == 0 ? (inventoryAction ^ 1) : inventoryAction;
-                        ItemStack itemstack = new ItemStack(inventoryItem, rowAmount);
-                        Object[] populatedStack = RollbackItemHandler.populateItemStack(itemstack, rowMetadata);
-                        if (rowAction == ItemLogger.ITEM_REMOVE_ENDER || rowAction == ItemLogger.ITEM_ADD_ENDER) {
-                            RollbackUtil.modifyContainerItems(containerType, player.getEnderChest(), (Integer) populatedStack[0], ((ItemStack) populatedStack[2]).clone(), action ^ 1);
-                        }
-                        int modifiedArmor = RollbackUtil.modifyContainerItems(containerType, player.getInventory(), (Integer) populatedStack[0], (ItemStack) populatedStack[2], action);
-                        if (modifiedArmor > -1) {
-                            List<Integer> currentSortList = sortPlayers.getOrDefault(player, new ArrayList<>());
-                            if (!currentSortList.contains(modifiedArmor)) {
-                                currentSortList.add(modifiedArmor);
-                            }
-                            sortPlayers.put(player, currentSortList);
-                        }
-
-                        itemCount1 = itemCount1 + rowAmount;
-                        ConfigHandler.rollbackHash.put(finalUserString, new int[] { itemCount1, blockCount1, entityCount1, 0, scannedWorlds });
-                        continue; // remove this for merged rollbacks in future? (be sure to re-enable chunk sorting)
-                    }
-
-                    if (inventoryRollback || rowAction > 1) {
-                        continue; // skip inventory & ender chest transactions
-                    }
-
-                    if ((rollbackType == 0 && rowRolledBack == 0) || (rollbackType == 1 && rowRolledBack == 1)) {
-                        ItemStack itemstack = new ItemStack(rowType, rowAmount);
-                        Object[] populatedStack = RollbackItemHandler.populateItemStack(itemstack, rowMetadata);
-                        String faceData = (String) populatedStack[1];
-
-                        if (!containerInit || rowX != lastX || rowY != lastY || rowZ != lastZ || rowWorldId != lastWorldId || !faceData.equals(lastFace)) {
-                            container = null; // container patch 2.14.0
-                            String world = WorldUtils.getWorldName(rowWorldId);
-                            if (world.length() == 0) {
-                                continue;
-                            }
-
-                            World bukkitWorld = Bukkit.getServer().getWorld(world);
-                            if (bukkitWorld == null) {
-                                continue;
-                            }
-                            Block block = bukkitWorld.getBlockAt(rowX, rowY, rowZ);
-                            if (!bukkitWorld.isChunkLoaded(block.getChunk())) {
-                                bukkitWorld.getChunkAt(block.getLocation());
-                            }
-
-                            if (BlockGroup.CONTAINERS.contains(block.getType())) {
-                                BlockState blockState = block.getState();
-                                if (blockState instanceof Jukebox) {
-                                    container = blockState;
-                                }
-                                else {
-                                    container = BlockUtils.getContainerInventory(blockState, false);
-                                }
-
-                                containerType = block.getType();
-                            }
-                            else if (BlockGroup.CONTAINERS.contains(Material.ARMOR_STAND) || BlockGroup.CONTAINERS.contains(Material.ITEM_FRAME)) {
-                                for (Entity entity : block.getChunk().getEntities()) {
-                                    if (entity.getLocation().getBlockX() == rowX && entity.getLocation().getBlockY() == rowY && entity.getLocation().getBlockZ() == rowZ) {
-                                        if (entity instanceof ArmorStand) {
-                                            container = ItemUtils.getEntityEquipment((LivingEntity) entity);
-                                            containerType = Material.ARMOR_STAND;
-                                        }
-                                        else if (entity instanceof ItemFrame) {
-                                            container = entity;
-                                            containerType = Material.ITEM_FRAME;
-                                            if (faceData.length() > 0 && (BlockFace.valueOf(faceData) == ((ItemFrame) entity).getFacing())) {
-                                                break;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-
-                            lastX = rowX;
-                            lastY = rowY;
-                            lastZ = rowZ;
-                            lastWorldId = rowWorldId;
-                            lastFace = faceData;
-                        }
-
-                        if (container != null) {
-                            int action = 0;
-                            if (rollbackType == 0 && rowAction == 0) {
-                                action = 1;
-                            }
-
-                            if (rollbackType == 1 && rowAction == 1) {
-                                action = 1;
-                            }
-
-                            int slot = (Integer) populatedStack[0];
-                            itemstack = (ItemStack) populatedStack[2];
-
-                            RollbackUtil.modifyContainerItems(containerType, container, slot, itemstack, action);
-                            itemCount1 = itemCount1 + rowAmount;
-                        }
-                        containerInit = true;
-                    }
-                }
-
-                ConfigHandler.rollbackHash.put(finalUserString, new int[] { itemCount1, blockCount1, entityCount1, 0, scannedWorlds });
-            }
-            itemData.clear();
-
-            for (Entry<Player, List<Integer>> sortEntry : sortPlayers.entrySet()) {
-                RollbackItemHandler.sortContainerItems(sortEntry.getKey().getInventory(), sortEntry.getValue());
-            }
-            sortPlayers.clear();
-
-            int[] rollbackHashData = ConfigHandler.rollbackHash.get(finalUserString);
-            int itemCount = rollbackHashData[0];
-            int blockCount = rollbackHashData[1];
-            int entityCount = rollbackHashData[2];
-            int scannedWorlds = rollbackHashData[4];
-            ConfigHandler.rollbackHash.put(finalUserString, new int[] { itemCount, blockCount, entityCount, 1, (scannedWorlds + 1) });
-
-            // Teleport players out of danger if they're within this chunk
-            if (preview == 0) {
-                for (Player player : Bukkit.getOnlinePlayers()) {
-                    Location playerLocation = player.getLocation();
-                    String playerWorld = playerLocation.getWorld().getName();
-                    int chunkX = playerLocation.getBlockX() >> 4;
-                    int chunkZ = playerLocation.getBlockZ() >> 4;
-
-                    if (bukkitRollbackWorld.getName().equals(playerWorld) && chunkX == finalChunkX && chunkZ == finalChunkZ) {
-                        Teleport.performSafeTeleport(player, playerLocation, false);
-                    }
-                }
-            }
-
-            return true;
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-            int[] rollbackHashData = ConfigHandler.rollbackHash.get(finalUserString);
-            int itemCount = rollbackHashData[0];
-            int blockCount = rollbackHashData[1];
-            int entityCount = rollbackHashData[2];
-            int scannedWorlds = rollbackHashData[4];
-
-            ConfigHandler.rollbackHash.put(finalUserString, new int[] { itemCount, blockCount, entityCount, 2, (scannedWorlds + 1) });
-            return false;
-        }
-    }
-}

src/main/java/net/coreprotect/database/rollback/RollbackUtil.java

@@ -7,14 +7,13 @@ import java.util.Map;
 import org.bukkit.FireworkEffect;
 import org.bukkit.FireworkEffect.Builder;
 import org.bukkit.Material;
+import org.bukkit.Tag;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeModifier;
-import org.bukkit.block.BlockState;
 import org.bukkit.block.Jukebox;
 import org.bukkit.block.ShulkerBox;
 import org.bukkit.block.banner.Pattern;
 import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.Inventory;
@@ -34,10 +33,9 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.util.io.BukkitObjectInputStream;
 
 import net.coreprotect.bukkit.BukkitAdapter;
-import net.coreprotect.consumer.Queue;
 import net.coreprotect.database.Lookup;
 import net.coreprotect.model.BlockGroup;
-import net.coreprotect.utility.ItemUtils;
+import net.coreprotect.utility.Util;
 
 public class RollbackUtil extends Lookup {
 
@@ -95,7 +93,7 @@ public class RollbackUtil extends Lookup {
             else if (type != null && type.equals(Material.JUKEBOX)) {
                 Jukebox jukebox = (Jukebox) container;
                 if (jukebox != null) {
-                    if (action == 1 && itemstack.getType().name().startsWith("MUSIC_DISC")) {
+                    if (action == 1 && Tag.ITEMS_MUSIC_DISCS.isTagged(itemstack.getType())) {
                         itemstack.setAmount(1);
                     }
                     else {
@@ -119,7 +117,7 @@ public class RollbackUtil extends Lookup {
                         while (count < amount) {
                             boolean addedItem = false;
                             if (isPlayerInventory) {
-                                int setArmor = ItemUtils.setPlayerArmor((PlayerInventory) inventory, itemstack);
+                                int setArmor = Util.setPlayerArmor((PlayerInventory) inventory, itemstack);
                                 addedItem = (setArmor > -1);
                                 modifiedArmor = addedItem ? setArmor : modifiedArmor;
                             }
@@ -306,7 +304,7 @@ public class RollbackUtil extends Lookup {
                     BlockStateMeta meta = (BlockStateMeta) itemstack.getItemMeta();
                     ShulkerBox shulkerBox = (ShulkerBox) meta.getBlockState();
                     for (Object value : metaList) {
-                        ItemStack item = ItemUtils.unserializeItemStackLegacy(value);
+                        ItemStack item = Util.unserializeItemStackLegacy(value);
                         if (item != null) {
                             shulkerBox.getInventory().addItem(item);
                         }
@@ -349,17 +347,10 @@ public class RollbackUtil extends Lookup {
                     List<Object> modifiers = (List<Object>) mapData.get("modifiers");
 
                     for (Object item : modifiers) {
-                        Map<Object, Map<String, Object>> modifiersMap = (Map<Object, Map<String, Object>>) item;
-                        for (Map.Entry<Object, Map<String, Object>> entry : modifiersMap.entrySet()) {
+                        Map<Attribute, Map<String, Object>> modifiersMap = (Map<Attribute, Map<String, Object>>) item;
+                        for (Map.Entry<Attribute, Map<String, Object>> entry : modifiersMap.entrySet()) {
                             try {
-                                Attribute attribute = null;
-                                if (entry.getKey() instanceof Attribute) {
-                                    attribute = (Attribute) entry.getKey();
-                                }
-                                else {
-                                    attribute = (Attribute) BukkitAdapter.ADAPTER.getRegistryValue((String) entry.getKey(), Attribute.class);
-                                }
-
+                                Attribute attribute = entry.getKey();
                                 AttributeModifier modifier = AttributeModifier.deserialize(entry.getValue());
                                 itemMeta.addAttributeModifier(attribute, modifier);
                             }
@@ -372,7 +363,7 @@ public class RollbackUtil extends Lookup {
                     itemstack.setItemMeta(itemMeta);
                 }
                 else if (itemCount == 0) {
-                    ItemMeta meta = ItemUtils.deserializeItemMeta(itemstack.getItemMeta().getClass(), map.get(0));
+                    ItemMeta meta = Util.deserializeItemMeta(itemstack.getItemMeta().getClass(), map.get(0));
                     itemstack.setItemMeta(meta);
 
                     if (map.size() > 1 && (rowType == Material.POTION)) {
@@ -410,7 +401,7 @@ public class RollbackUtil extends Lookup {
                     else if ((rowType == Material.CROSSBOW)) {
                         CrossbowMeta meta = (CrossbowMeta) itemstack.getItemMeta();
                         for (Map<String, Object> itemData : map) {
-                            ItemStack crossbowItem = ItemUtils.unserializeItemStack(itemData);
+                            ItemStack crossbowItem = Util.unserializeItemStack(itemData);
                             if (crossbowItem != null) {
                                 meta.addChargedProjectile(crossbowItem);
                             }
@@ -493,76 +484,4 @@ public class RollbackUtil extends Lookup {
         return new Object[] { 0, "", itemstack };
     }
 
-    /**
-     * Deserializes metadata from a byte array into a list of objects.
-     *
-     * @param metadata
-     *            The byte array containing serialized metadata
-     * @return The deserialized list of objects or null if deserialization fails
-     */
-    public static List<Object> deserializeMetadata(byte[] metadata) {
-        if (metadata == null) {
-            return null;
-        }
-
-        try {
-            ByteArrayInputStream metaByteStream = new ByteArrayInputStream(metadata);
-            BukkitObjectInputStream metaObjectStream = new BukkitObjectInputStream(metaByteStream);
-            @SuppressWarnings("unchecked")
-            List<Object> metaList = (List<Object>) metaObjectStream.readObject();
-            metaObjectStream.close();
-            metaByteStream.close();
-            return metaList;
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * Queues an entity spawn operation for processing.
-     *
-     * @param user
-     *            The username of the player
-     * @param block
-     *            The block state where the entity should be spawned
-     * @param type
-     *            The type of entity to spawn
-     * @param data
-     *            Additional data for the entity
-     */
-    public static void queueEntitySpawn(String user, BlockState block, EntityType type, int data) {
-        Queue.queueEntitySpawn(user, block, type, data);
-    }
-
-    /**
-     * Queues a skull update operation for processing.
-     *
-     * @param user
-     *            The username of the player
-     * @param block
-     *            The block state to update
-     * @param rowId
-     *            The row ID for the skull data
-     */
-    public static void queueSkullUpdate(String user, BlockState block, int rowId) {
-        Queue.queueSkullUpdate(user, block, rowId);
-    }
-
-    /**
-     * Queues a sign update operation for processing.
-     *
-     * @param user
-     *            The username of the player
-     * @param block
-     *            The block state to update
-     * @param action
-     *            The action type
-     * @param time
-     *            The time of the update
-     */
-    public static void queueSignUpdate(String user, BlockState block, int action, int time) {
-        Queue.queueSignUpdate(user, block, action, time);
-    }
 }