PR fixes:

* fix: Incorrect TypeReference possibly deserialization failure
* Thread interrupt only on InterruptedException
* Fix early return logic and improve error handling in update checker

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: myzticbean
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Quickshop Hikari / Reremake and version:**
+
+**QSFinditemAddOn version:**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,11 @@
+---
+name: Feature request
+about: Create a feature request
+title: ''
+labels: feature
+assignees: myzticbean
+
+---
+
+**Describe your feature**
+A clear and concise description of what enhancement you are looking for.

.github/workflows/maven.yml

@@ -0,0 +1,30 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Maven Build
+
+on:
+  pull_request:
+    branches: [ "master", "release/v2.0" ]
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 21
+      uses: actions/setup-java@v3
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn clean install

.github/workflows/publish-release.yml

@@ -0,0 +1,89 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Release
+
+on:
+#  push:
+#    branches: [ "master" ]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    name: Setup Environment, Build JAR and Release Project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
+      - name: Upload JAR as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: QSFindItemAddOn
+          path: target/QSFindItemAddOn-*.jar
+      - name: Automatic Release
+        uses: Fulminazzo/java-automatic-release@v2
+        with:
+          java-version: '21'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPOSITORY_NAME: ${{ github.event.repository.name }}
+          COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+      - name: Get Release Info and Rename
+        id: get_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          release_info=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
+            "https://api.github.com/repos/${{ github.repository }}/releases/latest")
+          
+          release_id=$(echo "$release_info" | jq -r .id)
+          upload_url=$(echo "$release_info" | jq -r .upload_url)
+          version=$(echo "$release_info" | jq -r .tag_name)
+          
+          # Extract full version from the release name (including RELEASE or SNAPSHOT)
+          full_version=$(echo "$release_info" | jq -r .name | sed 's/.*[[:space:]]//')
+          
+          # Determine if it's a RELEASE or SNAPSHOT
+          if [[ $full_version == *-SNAPSHOT ]]; then
+            jar_suffix="-SNAPSHOT"
+          else
+            jar_suffix="-RELEASE"
+          fi
+          
+          # Construct the full JAR name
+          jar_name="QSFindItemAddOn-${full_version}${jar_suffix}.jar"
+          
+          # Update the release name to include RELEASE or SNAPSHOT
+          curl -X PATCH -H "Authorization: token $GITHUB_TOKEN" \
+            -H "Accept: application/vnd.github.v3+json" \
+            "https://api.github.com/repos/${{ github.repository }}/releases/$release_id" \
+            -d "{\"name\":\"$full_version\"}"
+          
+          echo "upload_url=$upload_url" >> $GITHUB_OUTPUT
+          echo "version=$full_version" >> $GITHUB_OUTPUT
+          echo "jar_name=$jar_name" >> $GITHUB_OUTPUT
+
+      - name: Upload JAR to Release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./target/${{ steps.get_release.outputs.jar_name }}
+          asset_name: ${{ steps.get_release.outputs.jar_name }}
+          asset_content_type: application/java-archive

.gitignore

@@ -19,6 +19,7 @@ out/
 
 # Package Files #
 *.jar
+!lib/*.jar
 *.war
 *.nar
 *.ear

.gitlab-ci.yml

@@ -1,13 +0,0 @@
-image: maven:3.8.3-openjdk-17
-
-build:
-  stage: build
-  script:
-    - mvn --version
-    - java --version
-    - mvn clean package -DskipTests
-  allow_failure: false
-  artifacts:
-    when: on_success
-    paths:
-      - target/QSFindItemAddOn*.jar

CHANGELOG.md

@@ -1,3 +1,136 @@
+## Release 2.0.7.7
+### Changes
+- Changed comma delimiter to triple pipe (PR #83 by @MattDeWeerd)
+- Added initial classes for Modrinth API integration and a VirtualThreadScheduler for handling asynchronous tasks.
+- Relocated all enum classes from the `utils.enums` package to `models.enums` to improve project structure and organization.
+- Bumped Spigot dependency to `1.21.8-R0.1-SNAPSHOT`
+- Bumped QS-Hikari dependency to `6.2.0.10`
+- Bumped Bentobox dependency to `3.7.3`
+
+## Release 2.0.7.6
+### Bug fixes
+- Fixed `/finditem hideshop`/`/finditem revealshop` not working for newly created shop
+- Added support for custom-model-data to the GUI filler item
+- Added support for `{SHOP_WORLD}` placeholder in custom commands
+
+### Changes
+- Optimized the size of the `shops.json` file
+- Updated config version to `21`
+
+## Release 2.0.7.5
+### Changes
+- Updated dependencies to latest version
+- Fixed a bug teleporting to a shop without essentials (PR #77)
+
+## Release 2.0.7.4
+### Bug fixes
+- Fix for /finditem shows only 'searching...' but no GUI (PR #69)
+
+## Release 2.0.7.3
+### Changes
+- JDK version upgraded from 17 to 21
+- Added check to exclude shops of `buying` shops for owners who don't have enough money.
+- Bentobox integration to ignore shops in locked islands
+
+### Bug fixes
+- Hideshop/revealshop should work with double chests also
+
+## Release 2.0.7.2
+### Bug fixes
+- Fixed item meta not showing correctly in Search GUI
+
+## Release 2.0.7.1
+### Changes
+- Added config option to suppress update notifications in chat
+  ```yaml
+  suppress-update-notifications: false
+  ```
+- Added config option to configure blacklisted materials
+  ```yaml
+  blacklisted-materials:
+  - "BARRIER"
+  - "STRUCTURE_BLOCK"
+  - "COMMAND_BLOCK"
+  ```
+
+## Release 2.0.7.0
+### Changes
+- Added runnable custom commands on GUI item click. New related config options added.
+- Added a new permission to bypass safety check for shop tp.
+- MAJOR code refactoring in FoundShopsMenu.java to make it human readable.. finally!
+- Added publish-release.yml github action 
+
+## Release 2.0.6.4
+### Changes
+- Residence support for fetching the residence the shop is in (including subzones) ([#45](https://github.com/myzticbean/QSFindItemAddOn/pull/45)) [Contribution by SengyEU]
+- Configurable "No ... near shop" messages ([#45](https://github.com/myzticbean/QSFindItemAddOn/pull/45)) [Contribution by SengyEU]
+- Spigot API updated to 1.21.
+
+### Bug fixes
+- Fixed NPE when putting AIR as a filler item ([#46](https://github.com/myzticbean/QSFindItemAddOn/pull/46)) [Contribution by SengyEU]
+- Fixed bug where exception was thrown when trying to render player heads in GUI buttons (Broke in 1.21 update)
+
+## Release 2.0.6.3
+### Changes
+- Added stack size placeholder to shop lore ([#37](https://github.com/myzticbean/QSFindItemAddOn/issues/37))
+- Added a 500 block limit for searching nearby PlayerWarp (@TODO: to be made configurable in a future version)
+
+## Release 2.0.6.2
+### Changes
+- Added option to show only player owned warps in GUI ([#38](https://github.com/myzticbean/QSFindItemAddOn/issues/38)) [Contribution by lukemango]
+
+## Release 2.0.6.1
+### Bug fixes
+- Changed scheduled task loggers to debug-mode only ([#29](https://github.com/myzticbean/QSFindItemAddOn/issues/29))
+- Fix for players not getting teleported ([#30](https://github.com/myzticbean/QSFindItemAddOn/issues/30))
+
+## Release 2.0.6.0
+### Changes (Feature request [#23](https://github.com/myzticbean/QSFindItemAddOn/issues/23))
+- Plugin updated for Minecraft version 1.20.5.
+- Changed 15Min Scheduled Task to run in async thread (should help with lag).
+- Deprecated QSReremakeAPIHandler. Reremake implementation will no longer be updated. Last support is for QS-Reremake v5.1.2.5.
+- Changed logger statements to show Main/Async thread state.
+- Structural changes in the config.yml, specifically for shop-gui related options.
+- Fixed an issue with showing large numbers in currency.
+- Added new feature to format currency format. For example: $10,210,100 will be shown as $10.21M. New config option to toggle it:
+```yaml
+shop-gui:
+  use-shorter-currency-format: true
+```
+- New config option added as below to toggle if players should be allowed to warp to locked warps (Only for PlayerWarps).
+```yaml
+player-shop-teleportation:
+  nearest-warp-tp-mode:
+    do-not-tp-if-warp-locked: true
+```
+- Config version is now 15.
+
+## Release 2.0.5.7
+### Bug fixes
+- Fixed a bug where disabling hideshop/revealshop will not disable it for `/qs finditem` ([#13](https://github.com/myzticbean/QSFindItemAddOn/issues/13))
+- Fixed stock/space not updating properly from QS cache ([#17](https://github.com/myzticbean/QSFindItemAddOn/issues/17))
+
+## Release 2.0.5.6
+### Bug fixes
+- Fixed a code refactoring bug where search all shops would return no shops for Quickshop Reremake
+- Added a INFO level logger to log time taken for a search process
+- Fix the lag issue caused due to new QS-Hikari cache feature impl ([#12](https://github.com/myzticbean/QSFindItemAddOn/issues/12))
+
+## Release 2.0.5.5
+### Bug fixes
+- Fixed /finditem command not working in some cases ([#9](https://github.com/myzticbean/QSFindItemAddOn/issues/9))
+- Added a config option to disable the `/finditem {TO_BUY | TO_SELL} *`
+
+## Release 2.0.5.4
+### Features
+- Added Go to First and Last page GUI buttons ([#3](https://github.com/myzticbean/QSFindItemAddOn/issues/3))
+- Added new config option to include empty chests in the search result ([#3](https://github.com/myzticbean/QSFindItemAddOn/issues/3))
+- Added compatibility with QS Hikari 6.* shop stock/space fetch from cache feature. This should help prevent massive lag spikes.
+### Bug fixes
+- Full/out of space chests will be excluded from `/finditem TO-SELL <item_name>` ([#3](https://github.com/myzticbean/QSFindItemAddOn/issues/3))
+- Bug fix to prevent lag when during `/finditem TO_BUY *` on large servers (Only for QS Hikari)
+- Fix for issue [#5](https://github.com/myzticbean/QSFindItemAddOn/issues/5)
+
 ## Release 2.0.5.3
 ### Features
 - Added shop TP delay ([#28](https://gitlab.com/ronsane/QSFindItemAddOn/-/issues/28))
@@ -21,3 +154,35 @@
 - Fix for Issue [#24](https://gitlab.com/ronsane/QSFindItemAddOn/-/issues/24)
 - Fixed a bug related to nearest warp teleportation algorithm
 - Other minor bug fixes
+
+## Snapshot 2.0
+### Changes
+- **QuickShop-Hikari Support:** It now supports both QuickShop-Reremake and QuickShop-Hikari.
+- **Hexcode color support:** All messages in the config.yml now support hexcodes so you can get a lot more creative with colors.
+- **Different commands for players and admins**
+  - The /finditem command is now split into two:
+    - `/finditem` - This will support the usual shop searches and hiding
+    - `/finditemadmin` or `/fiadmin` - This will support plugin reloads. For example: `/fiadmin reload`.
+- **View all shops on server:** Now you can do `/finditem TO_BUY *` or `/finditem TO_SELL *` to view all shops on the server. As of this version, the sequence is always randomized. Sorting options are a work in progress.
+- **New shop visit count:** Now you can choose to display shop visits count in the shop lore in Search GUI. Just add the placeholder {SHOP_VISITS} in the "shop-gui-item-lore" in config.yml. To prevent visit spamming, a new config property "shop-player-visit-cooldown-in-minutes" has been added. Please don't use decimals here LOL.
+- **New storage format:** The "hiddenShops.json" will automatically be converted to a new file called "shops.json" which will store data of all shops along with their player visit count and whether they are hidden from searches.
+- **New Next/Back buttons:** The default next/back buttons are now fancy playerheads to make more sense. If you don't wish to use them, just specify the material in the config.yml.
+- **Customizable command aliases:** Added a new property in config.yml called "command-alias" where you can specify your own list of command aliases for /finditem command. If you don't wish to add any, just make it as:
+```yaml
+command-alias: []
+```
+- **Compatibility with QuickShop-Hikari v2.0.0.0:** Added support for Per Shop permission management for "quickshop-hikari.search". If for a shop, the shop owner Steve configures Alex to be in a group that does not have "quickshop-hikari.search" permission, then Alex won't be able to see that shop in GUI when searching.
+- **Added finditem sub-command for /qs:** Now you can try the below commands, same functionality. This feature removes the original /qs find sub-command to avoid confusion among players.
+- Added a new sample-config.yml file which will be copied over to the plugin folder. This file is just for your reference when editing the fields in the actual config.yml file.
+
+### Bug fixes
+- Removed an erroneous config field "warp-player-to-nearest-warp".
+- Fixed an issue where it will load up the plugin before QuickShop is done loading causing it to disable itself. Thanks Baran for reporting :)
+- Added support for EssentialsX /back.
+- Fixed a bug that broke autocompletes for all commands in-game.
+- Made minor bug fixes when enabling plugin.
+- Made some fixes in the search system for shops that are buying items.
+- Some other minor stability fixes.
+- Fixed bug in which the new `/qs finditem` sub-command was not showing up in `/qs help`.
+- Fixed a NullPointerException bug for PlayerWarps plugin integration.
+- Updated PlayerWarps API to latest version and fixed a NPE console error

CONTRIBUTING.md

@@ -8,7 +8,7 @@ But, please don't increase the plugin version number.
 ### How to compile?
 
 **Requirements**
-1. Java 17 JDK in PATH
+1. Java 21 JDK in PATH
 2. Git
 3. Maven
 

LICENSE

@@ -0,0 +1,675 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+                            Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+
+The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+The Corresponding Source for a work in source code form is that
+same work.
+
+2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari and
+    Reremake Shop plugins for Spigot server platform.
+    Copyright (C) 2021  myzticbean
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    QSFindItemAddOn  Copyright (C) 2021  myzticbean
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

LICENSE.md

@@ -1,13 +0,0 @@
-Copyright 2021 RonCreations
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

README.md

@@ -1,11 +1,13 @@
 # Shop Search AddOn For QuickShop
-### Version: 2.0.5.4-SNAPSHOT
+### Version: 2.0.7.7-RELEASE
 
 An unofficial add-on for the QuickShop Hikari and Reremake spigot plugin.
 Adds a `/finditem` command in game for searching through all the shops on the server.
 
-![MC](https://img.shields.io/badge/Minecraft-Java%20Edition:%201.16.5%20--%201.20.1-brightgreen)
-![Ver](https://img.shields.io/spiget/version/95104?label=Current%20Spigot%20Version)
+[//]: # (![MC](https://img.shields.io/badge/Minecraft-Java%20Edition:%201.16.5%20--%201.20.4-brightgreen))
+![ModrinthAvailableFor](https://img.shields.io/badge/dynamic/json?label=Minecraft%20Java%20Edition:&color=4bab62&query=version&url=https://api.blueish.dev/api/minecraft/version?id=asp13ugE)
+![Ver](https://img.shields.io/spiget/version/95104?label=Latest%20Spigot%20Version)
+![Build Status](https://github.com/myzticbean/QSFindItemAddOn/actions/workflows/maven.yml/badge.svg?branch=master)
 
 ## Features
 - Search items based on buying/selling shops
@@ -20,10 +22,11 @@ Adds a `/finditem` command in game for searching through all the shops on the se
 - Supports completely safe direct shop teleportation (configurable in config.yml)
 - Ignores shops that are out of stock by default
 - Support for world blacklisting (Shops in blacklisted worlds are ignored in the search result)
+- Support for material blacklisting that prevents players for searching for specific items
 
 
 **QuickShop-Hikari Support**
-- It supports both [QuickShop-Reremake](https://www.spigotmc.org/resources/62575/) and [QuickShop-Hikari](https://www.spigotmc.org/resources/100125/).
+- It supports both [QuickShop-Hikari](https://www.spigotmc.org/resources/100125/) and [QuickShop-Reremake](https://www.spigotmc.org/resources/62575/).
 
 **Hexcode color support**
 - All messages in the config.yml support hexcodes.
@@ -43,15 +46,16 @@ command-alias: []
 ## Integrations
 - Supports [PlayerWarps](https://www.spigotmc.org/resources/66692/) (by Olzie-12) integration. It shows the nearest warp to each shop in the search result GUI.
 - Supports EssentialsX Warps integration for fetching nearest warps.
-    - Global warps list for essentials is updated in batches every 15 minutes due to technical limitations, which is then used in every search query.
-    - If you added a new warp and want it to get updated immediately, run **/finditemadmin reload**
-    - Remember, this applies only to Essential Warps.
+  - Global warps list for essentials is updated in batches every 15 minutes due to technical limitations, which is then used in every search query.
+  - If you added a new warp and want it to get updated immediately, run **/finditemadmin reload**
+  - Remember, this applies only to Essential Warps.
 - WorldGuard region support for fetching the WorldGuard region the shop is in (if overlapping regions, highest priority will be chosen)
+- Residence support for fetching the residence the shop is in (including subzones)
 
 >Check out the sample config.yml [here](https://github.com/myzticbean/QSFindItemAddOn/wiki/Sample-config.yml).
 
 ## Requires
-- [QuickShop-Hikari](https://www.spigotmc.org/resources/100125/) v5.2 or higher
+- [QuickShop-Hikari](https://www.spigotmc.org/resources/100125/) v6.0 or higher
 
 **OR**
 
@@ -70,3 +74,16 @@ See more details [here](https://github.com/myzticbean/QSFindItemAddOn/blob/maste
 
 ## BStats Metrics
 [![BigImage](https://bstats.org/signatures/bukkit/QSFindItemAddOn.svg)](https://bstats.org/plugin/bukkit/QSFindItemAddOn/12382)
+
+## Demo
+### How to use `/finditem`?
+![/finditem_usage](https://cdn.modrinth.com/data/asp13ugE/images/bb37966809c9d7ab3201988ef58b2060688584f3.png)
+![alt text](https://cdn.modrinth.com/data/asp13ugE/images/878e9b703343a65c963d790d875ad5dbe6ac309d.png)
+### Multiple search result pages:
+![alt text](https://cdn.modrinth.com/data/asp13ugE/images/33cb7d96cabb709bc630685c9e6fdc1b9cd7b3bb.png)
+### Shows item enchantments:
+![alt text](https://cdn.modrinth.com/data/asp13ugE/images/8ac5643bc042b897e549400e29186d87024b3a71.png)
+### Shows Potion colors and effects:
+![alt text](https://cdn.modrinth.com/data/asp13ugE/images/786ce10d42c5e92cbbd12b7f1ee81011796acbe0.png)
+### Shows custom item names and lore:
+![alt text](https://cdn.modrinth.com/data/asp13ugE/images/0c30b767bfc9df1f4a79afef677c0fc262fa62c5.png)

pom.xml

@@ -4,27 +4,64 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.myzticbean.FindItemAddOn</groupId>
+    <groupId>io.myzticbean.finditemaddon</groupId>
     <artifactId>QSFindItemAddOn</artifactId>
-    <version>2.0.5.4-SNAPSHOT</version>
+    <version>2.0.7.7-RELEASE</version>
     <packaging>jar</packaging>
 
     <name>QSFindItemAddOn</name>
+    <inceptionYear>2021</inceptionYear>
 
     <properties>
-        <java.version>16</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spigot.version>1.21.8-R0.1-SNAPSHOT</spigot.version>
+        <qs-hikari.version>6.2.0.10</qs-hikari.version>
+        <playerwarps-api-old>6.30.0</playerwarps-api-old>
+        <playerwarps-api-new>7.7.1</playerwarps-api-new>
+        <essentialsx.version>2.21.1</essentialsx.version>
+        <jackson.version>2.13.5</jackson.version>
     </properties>
 
+    <ciManagement>
+        <system>jenkins</system>
+        <url>https://ci.codemc.io/job/myzticbean/job/QSFindItemAddOn</url>
+    </ciManagement>
+
+    <issueManagement>
+        <system>GitHub</system>
+        <url>https://github.com/myzticbean/QSFindItemAddOn/issues</url>
+    </issueManagement>
+
+    <distributionManagement>
+        <repository>
+            <id>QSFindItemAddOn</id>
+            <url>https://repo.codemc.io/repository/QSFindItemAddOn/</url>
+        </repository>
+    </distributionManagement>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>${jackson.version}</version> <!-- Use a stable latest version -->
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.1</version>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -49,9 +86,9 @@
                 <version>2.3.1</version>
                 <configuration>
                     <!-- Below path is where your plugin jar will be copied automatically upon build, comment out if on a Mac -->
-                    <!-- <outputDirectory>E:\MCServer_1.18\plugins</outputDirectory> -->
+                    <!-- <outputDirectory>D:\Github_myzticbean\MCServer_1.21\plugins</outputDirectory> -->
                     <!-- Comment out if on a PC -->
-                    <outputDirectory>/Users/${user.name}/IdeaProjects/MCServer_1.20.1/plugins</outputDirectory>
+                    <!-- <outputDirectory>/Users/${user.name}/IdeaProjects/MCServer_1.21/plugins</outputDirectory> -->
                 </configuration>
             </plugin>
             <plugin>
@@ -91,6 +128,14 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
         <repository>
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
@@ -99,14 +144,6 @@
             <id>codemc-public</id>
             <url>https://repo.codemc.io/repository/maven-public/</url>
         </repository>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
-        </repository>
         <repository>
             <id>essentials-releases</id>
             <url>https://repo.essentialsx.net/releases/</url>
@@ -124,16 +161,32 @@
             <url>https://maven.enginehub.org/repo/</url>
         </repository>
         <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
+            <id>central</id>
+            <url>https://repo.maven.apache.org/maven2/</url>
+        </repository>
+        <repository>
+            <id>bentoboxworld</id>
+            <url>https://repo.codemc.io/repository/bentoboxworld/</url>
         </repository>
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20.2-R0.1-SNAPSHOT</version>
+            <version>${spigot.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -157,7 +210,7 @@
         <dependency>
             <groupId>com.ghostchu</groupId>
             <artifactId>quickshop-api</artifactId>
-            <version>5.2.0.6</version>
+            <version>${qs-hikari.version}</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -184,12 +237,16 @@
                     <groupId>me.xanium</groupId>
                     <artifactId>GemsEconomy</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.ghostchu</groupId>
+                    <artifactId>quickshop-common</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>com.ghostchu</groupId>
             <artifactId>quickshop-bukkit</artifactId>
-            <version>5.2.0.5</version>
+            <version>${qs-hikari.version}</version>
             <scope>provided</scope>
             <classifier>shaded</classifier>
             <exclusions>
@@ -217,12 +274,16 @@
                     <groupId>me.xanium</groupId>
                     <artifactId>GemsEconomy</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.ghostchu</groupId>
+                    <artifactId>quickshop-common</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>net.essentialsx</groupId>
             <artifactId>EssentialsX</artifactId>
-            <version>2.19.4</version>
+            <version>${essentialsx.version}</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -234,7 +295,7 @@
         <dependency>
             <groupId>com.olziedev</groupId>
             <artifactId>playerwarps-api</artifactId>
-            <version>6.28.0</version>
+            <version>${playerwarps-api-old}</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -243,6 +304,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.olziedev</groupId>
+            <artifactId>playerwarps-api</artifactId>
+            <version>${playerwarps-api-new}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
@@ -306,12 +373,12 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.10</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>23.0.0</version>
+            <version>24.1.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -322,13 +389,13 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.26</version>
+            <version>1.18.34</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.github.KodySimpson</groupId>
             <artifactId>SimpAPI</artifactId>
-            <version>4.3.2</version>
+            <version>4.6.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -339,7 +406,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.18.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -350,7 +417,7 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.14.0</version>
+            <version>4.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -359,5 +426,31 @@
             <version>0.4.7</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>zrips.residence</groupId>
+            <artifactId>Residence</artifactId>
+            <version>5.1.5.1</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/Residence5.1.5.1.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.github.GriefPrevention</groupId>
+            <artifactId>GriefPrevention</artifactId>
+            <version>16.18.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>me.ryanhamshire</groupId>
+            <artifactId>GPFlags</artifactId>
+            <version>5.13.4</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/GPFlags-5.13.4.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>world.bentobox</groupId>
+            <artifactId>bentobox</artifactId>
+            <version>3.7.3</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

src/main/doc/README.md

@@ -4,8 +4,10 @@
 An unofficial add-on for the QuickShop Hikari and Reremake spigot plugin.
 Adds a `/finditem` command in game for searching through all the shops on the server.
 
-![MC](https://img.shields.io/badge/Minecraft-Java%20Edition:%201.16.5%20--%201.20.1-brightgreen)
-![Ver](https://img.shields.io/spiget/version/95104?label=Current%20Spigot%20Version)
+[//]: # (![MC](https://img.shields.io/badge/Minecraft-Java%20Edition:%201.16.5%20--%201.20.4-brightgreen))
+![ModrinthAvailableFor](https://img.shields.io/badge/dynamic/json?label=Minecraft%20Java%20Edition:&color=4bab62&query=version&url=https://api.blueish.dev/api/minecraft/version?id=asp13ugE)
+![Ver](https://img.shields.io/spiget/version/95104?label=Latest%20Spigot%20Version)
+![Build Status](https://github.com/myzticbean/QSFindItemAddOn/actions/workflows/maven.yml/badge.svg?branch=master)
 
 ## Features
 - Search items based on buying/selling shops
@@ -20,10 +22,11 @@ Adds a `/finditem` command in game for searching through all the shops on the se
 - Supports completely safe direct shop teleportation (configurable in config.yml)
 - Ignores shops that are out of stock by default
 - Support for world blacklisting (Shops in blacklisted worlds are ignored in the search result)
+- Support for material blacklisting that prevents players for searching for specific items
 
 
 **QuickShop-Hikari Support**
-- It supports both [QuickShop-Reremake](https://www.spigotmc.org/resources/62575/) and [QuickShop-Hikari](https://www.spigotmc.org/resources/100125/).
+- It supports both [QuickShop-Hikari](https://www.spigotmc.org/resources/100125/) and [QuickShop-Reremake](https://www.spigotmc.org/resources/62575/).
 
 **Hexcode color support**
 - All messages in the config.yml support hexcodes.
@@ -43,15 +46,16 @@ command-alias: []
 ## Integrations
 - Supports [PlayerWarps](https://www.spigotmc.org/resources/66692/) (by Olzie-12) integration. It shows the nearest warp to each shop in the search result GUI.
 - Supports EssentialsX Warps integration for fetching nearest warps.
-    - Global warps list for essentials is updated in batches every 15 minutes due to technical limitations, which is then used in every search query.
-    - If you added a new warp and want it to get updated immediately, run **/finditemadmin reload**
-    - Remember, this applies only to Essential Warps.
+  - Global warps list for essentials is updated in batches every 15 minutes due to technical limitations, which is then used in every search query.
+  - If you added a new warp and want it to get updated immediately, run **/finditemadmin reload**
+  - Remember, this applies only to Essential Warps.
 - WorldGuard region support for fetching the WorldGuard region the shop is in (if overlapping regions, highest priority will be chosen)
+- Residence support for fetching the residence the shop is in (including subzones)
 
 >Check out the sample config.yml [here](https://github.com/myzticbean/QSFindItemAddOn/wiki/Sample-config.yml).
 
 ## Requires
-- [QuickShop-Hikari](https://www.spigotmc.org/resources/100125/) v5.2 or higher
+- [QuickShop-Hikari](https://www.spigotmc.org/resources/100125/) v6.0 or higher
 
 **OR**
 
@@ -70,3 +74,16 @@ See more details [here](https://github.com/myzticbean/QSFindItemAddOn/blob/maste
 
 ## BStats Metrics
 [![BigImage](https://bstats.org/signatures/bukkit/QSFindItemAddOn.svg)](https://bstats.org/plugin/bukkit/QSFindItemAddOn/12382)
+
+## Demo
+### How to use `/finditem`?
+![/finditem_usage](https://cdn.modrinth.com/data/asp13ugE/images/bb37966809c9d7ab3201988ef58b2060688584f3.png)
+![alt text](https://cdn.modrinth.com/data/asp13ugE/images/878e9b703343a65c963d790d875ad5dbe6ac309d.png)
+### Multiple search result pages:
+![alt text](https://cdn.modrinth.com/data/asp13ugE/images/33cb7d96cabb709bc630685c9e6fdc1b9cd7b3bb.png)
+### Shows item enchantments:
+![alt text](https://cdn.modrinth.com/data/asp13ugE/images/8ac5643bc042b897e549400e29186d87024b3a71.png)
+### Shows Potion colors and effects:
+![alt text](https://cdn.modrinth.com/data/asp13ugE/images/786ce10d42c5e92cbbd12b7f1ee81011796acbe0.png)
+### Shows custom item names and lore:
+![alt text](https://cdn.modrinth.com/data/asp13ugE/images/0c30b767bfc9df1f4a79afef677c0fc262fa62c5.png)

src/main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdHikariImpl.java

@@ -1,121 +0,0 @@
-package io.myzticbean.finditemaddon.Commands.QSSubCommands;
-
-import com.ghostchu.quickshop.api.command.CommandHandler;
-import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
-import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPerms;
-import me.kodysimpson.simpapi.colors.ColorTranslator;
-import org.apache.commons.lang3.StringUtils;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author myzticbean
- */
-public class FindItemCmdHikariImpl implements CommandHandler<Player> {
-
-    private final String hideSubCommand;
-    private final String revealShopSubCommand;
-    private final CmdExecutorHandler cmdExecutor;
-    private final List<String> itemsList = new ArrayList<>();
-    private final List<String> buyOrSellList = new ArrayList<>();
-
-    public FindItemCmdHikariImpl() {
-        if(StringUtils.isBlank(FindItemAddOn.getConfigProvider().FIND_ITEM_HIDESHOP_AUTOCOMPLETE)) {
-            this.hideSubCommand = "hideshop";
-        }
-        else {
-            this.hideSubCommand = FindItemAddOn.getConfigProvider().FIND_ITEM_HIDESHOP_AUTOCOMPLETE;
-        }
-
-        if(StringUtils.isEmpty(FindItemAddOn.getConfigProvider().FIND_ITEM_REVEALSHOP_AUTOCOMPLETE)
-                || StringUtils.containsIgnoreCase(
-                FindItemAddOn.getConfigProvider().FIND_ITEM_REVEALSHOP_AUTOCOMPLETE, " ")) {
-            this.revealShopSubCommand = "revealshop";
-        }
-        else {
-            this.revealShopSubCommand = FindItemAddOn.getConfigProvider().FIND_ITEM_REVEALSHOP_AUTOCOMPLETE;
-        }
-        cmdExecutor = new CmdExecutorHandler();
-    }
-
-    @Override
-    public void onCommand(Player commandSender, @NotNull String label, @NotNull String[] args) {
-        if(args.length == 0) {
-            commandSender.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cIncorrect usage!"));
-        }
-        else if(args.length == 1) {
-            if(commandSender.hasPermission(PlayerPerms.FINDITEM_HIDESHOP.value())) {
-                if(args[0].equalsIgnoreCase(hideSubCommand)) {
-                    cmdExecutor.handleHideShop(commandSender);
-                } else if(args[0].equalsIgnoreCase(revealShopSubCommand)) {
-                    cmdExecutor.handleRevealShop(commandSender);
-                } else {
-                    commandSender.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cIncorrect usage!"));
-                }
-            } else {
-                commandSender.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cYou don't have permission to use that!"));
-            }
-        } else {
-            cmdExecutor.handleShopSearch(args[0], commandSender, args[1]);
-        }
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull Player sender, @NotNull String commandLabel, @NotNull String[] args) {
-        if(itemsList.isEmpty()) {
-            for(Material mat : Material.values()) {
-                itemsList.add(mat.name());
-            }
-        }
-        if(buyOrSellList.isEmpty()) {
-            // to-buy
-            if(StringUtils.isEmpty(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE)
-                    || StringUtils.containsIgnoreCase(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE, " ")) {
-                buyOrSellList.add("TO_BUY");
-            }
-            else {
-                buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE);
-            }
-            // to-sell
-            if(StringUtils.isEmpty(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_SELL_AUTOCOMPLETE)
-                    || StringUtils.containsIgnoreCase(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_SELL_AUTOCOMPLETE, " ")) {
-                buyOrSellList.add("TO_SELL");
-            }
-            else {
-                buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_SELL_AUTOCOMPLETE);
-            }
-            // hide
-            if(sender.hasPermission(PlayerPerms.FINDITEM_HIDESHOP.value())) {
-                buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_HIDESHOP_AUTOCOMPLETE);
-                buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_REVEALSHOP_AUTOCOMPLETE);
-            }
-        }
-        List<String> result = new ArrayList<>();
-        if(args.length == 1) {
-            for(String a : buyOrSellList) {
-                if(a.toLowerCase().startsWith(args[0].toLowerCase())) {
-                    result.add(a);
-                }
-            }
-            return result;
-        }
-        else if(args.length == 2) {
-            for(String a : itemsList) {
-                if(a.toLowerCase().startsWith(args[1].toLowerCase())) {
-                    result.add(a);
-                }
-            }
-            return result;
-        }
-        else {
-            return null;
-        }
-
-    }
-}

src/main/java/io/myzticbean/finditemaddon/ConfigUtil/ConfigProvider.java

@@ -1,93 +0,0 @@
-package io.myzticbean.finditemaddon.ConfigUtil;
-
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
-import me.kodysimpson.simpapi.colors.ColorTranslator;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ConfigProvider {
-
-    public final String PLUGIN_PREFIX = ColorTranslator.translateColorCodes(ConfigSetup.get().getString("plugin-prefix"));
-    public final List<String> FIND_ITEM_COMMAND_ALIAS = (List<String>) ConfigSetup.get().getList("find-item-command.command-alias");
-    public final String FIND_ITEM_TO_BUY_AUTOCOMPLETE = ConfigSetup.get().getString("find-item-command.to-buy-autocomplete");
-    public final String FIND_ITEM_TO_SELL_AUTOCOMPLETE = ConfigSetup.get().getString("find-item-command.to-sell-autocomplete");
-    public final String FIND_ITEM_HIDESHOP_AUTOCOMPLETE = ConfigSetup.get().getString("find-item-command.hideshop-autocomplete");
-    public final String FIND_ITEM_REVEALSHOP_AUTOCOMPLETE = ConfigSetup.get().getString("find-item-command.revealshop-autocomplete");
-    public final String FIND_ITEM_CMD_INCORRECT_USAGE_MSG = ConfigSetup.get().getString("find-item-command.incorrect-usage-message");
-    public final String FIND_ITEM_CMD_INVALID_MATERIAL_MSG = ConfigSetup.get().getString("find-item-command.invalid-material-message");
-    public final String FIND_ITEM_CMD_HIDING_SHOP_OWNER_INVALID_MSG = ConfigSetup.get().getString("find-item-command.hiding-shop-owner-invalid-message");
-    public final String SHOP_SEARCH_LOADING_MSG = ConfigSetup.get().getString("find-item-command.shop-search-loading-message");
-    public final String NO_SHOP_FOUND_MSG = ConfigSetup.get().getString("find-item-command.no-shop-found-message");
-    public final String FIND_ITEM_CMD_NO_PERMISSION_MSG = ConfigSetup.get().getString("find-item-command.find-item-command-no-permission-message");
-    public final String FIND_ITEM_CMD_SHOP_HIDE_SUCCESS_MSG = ConfigSetup.get().getString("find-item-command.shop-hide-success-message");
-    public final String FIND_ITEM_CMD_SHOP_REVEAL_SUCCESS_MSG = ConfigSetup.get().getString("find-item-command.shop-reveal-success-message");
-    public final String FIND_ITEM_CMD_SHOP_ALREADY_HIDDEN_MSG = ConfigSetup.get().getString("find-item-command.shop-already-hidden-message");
-    public final String FIND_ITEM_CMD_SHOP_ALREADY_PUBLIC_MSG = ConfigSetup.get().getString("find-item-command.shop-already-public-message");
-    public final String FIND_ITEM_CMD_INVALID_SHOP_BLOCK_MSG = ConfigSetup.get().getString("find-item-command.invalid-shop-block-message");
-    public final int SHOP_SORTING_METHOD = ConfigSetup.get().getInt("shop-sorting-method");
-    public final boolean SEARCH_LOADED_SHOPS_ONLY = ConfigSetup.get().getBoolean("search-loaded-shops-only");
-    public final String SHOP_SEARCH_GUI_TITLE = ConfigSetup.get().getString("shop-search-gui-title");
-    public final int NEAREST_WARP_MODE = ConfigSetup.get().getInt("nearest-warp-mode");
-    public final List<String> SHOP_GUI_ITEM_LORE = (List<String>) ConfigSetup.get().getList("shop-gui-item-lore");
-    public final boolean TP_PLAYER_DIRECTLY_TO_SHOP = ConfigSetup.get().getBoolean("player-shop-teleportation.direct-shop-tp-mode.tp-player-directly-to-shop");
-    public final String CLICK_TO_TELEPORT_MSG = ConfigSetup.get().getString("player-shop-teleportation.direct-shop-tp-mode.click-to-teleport-message");
-    public final String SHOP_TP_NO_PERMISSION_MSG = ConfigSetup.get().getString("player-shop-teleportation.direct-shop-tp-mode.shop-tp-no-permission-message");
-    public final String UNSAFE_SHOP_AREA_MSG = ConfigSetup.get().getString("player-shop-teleportation.direct-shop-tp-mode.unsafe-shop-area-message");
-    public final String TP_DELAY_IN_SECONDS = ConfigSetup.get().getString("player-shop-teleportation.direct-shop-tp-mode.tp-delay-in-seconds");
-    public final String TP_DELAY_MESSAGE = ConfigSetup.get().getString("player-shop-teleportation.direct-shop-tp-mode.tp-delay-message");
-    public final String TP_TO_OWN_SHOP_NO_PERMISSION_MESSAGE = ConfigSetup.get().getString("player-shop-teleportation.direct-shop-tp-mode.tp-to-own-shop-no-permission-message");
-    public final boolean TP_PLAYER_TO_NEAREST_WARP = ConfigSetup.get().getBoolean("player-shop-teleportation.nearest-warp-tp-mode.tp-player-to-nearest-warp");
-    public final String SHOP_GUI_BACK_BUTTON_MATERIAL = ConfigSetup.get().getString("shop-gui-back-button-material");
-    public final String SHOP_GUI_BACK_BUTTON_TEXT = ConfigSetup.get().getString("shop-gui-back-button-text");
-    public final String SHOP_GUI_NEXT_BUTTON_MATERIAL = ConfigSetup.get().getString("shop-gui-next-button-material");
-    public final String SHOP_GUI_NEXT_BUTTON_TEXT = ConfigSetup.get().getString("shop-gui-next-button-text");
-    public final String SHOP_GUI_FILLER_ITEM = ConfigSetup.get().getString("shop-gui-filler-item");
-    public final String SHOP_GUI_CLOSE_BUTTON_MATERIAL = ConfigSetup.get().getString("shop-gui-close-button-material");
-    public final String SHOP_GUI_CLOSE_BUTTON_TEXT = ConfigSetup.get().getString("shop-gui-close-button-text");
-    public final String SHOP_GUI_BACK_BUTTON_CMD = ConfigSetup.get().getString("shop-gui-back-button-custom-model-data");
-    public final String SHOP_GUI_NEXT_BUTTON_CMD = ConfigSetup.get().getString("shop-gui-next-button-custom-model-data");
-    public final String SHOP_GUI_CLOSE_BUTTON_CMD = ConfigSetup.get().getString("shop-gui-close-button-custom-model-data");
-    public final String SHOP_NAV_FIRST_PAGE_ALERT_MSG = ConfigSetup.get().getString("shop-navigation-first-page-alert-message");
-    public final String SHOP_NAV_LAST_PAGE_ALERT_MSG = ConfigSetup.get().getString("shop-navigation-last-page-alert-message");
-    public final int SHOP_PLAYER_VISIT_COOLDOWN_IN_MINUTES = ConfigSetup.get().getInt("shop-player-visit-cooldown-in-minutes");
-    public final boolean IGNORE_EMPTY_CHESTS = ConfigSetup.get().getBoolean("ignore-empty-chests");
-    public final String SHOP_GUI_GOTO_FIRST_PAGE_BUTTON_MATERIAL = ConfigSetup.get().getString("shop-gui-goto-first-page-button-material");
-    public final String SHOP_GUI_GOTO_FIRST_PAGE_BUTTON_TEXT = ConfigSetup.get().getString("shop-gui-goto-first-page-button-text");
-    public final String SHOP_GUI_GOTO_LAST_PAGE_BUTTON_MATERIAL = ConfigSetup.get().getString("shop-gui-goto-last-page-button-material");
-    public final String SHOP_GUI_GOTO_LAST_PAGE_BUTTON_TEXT = ConfigSetup.get().getString("shop-gui-goto-last-page-button-text");
-    public final String SHOP_GUI_GOTO_FIRST_PAGE_BUTTON_CMD = ConfigSetup.get().getString("shop-gui-goto-first-page-button-custom-model-data");
-    public final String SHOP_GUI_GOTO_LAST_PAGE_BUTTON_CMD = ConfigSetup.get().getString("shop-gui-goto-last-page-button-custom-model-data");
-    public final List<String> BLACKLISTED_WORLDS = (List<String>) ConfigSetup.get().getList("blacklisted-worlds");
-    public final boolean DEBUG_MODE = ConfigSetup.get().getBoolean("debug-mode");
-    public final int CONFIG_VERSION = ConfigSetup.get().getInt("config-version");
-
-    private final List<World> blacklistedWorldsList = new ArrayList<>();
-
-    public ConfigProvider() {
-        if(BLACKLISTED_WORLDS != null) {
-            BLACKLISTED_WORLDS.forEach(world -> {
-                World worldObj = Bukkit.getWorld(world);
-                if(worldObj != null) {
-                    blacklistedWorldsList.add(worldObj);
-                }
-            });
-        }
-        LoggerUtils.logInfo("Config loaded!");
-    }
-
-    public List<World> getBlacklistedWorlds() {
-        return blacklistedWorldsList;
-    }
-
-    public boolean shopGUIItemLoreHasKey(String key) {
-        if (SHOP_GUI_ITEM_LORE != null) {
-            return SHOP_GUI_ITEM_LORE.stream().anyMatch(key::contains);
-        }
-        else {
-            return false;
-        }
-    }
-}

src/main/java/io/myzticbean/finditemaddon/ConfigUtil/ConfigSetup.java

@@ -1,216 +0,0 @@
-package io.myzticbean.finditemaddon.ConfigUtil;
-
-import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ConfigSetup {
-
-    private static File configFile;
-    private static File sampleConfigFile;
-    private static FileConfiguration configFileConfiguration;
-    private static final int CURRENT_CONFIG_VERSION = 13;
-
-    public static void setupConfig() {
-        configFile = new File(FindItemAddOn.getInstance().getDataFolder(), "config.yml");
-
-        if(!configFile.exists()) {
-            try {
-                boolean isConfigGenerated = configFile.createNewFile();
-                if(isConfigGenerated) {
-                    LoggerUtils.logInfo("Generated a new config.yml");
-                }
-            }
-            catch (IOException e) {
-                LoggerUtils.logError("Error generating config.yml");
-            }
-        }
-
-        configFileConfiguration = YamlConfiguration.loadConfiguration(configFile);
-    }
-
-    public static void saveConfig() {
-        try {
-            configFileConfiguration.save(configFile);
-        }
-        catch (IOException e) {
-            LoggerUtils.logError("Error saving config.yml");
-        }
-    }
-
-    public static void checkForMissingProperties() {
-        if(!configFileConfiguration.contains("search-loaded-shops-only", true)) {
-            configFileConfiguration.set("search-loaded-shops-only", false);
-        }
-        if(!configFileConfiguration.contains("nearest-warp-mode", true)) {
-            configFileConfiguration.set("nearest-warp-mode", 1);
-        }
-        else {
-            try {
-                int nearestWarpMode = configFileConfiguration.getInt("nearest-warp-mode");
-                if(nearestWarpMode != 1 && nearestWarpMode != 2 && nearestWarpMode != 3) {
-                    LoggerUtils.logError("Invalid value for 'nearest-warp-mode' in config.yml!");
-                    LoggerUtils.logError("Resetting by default to &e1");
-                    configFileConfiguration.set("nearest-warp-mode", 1);
-                }
-            }
-            catch(Exception e) {
-                LoggerUtils.logError("Invalid value for 'nearest-warp-mode' in config.yml!");
-                LoggerUtils.logError("Resetting by default to &e1");
-                configFileConfiguration.set("nearest-warp-mode", 1);
-            }
-        }
-        if(!configFileConfiguration.contains("shop-gui-item-lore", true)) {
-            List<String> shopGUIItemLore = new ArrayList<>();
-            shopGUIItemLore.add("");
-            shopGUIItemLore.add("&fPrice: &a${ITEM_PRICE}");
-            shopGUIItemLore.add("&fStock: &7{SHOP_STOCK}");
-            shopGUIItemLore.add("&fOwner: &7{SHOP_OWNER}");
-            shopGUIItemLore.add("&fLocation: &7{SHOP_LOC}");
-            shopGUIItemLore.add("&fWorld: &7{SHOP_WORLD}");
-            shopGUIItemLore.add("&fWarp: &7{NEAREST_WARP}");
-            shopGUIItemLore.add("");
-            configFileConfiguration.set("shop-gui-item-lore", shopGUIItemLore);
-        }
-        if(!configFileConfiguration.contains("blacklisted-worlds", true)) {
-            List<String> blacklistedWorlds = new ArrayList<>();
-            blacklistedWorlds.add("world_number_1");
-            blacklistedWorlds.add("world_number_2");
-            configFileConfiguration.set("blacklisted-worlds", blacklistedWorlds);
-        }
-        if(!configFileConfiguration.contains("find-item-command.hideshop-autocomplete", true)) {
-            configFileConfiguration.set("find-item-command.hideshop-autocomplete", "hideshop");
-        }
-        if(!configFileConfiguration.contains("find-item-command.revealshop-autocomplete", true)) {
-            configFileConfiguration.set("find-item-command.revealshop-autocomplete", "revealshop");
-        }
-        if(!configFileConfiguration.contains("find-item-command.shop-hide-success-message", true)) {
-            configFileConfiguration.set("find-item-command.shop-hide-success-message", "&aShop is now hidden from search list!");
-        }
-        if(!configFileConfiguration.contains("find-item-command.shop-reveal-success-message", true)) {
-            configFileConfiguration.set("find-item-command.shop-reveal-success-message", "&aShop is no longer hidden from search list!");
-        }
-        if(!configFileConfiguration.contains("find-item-command.shop-already-hidden-message", true)) {
-            configFileConfiguration.set("find-item-command.shop-already-hidden-message", "&cThis shop is already hidden!");
-        }
-        if(!configFileConfiguration.contains("find-item-command.shop-already-public-message", true)) {
-            configFileConfiguration.set("find-item-command.shop-already-public-message", "&cThis shop is already public!");
-        }
-        if(!configFileConfiguration.contains("find-item-command.invalid-shop-block-message", true)) {
-            configFileConfiguration.set("find-item-command.invalid-shop-block-message", "&cThe block you are looking at is not a shop!");
-        }
-        if(!configFileConfiguration.contains("find-item-command.hiding-shop-owner-invalid-message", true)) {
-            configFileConfiguration.set("find-item-command.hiding-shop-owner-invalid-message", "&cThat shop is not yours!");
-        }
-
-        // ALWAYS AT LAST
-        if(!configFileConfiguration.contains("config-version", true)) {
-            configFileConfiguration.set("config-version", CURRENT_CONFIG_VERSION);
-        }
-        else {
-            // Automatic Config upgrade process
-            // Config v10
-            if(configFileConfiguration.getInt("config-version") < 10) {
-                boolean allowDirectShopTp = configFileConfiguration.getBoolean("allow-direct-shop-tp");
-                String clickToTeleportMsg = configFileConfiguration.getString("click-to-teleport-message");
-                String shopTPNoPermMsg = configFileConfiguration.getString("shop-tp-no-permission-message");
-                String unsafeShopAreaMsg = configFileConfiguration.getString("unsafe-shop-area-message");
-                // clear existing config properties
-                configFileConfiguration.set("allow-direct-shop-tp", null);
-                configFileConfiguration.set("click-to-teleport-message", null);
-                configFileConfiguration.set("shop-tp-no-permission-message", null);
-                configFileConfiguration.set("unsafe-shop-area-message", null);
-                // set the new properties
-                configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.tp-player-directly-to-shop", allowDirectShopTp);
-                if(clickToTeleportMsg == null || clickToTeleportMsg.isEmpty())
-                    configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.click-to-teleport-message", "&6&lClick to teleport to the shop!");
-                else
-                    configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.click-to-teleport-message", clickToTeleportMsg);
-
-                if(shopTPNoPermMsg == null || shopTPNoPermMsg.isEmpty())
-                    configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.shop-tp-no-permission-message", "&cYou don't have permission to teleport to shop!");
-                else
-                    configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.shop-tp-no-permission-message", shopTPNoPermMsg);
-
-                if(unsafeShopAreaMsg == null || unsafeShopAreaMsg.isEmpty())
-                    configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.unsafe-shop-area-message", "&cThe area around the shop is unsafe!");
-                else
-                    configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.unsafe-shop-area-message", unsafeShopAreaMsg);
-
-                configFileConfiguration.set("player-shop-teleportation.nearest-warp-tp-mode.tp-player-to-nearest-warp", false);
-            }
-            // Config v11
-            if(configFileConfiguration.getInt("config-version") < 11) {
-                List<String> cmdAliases = new ArrayList<>();
-                cmdAliases.add("searchshop");
-                cmdAliases.add("shopsearch");
-                cmdAliases.add("searchitem");
-                configFileConfiguration.set("find-item-command.command-alias", cmdAliases);
-
-                boolean warpState = configFileConfiguration.getBoolean("player-shop-teleportation.nearest-warp-tp-mode.warp-player-to-nearest-warp");
-                if(warpState)
-                    configFileConfiguration.set("player-shop-teleportation.nearest-warp-tp-mode.tp-player-to-nearest-warp", true);
-                // if warpState is false, don't bother updating tPState
-
-                // remove an erroneous field added in previous version
-                configFileConfiguration.set("player-shop-teleportation.nearest-warp-tp-mode.warp-player-to-nearest-warp", null);
-
-                // Update GUI next/previous button to blank if set to default value for the new player-head icons
-                if(configFileConfiguration.getString("shop-gui-back-button-material").equalsIgnoreCase("RED_CONCRETE")) {
-                    configFileConfiguration.set("shop-gui-back-button-material", "");
-                }
-                if(configFileConfiguration.getString("shop-gui-next-button-material").equalsIgnoreCase("GREEN_CONCRETE")) {
-                    configFileConfiguration.set("shop-gui-next-button-material", "");
-                }
-
-                // Add option to configure player visit cooldown
-                configFileConfiguration.set("shop-player-visit-cooldown-in-minutes", 5);
-            }
-            // Config 12
-            if(configFileConfiguration.getInt("config-version") < 12) {
-                configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.tp-delay-in-seconds", 0);
-                configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.tp-delay-message", "&6You will be teleported in &c{DELAY} &6seconds...");
-            }
-            // Config 13
-            if(configFileConfiguration.getInt("config-version") < 13) {
-                configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.tp-to-own-shop-no-permission-message", "&cYou cannot teleport to your own shop!");
-                configFileConfiguration.set("ignore-empty-chests", true);
-                configFileConfiguration.set("shop-gui-goto-first-page-button-material", "");
-                configFileConfiguration.set("shop-gui-goto-first-page-button-text", "&7&l« &cGo to First Page");
-                configFileConfiguration.set("shop-gui-goto-first-page-button-custom-model-data", "");
-                configFileConfiguration.set("shop-gui-goto-last-page-button-material", "");
-                configFileConfiguration.set("shop-gui-goto-last-page-button-text", "&aGo to Last Page &7&l»");
-                configFileConfiguration.set("shop-gui-goto-last-page-button-custom-model-data", "");
-            }
-
-            // AT LAST
-            // Moving debug-mode and config-version to the last
-            boolean userDefinedDebugMode = configFileConfiguration.getBoolean("debug-mode");
-            configFileConfiguration.set("debug-mode", null);
-            configFileConfiguration.set("debug-mode", userDefinedDebugMode);
-            configFileConfiguration.set("config-version", null);
-            configFileConfiguration.set("config-version", CURRENT_CONFIG_VERSION);
-        }
-    }
-
-    public static FileConfiguration get() {
-        return configFileConfiguration;
-    }
-
-    public static void reloadConfig() {
-        configFileConfiguration = YamlConfiguration.loadConfiguration(configFile);
-    }
-
-    /**
-     * Added in 2.0
-     */
-    public static void copySampleConfig() {
-        FindItemAddOn.getInstance().saveResource("sample-config.yml", true);
-    }
-}

src/main/java/io/myzticbean/finditemaddon/Dependencies/EssentialsXPlugin.java

@@ -1,57 +0,0 @@
-package io.myzticbean.finditemaddon.Dependencies;
-
-import com.earth2me.essentials.Essentials;
-import io.myzticbean.finditemaddon.Models.EssentialWarpModel;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
-import org.bukkit.Bukkit;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Hook for EssentialsX Plugin
- * @author myzticbean
- */
-public class EssentialsXPlugin {
-
-    private static Essentials essAPI = null;
-    private static List<EssentialWarpModel> allWarpsList = null;
-
-    public static void setup() {
-        if(Bukkit.getPluginManager().isPluginEnabled("Essentials")) {
-            essAPI = (Essentials) Bukkit.getServer().getPluginManager().getPlugin("Essentials");
-            if(essAPI != null) {
-                LoggerUtils.logInfo("Found Essentials");
-            }
-        }
-    }
-
-    public static boolean isEnabled() {
-        return essAPI != null;
-    }
-
-    public static Essentials getAPI() {
-        return essAPI;
-    }
-
-    public static List<EssentialWarpModel> getAllWarps() { return allWarpsList; }
-
-    public static void updateAllWarps() {
-        LoggerUtils.logInfo("Updating Essentials warps list...");
-        if(essAPI.isEnabled()) {
-            Collection<String> allWarps = EssentialsXPlugin.getAPI().getWarps().getList();
-            allWarpsList = new ArrayList<>();
-            allWarps.forEach(warp -> {
-                try {
-                    EssentialWarpModel essWarp = new EssentialWarpModel();
-                    essWarp.warpName = warp;
-                    essWarp.warpLoc = essAPI.getWarps().getWarp(warp);
-                    allWarpsList.add(essWarp);
-                } catch (Exception ignored) { }
-            });
-        }
-        LoggerUtils.logInfo("Update complete! Found " + getAllWarps().size() + " warps.");
-    }
-
-}

src/main/java/io/myzticbean/finditemaddon/Dependencies/PWarpPlugin.java

@@ -1,31 +0,0 @@
-package io.myzticbean.finditemaddon.Dependencies;
-
-//import me.ronsane.finditemaddon.finditemaddon.Utils.LoggerUtils;
-//import me.tks.playerwarp.PWarp;
-//import me.tks.playerwarp.Warp;
-//import me.tks.playerwarp.WarpList;
-//import org.bukkit.Bukkit;
-
-public class PWarpPlugin {
-
-//    private static PWarp pWarp = null;
-//
-//    public static void setup() {
-//        if(Bukkit.getPluginManager().isPluginEnabled("PWarp")) {
-//            LoggerUtils.logInfo("Found PWarp");
-//            pWarp = PWarp.getPlugin(PWarp.class);
-//        }
-//    }
-//    public static PWarp getAPI() {
-//        return pWarp;
-//    }
-//
-//    public static boolean isEnabled() {
-//        return pWarp != null;
-//    }
-//
-//    public static List<Warp> getAllWarps() {
-//
-//        return PWarp.wL.getWarps();
-//    }
-}

src/main/java/io/myzticbean/finditemaddon/Dependencies/WGPlugin.java

@@ -1,32 +0,0 @@
-package io.myzticbean.finditemaddon.Dependencies;
-
-import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
-import org.bukkit.Bukkit;
-
-public class WGPlugin {
-
-    private static boolean isPluginEnabled;
-
-    public static void setup() {
-        if(Bukkit.getPluginManager().isPluginEnabled("WorldGuard")) {
-            LoggerUtils.logInfo("Found WorldGuard");
-            isPluginEnabled = true;
-        }
-        else {
-            isPluginEnabled = false;
-        }
-    }
-
-    public static WorldGuardPlugin getWgPluginInstance() {
-        return WorldGuardPlugin.inst();
-    }
-
-    public static WorldGuard getWgInstance () { return WorldGuard.getInstance(); }
-
-    public static boolean isEnabled() {
-        return isPluginEnabled;
-    }
-
-}

src/main/java/io/myzticbean/finditemaddon/FindItemAddOn.java

@@ -1,22 +1,49 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package io.myzticbean.finditemaddon;
 
-import io.myzticbean.finditemaddon.Commands.SAPICommands.*;
-import io.myzticbean.finditemaddon.ConfigUtil.ConfigProvider;
-import io.myzticbean.finditemaddon.ConfigUtil.ConfigSetup;
-import io.myzticbean.finditemaddon.Dependencies.EssentialsXPlugin;
-import io.myzticbean.finditemaddon.Dependencies.PlayerWarpsPlugin;
-import io.myzticbean.finditemaddon.Dependencies.WGPlugin;
-import io.myzticbean.finditemaddon.Handlers.GUIHandler.PlayerMenuUtility;
-import io.myzticbean.finditemaddon.Listeners.*;
-import io.myzticbean.finditemaddon.Metrics.Metrics;
-import io.myzticbean.finditemaddon.QuickShopHandler.QSApi;
-import io.myzticbean.finditemaddon.QuickShopHandler.QSHikariAPIHandler;
-import io.myzticbean.finditemaddon.QuickShopHandler.QSReremakeAPIHandler;
-import io.myzticbean.finditemaddon.ScheduledTasks.Task15MinInterval;
-import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPerms;
-import io.myzticbean.finditemaddon.Utils.JsonStorageUtils.ShopSearchActivityStorageUtil;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
-import io.myzticbean.finditemaddon.Utils.UpdateChecker;
+import io.myzticbean.finditemaddon.commands.simpapi.BuySubCmd;
+import io.myzticbean.finditemaddon.commands.simpapi.HideShopSubCmd;
+import io.myzticbean.finditemaddon.commands.simpapi.ReloadSubCmd;
+import io.myzticbean.finditemaddon.commands.simpapi.RevealShopSubCmd;
+import io.myzticbean.finditemaddon.commands.simpapi.SellSubCmd;
+import io.myzticbean.finditemaddon.config.ConfigProvider;
+import io.myzticbean.finditemaddon.config.ConfigSetup;
+import io.myzticbean.finditemaddon.dependencies.EssentialsXPlugin;
+import io.myzticbean.finditemaddon.dependencies.PlayerWarpsPlugin;
+import io.myzticbean.finditemaddon.dependencies.ResidencePlugin;
+import io.myzticbean.finditemaddon.dependencies.WGPlugin;
+import io.myzticbean.finditemaddon.dependencies.BentoBoxPlugin;
+import io.myzticbean.finditemaddon.handlers.gui.PlayerMenuUtility;
+import io.myzticbean.finditemaddon.listeners.*;
+import io.myzticbean.finditemaddon.metrics.Metrics;
+import io.myzticbean.finditemaddon.quickshop.QSApi;
+import io.myzticbean.finditemaddon.quickshop.impl.QSHikariAPIHandler;
+import io.myzticbean.finditemaddon.quickshop.impl.QSReremakeAPIHandler;
+import io.myzticbean.finditemaddon.scheduledtasks.Task15MinInterval;
+import io.myzticbean.finditemaddon.models.enums.PlayerPermsEnum;
+import io.myzticbean.finditemaddon.utils.async.VirtualThreadScheduler;
+import io.myzticbean.finditemaddon.utils.json.ShopSearchActivityStorageUtil;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import io.myzticbean.finditemaddon.utils.UpdateChecker;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import me.kodysimpson.simpapi.command.CommandManager;
 import me.kodysimpson.simpapi.command.SubCommand;
@@ -26,45 +53,90 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
+@Slf4j
 public final class FindItemAddOn extends JavaPlugin {
 
-    private static Plugin plugin;
-    public FindItemAddOn() { plugin = this; }
-    public static Plugin getInstance() { return plugin; }
+    // ONLY FOR SNAPSHOT BUILDS
+    // Change it to whenever you want your snapshot trial build to expire
+    private static final boolean ENABLE_TRIAL_PERIOD = false;
+    private static final int TRIAL_END_YEAR = 2024, TRIAL_END_MONTH = 5, TRIAL_END_DAY = 5;
+    // ************************************************************************************
+
+    private static Plugin pluginInstance;
+
+    public FindItemAddOn() {
+        pluginInstance = this;
+    }
+
+    public static Plugin getInstance() {
+        return pluginInstance;
+    }
+
     public static String serverVersion;
-    private final static int BS_PLUGIN_METRIC_ID = 12382;
-    private final static int SPIGOT_PLUGIN_ID = 95104;
-    private final static int REPEATING_TASK_SCHEDULE_MINS = 15*60*20;
+
+    private static final int BS_PLUGIN_METRIC_ID = 12382;
+    private static final int SPIGOT_PLUGIN_ID = 95104;
+    private static final String MODRINTH_PROJECT_SLUG = "asp13ugE";
+    private static final int REPEATING_TASK_SCHEDULE_MINS = 15*60*20;
+    @Getter
     private static ConfigProvider configProvider;
+    @Getter
+    private static UpdateChecker updateChecker;
+    @Getter
     private static boolean isPluginOutdated = false;
+    @Getter
     private static boolean qSReremakeInstalled = false;
+    @Getter
     private static boolean qSHikariInstalled = false;
     private static QSApi qsApi;
+    @Getter
+    private static BentoBoxPlugin bentoboxPlugin;
 
     private static final HashMap<Player, PlayerMenuUtility> playerMenuUtilityMap = new HashMap<>();
 
     @Override
     public void onLoad() {
-        LoggerUtils.logInfo("A Shop Search AddOn for QuickShop developed by myzticbean");
+        Logger.logInfo("A Shop Search AddOn for QuickShop developed by myzticbean");
 
         // Show warning if it's a snapshot build
         if(this.getDescription().getVersion().toLowerCase().contains("snapshot")) {
-            LoggerUtils.logWarning("This is a SNAPSHOT build! NOT recommended for production servers.");
-            LoggerUtils.logWarning("If you find any bugs, please report them here: https://github.com/myzticbean/QSFindItemAddOn/issues");
+            Logger.logWarning("This is a SNAPSHOT build! NOT recommended for production servers.");
+            Logger.logWarning("If you find any bugs, please report them here: https://github.com/myzticbean/QSFindItemAddOn/issues");
         }
-
-
     }
     @Override
     public void onEnable() {
 
+        if(ENABLE_TRIAL_PERIOD) {
+            Logger.logWarning("THIS IS A TRIAL BUILD!");
+            LocalDateTime trialEndDate = LocalDate.of(TRIAL_END_YEAR, TRIAL_END_MONTH, TRIAL_END_DAY).atTime(LocalTime.MIDNIGHT);
+            LocalDateTime today = LocalDateTime.now();
+            Duration duration = Duration.between(trialEndDate, today);
+            boolean hasPassed = Duration.ofDays(ChronoUnit.DAYS.between(today, trialEndDate)).isNegative();
+            if(hasPassed) {
+                Logger.logError("Your trial has expired! Please contact the developer.");
+                getServer().getPluginManager().disablePlugin(this);
+                return;
+            } else {
+                Logger.logWarning("You have " + Math.abs(duration.toDays()) + " days remaining in your trial.");
+            }
+        }
+
         if(!Bukkit.getPluginManager().isPluginEnabled("QuickShop")
                 && !Bukkit.getPluginManager().isPluginEnabled("QuickShop-Hikari")) {
-            LoggerUtils.logInfo("Delaying QuickShop hook as they are not enabled yet");
+            Logger.logInfo("Delaying QuickShop hook as they are not enabled yet");
         }
         else if(Bukkit.getPluginManager().isPluginEnabled("QuickShop")) {
             qSReremakeInstalled = true;
@@ -89,7 +161,7 @@ public final class FindItemAddOn extends JavaPlugin {
         initCommands();
 
         // Run plugin startup logic after server is done loading
-        Bukkit.getScheduler().scheduleSyncDelayedTask(FindItemAddOn.getInstance(), () -> runPluginStartupTasks());
+        Bukkit.getScheduler().scheduleSyncDelayedTask(FindItemAddOn.getInstance(), this::runPluginStartupTasks);
     }
 
     @Override
@@ -98,52 +170,33 @@ public final class FindItemAddOn extends JavaPlugin {
         if(qsApi != null) {
             ShopSearchActivityStorageUtil.saveShopsToFile();
         }
-        else {
-            LoggerUtils.logError("Uh oh! Looks like either this plugin has crashed or you don't have QuickShop or QuickShop-Hikari installed.");
+        else if(!ENABLE_TRIAL_PERIOD) {
+            Logger.logError("Uh oh! Looks like either this plugin has crashed or you don't have QuickShop-Hikari or QuickShop-Reremake installed.");
         }
-        LoggerUtils.logInfo("Bye!");
+        VirtualThreadScheduler.shutdown();
+        Logger.logInfo("Bye!");
     }
 
     private void runPluginStartupTasks() {
-//        if(!Bukkit.getPluginManager().isPluginEnabled("QuickShop")
-//                && !Bukkit.getPluginManager().isPluginEnabled("QuickShop-Hikari")) {
-//            LoggerUtils.logError("QuickShop is required to use this addon. Please install QuickShop and try again!");
-//            LoggerUtils.logError("Both QuickShop-Reremake and QuickShop-Hikari are supported by this addon.");
-//            LoggerUtils.logError("Download links:");
-//            LoggerUtils.logError("» QuickShop-Reremake: https://www.spigotmc.org/resources/62575");
-//            LoggerUtils.logError("» QuickShop-Hikari: https://www.spigotmc.org/resources/100125");
-//            getServer().getPluginManager().disablePlugin(this);
-//            return;
-//        }
-//        else if(Bukkit.getPluginManager().isPluginEnabled("QuickShop")) {
-//            qSReremakeInstalled = true;
-//            qsApi = new QSReremakeAPIHandler();
-//            LoggerUtils.logInfo("Found QuickShop-Reremake");
-//        }
-//        else if(Bukkit.getPluginManager().isPluginEnabled("QuickShop-Hikari")) {
-//            qSHikariInstalled = true;
-//            qsApi = new QSHikariAPIHandler();
-//            LoggerUtils.logInfo("Found QuickShop-Hikari");
-//        }
 
         serverVersion = Bukkit.getServer().getVersion();
-        LoggerUtils.logInfo("Server version found: " + serverVersion);
+        Logger.logInfo("Server version found: " + serverVersion);
 
         if(!isQSReremakeInstalled() && !isQSHikariInstalled()) {
-            LoggerUtils.logError("QuickShop is required to use this addon. Please install QuickShop and try again!");
-            LoggerUtils.logError("Both QuickShop-Reremake and QuickShop-Hikari are supported by this addon.");
-            LoggerUtils.logError("Download links:");
-            LoggerUtils.logError("» QuickShop-Reremake: https://www.spigotmc.org/resources/62575");
-            LoggerUtils.logError("» QuickShop-Hikari: https://www.spigotmc.org/resources/100125");
+            Logger.logError("QuickShop is required to use this addon. Please install QuickShop and try again!");
+            Logger.logError("Both QuickShop-Hikari and QuickShop-Reremake are supported by this addon.");
+            Logger.logError("Download links:");
+            Logger.logError("» QuickShop-Hikari: https://www.spigotmc.org/resources/100125");
+            Logger.logError("» QuickShop-Reremake (Support ending soon): https://www.spigotmc.org/resources/62575");
             getServer().getPluginManager().disablePlugin(this);
             return;
         }
         else if(isQSReremakeInstalled()) {
-            LoggerUtils.logInfo("Found QuickShop-Reremake");
+            Logger.logInfo("Found QuickShop-Reremake");
             qsApi = new QSReremakeAPIHandler();
             qsApi.registerSubCommand();
         } else {
-            LoggerUtils.logInfo("Found QuickShop-Hikari");
+            Logger.logInfo("Found QuickShop-Hikari");
             qsApi = new QSHikariAPIHandler();
             qsApi.registerSubCommand();
         }
@@ -151,64 +204,77 @@ public final class FindItemAddOn extends JavaPlugin {
         // Load all hidden shops from file
         ShopSearchActivityStorageUtil.loadShopsFromFile();
 
-        // v2.0.0 - Migrating hiddenShops.json to shops.json
+        // v2.0.0.0 - Migrating hiddenShops.json to shops.json
         ShopSearchActivityStorageUtil.migrateHiddenShopsToShopsJson();
 
+        // Setup optional dependencies
         PlayerWarpsPlugin.setup();
         EssentialsXPlugin.setup();
         WGPlugin.setup();
+        ResidencePlugin.setup();
+        bentoboxPlugin = new BentoBoxPlugin();
 
         initExternalPluginEventListeners();
 
         // Initiate batch tasks
-        LoggerUtils.logInfo("Registering tasks");
+        Logger.logInfo("Registering tasks");
         Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(this, new Task15MinInterval(), 0, REPEATING_TASK_SCHEDULE_MINS);
 
         // init metrics
-        LoggerUtils.logInfo("Registering anonymous bStats metrics");
-        Metrics metrics = new Metrics(this, BS_PLUGIN_METRIC_ID);
+        Logger.logInfo("Registering anonymous bStats metrics");
+        new Metrics(this, BS_PLUGIN_METRIC_ID);
 
         // Check for plugin updates
-        new UpdateChecker(SPIGOT_PLUGIN_ID).getLatestVersion(version -> {
-            if(this.getDescription().getVersion().equalsIgnoreCase(version)) {
-                LoggerUtils.logInfo("Oh awesome! Plugin is up to date");
-            } else {
+        updateChecker = new UpdateChecker();
+        checkForPluginUpdates();
+    }
+
+    private void checkForPluginUpdates() {
+//        updateChecker.getLatestVersion(version -> {
+//            if(this.getDescription().getVersion().equalsIgnoreCase(version)) {
+//                Logger.logInfo("Plugin is up to date!");
+//            } else {
+//                isPluginOutdated = true;
+//                if(version.toLowerCase().contains("snapshot")) {
+//                    Logger.logWarning("Plugin has a new snapshot version available! (Version: " + version + ")");
+//                }
+//                else {
+//                    Logger.logWarning("Plugin has a new update available! (Version: " + version + ")");
+//                }
+//                Logger.logWarning("Download here: https://www.spigotmc.org/resources/" + SPIGOT_PLUGIN_ID + "/");
+//            }
+//        });
+        updateChecker.isUpdateAvailable(isUpdateAvailable -> {
+            if(Boolean.TRUE.equals(isUpdateAvailable)) {
                 isPluginOutdated = true;
-                if(version.toLowerCase().contains("snapshot")) {
-                    LoggerUtils.logWarning("Plugin has a new snapshot version available! (Version: " + version + ")");
-                }
-                else {
-                    LoggerUtils.logWarning("Plugin has a new update available! (Version: " + version + ")");
-                }
-                LoggerUtils.logWarning("Download here: https://www.spigotmc.org/resources/" + SPIGOT_PLUGIN_ID + "/");
             }
         });
     }
 
     private void initCommands() {
-        LoggerUtils.logInfo("Registering commands");
+        Logger.logInfo("Registering commands");
         initFindItemCmd();
         initFindItemAdminCmd();
     }
 
     private void initBukkitEventListeners() {
-        LoggerUtils.logInfo("Registering Bukkit event listeners");
+        Logger.logInfo("Registering Bukkit event listeners");
         this.getServer().getPluginManager().registerEvents(new PluginEnableEventListener(), this);
         this.getServer().getPluginManager().registerEvents(new PlayerCommandSendEventListener(), this);
         this.getServer().getPluginManager().registerEvents(new MenuListener(), this);
         this.getServer().getPluginManager().registerEvents(new PlayerJoinEventListener(), this);
+        // QS-Hikari specific event listeners
+        this.getServer().getPluginManager().registerEvents(new ShopCreateEventListener(), this);
+        this.getServer().getPluginManager().registerEvents(new ShopDeleteEventListener(), this);
     }
+
     private void initExternalPluginEventListeners() {
-        LoggerUtils.logInfo("Registering external plugin event listeners");
+        Logger.logInfo("Registering external plugin event listeners");
         if(PlayerWarpsPlugin.getIsEnabled()) {
             this.getServer().getPluginManager().registerEvents(new PWPlayerWarpRemoveEventListener(), this);
             this.getServer().getPluginManager().registerEvents(new PWPlayerWarpCreateEventListener(), this);
         }
     }
-    
-    public static ConfigProvider getConfigProvider() {
-        return configProvider;
-    }
 
     public static void initConfigProvider() {
         configProvider = new ConfigProvider();
@@ -226,14 +292,14 @@ public final class FindItemAddOn extends JavaPlugin {
         }
     }
 
-    public static boolean getPluginOutdated() {
-        return isPluginOutdated;
-    }
-
     public static int getPluginID() {
         return SPIGOT_PLUGIN_ID;
     }
 
+    public static String getModrinthProjectSlug() {
+        return MODRINTH_PROJECT_SLUG;
+    }
+
     private void initFindItemCmd() {
         List<String> alias;
         if(StringUtils.isEmpty(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_SELL_AUTOCOMPLETE)
@@ -243,6 +309,17 @@ public final class FindItemAddOn extends JavaPlugin {
         else {
             alias = FindItemAddOn.getConfigProvider().FIND_ITEM_COMMAND_ALIAS;
         }
+
+        Class<? extends SubCommand>[] subCommands;
+        if(FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
+            subCommands = new Class[] {
+                    SellSubCmd.class, BuySubCmd.class
+            };
+        } else {
+            subCommands = new Class[] {
+                    SellSubCmd.class, BuySubCmd.class, HideShopSubCmd.class, RevealShopSubCmd.class
+            };
+        }
         // Register the subcommands under a core command
         try {
             CommandManager.createCoreCommand(
@@ -260,20 +337,14 @@ public final class FindItemAddOn extends JavaPlugin {
                         }
                         commandSender.sendMessage(ColorTranslator.translateColorCodes(""));
                         commandSender.sendMessage(ColorTranslator.translateColorCodes("&#b3b300Command alias:"));
-                        alias.forEach(alias_i -> {
-                            commandSender.sendMessage(ColorTranslator.translateColorCodes("&8&l» &#2db300/" + alias_i));
-                        });
+                        alias.forEach(alias_i -> commandSender.sendMessage(ColorTranslator.translateColorCodes("&8&l» &#2db300/" + alias_i)));
                         commandSender.sendMessage(ColorTranslator.translateColorCodes(""));
                     },
                     alias,
-                    SellSubCmd.class,
-                    BuySubCmd.class,
-                    HideShopSubCmd.class,
-                    RevealShopSubCmd.class);
-            LoggerUtils.logInfo("Registered /finditem command");
+                    subCommands);
+            Logger.logInfo("Registered /finditem command");
         } catch (NoSuchFieldException | IllegalAccessException e) {
-            LoggerUtils.logError(e.getMessage());
-            e.printStackTrace();
+            Logger.logError(e);
         }
     }
 
@@ -288,8 +359,8 @@ public final class FindItemAddOn extends JavaPlugin {
                     (commandSender, subCommandList) -> {
                         if (
                                 (commandSender.isOp())
-                                        || (!commandSender.isOp() && (commandSender.hasPermission(PlayerPerms.FINDITEM_ADMIN.value())
-                                        || commandSender.hasPermission(PlayerPerms.FINDITEM_RELOAD.value())))
+                                        || (!commandSender.isOp() && (commandSender.hasPermission(PlayerPermsEnum.FINDITEM_ADMIN.value())
+                                        || commandSender.hasPermission(PlayerPermsEnum.FINDITEM_RELOAD.value())))
                         ) {
                             commandSender.sendMessage(ColorTranslator.translateColorCodes(""));
                             commandSender.sendMessage(ColorTranslator.translateColorCodes("&7-----------------------------"));
@@ -301,29 +372,18 @@ public final class FindItemAddOn extends JavaPlugin {
                             }
                             commandSender.sendMessage(ColorTranslator.translateColorCodes(""));
                             commandSender.sendMessage(ColorTranslator.translateColorCodes("&#b3b300Command alias:"));
-                            alias.forEach(alias_i -> {
-                                commandSender.sendMessage(ColorTranslator.translateColorCodes("&8&l» &#2db300/" + alias_i));
-                            });
+                            alias.forEach(alias_i -> commandSender.sendMessage(ColorTranslator.translateColorCodes("&8&l» &#2db300/" + alias_i)));
                             commandSender.sendMessage(ColorTranslator.translateColorCodes(""));
                         }
                     },
                     alias,
                     ReloadSubCmd.class);
-            LoggerUtils.logInfo("Registered /finditemadmin command");
+            Logger.logInfo("Registered /finditemadmin command");
         } catch (NoSuchFieldException | IllegalAccessException e) {
-            LoggerUtils.logError(e.getMessage());
-            e.printStackTrace();
+            Logger.logError(e);
         }
     }
 
-    public static boolean isQSReremakeInstalled() {
-        return qSReremakeInstalled;
-    }
-
-    public static boolean isQSHikariInstalled() {
-        return qSHikariInstalled;
-    }
-
     public static void setQSReremakeInstalled(boolean qSReremakeInstalled) {
         FindItemAddOn.qSReremakeInstalled = qSReremakeInstalled;
     }

src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/Menu.java

@@ -1,70 +0,0 @@
-package io.myzticbean.finditemaddon.Handlers.GUIHandler;
-
-import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Models.FoundShopItemModel;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-/**
- * Based on an awesome tutorial from https://www.youtube.com/watch?v=xebH6M_7k18
- * Gui pagination: https://www.youtube.com/watch?v=e80NO9Pgz7s
- */
-public abstract class Menu implements InventoryHolder {
-
-    protected Inventory inventory;
-
-    protected PlayerMenuUtility playerMenuUtility;
-
-    protected ItemStack GUI_FILLER_ITEM;
-
-    protected Menu(PlayerMenuUtility playerMenuUtility) {
-        this.playerMenuUtility = playerMenuUtility;
-
-        assert FindItemAddOn.getConfigProvider().SHOP_GUI_FILLER_ITEM != null;
-        Material fillerMaterial = Material.getMaterial(FindItemAddOn.getConfigProvider().SHOP_GUI_FILLER_ITEM);
-        if(fillerMaterial == null) {
-            fillerMaterial = Material.GRAY_STAINED_GLASS_PANE;
-        }
-        GUI_FILLER_ITEM = new ItemStack(fillerMaterial);
-        ItemMeta FILLER_GLASS_meta = this.GUI_FILLER_ITEM.getItemMeta();
-        assert FILLER_GLASS_meta != null;
-        FILLER_GLASS_meta.setDisplayName(" ");
-        this.GUI_FILLER_ITEM.setItemMeta(FILLER_GLASS_meta);
-    }
-
-    public abstract String getMenuName();
-
-    public abstract int getSlots();
-
-    public abstract void handleMenu(InventoryClickEvent e);
-
-    public abstract void setMenuItems();
-
-    public abstract void setMenuItems(List<FoundShopItemModel> foundShops);
-
-    public void open() {
-        inventory = Bukkit.createInventory(this, getSlots(), getMenuName());
-        this.setMenuItems();
-        playerMenuUtility.getOwner().openInventory(inventory);
-    }
-
-    public void open(List<FoundShopItemModel> foundShops) {
-        inventory = Bukkit.createInventory(this, getSlots(), getMenuName());
-        this.setMenuItems(foundShops);
-        playerMenuUtility.getOwner().openInventory(inventory);
-    }
-
-    @NotNull
-    @Override
-    public Inventory getInventory() {
-        return inventory;
-    }
-}

src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/Menus/FoundShopsMenu.java

@@ -1,422 +0,0 @@
-package io.myzticbean.finditemaddon.Handlers.GUIHandler.Menus;
-
-import io.myzticbean.finditemaddon.Dependencies.EssentialsXPlugin;
-import io.myzticbean.finditemaddon.Dependencies.PlayerWarpsPlugin;
-import io.myzticbean.finditemaddon.Dependencies.WGPlugin;
-import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Handlers.GUIHandler.PaginatedMenu;
-import io.myzticbean.finditemaddon.Handlers.GUIHandler.PlayerMenuUtility;
-import io.myzticbean.finditemaddon.Models.FoundShopItemModel;
-import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPerms;
-import io.myzticbean.finditemaddon.Utils.Defaults.ShopLorePlaceholders;
-import io.myzticbean.finditemaddon.Utils.JsonStorageUtils.ShopSearchActivityStorageUtil;
-import io.myzticbean.finditemaddon.Utils.LocationUtils;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
-import io.myzticbean.finditemaddon.Utils.WarpUtils.EssentialWarpsUtil;
-import io.myzticbean.finditemaddon.Utils.WarpUtils.PlayerWarpsUtil;
-import io.myzticbean.finditemaddon.Utils.WarpUtils.WGRegionUtils;
-import io.papermc.lib.PaperLib;
-import me.kodysimpson.simpapi.colors.ColorTranslator;
-import org.apache.commons.lang3.StringUtils;
-import org.bukkit.*;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataType;
-
-import java.util.*;
-
-/**
- * Handler class for FoundShops GUI
- * @author myzticbean
- */
-public class FoundShopsMenu extends PaginatedMenu {
-
-    private final String NO_WARP_NEAR_SHOP_ERROR_MSG = "No Warp near this shop";
-    private final String NO_WG_REGION_NEAR_SHOP_ERROR_MSG = "No WG Region near this shop";
-
-    public FoundShopsMenu(PlayerMenuUtility playerMenuUtility, List<FoundShopItemModel> searchResult) {
-        super(playerMenuUtility, searchResult);
-    }
-
-    @Override
-    public String getMenuName() {
-        if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_SEARCH_GUI_TITLE)) {
-            return ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().SHOP_SEARCH_GUI_TITLE);
-        }
-        else {
-            return ColorTranslator.translateColorCodes("&l» &rShops");
-        }
-    }
-
-    @Override
-    public int getSlots() {
-        return 54;
-    }
-
-    @Override
-    public void handleMenu(InventoryClickEvent event) {
-        // Previous Page
-        if(event.getSlot() == 45) {
-            handleMenuClickForNavToPrevPage(event);
-        }
-        // First Page
-        else if(event.getSlot() == 46) {
-            handleFirstPageClick(event);
-        }
-        // Last Page
-        else if(event.getSlot() == 52) {
-            handleLastPageClick(event);
-        }
-        // Next Page
-        else if(event.getSlot() == 53) {
-            handleMenuClickForNavToNextPage(event);
-        }
-        // Issue #31: Removing condition 'event.getCurrentItem().getType().equals(Material.BARRIER)'
-        else if(event.getSlot() == 49) {
-            event.getWhoClicked().closeInventory();
-        }
-        else if(event.getCurrentItem().getType().equals(Material.AIR)) {
-            // do nothing
-            LoggerUtils.logDebugInfo(event.getWhoClicked().getName() + " just clicked on AIR!");
-        }
-        else {
-            Player player = (Player) event.getWhoClicked();
-            ItemStack item = event.getCurrentItem();
-            ItemMeta meta = item.getItemMeta();
-            NamespacedKey key = new NamespacedKey(FindItemAddOn.getInstance(), "locationData");
-            if(!meta.getPersistentDataContainer().isEmpty() && meta.getPersistentDataContainer().has(key, PersistentDataType.STRING)) {
-                String locData = meta.getPersistentDataContainer().get(key, PersistentDataType.STRING);
-                List<String> locDataList = Arrays.asList(locData.split("\\s*,\\s*"));
-                if(FindItemAddOn.getConfigProvider().TP_PLAYER_DIRECTLY_TO_SHOP) {
-                    if(playerMenuUtility.getOwner().hasPermission(PlayerPerms.FINDITEM_SHOPTP.value())) {
-                        World world = Bukkit.getWorld(locDataList.get(0));
-                        int locX = Integer.parseInt(locDataList.get(1));
-                        int locY = Integer.parseInt(locDataList.get(2));
-                        int locZ = Integer.parseInt(locDataList.get(3));
-                        Location shopLocation = new Location(world, locX, locY, locZ);
-                        UUID shopOwner = ShopSearchActivityStorageUtil.getShopOwnerUUID(shopLocation);
-                        if(player.getUniqueId().equals(shopOwner) && !PlayerPerms.canPlayerTpToOwnShop(player)) {
-                            player.sendMessage(ColorTranslator.translateColorCodes(
-                                    FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + FindItemAddOn.getConfigProvider().SHOP_TP_NO_PERMISSION_MSG));
-                        }
-                        Location locToTeleport = LocationUtils.findSafeLocationAroundShop(shopLocation);
-                        if(locToTeleport != null) {
-                            // Add Player Visit Entry
-                            ShopSearchActivityStorageUtil.addPlayerVisitEntryAsync(shopLocation, player);
-
-                            // Add Short Blindness effect... maybe?
-                            // TODO: 16/06/22 Make this an option in config -> player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 10, 0, false, false, false));
-
-                            // If EssentialsX is enabled, register last location before teleporting to make /back work
-                            if(EssentialsXPlugin.isEnabled()) {
-                                EssentialsXPlugin.getAPI().getUser(player).setLastLocation();
-                            }
-                            // Check for TP delay
-                            if(StringUtils.isNumeric(FindItemAddOn.getConfigProvider().TP_DELAY_IN_SECONDS)
-                                && !"0".equals(FindItemAddOn.getConfigProvider().TP_DELAY_IN_SECONDS)
-                                && !PlayerPerms.hasShopTpDelayBypassPermOrAdmin(player)) {
-                                long delay = Long.parseLong(FindItemAddOn.getConfigProvider().TP_DELAY_IN_SECONDS);
-                                LoggerUtils.logDebugInfo("Teleporting delay is set to: " + delay);
-                                String tpDelayMsg = FindItemAddOn.getConfigProvider().TP_DELAY_MESSAGE;
-                                if(!StringUtils.isEmpty(tpDelayMsg)) {
-                                    player.sendMessage(
-                                            ColorTranslator.translateColorCodes(
-                                                    FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + replaceDelayPlaceholder(tpDelayMsg,delay)));
-                                }
-                                Bukkit.getScheduler().scheduleSyncDelayedTask(
-                                        FindItemAddOn.getInstance(),
-                                        () -> PaperLib.teleportAsync(player, locToTeleport, PlayerTeleportEvent.TeleportCause.PLUGIN),
-                                        delay*20);
-                            } else {
-                                PaperLib.teleportAsync(player, locToTeleport, PlayerTeleportEvent.TeleportCause.PLUGIN);
-                            }
-                        }
-                        else {
-                            if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().UNSAFE_SHOP_AREA_MSG)) {
-                                player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX
-                                        + FindItemAddOn.getConfigProvider().UNSAFE_SHOP_AREA_MSG));
-                            }
-                        }
-                    }
-                    else {
-                        if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_TP_NO_PERMISSION_MSG)) {
-                            playerMenuUtility.getOwner()
-                                    .sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX
-                                            + FindItemAddOn.getConfigProvider().SHOP_TP_NO_PERMISSION_MSG));
-                            event.getWhoClicked().closeInventory();
-                        }
-                    }
-                    player.closeInventory();
-                }
-                else if(FindItemAddOn.getConfigProvider().TP_PLAYER_TO_NEAREST_WARP
-                    // if list size = 1, it contains Warp name
-                    && locDataList.size() == 1) {
-                    String warpName = locDataList.get(0);
-                    if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 1) {
-                        Bukkit.dispatchCommand(player, "essentials:warp " + warpName);
-                    }
-                    else if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 2) {
-                        PlayerWarpsPlugin.executeWarpPlayer(player, warpName);
-                    }
-                }
-            }
-            else {
-                LoggerUtils.logError("PersistentDataContainer doesn't have the right kind of data!");
-                return;
-            }
-        }
-    }
-
-    private void handleMenuClickForNavToNextPage(InventoryClickEvent event) {
-        if(!((index + 1) >= super.playerMenuUtility.getPlayerShopSearchResult().size())) {
-            page = page + 1;
-            super.open(super.playerMenuUtility.getPlayerShopSearchResult());
-        }
-        else {
-            if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_NAV_LAST_PAGE_ALERT_MSG)) {
-                event.getWhoClicked().sendMessage(
-                        ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + FindItemAddOn.getConfigProvider().SHOP_NAV_LAST_PAGE_ALERT_MSG));
-            }
-        }
-    }
-
-    private void handleMenuClickForNavToPrevPage(InventoryClickEvent event) {
-        if(page == 0) {
-            if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_NAV_FIRST_PAGE_ALERT_MSG)) {
-                event.getWhoClicked().sendMessage(
-                        ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX
-                                + FindItemAddOn.getConfigProvider().SHOP_NAV_FIRST_PAGE_ALERT_MSG));
-            }
-        }
-        else {
-            page = page - 1;
-            super.open(super.playerMenuUtility.getPlayerShopSearchResult());
-        }
-    }
-
-    private void handleFirstPageClick(InventoryClickEvent event) {
-        if(page == 0) {
-            if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_NAV_FIRST_PAGE_ALERT_MSG)) {
-                event.getWhoClicked().sendMessage(
-                        ColorTranslator.translateColorCodes(
-                                FindItemAddOn.getConfigProvider().PLUGIN_PREFIX
-                                        + FindItemAddOn.getConfigProvider().SHOP_NAV_FIRST_PAGE_ALERT_MSG));
-            }
-        } else {
-            page = 0;
-            super.open(super.playerMenuUtility.getPlayerShopSearchResult());
-        }
-    }
-
-    private void handleLastPageClick(InventoryClickEvent event) {
-        int listSize = super.playerMenuUtility.getPlayerShopSearchResult().size();
-        if(!((index + 1) >= listSize)) {
-            double totalPages = listSize / maxItemsPerPage;
-            if(totalPages % 10 == 0) {
-                page = (int) Math.floor(totalPages);
-                LoggerUtils.logDebugInfo("Floor page value: " + page);
-            }
-            else {
-                page = (int) Math.ceil(totalPages);
-                LoggerUtils.logDebugInfo("Ceiling page value: " + page);
-            }
-            super.open(super.playerMenuUtility.getPlayerShopSearchResult());
-        }
-        else {
-            if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_NAV_LAST_PAGE_ALERT_MSG)) {
-                event.getWhoClicked().sendMessage(
-                        ColorTranslator.translateColorCodes(
-                                FindItemAddOn.getConfigProvider().PLUGIN_PREFIX
-                                        + FindItemAddOn.getConfigProvider().SHOP_NAV_LAST_PAGE_ALERT_MSG));
-            }
-        }
-    }
-
-
-    /**
-     * Empty method in case we need to handle static GUI icons in future
-     */
-    @Override
-    public void setMenuItems() {
-        // Just overriding
-    }
-
-    /**
-     * Sets the slots in the search result GUI
-     * @param foundShops List of found shops
-     */
-    @Override
-    public void setMenuItems(List<FoundShopItemModel> foundShops) {
-        addMenuBottomBar();
-        if(foundShops != null && !foundShops.isEmpty()) {
-            int guiSlotCounter = 0;
-            while(guiSlotCounter < super.maxItemsPerPage) {
-                index = super.maxItemsPerPage * page + guiSlotCounter;
-
-                if(index >= foundShops.size())  break;
-
-                if(foundShops.get(index) != null) {
-                    // Place Search Results here
-                    FoundShopItemModel foundShop_i = foundShops.get(index);
-                    NamespacedKey key = new NamespacedKey(FindItemAddOn.getInstance(), "locationData");
-                    ItemStack item = new ItemStack(foundShop_i.getItem().getType());
-                    ItemMeta meta = item.getItemMeta();
-                    List<String> lore;
-                    lore = new ArrayList<>();
-                    com.olziedev.playerwarps.api.warp.Warp nearestPlayerWarp = null;
-                    String nearestEWarp = null;
-
-                    if(foundShop_i.getItem().hasItemMeta()) {
-                        meta = foundShop_i.getItem().getItemMeta();
-                        if(foundShop_i.getItem().getItemMeta().hasLore()) {
-                            for(String s : foundShop_i.getItem().getItemMeta().getLore()) {
-                                lore.add(ColorTranslator.translateColorCodes(s));
-                            }
-                        }
-                    }
-                    List<String> shopItemLore = FindItemAddOn.getConfigProvider().SHOP_GUI_ITEM_LORE;
-                    for(String shopItemLore_i : shopItemLore) {
-                        if(shopItemLore_i.contains(ShopLorePlaceholders.NEAREST_WARP.value())) {
-                            switch(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE) {
-                                case 1:
-                                    // EssentialWarp: Check nearest warp
-                                    if(EssentialsXPlugin.isEnabled()) {
-                                        nearestEWarp = new EssentialWarpsUtil().findNearestWarp(foundShop_i.getShopLocation());
-                                        if(nearestEWarp != null && !StringUtils.isEmpty(nearestEWarp)) {
-                                            lore.add(ColorTranslator.translateColorCodes(shopItemLore_i.replace(ShopLorePlaceholders.NEAREST_WARP.value(), nearestEWarp)));
-                                        }
-                                        else {
-                                            lore.add(ColorTranslator.translateColorCodes(shopItemLore_i.replace(ShopLorePlaceholders.NEAREST_WARP.value(), NO_WARP_NEAR_SHOP_ERROR_MSG)));
-                                        }
-                                    }
-                                    break;
-                                case 2:
-                                    // PlayerWarp: Check nearest warp
-                                    if(PlayerWarpsPlugin.getIsEnabled()) {
-                                        nearestPlayerWarp = new PlayerWarpsUtil().findNearestWarp(foundShop_i.getShopLocation());
-                                        if(nearestPlayerWarp != null) {
-                                            lore.add(ColorTranslator.translateColorCodes(shopItemLore_i.replace(ShopLorePlaceholders.NEAREST_WARP.value(), nearestPlayerWarp.getWarpName())));
-                                        }
-                                        else {
-                                            lore.add(ColorTranslator.translateColorCodes(shopItemLore_i.replace(ShopLorePlaceholders.NEAREST_WARP.value(), NO_WARP_NEAR_SHOP_ERROR_MSG)));
-                                        }
-                                    }
-                                    break;
-                                case 3:
-                                    // WG Region: Check nearest WG Region
-                                    if(WGPlugin.isEnabled()) {
-                                        String nearestWGRegion = new WGRegionUtils().findNearestWGRegion((foundShop_i.getShopLocation()));
-                                        if(nearestWGRegion != null && !StringUtils.isEmpty(nearestWGRegion)) {
-                                            lore.add(ColorTranslator.translateColorCodes(shopItemLore_i.replace(ShopLorePlaceholders.NEAREST_WARP.value(), nearestWGRegion)));
-                                        }
-                                        else {
-                                            lore.add(ColorTranslator.translateColorCodes(shopItemLore_i.replace(ShopLorePlaceholders.NEAREST_WARP.value(), NO_WG_REGION_NEAR_SHOP_ERROR_MSG)));
-                                        }
-                                    }
-                                    break;
-                                default:
-                                    LoggerUtils.logDebugInfo("Invalid value in 'nearest-warp-mode' in config.yml!");
-                            }
-                        }
-                        else {
-                            lore.add(ColorTranslator.translateColorCodes(replaceLorePlaceholders(shopItemLore_i, foundShop_i)));
-                        }
-                    }
-
-                    if(FindItemAddOn.getConfigProvider().TP_PLAYER_DIRECTLY_TO_SHOP) {
-                        if(playerMenuUtility.getOwner().hasPermission(PlayerPerms.FINDITEM_SHOPTP.value())) {
-                            lore.add(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().CLICK_TO_TELEPORT_MSG));
-                        }
-                    }
-                    assert meta != null;
-                    meta.setLore(lore);
-
-                    // storing location data in item persistent storage
-                    String locData = StringUtils.EMPTY;
-                    // store the coordinates
-                    if(FindItemAddOn.getConfigProvider().TP_PLAYER_DIRECTLY_TO_SHOP) {
-                        locData = Objects.requireNonNull(foundShop_i.getShopLocation().getWorld()).getName() + ","
-                                + foundShop_i.getShopLocation().getBlockX() + ","
-                                + foundShop_i.getShopLocation().getBlockY() + ","
-                                + foundShop_i.getShopLocation().getBlockZ();
-                    }
-                    else if(FindItemAddOn.getConfigProvider().TP_PLAYER_TO_NEAREST_WARP) {
-                        // if Nearest Warp is set to EssentialsX Warps, store the warp name
-                        if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 1) {
-                            if(nearestEWarp != null) {
-                                locData = nearestEWarp;
-                            }
-                        }
-                        // if Nearest Warp is set to PlayerWarps, store the warp name
-                        else if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 2) {
-                            if(nearestPlayerWarp != null) {
-                                locData = nearestPlayerWarp.getWarpName();
-                            }
-                        }
-                    }
-                    meta.getPersistentDataContainer().set(key, PersistentDataType.STRING, locData);
-
-                    // handling custom model data
-                    if(Objects.requireNonNull(foundShop_i.getItem().getItemMeta()).hasCustomModelData()) {
-                        meta.setCustomModelData(foundShop_i.getItem().getItemMeta().getCustomModelData());
-                    }
-                    item.setItemMeta(meta);
-                    inventory.addItem(item);
-                }
-                guiSlotCounter++;
-            }
-        }
-    }
-
-    /**
-     * Replaces all the placeholders in the Shop item lore in GUI
-     * @param text Line of lore
-     * @param shop Shop instance
-     * @return Line of lore replaced with placeholder values
-     */
-    private String replaceLorePlaceholders(String text, FoundShopItemModel shop) {
-
-        if(text.contains(ShopLorePlaceholders.ITEM_PRICE.value())) {
-            text = text.replace(ShopLorePlaceholders.ITEM_PRICE.value(), String.valueOf(shop.getShopPrice()));
-        }
-        if(text.contains(ShopLorePlaceholders.SHOP_STOCK.value())) {
-            if(shop.getRemainingStockOrSpace() == Integer.MAX_VALUE) {
-                text = text.replace(ShopLorePlaceholders.SHOP_STOCK.value(), "Unlimited");
-            }
-            else {
-                text = text.replace(ShopLorePlaceholders.SHOP_STOCK.value(), String.valueOf(shop.getRemainingStockOrSpace()));
-            }
-        }
-        if(text.contains(ShopLorePlaceholders.SHOP_OWNER.value())) {
-            OfflinePlayer shopOwner = Bukkit.getOfflinePlayer(shop.getShopOwner());
-            if(shopOwner.getName() != null) {
-                text = text.replace(ShopLorePlaceholders.SHOP_OWNER.value(), shopOwner.getName());
-            }
-            else {
-                // set a generic name for shops with no owner name
-                text = text.replace(ShopLorePlaceholders.SHOP_OWNER.value(), "Admin");
-            }
-        }
-        if(text.contains(ShopLorePlaceholders.SHOP_LOCATION.value())) {
-            text = text.replace(ShopLorePlaceholders.SHOP_LOCATION.value(),
-                    shop.getShopLocation().getBlockX() + ", "
-                    + shop.getShopLocation().getBlockY() + ", "
-                    + shop.getShopLocation().getBlockZ());
-        }
-        if(text.contains(ShopLorePlaceholders.SHOP_WORLD.value())) {
-            text = text.replace(ShopLorePlaceholders.SHOP_WORLD.value(), Objects.requireNonNull(shop.getShopLocation().getWorld()).getName());
-        }
-        // Added in v2.0
-        if(text.contains(ShopLorePlaceholders.SHOP_VISITS.value())) {
-            text = text.replace(ShopLorePlaceholders.SHOP_VISITS.value(), String.valueOf(ShopSearchActivityStorageUtil.getPlayerVisitCount(shop.getShopLocation())));
-        }
-        return text;
-    }
-
-    private String replaceDelayPlaceholder(String tpDelayMsg, long delay) {
-        return tpDelayMsg.replace("{DELAY}", String.valueOf(delay));
-    }
-}

src/main/java/io/myzticbean/finditemaddon/Handlers/GUIHandler/PlayerMenuUtility.java

@@ -1,32 +0,0 @@
-package io.myzticbean.finditemaddon.Handlers.GUIHandler;
-
-import io.myzticbean.finditemaddon.Models.FoundShopItemModel;
-import org.bukkit.entity.Player;
-
-import java.util.List;
-
-public class PlayerMenuUtility {
-    private Player owner;
-
-    private List<FoundShopItemModel> playerShopSearchResult;
-
-    public List<FoundShopItemModel> getPlayerShopSearchResult() {
-        return playerShopSearchResult;
-    }
-
-    public void setPlayerShopSearchResult(List<FoundShopItemModel> playerShopSearchResult) {
-        this.playerShopSearchResult = playerShopSearchResult;
-    }
-
-    public PlayerMenuUtility(Player owner) {
-        this.owner = owner;
-    }
-
-    public Player getOwner() {
-        return owner;
-    }
-
-    public void setOwner(Player owner) {
-        this.owner = owner;
-    }
-}

src/main/java/io/myzticbean/finditemaddon/Listeners/MenuListener.java

@@ -1,29 +0,0 @@
-package io.myzticbean.finditemaddon.Listeners;
-
-import io.myzticbean.finditemaddon.Handlers.GUIHandler.Menu;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.inventory.InventoryHolder;
-
-public class MenuListener implements Listener {
-
-    @EventHandler
-    public void onMenuClick(InventoryClickEvent e) {
-        Player p = (Player) e.getWhoClicked();
-
-        InventoryHolder holder = e.getInventory().getHolder();
-
-        if(holder instanceof Menu) {
-            e.setCancelled(true);
-
-            if(e.getCurrentItem() == null) {
-                return;
-            }
-
-            Menu menu = (Menu) holder;
-            menu.handleMenu(e);
-        }
-    }
-}

src/main/java/io/myzticbean/finditemaddon/Listeners/PWPlayerWarpCreateEventListener.java

@@ -1,17 +0,0 @@
-package io.myzticbean.finditemaddon.Listeners;
-
-import com.olziedev.playerwarps.api.events.warp.PlayerWarpCreateEvent;
-import io.myzticbean.finditemaddon.Dependencies.PlayerWarpsPlugin;
-import io.myzticbean.finditemaddon.FindItemAddOn;
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-public class PWPlayerWarpCreateEventListener implements Listener {
-    @EventHandler
-    public void onPlayerWarpCreate(PlayerWarpCreateEvent event) {
-        // Issue #24 Fix: Converted updateWarpsOnEventCall() call to async
-        Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(),
-                () -> PlayerWarpsPlugin.updateWarpsOnEventCall(event.getPlayerWarp(), false));
-    }
-}

src/main/java/io/myzticbean/finditemaddon/Listeners/PWPlayerWarpRemoveEventListener.java

@@ -1,17 +0,0 @@
-package io.myzticbean.finditemaddon.Listeners;
-
-import com.olziedev.playerwarps.api.events.warp.PlayerWarpRemoveEvent;
-import io.myzticbean.finditemaddon.Dependencies.PlayerWarpsPlugin;
-import io.myzticbean.finditemaddon.FindItemAddOn;
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-public class PWPlayerWarpRemoveEventListener implements Listener {
-    @EventHandler
-    public void onPlayerWarpRemove(PlayerWarpRemoveEvent event) {
-        // Issue #24 Fix: Converted updateWarpsOnEventCall() call to async
-        Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(),
-                () -> PlayerWarpsPlugin.updateWarpsOnEventCall(event.getPlayerWarp(), true));
-    }
-}

src/main/java/io/myzticbean/finditemaddon/Listeners/PlayerJoinEventListener.java

@@ -1,15 +0,0 @@
-package io.myzticbean.finditemaddon.Listeners;
-
-import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Utils.UpdateChecker;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-
-public class PlayerJoinEventListener implements Listener {
-
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        new UpdateChecker(FindItemAddOn.getPluginID()).notifyPlayerAboutUpdateOnJoin(event);
-    }
-}

src/main/java/io/myzticbean/finditemaddon/Models/CachedShop.java

@@ -1,16 +0,0 @@
-package io.myzticbean.finditemaddon.Models;
-
-import lombok.Builder;
-import lombok.Getter;
-import org.bukkit.Location;
-
-import java.util.Date;
-
-@Getter @Builder
-public class CachedShop {
-    private long shopId;
-    private Location shopLocation;
-    private int remainingStock;
-    private int remainingSpace;
-    private Date lastFetched;
-}

src/main/java/io/myzticbean/finditemaddon/Models/EssentialWarpModel.java

@@ -1,8 +0,0 @@
-package io.myzticbean.finditemaddon.Models;
-
-import org.bukkit.Location;
-
-public class EssentialWarpModel {
-    public String warpName;
-    public Location warpLoc;
-}

src/main/java/io/myzticbean/finditemaddon/Models/FoundShopItemModel.java

@@ -1,21 +0,0 @@
-package io.myzticbean.finditemaddon.Models;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.bukkit.Location;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.UUID;
-
-/**
- * Model for the Shop Item lore that will be shown in the search GUI
- */
-@Getter
-@AllArgsConstructor
-public class FoundShopItemModel {
-    private final double shopPrice;
-    private final int remainingStockOrSpace;
-    private final UUID shopOwner;
-    private final Location shopLocation;
-    private final ItemStack item;
-}

src/main/java/io/myzticbean/finditemaddon/Models/HiddenShopModel.java

@@ -1,84 +0,0 @@
-package io.myzticbean.finditemaddon.Models;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor
-@Getter
-public class HiddenShopModel {
-
-    private String worldName;
-    private double x;
-    private double y;
-    private double z;
-    private float pitch;
-    private float yaw;
-    private String shopOwnerUUID;
-
-//    public HiddenShopModel(String worldName, double x, double y, double z, float pitch, float yaw, String shopOwnerUUID) {
-//        this.worldName = worldName;
-//        this.x = x;
-//        this.y = y;
-//        this.z = z;
-//        this.pitch = pitch;
-//        this.yaw = yaw;
-//        this.shopOwnerUUID = shopOwnerUUID;
-//    }
-//
-//    public String getWorldName() {
-//        return worldName;
-//    }
-//
-//    public void setWorldName(String worldName) {
-//        this.worldName = worldName;
-//    }
-//
-//    public double getX() {
-//        return x;
-//    }
-//
-//    public void setX(double x) {
-//        this.x = x;
-//    }
-//
-//    public double getY() {
-//        return y;
-//    }
-//
-//    public void setY(double y) {
-//        this.y = y;
-//    }
-//
-//    public double getZ() {
-//        return z;
-//    }
-//
-//    public void setZ(double z) {
-//        this.z = z;
-//    }
-//
-//    public float getPitch() {
-//        return pitch;
-//    }
-//
-//    public void setPitch(float pitch) {
-//        this.pitch = pitch;
-//    }
-//
-//    public float getYaw() {
-//        return yaw;
-//    }
-//
-//    public void setYaw(float yaw) {
-//        this.yaw = yaw;
-//    }
-//
-//    public String getShopOwnerUUID() {
-//        return shopOwnerUUID;
-//    }
-//
-//    public void setShopOwnerUUID(String shopOwnerUUID) {
-//        this.shopOwnerUUID = shopOwnerUUID;
-//    }
-
-}

src/main/java/io/myzticbean/finditemaddon/Models/PlayerShopVisitModel.java

@@ -1,31 +0,0 @@
-package io.myzticbean.finditemaddon.Models;
-
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-
-import java.time.Instant;
-import java.util.UUID;
-
-@AllArgsConstructor
-@NoArgsConstructor
-public class PlayerShopVisitModel {
-
-    private String playerUUID;
-    private String visitDateTime;
-
-    public void setPlayerUUID(UUID uuid) {
-        this.playerUUID = uuid.toString();
-    }
-
-    public UUID getPlayerUUID() {
-        return UUID.fromString(this.playerUUID);
-    }
-
-    public void setVisitDateTime() {
-        this.visitDateTime = Instant.now().toString();
-    }
-
-    public Instant getVisitDateTime() {
-        return Instant.parse(visitDateTime);
-    }
-}

src/main/java/io/myzticbean/finditemaddon/QuickShopHandler/QSHikariAPIHandler.java

@@ -1,348 +0,0 @@
-package io.myzticbean.finditemaddon.QuickShopHandler;
-
-import cc.carm.lib.easysql.api.SQLQuery;
-import com.ghostchu.quickshop.QuickShop;
-import com.ghostchu.quickshop.api.QuickShopAPI;
-import com.ghostchu.quickshop.api.command.CommandContainer;
-import com.ghostchu.quickshop.api.obj.QUser;
-import com.ghostchu.quickshop.api.shop.Shop;
-import com.ghostchu.quickshop.api.shop.permission.BuiltInShopPermission;
-import com.ghostchu.quickshop.database.DataTables;
-import io.myzticbean.finditemaddon.Commands.QSSubCommands.FindItemCmdHikariImpl;
-import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Models.CachedShop;
-import io.myzticbean.finditemaddon.Models.FoundShopItemModel;
-import io.myzticbean.finditemaddon.Models.ShopSearchActivityModel;
-import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPerms;
-import io.myzticbean.finditemaddon.Utils.JsonStorageUtils.HiddenShopStorageUtil;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-import java.nio.charset.StandardCharsets;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * Implementation of QSApi for Hikari
- *
- * @author myzticbean
- */
-public class QSHikariAPIHandler implements QSApi<QuickShop, Shop> {
-
-    private final QuickShopAPI api;
-
-    private final ConcurrentMap<Long, CachedShop> shopCache;
-
-    private final int SHOP_CACHE_TIMEOUT_SECONDS = 60;
-
-    public QSHikariAPIHandler() {
-        api = QuickShopAPI.getInstance();
-        LoggerUtils.logInfo("Initializing Shop caching");
-        shopCache = new ConcurrentHashMap<>();
-    }
-
-    public List<FoundShopItemModel> findItemBasedOnTypeFromAllShops(ItemStack item, boolean toBuy, Player searchingPlayer) {
-        List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
-        List<Shop> allShops;
-        if (FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
-            allShops = new ArrayList<>(api.getShopManager().getLoadedShops());
-        } else {
-            allShops = getAllShops();
-        }
-        LoggerUtils.logDebugInfo(QS_TOTAL_SHOPS_ON_SERVER + allShops.size());
-        for(Shop shopIterator : allShops) {
-
-            // @TODO: Testing
-            testQuickShopHikariExternalCache(shopIterator);
-            LoggerUtils.logWarning("2: Location: " + shopIterator.getLocation() + "Stock: " + shopIterator.getRemainingStock() + " | Space: " + shopIterator.getRemainingSpace());
-
-            // check for quickshop hikari internal per-shop based search permission
-            if(shopIterator.playerAuthorize(searchingPlayer.getUniqueId(), BuiltInShopPermission.SEARCH)
-                    // check for blacklisted worlds
-                    && (!FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shopIterator.getLocation().getWorld())
-                    && shopIterator.getItem().getType().equals(item.getType())
-//                    && (toBuy ? getRemainingStockOrSpaceFromShopCache(shopIterator, true) != 0 : getRemainingStockOrSpaceFromShopCache(shopIterator, false) != 0)
-                    && (toBuy ? shopIterator.isSelling() : shopIterator.isBuying()))
-                    // check for shop if hidden
-                    && (!HiddenShopStorageUtil.isShopHidden(shopIterator))) {
-                if(checkIfShopToBeIgnoredForFullOrEmpty(toBuy, shopIterator)) {
-                    continue;
-                }
-                shopsFoundList.add(new FoundShopItemModel(
-                        shopIterator.getPrice(),
-                        QSApi.processStockOrSpace((toBuy ? getRemainingStockOrSpaceFromShopCache(shopIterator, true) : getRemainingStockOrSpaceFromShopCache(shopIterator, false))),
-                        shopIterator.getOwner().getUniqueIdOptional().orElse(new UUID(0, 0)),
-                        shopIterator.getLocation(),
-                        shopIterator.getItem()
-                ));
-            }
-        }
-        return handleShopSorting(toBuy, shopsFoundList);
-    }
-
-    @NotNull
-    static List<FoundShopItemModel> handleShopSorting(boolean toBuy, List<FoundShopItemModel> shopsFoundList) {
-        if(!shopsFoundList.isEmpty()) {
-            int sortingMethod = 2;
-            try {
-                sortingMethod = FindItemAddOn.getConfigProvider().SHOP_SORTING_METHOD;
-            }
-            catch(Exception e) {
-                LoggerUtils.logError("Invalid value in config.yml : 'shop-sorting-method'");
-                LoggerUtils.logError("Defaulting to sorting by prices method");
-            }
-            return QSApi.sortShops(sortingMethod, shopsFoundList, toBuy);
-        }
-        return shopsFoundList;
-    }
-
-    public List<FoundShopItemModel> findItemBasedOnDisplayNameFromAllShops(String displayName, boolean toBuy, Player searchingPlayer) {
-        List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
-        List<Shop> allShops;
-        if (FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
-            allShops = new ArrayList<>(api.getShopManager().getLoadedShops());
-        } else {
-            allShops = getAllShops();
-        }
-        LoggerUtils.logDebugInfo(QS_TOTAL_SHOPS_ON_SERVER + allShops.size());
-        for(Shop shopIterator : allShops) {
-            // check for quickshop hikari internal per-shop based search permission
-            if(shopIterator.playerAuthorize(searchingPlayer.getUniqueId(), BuiltInShopPermission.SEARCH)
-                    // check for blacklisted worlds
-                    && !FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shopIterator.getLocation().getWorld())
-                    // match the item based on query
-                    && shopIterator.getItem().hasItemMeta()
-                    && Objects.requireNonNull(shopIterator.getItem().getItemMeta()).hasDisplayName()
-                    && (shopIterator.getItem().getItemMeta().getDisplayName().toLowerCase().contains(displayName.toLowerCase())
-//                    && (toBuy ? getRemainingStockOrSpaceFromShopCache(shopIterator, true) != 0 : getRemainingStockOrSpaceFromShopCache(shopIterator, false) != 0)
-                    && (toBuy ? shopIterator.isSelling() : shopIterator.isBuying()))
-                    // check for shop if hidden
-                    && !HiddenShopStorageUtil.isShopHidden(shopIterator)) {
-                if(checkIfShopToBeIgnoredForFullOrEmpty(toBuy, shopIterator)) {
-                    continue;
-                }
-                shopsFoundList.add(new FoundShopItemModel(
-                        shopIterator.getPrice(),
-                        QSApi.processStockOrSpace((toBuy ? getRemainingStockOrSpaceFromShopCache(shopIterator, true) : getRemainingStockOrSpaceFromShopCache(shopIterator, false))),
-                        shopIterator.getOwner().getUniqueIdOptional().orElse(new UUID(0, 0)),
-                        shopIterator.getLocation(),
-                        shopIterator.getItem()
-                ));
-            }
-        }
-        return handleShopSorting(toBuy, shopsFoundList);
-    }
-
-    public List<FoundShopItemModel> fetchAllItemsFromAllShops(boolean toBuy, Player searchingPlayer) {
-        List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
-        List<Shop> allShops;
-        if (FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
-            allShops = new ArrayList<>(api.getShopManager().getLoadedShops());
-        } else {
-            allShops = getAllShops();
-        }
-        LoggerUtils.logDebugInfo(QS_TOTAL_SHOPS_ON_SERVER + allShops.size());
-        for(Shop shopIterator : allShops) {
-            // check for quickshop hikari internal per-shop based search permission
-            if(shopIterator.playerAuthorize(searchingPlayer.getUniqueId(), BuiltInShopPermission.SEARCH)
-                    // check for blacklisted worlds
-                    && (!FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shopIterator.getLocation().getWorld())
-//                    && (toBuy ? getRemainingStockOrSpaceFromShopCache(shopIterator, true) != 0 : getRemainingStockOrSpaceFromShopCache(shopIterator, false) != 0)
-                    && (toBuy ? shopIterator.isSelling() : shopIterator.isBuying()))
-                    // check for shop if hidden
-                    && (!HiddenShopStorageUtil.isShopHidden(shopIterator))) {
-                if(checkIfShopToBeIgnoredForFullOrEmpty(toBuy, shopIterator)) {
-                    continue;
-                }
-                shopsFoundList.add(new FoundShopItemModel(
-                        shopIterator.getPrice(),
-                        QSApi.processStockOrSpace((toBuy ? getRemainingStockOrSpaceFromShopCache(shopIterator, true) : getRemainingStockOrSpaceFromShopCache(shopIterator, false))),
-                        shopIterator.getOwner().getUniqueIdOptional().orElse(new UUID(0, 0)),
-                        shopIterator.getLocation(),
-                        shopIterator.getItem()
-                ));
-            }
-        }
-        if(!shopsFoundList.isEmpty()) {
-            int sortingMethod = 1;
-            return QSApi.sortShops(sortingMethod, shopsFoundList, toBuy);
-        }
-        return shopsFoundList;
-    }
-
-    public Material getShopSignMaterial() {
-        return com.ghostchu.quickshop.util.Util.getSignMaterial();
-    }
-
-    public Shop findShopAtLocation(Block block) {
-        Location loc = new Location(block.getWorld(), block.getX(), block.getY(), block.getZ());
-        return api.getShopManager().getShop(loc);
-    }
-
-    public boolean isShopOwnerCommandRunner(Player player, Shop shop) {
-        return shop.getOwner().toString().equalsIgnoreCase(player.getUniqueId().toString());
-    }
-
-    @Override
-    public List<Shop> getAllShops() {
-        return api.getShopManager().getAllShops();
-    }
-
-    @Override
-    public List<ShopSearchActivityModel> syncShopsListForStorage(List<ShopSearchActivityModel> globalShopsList) {
-        // copy all shops from shops list in API to a temp globalShopsList
-        // now check shops from temp globalShopsList in current globalShopsList and pull playerVisit data
-        List<ShopSearchActivityModel> tempGlobalShopsList = new ArrayList<>();
-        for (Shop shop_i : getAllShops()) {
-            Location shopLoc = shop_i.getLocation();
-            tempGlobalShopsList.add(new ShopSearchActivityModel(
-                    shopLoc.getWorld().getName(),
-                    shopLoc.getX(),
-                    shopLoc.getY(),
-                    shopLoc.getZ(),
-                    shopLoc.getPitch(),
-                    shopLoc.getYaw(),
-                    shop_i.getOwner().toString(),
-                    new ArrayList<>(),
-                    false
-            ));
-        }
-
-        for (ShopSearchActivityModel shop_temp : tempGlobalShopsList) {
-            ShopSearchActivityModel tempShopToRemove = null;
-            for (ShopSearchActivityModel shop_global : globalShopsList) {
-                if (shop_temp.getWorldName().equalsIgnoreCase(shop_global.getWorldName())
-                        && shop_temp.getX() == shop_global.getX()
-                        && shop_temp.getY() == shop_global.getY()
-                        && shop_temp.getZ() == shop_global.getZ()
-                        && shop_temp.getShopOwnerUUID().equalsIgnoreCase(shop_global.getShopOwnerUUID())
-                ) {
-                    shop_temp.setPlayerVisitList(shop_global.getPlayerVisitList());
-                    shop_temp.setHiddenFromSearch(shop_global.isHiddenFromSearch());
-                    tempShopToRemove = shop_global;
-                    break;
-                }
-            }
-            if (tempShopToRemove != null)
-                globalShopsList.remove(tempShopToRemove);
-        }
-        return tempGlobalShopsList;
-    }
-
-    /**
-     * Register finditem sub-command for /qs
-     * Unregister /qs find
-     */
-    @Override
-    public void registerSubCommand() {
-        LoggerUtils.logInfo("Unregistered find sub-command for /qs");
-        for (CommandContainer cmdContainer : api.getCommandManager().getRegisteredCommands()) {
-            if (cmdContainer.getPrefix().equalsIgnoreCase("find")) {
-                api.getCommandManager().unregisterCmd(cmdContainer);
-                break;
-            }
-        }
-        LoggerUtils.logInfo("Registered finditem sub-command for /qs");
-        /*
-            final TextComponent textComponent = Component.text("Search for items from all shops using an interactive GUI");
-            final Function<String, Component> func = x -> Component.text("Search for items from all shops using an interactive GUI");
-         */
-        api.getCommandManager().registerCmd(
-                CommandContainer.builder()
-                        .prefix("finditem")
-                        .permission(PlayerPerms.FINDITEM_USE.value())
-                        .hidden(false)
-                        .description(locale -> Component.text("Search for items from all shops using an interactive GUI"))
-                        .executor(new FindItemCmdHikariImpl())
-                        .build());
-    }
-
-    private UUID convertQUserToUUID(QUser qUser) {
-        Optional<UUID> uuid = qUser.getUniqueIdOptional();
-        if (uuid.isPresent()) {
-            return uuid.get();
-        }
-        String username = qUser.getUsernameOptional().orElse("Unknown");
-        return UUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes(StandardCharsets.UTF_8));
-    }
-
-    /**
-     * If IGNORE_EMPTY_CHESTS is true -> do not add empty stock or space
-     * If to buy -> If shop has no stock -> based on ignore flag, decide to include it or not
-     * If to sell -> If shop has no space -> based on ignore flag, decide to include it or not
-     * @param toBuy
-     * @param shop
-     * @return If shop needs to be ignored from list
-     */
-    private boolean checkIfShopToBeIgnoredForFullOrEmpty(boolean toBuy, Shop shop) {
-        boolean ignoreEmptyChests = FindItemAddOn.getConfigProvider().IGNORE_EMPTY_CHESTS;
-        if(ignoreEmptyChests) {
-            if(toBuy) {
-                return getRemainingStockOrSpaceFromShopCache(shop, true) == 0;
-
-            } else return getRemainingStockOrSpaceFromShopCache(shop, false) == 0;
-
-        }
-        return false;
-    }
-
-    /**
-     * Fallback to fetching info from ShopCache to avoid lag
-     * @param shop QuickShop Shop instance
-     * @param fetchRemainingStock True if fetching remaning stock, False if fetching remaining space
-     * @return
-     */
-    private int getRemainingStockOrSpaceFromShopCache(Shop shop, boolean fetchRemainingStock) {
-        LoggerUtils.logDebugInfo("Shop ID: " + shop.getShopId());
-        CachedShop cachedShop = shopCache.get(shop.getShopId());
-        if (cachedShop == null || QSApi.isTimeDifferenceGreaterThanSeconds(cachedShop.getLastFetched(), new Date(), SHOP_CACHE_TIMEOUT_SECONDS)) {
-            cachedShop = CachedShop.builder()
-                    .shopId(shop.getShopId())
-                    .remainingStock(shop.getRemainingStock())
-                    .remainingSpace(shop.getRemainingSpace())
-                    .lastFetched(new Date())
-                    .build();
-            shopCache.put(cachedShop.getShopId(), cachedShop);
-            LoggerUtils.logDebugInfo("Adding to ShopCache: " + shop.getShopId());
-        }
-        return (fetchRemainingStock ? cachedShop.getRemainingStock() : cachedShop.getRemainingSpace());
-    }
-
-    // An empty ResultSet or a value that returns -1 means that the value is not cached.
-    // Normally when space is -1, stock is not, and vice versa.
-    // In special cases, neither value may be -1.
-    // If Stock 0 -> Shop is admin or no stock
-    private void testQuickShopHikariExternalCache(Shop shop) throws RuntimeException {
-        long shopId = shop.getShopId();
-        try (SQLQuery query = DataTables.EXTERNAL_CACHE.createQuery()
-                .addCondition("shop", shopId)
-                .selectColumns("space", "stock")
-                .setLimit(1)
-                .build()
-                .execute(); ResultSet resultSet = query.getResultSet()) {
-            if(resultSet.next()){
-                long stock = resultSet.getLong("stock");
-                long space = resultSet.getLong("space");
-                // stock or space can be `-1`
-                LoggerUtils.logWarning("1: Location: " + shop.getLocation() + "Stock: " + stock + " | Space: " + space);
-            }else{
-                // no cached data
-                LoggerUtils.logWarning("No cached data found!");
-            }
-        }
-        catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

src/main/java/io/myzticbean/finditemaddon/ScheduledTasks/Task15MinInterval.java

@@ -1,13 +0,0 @@
-package io.myzticbean.finditemaddon.ScheduledTasks;
-
-import io.myzticbean.finditemaddon.Utils.JsonStorageUtils.ShopSearchActivityStorageUtil;
-import io.myzticbean.finditemaddon.Utils.WarpUtils.WarpUtils;
-
-public class Task15MinInterval implements Runnable {
-    @Override
-    public void run() {
-        WarpUtils.updateWarps();
-//        HiddenShopStorageUtil.saveHiddenShopsToFile();
-        ShopSearchActivityStorageUtil.syncShops();
-    }
-}

src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/ShopLorePlaceholders.java

@@ -1,21 +0,0 @@
-package io.myzticbean.finditemaddon.Utils.Defaults;
-
-/**
- * List of all the placeholds used in the Shop lore in GUI
- * @author myzticbean
- */
-public enum ShopLorePlaceholders {
-    ITEM_PRICE("{ITEM_PRICE}"),
-    SHOP_STOCK("{SHOP_STOCK}"),
-    SHOP_OWNER("{SHOP_OWNER}"),
-    SHOP_LOCATION("{SHOP_LOC}"),
-    SHOP_WORLD("{SHOP_WORLD}"),
-    NEAREST_WARP("{NEAREST_WARP}"),
-    SHOP_VISITS("{SHOP_VISITS}");
-    private final String placeholder;
-
-    ShopLorePlaceholders(String placeholder) {
-        this.placeholder = placeholder;
-    }
-    public String value() {return placeholder;}
-}

src/main/java/io/myzticbean/finditemaddon/Utils/LoggerUtils.java

@@ -1,23 +0,0 @@
-package io.myzticbean.finditemaddon.Utils;
-
-import io.myzticbean.finditemaddon.FindItemAddOn;
-import me.kodysimpson.simpapi.colors.ColorTranslator;
-import org.bukkit.Bukkit;
-
-public class LoggerUtils {
-    public static void logDebugInfo(String text) {
-        if(FindItemAddOn.getConfigProvider().DEBUG_MODE) {
-            Bukkit.getLogger().warning(ColorTranslator.translateColorCodes("[QSFindItemAddOn-DebugLog] " + text));
-        }
-    }
-    public static void logInfo(String text) {
-        Bukkit.getLogger().info(ColorTranslator.translateColorCodes("[QSFindItemAddOn] " + text));
-    }
-    public static void logError(String text) {
-        Bukkit.getLogger().severe(ColorTranslator.translateColorCodes("[QSFindItemAddOn] " + text));
-    }
-    public static void logWarning(String text) {
-//        Bukkit.getConsoleSender().sendMessage(ColorTranslator.translateColorCodes("[QSFindItemAddOn] &6" + text));
-        Bukkit.getLogger().warning(ColorTranslator.translateColorCodes("[QSFindItemAddOn] " + text));
-    }
-}

src/main/java/io/myzticbean/finditemaddon/Utils/UpdateChecker.java

@@ -1,71 +0,0 @@
-package io.myzticbean.finditemaddon.Utils;
-
-import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPerms;
-import me.kodysimpson.simpapi.colors.ColorTranslator;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerJoinEvent;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Scanner;
-import java.util.function.Consumer;
-
-public class UpdateChecker {
-
-    private final String prefix = "&8["
-            + "&#55a800Q"
-            + "&#5ea800S"
-            + "&#66a800F"
-            + "&#6ea900i"
-            + "&#76a900n"
-            + "&#7da900d"
-            + "&#84a900I"
-            + "&#8ba900t"
-            + "&#92a900e"
-            + "&#98a900m"
-            + "&#9ea900A"
-            + "&#a4a900d"
-            + "&#aaa800d"
-            + "&#b0a800O"
-            + "&#b6a800n"
-            + "&8] ";
-    private final int resourceId;
-
-    public UpdateChecker(int resourceId) {
-        this.resourceId = resourceId;
-    }
-
-    public void getLatestVersion(Consumer<String> consumer) {
-        Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
-            try (InputStream inputStream = new URL("https://api.spigotmc.org/legacy/update.php?resource=" + this.resourceId).openStream();
-                 Scanner scanner = new Scanner(inputStream)) {
-                if (scanner.hasNext()) {
-                    consumer.accept(scanner.next());
-                }
-            } catch (IOException exception) {
-                LoggerUtils.logError("Update checker is broken, can't find an update!" + exception.getMessage());
-            }
-        });
-    }
-
-    public void notifyPlayerAboutUpdateOnJoin(PlayerJoinEvent event) {
-        Player player = event.getPlayer();
-        if(player.isOp() || player.hasPermission(PlayerPerms.FINDITEM_ADMIN.value())) {
-            if(FindItemAddOn.getPluginOutdated()) {
-                player.sendMessage(ColorTranslator.translateColorCodes(
-                        prefix
-                                + "&#59b300Hey &#73e600" + player.getName() + "&#59b300! Plugin has an update... You are still on v"
-                                + FindItemAddOn.getInstance().getDescription().getVersion()));
-
-                player.sendMessage(ColorTranslator.translateColorCodes(
-                        prefix
-                                + "&#59b300Download here: &#a3a3c2&nhttps://www.spigotmc.org/resources/"
-                                + FindItemAddOn.getPluginID() + "/"));
-            }
-        }
-    }
-
-}

src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/EssentialWarpsUtil.java

@@ -1,43 +0,0 @@
-package io.myzticbean.finditemaddon.Utils.WarpUtils;
-
-import io.myzticbean.finditemaddon.Dependencies.EssentialsXPlugin;
-import io.myzticbean.finditemaddon.Models.EssentialWarpModel;
-import io.myzticbean.finditemaddon.Utils.CommonUtils;
-import org.bukkit.Location;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-public class EssentialWarpsUtil {
-
-    @Nullable
-    public String findNearestWarp(Location shopLocation) {
-        List<EssentialWarpModel> allWarps = EssentialsXPlugin.getAllWarps();
-        if(allWarps != null && !allWarps.isEmpty()) {
-            Map<Double, String> warpDistanceMap = new TreeMap<>();
-            allWarps.forEach(warp -> {
-                Double distance = CommonUtils.calculateDistance3D(
-                        shopLocation.getX(),
-                        shopLocation.getY(),
-                        shopLocation.getZ(),
-                        warp.warpLoc.getX(),
-                        warp.warpLoc.getY(),
-                        warp.warpLoc.getZ()
-                );
-                warpDistanceMap.put(distance, warp.warpName);
-            });
-            /*if(FindItemAddOn.getConfigProvider().DEBUG_MODE) {
-                for(Map.Entry<Double, String> entry : warpDistanceMap.entrySet()) {
-                    LoggerUtils.logDebugInfo(entry.getValue() + " : " + entry.getKey());
-                }
-            }*/
-            return warpDistanceMap.entrySet().iterator().next().getValue();
-        }
-        else {
-            return null;
-        }
-    }
-
-}

src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/PlayerWarpsUtil.java

@@ -1,44 +0,0 @@
-package io.myzticbean.finditemaddon.Utils.WarpUtils;
-
-import com.olziedev.playerwarps.api.warp.Warp;
-import io.myzticbean.finditemaddon.Dependencies.PlayerWarpsPlugin;
-import io.myzticbean.finditemaddon.Utils.CommonUtils;
-import org.bukkit.Location;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-public class PlayerWarpsUtil {
-
-    @Nullable
-    public Warp findNearestWarp(Location shopLocation) {
-        List<Warp> allWarps = PlayerWarpsPlugin.getAllWarps();
-        if(!allWarps.isEmpty()) {
-            Map<Double, Warp> warpDistanceMap = new TreeMap<>();
-            allWarps.forEach(warp -> {
-                warpDistanceMap.put(CommonUtils.calculateDistance3D(
-                        shopLocation.getX(),
-                        shopLocation.getY(),
-                        shopLocation.getZ(),
-                        warp.getWarpLocation().getX(),
-                        warp.getWarpLocation().getY(),
-                        warp.getWarpLocation().getZ()
-                ), warp);
-            });
-            /*
-            if(FindItemAddOn.getConfigProvider().DEBUG_MODE) {
-                for(Map.Entry<Double, Warp> entry : warpDistanceMap.entrySet()) {
-                    LoggerUtils.logDebugInfo(entry.getValue().getWarpName() + " : " + entry.getKey());
-                }
-            }*/
-
-            return warpDistanceMap.entrySet().iterator().next().getValue();
-        }
-        else {
-            return null;
-        }
-    }
-
-}

src/main/java/io/myzticbean/finditemaddon/Utils/WarpUtils/WarpUtils.java

@@ -1,22 +0,0 @@
-package io.myzticbean.finditemaddon.Utils.WarpUtils;
-
-import io.myzticbean.finditemaddon.Dependencies.EssentialsXPlugin;
-import io.myzticbean.finditemaddon.Dependencies.PlayerWarpsPlugin;
-import io.myzticbean.finditemaddon.FindItemAddOn;
-
-public class WarpUtils {
-    public static void updateWarps() {
-        if(FindItemAddOn.getConfigProvider().shopGUIItemLoreHasKey("{NEAREST_WARP}")) {
-            if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 1) {
-                if(EssentialsXPlugin.isEnabled()) {
-                    EssentialsXPlugin.updateAllWarps();
-                }
-            }
-            else if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 2) {
-                if(PlayerWarpsPlugin.getIsEnabled()) {
-                    PlayerWarpsPlugin.updateAllWarpsFromAPI();
-                }
-            }
-        }
-    }
-}

src/main/java/io/myzticbean/finditemaddon/commands/quickshop/subcommands/FindItemCmdHikariImpl.java

@@ -0,0 +1,147 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.commands.quickshop.subcommands;
+
+import com.ghostchu.quickshop.api.command.CommandHandler;
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import io.myzticbean.finditemaddon.handlers.command.CmdExecutorHandler;
+import io.myzticbean.finditemaddon.models.enums.PlayerPermsEnum;
+import me.kodysimpson.simpapi.colors.ColorTranslator;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author myzticbean
+ */
+public class FindItemCmdHikariImpl implements CommandHandler<Player> {
+
+    private final String hideSubCommand;
+    private final String revealShopSubCommand;
+    private final CmdExecutorHandler cmdExecutor;
+    private final List<String> itemsList = new ArrayList<>();
+    private final List<String> buyOrSellList = new ArrayList<>();
+
+    public FindItemCmdHikariImpl() {
+        if (FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
+            // I don't know what to do here ¯\_(ツ)_/¯
+        }
+        if (StringUtils.isBlank(FindItemAddOn.getConfigProvider().FIND_ITEM_HIDESHOP_AUTOCOMPLETE)) {
+            this.hideSubCommand = "hideshop";
+        } else {
+            this.hideSubCommand = FindItemAddOn.getConfigProvider().FIND_ITEM_HIDESHOP_AUTOCOMPLETE;
+        }
+
+        if (StringUtils.isEmpty(FindItemAddOn.getConfigProvider().FIND_ITEM_REVEALSHOP_AUTOCOMPLETE)
+                || StringUtils.containsIgnoreCase(
+                        FindItemAddOn.getConfigProvider().FIND_ITEM_REVEALSHOP_AUTOCOMPLETE, " ")) {
+            this.revealShopSubCommand = "revealshop";
+        } else {
+            this.revealShopSubCommand = FindItemAddOn.getConfigProvider().FIND_ITEM_REVEALSHOP_AUTOCOMPLETE;
+        }
+        cmdExecutor = new CmdExecutorHandler();
+    }
+
+    /**
+     * Handles player commands within a Bukkit plugin, including permission checks
+     * and subcommand execution.
+     */
+    @Override
+    public void onCommand(Player commandSender, @NotNull String label, @NotNull String[] args) {
+        if (args.length == 0) {
+            commandSender.sendMessage(ColorTranslator
+                    .translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cIncorrect usage!"));
+        } else if (args.length == 1) {
+            if (commandSender.hasPermission(PlayerPermsEnum.FINDITEM_HIDESHOP.value())
+                    && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
+                if (args[0].equalsIgnoreCase(hideSubCommand)) {
+                    cmdExecutor.handleHideShop(commandSender);
+                } else if (args[0].equalsIgnoreCase(revealShopSubCommand)) {
+                    cmdExecutor.handleRevealShop(commandSender);
+                } else {
+                    commandSender.sendMessage(ColorTranslator.translateColorCodes(
+                            FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cIncorrect usage!"));
+                }
+            } else {
+                commandSender.sendMessage(ColorTranslator.translateColorCodes(
+                        FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cYou don't have permission to use that!"));
+            }
+        } else {
+            cmdExecutor.handleShopSearch(args[0], commandSender, args[1]);
+        }
+    }
+
+    @Override
+    public @Nullable List<String> onTabComplete(@NotNull Player sender, @NotNull String commandLabel,
+            @NotNull String[] args) {
+        if (itemsList.isEmpty()) {
+            for (Material mat : Material.values()) {
+                itemsList.add(mat.name());
+            }
+        }
+        if (buyOrSellList.isEmpty()) {
+            // to-buy
+            if (StringUtils.isEmpty(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE)
+                    || StringUtils.containsIgnoreCase(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE,
+                            " ")) {
+                buyOrSellList.add("TO_BUY");
+            } else {
+                buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE);
+            }
+            // to-sell
+            if (StringUtils.isEmpty(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_SELL_AUTOCOMPLETE)
+                    || StringUtils.containsIgnoreCase(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_SELL_AUTOCOMPLETE,
+                            " ")) {
+                buyOrSellList.add("TO_SELL");
+            } else {
+                buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_SELL_AUTOCOMPLETE);
+            }
+            // hide
+            if (sender.hasPermission(PlayerPermsEnum.FINDITEM_HIDESHOP.value())
+                    && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
+                buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_HIDESHOP_AUTOCOMPLETE);
+                buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_REVEALSHOP_AUTOCOMPLETE);
+            }
+        }
+        List<String> result = new ArrayList<>();
+        if (args.length == 1) {
+            for (String a : buyOrSellList) {
+                if (a.toLowerCase().startsWith(args[0].toLowerCase())) {
+                    result.add(a);
+                }
+            }
+            return result;
+        } else if (args.length == 2) {
+            for (String a : itemsList) {
+                if (a.toLowerCase().startsWith(args[1].toLowerCase())) {
+                    result.add(a);
+                }
+            }
+            return result;
+        } else {
+            return null;
+        }
+
+    }
+}

src/main/java/io/myzticbean/finditemaddon/commands/quickshop/subcommands/FindItemCmdReremakeImpl.java

@@ -1,8 +1,26 @@
-package io.myzticbean.finditemaddon.Commands.QSSubCommands;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.commands.quickshop.subcommands;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
-import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPerms;
+import io.myzticbean.finditemaddon.handlers.command.CmdExecutorHandler;
+import io.myzticbean.finditemaddon.models.enums.PlayerPermsEnum;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Material;
@@ -14,6 +32,9 @@ import org.maxgamer.quickshop.api.command.CommandHandler;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public class FindItemCmdReremakeImpl implements CommandHandler<Player> {
 
     private final String hideSubCommand;
@@ -47,7 +68,7 @@ public class FindItemCmdReremakeImpl implements CommandHandler<Player> {
             commandSender.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cIncorrect usage!"));
         }
         else if(args.length == 1) {
-            if(commandSender.hasPermission(PlayerPerms.FINDITEM_HIDESHOP.value())) {
+            if(commandSender.hasPermission(PlayerPermsEnum.FINDITEM_HIDESHOP.value()) && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
                 if(args[0].equalsIgnoreCase(hideSubCommand)) {
                     cmdExecutor.handleHideShop(commandSender);
                 } else if(args[0].equalsIgnoreCase(revealShopSubCommand)) {
@@ -88,7 +109,7 @@ public class FindItemCmdReremakeImpl implements CommandHandler<Player> {
                 buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_SELL_AUTOCOMPLETE);
             }
             // hide
-            if(sender.hasPermission(PlayerPerms.FINDITEM_HIDESHOP.value())) {
+            if(sender.hasPermission(PlayerPermsEnum.FINDITEM_HIDESHOP.value()) && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
                 buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_HIDESHOP_AUTOCOMPLETE);
                 buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_REVEALSHOP_AUTOCOMPLETE);
             }

src/main/java/io/myzticbean/finditemaddon/commands/simpapi/BuySubCmd.java

@@ -1,7 +1,25 @@
-package io.myzticbean.finditemaddon.Commands.SAPICommands;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.commands.simpapi;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
+import io.myzticbean.finditemaddon.handlers.command.CmdExecutorHandler;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import me.kodysimpson.simpapi.command.SubCommand;
 import org.apache.commons.lang3.StringUtils;
@@ -10,7 +28,9 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Sub Command Handler for /finditem TO_BUY
@@ -32,9 +52,10 @@ public class BuySubCmd extends SubCommand {
             buySubCommand = FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE;
         }
         if(itemsList.isEmpty()) {
-            for(Material mat : Material.values()) {
-                itemsList.add(mat.name());
-            }
+            itemsList.addAll(Arrays.stream(Material.values())
+                    .filter(mat -> !FindItemAddOn.getConfigProvider().getBlacklistedMaterials().contains(mat))
+                    .map(Material::name)
+                    .toList());
         }
         cmdExecutor = new CmdExecutorHandler();
     }

src/main/java/io/myzticbean/finditemaddon/commands/simpapi/HideShopSubCmd.java

@@ -1,7 +1,25 @@
-package io.myzticbean.finditemaddon.Commands.SAPICommands;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.commands.simpapi;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
+import io.myzticbean.finditemaddon.handlers.command.CmdExecutorHandler;
 import me.kodysimpson.simpapi.command.SubCommand;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;

src/main/java/io/myzticbean/finditemaddon/commands/simpapi/ReloadSubCmd.java

@@ -1,6 +1,24 @@
-package io.myzticbean.finditemaddon.Commands.SAPICommands;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.commands.simpapi;
 
-import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
+import io.myzticbean.finditemaddon.handlers.command.CmdExecutorHandler;
 import me.kodysimpson.simpapi.command.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/io/myzticbean/finditemaddon/commands/simpapi/RestartSubCmd.java

@@ -1,6 +1,24 @@
-package io.myzticbean.finditemaddon.Commands.SAPICommands;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.commands.simpapi;
 
-import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
+import io.myzticbean.finditemaddon.handlers.command.CmdExecutorHandler;
 import me.kodysimpson.simpapi.command.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -20,6 +38,7 @@ public class RestartSubCmd extends SubCommand {
     public RestartSubCmd() {
         cmdExecutor = new CmdExecutorHandler();
     }
+
     @Override
     public String getName() {
         return "restart";

src/main/java/io/myzticbean/finditemaddon/commands/simpapi/RevealShopSubCmd.java

@@ -1,7 +1,25 @@
-package io.myzticbean.finditemaddon.Commands.SAPICommands;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.commands.simpapi;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
+import io.myzticbean.finditemaddon.handlers.command.CmdExecutorHandler;
 import me.kodysimpson.simpapi.command.SubCommand;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;

src/main/java/io/myzticbean/finditemaddon/commands/simpapi/SellSubCmd.java

@@ -1,7 +1,25 @@
-package io.myzticbean.finditemaddon.Commands.SAPICommands;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.commands.simpapi;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
+import io.myzticbean.finditemaddon.handlers.command.CmdExecutorHandler;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import me.kodysimpson.simpapi.command.SubCommand;
 import org.apache.commons.lang3.StringUtils;
@@ -10,6 +28,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -31,9 +50,10 @@ public class SellSubCmd extends SubCommand {
             sellSubCommand = FindItemAddOn.getConfigProvider().FIND_ITEM_TO_SELL_AUTOCOMPLETE;
         }
         if(itemsList.isEmpty()) {
-            for(Material mat : Material.values()) {
-                itemsList.add(mat.name());
-            }
+            itemsList.addAll(Arrays.stream(Material.values())
+                    .filter(mat -> !FindItemAddOn.getConfigProvider().getBlacklistedMaterials().contains(mat))
+                    .map(Material::name)
+                    .toList());
         }
         cmdExecutor = new CmdExecutorHandler();
     }

src/main/java/io/myzticbean/finditemaddon/config/ConfigProvider.java

@@ -0,0 +1,160 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.config;
+
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import me.kodysimpson.simpapi.colors.ColorTranslator;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.World;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author myzticbean
+ */
+public class ConfigProvider {
+
+    private static final String FIND_ITEM_COMMAND = "find-item-command.";
+    private static final String PLAYER_SHOP_TELEPORTATION = "player-shop-teleportation.";
+    private static final String DIRECT_SHOP_TP_MODE = "direct-shop-tp-mode.";
+    private static final String NEAREST_WARP_TP_MODE = "nearest-warp-tp-mode.";
+    private static final String CUSTOM_COMMANDS = "custom-commands.";
+    private static final String SHOP_GUI = "shop-gui.";
+    private static final String SHOP_GUI_NAVIGATION = "shop-navigation.";
+    private static final String SHOP_GUI_CMD = "custom-model-data.";
+    private static final String BENTOBOX = "bentobox.";
+    public final String PLUGIN_PREFIX = ColorTranslator.translateColorCodes(ConfigSetup.get().getString("plugin-prefix"));
+    public final List<String> FIND_ITEM_COMMAND_ALIAS = (List<String>) ConfigSetup.get().getList(FIND_ITEM_COMMAND + "command-alias");
+    public final String FIND_ITEM_TO_BUY_AUTOCOMPLETE = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "to-buy-autocomplete");
+    public final String FIND_ITEM_TO_SELL_AUTOCOMPLETE = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "to-sell-autocomplete");
+    public final String FIND_ITEM_HIDESHOP_AUTOCOMPLETE = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "hideshop-autocomplete");
+    public final String FIND_ITEM_REVEALSHOP_AUTOCOMPLETE = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "revealshop-autocomplete");
+    public final String FIND_ITEM_CMD_INCORRECT_USAGE_MSG = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "incorrect-usage-message");
+    public final String FIND_ITEM_CMD_INVALID_MATERIAL_MSG = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "invalid-material-message");
+    public final String SHOP_SEARCH_LOADING_MSG = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "shop-search-loading-message");
+    public final String NO_SHOP_FOUND_MSG = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "no-shop-found-message");
+    public final String FIND_ITEM_CMD_NO_PERMISSION_MSG = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "find-item-command-no-permission-message");
+    public final String FIND_ITEM_CMD_SHOP_HIDE_SUCCESS_MSG = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "shop-hide-success-message");
+    public final String FIND_ITEM_CMD_SHOP_REVEAL_SUCCESS_MSG = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "shop-reveal-success-message");
+    public final String FIND_ITEM_CMD_SHOP_ALREADY_HIDDEN_MSG = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "shop-already-hidden-message");
+    public final String FIND_ITEM_CMD_SHOP_ALREADY_PUBLIC_MSG = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "shop-already-public-message");
+    public final String FIND_ITEM_CMD_INVALID_SHOP_BLOCK_MSG = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "invalid-shop-block-message");
+    public final String FIND_ITEM_CMD_HIDING_SHOP_OWNER_INVALID_MSG = ConfigSetup.get().getString(FIND_ITEM_COMMAND + "hiding-shop-owner-invalid-message");
+    public final boolean FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS = ConfigSetup.get().getBoolean(FIND_ITEM_COMMAND + "remove-hideshop-revealshop-subcommands");
+    public final boolean FIND_ITEM_CMD_DISABLE_SEARCH_ALL_SHOPS = ConfigSetup.get().getBoolean(FIND_ITEM_COMMAND + "disable-search-all-shops");
+    public final int SHOP_SORTING_METHOD = ConfigSetup.get().getInt("shop-sorting-method");
+    public final boolean SEARCH_LOADED_SHOPS_ONLY = ConfigSetup.get().getBoolean("search-loaded-shops-only");
+    public final String SHOP_SEARCH_GUI_TITLE = ConfigSetup.get().getString("shop-search-gui-title");
+    public final int NEAREST_WARP_MODE = ConfigSetup.get().getInt("nearest-warp-mode");
+    public final List<String> SHOP_GUI_ITEM_LORE = (List<String>) ConfigSetup.get().getList("shop-gui-item-lore");
+    public final boolean TP_PLAYER_DIRECTLY_TO_SHOP = ConfigSetup.get().getBoolean(PLAYER_SHOP_TELEPORTATION + DIRECT_SHOP_TP_MODE + "tp-player-directly-to-shop");
+    public final String CLICK_TO_TELEPORT_MSG = ConfigSetup.get().getString(PLAYER_SHOP_TELEPORTATION + DIRECT_SHOP_TP_MODE + "click-to-teleport-message");
+    public final String SHOP_TP_NO_PERMISSION_MSG = ConfigSetup.get().getString(PLAYER_SHOP_TELEPORTATION + DIRECT_SHOP_TP_MODE + "shop-tp-no-permission-message");
+    public final String UNSAFE_SHOP_AREA_MSG = ConfigSetup.get().getString(PLAYER_SHOP_TELEPORTATION + DIRECT_SHOP_TP_MODE + "unsafe-shop-area-message");
+    public final String TP_DELAY_IN_SECONDS = ConfigSetup.get().getString(PLAYER_SHOP_TELEPORTATION + DIRECT_SHOP_TP_MODE + "tp-delay-in-seconds");
+    public final String TP_DELAY_MESSAGE = ConfigSetup.get().getString(PLAYER_SHOP_TELEPORTATION + DIRECT_SHOP_TP_MODE + "tp-delay-message");
+    public final String TP_TO_OWN_SHOP_NO_PERMISSION_MESSAGE = ConfigSetup.get().getString(PLAYER_SHOP_TELEPORTATION + DIRECT_SHOP_TP_MODE + "tp-to-own-shop-no-permission-message");
+    public final boolean TP_PLAYER_TO_NEAREST_WARP = ConfigSetup.get().getBoolean(PLAYER_SHOP_TELEPORTATION + NEAREST_WARP_TP_MODE + "tp-player-to-nearest-warp");
+    public final boolean DO_NOT_TP_IF_PLAYER_WARP_LOCKED = ConfigSetup.get().getBoolean(PLAYER_SHOP_TELEPORTATION + NEAREST_WARP_TP_MODE + "do-not-tp-if-warp-locked");
+    public final boolean ONLY_SHOW_PLAYER_OWNDED_WARPS = ConfigSetup.get().getBoolean(PLAYER_SHOP_TELEPORTATION + NEAREST_WARP_TP_MODE + "only-show-player-owned-warps");
+    public final boolean USE_RESIDENCE_SUBZONES = ConfigSetup.get().getBoolean(PLAYER_SHOP_TELEPORTATION + NEAREST_WARP_TP_MODE + "use-residence-subzones");
+    public final String NO_WARP_NEAR_SHOP_ERROR_MSG = ConfigSetup.get().getString(PLAYER_SHOP_TELEPORTATION + NEAREST_WARP_TP_MODE + "no-warp-near-shop-error-message");
+    public final String NO_WG_REGION_NEAR_SHOP_ERROR_MSG = ConfigSetup.get().getString(PLAYER_SHOP_TELEPORTATION + NEAREST_WARP_TP_MODE + "no-wg-region-near-shop-error-message");
+    public final String NO_RESIDENCE_NEAR_SHOP_ERROR_MSG = ConfigSetup.get().getString(PLAYER_SHOP_TELEPORTATION + NEAREST_WARP_TP_MODE + "no-residence-near-shop-error-message");
+    public final boolean CUSTOM_CMDS_RUN_ENABLED = ConfigSetup.get().getBoolean(PLAYER_SHOP_TELEPORTATION + CUSTOM_COMMANDS + "run-custom-commands");
+    public final List<String> CUSTOM_CMDS_LIST = (List<String>) ConfigSetup.get().getList(PLAYER_SHOP_TELEPORTATION + CUSTOM_COMMANDS + "commands-list");
+    public final String SHOP_GUI_BACK_BUTTON_MATERIAL = ConfigSetup.get().getString(SHOP_GUI + "back-button-material");
+    public final String SHOP_GUI_BACK_BUTTON_TEXT = ConfigSetup.get().getString(SHOP_GUI + "back-button-text");
+    public final String SHOP_GUI_NEXT_BUTTON_MATERIAL = ConfigSetup.get().getString(SHOP_GUI + "next-button-material");
+    public final String SHOP_GUI_NEXT_BUTTON_TEXT = ConfigSetup.get().getString(SHOP_GUI + "next-button-text");
+    public final String SHOP_GUI_FILLER_ITEM = ConfigSetup.get().getString(SHOP_GUI + "filler-item");
+    public final String SHOP_GUI_CLOSE_BUTTON_MATERIAL = ConfigSetup.get().getString(SHOP_GUI + "close-button-material");
+    public final String SHOP_GUI_CLOSE_BUTTON_TEXT = ConfigSetup.get().getString(SHOP_GUI + "close-button-text");
+    public final String SHOP_GUI_GOTO_FIRST_PAGE_BUTTON_MATERIAL = ConfigSetup.get().getString(SHOP_GUI + "goto-first-page-button-material");
+    public final String SHOP_GUI_GOTO_FIRST_PAGE_BUTTON_TEXT = ConfigSetup.get().getString(SHOP_GUI + "goto-first-page-button-text");
+    public final String SHOP_GUI_GOTO_LAST_PAGE_BUTTON_MATERIAL = ConfigSetup.get().getString(SHOP_GUI + "goto-last-page-button-material");
+    public final String SHOP_GUI_GOTO_LAST_PAGE_BUTTON_TEXT = ConfigSetup.get().getString(SHOP_GUI + "goto-last-page-button-text");
+    public final String SHOP_GUI_BACK_BUTTON_CMD = ConfigSetup.get().getString(SHOP_GUI + SHOP_GUI_CMD + "back-button-custom-model-data");
+    public final String SHOP_GUI_NEXT_BUTTON_CMD = ConfigSetup.get().getString(SHOP_GUI + SHOP_GUI_CMD + "next-button-custom-model-data");
+    public final String SHOP_GUI_CLOSE_BUTTON_CMD = ConfigSetup.get().getString(SHOP_GUI + SHOP_GUI_CMD + "close-button-custom-model-data");
+    public final String SHOP_GUI_GOTO_FIRST_PAGE_BUTTON_CMD = ConfigSetup.get().getString(SHOP_GUI + SHOP_GUI_CMD + "goto-first-page-button-custom-model-data");
+    public final String SHOP_GUI_GOTO_LAST_PAGE_BUTTON_CMD = ConfigSetup.get().getString(SHOP_GUI + SHOP_GUI_CMD + "goto-last-page-button-custom-model-data");
+    public final String SHOP_GUI_FILLER_ITEM_CMD = ConfigSetup.get().getString(SHOP_GUI + SHOP_GUI_CMD + "filler-item-custom-model-data");
+    public final String SHOP_NAV_FIRST_PAGE_ALERT_MSG = ConfigSetup.get().getString(SHOP_GUI + SHOP_GUI_NAVIGATION + "first-page-alert-message");
+    public final String SHOP_NAV_LAST_PAGE_ALERT_MSG = ConfigSetup.get().getString(SHOP_GUI + SHOP_GUI_NAVIGATION + "last-page-alert-message");
+    public final boolean SHOP_GUI_USE_SHORTER_CURRENCY_FORMAT = ConfigSetup.get().getBoolean(SHOP_GUI + "use-shorter-currency-format");
+    public final int SHOP_PLAYER_VISIT_COOLDOWN_IN_MINUTES = ConfigSetup.get().getInt("shop-player-visit-cooldown-in-minutes");
+    public final boolean IGNORE_EMPTY_CHESTS = ConfigSetup.get().getBoolean("ignore-empty-chests");
+    private final List<String> BLACKLISTED_WORLDS = (List<String>) ConfigSetup.get().getList("blacklisted-worlds");
+    private final List<String> BLACKLISTED_MATERIALS = (List<String>) ConfigSetup.get().getList("blacklisted-materials");
+    public final boolean SUPPRESS_UPDATE_NOTIFICATIONS = ConfigSetup.get().getBoolean("suppress-update-notifications");
+    public final boolean DEBUG_MODE = ConfigSetup.get().getBoolean("debug-mode");
+    public final int CONFIG_VERSION = ConfigSetup.get().getInt("config-version");
+    public final boolean BENTOBOX_IGNORE_LOCKED_ISLAND_SHOPS = ConfigSetup.get().getBoolean(BENTOBOX + "ignore-locked-island-shops");
+
+    private final List<World> blacklistedWorldsList = new ArrayList<>();
+    private final List<Material> blacklistedMaterialsList = new ArrayList<>();
+
+    public ConfigProvider() {
+        loadBlacklistedWorlds();
+        loadBlacklistedMaterials();
+        Logger.logInfo("Config loaded!");
+    }
+
+    public List<World> getBlacklistedWorlds() {
+        return blacklistedWorldsList;
+    }
+
+    public List<Material> getBlacklistedMaterials() {
+        return blacklistedMaterialsList;
+    }
+
+    public boolean shopGUIItemLoreHasKey(String key) {
+        if (SHOP_GUI_ITEM_LORE != null) {
+            return SHOP_GUI_ITEM_LORE.stream().anyMatch(key::contains);
+        }
+        else {
+            return false;
+        }
+    }
+
+    private void loadBlacklistedWorlds() {
+        if(BLACKLISTED_WORLDS != null) {
+            BLACKLISTED_WORLDS.forEach(world -> {
+                World worldObj = Bukkit.getWorld(world);
+                if(worldObj != null) {
+                    blacklistedWorldsList.add(worldObj);
+                }
+            });
+        }
+    }
+
+    private void loadBlacklistedMaterials() {
+        if(BLACKLISTED_MATERIALS != null) {
+            BLACKLISTED_MATERIALS.forEach(material -> {
+                var materialObj = Material.getMaterial(material);
+                if(materialObj != null) {
+                    blacklistedMaterialsList.add(materialObj);
+                }
+            });
+        }
+    }
+}

src/main/java/io/myzticbean/finditemaddon/config/ConfigSetup.java

@@ -0,0 +1,364 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.config;
+
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import lombok.experimental.UtilityClass;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author myzticbean
+ */
+@UtilityClass
+public class ConfigSetup {
+
+    private static File configFile;
+    private static File sampleConfigFile;
+    private static FileConfiguration configFileConfiguration;
+    private static final int CURRENT_CONFIG_VERSION = 21;
+
+    public static void setupConfig() {
+        configFile = new File(FindItemAddOn.getInstance().getDataFolder(), "config.yml");
+
+        if(!configFile.exists()) {
+            try {
+                boolean isConfigGenerated = configFile.createNewFile();
+                if(isConfigGenerated) {
+                    Logger.logInfo("Generated a new config.yml");
+                }
+            }
+            catch (IOException e) {
+                Logger.logError("Error generating config.yml");
+            }
+        }
+
+        configFileConfiguration = YamlConfiguration.loadConfiguration(configFile);
+    }
+
+    public static void saveConfig() {
+        try {
+            configFileConfiguration.save(configFile);
+        }
+        catch (IOException e) {
+            Logger.logError("Error saving config.yml");
+        }
+    }
+
+    public static void checkForMissingProperties() {
+        if(!configFileConfiguration.contains("search-loaded-shops-only", true)) {
+            configFileConfiguration.set("search-loaded-shops-only", false);
+        }
+        if(!configFileConfiguration.contains("nearest-warp-mode", true)) {
+            configFileConfiguration.set("nearest-warp-mode", 1);
+        }
+        else {
+            try {
+                int nearestWarpMode = configFileConfiguration.getInt("nearest-warp-mode");
+                if(nearestWarpMode != 1 && nearestWarpMode != 2 && nearestWarpMode != 3 && nearestWarpMode != 4) {
+                    Logger.logError("Invalid value for 'nearest-warp-mode' in config.yml!");
+                    Logger.logError("Resetting by default to &e1");
+                    configFileConfiguration.set("nearest-warp-mode", 1);
+                }
+            }
+            catch(Exception e) {
+                Logger.logError("Invalid value for 'nearest-warp-mode' in config.yml!");
+                Logger.logError("Resetting by default to &e1");
+                configFileConfiguration.set("nearest-warp-mode", 1);
+            }
+        }
+        if(!configFileConfiguration.contains("shop-gui-item-lore", true)) {
+            List<String> shopGUIItemLore = new ArrayList<>();
+            shopGUIItemLore.add("");
+            shopGUIItemLore.add("&fPrice: &a${ITEM_PRICE}");
+            shopGUIItemLore.add("&fStock: &7{SHOP_STOCK}");
+            shopGUIItemLore.add("&fOwner: &7{SHOP_OWNER}");
+            shopGUIItemLore.add("&fLocation: &7{SHOP_LOC}");
+            shopGUIItemLore.add("&fWorld: &7{SHOP_WORLD}");
+            shopGUIItemLore.add("&fWarp: &7{NEAREST_WARP}");
+            shopGUIItemLore.add("");
+            configFileConfiguration.set("shop-gui-item-lore", shopGUIItemLore);
+        }
+        if(!configFileConfiguration.contains("blacklisted-worlds", true)) {
+            List<String> blacklistedWorlds = new ArrayList<>();
+            blacklistedWorlds.add("world_number_1");
+            blacklistedWorlds.add("world_number_2");
+            configFileConfiguration.set("blacklisted-worlds", blacklistedWorlds);
+        }
+        if(!configFileConfiguration.contains("find-item-command.hideshop-autocomplete", true)) {
+            configFileConfiguration.set("find-item-command.hideshop-autocomplete", "hideshop");
+        }
+        if(!configFileConfiguration.contains("find-item-command.revealshop-autocomplete", true)) {
+            configFileConfiguration.set("find-item-command.revealshop-autocomplete", "revealshop");
+        }
+        if(!configFileConfiguration.contains("find-item-command.shop-hide-success-message", true)) {
+            configFileConfiguration.set("find-item-command.shop-hide-success-message", "&aShop is now hidden from search list!");
+        }
+        if(!configFileConfiguration.contains("find-item-command.shop-reveal-success-message", true)) {
+            configFileConfiguration.set("find-item-command.shop-reveal-success-message", "&aShop is no longer hidden from search list!");
+        }
+        if(!configFileConfiguration.contains("find-item-command.shop-already-hidden-message", true)) {
+            configFileConfiguration.set("find-item-command.shop-already-hidden-message", "&cThis shop is already hidden!");
+        }
+        if(!configFileConfiguration.contains("find-item-command.shop-already-public-message", true)) {
+            configFileConfiguration.set("find-item-command.shop-already-public-message", "&cThis shop is already public!");
+        }
+        if(!configFileConfiguration.contains("find-item-command.invalid-shop-block-message", true)) {
+            configFileConfiguration.set("find-item-command.invalid-shop-block-message", "&cThe block you are looking at is not a shop!");
+        }
+        if(!configFileConfiguration.contains("find-item-command.hiding-shop-owner-invalid-message", true)) {
+            configFileConfiguration.set("find-item-command.hiding-shop-owner-invalid-message", "&cThat shop is not yours!");
+        }
+
+        // ALWAYS AT LAST
+        if(!configFileConfiguration.contains("config-version", true)) {
+            configFileConfiguration.set("config-version", CURRENT_CONFIG_VERSION);
+        }
+        else {
+            // Automatic Config upgrade process
+            // Config v10
+            if(configFileConfiguration.getInt("config-version") < 10) {
+                boolean allowDirectShopTp = configFileConfiguration.getBoolean("allow-direct-shop-tp");
+                String clickToTeleportMsg = configFileConfiguration.getString("click-to-teleport-message");
+                String shopTPNoPermMsg = configFileConfiguration.getString("shop-tp-no-permission-message");
+                String unsafeShopAreaMsg = configFileConfiguration.getString("unsafe-shop-area-message");
+                // clear existing config properties
+                configFileConfiguration.set("allow-direct-shop-tp", null);
+                configFileConfiguration.set("click-to-teleport-message", null);
+                configFileConfiguration.set("shop-tp-no-permission-message", null);
+                configFileConfiguration.set("unsafe-shop-area-message", null);
+                // set the new properties
+                configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.tp-player-directly-to-shop", allowDirectShopTp);
+                if(clickToTeleportMsg == null || clickToTeleportMsg.isEmpty())
+                    configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.click-to-teleport-message", "&6&lClick to teleport to the shop!");
+                else
+                    configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.click-to-teleport-message", clickToTeleportMsg);
+
+                if(shopTPNoPermMsg == null || shopTPNoPermMsg.isEmpty())
+                    configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.shop-tp-no-permission-message", "&cYou don't have permission to teleport to shop!");
+                else
+                    configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.shop-tp-no-permission-message", shopTPNoPermMsg);
+
+                if(unsafeShopAreaMsg == null || unsafeShopAreaMsg.isEmpty())
+                    configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.unsafe-shop-area-message", "&cThe area around the shop is unsafe!");
+                else
+                    configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.unsafe-shop-area-message", unsafeShopAreaMsg);
+
+                configFileConfiguration.set("player-shop-teleportation.nearest-warp-tp-mode.tp-player-to-nearest-warp", false);
+            }
+            // Config v11
+            if(configFileConfiguration.getInt("config-version") < 11) {
+                List<String> cmdAliases = new ArrayList<>();
+                cmdAliases.add("searchshop");
+                cmdAliases.add("shopsearch");
+                cmdAliases.add("searchitem");
+                configFileConfiguration.set("find-item-command.command-alias", cmdAliases);
+
+                boolean warpState = configFileConfiguration.getBoolean("player-shop-teleportation.nearest-warp-tp-mode.warp-player-to-nearest-warp");
+                if(warpState)
+                    configFileConfiguration.set("player-shop-teleportation.nearest-warp-tp-mode.tp-player-to-nearest-warp", true);
+                // if warpState is false, don't bother updating tPState
+
+                // remove an erroneous field added in previous version
+                configFileConfiguration.set("player-shop-teleportation.nearest-warp-tp-mode.warp-player-to-nearest-warp", null);
+
+                // Update GUI next/previous button to blank if set to default value for the new player-head icons
+                if(configFileConfiguration.getString("shop-gui-back-button-material").equalsIgnoreCase("RED_CONCRETE")) {
+                    configFileConfiguration.set("shop-gui-back-button-material", "");
+                }
+                if(configFileConfiguration.getString("shop-gui-next-button-material").equalsIgnoreCase("GREEN_CONCRETE")) {
+                    configFileConfiguration.set("shop-gui-next-button-material", "");
+                }
+
+                // Add option to configure player visit cooldown
+                configFileConfiguration.set("shop-player-visit-cooldown-in-minutes", 5);
+            }
+            // Config 12
+            if(configFileConfiguration.getInt("config-version") < 12) {
+                configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.tp-delay-in-seconds", 0);
+                configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.tp-delay-message", "&6You will be teleported in &c{DELAY} &6seconds...");
+            }
+            // Config 13
+            if(configFileConfiguration.getInt("config-version") < 13) {
+                configFileConfiguration.set("find-item-command.remove-hideshop-revealshop-subcommands", false);
+                configFileConfiguration.set("player-shop-teleportation.direct-shop-tp-mode.tp-to-own-shop-no-permission-message", "&cYou cannot teleport to your own shop!");
+                configFileConfiguration.set("ignore-empty-chests", true);
+                configFileConfiguration.set("shop-gui-goto-first-page-button-material", "");
+                configFileConfiguration.set("shop-gui-goto-first-page-button-text", "&7&l« &cGo to First Page");
+                configFileConfiguration.set("shop-gui-goto-first-page-button-custom-model-data", "");
+                configFileConfiguration.set("shop-gui-goto-last-page-button-material", "");
+                configFileConfiguration.set("shop-gui-goto-last-page-button-text", "&aGo to Last Page &7&l»");
+                configFileConfiguration.set("shop-gui-goto-last-page-button-custom-model-data", "");
+            }
+            // Config 14
+            if(configFileConfiguration.getInt("config-version") < 14) {
+                configFileConfiguration.set("find-item-command.disable-search-all-shops", false);
+            }
+            // Config 15
+            if(configFileConfiguration.getInt("config-version") < 15) {
+                configFileConfiguration.set("player-shop-teleportation.nearest-warp-tp-mode.do-not-tp-if-warp-locked", true);
+                // capture old config data
+                String shopGuiBackButtonMaterial = configFileConfiguration.getString("shop-gui-back-button-material");
+                String shopGuiBackButtonText = configFileConfiguration.getString("shop-gui-back-button-text");
+                String shopGuiNextButtonMaterial = configFileConfiguration.getString("shop-gui-next-button-material");
+                String shopGuiNNextButtonText = configFileConfiguration.getString("shop-gui-next-button-text");
+                String shopGuiFillerItem = configFileConfiguration.getString("shop-gui-filler-item");
+                String shopGuiCloseButtonMaterial = configFileConfiguration.getString("shop-gui-close-button-material");
+                String shopGuiCloseButtonText = configFileConfiguration.getString("shop-gui-close-button-text");
+                String shopGuiGotoFirstPageButtonMaterial = configFileConfiguration.getString("shop-gui-goto-first-page-button-material");
+                String shopGuiGotoFirstPageButtonText = configFileConfiguration.getString("shop-gui-goto-first-page-button-text");
+                String shopGuiGotoLastPageButtonMaterial = configFileConfiguration.getString("shop-gui-goto-last-page-button-material");
+                String shopGuiGotoLastPageButtonText = configFileConfiguration.getString("shop-gui-goto-last-page-button-text");
+                String shopNavFirstPageAlertMsg = configFileConfiguration.getString("shop-navigation-first-page-alert-message");
+                String shopNavLastPageAlertMsg = configFileConfiguration.getString("shop-navigation-last-page-alert-message");
+                String shopGuiBackButtonCMD = configFileConfiguration.getString("shop-gui-back-button-custom-model-data");
+                String shopGuiNextButtonCMD = configFileConfiguration.getString("shop-gui-next-button-custom-model-data");
+                String shopGuiCloseButtonCMD = configFileConfiguration.getString("shop-gui-close-button-custom-model-data");
+                String shopGuiGotoFirstPageButtonCMD = configFileConfiguration.getString("shop-gui-goto-first-page-button-custom-model-data");
+                String shopGuiGotoLastPageButtonCMD = configFileConfiguration.getString("shop-gui-goto-last-page-button-custom-model-data");
+                // remove old config options
+                configFileConfiguration.set("shop-gui-back-button-material", null);
+                configFileConfiguration.set("shop-gui-back-button-text", null);
+                configFileConfiguration.set("shop-gui-next-button-material", null);
+                configFileConfiguration.set("shop-gui-next-button-text", null);
+                configFileConfiguration.set("shop-gui-filler-item", null);
+                configFileConfiguration.set("shop-gui-close-button-material", null);
+                configFileConfiguration.set("shop-gui-close-button-text", null);
+                configFileConfiguration.set("shop-gui-goto-first-page-button-material", null);
+                configFileConfiguration.set("shop-gui-goto-first-page-button-text", null);
+                configFileConfiguration.set("shop-gui-goto-last-page-button-material", null);
+                configFileConfiguration.set("shop-gui-goto-last-page-button-text", null);
+                configFileConfiguration.set("shop-navigation-first-page-alert-message", null);
+                configFileConfiguration.set("shop-navigation-last-page-alert-message", null);
+                configFileConfiguration.set("shop-gui-back-button-custom-model-data", null);
+                configFileConfiguration.set("shop-gui-next-button-custom-model-data", null);
+                configFileConfiguration.set("shop-gui-close-button-custom-model-data", null);
+                configFileConfiguration.set("shop-navigation-first-page-button-custom-model-data", null);
+                configFileConfiguration.set("shop-navigation-last-page-button-custom-model-data", null);
+                configFileConfiguration.set("shop-gui-goto-first-page-button-custom-model-data", null);
+                configFileConfiguration.set("shop-gui-goto-last-page-button-custom-model-data", null);
+                // add the new config properties and transfer the data
+                final String SHOP_GUI_OPTION = "shop-gui.";
+                final String SHOP_GUI_NAVIGATION_OPTION = "shop-navigation.";
+                final String SHOP_GUI_CMD_OPTION = "custom-model-data.";
+                configFileConfiguration.set(SHOP_GUI_OPTION + "back-button-material", shopGuiBackButtonMaterial);
+                configFileConfiguration.set(SHOP_GUI_OPTION + "back-button-text", shopGuiBackButtonText);
+                configFileConfiguration.set(SHOP_GUI_OPTION + "next-button-material", shopGuiNextButtonMaterial);
+                configFileConfiguration.set(SHOP_GUI_OPTION + "next-button-text", shopGuiNNextButtonText);
+                configFileConfiguration.set(SHOP_GUI_OPTION + "filler-item", shopGuiFillerItem);
+                configFileConfiguration.set(SHOP_GUI_OPTION + "close-button-material", shopGuiCloseButtonMaterial);
+                configFileConfiguration.set(SHOP_GUI_OPTION + "close-button-text", shopGuiCloseButtonText);
+                configFileConfiguration.set(SHOP_GUI_OPTION + "goto-first-page-button-material", shopGuiGotoFirstPageButtonMaterial);
+                configFileConfiguration.set(SHOP_GUI_OPTION + "goto-first-page-button-text", shopGuiGotoFirstPageButtonText);
+                configFileConfiguration.set(SHOP_GUI_OPTION + "goto-last-page-button-material", shopGuiGotoLastPageButtonMaterial);
+                configFileConfiguration.set(SHOP_GUI_OPTION + "goto-last-page-button-text", shopGuiGotoLastPageButtonText);
+                configFileConfiguration.set(SHOP_GUI_OPTION + SHOP_GUI_NAVIGATION_OPTION + "first-page-alert-message", shopNavFirstPageAlertMsg);
+                configFileConfiguration.set(SHOP_GUI_OPTION + SHOP_GUI_NAVIGATION_OPTION + "last-page-alert-message", shopNavLastPageAlertMsg);
+                configFileConfiguration.set(SHOP_GUI_OPTION + SHOP_GUI_CMD_OPTION + "back-button-custom-model-data", shopGuiBackButtonCMD);
+                configFileConfiguration.set(SHOP_GUI_OPTION + SHOP_GUI_CMD_OPTION + "next-button-custom-model-data", shopGuiNextButtonCMD);
+                configFileConfiguration.set(SHOP_GUI_OPTION + SHOP_GUI_CMD_OPTION + "close-button-custom-model-data", shopGuiCloseButtonCMD);
+                configFileConfiguration.set(SHOP_GUI_OPTION + SHOP_GUI_CMD_OPTION + "goto-first-page-button-custom-model-data", shopGuiGotoFirstPageButtonCMD);
+                configFileConfiguration.set(SHOP_GUI_OPTION + SHOP_GUI_CMD_OPTION + "goto-last-page-button-custom-model-data", shopGuiGotoLastPageButtonCMD);
+
+                configFileConfiguration.set(SHOP_GUI_OPTION + "use-shorter-currency-format", false);
+            }
+            // Config 16
+            if(configFileConfiguration.getInt("config-version") < 16) {
+                configFileConfiguration.set("player-shop-teleportation.nearest-warp-tp-mode.only-show-player-owned-warps", true);
+            }
+            // Config 17
+            if(configFileConfiguration.getInt("config-version") < 17) {
+                configFileConfiguration.set("player-shop-teleportation.nearest-warp-tp-mode.use-residence-subzones", false);
+                configFileConfiguration.set("player-shop-teleportation.nearest-warp-tp-mode.no-warp-near-shop-error-message", "&cNo warp near this shop");
+                configFileConfiguration.set("player-shop-teleportation.nearest-warp-tp-mode.no-wg-region-near-shop-error-message", "&cNo WG Region near this shop");
+                configFileConfiguration.set("player-shop-teleportation.nearest-warp-tp-mode.no-residence-near-shop-error-message", "&cNo residence Region near this shop");
+            }
+            // Config 18
+            if(configFileConfiguration.getInt("config-version") < 18) {
+                configFileConfiguration.set("player-shop-teleportation.custom-commands.run-custom-commands", false);
+                List<String> commands = Arrays.asList("tp {PLAYER_NAME} {SHOP_LOC_X} {SHOP_LOC_Y} {SHOP_LOC_Z}", "bal add 10000 {PLAYER_NAME}");
+                configFileConfiguration.set("player-shop-teleportation.custom-commands.commands-list", commands);
+            }
+
+            // Config 19
+            if(configFileConfiguration.getInt("config-version") < 19) {
+                configFileConfiguration.set("blacklisted-materials", populateSampleBlacklistedMaterials());
+                configFileConfiguration.set("suppress-update-notifications", false);
+            }
+
+            // Config 20
+            if(configFileConfiguration.getInt("config-version") < 20) {
+                configFileConfiguration.set("bentobox.ignore-locked-island-shops", true);
+            }
+
+            // Config 21
+            if(configFileConfiguration.getInt("config-version") < 21) {
+                configFileConfiguration.set("shop-gui.custom-model-data.filler-item-custom-model-data", "");
+            }
+
+            // AT LAST
+            // Moving debug-mode and config-version to the last
+            final String DEBUG_MODE_OPTION = "debug-mode";
+            final String CONFIG_VERSION_OPTION = "config-version";
+            boolean userDefinedDebugMode = configFileConfiguration.getBoolean(DEBUG_MODE_OPTION);
+            configFileConfiguration.set(DEBUG_MODE_OPTION, null);
+            configFileConfiguration.set(DEBUG_MODE_OPTION, userDefinedDebugMode);
+            configFileConfiguration.set(CONFIG_VERSION_OPTION, null);
+            configFileConfiguration.set(CONFIG_VERSION_OPTION, CURRENT_CONFIG_VERSION);
+        }
+    }
+
+    private static @NotNull List<String> populateSampleBlacklistedMaterials() {
+        List<String> blacklistedMaterials = new ArrayList<>();
+        blacklistedMaterials.add("BARRIER");
+        blacklistedMaterials.add("STRUCTURE_BLOCK");
+        blacklistedMaterials.add("COMMAND_BLOCK");
+        blacklistedMaterials.add("CHAIN_COMMAND_BLOCK");
+        blacklistedMaterials.add("REPEATING_COMMAND_BLOCK");
+        blacklistedMaterials.add("COMMAND_BLOCK_MINECART");
+        blacklistedMaterials.add("JIGSAW");
+        blacklistedMaterials.add("DEBUG_STICK");
+        blacklistedMaterials.add("LIGHT");
+        blacklistedMaterials.add("STRUCTURE_VOID");
+        return blacklistedMaterials;
+    }
+
+    public static FileConfiguration get() {
+        return configFileConfiguration;
+    }
+
+    public static void reloadConfig() {
+        configFileConfiguration = YamlConfiguration.loadConfiguration(configFile);
+    }
+
+    /**
+     * Added in 2.0
+     */
+    public static void copySampleConfig() {
+        FindItemAddOn.getInstance().saveResource("sample-config.yml", true);
+    }
+}

src/main/java/io/myzticbean/finditemaddon/dependencies/BentoBoxPlugin.java

@@ -0,0 +1,36 @@
+package io.myzticbean.finditemaddon.dependencies;
+
+import org.bukkit.Location;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.lists.Flags;
+
+public class BentoBoxPlugin {
+    
+    private boolean isBentoBoxEnabled = false;
+
+    public BentoBoxPlugin() {
+        checkBentoBoxPlugin();
+    }
+
+    private void checkBentoBoxPlugin() {
+        Plugin plugin = Bukkit.getPluginManager().getPlugin("BentoBox");
+        isBentoBoxEnabled = plugin != null && plugin.isEnabled();
+    }
+
+    public boolean isIslandLocked(Location loc, Player searchingPlayer) {
+        if (!isBentoBoxEnabled) {
+            return false;
+        }
+        User bentoboxUser = User.getInstance(searchingPlayer);
+        return BentoBox.getInstance()
+                .getIslands()
+                .getIslandAt(loc)
+                .filter(island -> !island.isAllowed(bentoboxUser, Flags.LOCK))
+                .isPresent();
+    }
+}

src/main/java/io/myzticbean/finditemaddon/dependencies/EssentialsXPlugin.java

@@ -0,0 +1,103 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.dependencies;
+
+import com.earth2me.essentials.Essentials;
+import io.myzticbean.finditemaddon.models.EssentialWarpModel;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import lombok.experimental.UtilityClass;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Hook for EssentialsX Plugin
+ * 
+ * @author myzticbean
+ */
+@UtilityClass
+public class EssentialsXPlugin {
+
+    private static Essentials essAPI = null;
+    private static List<EssentialWarpModel> allWarpsList = null;
+
+    public static void setup() {
+        if (Bukkit.getPluginManager().isPluginEnabled("Essentials")) {
+            essAPI = (Essentials) Bukkit.getServer().getPluginManager().getPlugin("Essentials");
+            if (essAPI != null) {
+                Logger.logInfo("Found Essentials");
+            }
+        }
+    }
+
+    public static boolean isEnabled() {
+        return essAPI != null;
+    }
+
+    public static Essentials getAPI() {
+        return essAPI;
+    }
+
+    public static List<EssentialWarpModel> getAllWarps() {
+        return allWarpsList;
+    }
+
+    public static void updateAllWarps() {
+        if (!essAPI.isEnabled()) {
+            return;
+        }
+
+        long start = System.currentTimeMillis();
+        Collection<String> allWarps = EssentialsXPlugin.getAPI().getWarps().getList();
+        allWarpsList = new ArrayList<>();
+
+        for (String warp : allWarps) {
+            addWarpToList(warp);
+        }
+
+        logUpdateCompletion(start);
+    }
+
+    private static void addWarpToList(String warp) {
+        try {
+            EssentialWarpModel essWarp = new EssentialWarpModel();
+            essWarp.warpName = warp;
+            essWarp.warpLoc = essAPI.getWarps().getWarp(warp);
+            allWarpsList.add(essWarp);
+        } catch (Exception ignored) {
+            Logger.logError("Error adding warp to list: " + warp);
+        }
+    }
+
+    private static void logUpdateCompletion(long startTime) {
+        long duration = System.currentTimeMillis() - startTime;
+        Logger.logDebugInfo(String.format("Update complete for Essentials warps list! Found %d warps. Time took: %dms.",
+                getAllWarps().size(), duration));
+    }
+
+    public static void setLastLocation(Player player) {
+        if (essAPI.isEnabled()) {
+            getAPI().getUser(player).setLastLocation();
+        }
+    }
+
+}

src/main/java/io/myzticbean/finditemaddon/dependencies/GPFlagsPlugin.java

@@ -0,0 +1,28 @@
+package io.myzticbean.finditemaddon.dependencies;
+
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import me.ryanhamshire.GPFlags.GPFlags;
+import org.bukkit.Bukkit;
+
+public class GPFlagsPlugin {
+
+    private static GPFlags gpFlags;
+
+    public static void setup() {
+        if(Bukkit.getPluginManager().isPluginEnabled("GPFlags")) {
+            gpFlags = (GPFlags) Bukkit.getServer().getPluginManager().getPlugin("GPFlags");
+            if(gpFlags != null) {
+                Logger.logInfo("Found GPFlags");
+            }
+        }
+    }
+
+    public static boolean isEnabled() {
+        return gpFlags.isEnabled();
+    }
+
+    public static GPFlags getAPI() {
+        return gpFlags;
+    }
+
+}

src/main/java/io/myzticbean/finditemaddon/dependencies/PWarpPlugin.java

@@ -0,0 +1,52 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.dependencies;
+
+//import me.ronsane.finditemaddon.finditemaddon.Utils.LoggerUtils;
+//import me.tks.playerwarp.PWarp;
+//import me.tks.playerwarp.Warp;
+//import me.tks.playerwarp.WarpList;
+//import org.bukkit.Bukkit;
+
+/**
+ * @author myzticbean
+ */
+public class PWarpPlugin {
+
+//    private static PWarp pWarp = null;
+//
+//    public static void setup() {
+//        if(Bukkit.getPluginManager().isPluginEnabled("PWarp")) {
+//            LoggerUtils.logInfo("Found PWarp");
+//            pWarp = PWarp.getPlugin(PWarp.class);
+//        }
+//    }
+//    public static PWarp getAPI() {
+//        return pWarp;
+//    }
+//
+//    public static boolean isEnabled() {
+//        return pWarp != null;
+//    }
+//
+//    public static List<Warp> getAllWarps() {
+//
+//        return PWarp.wL.getWarps();
+//    }
+}

src/main/java/io/myzticbean/finditemaddon/dependencies/PlayerWarpsPlugin.java

@@ -1,15 +1,39 @@
-package io.myzticbean.finditemaddon.Dependencies;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.dependencies;
 
 import com.olziedev.playerwarps.api.PlayerWarpsAPI;
-import com.olziedev.playerwarps.api.events.warp.PlayerWarpTeleportEvent;
 import com.olziedev.playerwarps.api.warp.Warp;
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
+import io.myzticbean.finditemaddon.models.enums.NearestWarpModeEnum;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
+import java.util.Collections;
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
+@UtilityClass
 public class PlayerWarpsPlugin {
 
     private static boolean isEnabled = false;
@@ -17,11 +41,9 @@ public class PlayerWarpsPlugin {
     private static PlayerWarpsAPI playerWarpsAPI = null;
     private static final String ALL_WARPS_LIST_CLASSPATH = PlayerWarpsPlugin.class.getCanonicalName() + ".allWarpsList";
 
-    private PlayerWarpsPlugin() { }
-
     public static void setup() {
         if(Bukkit.getPluginManager().isPluginEnabled("PlayerWarps")) {
-            LoggerUtils.logInfo("Found PlayerWarps");
+            Logger.logInfo("Found PlayerWarps");
             PlayerWarpsAPI.getInstance(api -> {
                 playerWarpsAPI = api;
                 isEnabled = true;
@@ -33,7 +55,7 @@ public class PlayerWarpsPlugin {
 
     /**
      * Issue #24 Fix: Changing all api get references to callback, making this method deprecated
-     * @return
+     * @return PlayerWarpsAPI api
      */
     @Deprecated
     public static PlayerWarpsAPI getAPI() {
@@ -41,34 +63,35 @@ public class PlayerWarpsPlugin {
     }
 
     public static List<Warp> getAllWarps() {
-        PlayerWarpsAPI.getInstance(api -> {
-            allWarpsList = api.getPlayerWarps(false);
-        });
+        if(!isEnabled) {
+            return Collections.emptyList();
+        }
+        PlayerWarpsAPI.getInstance(api -> allWarpsList = api.getPlayerWarps(false));
         return allWarpsList;
     }
 
     public static void updateAllWarpsFromAPI() {
         if(isEnabled) {
-            LoggerUtils.logInfo("Updating Player warps list...");
+            long start = System.currentTimeMillis();
             // Issue #24 Fix: Changing api instance to callback
             PlayerWarpsAPI.getInstance(api -> {
                 allWarpsList = api.getPlayerWarps(false);
-                LoggerUtils.logInfo("Update complete! Found " + getAllWarps().size() + " warps.");
+                Logger.logDebugInfo("Update complete for PlayerWarps list! Found " + getAllWarps().size() + " warps. Time took: " + (System.currentTimeMillis() - start) + "ms.");
             });
         }
     }
 
     public static void updateWarpsOnEventCall(Warp warp, boolean isRemoved) {
-        LoggerUtils.logDebugInfo("Got a PlayerWarps event call... checking nearest-warp-mode");
-        if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 2) {
-            LoggerUtils.logDebugInfo("'nearest-warp-mode' found set to 2");
+        Logger.logDebugInfo("Got a PlayerWarps event call... checking nearest-warp-mode");
+        if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == NearestWarpModeEnum.PLAYER_WARPS.value()) {
+            Logger.logDebugInfo("'nearest-warp-mode' found set to 2");
             if (getIsEnabled()) {
-                LoggerUtils.logDebugInfo("PlayerWarps plugin is enabled");
+                Logger.logDebugInfo("PlayerWarps plugin is enabled");
                 tryUpdateWarps(warp, isRemoved, 1);
             }
         }
         else {
-            LoggerUtils.logDebugInfo("No update required to '" + ALL_WARPS_LIST_CLASSPATH + "' as PlayerWarps integration is disabled.");
+            Logger.logDebugInfo("No update required to '" + ALL_WARPS_LIST_CLASSPATH + "' as PlayerWarps integration is disabled.");
         }
     }
 
@@ -78,14 +101,14 @@ public class PlayerWarpsPlugin {
             if(isRemoved) {
                 if(allWarpsList.contains(warp)) {
                     allWarpsList.remove(warp);
-                    LoggerUtils.logDebugInfo("Warp removed from allWarpsList: " + warp.getWarpName());
+                    Logger.logDebugInfo("Warp removed from allWarpsList: " + warp.getWarpName());
                 } else {
-                    LoggerUtils.logError("Error occurred while updating '" + ALL_WARPS_LIST_CLASSPATH + "'. Warp name: '" + warp.getWarpName() + "' does not exist!");
+                    Logger.logError("Error occurred while updating '" + ALL_WARPS_LIST_CLASSPATH + "'. Warp name: '" + warp.getWarpName() + "' does not exist!");
                 }
             }
             else {
                 allWarpsList.add(warp);
-                LoggerUtils.logDebugInfo("New warp added to allWarpsList: " + warp.getWarpName());
+                Logger.logDebugInfo("New warp added to allWarpsList: " + warp.getWarpName());
             }
         }
         else {
@@ -98,25 +121,15 @@ public class PlayerWarpsPlugin {
                 errorMsg.append("Error occurred while updating '").append(ALL_WARPS_LIST_CLASSPATH).append("' as it is null! ")
                         .append("Please install PlayerWarps by Olzie-12 if you would like to use 'nearest-warp-mode' as 2. ")
                         .append("If PlayerWarps plugin is installed and issue persists, please contact the developer!");
-                LoggerUtils.logError(errorMsg.toString());
+                Logger.logError(errorMsg.toString());
             }
         }
     }
 
-    /**
-     * Issue #24 Fix: Extracted method from FoundShopsMenu class
-     * @param player
-     * @param warpName
-     */
-    public static void executeWarpPlayer(Player player, String warpName) {
-        PlayerWarpsAPI.getInstance(api -> {
-            Warp playerWarp = api.getPlayerWarp(warpName, player);
-            if(playerWarp != null) {
-                playerWarp.getWarpLocation().teleportWarp(player, PlayerWarpTeleportEvent.Cause.PLAYER_WARP_MENU);
-            }
-            else {
-                LoggerUtils.logError("&e" + player.getName() + " &cis trying to teleport to a PlayerWarp that does not exist!");
-            }
-        });
+    public static boolean isWarpLocked(Player player, String warpName) {
+        Warp warp = playerWarpsAPI.getPlayerWarp(warpName, player);
+        if(warp == null)
+            return false;
+        return warp.isWarpLocked();
     }
 }

src/main/java/io/myzticbean/finditemaddon/dependencies/ResidencePlugin.java

@@ -0,0 +1,34 @@
+package io.myzticbean.finditemaddon.dependencies;
+
+import com.bekvon.bukkit.residence.api.ResidenceApi;
+import com.bekvon.bukkit.residence.api.ResidenceInterface;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import org.bukkit.Bukkit;
+
+/**
+ * @author SengyEU
+ */
+public class ResidencePlugin {
+
+    private static boolean isPluginEnabled;
+
+    public static void setup() {
+        if(Bukkit.getPluginManager().isPluginEnabled("Residence")) {
+            Logger.logInfo("Found Residence");
+            isPluginEnabled = true;
+        }
+        else {
+            isPluginEnabled = false;
+        }
+    }
+
+
+    public static ResidenceInterface getResidenceManager () {
+        return ResidenceApi.getResidenceManager();
+    }
+
+    public static boolean isEnabled() {
+        return isPluginEnabled;
+    }
+
+}

src/main/java/io/myzticbean/finditemaddon/dependencies/WGPlugin.java

@@ -0,0 +1,53 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.dependencies;
+
+import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import org.bukkit.Bukkit;
+
+/**
+ * @author myzticbean
+ */
+public class WGPlugin {
+
+    private static boolean isPluginEnabled;
+
+    public static void setup() {
+        if(Bukkit.getPluginManager().isPluginEnabled("WorldGuard")) {
+            Logger.logInfo("Found WorldGuard");
+            isPluginEnabled = true;
+        }
+        else {
+            isPluginEnabled = false;
+        }
+    }
+
+    public static WorldGuardPlugin getWgPluginInstance() {
+        return WorldGuardPlugin.inst();
+    }
+
+    public static WorldGuard getWgInstance () { return WorldGuard.getInstance(); }
+
+    public static boolean isEnabled() {
+        return isPluginEnabled;
+    }
+
+}

src/main/java/io/myzticbean/finditemaddon/handlers/command/CmdExecutorHandler.java

@@ -1,13 +1,32 @@
-package io.myzticbean.finditemaddon.Handlers.CommandHandler;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.handlers.command;
 
-import io.myzticbean.finditemaddon.ConfigUtil.ConfigSetup;
+import io.myzticbean.finditemaddon.config.ConfigSetup;
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Handlers.GUIHandler.Menus.FoundShopsMenu;
-import io.myzticbean.finditemaddon.Models.FoundShopItemModel;
-import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPerms;
-import io.myzticbean.finditemaddon.Utils.JsonStorageUtils.HiddenShopStorageUtil;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
-import io.myzticbean.finditemaddon.Utils.WarpUtils.WarpUtils;
+import io.myzticbean.finditemaddon.handlers.gui.menus.FoundShopsMenu;
+import io.myzticbean.finditemaddon.models.FoundShopItemModel;
+import io.myzticbean.finditemaddon.models.enums.PlayerPermsEnum;
+import io.myzticbean.finditemaddon.utils.async.VirtualThreadScheduler;
+import io.myzticbean.finditemaddon.utils.json.HiddenShopStorageUtil;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import io.myzticbean.finditemaddon.utils.warp.WarpUtils;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
@@ -26,6 +45,9 @@ import java.util.List;
  */
 public class CmdExecutorHandler {
 
+    private static final String THIS_COMMAND_CAN_ONLY_BE_RUN_FROM_IN_GAME = "This command can only be run from in game";
+    public static final String NO_PERMISSION = "&cNo permission!";
+
     /**
      * Handles the main shop search process
      * @param buySellSubCommand Whether player is buying or selling
@@ -33,107 +55,127 @@ public class CmdExecutorHandler {
      * @param itemArg Specifies Item ID or Item name
      */
     public void handleShopSearch(String buySellSubCommand, CommandSender commandSender, String itemArg) {
-        if (!(commandSender instanceof Player)) {
-            LoggerUtils.logInfo("This command can only be run from in game");
+        if (!(commandSender instanceof Player player)) {
+            Logger.logInfo(THIS_COMMAND_CAN_ONLY_BE_RUN_FROM_IN_GAME);
+            return;
+        }
+        if (!player.hasPermission(PlayerPermsEnum.FINDITEM_USE.value())) {
+            player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + NO_PERMISSION));
+            return;
+        }
+
+        // Show searching... message
+        if (!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_SEARCH_LOADING_MSG)) {
+            player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + FindItemAddOn.getConfigProvider().SHOP_SEARCH_LOADING_MSG));
+        }
+
+        boolean isBuying;
+        if(StringUtils.isEmpty(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE)
+                || StringUtils.containsIgnoreCase(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE, " ")) {
+            isBuying = buySellSubCommand.equalsIgnoreCase("to_buy");
         }
         else {
-            Player player = (Player) commandSender;
-            if(player.hasPermission(PlayerPerms.FINDITEM_USE.value())) {
-                if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_SEARCH_LOADING_MSG)) {
-                    player.sendMessage(ColorTranslator.translateColorCodes(
-                            FindItemAddOn.getConfigProvider().PLUGIN_PREFIX
-                                    + FindItemAddOn.getConfigProvider().SHOP_SEARCH_LOADING_MSG));
-                }
-                boolean isBuying;
-                if(StringUtils.isEmpty(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE)
-                        || StringUtils.containsIgnoreCase(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE, " ")) {
-                    isBuying = buySellSubCommand.equalsIgnoreCase("to_buy");
-                }
-                else {
-                    isBuying = buySellSubCommand.equalsIgnoreCase(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE);
-                }
+            isBuying = buySellSubCommand.equalsIgnoreCase(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE);
+        }
 
-                if(itemArg.equalsIgnoreCase("*")) {
+        if(itemArg.equalsIgnoreCase("*") && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_DISABLE_SEARCH_ALL_SHOPS) {
+            // If QS Hikari installed and Shop Cache feature available (>6), then run in async thread (Fix for Issue #12)
+            if(!FindItemAddOn.isQSReremakeInstalled() && FindItemAddOn.getQsApiInstance().isQSShopCacheImplemented()) {
+                Logger.logDebugInfo("Should run in async thread...");
+                Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
                     List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().fetchAllItemsFromAllShops(isBuying, player);
-                    if(searchResultList.size() > 0) {
-                        Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
-                            FoundShopsMenu menu = new FoundShopsMenu(FindItemAddOn.getPlayerMenuUtility(player), searchResultList);
-                            Bukkit.getScheduler().runTask(FindItemAddOn.getInstance(), () -> menu.open(searchResultList));
-                        });
-                    }
-                    else {
-                        if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().NO_SHOP_FOUND_MSG)) {
-                            player.sendMessage(ColorTranslator.translateColorCodes(
-                                    FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + FindItemAddOn.getConfigProvider().NO_SHOP_FOUND_MSG));
-                        }
-                    }
-                }
-                else {
-                    Material mat = Material.getMaterial(itemArg.toUpperCase());
-                    if(mat != null) {
-                        LoggerUtils.logDebugInfo("Material found: " + mat.toString());
-                        List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().findItemBasedOnTypeFromAllShops(new ItemStack(mat), isBuying, player);
-                        if(searchResultList.size() > 0) {
-                            Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
-                                FoundShopsMenu menu = new FoundShopsMenu(FindItemAddOn.getPlayerMenuUtility(player), searchResultList);
-                                Bukkit.getScheduler().runTask(FindItemAddOn.getInstance(), () -> menu.open(searchResultList));
-                            });
-                        }
-                        else {
-                            if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().NO_SHOP_FOUND_MSG)) {
-                                player.sendMessage(ColorTranslator.translateColorCodes(
-                                        FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + FindItemAddOn.getConfigProvider().NO_SHOP_FOUND_MSG));
-                            }
-                        }
-                    }
-                    else {
-                        LoggerUtils.logDebugInfo("Material not found! Performing query based search..");
-                        List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().findItemBasedOnDisplayNameFromAllShops(itemArg, isBuying, player);
-                        if(searchResultList.size() > 0) {
-                            Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
-                                FoundShopsMenu menu = new FoundShopsMenu(FindItemAddOn.getPlayerMenuUtility(player), searchResultList);
-                                Bukkit.getScheduler().runTask(FindItemAddOn.getInstance(), () -> menu.open(searchResultList));
-                            });
-                        }
-                        else {
-                            // Invalid Material
-                            if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_INVALID_MATERIAL_MSG)) {
-                                player.sendMessage(ColorTranslator.translateColorCodes(
-                                        FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_INVALID_MATERIAL_MSG));
-                            }
-                        }
-                    }
-                }
-
+                    this.openShopMenu(player, searchResultList, true, FindItemAddOn.getConfigProvider().NO_SHOP_FOUND_MSG);
+                });
+            } else {
+                // Else run in MAIN thread
+                List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().fetchAllItemsFromAllShops(isBuying, player);
+                this.openShopMenu(player, searchResultList, false, FindItemAddOn.getConfigProvider().NO_SHOP_FOUND_MSG);
             }
-            else {
-                player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cNo permission!"));
+        } else {
+            Material mat = Material.getMaterial(itemArg.toUpperCase());
+            if(this.checkMaterialBlacklist(mat)) {
+                player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cThis material is not allowed."));
+                return;
+            }
+            if (mat != null && mat.isItem()) {
+                Logger.logDebugInfo("Material found: " + mat);
+                // If QS Hikari installed and Shop Cache feature available (>6), then run in async thread (Fix for Issue #12)
+                if(!FindItemAddOn.isQSReremakeInstalled() && FindItemAddOn.getQsApiInstance().isQSShopCacheImplemented()) {
+                    VirtualThreadScheduler.runTaskAsync(() -> {
+                        List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().findItemBasedOnTypeFromAllShops(new ItemStack(mat), isBuying, player);
+                        this.openShopMenu(player, searchResultList, true, FindItemAddOn.getConfigProvider().NO_SHOP_FOUND_MSG);
+                    });
+//                    Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
+//                        List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().findItemBasedOnTypeFromAllShops(new ItemStack(mat), isBuying, player);
+//                        this.openShopMenu(player, searchResultList, true, FindItemAddOn.getConfigProvider().NO_SHOP_FOUND_MSG);
+//                    });
+                } else {
+                    List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().findItemBasedOnTypeFromAllShops(new ItemStack(mat), isBuying, player);
+                    this.openShopMenu(player, searchResultList, false, FindItemAddOn.getConfigProvider().NO_SHOP_FOUND_MSG);
+                }
+            } else {
+                Logger.logDebugInfo("Material not found! Performing query based search..");
+                // If QS Hikari installed and Shop Cache feature available (>6), then run in async thread (Fix for Issue #12)
+                if(!FindItemAddOn.isQSReremakeInstalled() && FindItemAddOn.getQsApiInstance().isQSShopCacheImplemented()) {
+                    VirtualThreadScheduler.runTaskAsync(() -> {
+                        List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().findItemBasedOnDisplayNameFromAllShops(itemArg, isBuying, player);
+                        this.openShopMenu(player, searchResultList, true, FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_INVALID_MATERIAL_MSG);
+                    });
+//                    Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
+//                        List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().findItemBasedOnDisplayNameFromAllShops(itemArg, isBuying, player);
+//                        this.openShopMenu(player, searchResultList, true, FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_INVALID_MATERIAL_MSG);
+//                    });
+                } else {
+                    List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().findItemBasedOnDisplayNameFromAllShops(itemArg, isBuying, player);
+                    this.openShopMenu(player, searchResultList, false, FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_INVALID_MATERIAL_MSG);
+                }
             }
         }
     }
 
+    private void openShopMenu(Player player, List<FoundShopItemModel> searchResultList, boolean synchronize, String errorMsg) {
+        if (!searchResultList.isEmpty()) {
+            if (synchronize) {
+                Bukkit.getScheduler().runTask(FindItemAddOn.getInstance(), () -> {
+                    FoundShopsMenu menu = new FoundShopsMenu(FindItemAddOn.getPlayerMenuUtility(player), searchResultList);
+                    menu.open(searchResultList);
+                });
+            } else {
+                FoundShopsMenu menu = new FoundShopsMenu(FindItemAddOn.getPlayerMenuUtility(player), searchResultList);
+                menu.open(searchResultList);
+            }
+        } else {
+            if (!StringUtils.isEmpty(errorMsg)) {
+                player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + errorMsg));
+            }
+        }
+    }
+
+    private boolean checkMaterialBlacklist(Material mat) {
+        return FindItemAddOn.getConfigProvider().getBlacklistedMaterials().contains(mat);
+    }
+
     /**
      * Handles the shop hiding feature
      * @param commandSender Who is the command sender: console or player
      */
     public void handleHideShop(CommandSender commandSender) {
-        if (!(commandSender instanceof Player)) {
-            LoggerUtils.logInfo("This command can only be run from in game");
-        }
-        else {
-            Player player = (Player) commandSender;
-            if(player.hasPermission(PlayerPerms.FINDITEM_HIDESHOP.value())) {
-                Block playerLookAtBlock = player.getTargetBlock(null, 100);
+        if(commandSender instanceof Player player) {
+            if(player.hasPermission(PlayerPermsEnum.FINDITEM_HIDESHOP.value())) {
+                Block playerLookAtBlock = player.getTargetBlock(null, 3);
+                Logger.logDebugInfo("TargetBlock found: " + playerLookAtBlock.getType());
                 if(FindItemAddOn.isQSReremakeInstalled()) {
-                    hideShop((Shop) FindItemAddOn.getQsApiInstance().findShopAtLocation(playerLookAtBlock), player);
+                    hideReremakeShop((Shop) FindItemAddOn.getQsApiInstance().findShopAtLocation(playerLookAtBlock), player);
                 }
                 else {
-                    hideShop((com.ghostchu.quickshop.api.shop.Shop) FindItemAddOn.getQsApiInstance().findShopAtLocation(playerLookAtBlock), player);
+                    hideHikariShop((com.ghostchu.quickshop.api.shop.Shop) FindItemAddOn.getQsApiInstance().findShopAtLocation(playerLookAtBlock), player);
                 }
             }
             else {
-                player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cNo permission!"));
+                player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + NO_PERMISSION));
             }
+        } else {
+            Logger.logInfo(THIS_COMMAND_CAN_ONLY_BE_RUN_FROM_IN_GAME);
         }
     }
 
@@ -143,108 +185,58 @@ public class CmdExecutorHandler {
      */
     public void handleRevealShop(CommandSender commandSender) {
         if (!(commandSender instanceof Player)) {
-            LoggerUtils.logInfo("This command can only be run from in game");
+            Logger.logInfo(THIS_COMMAND_CAN_ONLY_BE_RUN_FROM_IN_GAME);
         }
         else {
             Player player = (Player) commandSender;
-            if(player.hasPermission(PlayerPerms.FINDITEM_HIDESHOP.value())) {
-                Block playerLookAtBlock = player.getTargetBlock(null, 100);
-                if(FindItemAddOn.isQSReremakeInstalled()) {
-                    revealShop((Shop) FindItemAddOn.getQsApiInstance().findShopAtLocation(playerLookAtBlock), player);
-                }
-                else {
-                    revealShop((com.ghostchu.quickshop.api.shop.Shop) FindItemAddOn.getQsApiInstance().findShopAtLocation(playerLookAtBlock), player);
+            if(player.hasPermission(PlayerPermsEnum.FINDITEM_HIDESHOP.value())) {
+                Block playerLookAtBlock = player.getTargetBlock(null, 5);
+                if(playerLookAtBlock != null) {
+                    Logger.logDebugInfo("TargetBlock found: " + playerLookAtBlock.getType());
+                    if(FindItemAddOn.isQSReremakeInstalled()) {
+                        revealShop((Shop) FindItemAddOn.getQsApiInstance().findShopAtLocation(playerLookAtBlock), player);
+                    }
+                    else {
+                        revealShop((com.ghostchu.quickshop.api.shop.Shop) FindItemAddOn.getQsApiInstance().findShopAtLocation(playerLookAtBlock), player);
+                    }
+                } else {
+                    Logger.logDebugInfo("TargetBlock is null!");
                 }
             }
             else {
-                player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cNo permission!"));
+                player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + NO_PERMISSION));
             }
         }
     }
 
-    /**
-     * Handles the saving hidden shops to file feature
-     * @param commandSender Who is the command sender: console or player
-     */
-    /*
-    public void handleHiddenShopSavingToFile(CommandSender commandSender) {
-        if (!(commandSender instanceof Player)) {
-            LoggerUtils.logInfo("This command can only be run from in game");
-        }
-        else {
-            Player player = (Player) commandSender;
-            if(player.hasPermission(PlayerPerms.FINDITEM_ADMIN.toString())) {
-                HiddenShopStorageUtil.saveHiddenShopsToFile();
-                player.sendMessage(ColorTranslator.translateColorCodes(
-                        FindItemAddOn.getConfigProvider().PLUGIN_PREFIX
-                                + "&aSaved hidden shops!"));
-            }
-            else {
-                player.sendMessage(
-                        ColorTranslator.translateColorCodes(
-                                FindItemAddOn.getConfigProvider().PLUGIN_PREFIX
-                                        + "&cNo permission!"));
-            }
-        }
-    }
-     */
-
-    /**
-     * Handles the loading of hidden shops from file feature
-     * @param commandSender Who is the command sender: console or player
-     */
-    /*
-    public void handleHiddenShopLoadingFromFile(CommandSender commandSender) {
-        if (!(commandSender instanceof Player)) {
-            LoggerUtils.logInfo("This command can only be run from in game");
-        }
-        else {
-            Player player = (Player) commandSender;
-            if(player.hasPermission(PlayerPerms.FINDITEM_ADMIN.toString())) {
-                HiddenShopStorageUtil.loadHiddenShopsFromFile();
-                player.sendMessage(ColorTranslator.translateColorCodes(
-                        FindItemAddOn.getConfigProvider().PLUGIN_PREFIX
-                                + "&aSaved hidden shops!"));
-            }
-            else {
-                player.sendMessage(
-                        ColorTranslator.translateColorCodes(
-                                FindItemAddOn.getConfigProvider().PLUGIN_PREFIX
-                                        + "&cNo permission!"));
-            }
-        }
-    }
-     */
-
     /**
      * Handles plugin reload
      * @param commandSender Who is the command sender: console or player
      */
     public void handlePluginReload(CommandSender commandSender) {
-        if (!(commandSender instanceof Player)) {
+        if (!(commandSender instanceof Player player)) {
             ConfigSetup.reloadConfig();
             ConfigSetup.checkForMissingProperties();
             ConfigSetup.saveConfig();
             FindItemAddOn.initConfigProvider();
-            List allServerShops = FindItemAddOn.getQsApiInstance().getAllShops();
-            if(allServerShops.size() == 0) {
-                LoggerUtils.logWarning("&6Found &e0 &6shops on the server. If you ran &e/qs reload &6recently, please restart your server!");
+            List<Shop> allServerShops = FindItemAddOn.getQsApiInstance().getAllShops();
+            if(allServerShops.isEmpty()) {
+                Logger.logWarning("&6Found &e0 &6shops on the server. If you ran &e/qs reload &6recently, please restart your server!");
             }
             else {
-                LoggerUtils.logInfo("&aFound &e" + allServerShops.size() + " &ashops on the server.");
+                Logger.logInfo("&aFound &e" + allServerShops.size() + " &ashops on the server.");
             }
             WarpUtils.updateWarps();
         }
         else {
-            Player player = (Player) commandSender;
-            if(player.hasPermission(PlayerPerms.FINDITEM_RELOAD.value()) || player.hasPermission(PlayerPerms.FINDITEM_ADMIN.value())) {
+            if(player.hasPermission(PlayerPermsEnum.FINDITEM_RELOAD.value()) || player.hasPermission(PlayerPermsEnum.FINDITEM_ADMIN.value())) {
                 ConfigSetup.reloadConfig();
                 ConfigSetup.checkForMissingProperties();
                 ConfigSetup.saveConfig();
                 FindItemAddOn.initConfigProvider();
                 player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&aConfig reloaded!"));
                 List allServerShops = FindItemAddOn.getQsApiInstance().getAllShops();
-                if(allServerShops.size() == 0) {
+                if(allServerShops.isEmpty()) {
                     player.sendMessage(ColorTranslator.translateColorCodes(
                             FindItemAddOn.getConfigProvider().PLUGIN_PREFIX
                                     + "&6Found &e0 &6shops on the server. If you ran &e/qs reload &6recently, please restart your server!"));
@@ -256,7 +248,7 @@ public class CmdExecutorHandler {
                 WarpUtils.updateWarps();
             }
             else {
-                player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cNo permission!"));
+                player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + NO_PERMISSION));
             }
         }
     }
@@ -271,18 +263,18 @@ public class CmdExecutorHandler {
         if (!(commandSender instanceof Player)) {
             Bukkit.getPluginManager().disablePlugin(FindItemAddOn.getInstance());
             Bukkit.getPluginManager().enablePlugin(FindItemAddOn.getPlugin(FindItemAddOn.class));
-            LoggerUtils.logInfo("&aPlugin restarted!");
+            Logger.logInfo("&aPlugin restarted!");
             List allServerShops = FindItemAddOn.getQsApiInstance().getAllShops();
             if(allServerShops.size() == 0) {
-                LoggerUtils.logWarning("&6Found &e0 &6shops on the server. If you ran &e/qs reload &6recently, please restart your server!");
+                Logger.logWarning("&6Found &e0 &6shops on the server. If you ran &e/qs reload &6recently, please restart your server!");
             }
             else {
-                LoggerUtils.logInfo("&aFound &e" + allServerShops.size() + " &ashops on the server.");
+                Logger.logInfo("&aFound &e" + allServerShops.size() + " &ashops on the server.");
             }
         }
         else {
             Player player = (Player) commandSender;
-            if(player.hasPermission(PlayerPerms.FINDITEM_RESTART.value()) || player.hasPermission(PlayerPerms.FINDITEM_ADMIN.value())) {
+            if(player.hasPermission(PlayerPermsEnum.FINDITEM_RESTART.value()) || player.hasPermission(PlayerPermsEnum.FINDITEM_ADMIN.value())) {
                 Bukkit.getPluginManager().disablePlugin(FindItemAddOn.getInstance());
                 Bukkit.getPluginManager().enablePlugin(FindItemAddOn.getPlugin(FindItemAddOn.class));
                 player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&aPlugin restarted!"));
@@ -298,7 +290,7 @@ public class CmdExecutorHandler {
                 }
             }
             else {
-                player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cNo permission!"));
+                player.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + NO_PERMISSION));
             }
         }
     }
@@ -308,7 +300,7 @@ public class CmdExecutorHandler {
      * @param shop
      * @param player
      */
-    private void hideShop(org.maxgamer.quickshop.api.shop.Shop shop, Player player) {
+    private void hideReremakeShop(org.maxgamer.quickshop.api.shop.Shop shop, Player player) {
         if(shop != null) {
             // check if command runner same as shop owner
             if(FindItemAddOn.getQsApiInstance().isShopOwnerCommandRunner(player, shop)) {
@@ -342,7 +334,7 @@ public class CmdExecutorHandler {
      * @param shop
      * @param player
      */
-    private void hideShop(com.ghostchu.quickshop.api.shop.Shop shop, Player player) {
+    private void hideHikariShop(com.ghostchu.quickshop.api.shop.Shop shop, Player player) {
         if(shop != null) {
             // check if command runner same as shop owner
             if(FindItemAddOn.getQsApiInstance().isShopOwnerCommandRunner(player, shop)) {

src/main/java/io/myzticbean/finditemaddon/handlers/gui/Menu.java

@@ -0,0 +1,163 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.handlers.gui;
+
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import io.myzticbean.finditemaddon.models.FoundShopItemModel;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.components.CustomModelDataComponent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Based on an awesome tutorial from https://www.youtube.com/watch?v=xebH6M_7k18
+ * Gui pagination: https://www.youtube.com/watch?v=e80NO9Pgz7s
+ * 
+ * @author myzticbean
+ */
+@SuppressWarnings({"java:S100", "java:S3776"})
+public abstract class Menu implements InventoryHolder {
+
+    protected Inventory inventory;
+
+    protected PlayerMenuUtility playerMenuUtility;
+
+    protected ItemStack GUI_FILLER_ITEM;
+
+    protected Menu(PlayerMenuUtility playerMenuUtility) {
+        this.playerMenuUtility = playerMenuUtility;
+
+        assert FindItemAddOn.getConfigProvider().SHOP_GUI_FILLER_ITEM != null;
+        Material fillerMaterial = Material.getMaterial(FindItemAddOn.getConfigProvider().SHOP_GUI_FILLER_ITEM);
+        if (fillerMaterial == null) {
+            fillerMaterial = Material.GRAY_STAINED_GLASS_PANE;
+        }
+        if (!fillerMaterial.isAir()) {
+            GUI_FILLER_ITEM = new ItemStack(fillerMaterial);
+            ItemMeta fillerItemItemMeta = this.GUI_FILLER_ITEM.getItemMeta();
+            assert fillerItemItemMeta != null;
+            fillerItemItemMeta.setDisplayName(" ");
+            if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_GUI_FILLER_ITEM_CMD)) {
+                try {
+                    fillerItemItemMeta.setCustomModelData(Integer.parseInt(FindItemAddOn.getConfigProvider().SHOP_GUI_FILLER_ITEM_CMD));
+                    if(checkServerVersionIs_1_21_5_OrAbove()) {
+                        var customModelDataComponent = fillerItemItemMeta.getCustomModelDataComponent();
+                        customModelDataComponent.setFloats(List.of(Float.parseFloat(FindItemAddOn.getConfigProvider().SHOP_GUI_FILLER_ITEM_CMD)));
+                        fillerItemItemMeta.setCustomModelDataComponent(customModelDataComponent);
+                    }
+                } catch (Exception e) {
+                    Logger.logError("Error setting custom model data", e);
+                }
+            }
+            this.GUI_FILLER_ITEM.setItemMeta(fillerItemItemMeta);
+        }
+    }
+
+    private boolean checkServerVersionIs_1_21_5_OrAbove() {
+        String serverVersionString = Bukkit.getVersion();
+        // Example: "1.21-109-5a5035b (MC: 1.21)" or "git-Paper-123 (MC: 1.20.4)"
+        Logger.logDebugInfo("Full Server Version for check: " + serverVersionString);
+        Pattern pattern = Pattern.compile("\\(MC: ([\\d\\.]+)\\)");
+        Matcher matcher = pattern.matcher(serverVersionString);
+        if (matcher.find()) {
+            String mcVersionStr = matcher.group(1); // This will be "1.21" or "1.20.4" etc.
+            Logger.logDebugInfo("Extracted MC Version: " + mcVersionStr);
+            String[] versionParts = mcVersionStr.split("\\.");
+            // We need at least major and minor version numbers (e.g., "1.21")
+            if (versionParts.length >= 2) {
+                try {
+                    int major = Integer.parseInt(versionParts[0]);
+                    int minor = Integer.parseInt(versionParts[1]);
+                    int patch = 0; // Default patch to 0 if not specified (e.g., for "1.21")
+                    if (versionParts.length >= 3) {
+                        // Attempt to parse patch version, removing any non-numeric characters
+                        String patchStr = versionParts[2].replaceAll("[^0-9]", "");
+                        if (!patchStr.isEmpty()) {
+                            patch = Integer.parseInt(patchStr);
+                        }
+                    }
+                    // Target version: 1.21.5
+                    final int TARGET_MAJOR = 1;
+                    final int TARGET_MINOR = 21;
+                    final int TARGET_PATCH = 5;
+                    // Compare versions
+                    if (major > TARGET_MAJOR) {
+                        return true; // e.g., 2.x.x is > 1.21.5
+                    }
+                    if (major == TARGET_MAJOR) {
+                        if (minor > TARGET_MINOR) {
+                            return true; // e.g., 1.22.x is > 1.21.5
+                        }
+                        if (minor == TARGET_MINOR) {
+                            return patch >= TARGET_PATCH; // e.g., 1.21.5, 1.21.6 are >= 1.21.5
+                        }
+                    }
+                    // All other cases are older versions (e.g., 1.20.x, 1.21.0-1.21.4)
+                    return false;
+                } catch (NumberFormatException e) {
+                    Logger.logDebugInfo("Failed to parse MC version parts from: '" + mcVersionStr + "': " + e.getMessage());
+                    return false;
+                }
+            } else {
+                Logger.logDebugInfo("Could not parse MC version string '" + mcVersionStr + "' into at least major.minor parts.");
+                return false;
+            }
+        } else {
+            Logger.logDebugInfo("Could not find MC version pattern '(MC: ...)' in server version string: '" + serverVersionString + "'. Assuming older version or unable to determine.");
+            return false;
+        }
+    }
+
+    public abstract String getMenuName();
+
+    public abstract int getSlots();
+
+    public abstract void handleMenu(InventoryClickEvent e);
+
+    public abstract void setMenuItems(List<FoundShopItemModel> foundShops);
+
+    /*public void open() {
+        inventory = Bukkit.createInventory(this, getSlots(), getMenuName());
+        this.setMenuItems();
+        playerMenuUtility.getOwner().openInventory(inventory);
+    }*/
+
+    public void open(List<FoundShopItemModel> foundShops) {
+        inventory = Bukkit.createInventory(this, getSlots(), getMenuName());
+        this.setMenuItems(foundShops);
+        playerMenuUtility.getOwner().openInventory(inventory);
+    }
+
+    @NotNull
+    @Override
+    public Inventory getInventory() {
+        return inventory;
+    }
+}

src/main/java/io/myzticbean/finditemaddon/handlers/gui/PaginatedMenu.java

@@ -1,21 +1,51 @@
-package io.myzticbean.finditemaddon.Handlers.GUIHandler;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.handlers.gui;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Models.FoundShopItemModel;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
+import io.myzticbean.finditemaddon.models.FoundShopItemModel;
+import io.myzticbean.finditemaddon.utils.log.Logger;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.SkullMeta;
+import org.bukkit.profile.PlayerProfile;
+import org.bukkit.profile.PlayerTextures;
 
+import java.net.URL;
+import java.util.Base64;
 import java.util.List;
 import java.util.UUID;
 
+/**
+ * @author myzticbean
+ */
 public abstract class PaginatedMenu extends Menu {
+
+    private static final Gson gson = new Gson();
+
     protected int page = 0;
-    protected final int maxItemsPerPage = 45;
     protected int index = 0;
 
     protected ItemStack backButton;
@@ -24,6 +54,7 @@ public abstract class PaginatedMenu extends Menu {
     protected ItemStack lastPageButton;
     protected ItemStack closeInvButton;
 
+    protected static final int MAX_ITEMS_PER_PAGE = 45;
     private final String BACK_BUTTON_SKIN_ID = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjZkYWI3MjcxZjRmZjA0ZDU0NDAyMTkwNjdhMTA5YjVjMGMxZDFlMDFlYzYwMmMwMDIwNDc2ZjdlYjYxMjE4MCJ9fX0=";
     private final String FIRST_PAGE_BUTTON_SKIN_ID = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTI5M2E2MDcwNTAzMTcyMDcxZjM1ZjU4YzgyMjA0ZTgxOGNkMDY1MTg2OTAxY2ExOWY3ZGFkYmRhYzE2NWU0NCJ9fX0=";
     private final String NEXT_BUTTON_SKIN_ID = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGFhMTg3ZmVkZTg4ZGUwMDJjYmQ5MzA1NzVlYjdiYTQ4ZDNiMWEwNmQ5NjFiZGM1MzU4MDA3NTBhZjc2NDkyNiJ9fX0=";
@@ -82,7 +113,7 @@ public abstract class PaginatedMenu extends Menu {
             }
         }
         catch (NumberFormatException e) {
-            LoggerUtils.logDebugInfo("Invalid Custom Model Data for Back Button in config.yml");
+            Logger.logDebugInfo("Invalid Custom Model Data for Back Button in config.yml");
         }
         backButton.setItemMeta(backButtonMeta);
     }
@@ -108,7 +139,7 @@ public abstract class PaginatedMenu extends Menu {
             }
         }
         catch (NumberFormatException e) {
-            LoggerUtils.logDebugInfo("Invalid Custom Model Data for Next Button in config.yml");
+            Logger.logDebugInfo("Invalid Custom Model Data for Next Button in config.yml");
         }
         nextButton.setItemMeta(nextButtonMeta);
     }
@@ -130,7 +161,7 @@ public abstract class PaginatedMenu extends Menu {
             }
         }
         catch (NumberFormatException e) {
-            LoggerUtils.logDebugInfo("Invalid Custom Model Data for Goto First Page Button in config.yml");
+            Logger.logDebugInfo("Invalid Custom Model Data for Goto First Page Button in config.yml");
         }
         firstPageButton.setItemMeta(firstPageButtonMeta);
     }
@@ -152,7 +183,7 @@ public abstract class PaginatedMenu extends Menu {
             }
         }
         catch (NumberFormatException e) {
-            LoggerUtils.logDebugInfo("Invalid Custom Model Data for Goto Last Page Button in config.yml");
+            Logger.logDebugInfo("Invalid Custom Model Data for Goto Last Page Button in config.yml");
         }
         lastPageButton.setItemMeta(lastPageButtonMeta);
     }
@@ -176,16 +207,39 @@ public abstract class PaginatedMenu extends Menu {
             }
         }
         catch (NumberFormatException e) {
-            LoggerUtils.logDebugInfo("Invalid Custom Model Data for Close Button in config.yml");
+            Logger.logDebugInfo("Invalid Custom Model Data for Close Button in config.yml");
         }
         closeInvButton.setItemMeta(closeInvMeta);
     }
 
-    private ItemStack createPlayerHead(String value) {
-        ItemStack skull = new ItemStack(Material.PLAYER_HEAD);
-        UUID hashAsId = new UUID(value.hashCode(), value.hashCode());
-        return Bukkit.getUnsafe().modifyItemStack(skull,
-                "{SkullOwner:{Id:\"" + hashAsId + "\",Properties:{textures:[{Value:\"" + value + "\"}]}}}"
-        );
+    private ItemStack createPlayerHead(String textureValue) {
+        ItemStack head = new ItemStack(Material.PLAYER_HEAD, 1);
+        SkullMeta meta = (SkullMeta) head.getItemMeta();
+        if (meta != null) {
+            PlayerProfile profile = Bukkit.createPlayerProfile(UUID.randomUUID(), null);
+            PlayerTextures textures = profile.getTextures();
+            try {
+                String decodedValue = new String(Base64.getDecoder().decode(textureValue));
+                Logger.logDebugInfo("Decoded Value: " + decodedValue);
+                String textureUrl = extractTextureUrl(decodedValue);
+                URL url = new URL(textureUrl);
+                textures.setSkin(url);
+            } catch (Exception e) {
+                Logger.logError(e);
+            }
+            profile.setTextures(textures);
+            meta.setOwnerProfile(profile);
+            head.setItemMeta(meta);
+        }
+        return head;
+    }
+
+    private String extractTextureUrl(String decodedValue) {
+        JsonObject jsonObject = gson.fromJson(decodedValue, JsonObject.class);
+        return jsonObject
+                .getAsJsonObject("textures")
+                .getAsJsonObject("SKIN")
+                .get("url")
+                .getAsString();
     }
 }

src/main/java/io/myzticbean/finditemaddon/handlers/gui/PlayerMenuUtility.java

@@ -0,0 +1,61 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.handlers.gui;
+
+import io.myzticbean.finditemaddon.models.FoundShopItemModel;
+import lombok.Getter;
+import lombok.Setter;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author myzticbean
+ */
+public class PlayerMenuUtility {
+    private UUID owner;
+
+    @Setter
+    @Getter
+    private List<FoundShopItemModel> playerShopSearchResult;
+
+    public PlayerMenuUtility(Player owner) {
+        this.owner = owner.getUniqueId();
+    }
+
+    public PlayerMenuUtility(UUID owner) {
+        this.owner = owner;
+    }
+
+    @Nullable
+    public Player getOwner() {
+        return Bukkit.getPlayer(owner);
+    }
+
+    public void setOwner(Player owner) {
+        this.owner = owner.getUniqueId();
+    }
+
+    public void setOwner(UUID owner) {
+        this.owner = owner;
+    }
+}

src/main/java/io/myzticbean/finditemaddon/handlers/gui/menus/FoundShopsMenu.java

@@ -0,0 +1,682 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.handlers.gui.menus;
+
+import com.bekvon.bukkit.residence.protection.ClaimedResidence;
+import com.olziedev.playerwarps.api.warp.Warp;
+import io.myzticbean.finditemaddon.config.ConfigProvider;
+import io.myzticbean.finditemaddon.dependencies.EssentialsXPlugin;
+import io.myzticbean.finditemaddon.dependencies.PlayerWarpsPlugin;
+import io.myzticbean.finditemaddon.dependencies.ResidencePlugin;
+import io.myzticbean.finditemaddon.dependencies.WGPlugin;
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import io.myzticbean.finditemaddon.handlers.gui.PaginatedMenu;
+import io.myzticbean.finditemaddon.handlers.gui.PlayerMenuUtility;
+import io.myzticbean.finditemaddon.models.FoundShopItemModel;
+import io.myzticbean.finditemaddon.models.enums.CustomCmdPlaceholdersEnum;
+import io.myzticbean.finditemaddon.models.enums.PlayerPermsEnum;
+import io.myzticbean.finditemaddon.models.enums.ShopLorePlaceholdersEnum;
+import io.myzticbean.finditemaddon.utils.json.ShopSearchActivityStorageUtil;
+import io.myzticbean.finditemaddon.utils.LocationUtils;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import io.myzticbean.finditemaddon.utils.warp.EssentialWarpsUtil;
+import io.myzticbean.finditemaddon.utils.warp.PlayerWarpsUtil;
+import io.myzticbean.finditemaddon.utils.warp.ResidenceUtils;
+import io.myzticbean.finditemaddon.utils.warp.WGRegionUtils;
+import io.papermc.lib.PaperLib;
+import me.kodysimpson.simpapi.colors.ColorTranslator;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+
+/**
+ * Handler class for FoundShops GUI
+ * 
+ * @author myzticbean
+ */
+public class FoundShopsMenu extends PaginatedMenu {
+
+    public static final String SHOP_STOCK_UNLIMITED = "Unlimited";
+    public static final String SHOP_STOCK_UNKNOWN = "Unknown";
+    private static final String NAMEDSPACE_KEY_LOCATION_DATA = "locationData";
+    private final ConfigProvider configProvider;
+
+    public FoundShopsMenu(PlayerMenuUtility playerMenuUtility, List<FoundShopItemModel> searchResult) {
+        super(playerMenuUtility, searchResult);
+        configProvider = FindItemAddOn.getConfigProvider();
+    }
+
+    @Override
+    public String getMenuName() {
+        if (!StringUtils.isEmpty(configProvider.SHOP_SEARCH_GUI_TITLE)) {
+            return ColorTranslator.translateColorCodes(configProvider.SHOP_SEARCH_GUI_TITLE);
+        } else {
+            return ColorTranslator.translateColorCodes("&l» &rShops");
+        }
+    }
+
+    @Override
+    public int getSlots() {
+        return 54;
+    }
+
+    @Override
+    public void handleMenu(@NotNull InventoryClickEvent event) {
+        int slot = event.getSlot();
+        Player player = (Player) event.getWhoClicked();
+
+        // Handle navigation buttons (prev, next, first, last page)
+        if (handleNavigationClick(event, slot)) {
+            return;
+        }
+
+        // Close inventory if the close button (slot 49) is clicked
+        if (slot == 49) {
+            player.closeInventory();
+            return;
+        }
+
+        // Ignore clicks on empty slots
+        if (event.getCurrentItem().getType().equals(Material.AIR)) {
+            Logger.logDebugInfo(player.getName() + " just clicked on AIR!");
+            return;
+        }
+
+        // Handle clicks on shop items
+        handleShopItemClick(event, player);
+    }
+
+    /**
+     * Handles clicks on navigation buttons
+     * 
+     * @param event The InventoryClickEvent
+     * @param slot  The clicked slot number
+     * @return true if a navigation button was clicked, false otherwise
+     */
+    private boolean handleNavigationClick(InventoryClickEvent event, int slot) {
+        return switch (slot) {
+            case 45 -> {
+                handleMenuClickForNavToPrevPage(event);
+                yield true;
+            }
+            case 46 -> {
+                handleFirstPageClick(event);
+                yield true;
+            }
+            case 52 -> {
+                handleLastPageClick(event);
+                yield true;
+            }
+            case 53 -> {
+                handleMenuClickForNavToNextPage(event);
+                yield true;
+            }
+            default -> false;
+        };
+    }
+
+    /**
+     * Handles clicks on shop items in the inventory
+     * 
+     * @param event  The InventoryClickEvent
+     * @param player The player who clicked
+     */
+    private void handleShopItemClick(@NotNull InventoryClickEvent event, Player player) {
+        ItemStack item = event.getCurrentItem();
+        ItemMeta meta = item.getItemMeta();
+        NamespacedKey key = new NamespacedKey(FindItemAddOn.getInstance(), NAMEDSPACE_KEY_LOCATION_DATA);
+
+        // Check if the item has the required location data
+        if (!meta.getPersistentDataContainer().has(key, PersistentDataType.STRING)) {
+            Logger.logError("PersistentDataContainer doesn't have the right kind of data!");
+            return;
+        }
+
+        String locData = meta.getPersistentDataContainer().get(key, PersistentDataType.STRING);
+        List<String> locDataList = Arrays.asList(locData.split("\\s*\\|\\|\\|\\s*"));
+
+        // Handle direct teleportation to shop
+        if (configProvider.TP_PLAYER_DIRECTLY_TO_SHOP && locDataList.size() > 1) {
+            handleDirectShopTeleport(player, locDataList);
+        }
+        // Handle teleportation to nearest warp
+        else if (configProvider.TP_PLAYER_TO_NEAREST_WARP && locDataList.size() == 1
+                && !locDataList.get(0).isEmpty()) {
+            handleWarpTeleport(player, locDataList.get(0));
+        }
+
+        // Execute custom commands if enabled
+        handleCustomCommands(player, locDataList);
+        player.closeInventory();
+    }
+
+    /**
+     * Handles direct teleportation to a shop
+     * 
+     * @param player      The player to teleport
+     * @param locDataList List containing location data
+     */
+    private void handleDirectShopTeleport(@NotNull Player player, List<String> locDataList) {
+        // Check if player has permission to teleport
+        if (!player.hasPermission(PlayerPermsEnum.FINDITEM_SHOPTP.value())) {
+            sendNoPermissionMessage(player);
+            return;
+        }
+
+        Location shopLocation = parseShopLocation(locDataList);
+        if (shopLocation == null)
+            return;
+
+        // Check if player is teleporting to their own shop
+        UUID shopOwner = ShopSearchActivityStorageUtil.getShopOwnerUUID(shopLocation);
+        if (player.getUniqueId().equals(shopOwner) && !PlayerPermsEnum.canPlayerTpToOwnShop(player)) {
+            player.sendMessage(ColorTranslator.translateColorCodes(
+                    configProvider.PLUGIN_PREFIX + configProvider.SHOP_TP_NO_PERMISSION_MSG));
+            return;
+        }
+
+        // Find a safe location around the shop
+        Location locToTeleport = LocationUtils.findSafeLocationAroundShop(shopLocation, player);
+        if (locToTeleport == null) {
+            sendUnsafeAreaMessage(player);
+            return;
+        }
+
+        // Record the visit and set last location for Essentials
+        ShopSearchActivityStorageUtil.addPlayerVisitEntryAsync(shopLocation, player);
+        if (EssentialsXPlugin.isEnabled())
+            EssentialsXPlugin.setLastLocation(player);
+
+        // Apply teleport delay if necessary, otherwise teleport immediately
+        if (shouldApplyTeleportDelay(player)) {
+            applyTeleportDelay(player, locToTeleport);
+        } else {
+            PaperLib.teleportAsync(player, locToTeleport, PlayerTeleportEvent.TeleportCause.PLUGIN);
+        }
+    }
+
+    /**
+     * Handles teleportation to the nearest warp
+     * 
+     * @param player   The player to teleport
+     * @param warpName The name of the warp
+     */
+    private void handleWarpTeleport(Player player, String warpName) {
+        switch (configProvider.NEAREST_WARP_MODE) {
+            case 1:
+                EssentialWarpsUtil.warpPlayer(player, warpName);
+                break;
+            case 2:
+                PlayerWarpsUtil.executeWarpPlayer(player, warpName);
+                break;
+            case 4:
+                ResidenceUtils.residenceTp(player, warpName);
+                break;
+        }
+    }
+
+    /**
+     * Executes custom commands if enabled
+     * 
+     * @param player      The player who triggered the commands
+     * @param locDataList List containing location data
+     */
+    private void handleCustomCommands(Player player, List<String> locDataList) {
+        if (configProvider.CUSTOM_CMDS_RUN_ENABLED && !configProvider.CUSTOM_CMDS_LIST.isEmpty()
+                && locDataList.size() > 1) {
+            Location shopLocation = parseShopLocation(locDataList);
+            if (shopLocation == null)
+                return;
+
+            for (String cmd : configProvider.CUSTOM_CMDS_LIST) {
+                Bukkit.dispatchCommand(Bukkit.getConsoleSender(),
+                        replaceCustomCmdPlaceholders(cmd, player, shopLocation));
+            }
+        }
+    }
+
+    /**
+     * Parses location data into a Bukkit Location
+     * 
+     * @param locDataList List containing location data
+     * @return A Bukkit Location, or null if parsing fails
+     */
+    private @Nullable Location parseShopLocation(@NotNull List<String> locDataList) {
+        if (locDataList.size() <= 1)
+            return null;
+        World world = Bukkit.getWorld(locDataList.get(0));
+        int locX = Integer.parseInt(locDataList.get(1));
+        int locY = Integer.parseInt(locDataList.get(2));
+        int locZ = Integer.parseInt(locDataList.get(3));
+        return new Location(world, locX, locY, locZ);
+    }
+
+    /**
+     * Sends a no permission message to the player
+     * 
+     * @param player The player to send the message to
+     */
+    private void sendNoPermissionMessage(Player player) {
+        if (!StringUtils.isEmpty(configProvider.SHOP_TP_NO_PERMISSION_MSG)) {
+            player.sendMessage(ColorTranslator.translateColorCodes(configProvider.PLUGIN_PREFIX
+                    + configProvider.SHOP_TP_NO_PERMISSION_MSG));
+        }
+    }
+
+    /**
+     * Sends an unsafe area message to the player
+     * 
+     * @param player The player to send the message to
+     */
+    private void sendUnsafeAreaMessage(Player player) {
+        if (!StringUtils.isEmpty(configProvider.UNSAFE_SHOP_AREA_MSG)) {
+            player.sendMessage(ColorTranslator.translateColorCodes(configProvider.PLUGIN_PREFIX
+                    + configProvider.UNSAFE_SHOP_AREA_MSG));
+        }
+    }
+
+    /**
+     * Checks if a teleport delay should be applied
+     * 
+     * @param player The player to check
+     * @return true if a delay should be applied, false otherwise
+     */
+    private boolean shouldApplyTeleportDelay(Player player) {
+        return StringUtils.isNumeric(configProvider.TP_DELAY_IN_SECONDS)
+                && !"0".equals(configProvider.TP_DELAY_IN_SECONDS)
+                && !PlayerPermsEnum.hasShopTpDelayBypassPermOrAdmin(player);
+    }
+
+    /**
+     * Applies a teleport delay and sends a message to the player
+     * 
+     * @param player        The player to apply the delay to
+     * @param locToTeleport The location to teleport to after the delay
+     */
+    private void applyTeleportDelay(Player player, Location locToTeleport) {
+        long delay = Long.parseLong(configProvider.TP_DELAY_IN_SECONDS);
+        Logger.logDebugInfo("Teleporting delay is set to: " + delay);
+        String tpDelayMsg = configProvider.TP_DELAY_MESSAGE;
+        if (!StringUtils.isEmpty(tpDelayMsg)) {
+            player.sendMessage(ColorTranslator.translateColorCodes(
+                    configProvider.PLUGIN_PREFIX + replaceDelayPlaceholder(tpDelayMsg, delay)));
+        }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(
+                FindItemAddOn.getInstance(),
+                () -> PaperLib.teleportAsync(player, locToTeleport, PlayerTeleportEvent.TeleportCause.PLUGIN),
+                delay * 20);
+    }
+
+    /**
+     * Handles navigation to the next page
+     * 
+     * @param event The InventoryClickEvent
+     */
+    private void handleMenuClickForNavToNextPage(InventoryClickEvent event) {
+        if (!((index + 1) >= super.playerMenuUtility.getPlayerShopSearchResult().size())) {
+            page = page + 1;
+            super.open(super.playerMenuUtility.getPlayerShopSearchResult());
+        } else {
+            if (!StringUtils.isEmpty(configProvider.SHOP_NAV_LAST_PAGE_ALERT_MSG)) {
+                event.getWhoClicked().sendMessage(
+                        ColorTranslator.translateColorCodes(
+                                configProvider.PLUGIN_PREFIX + configProvider.SHOP_NAV_LAST_PAGE_ALERT_MSG));
+            }
+        }
+    }
+
+    /**
+     * Handles navigation to the previous page
+     * 
+     * @param event The InventoryClickEvent
+     */
+    private void handleMenuClickForNavToPrevPage(InventoryClickEvent event) {
+        if (page == 0) {
+            if (!StringUtils.isEmpty(configProvider.SHOP_NAV_FIRST_PAGE_ALERT_MSG)) {
+                event.getWhoClicked().sendMessage(
+                        ColorTranslator.translateColorCodes(configProvider.PLUGIN_PREFIX
+                                + configProvider.SHOP_NAV_FIRST_PAGE_ALERT_MSG));
+            }
+        } else {
+            page = page - 1;
+            super.open(super.playerMenuUtility.getPlayerShopSearchResult());
+        }
+    }
+
+    /**
+     * Handles navigation to the first page
+     * 
+     * @param event The InventoryClickEvent
+     */
+    private void handleFirstPageClick(InventoryClickEvent event) {
+        if (page == 0) {
+            if (!StringUtils.isEmpty(configProvider.SHOP_NAV_FIRST_PAGE_ALERT_MSG)) {
+                event.getWhoClicked().sendMessage(
+                        ColorTranslator.translateColorCodes(
+                                configProvider.PLUGIN_PREFIX
+                                        + configProvider.SHOP_NAV_FIRST_PAGE_ALERT_MSG));
+            }
+        } else {
+            page = 0;
+            super.open(super.playerMenuUtility.getPlayerShopSearchResult());
+        }
+    }
+
+    /**
+     * Handles navigation to the last page
+     * 
+     * @param event The InventoryClickEvent
+     */
+    private void handleLastPageClick(InventoryClickEvent event) {
+        int listSize = super.playerMenuUtility.getPlayerShopSearchResult().size();
+        if (!((index + 1) >= listSize)) {
+            double totalPages = listSize / MAX_ITEMS_PER_PAGE;
+            if (totalPages % 10 == 0) {
+                page = (int) Math.floor(totalPages);
+                Logger.logDebugInfo("Floor page value: " + page);
+            } else {
+                page = (int) Math.ceil(totalPages);
+                Logger.logDebugInfo("Ceiling page value: " + page);
+            }
+            super.open(super.playerMenuUtility.getPlayerShopSearchResult());
+        } else {
+            if (!StringUtils.isEmpty(configProvider.SHOP_NAV_LAST_PAGE_ALERT_MSG)) {
+                event.getWhoClicked().sendMessage(
+                        ColorTranslator.translateColorCodes(
+                                configProvider.PLUGIN_PREFIX
+                                        + configProvider.SHOP_NAV_LAST_PAGE_ALERT_MSG));
+            }
+        }
+    }
+
+    /**
+     * Sets the slots in the search result GUI
+     * 
+     * @param foundShops List of found shops
+     */
+    @Override
+    public void setMenuItems(List<FoundShopItemModel> foundShops) {
+        // Add the bottom navigation bar to the menu
+        addMenuBottomBar();
+
+        // If no shops were found, return early
+        if (foundShops == null || foundShops.isEmpty()) {
+            return;
+        }
+
+        int maxItemsPerPage = MAX_ITEMS_PER_PAGE;
+        // Iterate through the slots for this page
+        for (int guiSlotCounter = 0; guiSlotCounter < maxItemsPerPage; guiSlotCounter++) {
+            // Calculate the index in the foundShops list for the current slot
+            index = maxItemsPerPage * page + guiSlotCounter;
+            if (index >= foundShops.size()) {
+                break;
+            }
+
+            FoundShopItemModel foundShop = foundShops.get(index);
+            if (foundShop == null) {
+                continue;
+            }
+
+            // Create an ItemStack for the shop and add it to the inventory
+            ItemStack item = createShopItem(foundShop);
+            inventory.addItem(item);
+        }
+    }
+
+    /**
+     * Creates an ItemStack representing a shop
+     * 
+     * @param foundShop The shop to create an item for
+     * @return An ItemStack representing the shop
+     */
+    private @NotNull ItemStack createShopItem(@NotNull FoundShopItemModel foundShop) {
+        // Create a new ItemStack based on the shop's item
+        ItemStack item = new ItemStack(foundShop.getItem().getType(), foundShop.getItem().getAmount());
+        ItemMeta meta = foundShop.getItem().getItemMeta();
+        if (meta == null) {
+            meta = Bukkit.getItemFactory().getItemMeta(item.getType());
+        }
+
+        List<String> lore = new ArrayList<>();
+        // Add lore to the item
+        addItemLore(lore, foundShop);
+
+        meta.setLore(lore);
+        // Set location data in the item's metadata
+        setLocationData(meta, foundShop);
+
+        // Preserve custom model data if it exists
+        if (foundShop.getItem().getItemMeta().hasCustomModelData()) {
+            meta.setCustomModelData(foundShop.getItem().getItemMeta().getCustomModelData());
+        }
+
+        item.setItemMeta(meta);
+        return item;
+    }
+
+    /**
+     * Adds lore to an item representing a shop
+     * 
+     * @param lore      The list to add lore to
+     * @param foundShop The shop to create lore for
+     */
+    private void addItemLore(List<String> lore, FoundShopItemModel foundShop) {
+        // Add existing item lore
+        ItemMeta shopItemMeta = foundShop.getItem().getItemMeta();
+        if (shopItemMeta != null && shopItemMeta.hasLore()) {
+            for (String line : shopItemMeta.getLore()) {
+                lore.add(ColorTranslator.translateColorCodes(line));
+            }
+        }
+
+        // Add shop info lore
+        for (String loreLine : configProvider.SHOP_GUI_ITEM_LORE) {
+            if (loreLine.contains(ShopLorePlaceholdersEnum.NEAREST_WARP.value())) {
+                String nearestWarpInfo = getNearestWarpInfo(foundShop);
+                lore.add(ColorTranslator.translateColorCodes(
+                        loreLine.replace(ShopLorePlaceholdersEnum.NEAREST_WARP.value(), nearestWarpInfo)));
+            } else {
+                lore.add(ColorTranslator.translateColorCodes(replaceLorePlaceholders(loreLine, foundShop)));
+            }
+        }
+
+        // Add teleport info if applicable
+        if (configProvider.TP_PLAYER_DIRECTLY_TO_SHOP
+                && playerMenuUtility.getOwner().hasPermission(PlayerPermsEnum.FINDITEM_SHOPTP.value())) {
+            lore.add(ColorTranslator.translateColorCodes(configProvider.CLICK_TO_TELEPORT_MSG));
+        }
+    }
+
+    /**
+     * Finds the nearest warp or region to a shop based on the configuration
+     * 
+     * @param foundShop The shop to find the nearest warp/region for
+     * @return A string representing the nearest warp/region, or an error message if
+     *         none found
+     */
+    private String getNearestWarpInfo(FoundShopItemModel foundShop) {
+        int nearestWarpMode = configProvider.NEAREST_WARP_MODE;
+        switch (nearestWarpMode) {
+            case 1:
+                // EssentialsX warps
+                if (EssentialsXPlugin.isEnabled()) {
+                    String nearestEWarp = EssentialWarpsUtil.findNearestWarp(foundShop.getShopLocation());
+                    return (nearestEWarp != null && !StringUtils.isEmpty(nearestEWarp)) ? nearestEWarp
+                            : configProvider.NO_WARP_NEAR_SHOP_ERROR_MSG;
+                }
+                break;
+            case 2:
+                // PlayerWarps
+                if (PlayerWarpsPlugin.getIsEnabled()) {
+                    Warp nearestPlayerWarp = PlayerWarpsUtil.findNearestWarp(foundShop.getShopLocation(),
+                            foundShop.getShopOwner());
+                    return (nearestPlayerWarp != null) ? nearestPlayerWarp.getWarpName()
+                            : configProvider.NO_WARP_NEAR_SHOP_ERROR_MSG;
+                }
+                break;
+            case 3:
+                // WorldGuard regions
+                if (WGPlugin.isEnabled()) {
+                    String nearestWGRegion = new WGRegionUtils().findNearestWGRegion(foundShop.getShopLocation());
+                    return (nearestWGRegion != null && !StringUtils.isEmpty(nearestWGRegion)) ? nearestWGRegion
+                            : configProvider.NO_WG_REGION_NEAR_SHOP_ERROR_MSG;
+                }
+                break;
+            case 4:
+                // Residence plugin
+                if (ResidencePlugin.isEnabled()) {
+                    ClaimedResidence nearestResidence = ResidenceUtils
+                            .findNearestResidence(foundShop.getShopLocation());
+                    return (nearestResidence != null) ? ResidenceUtils.getResidenceName(nearestResidence)
+                            : configProvider.NO_RESIDENCE_NEAR_SHOP_ERROR_MSG;
+                }
+                break;
+            default:
+                Logger.logDebugInfo("Invalid value in 'nearest-warp-mode' in config.yml!");
+        }
+        return configProvider.NO_WARP_NEAR_SHOP_ERROR_MSG;
+    }
+
+    /**
+     * Sets location data in the item's metadata
+     * 
+     * @param meta      The ItemMeta to set the data on
+     * @param foundShop The shop to get location data from
+     */
+    private void setLocationData(ItemMeta meta, FoundShopItemModel foundShop) {
+        NamespacedKey key = new NamespacedKey(FindItemAddOn.getInstance(), NAMEDSPACE_KEY_LOCATION_DATA);
+        String locData = "";
+
+        if (configProvider.TP_PLAYER_DIRECTLY_TO_SHOP) {
+            // Store exact coordinates for direct teleportation
+            Location shopLoc = foundShop.getShopLocation();
+            locData = String.format("%s|||%d|||%d|||%d", shopLoc.getWorld().getName(), shopLoc.getBlockX(),
+                    shopLoc.getBlockY(), shopLoc.getBlockZ());
+        } else if (configProvider.TP_PLAYER_TO_NEAREST_WARP) {
+            // Store nearest warp info for warp teleportation
+            locData = getNearestWarpInfo(foundShop);
+        }
+
+        meta.getPersistentDataContainer().set(key, PersistentDataType.STRING, locData);
+    }
+
+    /**
+     * Replaces all the placeholders in the Shop item lore in GUI
+     * 
+     * @param text Line of lore
+     * @param shop Shop instance
+     * @return Line of lore replaced with placeholder values
+     */
+    private @NotNull String replaceLorePlaceholders(String text, @NotNull FoundShopItemModel shop) {
+        text = text.replace(ShopLorePlaceholdersEnum.ITEM_PRICE.value(), formatNumber(shop.getShopPrice()));
+
+        if (text.contains(ShopLorePlaceholdersEnum.SHOP_STOCK.value())) {
+            int stock = shop.getRemainingStockOrSpace();
+            String stockText;
+            if (stock == -2) {
+                // if -2 (cache doesn't have value) -> try to fetch from MAIN thread
+                int stockOrSpace = processUnknownStockSpace(shop);
+                stockText = (stockOrSpace == -2) ? SHOP_STOCK_UNKNOWN
+                        : (stockOrSpace == -1 ? SHOP_STOCK_UNLIMITED : String.valueOf(stockOrSpace));
+            } else {
+                stockText = (stock == Integer.MAX_VALUE) ? SHOP_STOCK_UNLIMITED : String.valueOf(stock);
+            }
+            text = text.replace(ShopLorePlaceholdersEnum.SHOP_STOCK.value(), stockText);
+        }
+
+        text = text.replace(ShopLorePlaceholdersEnum.SHOP_PER_ITEM_QTY.value(),
+                String.valueOf(shop.getItem().getAmount()));
+
+        if (text.contains(ShopLorePlaceholdersEnum.SHOP_OWNER.value())) {
+            OfflinePlayer shopOwner = Bukkit.getOfflinePlayer(shop.getShopOwner());
+            // set a generic name for shops with no owner name ('Admin')
+            String ownerName = shopOwner.getName() != null ? shopOwner.getName() : "Admin";
+            text = text.replace(ShopLorePlaceholdersEnum.SHOP_OWNER.value(), ownerName);
+        }
+
+        if (text.contains(ShopLorePlaceholdersEnum.SHOP_LOCATION.value())) {
+            Location loc = shop.getShopLocation();
+            String locText = loc.getBlockX() + ", " + loc.getBlockY() + ", " + loc.getBlockZ();
+            text = text.replace(ShopLorePlaceholdersEnum.SHOP_LOCATION.value(), locText);
+        }
+
+        text = text.replace(ShopLorePlaceholdersEnum.SHOP_WORLD.value(),
+                Objects.requireNonNull(shop.getShopLocation().getWorld()).getName());
+
+        // Added in v2.0
+        text = text.replace(ShopLorePlaceholdersEnum.SHOP_VISITS.value(),
+                String.valueOf(ShopSearchActivityStorageUtil.getPlayerVisitCount(shop.getShopLocation())));
+
+        return text;
+    }
+
+    private int processUnknownStockSpace(FoundShopItemModel shop) {
+        return FindItemAddOn.getQsApiInstance().processUnknownStockSpace(shop.getShopLocation(), shop.isToBuy());
+    }
+
+    private String replaceDelayPlaceholder(String tpDelayMsg, long delay) {
+        return tpDelayMsg.replace("{DELAY}", String.valueOf(delay));
+    }
+
+    private String formatNumber(double number) {
+        if (configProvider.SHOP_GUI_USE_SHORTER_CURRENCY_FORMAT) {
+            if (number < 100_000) {
+                return String.format("%,.2f", number);
+            } else if (number < 1_000_000) {
+                return String.format("%.2fK", number / 1_000.0);
+            } else if (number < 1_000_000_000) {
+                return String.format("%.2fM", number / 1_000_000.0);
+            } else if (number < 1_000_000_000_000L) {
+                return String.format("%.2fB", number / 1_000_000_000.0);
+            } else {
+                return String.format("%.2fT", number / 1_000_000_000_000.0);
+            }
+        } else {
+            return String.format("%,.2f", number);
+        }
+    }
+
+    private String replaceCustomCmdPlaceholders(String cmd, Player player, Location shopLoc) {
+        return cmd
+                .replace(CustomCmdPlaceholdersEnum.PLAYER_NAME.value(), player.getName())
+                .replace(CustomCmdPlaceholdersEnum.SHOP_LOC_X.value(), Double.toString(shopLoc.getX()))
+                .replace(CustomCmdPlaceholdersEnum.SHOP_LOC_Y.value(), Double.toString(shopLoc.getY()))
+                .replace(CustomCmdPlaceholdersEnum.SHOP_LOC_Z.value(), Double.toString(shopLoc.getZ()))
+                .replace(CustomCmdPlaceholdersEnum.SHOP_WORLD.value(), shopLoc.getWorld().getName());
+    }
+}

src/main/java/io/myzticbean/finditemaddon/listeners/MenuListener.java

@@ -0,0 +1,43 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.listeners;
+
+import io.myzticbean.finditemaddon.handlers.gui.Menu;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.InventoryHolder;
+
+/**
+ * @author myzticbean
+ */
+public class MenuListener implements Listener {
+
+    @EventHandler
+    public void onMenuClick(InventoryClickEvent e) {
+        InventoryHolder holder = e.getInventory().getHolder();
+        if(holder instanceof Menu menu) {
+            e.setCancelled(true);
+            if(e.getCurrentItem() == null) {
+                return;
+            }
+            menu.handleMenu(e);
+        }
+    }
+}

src/main/java/io/myzticbean/finditemaddon/listeners/PWPlayerWarpCreateEventListener.java

@@ -0,0 +1,38 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.listeners;
+
+import com.olziedev.playerwarps.api.events.warp.PlayerWarpCreateEvent;
+import io.myzticbean.finditemaddon.dependencies.PlayerWarpsPlugin;
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+/**
+ * @author myzticbean
+ */
+public class PWPlayerWarpCreateEventListener implements Listener {
+    @EventHandler
+    public void onPlayerWarpCreate(PlayerWarpCreateEvent event) {
+        // Issue #24 Fix: Converted updateWarpsOnEventCall() call to async
+        Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(),
+                () -> PlayerWarpsPlugin.updateWarpsOnEventCall(event.getPlayerWarp(), false));
+    }
+}

src/main/java/io/myzticbean/finditemaddon/listeners/PWPlayerWarpRemoveEventListener.java

@@ -0,0 +1,38 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.listeners;
+
+import com.olziedev.playerwarps.api.events.warp.PlayerWarpRemoveEvent;
+import io.myzticbean.finditemaddon.dependencies.PlayerWarpsPlugin;
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+/**
+ * @author myzticbean
+ */
+public class PWPlayerWarpRemoveEventListener implements Listener {
+    @EventHandler
+    public void onPlayerWarpRemove(PlayerWarpRemoveEvent event) {
+        // Issue #24 Fix: Converted updateWarpsOnEventCall() call to async
+        Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(),
+                () -> PlayerWarpsPlugin.updateWarpsOnEventCall(event.getPlayerWarp(), true));
+    }
+}

src/main/java/io/myzticbean/finditemaddon/listeners/PlayerCommandSendEventListener.java

@@ -1,4 +1,22 @@
-package io.myzticbean.finditemaddon.Listeners;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.listeners;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
 import org.bukkit.event.EventHandler;
@@ -8,6 +26,9 @@ import org.bukkit.event.player.PlayerCommandSendEvent;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public class PlayerCommandSendEventListener implements Listener {
     @EventHandler
     public void onPlayerCommandTab(PlayerCommandSendEvent event) {

src/main/java/io/myzticbean/finditemaddon/listeners/PlayerJoinEventListener.java

@@ -0,0 +1,36 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.listeners;
+
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import io.myzticbean.finditemaddon.utils.UpdateChecker;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+/**
+ * @author myzticbean
+ */
+public class PlayerJoinEventListener implements Listener {
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        new UpdateChecker().notifyPlayerAboutUpdateOnJoin(event);
+    }
+}

src/main/java/io/myzticbean/finditemaddon/listeners/PluginEnableEventListener.java

@@ -1,10 +1,31 @@
-package io.myzticbean.finditemaddon.Listeners;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.listeners;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.server.PluginEnableEvent;
 
+/**
+ * @author myzticbean
+ */
 public class PluginEnableEventListener implements Listener {
     @EventHandler
     public void onPluginEnable(PluginEnableEvent event) {

src/main/java/io/myzticbean/finditemaddon/listeners/ShopCreateEventListener.java

@@ -0,0 +1,36 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.listeners;
+
+import com.ghostchu.quickshop.api.event.management.ShopCreateEvent;
+import io.myzticbean.finditemaddon.utils.json.ShopSearchActivityStorageUtil;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+/**
+ * @author myzticbean
+ */
+public class ShopCreateEventListener implements Listener {
+    @EventHandler
+    public void onShopCreate(ShopCreateEvent event) {
+        Logger.logDebugInfo("New shop added!");
+        event.shop().ifPresent(ShopSearchActivityStorageUtil::addShop);
+    }
+}

src/main/java/io/myzticbean/finditemaddon/listeners/ShopDeleteEventListener.java

@@ -0,0 +1,18 @@
+package io.myzticbean.finditemaddon.listeners;
+
+import com.ghostchu.quickshop.api.event.management.ShopDeleteEvent;
+import io.myzticbean.finditemaddon.utils.json.ShopSearchActivityStorageUtil;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+/**
+ * @author myzticbean
+ */
+public class ShopDeleteEventListener implements Listener {
+    @EventHandler
+    public void onShopDelete(ShopDeleteEvent event) {
+        Logger.logDebugInfo("Shop deleted!");
+        event.shop().ifPresent(ShopSearchActivityStorageUtil::removeShop);
+    }
+}

src/main/java/io/myzticbean/finditemaddon/metrics/Metrics.java

@@ -4,15 +4,15 @@
  *
  * IMPORTANT: You are not allowed to modify this class, except changing the package.
  *
- * Unallowed modifications include but are not limited to:
+ * Disallowed modifications include but are not limited to:
  *  - Remove the option for users to opt-out
  *  - Change the frequency for data submission
- *  - Obfuscate the code (every obfucator should allow you to make an exception for specific files)
+ *  - Obfuscate the code (every obfuscator should allow you to make an exception for specific files)
  *  - Reformat the code (if you use a linter, add an exception)
  *
  * Violations will result in a ban of your plugin and account from bStats.
  */
-package io.myzticbean.finditemaddon.Metrics;
+package io.myzticbean.finditemaddon.metrics;
 
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -21,14 +21,25 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import javax.net.ssl.HttpsURLConnection;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.Callable;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -100,6 +111,11 @@ public class Metrics {
                         logResponseStatusText);
     }
 
+    /** Shuts down the underlying scheduler service. */
+    public void shutdown() {
+        metricsBase.shutdown();
+    }
+
     /**
      * Adds a custom chart.
      *
@@ -143,13 +159,12 @@ public class Metrics {
     public static class MetricsBase {
 
         /** The version of the Metrics class. */
-        public static final String METRICS_VERSION = "3.0.0";
-
-        private static final ScheduledExecutorService scheduler =
-                Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics"));
+        public static final String METRICS_VERSION = "3.0.2";
 
         private static final String REPORT_URL = "https://bStats.org/api/v2/data/%s";
 
+        private final ScheduledExecutorService scheduler;
+
         private final String platform;
 
         private final String serverUuid;
@@ -213,6 +228,14 @@ public class Metrics {
                 boolean logErrors,
                 boolean logSentData,
                 boolean logResponseStatusText) {
+            ScheduledThreadPoolExecutor scheduler =
+                    new ScheduledThreadPoolExecutor(1, task -> new Thread(task, "bStats-Metrics"));
+            // We want delayed tasks (non-periodic) that will execute in the future to be
+            // cancelled when the scheduler is shutdown.
+            // Otherwise, we risk preventing the server from shutting down even when
+            // MetricsBase#shutdown() is called
+            scheduler.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+            this.scheduler = scheduler;
             this.platform = platform;
             this.serverUuid = serverUuid;
             this.serviceId = serviceId;
@@ -228,7 +251,8 @@ public class Metrics {
             this.logResponseStatusText = logResponseStatusText;
             checkRelocation();
             if (enabled) {
-                // WARNING: Removing the option to opt-out will get your plugin banned from bStats
+                // WARNING: Removing the option to opt-out will get your plugin banned from
+                // bStats
                 startSubmitting();
             }
         }
@@ -237,6 +261,10 @@ public class Metrics {
             this.customCharts.add(chart);
         }
 
+        public void shutdown() {
+            scheduler.shutdown();
+        }
+
         private void startSubmitting() {
             final Runnable submitTask =
                     () -> {
@@ -251,13 +279,14 @@ public class Metrics {
                             this.submitData();
                         }
                     };
-            // Many servers tend to restart at a fixed time at xx:00 which causes an uneven distribution
-            // of requests on the
-            // bStats backend. To circumvent this problem, we introduce some randomness into the initial
-            // and second delay.
-            // WARNING: You must not modify and part of this Metrics class, including the submit delay or
-            // frequency!
-            // WARNING: Modifying this code will get your plugin banned on bStats. Just don't do it!
+            // Many servers tend to restart at a fixed time at xx:00 which causes an uneven
+            // distribution of requests on the
+            // bStats backend. To circumvent this problem, we introduce some randomness into
+            // the initial and second delay.
+            // WARNING: You must not modify and part of this Metrics class, including the
+            // submit delay or frequency!
+            // WARNING: Modifying this code will get your plugin banned on bStats. Just
+            // don't do it!
             long initialDelay = (long) (1000 * 60 * (3 + Math.random() * 3));
             long secondDelay = (long) (1000 * 60 * (Math.random() * 30));
             scheduler.schedule(submitTask, initialDelay, TimeUnit.MILLISECONDS);
@@ -332,14 +361,14 @@ public class Metrics {
             // You can use the property to disable the check in your test environment
             if (System.getProperty("bstats.relocatecheck") == null
                     || !System.getProperty("bstats.relocatecheck").equals("false")) {
-                // Maven's Relocate is clever and changes strings, too. So we have to use this little
-                // "trick" ... :D
+                // Maven's Relocate is clever and changes strings, too. So we have to use this
+                // little "trick" ... :D
                 final String defaultPackage =
                         new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'});
                 final String examplePackage =
                         new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
-                // We want to make sure no one just copy & pastes the example and uses the wrong package
-                // names
+                // We want to make sure no one just copy & pastes the example and uses the wrong
+                // package names
                 if (MetricsBase.class.getPackage().getName().startsWith(defaultPackage)
                         || MetricsBase.class.getPackage().getName().startsWith(examplePackage)) {
                     throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
@@ -365,9 +394,9 @@ public class Metrics {
         }
     }
 
-    public static class DrilldownPie extends CustomChart {
+    public static class SimplePie extends CustomChart {
 
-        private final Callable<Map<String, Map<String, Integer>>> callable;
+        private final Callable<String> callable;
 
         /**
          * Class constructor.
@@ -375,41 +404,23 @@ public class Metrics {
          * @param chartId The id of the chart.
          * @param callable The callable which is used to request the chart data.
          */
-        public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
+        public SimplePie(String chartId, Callable<String> callable) {
             super(chartId);
             this.callable = callable;
         }
 
         @Override
-        public JsonObjectBuilder.JsonObject getChartData() throws Exception {
-            JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
-            Map<String, Map<String, Integer>> map = callable.call();
-            if (map == null || map.isEmpty()) {
+        protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
+            String value = callable.call();
+            if (value == null || value.isEmpty()) {
                 // Null = skip the chart
                 return null;
             }
-            boolean reallyAllSkipped = true;
-            for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
-                JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
-                boolean allSkipped = true;
-                for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
-                    valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue());
-                    allSkipped = false;
-                }
-                if (!allSkipped) {
-                    reallyAllSkipped = false;
-                    valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
-                }
-            }
-            if (reallyAllSkipped) {
-                // Null = skip the chart
-                return null;
-            }
-            return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
+            return new JsonObjectBuilder().appendField("value", value).build();
         }
     }
 
-    public static class AdvancedPie extends CustomChart {
+    public static class MultiLineChart extends CustomChart {
 
         private final Callable<Map<String, Integer>> callable;
 
@@ -419,7 +430,7 @@ public class Metrics {
          * @param chartId The id of the chart.
          * @param callable The callable which is used to request the chart data.
          */
-        public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
+        public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
             super(chartId);
             this.callable = callable;
         }
@@ -449,7 +460,7 @@ public class Metrics {
         }
     }
 
-    public static class MultiLineChart extends CustomChart {
+    public static class AdvancedPie extends CustomChart {
 
         private final Callable<Map<String, Integer>> callable;
 
@@ -459,7 +470,7 @@ public class Metrics {
          * @param chartId The id of the chart.
          * @param callable The callable which is used to request the chart data.
          */
-        public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
+        public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
             super(chartId);
             this.callable = callable;
         }
@@ -519,66 +530,6 @@ public class Metrics {
         }
     }
 
-    public abstract static class CustomChart {
-
-        private final String chartId;
-
-        protected CustomChart(String chartId) {
-            if (chartId == null) {
-                throw new IllegalArgumentException("chartId must not be null");
-            }
-            this.chartId = chartId;
-        }
-
-        public JsonObjectBuilder.JsonObject getRequestJsonObject(
-                BiConsumer<String, Throwable> errorLogger, boolean logErrors) {
-            JsonObjectBuilder builder = new JsonObjectBuilder();
-            builder.appendField("chartId", chartId);
-            try {
-                JsonObjectBuilder.JsonObject data = getChartData();
-                if (data == null) {
-                    // If the data is null we don't send the chart.
-                    return null;
-                }
-                builder.appendField("data", data);
-            } catch (Throwable t) {
-                if (logErrors) {
-                    errorLogger.accept("Failed to get data for custom chart with id " + chartId, t);
-                }
-                return null;
-            }
-            return builder.build();
-        }
-
-        protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception;
-    }
-
-    public static class SimplePie extends CustomChart {
-
-        private final Callable<String> callable;
-
-        /**
-         * Class constructor.
-         *
-         * @param chartId The id of the chart.
-         * @param callable The callable which is used to request the chart data.
-         */
-        public SimplePie(String chartId, Callable<String> callable) {
-            super(chartId);
-            this.callable = callable;
-        }
-
-        @Override
-        protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
-            String value = callable.call();
-            if (value == null || value.isEmpty()) {
-                // Null = skip the chart
-                return null;
-            }
-            return new JsonObjectBuilder().appendField("value", value).build();
-        }
-    }
-
     public static class AdvancedBarChart extends CustomChart {
 
         private final Callable<Map<String, int[]>> callable;
@@ -619,6 +570,84 @@ public class Metrics {
         }
     }
 
+    public static class DrilldownPie extends CustomChart {
+
+        private final Callable<Map<String, Map<String, Integer>>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        public JsonObjectBuilder.JsonObject getChartData() throws Exception {
+            JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
+            Map<String, Map<String, Integer>> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean reallyAllSkipped = true;
+            for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
+                JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
+                boolean allSkipped = true;
+                for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
+                    valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue());
+                    allSkipped = false;
+                }
+                if (!allSkipped) {
+                    reallyAllSkipped = false;
+                    valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
+                }
+            }
+            if (reallyAllSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
+        }
+    }
+
+    public abstract static class CustomChart {
+
+        private final String chartId;
+
+        protected CustomChart(String chartId) {
+            if (chartId == null) {
+                throw new IllegalArgumentException("chartId must not be null");
+            }
+            this.chartId = chartId;
+        }
+
+        public JsonObjectBuilder.JsonObject getRequestJsonObject(
+                BiConsumer<String, Throwable> errorLogger, boolean logErrors) {
+            JsonObjectBuilder builder = new JsonObjectBuilder();
+            builder.appendField("chartId", chartId);
+            try {
+                JsonObjectBuilder.JsonObject data = getChartData();
+                if (data == null) {
+                    // If the data is null we don't send the chart.
+                    return null;
+                }
+                builder.appendField("data", data);
+            } catch (Throwable t) {
+                if (logErrors) {
+                    errorLogger.accept("Failed to get data for custom chart with id " + chartId, t);
+                }
+                return null;
+            }
+            return builder.build();
+        }
+
+        protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception;
+    }
+
     public static class SingleLineChart extends CustomChart {
 
         private final Callable<Integer> callable;
@@ -850,4 +879,4 @@ public class Metrics {
             }
         }
     }
-}
+}

src/main/java/io/myzticbean/finditemaddon/models/CachedShop.java

@@ -0,0 +1,37 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.models;
+
+import lombok.Builder;
+import lombok.Getter;
+import org.bukkit.Location;
+
+import java.util.Date;
+
+/**
+ * @author myzticbean
+ */
+@Getter @Builder
+public class CachedShop {
+    private long shopId;
+    private Location shopLocation;
+    private int remainingStock;
+    private int remainingSpace;
+    private Date lastFetched;
+}

src/main/java/io/myzticbean/finditemaddon/models/EssentialWarpModel.java

@@ -0,0 +1,29 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.models;
+
+import org.bukkit.Location;
+
+/**
+ * @author myzticbean
+ */
+public class EssentialWarpModel {
+    public String warpName;
+    public Location warpLoc;
+}

src/main/java/io/myzticbean/finditemaddon/models/FoundShopItemModel.java

@@ -0,0 +1,41 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.bukkit.Location;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.UUID;
+
+/**
+ * Model for the Shop Item lore that will be shown in the search GUI
+ * @author myzticbean
+ */
+@Getter
+@AllArgsConstructor
+public class FoundShopItemModel {
+    private final double shopPrice;
+    private final int remainingStockOrSpace;
+    private final UUID shopOwner;
+    private final Location shopLocation;
+    private final ItemStack item;
+    private final boolean toBuy;
+}

src/main/java/io/myzticbean/finditemaddon/models/HiddenShopModel.java

@@ -0,0 +1,39 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author myzticbean
+ */
+@AllArgsConstructor
+@Getter
+public class HiddenShopModel {
+
+    private String worldName;
+    private double x;
+    private double y;
+    private double z;
+    private float pitch;
+    private float yaw;
+    private String shopOwnerUUID;
+
+}

src/main/java/io/myzticbean/finditemaddon/models/PlayerShopVisitModel.java

@@ -0,0 +1,52 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.models;
+
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+import java.time.Instant;
+import java.util.UUID;
+
+/**
+ * @author myzticbean
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+public class PlayerShopVisitModel {
+
+    private String playerUUID;
+    private String visitDateTime;
+
+    public void setPlayerUUID(UUID uuid) {
+        this.playerUUID = uuid.toString();
+    }
+
+    public UUID getPlayerUUID() {
+        return UUID.fromString(this.playerUUID);
+    }
+
+    public void setVisitDateTime() {
+        this.visitDateTime = Instant.now().toString();
+    }
+
+    public Instant getVisitDateTime() {
+        return Instant.parse(visitDateTime);
+    }
+}

src/main/java/io/myzticbean/finditemaddon/models/ShopSearchActivityModel.java

@@ -1,4 +1,22 @@
-package io.myzticbean.finditemaddon.Models;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.models;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -6,7 +24,11 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.util.List;
+import java.util.Objects;
 
+/**
+ * @author myzticbean
+ */
 @AllArgsConstructor
 @Getter
 @Setter
@@ -32,7 +54,9 @@ public class ShopSearchActivityModel {
     }
 
     public boolean compareWith(String targetWorldName, double targetX, double targetY, double targetZ) {
-        return this.getWorldName().equalsIgnoreCase(targetWorldName)
+        return (Objects.nonNull(this.getWorldName())
+                    && Objects.nonNull(targetWorldName)
+                    && this.getWorldName().equalsIgnoreCase(targetWorldName))
                 && this.getX() == targetX
                 && this.getY() == targetY
                 && this.getZ() == targetZ;

src/main/java/io/myzticbean/finditemaddon/models/enums/CustomCmdPlaceholdersEnum.java

@@ -0,0 +1,42 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.models.enums;
+
+/**
+ * @author myzticbean
+ */
+public enum CustomCmdPlaceholdersEnum {
+
+    PLAYER_NAME("{PLAYER_NAME}"),
+    SHOP_LOC_X("{SHOP_LOC_X}"),
+    SHOP_LOC_Y("{SHOP_LOC_Y}"),
+    SHOP_LOC_Z("{SHOP_LOC_Z}"),
+    SHOP_WORLD("{SHOP_WORLD}");
+
+    private final String placeholder;
+
+    CustomCmdPlaceholdersEnum(String placeholder) {
+        this.placeholder = placeholder;
+    }
+
+    public String value() {
+        return placeholder;
+    }
+
+}

src/main/java/io/myzticbean/finditemaddon/models/enums/NearestWarpModeEnum.java

@@ -0,0 +1,41 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.models.enums;
+
+/**
+ * @author myzticbean
+ */
+public enum NearestWarpModeEnum {
+
+    ESSENTIAL_WARPS(1),
+    PLAYER_WARPS(2),
+    WORLDGUARD_REGION(3),
+    RESIDENCE(4);
+
+    private final int mode;
+
+    NearestWarpModeEnum(int mode) {
+        this.mode = mode;
+    }
+
+    public int value() {
+        return mode;
+    }
+
+}

src/main/java/io/myzticbean/finditemaddon/models/enums/PlayerPermsEnum.java

@@ -1,4 +1,22 @@
-package io.myzticbean.finditemaddon.Utils.Defaults;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.models.enums;
 
 import org.bukkit.entity.Player;
 
@@ -6,7 +24,7 @@ import org.bukkit.entity.Player;
  * List of all the permissions used by the addon
  * @author myzticbean
  */
-public enum PlayerPerms {
+public enum PlayerPermsEnum {
     FINDITEM_ADMIN("finditem.admin"),
     FINDITEM_USE("finditem.use"),
     FINDITEM_HIDESHOP("finditem.hideshop"),
@@ -14,13 +32,15 @@ public enum PlayerPerms {
 
     @Deprecated
     FINDITEM_RESTART("finditem.restart"),
+
     FINDITEM_SHOPTP("finditem.shoptp"),
     FINDITEM_SHOPTP_OWN("finditem.shoptp.own"),
-    FINDITEM_SHOPTP_BYPASS_DELAY("finditem.shoptp-delay.bypass");
+    FINDITEM_SHOPTP_BYPASS_DELAY("finditem.shoptp-delay.bypass"),
+    FINDITEM_SHOPTP_BYPASS_SAFETYCHECK("finditem.shoptp.bypass-safetycheck");
 
     private final String permName;
 
-    PlayerPerms(String perm) {
+    PlayerPermsEnum(String perm) {
         permName = perm;
     }
 

src/main/java/io/myzticbean/finditemaddon/models/enums/ShopLorePlaceholdersEnum.java

@@ -0,0 +1,40 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.models.enums;
+
+/**
+ * List of all the placeholders used in the Shop lore in GUI
+ * @author myzticbean
+ */
+public enum ShopLorePlaceholdersEnum {
+    ITEM_PRICE("{ITEM_PRICE}"),
+    SHOP_STOCK("{SHOP_STOCK}"),
+    SHOP_OWNER("{SHOP_OWNER}"),
+    SHOP_PER_ITEM_QTY("{ITEM_STACK_SIZE}"),
+    SHOP_LOCATION("{SHOP_LOC}"),
+    SHOP_WORLD("{SHOP_WORLD}"),
+    NEAREST_WARP("{NEAREST_WARP}"),
+    SHOP_VISITS("{SHOP_VISITS}");
+    private final String placeholder;
+
+    ShopLorePlaceholdersEnum(String placeholder) {
+        this.placeholder = placeholder;
+    }
+    public String value() {return placeholder;}
+}

src/main/java/io/myzticbean/finditemaddon/quickshop/QSApi.java

@@ -1,9 +1,28 @@
-package io.myzticbean.finditemaddon.QuickShopHandler;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.quickshop;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Models.FoundShopItemModel;
-import io.myzticbean.finditemaddon.Models.ShopSearchActivityModel;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
+import io.myzticbean.finditemaddon.models.FoundShopItemModel;
+import io.myzticbean.finditemaddon.models.ShopSearchActivityModel;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -15,6 +34,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * Interface for QS API.
@@ -65,6 +85,11 @@ public interface QSApi<QSType, Shop> {
     List<ShopSearchActivityModel> syncShopsListForStorage(List<ShopSearchActivityModel> globalShopsList);
 
     void registerSubCommand();
+    UUID convertNameToUuid(String playerName);
+
+    boolean isQSShopCacheImplemented();
+
+    int processUnknownStockSpace(Location shopLoc, boolean toBuy);
 
     static List<FoundShopItemModel> sortShops(int sortingMethod, List<FoundShopItemModel> shopsFoundList, boolean toBuy) {
         switch (sortingMethod) {
@@ -78,14 +103,14 @@ public interface QSApi<QSType, Shop> {
                 Collections.reverse(shopsFoundList);
             }
             default -> {
-                LoggerUtils.logError("Invalid value in config.yml : 'shop-sorting-method'");
-                LoggerUtils.logError("Defaulting to sorting by prices method");
+                Logger.logError("Invalid value in config.yml : 'shop-sorting-method'");
+                Logger.logError("Defaulting to sorting by prices method");
                 shopsFoundList.sort(Comparator.comparing(FoundShopItemModel::getShopPrice));
             }
         }
         if(FindItemAddOn.getConfigProvider().DEBUG_MODE)
             shopsFoundList.forEach(foundShopItem ->
-                    LoggerUtils.logDebugInfo(QS_REMAINING_STOCK_OR_SPACE + foundShopItem.getRemainingStockOrSpace()));
+                    Logger.logDebugInfo(QS_REMAINING_STOCK_OR_SPACE + foundShopItem.getRemainingStockOrSpace()));
         return shopsFoundList;
     }
 
@@ -109,8 +134,12 @@ public interface QSApi<QSType, Shop> {
         Duration duration = Duration.between(instant1, instant2);
         long secondsDifference = Math.abs(duration.getSeconds());
 
-        LoggerUtils.logDebugInfo("Difference: " + secondsDifference);
+        Logger.logDebugInfo("Difference: " + secondsDifference);
 
         return secondsDifference >= seconds;
     }
+
+    static void logTimeTookMsg(Instant timeStart) {
+        Logger.logInfo("Shop search took " + Duration.between(timeStart, Instant.now()).toMillis() + "ms");
+    }
 }

src/main/java/io/myzticbean/finditemaddon/quickshop/impl/QSHikariAPIHandler.java

@@ -0,0 +1,486 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.quickshop.impl;
+
+import cc.carm.lib.easysql.api.SQLQuery;
+import com.ghostchu.quickshop.QuickShop;
+import com.ghostchu.quickshop.QuickShopBukkit;
+import com.ghostchu.quickshop.api.QuickShopAPI;
+import com.ghostchu.quickshop.api.command.CommandContainer;
+import com.ghostchu.quickshop.api.obj.QUser;
+import com.ghostchu.quickshop.api.shop.Shop;
+import com.ghostchu.quickshop.api.shop.permission.BuiltInShopPermission;
+import com.ghostchu.quickshop.database.DataTables;
+import com.ghostchu.quickshop.util.Util;
+import io.myzticbean.finditemaddon.quickshop.QSApi;
+import io.myzticbean.finditemaddon.commands.quickshop.subcommands.FindItemCmdHikariImpl;
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import io.myzticbean.finditemaddon.models.CachedShop;
+import io.myzticbean.finditemaddon.models.FoundShopItemModel;
+import io.myzticbean.finditemaddon.models.ShopSearchActivityModel;
+import io.myzticbean.finditemaddon.models.enums.PlayerPermsEnum;
+import io.myzticbean.finditemaddon.utils.json.HiddenShopStorageUtil;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import net.kyori.adventure.text.Component;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.nio.charset.StandardCharsets;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * Implementation of QSApi for Hikari
+ * @author myzticbean
+ */
+public class QSHikariAPIHandler implements QSApi<QuickShop, Shop> {
+
+    public static final String IS_MAIN_THREAD = "Is MAIN Thread? ";
+
+    private final QuickShopAPI api;
+    private final String pluginVersion;
+    private final ConcurrentMap<Long, CachedShop> shopCache;
+    private final int SHOP_CACHE_TIMEOUT_SECONDS = 5*60;
+    private final boolean isQSHikariShopCacheImplemented;
+
+    public QSHikariAPIHandler() {
+        api = QuickShopAPI.getInstance();
+        pluginVersion = Bukkit.getPluginManager().getPlugin("QuickShop-Hikari").getDescription().getVersion();
+        Logger.logInfo("Initializing Shop caching");
+        shopCache = new ConcurrentHashMap<>();
+        isQSHikariShopCacheImplemented = checkIfQSHikariShopCacheImplemented();
+    }
+
+    public List<FoundShopItemModel> findItemBasedOnTypeFromAllShops(ItemStack item, boolean toBuy, Player searchingPlayer) {
+        Logger.logDebugInfo(IS_MAIN_THREAD + Bukkit.isPrimaryThread());
+        var begin = Instant.now();
+        List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
+        List<Shop> allShops = fetchAllShopsFromQS();
+        Logger.logDebugInfo(QS_TOTAL_SHOPS_ON_SERVER + allShops.size());
+        for(Shop shopIterator : allShops) {
+            // check for quickshop hikari internal per-shop based search permission
+            if(shopIterator.playerAuthorize(searchingPlayer.getUniqueId(), BuiltInShopPermission.SEARCH)
+                    // check for blacklisted worlds
+                    && (!FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shopIterator.getLocation().getWorld())
+                    && shopIterator.getItem().getType().equals(item.getType())
+                    && (toBuy ? shopIterator.isSelling() : shopIterator.isBuying()))
+                    // check for shop if hidden
+                    && (!HiddenShopStorageUtil.isShopHidden(shopIterator))) {
+                processPotentialShopMatchAndAddToFoundList(toBuy, shopIterator, shopsFoundList, searchingPlayer);
+            }
+        }
+        List<FoundShopItemModel> sortedShops = handleShopSorting(toBuy, shopsFoundList);
+        QSApi.logTimeTookMsg(begin);
+        return sortedShops;
+    }
+
+    /**
+     * Checks if the shop owner has enough balance to buy at least one item
+     * @param shop The shop to check
+     * @return true if owner has enough balance, false otherwise
+     */
+    private static boolean isOwnerHavingEnoughBalance(@NotNull Shop shop) {
+        // Skip check for admin shops
+        if (shop.getOwner().getUniqueIdOptional().isEmpty()) {
+            return true;
+        }
+
+        double price = shop.getPrice();
+        double itemAmount = shop.getItem().getAmount();
+        double pricePerTransaction = price * itemAmount;
+
+        var economy = getQuickShop().getEconomy();
+        var qUser = shop.getOwner();
+        var uuid = qUser.getUniqueIdIfRealPlayer().orElse(null);
+        // return true if not a real player
+        if(Objects.isNull(uuid)) {
+            return true;
+        }
+        var bukkitPlayer = Bukkit.getOfflinePlayer(uuid);
+        var world = bukkitPlayer.getLocation().getWorld();
+        if(Objects.isNull(world)) {
+            Logger.logError("Shop owner hasn't played before ever in the server (?) - ShopInfo: " + shop.getOwner().getUsername());
+            return true;
+        }
+        var currency = shop.getCurrency();
+
+        // Get owner's balance through QuickShop API
+        return economy.getBalance(qUser, world, currency) >= pricePerTransaction;
+    }
+
+    private static QuickShop getQuickShop() {
+        return ((QuickShopBukkit) QuickShopAPI.getPluginInstance()).getQuickShop();
+    }
+
+    @NotNull
+    static List<FoundShopItemModel> handleShopSorting(boolean toBuy, @NotNull List<FoundShopItemModel> shopsFoundList) {
+        if(!shopsFoundList.isEmpty()) {
+            int sortingMethod = 2;
+            try {
+                sortingMethod = FindItemAddOn.getConfigProvider().SHOP_SORTING_METHOD;
+            }
+            catch(Exception e) {
+                Logger.logError("Invalid value in config.yml : 'shop-sorting-method'");
+                Logger.logError("Defaulting to sorting by prices method");
+            }
+            return QSApi.sortShops(sortingMethod, shopsFoundList, toBuy);
+        }
+        return shopsFoundList;
+    }
+
+    public List<FoundShopItemModel> findItemBasedOnDisplayNameFromAllShops(String displayName, boolean toBuy, Player searchingPlayer) {
+        Logger.logDebugInfo(IS_MAIN_THREAD + Bukkit.isPrimaryThread());
+        var begin = Instant.now();
+        List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
+        List<Shop> allShops = fetchAllShopsFromQS();
+        Logger.logDebugInfo(QS_TOTAL_SHOPS_ON_SERVER + allShops.size());
+        for(Shop shopIterator : allShops) {
+            // check for quickshop hikari internal per-shop based search permission
+            if(shopIterator.playerAuthorize(searchingPlayer.getUniqueId(), BuiltInShopPermission.SEARCH)
+                    // check for blacklisted worlds
+                    && !FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shopIterator.getLocation().getWorld())
+                    // match the item based on query
+                    && shopIterator.getItem().hasItemMeta()
+                    && Objects.requireNonNull(shopIterator.getItem().getItemMeta()).hasDisplayName()
+                    && (shopIterator.getItem().getItemMeta().getDisplayName().toLowerCase().contains(displayName.toLowerCase())
+                    && (toBuy ? shopIterator.isSelling() : shopIterator.isBuying()))
+                    // check for shop if hidden
+                    && !HiddenShopStorageUtil.isShopHidden(shopIterator)) {
+                processPotentialShopMatchAndAddToFoundList(toBuy, shopIterator, shopsFoundList, searchingPlayer);
+            }
+        }
+        List<FoundShopItemModel> sortedShops = handleShopSorting(toBuy, shopsFoundList);
+        QSApi.logTimeTookMsg(begin);
+        return sortedShops;
+    }
+
+    public List<FoundShopItemModel> fetchAllItemsFromAllShops(boolean toBuy, Player searchingPlayer) {
+        Logger.logDebugInfo(IS_MAIN_THREAD + Bukkit.isPrimaryThread());
+        var begin = Instant.now();
+        List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
+        List<Shop> allShops = fetchAllShopsFromQS();
+        Logger.logDebugInfo(QS_TOTAL_SHOPS_ON_SERVER + allShops.size());
+        for(Shop shopIterator : allShops) {
+            // check for quickshop hikari internal per-shop based search permission
+            if(shopIterator.playerAuthorize(searchingPlayer.getUniqueId(), BuiltInShopPermission.SEARCH)
+                    // check for blacklisted worlds
+                    && (!FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shopIterator.getLocation().getWorld())
+                    && (toBuy ? shopIterator.isSelling() : shopIterator.isBuying()))
+                    // check for shop if hidden
+                    && (!HiddenShopStorageUtil.isShopHidden(shopIterator))) {
+                processPotentialShopMatchAndAddToFoundList(toBuy, shopIterator, shopsFoundList, searchingPlayer);
+            }
+        }
+        List<FoundShopItemModel> sortedShops = new ArrayList<>(shopsFoundList);
+        if(!shopsFoundList.isEmpty()) {
+            int sortingMethod = 1;
+            sortedShops = QSApi.sortShops(sortingMethod, shopsFoundList, toBuy);
+        }
+        QSApi.logTimeTookMsg(begin);
+        return sortedShops;
+    }
+
+    private List<Shop> fetchAllShopsFromQS() {
+        List<Shop> allShops;
+        if (FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
+            allShops = new ArrayList<>(api.getShopManager().getLoadedShops());
+        } else {
+            allShops = getAllShops();
+        }
+        return allShops;
+    }
+
+    public Material getShopSignMaterial() {
+        return com.ghostchu.quickshop.util.Util.getSignMaterial();
+    }
+
+//    public Shop findShopAtLocation(Block block) {
+//        Location loc = new Location(block.getWorld(), block.getX(), block.getY(), block.getZ());
+//        return api.getShopManager().getShop(loc);
+//    }
+
+    public Shop findShopAtLocation(Block block) {
+        Location loc = block.getLocation(); // Simpler way to get location
+
+        // Try getting shop directly first
+        Shop shop = api.getShopManager().getShopIncludeAttached(loc);
+
+        // If no shop found and block is a chest, check if it's a double chest
+        if (shop == null && block.getType() == Material.CHEST) {
+            Block secondHalf = Util.getSecondHalf(block);
+            if (secondHalf != null) {
+                shop = api.getShopManager().getShopIncludeAttached(secondHalf.getLocation());
+            }
+        }
+
+        return shop;
+    }
+
+    public boolean isShopOwnerCommandRunner(Player player, Shop shop) {
+        Logger.logDebugInfo("Shop owner: " + shop.getOwner() + " | Player: " + player.getUniqueId());
+        return shop.getOwner().getUniqueId().toString().equalsIgnoreCase(player.getUniqueId().toString());
+    }
+
+    @Override
+    public List<Shop> getAllShops() {
+        return api.getShopManager().getAllShops();
+    }
+
+    @Override
+    public List<ShopSearchActivityModel> syncShopsListForStorage(List<ShopSearchActivityModel> globalShopsList) {
+        long start = System.currentTimeMillis();
+        // copy all shops from shops list in API to a temp globalShopsList
+        // now check shops from temp globalShopsList in current globalShopsList and pull playerVisit data
+        List<ShopSearchActivityModel> tempGlobalShopsList = new ArrayList<>();
+        for (Shop shop_i : getAllShops()) {
+            Location shopLoc = shop_i.getLocation();
+            tempGlobalShopsList.add(new ShopSearchActivityModel(
+                    shopLoc.getWorld().getName(),
+                    shopLoc.getX(),
+                    shopLoc.getY(),
+                    shopLoc.getZ(),
+                    shopLoc.getPitch(),
+                    shopLoc.getYaw(),
+                    convertQUserToUUID(shop_i.getOwner()).toString(),
+                    new ArrayList<>(),
+                    false
+            ));
+        }
+
+        for (ShopSearchActivityModel shop_temp : tempGlobalShopsList) {
+            ShopSearchActivityModel tempShopToRemove = null;
+            for (ShopSearchActivityModel shop_global : globalShopsList) {
+                if (shop_temp.getWorldName().equalsIgnoreCase(shop_global.getWorldName())
+                        && shop_temp.getX() == shop_global.getX()
+                        && shop_temp.getY() == shop_global.getY()
+                        && shop_temp.getZ() == shop_global.getZ()
+                        && shop_temp.getShopOwnerUUID().equalsIgnoreCase(shop_global.getShopOwnerUUID())
+                ) {
+                    shop_temp.setPlayerVisitList(shop_global.getPlayerVisitList());
+                    shop_temp.setHiddenFromSearch(shop_global.isHiddenFromSearch());
+                    tempShopToRemove = shop_global;
+                    break;
+                }
+            }
+            if (tempShopToRemove != null)
+                globalShopsList.remove(tempShopToRemove);
+        }
+        Logger.logDebugInfo("Shops List sync complete. Time took: " + (System.currentTimeMillis() - start) + "ms.");
+        return tempGlobalShopsList;
+    }
+
+    /**
+     * Register finditem sub-command for /qs
+     * Unregister /qs find
+     */
+    @Override
+    public void registerSubCommand() {
+        Logger.logInfo("Unregistered find sub-command for /qs");
+        for (CommandContainer cmdContainer : api.getCommandManager().getRegisteredCommands()) {
+            if (cmdContainer.getPrefix().equalsIgnoreCase("find")) {
+                api.getCommandManager().unregisterCmd(cmdContainer);
+                break;
+            }
+        }
+        Logger.logInfo("Registered finditem sub-command for /qs");
+        api.getCommandManager().registerCmd(
+                CommandContainer.builder()
+                        .prefix("finditem")
+                        .permission(PlayerPermsEnum.FINDITEM_USE.value())
+                        .hidden(false)
+                        .description(locale -> Component.text("Search for items from all shops using an interactive GUI"))
+                        .executor(new FindItemCmdHikariImpl())
+                        .build());
+    }
+
+    @Override
+    public boolean isQSShopCacheImplemented() {
+        return isQSHikariShopCacheImplemented;
+    }
+
+    @Override
+    public int processUnknownStockSpace(Location shopLoc, boolean toBuy) {
+        // This process needs to run in MAIN thread
+        Util.ensureThread(false);
+        Logger.logDebugInfo("Fetching stock/space from MAIN thread...");
+        Shop qsShop = api.getShopManager().getShop(shopLoc);
+        if(qsShop != null) {
+            return (toBuy ? qsShop.getRemainingStock() : qsShop.getRemainingSpace());
+        } else {
+            return -2;
+        }
+    }
+
+    private UUID convertQUserToUUID(QUser qUser) {
+        Optional<UUID> uuid = qUser.getUniqueIdOptional();
+        if (uuid.isPresent()) {
+            return uuid.get();
+        }
+        String username = qUser.getUsernameOptional().orElse("Unknown");
+        return UUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes(StandardCharsets.UTF_8));
+    }
+
+    public UUID convertNameToUuid(String playerName) {
+        return api.getPlayerFinder().name2Uuid(playerName);
+    }
+
+    /**
+     * If IGNORE_EMPTY_CHESTS is true -> do not add empty stock or space
+     * If to buy -> If shop has no stock -> based on ignore flag, decide to include it or not
+     * If to sell -> If shop has no space -> based on ignore flag, decide to include it or not
+     * @param stockOrSpace
+     * @return If shop needs to be ignored from list
+     */
+    private boolean isShopToBeIgnoredForFullOrEmpty(int stockOrSpace) {
+        boolean ignoreEmptyChests = FindItemAddOn.getConfigProvider().IGNORE_EMPTY_CHESTS;
+        if(ignoreEmptyChests) {
+            return stockOrSpace == 0;
+        }
+        return false;
+    }
+
+    /**
+     * Fallback to fetching info from ShopCache to avoid lag
+     * @param shop QuickShop Shop instance
+     * @param fetchRemainingStock True if fetching remaining stock, False if fetching remaining space
+     * @return
+     */
+    private int getRemainingStockOrSpaceFromShopCache___test(Shop shop, boolean fetchRemainingStock) {
+        Logger.logDebugInfo("Shop ID: " + shop.getShopId());
+        CachedShop cachedShop = shopCache.get(shop.getShopId());
+        if (cachedShop == null || QSApi.isTimeDifferenceGreaterThanSeconds(cachedShop.getLastFetched(), new Date(), SHOP_CACHE_TIMEOUT_SECONDS)) {
+            cachedShop = CachedShop.builder()
+                    .shopId(shop.getShopId())
+                    .remainingStock(shop.getRemainingStock())
+                    .remainingSpace(shop.getRemainingSpace())
+                    .lastFetched(new Date())
+                    .build();
+            shopCache.put(cachedShop.getShopId(), cachedShop);
+            Logger.logDebugInfo("Adding to ShopCache: " + shop.getShopId());
+        }
+        return (fetchRemainingStock ? cachedShop.getRemainingStock() : cachedShop.getRemainingSpace());
+    }
+
+    private int getRemainingStockOrSpaceFromShopCache(Shop shop, boolean fetchRemainingStock) {
+//        LoggerUtils.logDebugInfo("Shop ID: " + shop.getShopId());
+        String mainVersionStr = pluginVersion.split("\\.")[0];
+        int mainVersion = Integer.parseInt(mainVersionStr);
+        if (mainVersion >= 6) {
+            // New feature available
+            Util.ensureThread(true);
+            int stockOrSpace = (fetchRemainingStock ? shop.getRemainingStock() : shop.getRemainingSpace());
+            Logger.logDebugInfo("Stock/Space from cache: " + stockOrSpace);
+            return stockOrSpace;
+        }
+        else {
+            // Show warning
+            Logger.logWarning("Update recommended to QuickShop-Hikari v6+! You are still using v" + pluginVersion);
+            // PREPARE FOR LAG
+            CachedShop cachedShop = shopCache.get(shop.getShopId());
+            if (cachedShop == null || QSApi.isTimeDifferenceGreaterThanSeconds(cachedShop.getLastFetched(), new Date(), SHOP_CACHE_TIMEOUT_SECONDS)) {
+                cachedShop = CachedShop.builder()
+                        .shopId(shop.getShopId())
+                        .remainingStock(shop.getRemainingStock())
+                        .remainingSpace(shop.getRemainingSpace())
+                        .lastFetched(new Date())
+                        .build();
+                shopCache.put(cachedShop.getShopId(), cachedShop);
+                Logger.logDebugInfo("Adding to ShopCache: " + shop.getShopId());
+            }
+            return (fetchRemainingStock ? cachedShop.getRemainingStock() : cachedShop.getRemainingSpace());
+        }
+    }
+
+    // An empty ResultSet or a value that returns -1 means that the value is not cached.
+    // Normally when space is -1, stock is not, and vice versa.
+    // In special cases, neither value may be -1.
+    // If Stock 0 -> Shop is admin or no stock
+    private void testQuickShopHikariExternalCache(Shop shop) throws RuntimeException {
+        boolean fetchRemainingStock = false;
+        long shopId = shop.getShopId();
+        try (SQLQuery query = DataTables.EXTERNAL_CACHE.createQuery()
+                .addCondition("shop", shopId)
+                .selectColumns("space", "stock")
+                .setLimit(1)
+                .build()
+                .execute(); ResultSet resultSet = query.getResultSet()) {
+            if(resultSet.next()){
+                long stock = resultSet.getLong("stock");
+                long space = resultSet.getLong("space");
+                // stock or space can be `-1`
+                Logger.logWarning("1: Location: " + shop.getLocation() + " | Stock: " + stock + " | Space: " + space);
+            }else{
+                // no cached data
+                Logger.logWarning("No cached data found!");
+            }
+        }
+        catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private boolean checkIfQSHikariShopCacheImplemented() {
+        String mainVersionStr = pluginVersion.split("\\.")[0];
+        int mainVersion = Integer.parseInt(mainVersionStr);
+        return mainVersion >= 6;
+    }
+
+    private void processPotentialShopMatchAndAddToFoundList(boolean toBuy, Shop shopIterator, List<FoundShopItemModel> shopsFoundList, Player searchingPlayer) {
+        Logger.logDebugInfo("Shop match found: " + shopIterator.getLocation());
+        // Check if shop is in a locked BentoBox island
+        if (FindItemAddOn.getConfigProvider().BENTOBOX_IGNORE_LOCKED_ISLAND_SHOPS && 
+            FindItemAddOn.getBentoboxPlugin().isIslandLocked(shopIterator.getLocation(), searchingPlayer)) {
+            Logger.logDebugInfo("Shop is in locked BentoBox island - ignoring");
+            return;
+        }
+        // check for stock / space
+        int stockOrSpace = (toBuy ? getRemainingStockOrSpaceFromShopCache(shopIterator, true)
+                : getRemainingStockOrSpaceFromShopCache(shopIterator, false));
+        if(isShopToBeIgnoredForFullOrEmpty(stockOrSpace)) {
+            return;
+        }
+        // check if owner has enough balance for buying shops
+        if(!toBuy && !isOwnerHavingEnoughBalance(shopIterator)) {
+            Logger.logDebugInfo("Shop Owner is poor");
+            return;
+        }
+        shopsFoundList.add(new FoundShopItemModel(
+                shopIterator.getPrice(),
+                QSApi.processStockOrSpace(stockOrSpace),
+                shopIterator.getOwner().getUniqueIdOptional().orElse(new UUID(0, 0)),
+                shopIterator.getLocation(),
+                shopIterator.getItem(),
+                toBuy
+        ));
+    }
+}

src/main/java/io/myzticbean/finditemaddon/quickshop/impl/QSReremakeAPIHandler.java

@@ -1,13 +1,32 @@
-package io.myzticbean.finditemaddon.QuickShopHandler;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.quickshop.impl;
 
-import io.myzticbean.finditemaddon.Commands.QSSubCommands.FindItemCmdReremakeImpl;
+import io.myzticbean.finditemaddon.quickshop.QSApi;
+import io.myzticbean.finditemaddon.commands.quickshop.subcommands.FindItemCmdReremakeImpl;
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Models.CachedShop;
-import io.myzticbean.finditemaddon.Models.FoundShopItemModel;
-import io.myzticbean.finditemaddon.Models.ShopSearchActivityModel;
-import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPerms;
-import io.myzticbean.finditemaddon.Utils.JsonStorageUtils.HiddenShopStorageUtil;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
+import io.myzticbean.finditemaddon.models.CachedShop;
+import io.myzticbean.finditemaddon.models.FoundShopItemModel;
+import io.myzticbean.finditemaddon.models.ShopSearchActivityModel;
+import io.myzticbean.finditemaddon.models.enums.PlayerPermsEnum;
+import io.myzticbean.finditemaddon.utils.json.HiddenShopStorageUtil;
+import io.myzticbean.finditemaddon.utils.log.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -21,10 +40,12 @@ import org.maxgamer.quickshop.api.QuickShopAPI;
 import org.maxgamer.quickshop.api.command.CommandContainer;
 import org.maxgamer.quickshop.api.shop.Shop;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -32,27 +53,25 @@ import java.util.concurrent.ConcurrentMap;
  * Implementation of QSApi for Reremake
  * @author myzticbean
  */
+@Deprecated(since = "2.0.6.0")
 public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
 
     private final QuickShopAPI api;
-
     private final QuickShop quickShop;
-
     private final ConcurrentMap<Location, CachedShop> shopCache;
-
     private final int SHOP_CACHE_TIMEOUT_SECONDS = 60;
     private final String QS_REREMAKE_PLUGIN_NAME = "QuickShop";
 
     public QSReremakeAPIHandler() {
         api = (QuickShopAPI) Bukkit.getPluginManager().getPlugin(QS_REREMAKE_PLUGIN_NAME);
         quickShop = (QuickShop) Bukkit.getPluginManager().getPlugin(QS_REREMAKE_PLUGIN_NAME);
-        LoggerUtils.logInfo("Initializing Shop caching");
+        Logger.logInfo("Initializing Shop caching");
         shopCache = new ConcurrentHashMap<>();
     }
 
     @Override
     public List<FoundShopItemModel> findItemBasedOnTypeFromAllShops(ItemStack item, boolean toBuy, Player searchingPlayer) {
-        long begin = System.currentTimeMillis();
+        var begin = Instant.now();
         List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
         List<Shop> allShops;
         if(FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
@@ -61,18 +80,15 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
         else {
             allShops = api.getShopManager().getAllShops();
         }
-        LoggerUtils.logDebugInfo("Total shops on server: " + allShops.size());
+        logTotalShopsOnServer(allShops.size());
         for(Shop shop_i : allShops) {
             // check for blacklisted worlds
             if(!FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shop_i.getLocation().getWorld())
                     && shop_i.getItem().getType().equals(item.getType())
-//                    && (toBuy ? getRemainingStockOrSpaceFromShopCache(shop_i, true) != 0 : getRemainingStockOrSpaceFromShopCache(shop_i, false) != 0)
                     && (toBuy ? shop_i.isSelling() : shop_i.isBuying())) {
                 if(checkIfShopToBeIgnoredForFullOrEmpty(toBuy, shop_i)) {
                     continue;
                 }
-//                if(checkIfShopToBeIgnoredIfAdminShop(shop_i))
-//                    continue;
                 // check for shop if hidden
                 if(!HiddenShopStorageUtil.isShopHidden(shop_i)) {
                     shopsFoundList.add(new FoundShopItemModel(
@@ -80,20 +96,20 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
                             QSApi.processStockOrSpace((toBuy ? getRemainingStockOrSpaceFromShopCache(shop_i, true) : getRemainingStockOrSpaceFromShopCache(shop_i, false))),
                             shop_i.getOwner(),
                             shop_i.getLocation(),
-                            shop_i.getItem()
+                            shop_i.getItem(),
+                            toBuy
                     ));
                 }
             }
         }
         List<FoundShopItemModel> sortedShops = handleShopSorting(toBuy, shopsFoundList);
-        long end = System.currentTimeMillis();
-        logTimeTookMsg((end-begin));
+        QSApi.logTimeTookMsg(begin);
         return sortedShops;
     }
 
     @Override
     public List<FoundShopItemModel> findItemBasedOnDisplayNameFromAllShops(String displayName, boolean toBuy, Player searchingPlayer) {
-        long begin = System.currentTimeMillis();
+        var begin = Instant.now();
         List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
         List<Shop> allShops;
         if(FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
@@ -102,7 +118,7 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
         else {
             allShops = api.getShopManager().getAllShops();
         }
-        LoggerUtils.logDebugInfo("Total shops on server: " + allShops.size());
+        logTotalShopsOnServer(allShops.size());
         for(Shop shop_i : allShops) {
             if(!FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shop_i.getLocation().getWorld())) {
                 if(shop_i.getItem().hasItemMeta()) {
@@ -112,8 +128,6 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
                                 && (toBuy ? shop_i.isSelling() : shop_i.isBuying())) {
                             if(checkIfShopToBeIgnoredForFullOrEmpty(toBuy, shop_i))
                                 continue;
-//                            if(checkIfShopToBeIgnoredIfAdminShop(shop_i))
-//                                continue;
                             // check for shop if hidden
                             if(!HiddenShopStorageUtil.isShopHidden(shop_i)) {
                                 shopsFoundList.add(new FoundShopItemModel(
@@ -121,7 +135,8 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
                                         QSApi.processStockOrSpace((toBuy ? getRemainingStockOrSpaceFromShopCache(shop_i, true) : getRemainingStockOrSpaceFromShopCache(shop_i, false))),
                                         shop_i.getOwner(),
                                         shop_i.getLocation(),
-                                        shop_i.getItem()
+                                        shop_i.getItem(),
+                                        toBuy
                                 ));
                             }
                         }
@@ -130,14 +145,13 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
             }
         }
         List<FoundShopItemModel> sortedShops = handleShopSorting(toBuy, shopsFoundList);
-        long end = System.currentTimeMillis();
-        logTimeTookMsg((end-begin));
+        QSApi.logTimeTookMsg(begin);
         return sortedShops;
     }
 
     @Override
     public List<FoundShopItemModel> fetchAllItemsFromAllShops(boolean toBuy, Player searchingPlayer) {
-        long begin = System.currentTimeMillis();
+        var begin = Instant.now();
         List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
         List<Shop> allShops;
         if(FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
@@ -146,7 +160,7 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
         else {
             allShops = api.getShopManager().getAllShops();
         }
-        LoggerUtils.logDebugInfo("Total shops on server: " + allShops.size());
+        logTotalShopsOnServer(allShops.size());
         for(Shop shop_i : allShops) {
             // check for blacklisted worlds
             if(!FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shop_i.getLocation().getWorld())
@@ -154,8 +168,6 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
                     && (toBuy ? shop_i.isSelling() : shop_i.isBuying())) {
                 if(checkIfShopToBeIgnoredForFullOrEmpty(toBuy, shop_i))
                     continue;
-//                if(checkIfShopToBeIgnoredIfAdminShop(shop_i))
-//                    continue;
                 // check for shop if hidden
                 if(!HiddenShopStorageUtil.isShopHidden(shop_i)) {
                     shopsFoundList.add(new FoundShopItemModel(
@@ -163,18 +175,19 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
                             QSApi.processStockOrSpace((toBuy ? getRemainingStockOrSpaceFromShopCache(shop_i, true) : getRemainingStockOrSpaceFromShopCache(shop_i, false))),
                             shop_i.getOwner(),
                             shop_i.getLocation(),
-                            shop_i.getItem()
+                            shop_i.getItem(),
+                            toBuy
                     ));
                 }
             }
         }
+        List<FoundShopItemModel> sortedShops = new ArrayList<>(shopsFoundList);
         if(!shopsFoundList.isEmpty()) {
             int sortingMethod = 1;
-            return QSApi.sortShops(sortingMethod, shopsFoundList, toBuy);
+            sortedShops = QSApi.sortShops(sortingMethod, shopsFoundList, toBuy);
         }
-        long end = System.currentTimeMillis();
-        logTimeTookMsg((end-begin));
-        return shopsFoundList;
+        QSApi.logTimeTookMsg(begin);
+        return sortedShops;
     }
 
     @Override
@@ -190,6 +203,7 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
 
     @Override
     public boolean isShopOwnerCommandRunner(Player player, Shop shop) {
+        Logger.logDebugInfo("Shop owner: " + shop.getOwner() + " | Player: " + player.getUniqueId());
         return shop.getOwner().toString().equalsIgnoreCase(player.getUniqueId().toString());
     }
 
@@ -218,7 +232,6 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
                     false
             ));
         }
-
         for(ShopSearchActivityModel shop_temp : tempGlobalShopsList) {
             ShopSearchActivityModel tempShopToRemove = null;
             for(ShopSearchActivityModel shop_global : globalShopsList) {
@@ -245,24 +258,29 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
      */
     @Override
     public void registerSubCommand() {
-        LoggerUtils.logInfo("Unregistered find sub-command for /qs");
+        Logger.logInfo("Unregistered find sub-command for /qs");
         for(CommandContainer cmdContainer : api.getCommandManager().getRegisteredCommands()) {
             if(cmdContainer.getPrefix().equalsIgnoreCase("find")) {
                 api.getCommandManager().unregisterCmd(cmdContainer);
                 break;
             }
         }
-        LoggerUtils.logInfo("Registered finditem sub-command for /qs");
+        Logger.logInfo("Registered finditem sub-command for /qs");
         api.getCommandManager().registerCmd(
                 CommandContainer.builder()
                         .prefix("finditem")
-                        .permission(PlayerPerms.FINDITEM_USE.value())
+                        .permission(PlayerPermsEnum.FINDITEM_USE.value())
                         .hidden(false)
                         .description("Search for items from all shops using an interactive GUI")
                         .executor(new FindItemCmdReremakeImpl())
                         .build());
     }
 
+    @Override
+    public UUID convertNameToUuid(String playerName) {
+        return null;
+    }
+
     @NotNull
     static List<FoundShopItemModel> handleShopSorting(boolean toBuy, List<FoundShopItemModel> shopsFoundList) {
         if(!shopsFoundList.isEmpty()) {
@@ -271,8 +289,8 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
                 sortingMethod = FindItemAddOn.getConfigProvider().SHOP_SORTING_METHOD;
             }
             catch(Exception e) {
-                LoggerUtils.logError("Invalid value in config.yml : 'shop-sorting-method'");
-                LoggerUtils.logError("Defaulting to sorting by prices method");
+                Logger.logError("Invalid value in config.yml : 'shop-sorting-method'");
+                Logger.logError("Defaulting to sorting by prices method");
             }
             return QSApi.sortShops(sortingMethod, shopsFoundList, toBuy);
         }
@@ -320,24 +338,25 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
      * @return
      */
     private int getRemainingStockOrSpaceFromShopCache(Shop shop, boolean fetchRemainingStock) {
-        LoggerUtils.logDebugInfo("Shop Location: " + shop.getLocation());
+        Logger.logDebugInfo("Shop Location: " + shop.getLocation());
         CachedShop cachedShop = shopCache.get(shop.getLocation());
         if (cachedShop == null || QSApi.isTimeDifferenceGreaterThanSeconds(cachedShop.getLastFetched(), new Date(), SHOP_CACHE_TIMEOUT_SECONDS)) {
             Shop possibleCachedShop = getRemainingStockOrSpaceFromQSCache(shop);
             if(possibleCachedShop != null) {
+                Logger.logDebugInfo("Shop found from QS cache: " + shop.getLocation());
                 cachedShop = CachedShop.builder()
-                        .shopLocation(possibleCachedShop.getLocation())
-                        .remainingStock(possibleCachedShop.getRemainingStock())
-                        .remainingSpace(possibleCachedShop.getRemainingSpace())
-                        .lastFetched(new Date())
-                        .build();
+                                .shopLocation(possibleCachedShop.getLocation())
+                                .remainingStock(possibleCachedShop.getRemainingStock())
+                                .remainingSpace(possibleCachedShop.getRemainingSpace())
+                                .lastFetched(new Date())
+                                .build();
                 shopCache.put(cachedShop.getShopLocation(), cachedShop);
-                LoggerUtils.logDebugInfo("Added to ShopCache: " + shop.getLocation());
+                Logger.logDebugInfo("Added to ShopCache: " + shop.getLocation());
             } else {
-                LoggerUtils.logError("No shop found from QS cache for location: " + shop.getLocation());
+                Logger.logDebugInfo("No shop found from QS cache for location: " + shop.getLocation());
             }
         } else {
-            LoggerUtils.logInfo("Shop found from cache: " + shop.getLocation());
+            Logger.logDebugInfo("Shop found from cache: " + shop.getLocation());
         }
         return (fetchRemainingStock ?
                 (cachedShop != null ? cachedShop.getRemainingStock() : -1)
@@ -350,28 +369,24 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
      * @return
      */
     private @Nullable Shop getRemainingStockOrSpaceFromQSCache(Shop shop) {
-        LoggerUtils.logDebugInfo("Shop Location: " + shop.getLocation());
-
         return quickShop.getShopCache().find(shop.getLocation(), false);
-
-        /*
-        CachedShop cachedShop = shopCache.get(shop.getLocation());
-        if (cachedShop == null || QSApi.isTimeDifferenceGreaterThanSeconds(cachedShop.getLastFetched(), new Date(), SHOP_CACHE_TIMEOUT_SECONDS)) {
-            cachedShop = CachedShop.builder()
-                    .shopLocation(shop.getLocation())
-                    .remainingStock(shop.getRemainingStock())
-                    .remainingSpace(shop.getRemainingSpace())
-                    .lastFetched(new Date())
-                    .build();
-            shopCache.put(cachedShop.getShopLocation(), cachedShop);
-            LoggerUtils.logDebugInfo("Adding to ShopCache: " + shop.getLocation());
-        }
-        return (fetchRemainingStock ? cachedShop.getRemainingStock() : cachedShop.getRemainingSpace());
-         */
     }
 
-    private void logTimeTookMsg(long timeTook) {
-        LoggerUtils.logInfo("Shop search took: " + timeTook + " milliseconds");
+
+
+    private static void logTotalShopsOnServer(int allShopsCount) {
+        Logger.logDebugInfo("Total shops on server: " + allShopsCount);
+    }
+
+    @Override
+    public boolean isQSShopCacheImplemented() {
+        return false;
+    }
+
+    @Override
+    public int processUnknownStockSpace(Location shopLoc, boolean toBuy) {
+        // This method will not be called from QS-Reremake context, but keeping it here as a placeholder
+        return -2;
     }
 
 

src/main/java/io/myzticbean/finditemaddon/scheduledtasks/Task15MinInterval.java

@@ -0,0 +1,40 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.scheduledtasks;
+
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import io.myzticbean.finditemaddon.utils.async.VirtualThreadScheduler;
+import io.myzticbean.finditemaddon.utils.json.ShopSearchActivityStorageUtil;
+import io.myzticbean.finditemaddon.utils.warp.WarpUtils;
+import org.bukkit.Bukkit;
+
+/**
+ * @author myzticbean
+ */
+public class Task15MinInterval implements Runnable {
+    @Override
+    public void run() {
+        // v2.0.6.0 - Changed tasks to run in async thread
+        // v2.0.7.7 - Switched to virtual thread
+        VirtualThreadScheduler.runTaskAsync(() -> {
+            WarpUtils.updateWarps();
+            ShopSearchActivityStorageUtil.syncShops();
+        });
+    }
+}

src/main/java/io/myzticbean/finditemaddon/utils/CommonUtils.java

@@ -1,10 +1,33 @@
-package io.myzticbean.finditemaddon.Utils;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.utils;
 
+import lombok.experimental.UtilityClass;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
+/**
+ * @author myzticbean
+ */
+@UtilityClass
 public class CommonUtils {
 
     public static String parseColors(String msg) {

src/main/java/io/myzticbean/finditemaddon/utils/LocationUtils.java

@@ -1,20 +1,42 @@
-package io.myzticbean.finditemaddon.Utils;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.utils;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.QuickShopHandler.QSApi;
-import io.myzticbean.finditemaddon.QuickShopHandler.QSHikariAPIHandler;
-import io.myzticbean.finditemaddon.QuickShopHandler.QSReremakeAPIHandler;
+import io.myzticbean.finditemaddon.models.enums.PlayerPermsEnum;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-
+/**
+ * @author myzticbean
+ */
+@UtilityClass
 public class LocationUtils {
 
     private static final List<Material> damagingBlocks = new ArrayList<>();
@@ -39,11 +61,11 @@ public class LocationUtils {
         // Glass
         nonSuffocatingBlocks.add(Material.GLASS);
         nonSuffocatingBlocks.addAll(
-                new ArrayList<>(Arrays.asList(Material.values()).stream().filter(p -> p.toString().toLowerCase().contains("_glass")).toList())
+                new ArrayList<>(Arrays.stream(Material.values()).filter(p -> p.toString().toLowerCase().contains("_glass")).toList())
         );
         // Glass Panes
         nonSuffocatingBlocks.addAll(
-                new ArrayList<>(Arrays.asList(Material.values()).stream().filter(p -> p.toString().toLowerCase().contains("glass_pane")).toList())
+                new ArrayList<>(Arrays.stream(Material.values()).filter(p -> p.toString().toLowerCase().contains("glass_pane")).toList())
         );
         // Leaves
         nonSuffocatingBlocks.add(Material.ACACIA_LEAVES);
@@ -58,15 +80,15 @@ public class LocationUtils {
         }
         // Slabs
         nonSuffocatingBlocks.addAll(
-                new ArrayList<>(Arrays.asList(Material.values()).stream().filter(p -> p.toString().toLowerCase().contains("_slab")).toList())
+                new ArrayList<>(Arrays.stream(Material.values()).filter(p -> p.toString().toLowerCase().contains("_slab")).toList())
         );
         // Walled Signs
         nonSuffocatingBlocks.addAll(
-                new ArrayList<>(Arrays.asList(Material.values()).stream().filter(p -> p.toString().toLowerCase().contains("_sign")).toList())
+                new ArrayList<>(Arrays.stream(Material.values()).filter(p -> p.toString().toLowerCase().contains("_sign")).toList())
         );
         // Stairs
         nonSuffocatingBlocks.addAll(
-                new ArrayList<>(Arrays.asList(Material.values()).stream().filter(p -> p.toString().toLowerCase().contains("_stairs")).toList())
+                new ArrayList<>(Arrays.stream(Material.values()).filter(p -> p.toString().toLowerCase().contains("_stairs")).toList())
         );
         // MISC
         nonSuffocatingBlocks.add(Material.HONEY_BLOCK);
@@ -84,16 +106,9 @@ public class LocationUtils {
     }
 
     @Nullable
-    public static Location findSafeLocationAroundShop(Location shopLocation) {
+    public static Location findSafeLocationAroundShop(Location shopLocation, Player player) {
         Location roundedShopLoc = getRoundedDestination(shopLocation);
-        QSApi qsApi;
-        if(FindItemAddOn.isQSReremakeInstalled()) {
-            qsApi = new QSReremakeAPIHandler();
-        }
-        else {
-            qsApi = new QSHikariAPIHandler();
-        }
-        LoggerUtils.logDebugInfo("Rounded location: " + roundedShopLoc.getX() + ", " + roundedShopLoc.getY() + ", " + roundedShopLoc.getZ());
+        Logger.logDebugInfo("Rounded location: " + roundedShopLoc.getX() + ", " + roundedShopLoc.getY() + ", " + roundedShopLoc.getZ());
         // Creating a list of four block locations in 4 sides of the shop
         List<Location> possibleSafeLocList = new ArrayList<>();
         possibleSafeLocList.add(new Location(
@@ -121,16 +136,32 @@ public class LocationUtils {
                 roundedShopLoc.getZ() - 1
         ));
         for(Location loc_i : possibleSafeLocList) {
-            LoggerUtils.logDebugInfo("Possible safe location: " + loc_i.getX() + ", " + loc_i.getY() + ", " + loc_i.getZ());
-            if(loc_i.getBlock().getType().equals(qsApi.getShopSignMaterial())) {
-                LoggerUtils.logDebugInfo("Shop sign block found at " + loc_i.getX() + ", " + loc_i.getY() + ", " + loc_i.getZ());
+            Logger.logDebugInfo("Possible safe location: " + loc_i.getX() + ", " + loc_i.getY() + ", " + loc_i.getZ());
+            if(loc_i.getBlock().getType().equals(FindItemAddOn.getQsApiInstance().getShopSignMaterial())) {
+                Logger.logDebugInfo("Shop sign block found at " + loc_i.getX() + ", " + loc_i.getY() + ", " + loc_i.getZ());
+                // Adding a check for a safe location check bypass permission
+                if(player.hasPermission(PlayerPermsEnum.FINDITEM_SHOPTP_BYPASS_SAFETYCHECK.value())) {
+                    Location blockBelow = new Location(
+                            loc_i.getWorld(),
+                            loc_i.getBlockX(),
+                            loc_i.getBlockY() - 1,
+                            loc_i.getBlockZ()
+                    );
+                    loc_i = lookAt(getRoundedDestination(new Location(
+                            blockBelow.getWorld(),
+                            blockBelow.getX(),
+                            blockBelow.getY() + 1,
+                            blockBelow.getZ()
+                    )), roundedShopLoc);
+                    return loc_i;
+                }
                 // check if the block above is suffocating
                 Location blockAbove = new Location(
                         loc_i.getWorld(),
                         loc_i.getBlockX(),
                         loc_i.getBlockY() + 1,
                         loc_i.getBlockZ());
-                LoggerUtils.logDebugInfo("Block above shop sign: "
+                Logger.logDebugInfo("Block above shop sign: "
                         + blockAbove.getX() + ", " + blockAbove.getY() + ", " + blockAbove.getZ());
                 if(!isBlockSuffocating(blockAbove)) {
                     Location blockBelow = null;
@@ -142,17 +173,17 @@ public class LocationUtils {
                                 loc_i.getBlockY() - i,
                                 loc_i.getBlockZ()
                         );
-                        LoggerUtils.logDebugInfo("Block below shop sign: "
+                        Logger.logDebugInfo("Block below shop sign: "
                                 + blockBelow.getBlock().getType() + " " + blockBelow.getX() + ", " + blockBelow.getY() + ", " + blockBelow.getZ());
                         if(blockBelow.getBlock().getType().equals(Material.AIR)
                             || blockBelow.getBlock().getType().equals(Material.CAVE_AIR)
                             || blockBelow.getBlock().getType().equals(Material.VOID_AIR)
-                            || blockBelow.getBlock().getType().equals(qsApi.getShopSignMaterial())) {
+                            || blockBelow.getBlock().getType().equals(FindItemAddOn.getQsApiInstance().getShopSignMaterial())) {
                             // do nothing and let the loop run
-                            LoggerUtils.logDebugInfo("Shop or Air found below");
+                            Logger.logDebugInfo("Shop or Air found below");
                         }
                         else if(!isBlockDamaging(blockBelow)) {
-                            LoggerUtils.logDebugInfo("Safe block found!");
+                            Logger.logDebugInfo("Safe block found!");
                             safeLocFound = true;
                             break;
                         }
@@ -174,15 +205,15 @@ public class LocationUtils {
                     }
                 }
                 else {
-                    LoggerUtils.logDebugInfo("Block above shop sign found not air. Block type: " + blockAbove.getBlock().getType());
+                    Logger.logDebugInfo("Block above shop sign found not air. Block type: " + blockAbove.getBlock().getType());
                     return null;
                 }
             }
             else {
-                LoggerUtils.logDebugInfo("Block not shop sign. Block type: " + loc_i.getBlock().getType());
+                Logger.logDebugInfo("Block not shop sign. Block type: " + loc_i.getBlock().getType());
             }
         }
-        LoggerUtils.logDebugInfo("No safe block found near shop");
+        Logger.logDebugInfo("No safe block found near shop");
         return null;
     }
 

src/main/java/io/myzticbean/finditemaddon/utils/UpdateChecker.java

@@ -0,0 +1,134 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.utils;
+
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import io.myzticbean.finditemaddon.models.enums.PlayerPermsEnum;
+import io.myzticbean.finditemaddon.utils.api.modrinth.ModrinthService;
+import io.myzticbean.finditemaddon.utils.async.VirtualThreadScheduler;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import me.kodysimpson.simpapi.colors.ColorTranslator;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Scanner;
+import java.util.function.Consumer;
+
+/**
+ * @author myzticbean
+ */
+public class UpdateChecker {
+
+    private static final String SPIGOT_DOWNLOAD_LINK = "https://www.spigotmc.org/resources/" + FindItemAddOn.getPluginID() + "/";
+    private static final String MODRINTH_DOWNLOAD_LINK = "https://modrinth.com/plugin/shop-search/versions/";
+    private final boolean suppressUpdateNotifications;
+    private final ModrinthService modrinthService;
+
+    public UpdateChecker() {
+        this.suppressUpdateNotifications = FindItemAddOn.getConfigProvider().SUPPRESS_UPDATE_NOTIFICATIONS;
+        this.modrinthService = new ModrinthService();
+    }
+
+    /**
+     * Checks if there is an update available for the plugin.
+     * @param updateAvailabilityConsumer Consumer to accept the update availability result. {@code True} if an update is available, {@code False} otherwise.
+     */
+    public void isUpdateAvailable(Consumer<Boolean> updateAvailabilityConsumer) {
+        VirtualThreadScheduler.runTaskAsync(() -> {
+            var projectVersions = modrinthService.getProjectVersions(FindItemAddOn.getModrinthProjectSlug());
+            if (projectVersions == null || projectVersions.isEmpty()) {
+                Logger.logWarning("Could not fetch version information from Modrinth");
+                updateAvailabilityConsumer.accept(false);
+                return;
+            }
+            var latestVersionDetails = projectVersions.getFirst();
+            if (latestVersionDetails == null || latestVersionDetails.getVersionNumber() == null) {
+                Logger.logWarning("Invalid version response from Modrinth");
+                updateAvailabilityConsumer.accept(false);
+                return;
+            }
+            var latestVersion = latestVersionDetails.getVersionNumber();
+            var currentVersion = FindItemAddOn.getInstance().getDescription().getVersion();
+            boolean isUpToDate = currentVersion.equals(latestVersion);
+            updateAvailabilityConsumer.accept(!isUpToDate);
+            if (!isUpToDate) {
+                if(latestVersion.toLowerCase().contains("snapshot")) {
+                    Logger.logWarning("Plugin has a new snapshot version available! (Version: " + latestVersion + ")");
+                } else {
+                    Logger.logWarning("Plugin has a new update available! (Version: " + latestVersion + ")");
+                }
+                Logger.logWarning("Download here: https://modrinth.com/plugin/shop-search/version/" + latestVersion);
+            }
+        });
+    }
+
+    @Deprecated(since = "v2.0.7.7")
+    public void getLatestVersion(Consumer<String> consumer) {
+        Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
+            try (
+                    InputStream inputStream = new URL("https://api.spigotmc.org/legacy/update.php?resource=" + FindItemAddOn.getPluginID()).openStream();
+                    Scanner scanner = new Scanner(inputStream)) {
+                if (scanner.hasNext()) {
+                    consumer.accept(scanner.next());
+                }
+            } catch (IOException exception) {
+                Logger.logError("Update checker is broken, can't find an update!" + exception.getMessage());
+            }
+        });
+    }
+
+    public void notifyPlayerAboutUpdateOnJoin(PlayerJoinEvent event) {
+        if(suppressUpdateNotifications) {
+            return;
+        }
+        Player player = event.getPlayer();
+        if ((player.isOp() || player.hasPermission(PlayerPermsEnum.FINDITEM_ADMIN.value()))
+                && FindItemAddOn.isPluginOutdated()) {
+            String prefix = "&8["
+                    + "&#55a800Q"
+                    + "&#5ea800S"
+                    + "&#66a800F"
+                    + "&#6ea900i"
+                    + "&#76a900n"
+                    + "&#7da900d"
+                    + "&#84a900I"
+                    + "&#8ba900t"
+                    + "&#92a900e"
+                    + "&#98a900m"
+                    + "&#9ea900A"
+                    + "&#a4a900d"
+                    + "&#aaa800d"
+                    + "&#b0a800O"
+                    + "&#b6a800n"
+                    + "&8] ";
+            player.sendMessage(ColorTranslator.translateColorCodes(
+                    prefix
+                            + "&#59b300Hey &#73e600" + player.getName()
+                            + "&#59b300! Plugin has an update... You are still on v"
+                            + FindItemAddOn.getInstance().getDescription().getVersion()));
+//            player.sendMessage(ColorTranslator.translateColorCodes(prefix + "&#59b300Download here: &#a3a3c2&n" + SPIGOT_DOWNLOAD_LINK));
+            player.sendMessage(ColorTranslator.translateColorCodes(prefix + "&#59b300Download here: &#a3a3c2&n" + MODRINTH_DOWNLOAD_LINK));
+        }
+    }
+
+}

src/main/java/io/myzticbean/finditemaddon/utils/api/modrinth/ModrinthService.java

@@ -0,0 +1,51 @@
+package io.myzticbean.finditemaddon.utils.api.modrinth;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import io.myzticbean.finditemaddon.utils.api.modrinth.model.ProjectDetailsResponse;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Collections;
+import java.util.List;
+
+public class ModrinthService {
+
+    private static final String MODRINTH_API_BASE_URL = "https://api.modrinth.com/v2/";
+    private final HttpClient httpClient;
+    private final ObjectMapper objectMapper;
+
+    public ModrinthService() {
+        this.httpClient = HttpClient.newHttpClient();
+        this.objectMapper = new ObjectMapper();
+        this.objectMapper.registerModule(new JavaTimeModule());
+    }
+
+    public List<ProjectDetailsResponse> getProjectVersions(String projectId) {
+        var url = MODRINTH_API_BASE_URL + "project/" + projectId + "/version";
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(url))
+                .build();
+        try {
+            Logger.logDebugInfo("Outbound Request: " + url);
+            HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+            Logger.logDebugInfo("Inbound Response: " + response.body());
+            if (response.statusCode() == 200) {
+                return objectMapper.readValue(response.body(), new TypeReference<List<ProjectDetailsResponse>>() {});
+            } else {
+                Logger.logError("Modrinth API request failed with status code: " + response.statusCode());
+            }
+        } catch (InterruptedException e) {
+            Logger.logError(e);
+            Thread.currentThread().interrupt();
+        } catch (IOException e) {
+            Logger.logError(e);
+        }
+        return Collections.emptyList();
+    }
+}

src/main/java/io/myzticbean/finditemaddon/utils/api/modrinth/model/ProjectDetailsResponse.java

@@ -0,0 +1,83 @@
+package io.myzticbean.finditemaddon.utils.api.modrinth.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.time.OffsetDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ProjectDetailsResponse {
+
+    private String id;
+
+    @JsonProperty("project_id")
+    private String projectId;
+
+    @JsonProperty("author_id")
+    private String authorId;
+
+    private boolean featured;
+    private String name;
+
+    @JsonProperty("version_number")
+    private String versionNumber;
+
+    private String changelog;
+
+    @JsonProperty("changelog_url")
+    private String changelogUrl;
+
+    @JsonProperty("date_published")
+    private OffsetDateTime datePublished;
+
+    private int downloads;
+
+    @JsonProperty("version_type")
+    private String versionType;
+
+    private String status;
+
+    @JsonProperty("requested_status")
+    private String requestedStatus;
+
+    private List<FileInfo> files;
+    private List<Dependency> dependencies;
+
+    @JsonProperty("game_versions")
+    private List<String> gameVersions;
+
+    private List<String> loaders;
+
+    // 🔹 Nested class: FileInfo
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class FileInfo {
+        private String filename;
+        private String url;
+        private Map<String, String> hashes;
+
+        @JsonProperty("primary")
+        private boolean primary;
+
+        private long size;
+    }
+
+    // 🔹 Nested class: Dependency
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class Dependency {
+        @JsonProperty("version_id")
+        private String versionId;
+
+        @JsonProperty("project_id")
+        private String projectId;
+
+        @JsonProperty("dependency_type")
+        private String dependencyType;
+    }
+
+}

src/main/java/io/myzticbean/finditemaddon/utils/async/VirtualThreadScheduler.java

@@ -0,0 +1,46 @@
+package io.myzticbean.finditemaddon.utils.async;
+
+import io.myzticbean.finditemaddon.utils.log.Logger;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+public class VirtualThreadScheduler {
+    // Use a shared executor for all virtual-thread tasks
+    private static final ExecutorService VIRTUAL_EXECUTOR =
+            Executors.newVirtualThreadPerTaskExecutor();
+
+    private VirtualThreadScheduler() {
+        // prevent instantiation
+    }
+
+    /**
+     * Run a task asynchronously on a Java Virtual Thread.
+     *
+     * @param task The task to run.
+     * @return a Future representing the result of the task.
+     */
+    public static Future<?> runTaskAsync(Runnable task) {
+        return VIRTUAL_EXECUTOR.submit(task);
+    }
+
+    /**
+     * Run a task asynchronously on a Java Virtual Thread with result.
+     *
+     * @param task The task to run.
+     * @param <T>  The type of the result.
+     * @return a Future with the result.
+     */
+    public static <T> Future<T> runTaskAsync(java.util.concurrent.Callable<T> task) {
+        return VIRTUAL_EXECUTOR.submit(task);
+    }
+
+    /**
+     * Shut down the virtual thread executor gracefully.
+     */
+    public static void shutdown() {
+        Logger.logInfo("Shutting down virtual thread executor...");
+        VIRTUAL_EXECUTOR.shutdown();
+    }
+}

src/main/java/io/myzticbean/finditemaddon/utils/json/HiddenShopStorageUtil.java

@@ -1,30 +1,61 @@
-package io.myzticbean.finditemaddon.Utils.JsonStorageUtils;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.utils.json;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Models.HiddenShopModel;
-import io.myzticbean.finditemaddon.Models.ShopSearchActivityModel;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
+import io.myzticbean.finditemaddon.models.HiddenShopModel;
+import io.myzticbean.finditemaddon.models.ShopSearchActivityModel;
+import io.myzticbean.finditemaddon.utils.async.VirtualThreadScheduler;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.maxgamer.quickshop.api.shop.Shop;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
+@UtilityClass
 public class HiddenShopStorageUtil {
 
-    protected static List<HiddenShopModel> hiddenShopsList = new ArrayList<>();
-    protected static final String HIDDEN_SHOP_STORAGE_JSON_FILE_NAME = "hiddenShops.json";
+    static List<HiddenShopModel> hiddenShopsList = new ArrayList<>();
+    static final String HIDDEN_SHOP_STORAGE_JSON_FILE_NAME = "hiddenShops.json";
 
     /**
      * QuickShop Reremake
      * @param shop
      */
+    @Deprecated(since = "v2.0.7.7")
     public static void handleShopSearchVisibilityAsync(Shop shop, boolean hideShop) {
         Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
             Iterator<ShopSearchActivityModel> shopSearchActivityIterator = ShopSearchActivityStorageUtil.getGlobalShopsList().iterator();
@@ -44,15 +75,6 @@ public class HiddenShopStorageUtil {
                 i++;
             }
         });
-//        HiddenShopModel hiddenShop = new HiddenShopModel(
-//                shop.getLocation().getWorld().getName(),
-//                shop.getLocation().getX(),
-//                shop.getLocation().getY(),
-//                shop.getLocation().getZ(),
-//                shop.getLocation().getPitch(),
-//                shop.getLocation().getYaw(),
-//                shop.getOwner().toString());
-//        hiddenShopsList.add(hiddenShop);
     }
 
     /**
@@ -60,7 +82,7 @@ public class HiddenShopStorageUtil {
      * @param shop
      */
     public static void handleShopSearchVisibilityAsync(com.ghostchu.quickshop.api.shop.Shop shop, boolean hideShop) {
-        Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
+        VirtualThreadScheduler.runTaskAsync(() -> {
             Iterator<ShopSearchActivityModel> shopSearchActivityIterator = ShopSearchActivityStorageUtil.getGlobalShopsList().iterator();
             int i = 0;
             while(shopSearchActivityIterator.hasNext()) {
@@ -72,61 +94,16 @@ public class HiddenShopStorageUtil {
                         shopLocation.getY(),
                         shopLocation.getZ()
                 )) {
-                    ShopSearchActivityStorageUtil.getGlobalShopsList().get(i).setHiddenFromSearch(hideShop);
+                    ShopSearchActivityStorageUtil.getGlobalShopsList()
+                            .get(i)
+                            .setHiddenFromSearch(hideShop);
                     break;
                 }
                 i++;
             }
         });
-//        HiddenShopModel hiddenShop = new HiddenShopModel(
-//                shop.getLocation().getWorld().getName(),
-//                shop.getLocation().getX(),
-//                shop.getLocation().getY(),
-//                shop.getLocation().getZ(),
-//                shop.getLocation().getPitch(),
-//                shop.getLocation().getYaw(),
-//                shop.getOwner().toString());
-//        hiddenShopsList.add(hiddenShop);
     }
 
-    /**
-     * QuickShop Reremake
-     * @param shop
-     */
-//    public static void deleteShop(Shop shop) {
-//        for(HiddenShopModel hiddenShop : hiddenShopsList) {
-//            if(hiddenShop.getWorldName().equalsIgnoreCase(shop.getLocation().getWorld().getName())
-//                && hiddenShop.getX() == shop.getLocation().getX()
-//                && hiddenShop.getY() == shop.getLocation().getY()
-//                && hiddenShop.getZ() == shop.getLocation().getZ()
-//                && hiddenShop.getPitch() == shop.getLocation().getPitch()
-//                && hiddenShop.getYaw() == shop.getLocation().getYaw()
-//                && Objects.equals(hiddenShop.getShopOwnerUUID(), shop.getOwner().toString())) {
-//                hiddenShopsList.remove(hiddenShop);
-//                break;
-//            }
-//        }
-//    }
-
-    /**
-     * QuickShop Hikari
-     * @param shop
-     */
-//    public static void deleteShop(com.ghostchu.quickshop.api.shop.Shop shop) {
-//        for(HiddenShopModel hiddenShop : hiddenShopsList) {
-//            if(hiddenShop.getWorldName().equalsIgnoreCase(shop.getLocation().getWorld().getName())
-//                    && hiddenShop.getX() == shop.getLocation().getX()
-//                    && hiddenShop.getY() == shop.getLocation().getY()
-//                    && hiddenShop.getZ() == shop.getLocation().getZ()
-//                    && hiddenShop.getPitch() == shop.getLocation().getPitch()
-//                    && hiddenShop.getYaw() == shop.getLocation().getYaw()
-//                    && Objects.equals(hiddenShop.getShopOwnerUUID(), shop.getOwner().toString())) {
-//                hiddenShopsList.remove(hiddenShop);
-//                break;
-//            }
-//        }
-//    }
-
     /**
      * QuickShop Reremake
      * @param shop
@@ -150,18 +127,6 @@ public class HiddenShopStorageUtil {
             }
         }
         return false;
-//        for(HiddenShopModel hiddenShop : hiddenShopsList) {
-//            if(hiddenShop.getWorldName().equalsIgnoreCase(shop.getLocation().getWorld().getName())
-//                    && hiddenShop.getX() == shop.getLocation().getX()
-//                    && hiddenShop.getY() == shop.getLocation().getY()
-//                    && hiddenShop.getZ() == shop.getLocation().getZ()
-//                    && hiddenShop.getPitch() == shop.getLocation().getPitch()
-//                    && hiddenShop.getYaw() == shop.getLocation().getYaw()
-//                    && Objects.equals(hiddenShop.getShopOwnerUUID(), shop.getOwner().toString())) {
-//                return true;
-//            }
-//        }
-//        return false;
     }
 
     /**
@@ -187,18 +152,6 @@ public class HiddenShopStorageUtil {
             }
         }
         return false;
-//        for(HiddenShopModel hiddenShop : hiddenShopsList) {
-//            if(hiddenShop.getWorldName().equalsIgnoreCase(shop.getLocation().getWorld().getName())
-//                    && hiddenShop.getX() == shop.getLocation().getX()
-//                    && hiddenShop.getY() == shop.getLocation().getY()
-//                    && hiddenShop.getZ() == shop.getLocation().getZ()
-//                    && hiddenShop.getPitch() == shop.getLocation().getPitch()
-//                    && hiddenShop.getYaw() == shop.getLocation().getYaw()
-//                    && Objects.equals(hiddenShop.getShopOwnerUUID(), shop.getOwner().toString())) {
-//                return true;
-//            }
-//        }
-//        return false;
     }
 
     public static void loadHiddenShopsFromFile() {
@@ -207,7 +160,6 @@ public class HiddenShopStorageUtil {
         if(file.exists()) {
             try {
                 Reader reader = new FileReader(file);
-//                Type listType = new TypeToken<List<HiddenShopModel>>() {}.getType();
                 HiddenShopModel[] h = gson.fromJson(reader, HiddenShopModel[].class);
                 if(h != null) {
                     hiddenShopsList = new ArrayList<>(Arrays.asList(h));
@@ -215,7 +167,7 @@ public class HiddenShopStorageUtil {
                 else {
                     hiddenShopsList = new ArrayList<>();
                 }
-                LoggerUtils.logInfo("Loaded hidden shops from file");
+                Logger.logInfo("Loaded hidden shops from file");
             } catch (FileNotFoundException e) {
                 e.printStackTrace();
             }
@@ -232,7 +184,7 @@ public class HiddenShopStorageUtil {
             gson.toJson(hiddenShopsList, writer);
             writer.flush();
             writer.close();
-            LoggerUtils.logInfo("Saved hidden shops to file");
+            Logger.logInfo("Saved hidden shops to file");
         } catch (IOException e) {
             e.printStackTrace();
         }

src/main/java/io/myzticbean/finditemaddon/utils/json/ShopSearchActivityStorageUtil.java

@@ -1,12 +1,31 @@
-package io.myzticbean.finditemaddon.Utils.JsonStorageUtils;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.utils.json;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import io.myzticbean.finditemaddon.FindItemAddOn;
-import io.myzticbean.finditemaddon.Models.HiddenShopModel;
-import io.myzticbean.finditemaddon.Models.PlayerShopVisitModel;
-import io.myzticbean.finditemaddon.Models.ShopSearchActivityModel;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
+import io.myzticbean.finditemaddon.models.HiddenShopModel;
+import io.myzticbean.finditemaddon.models.PlayerShopVisitModel;
+import io.myzticbean.finditemaddon.models.ShopSearchActivityModel;
+import io.myzticbean.finditemaddon.utils.async.VirtualThreadScheduler;
+import io.myzticbean.finditemaddon.utils.log.Logger;
 import lombok.Getter;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import org.bukkit.Bukkit;
@@ -17,22 +36,34 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
 import java.time.Instant;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
+/**
+ * @author myzticbean
+ */
 public class ShopSearchActivityStorageUtil {
 
     private static final String SHOP_SEARCH_ACTIVITY_JSON_FILE_NAME = "shops.json";
-    private static final String COOLDOWNS_YAML_FILE_NAME = "cooldowns.yml";
 
     @Getter
     private static final Map<String, Long> cooldowns = new HashMap<>();
 
-    private static File cooldownsYaml;
-    private static FileConfiguration cooldownsConfig;
-
     @Getter
     private static List<ShopSearchActivityModel> globalShopsList = new ArrayList<>();
 
@@ -42,21 +73,6 @@ public class ShopSearchActivityStorageUtil {
      * @return
      */
     private static boolean handleCooldownIfPresent(Location shopLocation, Player player) {
-        // The below logic is flawed
-        /*
-        // check player is inside hashmap
-        if(cooldowns.containsKey(player.getName())) {
-            // check if player still has cooldown
-            if(cooldowns.get(player.getName()) > (System.currentTimeMillis()/1000)) {
-                long timeLeft = (cooldowns.get(player.getName()) - System.currentTimeMillis()/1000);
-                LoggerUtils.logDebugInfo(ColorTranslator.translateColorCodes("&6" + player.getName() + " still has cooldown of " + timeLeft + " seconds!"));
-                return false;
-            }
-        }
-        cooldowns.put(player.getName(), (System.currentTimeMillis()/1000) + FindItemAddOn.getConfigProvider().SHOP_PLAYER_VISIT_COOLDOWN_IN_MINUTES * 60);
-        LoggerUtils.logDebugInfo(ColorTranslator.translateColorCodes("&aCooldown added for " + FindItemAddOn.getConfigProvider().SHOP_PLAYER_VISIT_COOLDOWN_IN_MINUTES * 60 + " seconds for " + player.getName()));
-        return true;
-         */
 
         // New logic
         for(ShopSearchActivityModel shopSearchActivity : globalShopsList) {
@@ -82,16 +98,16 @@ public class ShopSearchActivityStorageUtil {
                     isCooldownTimeElapsed = true;
                 }
                 if(isCooldownTimeElapsed) {
-                    LoggerUtils.logDebugInfo(ColorTranslator.translateColorCodes("&6" + player.getName() + " is out of cooldown"));
+                    Logger.logDebugInfo(ColorTranslator.translateColorCodes("&6" + player.getName() + " is out of cooldown"));
                     return true;
                 }
                 else {
-                    LoggerUtils.logDebugInfo(ColorTranslator.translateColorCodes("&6" + player.getName() + " still has cooldown"));
+                    Logger.logDebugInfo(ColorTranslator.translateColorCodes("&6" + player.getName() + " still has cooldown"));
                     return false;
                 }
             }
         }
-        LoggerUtils.logDebugInfo(ColorTranslator.translateColorCodes("&6Shop not found, returning false for cooldown check"));
+        Logger.logDebugInfo(ColorTranslator.translateColorCodes("&6Shop not found, returning false for cooldown check"));
         return false;
     }
 
@@ -99,27 +115,6 @@ public class ShopSearchActivityStorageUtil {
         globalShopsList = FindItemAddOn.getQsApiInstance().syncShopsListForStorage(globalShopsList);
     }
 
-//    public static void saveCooldowns() {
-//        try {
-//            for(Map.Entry<String, Long> entry : cooldowns.entrySet()) {
-//                cooldownsConfig.set("cooldowns." + entry.getKey(), entry.getValue());
-//            }
-//            cooldownsConfig.save(cooldownsYaml);
-//        }
-//        catch (IOException e) {
-//            LoggerUtils.logError("Error saving config.yml");
-//        }
-//    }
-
-//    public static void restoreCooldowns() {
-//        if(cooldownsConfig.isConfigurationSection("cooldowns")) {
-//            cooldownsConfig.getConfigurationSection("cooldowns").getKeys(false).forEach(key -> {
-//                long timeLeft = cooldownsConfig.getLong("cooldowns." + key);
-//                cooldowns.put(key, timeLeft);
-//            });
-//        }
-//    }
-
     /**
      * QuickShop Reremake
      * @param shop
@@ -153,7 +148,7 @@ public class ShopSearchActivityStorageUtil {
      * QuickShop Hikari
      * @param shop
      */
-    public void addShop(com.ghostchu.quickshop.api.shop.Shop shop) {
+    public static void addShop(com.ghostchu.quickshop.api.shop.Shop shop) {
         ShopSearchActivityModel shopModel = new ShopSearchActivityModel(
                 shop.getLocation().getWorld().getName(),
                 shop.getLocation().getX(),
@@ -168,16 +163,28 @@ public class ShopSearchActivityStorageUtil {
         globalShopsList.add(shopModel);
     }
 
-//    public void deleteShop(org.maxgamer.quickshop.api.shop.Shop shop) {
-//
-//    }
-//
-//    public void deleteShop(com.ghostchu.quickshop.api.shop.Shop shop) {
-//
-//    }
+    /**
+     * QuickShop Hikari
+     * @param shop
+     */
+    public static void removeShop(com.ghostchu.quickshop.api.shop.Shop shop) {
+        Iterator<ShopSearchActivityModel> shopSearchActivityIterator = globalShopsList.iterator();
+        while(shopSearchActivityIterator.hasNext()) {
+            ShopSearchActivityModel shopSearchActivity = shopSearchActivityIterator.next();
+            if(shopSearchActivity.compareWith(
+                    shop.getLocation().getWorld().getName(),
+                    shop.getLocation().getX(),
+                    shop.getLocation().getY(),
+                    shop.getLocation().getZ()
+            )) {
+                shopSearchActivityIterator.remove();
+                return;
+            }
+        }
+    }
 
     public static void loadShopsFromFile() {
-        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        Gson gson = new GsonBuilder().create();
         File file = new File(FindItemAddOn.getInstance().getDataFolder().getAbsolutePath() + "/" + SHOP_SEARCH_ACTIVITY_JSON_FILE_NAME);
         if(file.exists()) {
             try {
@@ -189,25 +196,16 @@ public class ShopSearchActivityStorageUtil {
                 else {
                     globalShopsList = new ArrayList<>();
                 }
-                LoggerUtils.logInfo("Loaded shops from file");
+                Logger.logInfo("Loaded shops from file");
             } catch (FileNotFoundException e) {
                 e.printStackTrace();
             }
         }
-//        else {
-//            try {
-//                file.createNewFile();
-//                LoggerUtils.logInfo("Generated new " + SHOP_SEARCH_ACTIVITY_JSON_FILE_NAME);
-//            } catch (IOException e) {
-//                LoggerUtils.logError("Error generating " + SHOP_SEARCH_ACTIVITY_JSON_FILE_NAME);
-//                e.printStackTrace();
-//            }
-//        }
         globalShopsList = FindItemAddOn.getQsApiInstance().syncShopsListForStorage(globalShopsList);
     }
 
     public static void saveShopsToFile() {
-        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        Gson gson = new GsonBuilder().create();
         File file = new File(FindItemAddOn.getInstance().getDataFolder().getAbsolutePath() + "/" + SHOP_SEARCH_ACTIVITY_JSON_FILE_NAME);
         file.getParentFile().mkdir();
         try {
@@ -216,29 +214,12 @@ public class ShopSearchActivityStorageUtil {
             gson.toJson(globalShopsList, writer);
             writer.flush();
             writer.close();
-            LoggerUtils.logInfo("Saved shops to file");
+            Logger.logInfo("Saved shops to file");
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
-    /*
-    public static void setupCooldownsConfigFile() {
-        cooldownsYaml = new File(FindItemAddOn.getInstance().getDataFolder(), COOLDOWNS_YAML_FILE_NAME);
-        if(!cooldownsYaml.exists()) {
-            try {
-                boolean isConfigGenerated = cooldownsYaml.createNewFile();
-                if(isConfigGenerated) {
-                    LoggerUtils.logInfo("Generated a new " + COOLDOWNS_YAML_FILE_NAME);
-                }
-            } catch (IOException e) {
-                LoggerUtils.logError("Error generating " + COOLDOWNS_YAML_FILE_NAME);
-            }
-        }
-        cooldownsConfig = YamlConfiguration.loadConfiguration(cooldownsYaml);
-    }
-     */
-
     public static void migrateHiddenShopsToShopsJson() {
         File hiddenShopsJsonfile = new File(FindItemAddOn.getInstance().getDataFolder().getAbsolutePath() + "/" + HiddenShopStorageUtil.HIDDEN_SHOP_STORAGE_JSON_FILE_NAME);
         if(hiddenShopsJsonfile.exists()) {
@@ -256,22 +237,22 @@ public class ShopSearchActivityStorageUtil {
                             tempHiddenShop = hiddenShop_i;
                             shopSearchActivity.setHiddenFromSearch(true);
                             globalShopsList.set(globalShopsList_i, shopSearchActivity);
-                            LoggerUtils.logDebugInfo("Converted shop: " + shopSearchActivity);
+                            Logger.logDebugInfo("Converted shop: " + shopSearchActivity);
                         }
                     }
                     HiddenShopStorageUtil.hiddenShopsList.remove(tempHiddenShop);
                 }
             }
-            LoggerUtils.logDebugInfo("Here we will delete the hiddenShops.json");
+            Logger.logDebugInfo("Here we will delete the hiddenShops.json");
             hiddenShopsJsonfile.delete();
         }
         else {
-            LoggerUtils.logDebugInfo("hiddenshops.json: No conversion required");
+            Logger.logDebugInfo("hiddenshops.json: No conversion required");
         }
     }
 
     public static void addPlayerVisitEntryAsync(Location shopLocation, Player visitingPlayer) {
-        Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
+        VirtualThreadScheduler.runTaskAsync(() -> {
             if(handleCooldownIfPresent(shopLocation, visitingPlayer)) {
                 Iterator<ShopSearchActivityModel> shopSearchActivityIterator = globalShopsList.iterator();
                 int i = 0;
@@ -286,28 +267,12 @@ public class ShopSearchActivityStorageUtil {
                         PlayerShopVisitModel playerShopVisit = new PlayerShopVisitModel();
                         playerShopVisit.setPlayerUUID(visitingPlayer.getUniqueId());
                         playerShopVisit.setVisitDateTime();
-//                        shopSearchActivity.getPlayerVisitList().add(playerShopVisit);
                         globalShopsList.get(i).getPlayerVisitList().add(playerShopVisit);
-                        LoggerUtils.logDebugInfo("Added new player visit entry at " + shopLocation.toString());
+                        Logger.logDebugInfo("Added new player visit entry at " + shopLocation);
                         break;
                     }
                     i++;
                 }
-//                for(ShopSearchActivityModel shopSearchActivity : globalShopsList) {
-//                    if(shopSearchActivity.compareWith(
-//                            shopLocation.getWorld().getName(),
-//                            shopLocation.getX(),
-//                            shopLocation.getY(),
-//                            shopLocation.getZ()
-//                    )) {
-//                        PlayerShopVisitModel playerShopVisit = new PlayerShopVisitModel();
-//                        playerShopVisit.setPlayerUUID(visitingPlayer.getUniqueId());
-//                        playerShopVisit.setVisitDateTime();
-//                        shopSearchActivity.getPlayerVisitList().add(playerShopVisit);
-//                        LoggerUtils.logDebugInfo("Added new player visit entry at " + shopLocation.toString());
-//                        break;
-//                    }
-//                }
             }
         });
     }
@@ -343,13 +308,25 @@ public class ShopSearchActivityStorageUtil {
 
     @Nullable
     public static UUID getShopOwnerUUID(@NotNull Location shopLocation) {
-        for(ShopSearchActivityModel shopSearchActivity : globalShopsList) {
+        Iterator<ShopSearchActivityModel> globalShopsListIterator = globalShopsList.iterator();
+        while(globalShopsListIterator.hasNext()) {
+            ShopSearchActivityModel shopSearchActivity = globalShopsListIterator.next();
             if (shopSearchActivity.compareWith(
                     shopLocation.getWorld().getName(),
                     shopLocation.getX(),
                     shopLocation.getY(),
                     shopLocation.getZ()
             )) {
+                String uuidStr = shopSearchActivity.getShopOwnerUUID();
+                try {
+                    return UUID.fromString(uuidStr);
+                } catch (IllegalArgumentException e) {
+                    if(!FindItemAddOn.isQSReremakeInstalled()) {
+                        UUID uuid = FindItemAddOn.getQsApiInstance().convertNameToUuid(uuidStr);
+                        int index = globalShopsList.indexOf(shopSearchActivity);
+                        globalShopsList.get(index).setShopOwnerUUID(uuid.toString());
+                    }
+                }
                 return UUID.fromString(shopSearchActivity.getShopOwnerUUID());
             }
         }

src/main/java/io/myzticbean/finditemaddon/utils/log/Logger.java

@@ -0,0 +1,62 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.utils.log;
+
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import lombok.experimental.UtilityClass;
+import me.kodysimpson.simpapi.colors.ColorTranslator;
+import org.bukkit.Bukkit;
+
+/**
+ * @author myzticbean
+ */
+@UtilityClass
+public class Logger {
+
+    public static final String QS_FIND_ITEM_ADD_ON = "[QuickShop-FindItemAddOn] ";
+    public static final String QS_FIND_ITEM_ADD_ON_DEBUG_LOG = "[QuickShop-FindItemAddOn-DEBUG] ";
+
+    public static void logDebugInfo(String text) {
+        if(FindItemAddOn.getConfigProvider().DEBUG_MODE) {
+            Bukkit.getLogger().warning(ColorTranslator.translateColorCodes(QS_FIND_ITEM_ADD_ON_DEBUG_LOG + getMainOrAsyncThreadLogText() + text));
+        }
+    }
+    public static void logInfo(String text) {
+        Bukkit.getLogger().info(ColorTranslator.translateColorCodes(QS_FIND_ITEM_ADD_ON + getMainOrAsyncThreadLogText() + text));
+    }
+    public static void logError(String text) {
+        Bukkit.getLogger().severe(ColorTranslator.translateColorCodes(QS_FIND_ITEM_ADD_ON + text));
+    }
+    public static void logError(Exception e) {
+        Bukkit.getLogger().severe(ColorTranslator.translateColorCodes(QS_FIND_ITEM_ADD_ON + e.getMessage()));
+        e.printStackTrace();
+    }
+
+    public static void logError(String errorMessage, Exception e) {
+        Bukkit.getLogger().severe(ColorTranslator.translateColorCodes(QS_FIND_ITEM_ADD_ON + errorMessage + ": " + e.getMessage()));
+        e.printStackTrace();
+    }
+    public static void logWarning(String text) {
+        Bukkit.getLogger().warning(ColorTranslator.translateColorCodes(QS_FIND_ITEM_ADD_ON + text));
+    }
+
+    private static String getMainOrAsyncThreadLogText() {
+        return Bukkit.isPrimaryThread() ? "[MAIN] " : "[ASYNC] ";
+    }
+}

src/main/java/io/myzticbean/finditemaddon/utils/warp/EssentialWarpsUtil.java

@@ -0,0 +1,72 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.utils.warp;
+
+import io.myzticbean.finditemaddon.dependencies.EssentialsXPlugin;
+import io.myzticbean.finditemaddon.models.EssentialWarpModel;
+import io.myzticbean.finditemaddon.utils.CommonUtils;
+import lombok.experimental.UtilityClass;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * @author myzticbean
+ */
+@UtilityClass
+public class EssentialWarpsUtil {
+
+    @Nullable
+    public static String findNearestWarp(Location shopLocation) {
+        List<EssentialWarpModel> allWarps = EssentialsXPlugin.getAllWarps();
+        if(allWarps != null && !allWarps.isEmpty()) {
+            Map<Double, String> warpDistanceMap = new TreeMap<>();
+            allWarps.forEach(warp -> {
+                Double distance = CommonUtils.calculateDistance3D(
+                        shopLocation.getX(),
+                        shopLocation.getY(),
+                        shopLocation.getZ(),
+                        warp.warpLoc.getX(),
+                        warp.warpLoc.getY(),
+                        warp.warpLoc.getZ()
+                );
+                warpDistanceMap.put(distance, warp.warpName);
+            });
+            /*if(FindItemAddOn.getConfigProvider().DEBUG_MODE) {
+                for(Map.Entry<Double, String> entry : warpDistanceMap.entrySet()) {
+                    LoggerUtils.logDebugInfo(entry.getValue() + " : " + entry.getKey());
+                }
+            }*/
+            return warpDistanceMap.entrySet().iterator().next().getValue();
+        }
+        else {
+            return null;
+        }
+    }
+
+    public static void warpPlayer(Player player, String warpName) {
+        Bukkit.dispatchCommand(player, "essentials:warp " + warpName);
+    }
+
+}

src/main/java/io/myzticbean/finditemaddon/utils/warp/PlayerWarpsUtil.java

@@ -0,0 +1,104 @@
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.utils.warp;
+
+import com.olziedev.playerwarps.api.PlayerWarpsAPI;
+import com.olziedev.playerwarps.api.events.warp.PlayerWarpTeleportEvent;
+import com.olziedev.playerwarps.api.warp.Warp;
+import io.myzticbean.finditemaddon.dependencies.PlayerWarpsPlugin;
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import io.myzticbean.finditemaddon.utils.CommonUtils;
+import io.myzticbean.finditemaddon.utils.log.Logger;
+import lombok.experimental.UtilityClass;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.UUID;
+
+/**
+ * @author myzticbean & lukemango
+ */
+@UtilityClass
+public class PlayerWarpsUtil {
+
+    @Nullable
+    public static Warp findNearestWarp(Location shopLocation, UUID shopOwner) {
+        Logger.logDebugInfo("Find nearest warp for shop location " + shopLocation);
+        List<Warp> playersWarps = PlayerWarpsPlugin.getAllWarps().stream()
+                .filter(warp -> warp.getWarpLocation().getWorld() != null)
+                .filter(warp -> warp.getWarpLocation().getWorld().equals(shopLocation.getWorld().getName()))
+                .toList();
+        if(FindItemAddOn.getConfigProvider().ONLY_SHOW_PLAYER_OWNDED_WARPS) {
+            playersWarps = playersWarps.stream()
+                    .filter(warp -> warp.getWarpPlayer().getUUID().equals(shopOwner))
+                    .toList();
+        }
+        if (!playersWarps.isEmpty()) {
+            Map<Double, Warp> warpDistanceMap = new TreeMap<>();
+            playersWarps.forEach(warp ->{
+                        var distance3D = CommonUtils.calculateDistance3D(
+                                shopLocation.getX(),
+                                shopLocation.getY(),
+                                shopLocation.getZ(),
+                                warp.getWarpLocation().getX(),
+                                warp.getWarpLocation().getY(),
+                                warp.getWarpLocation().getZ()
+                        );
+                        warpDistanceMap.put(distance3D, warp);
+                        Logger.logDebugInfo("Warp Distance: " + distance3D + " Warp Name: " + warp.getWarpName() + ", Warp World: " + warp.getWarpLocation().getWorld());
+                    }
+                );
+            for (Map.Entry<Double, Warp> doubleWarpEntry : warpDistanceMap.entrySet()) {
+                Double distance3D = doubleWarpEntry.getKey();
+                Warp warp = doubleWarpEntry.getValue();
+                Logger.logDebugInfo("Warp: " + warp.getWarpName() + " " + warp.isWarpLocked() + " Distance in 3D: " + distance3D);
+                // Is the config set to not tp if player warp is locked, and if so, is the warp locked?
+                // also check distance from shop (should not be too long)
+                if (FindItemAddOn.getConfigProvider().DO_NOT_TP_IF_PLAYER_WARP_LOCKED
+                        && doubleWarpEntry.getValue().isWarpLocked()
+                        && distance3D > 500) {
+                    continue;
+                }
+                return doubleWarpEntry.getValue();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Issue #24 Fix: Extracted method from FoundShopsMenu class
+     * @param player
+     * @param warpName
+     */
+    public static void executeWarpPlayer(Player player, String warpName) {
+        PlayerWarpsAPI.getInstance(api -> {
+            Warp playerWarp = api.getPlayerWarp(warpName, player);
+            if(playerWarp != null) {
+                playerWarp.getWarpLocation().teleportWarp(player, PlayerWarpTeleportEvent.Cause.PLAYER_WARP_MENU);
+            }
+            else {
+                Logger.logError("&e" + player.getName() + " &cis trying to teleport to a PlayerWarp that does not exist!");
+            }
+        });
+    }
+}

src/main/java/io/myzticbean/finditemaddon/utils/warp/ResidenceUtils.java

@@ -0,0 +1,35 @@
+package io.myzticbean.finditemaddon.utils.warp;
+
+import com.bekvon.bukkit.residence.protection.ClaimedResidence;
+import io.myzticbean.finditemaddon.dependencies.ResidencePlugin;
+import io.myzticbean.finditemaddon.FindItemAddOn;
+import lombok.experimental.UtilityClass;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author SengyEU
+ */
+@UtilityClass
+public class ResidenceUtils {
+
+    @Nullable
+    public static ClaimedResidence findNearestResidence(Location shopLocation) {
+        return ResidencePlugin.getResidenceManager().getByLoc(shopLocation);
+    }
+
+    public static String getResidenceName(ClaimedResidence residence){
+        if(!FindItemAddOn.getConfigProvider().USE_RESIDENCE_SUBZONES) {
+            return residence.getParent() == null ? residence.getResidenceName() : residence.getTopParentName();
+        }
+        return residence.getName();
+    }
+
+    public static void residenceTp(Player player, String warpName) {
+        Bukkit.dispatchCommand(player, "residence tp " + warpName);
+    }
+
+}

src/main/java/io/myzticbean/finditemaddon/utils/warp/WGRegionUtils.java

@@ -1,14 +1,39 @@
-package io.myzticbean.finditemaddon.Utils.WarpUtils;
+/**
+ * QSFindItemAddOn: An Minecraft add-on plugin for the QuickShop Hikari
+ * and Reremake Shop plugins for Spigot server platform.
+ * Copyright (C) 2021  myzticbean
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package io.myzticbean.finditemaddon.utils.warp;
 
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import io.myzticbean.finditemaddon.Dependencies.WGPlugin;
+import io.myzticbean.finditemaddon.dependencies.WGPlugin;
 import org.bukkit.Location;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
+/**
+ * @author myzticbean
+ */
 public class WGRegionUtils {
 
     @Nullable