Merge pull request #44 from myzticbean/release/v2.0

release_v2.0.6.3

.github/workflows/maven.yml

@@ -0,0 +1,31 @@
+# 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: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn clean install

.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

@@ -0,0 +1,116 @@
+## 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))
+
+## 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))
+### Bug fixes
+- Fix for issue [#31](https://gitlab.com/ronsane/QSFindItemAddOn/-/issues/31)
+
+## Release 2.0.5.2
+### Plugin updates
+- Updated the addon to make it compatible with the recent QuickShop and other dependency updates.
+
+## Release 2.0.5.1
+### Plugin updates
+- Updated QuickShop-Hikari dependency to v4.0.0.0
+- Updated PlayerWarps dependency to v6.18.1
+- Updated QuickShop-Reremake dependency to v5.1.1.2
+### Bug fixes
+- Fixed issue [#25](https://gitlab.com/ronsane/QSFindItemAddOn/-/issues/25)
+
+## Release 2.0.5.0
+### Bug fixes
+- 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

@@ -14,7 +14,7 @@ But, please don't increase the plugin version number.
 
 **Compiling from source**
 ```shell
-git clone https://gitlab.com/ronsane/QSFindItemAddOn.git
+git clone https://github.com/myzticbean/QSFindItemAddOn.git
 cd QSFindItemAddOn/
 mvn clean install
 ```

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.1-RELEASE
+### Version: 2.0.6.3-RELEASE
 
-An unofficial add-on for the QuickShop Reremake and Hikari spigot plugin.
+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.19.3-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
@@ -23,7 +25,7 @@ Adds a `/finditem` command in game for searching through all the shops on the se
 
 
 **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,30 +45,43 @@ 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)
 
->Check out the sample config.yml [here](https://gitlab.com/ronsane/QSFindItemAddOn/-/wikis/config.yml-%5BFor-QuickShopAddOn-v2.*%5D).
+>Check out the sample config.yml [here](https://github.com/myzticbean/QSFindItemAddOn/wiki/Sample-config.yml).
 
 ## Requires
-- [QuickShop Reremake](https://www.spigotmc.org/resources/62575/) 5.0 or higher (Use add-on v1.7 for QuickShop version 4.0.*)
+- [QuickShop-Hikari](https://www.spigotmc.org/resources/100125/) v6.0 or higher
 
-OR
+**OR**
 
-- [QuickShop-Hikari](https://www.spigotmc.org/resources/100125/) v4.0.0.0 or higher
+- [QuickShop Reremake](https://www.spigotmc.org/resources/62575/) 5.1 or higher (Use add-on v1.7 for QuickShop version 4.0.*)
 
 ## Assumptions
 - A compatible economy plugin is installed
 - [Vault](https://www.spigotmc.org/resources/34315/) 1.7.3 or higher is installed
 
 ## Issue Tracking
-Please create a new issue [here](https://gitlab.com/ronsane/QSFindItemAddOn/-/issues) if you encounter any errors. Please try to explain in detail about your issue, and attach your console log if possible.
+Please create a new issue [here](https://github.com/myzticbean/QSFindItemAddOn/issues) if you encounter any errors. Please try to explain in detail about your issue, and attach your console log if possible.
 You can also find the list of features currently being worked on (if any) in the same link.
 
 ## How to contribute?
-See more details [here](../../../CONTRIBUTING.md).
+See more details [here](https://github.com/myzticbean/QSFindItemAddOn/blob/master/CONTRIBUTING.md).
 
 ## 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

@@ -6,14 +6,15 @@
 
     <groupId>io.myzticbean.FindItemAddOn</groupId>
     <artifactId>QSFindItemAddOn</artifactId>
-    <version>2.0.5.1-RELEASE</version>
+    <version>2.0.6.3-RELEASE</version>
     <packaging>jar</packaging>
 
     <name>QSFindItemAddOn</name>
 
     <properties>
-        <java.version>16</java.version>
+        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spigot.version>1.20.6-R0.1-SNAPSHOT</spigot.version>
     </properties>
 
     <build>
@@ -49,9 +50,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:\${user.name}\MCServers\MCServer_1.20.1\plugins</outputDirectory>-->
                     <!-- Comment out if on a PC -->
-                    <!-- <outputDirectory>/Users/${user.name}/IdeaProjects/MCServer_1.18/plugins</outputDirectory> -->
+                    <!--<outputDirectory>/Users/${user.name}/IdeaProjects/MCServer_1.20.1/plugins</outputDirectory>-->
                 </configuration>
             </plugin>
             <plugin>
@@ -91,6 +92,10 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
         <repository>
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
@@ -124,8 +129,8 @@
             <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>
     </repositories>
 
@@ -133,7 +138,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.19.3-R0.1-SNAPSHOT</version>
+            <version>${spigot.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -145,7 +150,7 @@
         <dependency>
             <groupId>org.maxgamer</groupId>
             <artifactId>QuickShop</artifactId>
-            <version>5.1.1.2</version>
+            <version>5.1.2.5</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -154,10 +159,46 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.ghostchu</groupId>
+            <artifactId>quickshop-api</artifactId>
+            <version>6.2.0.5</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains</groupId>
+                    <artifactId>annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.kyori</groupId>
+                    <artifactId>adventure-platform-bukkit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.github.juliomarcopineda</groupId>
+                    <artifactId>jdbc-stream</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>one.util</groupId>
+                    <artifactId>streamex</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>tne.tne</groupId>
+                    <artifactId>TheNewEconomy</artifactId>
+                </exclusion>
+                <exclusion>
+                    <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>4.0.0.0</version>
+            <version>6.2.0.5</version>
             <scope>provided</scope>
             <classifier>shaded</classifier>
             <exclusions>
@@ -185,12 +226,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>2.20.1</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -202,7 +247,7 @@
         <dependency>
             <groupId>com.olziedev</groupId>
             <artifactId>playerwarps-api</artifactId>
-            <version>6.18.1</version>
+            <version>6.30.0</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -274,12 +319,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>
@@ -290,13 +335,13 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</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.5.5</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -307,12 +352,25 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.14.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.12.0</version>
+            <version>4.16.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>cc.carm.lib</groupId>
+            <artifactId>easysql-api</artifactId>
+            <version>0.4.7</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

src/main/doc/README.md

@@ -1,11 +1,13 @@
 # Shop Search AddOn For QuickShop
 ### Version: ${project.version}
 
-An unofficial add-on for the QuickShop Reremake and Hikari spigot plugin.
+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.19.3-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
@@ -23,7 +25,7 @@ Adds a `/finditem` command in game for searching through all the shops on the se
 
 
 **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,30 +45,43 @@ 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)
 
->Check out the sample config.yml [here](https://gitlab.com/ronsane/QSFindItemAddOn/-/wikis/config.yml-%5BFor-QuickShopAddOn-v2.*%5D).
+>Check out the sample config.yml [here](https://github.com/myzticbean/QSFindItemAddOn/wiki/Sample-config.yml).
 
 ## Requires
-- [QuickShop Reremake](https://www.spigotmc.org/resources/62575/) 5.0 or higher (Use add-on v1.7 for QuickShop version 4.0.*)
+- [QuickShop-Hikari](https://www.spigotmc.org/resources/100125/) v6.0 or higher
 
-OR
+**OR**
 
-- [QuickShop-Hikari](https://www.spigotmc.org/resources/100125/) v4.0.0.0 or higher
+- [QuickShop Reremake](https://www.spigotmc.org/resources/62575/) 5.1 or higher (Use add-on v1.7 for QuickShop version 4.0.*)
 
 ## Assumptions
 - A compatible economy plugin is installed
 - [Vault](https://www.spigotmc.org/resources/34315/) 1.7.3 or higher is installed
 
 ## Issue Tracking
-Please create a new issue [here](https://gitlab.com/ronsane/QSFindItemAddOn/-/issues) if you encounter any errors. Please try to explain in detail about your issue, and attach your console log if possible.
+Please create a new issue [here](https://github.com/myzticbean/QSFindItemAddOn/issues) if you encounter any errors. Please try to explain in detail about your issue, and attach your console log if possible.
 You can also find the list of features currently being worked on (if any) in the same link.
 
 ## How to contribute?
-See more details [here](../../../CONTRIBUTING.md).
+See more details [here](https://github.com/myzticbean/QSFindItemAddOn/blob/master/CONTRIBUTING.md).
 
 ## 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,9 +1,27 @@
+/**
+ * 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.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 io.myzticbean.finditemaddon.Utils.Defaults.PlayerPermsEnum;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Material;
@@ -15,7 +33,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @author ronsane
+ * @author myzticbean
  */
 public class FindItemCmdHikariImpl implements CommandHandler<Player> {
 
@@ -26,6 +44,9 @@ public class FindItemCmdHikariImpl implements CommandHandler<Player> {
     private final List<String> buyOrSellList = new ArrayList<>();
 
     public FindItemCmdHikariImpl() {
+        if(FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
+
+        }
         if(StringUtils.isBlank(FindItemAddOn.getConfigProvider().FIND_ITEM_HIDESHOP_AUTOCOMPLETE)) {
             this.hideSubCommand = "hideshop";
         }
@@ -50,7 +71,7 @@ public class FindItemCmdHikariImpl 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)) {
@@ -91,7 +112,7 @@ public class FindItemCmdHikariImpl 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/QSSubCommands/FindItemCmdReremakeImpl.java

@@ -1,8 +1,26 @@
+/**
+ * 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.QSSubCommands;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
 import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
-import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPerms;
+import io.myzticbean.finditemaddon.Utils.Defaults.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/SAPICommands/BuySubCmd.java

@@ -1,3 +1,21 @@
+/**
+ * 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.SAPICommands;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -14,7 +32,7 @@ import java.util.List;
 
 /**
  * Sub Command Handler for /finditem TO_BUY
- * @author ronsane
+ * @author myzticbean
  */
 public class BuySubCmd extends SubCommand {
 

src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/HideShopSubCmd.java

@@ -1,3 +1,21 @@
+/**
+ * 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.SAPICommands;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -11,7 +29,7 @@ import java.util.List;
 
 /**
  * Sub Command Handler for /finditem hideshop
- * @author ronsane
+ * @author myzticbean
  */
 public class HideShopSubCmd extends SubCommand {
 

src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/ReloadSubCmd.java

@@ -1,3 +1,21 @@
+/**
+ * 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.SAPICommands;
 
 import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
@@ -9,7 +27,7 @@ import java.util.List;
 
 /**
  * Sub Command Handler for /finditemadmin reload
- * @author ronsane
+ * @author myzticbean
  */
 public class ReloadSubCmd extends SubCommand {
 

src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/RestartSubCmd.java

@@ -1,3 +1,21 @@
+/**
+ * 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.SAPICommands;
 
 import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
@@ -10,7 +28,7 @@ import java.util.List;
 /**
  * Sub Command Handler for /finditem restart
  * @deprecated No longer used, will be removed in future versions
- * @author ronsane
+ * @author myzticbean
  */
 @Deprecated
 public class RestartSubCmd extends SubCommand {

src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/RevealShopSubCmd.java

@@ -1,3 +1,21 @@
+/**
+ * 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.SAPICommands;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -11,7 +29,7 @@ import java.util.List;
 
 /**
  * Sub Command Handler for /finditemadmin revealshop
- * @author ronsane
+ * @author myzticbean
  */
 public class RevealShopSubCmd extends SubCommand {
 

src/main/java/io/myzticbean/finditemaddon/Commands/SAPICommands/SellSubCmd.java

@@ -1,3 +1,21 @@
+/**
+ * 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.SAPICommands;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -14,7 +32,7 @@ import java.util.List;
 
 /**
  * Sub Command Handler for /finditem TO_SELL
- * @author ronsane
+ * @author myzticbean
  */
 public class SellSubCmd extends SubCommand {
 

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

@@ -1,3 +1,21 @@
+/**
+ * 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.ConfigUtil;
 
 import io.myzticbean.finditemaddon.Utils.LoggerUtils;
@@ -8,36 +26,53 @@ 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 SHOP_GUI = "shop-gui.";
+    private static final String SHOP_GUI_NAVIGATION = "shop-navigation.";
+    private static final String SHOP_GUI_CMD = "custom-model-data.";
     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 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 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 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 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");
@@ -49,7 +84,33 @@ public class ConfigProvider {
     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 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 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_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");
     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");

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

@@ -1,3 +1,21 @@
+/**
+ * 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.ConfigUtil;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -10,12 +28,15 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public class ConfigSetup {
 
     private static File configFile;
     private static File sampleConfigFile;
     private static FileConfiguration configFileConfiguration;
-    private static final int CURRENT_CONFIG_VERSION = 11;
+    private static final int CURRENT_CONFIG_VERSION = 16;
 
     public static void setupConfig() {
         configFile = new File(FindItemAddOn.getInstance().getDataFolder(), "config.yml");
@@ -114,6 +135,7 @@ public class ConfigSetup {
             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");
@@ -171,11 +193,109 @@ public class ConfigSetup {
                 // Add option to configure player visit cooldown
                 configFileConfiguration.set("shop-player-visit-cooldown-in-minutes", 5);
             }
-            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);
+            // 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);
+            }
+
+            // 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);
         }
     }
 
@@ -191,20 +311,6 @@ public class ConfigSetup {
      * Added in 2.0
      */
     public static void copySampleConfig() {
-
         FindItemAddOn.getInstance().saveResource("sample-config.yml", true);
-
-//        sampleConfigFile = new File(FindItemAddOn.getInstance().getDataFolder(), "sample-config.yml");
-//        if(!sampleConfigFile.exists()) {
-//            try {
-//                boolean isConfigGenerated = sampleConfigFile.createNewFile();
-//                if(isConfigGenerated) {
-//                    LoggerUtils.logInfo("Generated a new config.yml");
-//                }
-//            }
-//            catch (IOException e) {
-//                LoggerUtils.logError("Error generating config.yml");
-//            }
-//        }
     }
 }

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

@@ -1,3 +1,21 @@
+/**
+ * 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;
@@ -11,7 +29,7 @@ import java.util.List;
 
 /**
  * Hook for EssentialsX Plugin
- * @author ronsane
+ * @author myzticbean
  */
 public class EssentialsXPlugin {
 
@@ -38,7 +56,7 @@ public class EssentialsXPlugin {
     public static List<EssentialWarpModel> getAllWarps() { return allWarpsList; }
 
     public static void updateAllWarps() {
-        LoggerUtils.logInfo("Updating Essentials warps list...");
+        long start = System.currentTimeMillis();
         if(essAPI.isEnabled()) {
             Collection<String> allWarps = EssentialsXPlugin.getAPI().getWarps().getList();
             allWarpsList = new ArrayList<>();
@@ -51,7 +69,7 @@ public class EssentialsXPlugin {
                 } catch (Exception ignored) { }
             });
         }
-        LoggerUtils.logInfo("Update complete! Found " + getAllWarps().size() + " warps.");
+        LoggerUtils.logDebugInfo("Update complete for Essentials warps list! Found " + getAllWarps().size() + " warps. Time took: " + (System.currentTimeMillis() - start) + "ms.");
     }
 
 }

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

@@ -1,3 +1,21 @@
+/**
+ * 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;
@@ -6,6 +24,9 @@ package io.myzticbean.finditemaddon.Dependencies;
 //import me.tks.playerwarp.WarpList;
 //import org.bukkit.Bukkit;
 
+/**
+ * @author myzticbean
+ */
 public class PWarpPlugin {
 
 //    private static PWarp pWarp = null;

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

@@ -1,14 +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.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.Defaults.NearestWarpModeEnum;
 import io.myzticbean.finditemaddon.Utils.LoggerUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public class PlayerWarpsPlugin {
 
     private static boolean isEnabled = false;
@@ -48,18 +71,18 @@ public class PlayerWarpsPlugin {
 
     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.");
+                LoggerUtils.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) {
+        if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == NearestWarpModeEnum.PLAYER_WARPS.value()) {
             LoggerUtils.logDebugInfo("'nearest-warp-mode' found set to 2");
             if (getIsEnabled()) {
                 LoggerUtils.logDebugInfo("PlayerWarps plugin is enabled");
@@ -109,13 +132,20 @@ public class PlayerWarpsPlugin {
      */
     public static void executeWarpPlayer(Player player, String warpName) {
         PlayerWarpsAPI.getInstance(api -> {
-            Warp playerWarp = api.getPlayerWarp(warpName);
+            Warp playerWarp = api.getPlayerWarp(warpName, player);
             if(playerWarp != null) {
-                playerWarp.getWarpLocation().teleportWarp(player);
+                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/WGPlugin.java

@@ -1,3 +1,21 @@
+/**
+ * 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;
@@ -5,6 +23,9 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import io.myzticbean.finditemaddon.Utils.LoggerUtils;
 import org.bukkit.Bukkit;
 
+/**
+ * @author myzticbean
+ */
 public class WGPlugin {
 
     private static boolean isPluginEnabled;

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

@@ -1,19 +1,46 @@
+/**
+ * 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.Commands.SAPICommands.BuySubCmd;
+import io.myzticbean.finditemaddon.Commands.SAPICommands.HideShopSubCmd;
+import io.myzticbean.finditemaddon.Commands.SAPICommands.ReloadSubCmd;
+import io.myzticbean.finditemaddon.Commands.SAPICommands.RevealShopSubCmd;
+import io.myzticbean.finditemaddon.Commands.SAPICommands.SellSubCmd;
 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.Listeners.MenuListener;
+import io.myzticbean.finditemaddon.Listeners.PWPlayerWarpCreateEventListener;
+import io.myzticbean.finditemaddon.Listeners.PWPlayerWarpRemoveEventListener;
+import io.myzticbean.finditemaddon.Listeners.PlayerCommandSendEventListener;
+import io.myzticbean.finditemaddon.Listeners.PlayerJoinEventListener;
+import io.myzticbean.finditemaddon.Listeners.PluginEnableEventListener;
 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.Defaults.PlayerPermsEnum;
 import io.myzticbean.finditemaddon.Utils.JsonStorageUtils.ShopSearchActivityStorageUtil;
 import io.myzticbean.finditemaddon.Utils.LoggerUtils;
 import io.myzticbean.finditemaddon.Utils.UpdateChecker;
@@ -26,19 +53,32 @@ 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
+ */
 public final class FindItemAddOn extends JavaPlugin {
 
+    // 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 plugin;
     public FindItemAddOn() { plugin = this; }
     public static Plugin getInstance() { return plugin; }
     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 int REPEATING_TASK_SCHEDULE_MINS = 15*60*20;
     private static ConfigProvider configProvider;
     private static boolean isPluginOutdated = false;
     private static boolean qSReremakeInstalled = false;
@@ -49,19 +89,32 @@ public final class FindItemAddOn extends JavaPlugin {
 
     @Override
     public void onLoad() {
-        LoggerUtils.logInfo("A Shop Search AddOn for QuickShop developed by ronsane");
+        LoggerUtils.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://gitlab.com/ronsane/QSFindItemAddOn/-/issues");
+            LoggerUtils.logWarning("If you find any bugs, please report them here: https://github.com/myzticbean/QSFindItemAddOn/issues");
         }
-
-
     }
     @Override
     public void onEnable() {
 
+        if(ENABLE_TRIAL_PERIOD) {
+            LoggerUtils.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) {
+                LoggerUtils.logError("Your trial has expired! Please contact the developer.");
+                getServer().getPluginManager().disablePlugin(this);
+                return;
+            } else {
+                LoggerUtils.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");
@@ -98,43 +151,23 @@ 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) {
+            LoggerUtils.logError("Uh oh! Looks like either this plugin has crashed or you don't have QuickShop-Hikari or QuickShop-Reremake installed.");
         }
         LoggerUtils.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);
 
         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("Both QuickShop-Hikari and QuickShop-Reremake 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");
+            LoggerUtils.logError("» QuickShop-Reremake (Support ending soon): https://www.spigotmc.org/resources/62575");
             getServer().getPluginManager().disablePlugin(this);
             return;
         }
@@ -151,7 +184,7 @@ 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();
 
         PlayerWarpsPlugin.setup();
@@ -243,6 +276,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 +304,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);
+                    subCommands);
             LoggerUtils.logInfo("Registered /finditem command");
         } catch (NoSuchFieldException | IllegalAccessException e) {
-            LoggerUtils.logError(e.getMessage());
-            e.printStackTrace();
+            LoggerUtils.logError(e);
         }
     }
 
@@ -288,8 +326,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,9 +339,7 @@ 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(""));
                         }
                     },
@@ -311,8 +347,7 @@ public final class FindItemAddOn extends JavaPlugin {
                     ReloadSubCmd.class);
             LoggerUtils.logInfo("Registered /finditemadmin command");
         } catch (NoSuchFieldException | IllegalAccessException e) {
-            LoggerUtils.logError(e.getMessage());
-            e.printStackTrace();
+            LoggerUtils.logError(e);
         }
     }
 

src/main/java/io/myzticbean/finditemaddon/Handlers/CommandHandler/CmdExecutorHandler.java

@@ -1,10 +1,28 @@
+/**
+ * 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.CommandHandler;
 
 import io.myzticbean.finditemaddon.ConfigUtil.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.Defaults.PlayerPermsEnum;
 import io.myzticbean.finditemaddon.Utils.JsonStorageUtils.HiddenShopStorageUtil;
 import io.myzticbean.finditemaddon.Utils.LoggerUtils;
 import io.myzticbean.finditemaddon.Utils.WarpUtils.WarpUtils;
@@ -22,10 +40,12 @@ import java.util.List;
 
 /**
  * Handler for different parameters of /finditem command
- * @author ronsane
+ * @author myzticbean
  */
 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";
+
     /**
      * Handles the main shop search process
      * @param buySellSubCommand Whether player is buying or selling
@@ -33,17 +53,19 @@ 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)) {
+            LoggerUtils.logInfo(THIS_COMMAND_CAN_ONLY_BE_RUN_FROM_IN_GAME);
         }
         else {
-            Player player = (Player) commandSender;
-            if(player.hasPermission(PlayerPerms.FINDITEM_USE.value())) {
+            if(player.hasPermission(PlayerPermsEnum.FINDITEM_USE.value())) {
+
+                // 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, " ")) {
@@ -53,27 +75,27 @@ public class CmdExecutorHandler {
                     isBuying = buySellSubCommand.equalsIgnoreCase(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_BUY_AUTOCOMPLETE);
                 }
 
-                if(itemArg.equalsIgnoreCase("*")) {
-                    List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().fetchAllItemsFromAllShops(isBuying, player);
-                    if(searchResultList.size() > 0) {
+                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()) {
+                        LoggerUtils.logDebugInfo("Should run in async thread...");
                         Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
-                            FoundShopsMenu menu = new FoundShopsMenu(FindItemAddOn.getPlayerMenuUtility(player), searchResultList);
-                            Bukkit.getScheduler().runTask(FindItemAddOn.getInstance(), () -> menu.open(searchResultList));
+                            List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().fetchAllItemsFromAllShops(isBuying, player);
+                            if(!searchResultList.isEmpty()) {
+                                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 {
-                        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) {
+                    } else {
+                        // Else run in MAIN thread
+                        List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().fetchAllItemsFromAllShops(isBuying, player);
+                        if(!searchResultList.isEmpty()) {
                             Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
                                 FoundShopsMenu menu = new FoundShopsMenu(FindItemAddOn.getPlayerMenuUtility(player), searchResultList);
                                 Bukkit.getScheduler().runTask(FindItemAddOn.getInstance(), () -> menu.open(searchResultList));
@@ -86,20 +108,74 @@ public class CmdExecutorHandler {
                             }
                         }
                     }
+                }
+                else {
+                    Material mat = Material.getMaterial(itemArg.toUpperCase());
+                    if(mat != null) {
+                        LoggerUtils.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()) {
+                            Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
+                                List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().findItemBasedOnTypeFromAllShops(new ItemStack(mat), isBuying, player);
+                                if(!searchResultList.isEmpty()) {
+                                    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 {
+                            List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().findItemBasedOnTypeFromAllShops(new ItemStack(mat), isBuying, player);
+                            if(!searchResultList.isEmpty()) {
+                                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) {
+                        // 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()) {
                             Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
-                                FoundShopsMenu menu = new FoundShopsMenu(FindItemAddOn.getPlayerMenuUtility(player), searchResultList);
-                                Bukkit.getScheduler().runTask(FindItemAddOn.getInstance(), () -> menu.open(searchResultList));
+                                List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().findItemBasedOnDisplayNameFromAllShops(itemArg, isBuying, player);
+                                if(!searchResultList.isEmpty()) {
+                                    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));
+                                    }
+                                }
                             });
-                        }
-                        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));
+                        } else {
+                            List<FoundShopItemModel> searchResultList = FindItemAddOn.getQsApiInstance().findItemBasedOnDisplayNameFromAllShops(itemArg, isBuying, player);
+                            if(!searchResultList.isEmpty()) {
+                                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));
+                                }
                             }
                         }
                     }
@@ -118,12 +194,13 @@ public class CmdExecutorHandler {
      */
     public void handleHideShop(CommandSender commandSender) {
         if (!(commandSender instanceof Player)) {
-            LoggerUtils.logInfo("This command can only be run from in game");
+            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(player.hasPermission(PlayerPermsEnum.FINDITEM_HIDESHOP.value())) {
+                Block playerLookAtBlock = player.getTargetBlock(null, 3);
+                LoggerUtils.logDebugInfo("TargetBlock found: " + playerLookAtBlock.getType());
                 if(FindItemAddOn.isQSReremakeInstalled()) {
                     hideShop((Shop) FindItemAddOn.getQsApiInstance().findShopAtLocation(playerLookAtBlock), player);
                 }
@@ -143,17 +220,22 @@ public class CmdExecutorHandler {
      */
     public void handleRevealShop(CommandSender commandSender) {
         if (!(commandSender instanceof Player)) {
-            LoggerUtils.logInfo("This command can only be run from in game");
+            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(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) {
+                    LoggerUtils.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 {
+                    LoggerUtils.logDebugInfo("TargetBlock is null!");
                 }
             }
             else {
@@ -237,7 +319,7 @@ public class CmdExecutorHandler {
         }
         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();
@@ -262,9 +344,11 @@ public class CmdExecutorHandler {
     }
 
     /**
+     * @deprecated
      * Handles plugin restart
      * @param commandSender Who is the command sender: console or player
      */
+    @Deprecated(forRemoval = true)
     public void handlePluginRestart(CommandSender commandSender) {
         if (!(commandSender instanceof Player)) {
             Bukkit.getPluginManager().disablePlugin(FindItemAddOn.getInstance());
@@ -280,7 +364,7 @@ public class CmdExecutorHandler {
         }
         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!"));
@@ -306,7 +390,7 @@ public class CmdExecutorHandler {
      * @param shop
      * @param player
      */
-    private void hideShop(Shop shop, Player player) {
+    private void hideShop(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)) {

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

@@ -1,3 +1,21 @@
+/**
+ * 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.GUIHandler;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -13,8 +31,11 @@ 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
+/**
+ * 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
+ */
 public abstract class Menu implements InventoryHolder {
 
     protected Inventory inventory;
@@ -23,7 +44,7 @@ public abstract class Menu implements InventoryHolder {
 
     protected ItemStack GUI_FILLER_ITEM;
 
-    public Menu(PlayerMenuUtility playerMenuUtility) {
+    protected Menu(PlayerMenuUtility playerMenuUtility) {
         this.playerMenuUtility = playerMenuUtility;
 
         assert FindItemAddOn.getConfigProvider().SHOP_GUI_FILLER_ITEM != null;

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

@@ -1,3 +1,21 @@
+/**
+ * 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.GUIHandler.Menus;
 
 import io.myzticbean.finditemaddon.Dependencies.EssentialsXPlugin;
@@ -7,8 +25,9 @@ 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.Defaults.NearestWarpModeEnum;
+import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPermsEnum;
+import io.myzticbean.finditemaddon.Utils.Defaults.ShopLorePlaceholdersEnum;
 import io.myzticbean.finditemaddon.Utils.JsonStorageUtils.ShopSearchActivityStorageUtil;
 import io.myzticbean.finditemaddon.Utils.LocationUtils;
 import io.myzticbean.finditemaddon.Utils.LoggerUtils;
@@ -18,7 +37,12 @@ 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.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;
@@ -30,15 +54,19 @@ 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 ronsane
+ * @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 static final String SHOP_STOCK_UNLIMITED = "Unlimited";
+    public static final String SHOP_STOCK_UNKNOWN = "Unknown";
+    private static final String NO_WARP_NEAR_SHOP_ERROR_MSG = "No warp near this shop";
+    private static final String NO_WG_REGION_NEAR_SHOP_ERROR_MSG = "No WG Region near this shop";
+    private static final String NAMEDSPACE_KEY_LOCATION_DATA = "locationData";
 
     public FoundShopsMenu(PlayerMenuUtility playerMenuUtility, List<FoundShopItemModel> searchResult) {
         super(playerMenuUtility, searchResult);
@@ -61,32 +89,24 @@ public class FoundShopsMenu extends PaginatedMenu {
 
     @Override
     public void handleMenu(InventoryClickEvent event) {
+        // Previous Page
         if(event.getSlot() == 45) {
-            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());
-            }
+            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) {
-            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));
-                }
-            }
+            handleMenuClickForNavToNextPage(event);
         }
-        else if(event.getCurrentItem().getType().equals(Material.BARRIER) && event.getSlot() == 49) {
+        // 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)) {
@@ -97,76 +117,163 @@ public class FoundShopsMenu extends PaginatedMenu {
             Player player = (Player) event.getWhoClicked();
             ItemStack item = event.getCurrentItem();
             ItemMeta meta = item.getItemMeta();
-            NamespacedKey key = new NamespacedKey(FindItemAddOn.getInstance(), "locationData");
+            NamespacedKey key = new NamespacedKey(FindItemAddOn.getInstance(), NAMEDSPACE_KEY_LOCATION_DATA);
             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())) {
+                    if(playerMenuUtility.getOwner().hasPermission(PlayerPermsEnum.FINDITEM_SHOPTP.value())) {
                         World world = Bukkit.getWorld(locDataList.get(0));
-                        int locX = Integer.parseInt(locDataList.get(1)), locY = Integer.parseInt(locDataList.get(2)), locZ = Integer.parseInt(locDataList.get(3));
+                        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) && !PlayerPermsEnum.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));
+                            // TODO: 16/06/22 Make this an option in config -> player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 10, 0, false, false, false));
 
-                            // Teleport
                             // If EssentialsX is enabled, register last location before teleporting to make /back work
                             if(EssentialsXPlugin.isEnabled()) {
                                 EssentialsXPlugin.getAPI().getUser(player).setLastLocation();
                             }
-                            PaperLib.teleportAsync(player, locToTeleport, PlayerTeleportEvent.TeleportCause.PLUGIN);
+                            // Check for TP delay
+                            if(StringUtils.isNumeric(FindItemAddOn.getConfigProvider().TP_DELAY_IN_SECONDS)
+                                && !"0".equals(FindItemAddOn.getConfigProvider().TP_DELAY_IN_SECONDS)
+                                && !PlayerPermsEnum.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));
+                                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));
+                            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) {
+                else if(FindItemAddOn.getConfigProvider().TP_PLAYER_TO_NEAREST_WARP
                     // if list size = 1, it contains Warp name
-                    if(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);
-                        }
+                    && 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() {}
+    public void setMenuItems() {
+        // Just overriding
+    }
 
     /**
      * Sets the slots in the search result GUI
@@ -176,68 +283,74 @@ public class FoundShopsMenu extends PaginatedMenu {
     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;
-
+            int maxItemsPerPage = super.maxItemsPerPage;
+            for(int guiSlotCounter = 0; guiSlotCounter < maxItemsPerPage; guiSlotCounter++) {
+                index = 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());
+                    FoundShopItemModel foundShopIter = foundShops.get(index);
+                    NamespacedKey key = new NamespacedKey(FindItemAddOn.getInstance(), NAMEDSPACE_KEY_LOCATION_DATA);
+                    ItemStack item = new ItemStack(foundShopIter.getItem().getType());
+
+                    // Issue #37: Added item stack size
+                    item.setAmount(foundShopIter.getItem().getAmount());
+
                     ItemMeta meta = item.getItemMeta();
-                    List<String> lore;
-                    lore = new ArrayList<>();
+                    List<String> 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()) {
+                    // set shop item's lore first
+                    if(foundShopIter.getItem().hasItemMeta()) {
+                        meta = foundShopIter.getItem().getItemMeta();
+                        if(meta.hasLore()) {
+                            for(String s : meta.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) {
+                    // now set the search related lore
+                    int nearestWarpMode = FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE;
+                    for(String shopItemLoreIter : shopItemLore) {
+                        if(shopItemLoreIter.contains(ShopLorePlaceholdersEnum.NEAREST_WARP.value())) {
+                            switch(nearestWarpMode) {
                                 case 1:
                                     // EssentialWarp: Check nearest warp
                                     if(EssentialsXPlugin.isEnabled()) {
-                                        nearestEWarp = new EssentialWarpsUtil().findNearestWarp(foundShop_i.getShopLocation());
+                                        nearestEWarp = new EssentialWarpsUtil().findNearestWarp(foundShopIter.getShopLocation());
                                         if(nearestEWarp != null && !StringUtils.isEmpty(nearestEWarp)) {
-                                            lore.add(ColorTranslator.translateColorCodes(shopItemLore_i.replace(ShopLorePlaceholders.NEAREST_WARP.value(), nearestEWarp)));
+                                            lore.add(ColorTranslator.translateColorCodes(shopItemLoreIter.replace(ShopLorePlaceholdersEnum.NEAREST_WARP.value(), nearestEWarp)));
                                         }
                                         else {
-                                            lore.add(ColorTranslator.translateColorCodes(shopItemLore_i.replace(ShopLorePlaceholders.NEAREST_WARP.value(), NO_WARP_NEAR_SHOP_ERROR_MSG)));
+                                            lore.add(ColorTranslator.translateColorCodes(shopItemLoreIter.replace(ShopLorePlaceholdersEnum.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());
+                                        nearestPlayerWarp = new PlayerWarpsUtil().findNearestWarp(foundShopIter.getShopLocation(), foundShopIter.getShopOwner());
                                         if(nearestPlayerWarp != null) {
-                                            lore.add(ColorTranslator.translateColorCodes(shopItemLore_i.replace(ShopLorePlaceholders.NEAREST_WARP.value(), nearestPlayerWarp.getWarpName())));
+                                            lore.add(ColorTranslator.translateColorCodes(shopItemLoreIter.replace(ShopLorePlaceholdersEnum.NEAREST_WARP.value(), nearestPlayerWarp.getWarpName())));
                                         }
                                         else {
-                                            lore.add(ColorTranslator.translateColorCodes(shopItemLore_i.replace(ShopLorePlaceholders.NEAREST_WARP.value(), NO_WARP_NEAR_SHOP_ERROR_MSG)));
+                                            lore.add(ColorTranslator.translateColorCodes(shopItemLoreIter.replace(ShopLorePlaceholdersEnum.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()));
+                                        String nearestWGRegion = new WGRegionUtils().findNearestWGRegion((foundShopIter.getShopLocation()));
                                         if(nearestWGRegion != null && !StringUtils.isEmpty(nearestWGRegion)) {
-                                            lore.add(ColorTranslator.translateColorCodes(shopItemLore_i.replace(ShopLorePlaceholders.NEAREST_WARP.value(), nearestWGRegion)));
+                                            lore.add(ColorTranslator.translateColorCodes(shopItemLoreIter.replace(ShopLorePlaceholdersEnum.NEAREST_WARP.value(), nearestWGRegion)));
                                         }
                                         else {
-                                            lore.add(ColorTranslator.translateColorCodes(shopItemLore_i.replace(ShopLorePlaceholders.NEAREST_WARP.value(), NO_WG_REGION_NEAR_SHOP_ERROR_MSG)));
+                                            lore.add(ColorTranslator.translateColorCodes(shopItemLoreIter.replace(ShopLorePlaceholdersEnum.NEAREST_WARP.value(), NO_WG_REGION_NEAR_SHOP_ERROR_MSG)));
                                         }
                                     }
                                     break;
@@ -246,12 +359,12 @@ public class FoundShopsMenu extends PaginatedMenu {
                             }
                         }
                         else {
-                            lore.add(ColorTranslator.translateColorCodes(replaceLorePlaceholders(shopItemLore_i, foundShop_i)));
+                            lore.add(ColorTranslator.translateColorCodes(replaceLorePlaceholders(shopItemLoreIter, foundShopIter)));
                         }
                     }
 
                     if(FindItemAddOn.getConfigProvider().TP_PLAYER_DIRECTLY_TO_SHOP) {
-                        if(playerMenuUtility.getOwner().hasPermission(PlayerPerms.FINDITEM_SHOPTP.value())) {
+                        if(playerMenuUtility.getOwner().hasPermission(PlayerPermsEnum.FINDITEM_SHOPTP.value())) {
                             lore.add(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().CLICK_TO_TELEPORT_MSG));
                         }
                     }
@@ -262,35 +375,32 @@ public class FoundShopsMenu extends PaginatedMenu {
                     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();
+                        locData = Objects.requireNonNull(foundShopIter.getShopLocation().getWorld()).getName() + ","
+                                + foundShopIter.getShopLocation().getBlockX() + ","
+                                + foundShopIter.getShopLocation().getBlockY() + ","
+                                + foundShopIter.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(nearestWarpMode == NearestWarpModeEnum.ESSENTIAL_WARPS.value()) {
                             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();
-                            }
+                        else if(nearestWarpMode == NearestWarpModeEnum.PLAYER_WARPS.value() && 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());
+                    if(Objects.requireNonNull(foundShopIter.getItem().getItemMeta()).hasCustomModelData()) {
+                        meta.setCustomModelData(foundShopIter.getItem().getItemMeta().getCustomModelData());
                     }
                     item.setItemMeta(meta);
                     inventory.addItem(item);
                 }
-                guiSlotCounter++;
             }
         }
     }
@@ -303,40 +413,78 @@ public class FoundShopsMenu extends PaginatedMenu {
      */
     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(ShopLorePlaceholdersEnum.ITEM_PRICE.value())) {
+            text = text.replace(ShopLorePlaceholdersEnum.ITEM_PRICE.value(), formatNumber(shop.getShopPrice()));
         }
-        if(text.contains(ShopLorePlaceholders.SHOP_STOCK.value())) {
-            if(shop.getRemainingStockOrSpace() == -1) {
-                text = text.replace(ShopLorePlaceholders.SHOP_STOCK.value(), "Unlimited");
-            }
-            else {
-                text = text.replace(ShopLorePlaceholders.SHOP_STOCK.value(), String.valueOf(shop.getRemainingStockOrSpace()));
+        if(text.contains(ShopLorePlaceholdersEnum.SHOP_STOCK.value())) {
+            if(shop.getRemainingStockOrSpace() == -2) {
+                // if -2 (cache doesn't have value) -> try to fetch from MAIN thread
+                int stockOrSpace = processUnknownStockSpace(shop);
+                if(stockOrSpace == -2) {
+                    text = text.replace(ShopLorePlaceholdersEnum.SHOP_STOCK.value(), SHOP_STOCK_UNKNOWN);
+                }
+                else {
+                    text = text.replace(ShopLorePlaceholdersEnum.SHOP_STOCK.value(),
+                            (stockOrSpace == -1 ? SHOP_STOCK_UNLIMITED : String.valueOf(stockOrSpace)));
+                }
+            } else if(shop.getRemainingStockOrSpace() == Integer.MAX_VALUE) {
+                text = text.replace(ShopLorePlaceholdersEnum.SHOP_STOCK.value(), SHOP_STOCK_UNLIMITED);
+            } else {
+                text = text.replace(ShopLorePlaceholdersEnum.SHOP_STOCK.value(), String.valueOf(shop.getRemainingStockOrSpace()));
             }
         }
-        if(text.contains(ShopLorePlaceholders.SHOP_OWNER.value())) {
+        if(text.contains(ShopLorePlaceholdersEnum.SHOP_PER_ITEM_QTY.value())) {
+            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());
             if(shopOwner.getName() != null) {
-                text = text.replace(ShopLorePlaceholders.SHOP_OWNER.value(), shopOwner.getName());
+                text = text.replace(ShopLorePlaceholdersEnum.SHOP_OWNER.value(), shopOwner.getName());
             }
             else {
                 // set a generic name for shops with no owner name
-                text = text.replace(ShopLorePlaceholders.SHOP_OWNER.value(), "Admin");
+                text = text.replace(ShopLorePlaceholdersEnum.SHOP_OWNER.value(), "Admin");
             }
         }
-        if(text.contains(ShopLorePlaceholders.SHOP_LOCATION.value())) {
-            text = text.replace(ShopLorePlaceholders.SHOP_LOCATION.value(),
+        if(text.contains(ShopLorePlaceholdersEnum.SHOP_LOCATION.value())) {
+            text = text.replace(ShopLorePlaceholdersEnum.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());
+        if(text.contains(ShopLorePlaceholdersEnum.SHOP_WORLD.value())) {
+            text = text.replace(ShopLorePlaceholdersEnum.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())));
+        if(text.contains(ShopLorePlaceholdersEnum.SHOP_VISITS.value())) {
+            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));
+    }
+
+    public static String formatNumber(double number) {
+        if(FindItemAddOn.getConfigProvider().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);
+        }
+    }
 }

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

@@ -1,3 +1,21 @@
+/**
+ * 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.GUIHandler;
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
@@ -13,24 +31,31 @@ import org.bukkit.inventory.meta.ItemMeta;
 import java.util.List;
 import java.util.UUID;
 
+/**
+ * @author myzticbean
+ */
 public abstract class PaginatedMenu extends Menu {
     protected int page = 0;
-    protected int maxItemsPerPage = 45;
+    protected final int maxItemsPerPage = 45;
     protected int index = 0;
 
     protected ItemStack backButton;
+    protected ItemStack firstPageButton;
     protected ItemStack nextButton;
+    protected ItemStack lastPageButton;
     protected ItemStack closeInvButton;
 
     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=";
+    private final String LAST_PAGE_BUTTON_SKIN_ID = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWRhNDRjNzY3Y2NhMjU4NjFkM2E1MmZlMTdjMjY0MjhlNjYwZWUyM2RjMGQ3OTNiZjdiZDg2ZWEyMDJmNzAzZCJ9fX0=";
 
-    public PaginatedMenu(PlayerMenuUtility playerMenuUtility) {
+    protected PaginatedMenu(PlayerMenuUtility playerMenuUtility) {
         super(playerMenuUtility);
         initMaterialsForBottomBar();
     }
 
-    public PaginatedMenu(PlayerMenuUtility playerMenuUtility, List<FoundShopItemModel> searchResult) {
+    protected PaginatedMenu(PlayerMenuUtility playerMenuUtility, List<FoundShopItemModel> searchResult) {
         super(playerMenuUtility);
         initMaterialsForBottomBar();
         super.playerMenuUtility.setPlayerShopSearchResult(searchResult);
@@ -38,21 +63,23 @@ public abstract class PaginatedMenu extends Menu {
 
     private void initMaterialsForBottomBar() {
         createGUIBackButton();
+        createGUIFirstPageButton();
         createGUINextButton();
+        createGUILastPageButton();
         createGUICloseInvButton();
     }
 
     public void addMenuBottomBar() {
         inventory.setItem(45, backButton);
+        inventory.setItem(46, firstPageButton);
         inventory.setItem(53, nextButton);
+        inventory.setItem(52, lastPageButton);
         inventory.setItem(49, closeInvButton);
 
-        inventory.setItem(46, super.GUI_FILLER_ITEM);
         inventory.setItem(47, super.GUI_FILLER_ITEM);
         inventory.setItem(48, super.GUI_FILLER_ITEM);
         inventory.setItem(50, super.GUI_FILLER_ITEM);
         inventory.setItem(51, super.GUI_FILLER_ITEM);
-        inventory.setItem(52, super.GUI_FILLER_ITEM);
     }
 
     private void createGUIBackButton() {
@@ -63,22 +90,22 @@ public abstract class PaginatedMenu extends Menu {
         else {
             backButton = new ItemStack(backButtonMaterial);
         }
-        ItemMeta backButton_meta = backButton.getItemMeta();
-        assert backButton_meta != null;
+        ItemMeta backButtonMeta = backButton.getItemMeta();
+        assert backButtonMeta != null;
         if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_GUI_BACK_BUTTON_TEXT)) {
-            backButton_meta.setDisplayName(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().SHOP_GUI_BACK_BUTTON_TEXT));
+            backButtonMeta.setDisplayName(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().SHOP_GUI_BACK_BUTTON_TEXT));
         }
         int backButtonCMD;
         try {
             if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_GUI_BACK_BUTTON_CMD)) {
                 backButtonCMD = Integer.parseInt(FindItemAddOn.getConfigProvider().SHOP_GUI_BACK_BUTTON_CMD);
-                backButton_meta.setCustomModelData(backButtonCMD);
+                backButtonMeta.setCustomModelData(backButtonCMD);
             }
         }
         catch (NumberFormatException e) {
             LoggerUtils.logDebugInfo("Invalid Custom Model Data for Back Button in config.yml");
         }
-        backButton.setItemMeta(backButton_meta);
+        backButton.setItemMeta(backButtonMeta);
     }
 
     private void createGUINextButton() {
@@ -89,22 +116,66 @@ public abstract class PaginatedMenu extends Menu {
         else {
             nextButton = new ItemStack(nextButtonMaterial);
         }
-        ItemMeta nextButton_meta = nextButton.getItemMeta();
-        assert nextButton_meta != null;
+        ItemMeta nextButtonMeta = nextButton.getItemMeta();
+        assert nextButtonMeta != null;
         if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_GUI_NEXT_BUTTON_TEXT)) {
-            nextButton_meta.setDisplayName(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().SHOP_GUI_NEXT_BUTTON_TEXT));
+            nextButtonMeta.setDisplayName(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().SHOP_GUI_NEXT_BUTTON_TEXT));
         }
         int nextButtonCMD;
         try {
             if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_GUI_NEXT_BUTTON_CMD)) {
                 nextButtonCMD = Integer.parseInt(FindItemAddOn.getConfigProvider().SHOP_GUI_NEXT_BUTTON_CMD);
-                nextButton_meta.setCustomModelData(nextButtonCMD);
+                nextButtonMeta.setCustomModelData(nextButtonCMD);
             }
         }
         catch (NumberFormatException e) {
             LoggerUtils.logDebugInfo("Invalid Custom Model Data for Next Button in config.yml");
         }
-        nextButton.setItemMeta(nextButton_meta);
+        nextButton.setItemMeta(nextButtonMeta);
+    }
+
+    private void createGUIFirstPageButton() {
+        Material firstPageButtonMaterial = Material.getMaterial(FindItemAddOn.getConfigProvider().SHOP_GUI_GOTO_FIRST_PAGE_BUTTON_MATERIAL);
+        if(firstPageButtonMaterial == null)
+            firstPageButton = createPlayerHead(FIRST_PAGE_BUTTON_SKIN_ID);
+        else
+            firstPageButton = new ItemStack(firstPageButtonMaterial);
+        ItemMeta firstPageButtonMeta = firstPageButton.getItemMeta();
+        if(firstPageButtonMeta != null && !StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_GUI_GOTO_FIRST_PAGE_BUTTON_TEXT))
+            firstPageButtonMeta.setDisplayName(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().SHOP_GUI_GOTO_FIRST_PAGE_BUTTON_TEXT));
+        int firstPageButtonCMD;
+        try {
+            if(firstPageButtonMeta != null && !StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_GUI_GOTO_FIRST_PAGE_BUTTON_CMD)) {
+                firstPageButtonCMD = Integer.parseInt(FindItemAddOn.getConfigProvider().SHOP_GUI_GOTO_FIRST_PAGE_BUTTON_CMD);
+                firstPageButtonMeta.setCustomModelData(firstPageButtonCMD);
+            }
+        }
+        catch (NumberFormatException e) {
+            LoggerUtils.logDebugInfo("Invalid Custom Model Data for Goto First Page Button in config.yml");
+        }
+        firstPageButton.setItemMeta(firstPageButtonMeta);
+    }
+
+    private void createGUILastPageButton() {
+        Material lastPageButtonMaterial = Material.getMaterial(FindItemAddOn.getConfigProvider().SHOP_GUI_GOTO_LAST_PAGE_BUTTON_MATERIAL);
+        if(lastPageButtonMaterial == null)
+            lastPageButton = createPlayerHead(LAST_PAGE_BUTTON_SKIN_ID);
+        else
+            lastPageButton = new ItemStack(lastPageButtonMaterial);
+        ItemMeta lastPageButtonMeta = lastPageButton.getItemMeta();
+        if(lastPageButtonMeta != null && !StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_GUI_GOTO_LAST_PAGE_BUTTON_TEXT))
+            lastPageButtonMeta.setDisplayName(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().SHOP_GUI_GOTO_LAST_PAGE_BUTTON_TEXT));
+        int lastPageButtonCMD;
+        try {
+            if(lastPageButtonMeta != null && !StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_GUI_GOTO_LAST_PAGE_BUTTON_CMD)) {
+                lastPageButtonCMD = Integer.parseInt(FindItemAddOn.getConfigProvider().SHOP_GUI_GOTO_LAST_PAGE_BUTTON_CMD);
+                lastPageButtonMeta.setCustomModelData(lastPageButtonCMD);
+            }
+        }
+        catch (NumberFormatException e) {
+            LoggerUtils.logDebugInfo("Invalid Custom Model Data for Goto Last Page Button in config.yml");
+        }
+        lastPageButton.setItemMeta(lastPageButtonMeta);
     }
 
     private void createGUICloseInvButton() {
@@ -113,22 +184,22 @@ public abstract class PaginatedMenu extends Menu {
             closeInvButtonMaterial = Material.BARRIER;
         }
         closeInvButton = new ItemStack(closeInvButtonMaterial);
-        ItemMeta closeInv_meta = closeInvButton.getItemMeta();
-        assert closeInv_meta != null;
+        ItemMeta closeInvMeta = closeInvButton.getItemMeta();
+        assert closeInvMeta != null;
         if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_GUI_CLOSE_BUTTON_TEXT)) {
-            closeInv_meta.setDisplayName(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().SHOP_GUI_CLOSE_BUTTON_TEXT));
+            closeInvMeta.setDisplayName(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().SHOP_GUI_CLOSE_BUTTON_TEXT));
         }
         int closeInvButtonCMD;
         try {
             if(!StringUtils.isEmpty(FindItemAddOn.getConfigProvider().SHOP_GUI_CLOSE_BUTTON_CMD)) {
                 closeInvButtonCMD = Integer.parseInt(FindItemAddOn.getConfigProvider().SHOP_GUI_CLOSE_BUTTON_CMD);
-                closeInv_meta.setCustomModelData(closeInvButtonCMD);
+                closeInvMeta.setCustomModelData(closeInvButtonCMD);
             }
         }
         catch (NumberFormatException e) {
             LoggerUtils.logDebugInfo("Invalid Custom Model Data for Close Button in config.yml");
         }
-        closeInvButton.setItemMeta(closeInv_meta);
+        closeInvButton.setItemMeta(closeInvMeta);
     }
 
     private ItemStack createPlayerHead(String value) {

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

@@ -1,3 +1,21 @@
+/**
+ * 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.GUIHandler;
 
 import io.myzticbean.finditemaddon.Models.FoundShopItemModel;
@@ -5,6 +23,9 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 public class PlayerMenuUtility {
     private Player owner;
 

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

@@ -1,28 +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.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;
 
+/**
+ * @author myzticbean
+ */
 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) {
+        if(holder instanceof Menu 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,12 +1,33 @@
+/**
+ * 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.PlayerWarpCreateEvent;
+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) {

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

@@ -1,12 +1,33 @@
+/**
+ * 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.PlayerWarpRemoveEvent;
+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) {

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

@@ -1,3 +1,21 @@
+/**
+ * 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;
@@ -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

@@ -1,3 +1,21 @@
+/**
+ * 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;
@@ -6,6 +24,9 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
+/**
+ * @author myzticbean
+ */
 public class PlayerJoinEventListener implements Listener {
 
     @EventHandler

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

@@ -1,3 +1,21 @@
+/**
+ * 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;
@@ -5,6 +23,9 @@ 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/Metrics/Metrics.java

@@ -4,10 +4,10 @@
  *
  * 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.
@@ -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

@@ -1,7 +1,28 @@
+/**
+ * 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

@@ -1,3 +1,21 @@
+/**
+ * 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;
@@ -9,6 +27,7 @@ import java.util.UUID;
 
 /**
  * Model for the Shop Item lore that will be shown in the search GUI
+ * @author myzticbean
  */
 @Getter
 @AllArgsConstructor
@@ -18,4 +37,5 @@ public class FoundShopItemModel {
     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

@@ -1,8 +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 lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * @author myzticbean
+ */
 @AllArgsConstructor
 @Getter
 public class HiddenShopModel {
@@ -15,70 +36,4 @@ public class HiddenShopModel {
     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,3 +1,21 @@
+/**
+ * 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;
@@ -6,6 +24,9 @@ import lombok.NoArgsConstructor;
 import java.time.Instant;
 import java.util.UUID;
 
+/**
+ * @author myzticbean
+ */
 @AllArgsConstructor
 @NoArgsConstructor
 public class PlayerShopVisitModel {

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

@@ -1,3 +1,21 @@
+/**
+ * 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;
@@ -7,6 +25,9 @@ import lombok.ToString;
 
 import java.util.List;
 
+/**
+ * @author myzticbean
+ */
 @AllArgsConstructor
 @Getter
 @Setter

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

@@ -1,26 +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.QuickShopHandler;
 
+import io.myzticbean.finditemaddon.FindItemAddOn;
 import io.myzticbean.finditemaddon.Models.FoundShopItemModel;
 import io.myzticbean.finditemaddon.Models.ShopSearchActivityModel;
 import io.myzticbean.finditemaddon.Utils.LoggerUtils;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * Interface for QS API.
  * Implement it depending on which API is being used (Reremake/Hikari).
  * @param <QSType>
  * @param <Shop>
- * @author ronsane
+ * @author myzticbean
  */
 public interface QSApi<QSType, Shop> {
 
+    String QS_TOTAL_SHOPS_ON_SERVER = "Total shops on server: ";
+    String QS_REMAINING_STOCK_OR_SPACE = "Remaining Stock/Space: ";
+
     /**
      * Search based on Item Type from all server shops
      * @param item
@@ -58,8 +85,13 @@ public interface QSApi<QSType, Shop> {
     List<ShopSearchActivityModel> syncShopsListForStorage(List<ShopSearchActivityModel> globalShopsList);
 
     void registerSubCommand();
+    UUID convertNameToUuid(String playerName);
 
-    static List<FoundShopItemModel> sortShops(int sortingMethod, List<FoundShopItemModel> shopsFoundList) {
+    boolean isQSShopCacheImplemented();
+
+    int processUnknownStockSpace(Location shopLoc, boolean toBuy);
+
+    static List<FoundShopItemModel> sortShops(int sortingMethod, List<FoundShopItemModel> shopsFoundList, boolean toBuy) {
         switch (sortingMethod) {
             // Random
             case 1 -> Collections.shuffle(shopsFoundList);
@@ -76,6 +108,38 @@ public interface QSApi<QSType, Shop> {
                 shopsFoundList.sort(Comparator.comparing(FoundShopItemModel::getShopPrice));
             }
         }
+        if(FindItemAddOn.getConfigProvider().DEBUG_MODE)
+            shopsFoundList.forEach(foundShopItem ->
+                    LoggerUtils.logDebugInfo(QS_REMAINING_STOCK_OR_SPACE + foundShopItem.getRemainingStockOrSpace()));
         return shopsFoundList;
     }
+
+    static int processStockOrSpace(int stockOrSpace) {
+        if(stockOrSpace == -1)
+            return Integer.MAX_VALUE;
+        return stockOrSpace;
+    }
+
+    /**
+     * Function to check if the time difference between two dates is greater than or equal to the specified seconds
+     * @param date1
+     * @param date2
+     * @param seconds
+     * @return
+     */
+    static boolean isTimeDifferenceGreaterThanSeconds(Date date1, Date date2, int seconds) {
+        Instant instant1 = date1.toInstant();
+        Instant instant2 = date2.toInstant();
+
+        Duration duration = Duration.between(instant1, instant2);
+        long secondsDifference = Math.abs(duration.getSeconds());
+
+        LoggerUtils.logDebugInfo("Difference: " + secondsDifference);
+
+        return secondsDifference >= seconds;
+    }
+
+    static void logTimeTookMsg(Instant timeStart) {
+        LoggerUtils.logInfo("Shop search took " + Duration.between(timeStart, Instant.now()).toMillis() + "ms");
+    }
 }

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

@@ -1,74 +1,125 @@
+/**
+ * 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.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 com.ghostchu.quickshop.util.Util;
 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.Defaults.PlayerPermsEnum;
 import io.myzticbean.finditemaddon.Utils.JsonStorageUtils.HiddenShopStorageUtil;
 import io.myzticbean.finditemaddon.Utils.LoggerUtils;
 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.bukkit.plugin.Plugin;
+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 Reremake
- * @author ronsane
+ * Implementation of QSApi for Hikari
+ * @author myzticbean
  */
 public class QSHikariAPIHandler implements QSApi<QuickShop, Shop> {
 
-    private QuickShopAPI api;
-    private Plugin qsHikariPluginInstance;
-    private final String QS_HIKARI_PLUGIN_NAME = "QuickShop-Hikari";
+    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();
+        LoggerUtils.logInfo("Initializing Shop caching");
+        shopCache = new ConcurrentHashMap<>();
+        isQSHikariShopCacheImplemented = checkIfQSHikariShopCacheImplemented();
     }
 
     public List<FoundShopItemModel> findItemBasedOnTypeFromAllShops(ItemStack item, boolean toBuy, Player searchingPlayer) {
+        LoggerUtils.logDebugInfo(IS_MAIN_THREAD + Bukkit.isPrimaryThread());
+        var begin = Instant.now();
         List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
-        List<Shop> allShops;
-        if(FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
-            allShops = new ArrayList<>(api.getShopManager().getLoadedShops());
-        }
-        else {
-            allShops = api.getShopManager().getAllShops();
-        }
-        LoggerUtils.logDebugInfo("Total shops on server: " + allShops.size());
-        allShops.forEach((shop_i) -> {
+        List<Shop> allShops = fetchAllShopsFromQS();
+        LoggerUtils.logDebugInfo(QS_TOTAL_SHOPS_ON_SERVER + allShops.size());
+        for(Shop shopIterator : allShops) {
             // check for quickshop hikari internal per-shop based search permission
-            if(shop_i.playerAuthorize(searchingPlayer.getUniqueId(), BuiltInShopPermission.SEARCH)) {
-                // check for blacklisted worlds
-                if(!FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shop_i.getLocation().getWorld())
-                        && shop_i.getItem().getType().equals(item.getType())
-                        && (toBuy ? shop_i.getRemainingStock() != 0 : shop_i.getRemainingSpace() != 0)
-                        && (toBuy ? shop_i.isSelling() : shop_i.isBuying())) {
+            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
-                    if(!HiddenShopStorageUtil.isShopHidden(shop_i)) {
-                        shopsFoundList.add(new FoundShopItemModel(
-                                shop_i.getPrice(),
-                                (toBuy ? shop_i.getRemainingStock() : shop_i.getRemainingSpace()),
-                                shop_i.getOwner(),
-                                shop_i.getLocation(),
-                                shop_i.getItem()
-                        ));
-                    }
+                    && (!HiddenShopStorageUtil.isShopHidden(shopIterator))) {
+                LoggerUtils.logDebugInfo("Shop match found: " + shopIterator.getLocation());
+                int stockOrSpace = (toBuy ? getRemainingStockOrSpaceFromShopCache(shopIterator, true)
+                        : getRemainingStockOrSpaceFromShopCache(shopIterator, false));
+                if(checkIfShopToBeIgnoredForFullOrEmpty(stockOrSpace)) {
+                    continue;
                 }
+                shopsFoundList.add(new FoundShopItemModel(
+                        shopIterator.getPrice(),
+                        QSApi.processStockOrSpace(stockOrSpace),
+                        shopIterator.getOwner().getUniqueIdOptional().orElse(new UUID(0, 0)),
+                        shopIterator.getLocation(),
+                        shopIterator.getItem(),
+                        toBuy
+                ));
             }
-        });
+        }
+        List<FoundShopItemModel> sortedShops = handleShopSorting(toBuy, shopsFoundList);
+        QSApi.logTimeTookMsg(begin);
+        return sortedShops;
+    }
+
+    @NotNull
+    static List<FoundShopItemModel> handleShopSorting(boolean toBuy, List<FoundShopItemModel> shopsFoundList) {
         if(!shopsFoundList.isEmpty()) {
             int sortingMethod = 2;
             try {
@@ -78,97 +129,95 @@ public class QSHikariAPIHandler implements QSApi<QuickShop, Shop> {
                 LoggerUtils.logError("Invalid value in config.yml : 'shop-sorting-method'");
                 LoggerUtils.logError("Defaulting to sorting by prices method");
             }
-            return QSApi.sortShops(sortingMethod, shopsFoundList);
+            return QSApi.sortShops(sortingMethod, shopsFoundList, toBuy);
         }
         return shopsFoundList;
     }
 
     public List<FoundShopItemModel> findItemBasedOnDisplayNameFromAllShops(String displayName, boolean toBuy, Player searchingPlayer) {
+        LoggerUtils.logDebugInfo(IS_MAIN_THREAD + Bukkit.isPrimaryThread());
+        var begin = Instant.now();
         List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
-        List<Shop> allShops;
-        if(FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
-            allShops = new ArrayList<>(api.getShopManager().getLoadedShops());
-        }
-        else {
-            allShops = api.getShopManager().getAllShops();
-        }
-        LoggerUtils.logDebugInfo("Total shops on server: " + allShops.size());
-        for(Shop shop_i : allShops) {
+        List<Shop> allShops = fetchAllShopsFromQS();
+        LoggerUtils.logDebugInfo(QS_TOTAL_SHOPS_ON_SERVER + allShops.size());
+        for(Shop shopIterator : allShops) {
             // check for quickshop hikari internal per-shop based search permission
-            if(shop_i.playerAuthorize(searchingPlayer.getUniqueId(), BuiltInShopPermission.SEARCH)) {
-                // check for blacklisted worlds
-                if(!FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shop_i.getLocation().getWorld())) {
+            if(shopIterator.playerAuthorize(searchingPlayer.getUniqueId(), BuiltInShopPermission.SEARCH)
+                    // check for blacklisted worlds
+                    && !FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shopIterator.getLocation().getWorld())
                     // match the item based on query
-                    if(shop_i.getItem().hasItemMeta()) {
-                        if(Objects.requireNonNull(shop_i.getItem().getItemMeta()).hasDisplayName()) {
-                            if(shop_i.getItem().getItemMeta().getDisplayName().toLowerCase().contains(displayName.toLowerCase())
-                                    && (toBuy ? shop_i.getRemainingStock() != 0 : shop_i.getRemainingSpace() != 0)
-                                    && (toBuy ? shop_i.isSelling() : shop_i.isBuying())) {
-                                // check for shop if hidden
-                                if(!HiddenShopStorageUtil.isShopHidden(shop_i)) {
-                                    shopsFoundList.add(new FoundShopItemModel(
-                                            shop_i.getPrice(),
-                                            (toBuy ? shop_i.getRemainingStock() : shop_i.getRemainingSpace()),
-                                            shop_i.getOwner(),
-                                            shop_i.getLocation(),
-                                            shop_i.getItem()
-                                    ));
-                                }
-                            }
-                        }
-                    }
+                    && 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)) {
+                int stockOrSpace = (toBuy ? getRemainingStockOrSpaceFromShopCache(shopIterator, true)
+                        : getRemainingStockOrSpaceFromShopCache(shopIterator, false));
+                if(checkIfShopToBeIgnoredForFullOrEmpty(stockOrSpace)) {
+                    continue;
                 }
+                shopsFoundList.add(new FoundShopItemModel(
+                        shopIterator.getPrice(),
+                        QSApi.processStockOrSpace(stockOrSpace),
+                        shopIterator.getOwner().getUniqueIdOptional().orElse(new UUID(0, 0)),
+                        shopIterator.getLocation(),
+                        shopIterator.getItem(),
+                        toBuy
+                ));
             }
         }
-        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);
-        }
-        return shopsFoundList;
+        List<FoundShopItemModel> sortedShops = handleShopSorting(toBuy, shopsFoundList);
+        QSApi.logTimeTookMsg(begin);
+        return sortedShops;
     }
 
     public List<FoundShopItemModel> fetchAllItemsFromAllShops(boolean toBuy, Player searchingPlayer) {
+        LoggerUtils.logDebugInfo(IS_MAIN_THREAD + Bukkit.isPrimaryThread());
+        var begin = Instant.now();
         List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
-        List<Shop> allShops;
-        if(FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
-            allShops = new ArrayList<>(api.getShopManager().getLoadedShops());
-        }
-        else {
-            allShops = api.getShopManager().getAllShops();
-        }
-        LoggerUtils.logDebugInfo("Total shops on server: " + allShops.size());
-        allShops.forEach((shop_i) -> {
+        List<Shop> allShops = fetchAllShopsFromQS();
+        LoggerUtils.logDebugInfo(QS_TOTAL_SHOPS_ON_SERVER + allShops.size());
+        for(Shop shopIterator : allShops) {
             // check for quickshop hikari internal per-shop based search permission
-            if(shop_i.playerAuthorize(searchingPlayer.getUniqueId(), BuiltInShopPermission.SEARCH)) {
-                // check for blacklisted worlds
-                if(!FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shop_i.getLocation().getWorld())
-                        && (toBuy ? shop_i.getRemainingStock() != 0 : shop_i.getRemainingSpace() != 0)
-                        && (toBuy ? shop_i.isSelling() : shop_i.isBuying())) {
+            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
-                    if(!HiddenShopStorageUtil.isShopHidden(shop_i)) {
-                        shopsFoundList.add(new FoundShopItemModel(
-                                shop_i.getPrice(),
-                                (toBuy ? shop_i.getRemainingStock() : shop_i.getRemainingSpace()),
-                                shop_i.getOwner(),
-                                shop_i.getLocation(),
-                                shop_i.getItem()
-                        ));
-                    }
+                    && (!HiddenShopStorageUtil.isShopHidden(shopIterator))) {
+                int stockOrSpace = (toBuy ? getRemainingStockOrSpaceFromShopCache(shopIterator, true)
+                        : getRemainingStockOrSpaceFromShopCache(shopIterator, false));
+                if(checkIfShopToBeIgnoredForFullOrEmpty(stockOrSpace)) {
+                    continue;
                 }
+                shopsFoundList.add(new FoundShopItemModel(
+                        shopIterator.getPrice(),
+                        QSApi.processStockOrSpace(stockOrSpace),
+                        shopIterator.getOwner().getUniqueIdOptional().orElse(new UUID(0, 0)),
+                        shopIterator.getLocation(),
+                        shopIterator.getItem(),
+                        toBuy
+                ));
             }
-        });
+        }
+        List<FoundShopItemModel> sortedShops = new ArrayList<>(shopsFoundList);
         if(!shopsFoundList.isEmpty()) {
             int sortingMethod = 1;
-            return QSApi.sortShops(sortingMethod, shopsFoundList);
+            sortedShops = QSApi.sortShops(sortingMethod, shopsFoundList, toBuy);
         }
-        return shopsFoundList;
+        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() {
@@ -181,7 +230,8 @@ public class QSHikariAPIHandler implements QSApi<QuickShop, Shop> {
     }
 
     public boolean isShopOwnerCommandRunner(Player player, Shop shop) {
-        return shop.getOwner().toString().equalsIgnoreCase(player.getUniqueId().toString());
+        LoggerUtils.logDebugInfo("Shop owner: " + shop.getOwner() + " | Player: " + player.getUniqueId());
+        return shop.getOwner().getUniqueId().toString().equalsIgnoreCase(player.getUniqueId().toString());
     }
 
     @Override
@@ -191,10 +241,11 @@ public class QSHikariAPIHandler implements QSApi<QuickShop, Shop> {
 
     @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()) {
+        for (Shop shop_i : getAllShops()) {
             Location shopLoc = shop_i.getLocation();
             tempGlobalShopsList.add(new ShopSearchActivityModel(
                     shopLoc.getWorld().getName(),
@@ -203,16 +254,16 @@ public class QSHikariAPIHandler implements QSApi<QuickShop, Shop> {
                     shopLoc.getZ(),
                     shopLoc.getPitch(),
                     shopLoc.getYaw(),
-                    shop_i.getOwner().toString(),
+                    convertQUserToUUID(shop_i.getOwner()).toString(),
                     new ArrayList<>(),
                     false
             ));
         }
 
-        for(ShopSearchActivityModel shop_temp : tempGlobalShopsList) {
+        for (ShopSearchActivityModel shop_temp : tempGlobalShopsList) {
             ShopSearchActivityModel tempShopToRemove = null;
-            for(ShopSearchActivityModel shop_global : globalShopsList) {
-                if(shop_temp.getWorldName().equalsIgnoreCase(shop_global.getWorldName())
+            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()
@@ -224,9 +275,10 @@ public class QSHikariAPIHandler implements QSApi<QuickShop, Shop> {
                     break;
                 }
             }
-            if(tempShopToRemove != null)
+            if (tempShopToRemove != null)
                 globalShopsList.remove(tempShopToRemove);
         }
+        LoggerUtils.logDebugInfo("Shops List sync complete. Time took: " + (System.currentTimeMillis() - start) + "ms.");
         return tempGlobalShopsList;
     }
 
@@ -237,24 +289,152 @@ public class QSHikariAPIHandler implements QSApi<QuickShop, Shop> {
     @Override
     public void registerSubCommand() {
         LoggerUtils.logInfo("Unregistered find sub-command for /qs");
-        for(CommandContainer cmdContainer : api.getCommandManager().getRegisteredCommands()) {
-            if(cmdContainer.getPrefix().equalsIgnoreCase("find")) {
+        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())
+                        .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());
     }
+
+    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 checkIfShopToBeIgnoredForFullOrEmpty(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) {
+        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());
+    }
+
+    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());
+            LoggerUtils.logDebugInfo("Stock/Space from cache: " + stockOrSpace);
+            return stockOrSpace;
+        }
+        else {
+            // Show warning
+            LoggerUtils.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);
+                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 {
+        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`
+                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);
+        }
+    }
+
+    private boolean checkIfQSHikariShopCacheImplemented() {
+        String mainVersionStr = pluginVersion.split("\\.")[0];
+        int mainVersion = Integer.parseInt(mainVersionStr);
+        return mainVersion >= 6;
+    }
+
+    @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);
+        LoggerUtils.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;
+        }
+    }
 }

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

@@ -1,10 +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.QuickShopHandler;
 
 import io.myzticbean.finditemaddon.Commands.QSSubCommands.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.Defaults.PlayerPermsEnum;
 import io.myzticbean.finditemaddon.Utils.JsonStorageUtils.HiddenShopStorageUtil;
 import io.myzticbean.finditemaddon.Utils.LoggerUtils;
 import org.bukkit.Bukkit;
@@ -13,30 +32,45 @@ 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 org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.QuickShop;
 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;
 
 /**
  * Implementation of QSApi for Reremake
- * @author ronsane
+ * @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");
+        shopCache = new ConcurrentHashMap<>();
     }
 
     @Override
     public List<FoundShopItemModel> findItemBasedOnTypeFromAllShops(ItemStack item, boolean toBuy, Player searchingPlayer) {
+        var begin = Instant.now();
         List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
         List<Shop> allShops;
         if(FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
@@ -45,41 +79,36 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
         else {
             allShops = api.getShopManager().getAllShops();
         }
-        LoggerUtils.logDebugInfo("Total shops on server: " + allShops.size());
-        allShops.forEach((shop_i) -> {
+        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 ? shop_i.getRemainingStock() != 0 : shop_i.getRemainingSpace() != 0)
                     && (toBuy ? shop_i.isSelling() : shop_i.isBuying())) {
+                if(checkIfShopToBeIgnoredForFullOrEmpty(toBuy, shop_i)) {
+                    continue;
+                }
                 // check for shop if hidden
                 if(!HiddenShopStorageUtil.isShopHidden(shop_i)) {
                     shopsFoundList.add(new FoundShopItemModel(
                             shop_i.getPrice(),
-                            (toBuy ? shop_i.getRemainingStock() : shop_i.getRemainingSpace()),
+                            QSApi.processStockOrSpace((toBuy ? getRemainingStockOrSpaceFromShopCache(shop_i, true) : getRemainingStockOrSpaceFromShopCache(shop_i, false))),
                             shop_i.getOwner(),
                             shop_i.getLocation(),
-                            shop_i.getItem()
+                            shop_i.getItem(),
+                            toBuy
                     ));
                 }
             }
-        });
-        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);
         }
-        return shopsFoundList;
+        List<FoundShopItemModel> sortedShops = handleShopSorting(toBuy, shopsFoundList);
+        QSApi.logTimeTookMsg(begin);
+        return sortedShops;
     }
 
     @Override
     public List<FoundShopItemModel> findItemBasedOnDisplayNameFromAllShops(String displayName, boolean toBuy, Player searchingPlayer) {
+        var begin = Instant.now();
         List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
         List<Shop> allShops;
         if(FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
@@ -88,22 +117,25 @@ 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()) {
                     if(Objects.requireNonNull(shop_i.getItem().getItemMeta()).hasDisplayName()) {
                         if(shop_i.getItem().getItemMeta().getDisplayName().toLowerCase().contains(displayName.toLowerCase())
-                                && (toBuy ? shop_i.getRemainingStock() != 0 : shop_i.getRemainingSpace() != 0)
+//                                && (toBuy ? getRemainingStockOrSpaceFromShopCache(shop_i, true) != 0 : getRemainingStockOrSpaceFromShopCache(shop_i, false) != 0)
                                 && (toBuy ? shop_i.isSelling() : shop_i.isBuying())) {
+                            if(checkIfShopToBeIgnoredForFullOrEmpty(toBuy, shop_i))
+                                continue;
                             // check for shop if hidden
                             if(!HiddenShopStorageUtil.isShopHidden(shop_i)) {
                                 shopsFoundList.add(new FoundShopItemModel(
                                         shop_i.getPrice(),
-                                        (toBuy ? shop_i.getRemainingStock() : shop_i.getRemainingSpace()),
+                                        QSApi.processStockOrSpace((toBuy ? getRemainingStockOrSpaceFromShopCache(shop_i, true) : getRemainingStockOrSpaceFromShopCache(shop_i, false))),
                                         shop_i.getOwner(),
                                         shop_i.getLocation(),
-                                        shop_i.getItem()
+                                        shop_i.getItem(),
+                                        toBuy
                                 ));
                             }
                         }
@@ -111,22 +143,14 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
                 }
             }
         }
-        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);
-        }
-        return shopsFoundList;
+        List<FoundShopItemModel> sortedShops = handleShopSorting(toBuy, shopsFoundList);
+        QSApi.logTimeTookMsg(begin);
+        return sortedShops;
     }
 
     @Override
     public List<FoundShopItemModel> fetchAllItemsFromAllShops(boolean toBuy, Player searchingPlayer) {
+        var begin = Instant.now();
         List<FoundShopItemModel> shopsFoundList = new ArrayList<>();
         List<Shop> allShops;
         if(FindItemAddOn.getConfigProvider().SEARCH_LOADED_SHOPS_ONLY) {
@@ -135,29 +159,34 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
         else {
             allShops = api.getShopManager().getAllShops();
         }
-        LoggerUtils.logDebugInfo("Total shops on server: " + allShops.size());
-        allShops.forEach((shop_i) -> {
+        logTotalShopsOnServer(allShops.size());
+        for(Shop shop_i : allShops) {
             // check for blacklisted worlds
             if(!FindItemAddOn.getConfigProvider().getBlacklistedWorlds().contains(shop_i.getLocation().getWorld())
-                    && (toBuy ? shop_i.getRemainingStock() != 0 : shop_i.getRemainingSpace() != 0)
+//                    && (toBuy ? getRemainingStockOrSpaceFromShopCache(shop_i, true) != 0 : getRemainingStockOrSpaceFromShopCache(shop_i, false) != 0)
                     && (toBuy ? shop_i.isSelling() : shop_i.isBuying())) {
+                if(checkIfShopToBeIgnoredForFullOrEmpty(toBuy, shop_i))
+                    continue;
                 // check for shop if hidden
                 if(!HiddenShopStorageUtil.isShopHidden(shop_i)) {
                     shopsFoundList.add(new FoundShopItemModel(
                             shop_i.getPrice(),
-                            (toBuy ? shop_i.getRemainingStock() : shop_i.getRemainingSpace()),
+                            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);
+            sortedShops = QSApi.sortShops(sortingMethod, shopsFoundList, toBuy);
         }
-        return shopsFoundList;
+        QSApi.logTimeTookMsg(begin);
+        return sortedShops;
     }
 
     @Override
@@ -173,6 +202,7 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
 
     @Override
     public boolean isShopOwnerCommandRunner(Player player, Shop shop) {
+        LoggerUtils.logDebugInfo("Shop owner: " + shop.getOwner() + " | Player: " + player.getUniqueId());
         return shop.getOwner().toString().equalsIgnoreCase(player.getUniqueId().toString());
     }
 
@@ -201,7 +231,6 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
                     false
             ));
         }
-
         for(ShopSearchActivityModel shop_temp : tempGlobalShopsList) {
             ShopSearchActivityModel tempShopToRemove = null;
             for(ShopSearchActivityModel shop_global : globalShopsList) {
@@ -220,7 +249,6 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
             if(tempShopToRemove != null)
                 globalShopsList.remove(tempShopToRemove);
         }
-
         return tempGlobalShopsList;
     }
 
@@ -240,10 +268,125 @@ public class QSReremakeAPIHandler implements QSApi<QuickShop, Shop> {
         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()) {
+            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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     *
+     * @param shop
+     * @return True if shop to be ignored
+     */
+    /*private boolean checkIfShopToBeIgnoredIfAdminShop(Shop shop) {
+        boolean ignoreAdminShops = FindItemAddOn.getConfigProvider().IGNORE_ADMIN_SHOPS;
+        if(ignoreAdminShops) {
+            OfflinePlayer shopOwner = Bukkit.getOfflinePlayer(shop.getOwner());
+            return shopOwner.getName() == null;
+        }
+        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 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) {
+                LoggerUtils.logDebugInfo("Shop found from QS cache: " + shop.getLocation());
+                cachedShop = CachedShop.builder()
+                                .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());
+            } else {
+                LoggerUtils.logDebugInfo("No shop found from QS cache for location: " + shop.getLocation());
+            }
+        } else {
+            LoggerUtils.logDebugInfo("Shop found from cache: " + shop.getLocation());
+        }
+        return (fetchRemainingStock ?
+                (cachedShop != null ? cachedShop.getRemainingStock() : -1)
+                : (cachedShop != null ? cachedShop.getRemainingSpace() : -1));
+    }
+
+    /**
+     * Fallback to fetching info from ShopCache to avoid lag
+     * @param shop QuickShop Shop instance
+     * @return
+     */
+    private @Nullable Shop getRemainingStockOrSpaceFromQSCache(Shop shop) {
+        return quickShop.getShopCache().find(shop.getLocation(), false);
+    }
+
+
+
+    private static void logTotalShopsOnServer(int allShopsCount) {
+        LoggerUtils.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

@@ -1,13 +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.ScheduledTasks;
 
+import io.myzticbean.finditemaddon.FindItemAddOn;
 import io.myzticbean.finditemaddon.Utils.JsonStorageUtils.ShopSearchActivityStorageUtil;
 import io.myzticbean.finditemaddon.Utils.WarpUtils.WarpUtils;
+import org.bukkit.Bukkit;
 
+/**
+ * @author myzticbean
+ */
 public class Task15MinInterval implements Runnable {
     @Override
     public void run() {
-        WarpUtils.updateWarps();
-//        HiddenShopStorageUtil.saveHiddenShopsToFile();
-        ShopSearchActivityStorageUtil.syncShops();
+        // v2.0.6.0 - Changed tasks to run in async thread
+        Bukkit.getScheduler().runTaskAsynchronously(FindItemAddOn.getInstance(), () -> {
+            WarpUtils.updateWarps();
+            ShopSearchActivityStorageUtil.syncShops();
+        });
     }
 }

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

@@ -1,3 +1,21 @@
+/**
+ * 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 me.kodysimpson.simpapi.colors.ColorTranslator;
@@ -5,6 +23,9 @@ import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
+/**
+ * @author myzticbean
+ */
 public class CommonUtils {
 
     public static String parseColors(String msg) {

src/main/java/io/myzticbean/finditemaddon/Utils/Defaults/NearestWarpModeEnum.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.Utils.Defaults;
+
+/**
+ * @author myzticbean
+ */
+public enum NearestWarpModeEnum {
+
+    ESSENTIAL_WARPS(1),
+    PLAYER_WARPS(2),
+    WORLDGUARD_REGION(3);
+
+    private final int mode;
+
+    NearestWarpModeEnum(int mode) {
+        this.mode = mode;
+    }
+
+    public int value() {
+        return mode;
+    }
+
+}

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

@@ -1,24 +0,0 @@
-package io.myzticbean.finditemaddon.Utils.Defaults;
-
-/**
- * List of all the permissions used by the addon
- * @author ronsane
- */
-public enum PlayerPerms {
-    FINDITEM_ADMIN("finditem.admin"),
-    FINDITEM_USE("finditem.use"),
-    FINDITEM_HIDESHOP("finditem.hideshop"),
-    FINDITEM_RELOAD("finditem.reload"),
-    FINDITEM_RESTART("finditem.restart"),
-    FINDITEM_SHOPTP("finditem.shoptp");
-
-    private final String permName;
-
-    PlayerPerms(String perm) {
-        permName = perm;
-    }
-
-    public String value() {
-        return permName;
-    }
-}

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

@@ -0,0 +1,64 @@
+/**
+ * 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.Defaults;
+
+import org.bukkit.entity.Player;
+
+/**
+ * List of all the permissions used by the addon
+ * @author myzticbean
+ */
+public enum PlayerPermsEnum {
+    FINDITEM_ADMIN("finditem.admin"),
+    FINDITEM_USE("finditem.use"),
+    FINDITEM_HIDESHOP("finditem.hideshop"),
+    FINDITEM_RELOAD("finditem.reload"),
+
+    @Deprecated
+    FINDITEM_RESTART("finditem.restart"),
+    FINDITEM_SHOPTP("finditem.shoptp"),
+    FINDITEM_SHOPTP_OWN("finditem.shoptp.own"),
+    FINDITEM_SHOPTP_BYPASS_DELAY("finditem.shoptp-delay.bypass");
+
+    private final String permName;
+
+    PlayerPermsEnum(String perm) {
+        permName = perm;
+    }
+
+    public String value() {
+        return permName;
+    }
+
+    public static boolean isAdmin(Player p) {
+        return p.hasPermission(FINDITEM_ADMIN.permName);
+    }
+
+    public static boolean hasShopTpDelayBypassPermOrAdmin(Player p) {
+        return (isAdmin(p) || hasShopTpDelayBypassPerm(p));
+    }
+
+    public static boolean hasShopTpDelayBypassPerm(Player p) {
+        return p.hasPermission(FINDITEM_SHOPTP_BYPASS_DELAY.permName);
+    }
+
+    public static boolean canPlayerTpToOwnShop(Player p) {
+        return p.hasPermission(FINDITEM_SHOPTP_OWN.permName);
+    }
+}

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 ronsane
- */
-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/Defaults/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.Utils.Defaults;
+
+/**
+ * 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/Utils/JsonStorageUtils/HiddenShopStorageUtil.java

@@ -1,3 +1,21 @@
+/**
+ * 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.JsonStorageUtils;
 
 import com.google.gson.Gson;
@@ -10,12 +28,21 @@ 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
+ */
 public class HiddenShopStorageUtil {
 
     protected static List<HiddenShopModel> hiddenShopsList = new ArrayList<>();

src/main/java/io/myzticbean/finditemaddon/Utils/JsonStorageUtils/ShopSearchActivityStorageUtil.java

@@ -1,3 +1,21 @@
+/**
+ * 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.JsonStorageUtils;
 
 import com.google.gson.Gson;
@@ -11,14 +29,33 @@ import lombok.Getter;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
-import java.io.*;
+import javax.annotation.Nullable;
+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";
@@ -39,21 +76,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) {
@@ -96,27 +118,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
@@ -165,14 +166,6 @@ 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) {
-//
-//    }
-
     public static void loadShopsFromFile() {
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
         File file = new File(FindItemAddOn.getInstance().getDataFolder().getAbsolutePath() + "/" + SHOP_SEARCH_ACTIVITY_JSON_FILE_NAME);
@@ -191,15 +184,6 @@ public class ShopSearchActivityStorageUtil {
                 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);
     }
 
@@ -219,23 +203,6 @@ public class ShopSearchActivityStorageUtil {
         }
     }
 
-    /*
-    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()) {
@@ -283,28 +250,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());
                         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;
-//                    }
-//                }
             }
         });
     }
@@ -322,4 +273,46 @@ public class ShopSearchActivityStorageUtil {
         }
         return 0;
     }
+
+    @Nullable
+    public static OfflinePlayer getShopOwner(@NotNull Location shopLocation) {
+        for(ShopSearchActivityModel shopSearchActivity : globalShopsList) {
+            if (shopSearchActivity.compareWith(
+                    shopLocation.getWorld().getName(),
+                    shopLocation.getX(),
+                    shopLocation.getY(),
+                    shopLocation.getZ()
+            )) {
+                return Bukkit.getOfflinePlayer(UUID.fromString(shopSearchActivity.getShopOwnerUUID()));
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    public static UUID getShopOwnerUUID(@NotNull Location shopLocation) {
+        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());
+            }
+        }
+        return null;
+    }
 }

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

@@ -1,9 +1,24 @@
+/**
+ * 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 org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -14,7 +29,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-
+/**
+ * @author myzticbean
+ */
 public class LocationUtils {
 
     private static final List<Material> damagingBlocks = new ArrayList<>();
@@ -86,13 +103,6 @@ public class LocationUtils {
     @Nullable
     public static Location findSafeLocationAroundShop(Location shopLocation) {
         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());
         // Creating a list of four block locations in 4 sides of the shop
         List<Location> possibleSafeLocList = new ArrayList<>();
@@ -122,7 +132,7 @@ public class LocationUtils {
         ));
         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())) {
+            if(loc_i.getBlock().getType().equals(FindItemAddOn.getQsApiInstance().getShopSignMaterial())) {
                 LoggerUtils.logDebugInfo("Shop sign block found at " + loc_i.getX() + ", " + loc_i.getY() + ", " + loc_i.getZ());
                 // check if the block above is suffocating
                 Location blockAbove = new Location(
@@ -147,7 +157,7 @@ public class LocationUtils {
                         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");
                         }

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

@@ -1,23 +1,55 @@
+/**
+ * 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 me.kodysimpson.simpapi.colors.ColorTranslator;
 import org.bukkit.Bukkit;
 
+/**
+ * @author myzticbean
+ */
 public class LoggerUtils {
+
+    public static final String QS_FIND_ITEM_ADD_ON = "[QSFindItemAddOn] ";
+    public static final String QS_FIND_ITEM_ADD_ON_DEBUG_LOG = "[QSFindItemAddOn-DEBUG] ";
+
     public static void logDebugInfo(String text) {
         if(FindItemAddOn.getConfigProvider().DEBUG_MODE) {
-            Bukkit.getLogger().warning(ColorTranslator.translateColorCodes("[QSFindItemAddOn-DebugLog] " + text));
+            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("[QSFindItemAddOn] " + text));
+        Bukkit.getLogger().info(ColorTranslator.translateColorCodes(QS_FIND_ITEM_ADD_ON + getMainOrAsyncThreadLogText() + text));
     }
     public static void logError(String text) {
-        Bukkit.getLogger().severe(ColorTranslator.translateColorCodes("[QSFindItemAddOn] " + 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 logWarning(String text) {
-//        Bukkit.getConsoleSender().sendMessage(ColorTranslator.translateColorCodes("[QSFindItemAddOn] &6" + text));
-        Bukkit.getLogger().warning(ColorTranslator.translateColorCodes("[QSFindItemAddOn] " + 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/UpdateChecker.java

@@ -1,7 +1,25 @@
+/**
+ * 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.Utils.Defaults.PlayerPerms;
+import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPermsEnum;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -13,6 +31,9 @@ import java.net.URL;
 import java.util.Scanner;
 import java.util.function.Consumer;
 
+/**
+ * @author myzticbean
+ */
 public class UpdateChecker {
 
     private final String prefix = "&8["
@@ -53,7 +74,7 @@ public class UpdateChecker {
 
     public void notifyPlayerAboutUpdateOnJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
-        if(player.isOp() || player.hasPermission(PlayerPerms.FINDITEM_ADMIN.value())) {
+        if(player.isOp() || player.hasPermission(PlayerPermsEnum.FINDITEM_ADMIN.value())) {
             if(FindItemAddOn.getPluginOutdated()) {
                 player.sendMessage(ColorTranslator.translateColorCodes(
                         prefix

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

@@ -1,10 +1,26 @@
+/**
+ * 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.WarpUtils;
 
 import io.myzticbean.finditemaddon.Dependencies.EssentialsXPlugin;
-import io.myzticbean.finditemaddon.FindItemAddOn;
 import io.myzticbean.finditemaddon.Models.EssentialWarpModel;
 import io.myzticbean.finditemaddon.Utils.CommonUtils;
-import io.myzticbean.finditemaddon.Utils.LoggerUtils;
 import org.bukkit.Location;
 import org.jetbrains.annotations.Nullable;
 
@@ -12,12 +28,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+/**
+ * @author myzticbean
+ */
 public class EssentialWarpsUtil {
 
     @Nullable
     public String findNearestWarp(Location shopLocation) {
         List<EssentialWarpModel> allWarps = EssentialsXPlugin.getAllWarps();
-        if(allWarps != null && allWarps.size() > 0) {
+        if(allWarps != null && !allWarps.isEmpty()) {
             Map<Double, String> warpDistanceMap = new TreeMap<>();
             allWarps.forEach(warp -> {
                 Double distance = CommonUtils.calculateDistance3D(
@@ -30,11 +49,11 @@ public class EssentialWarpsUtil {
                 );
                 warpDistanceMap.put(distance, warp.warpName);
             });
-            if(FindItemAddOn.getConfigProvider().DEBUG_MODE) {
+            /*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 {

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

@@ -1,43 +0,0 @@
-package io.myzticbean.finditemaddon.Utils.WarpUtils;
-
-//import me.ronsane.finditemaddon.finditemaddon.Dependencies.PWarpPlugin;
-//import me.ronsane.finditemaddon.finditemaddon.FindItemAddOn;
-//import me.ronsane.finditemaddon.finditemaddon.Utils.CommonUtils;
-//import me.ronsane.finditemaddon.finditemaddon.Utils.LoggerUtils;
-//import me.tks.playerwarp.Warp;
-//import org.bukkit.Location;
-//import org.jetbrains.annotations.Nullable;
-//
-//import java.util.List;
-//import java.util.Map;
-//import java.util.TreeMap;
-
-public class PWarpsUtil {
-
-//    @Nullable
-//    public Warp findNearestWarp(Location shopLocation) {
-//        List<Warp> allWarps = PWarpPlugin.getAllWarps();
-//        if(allWarps.size() > 0) {
-//            Map<Double, Warp> warpDistanceMap = new TreeMap<>();
-//            allWarps.parallelStream().forEach(warp -> {
-//                warpDistanceMap.put(CommonUtils.calculateDistance2D(
-//                        shopLocation.getX(),
-//                        shopLocation.getY(),
-//                        warp.getWarpLocation().getX(),
-//                        warp.getWarpLocation().getY()
-//                ), warp);
-//            });
-//            if(FindItemAddOn.getConfigProvider().DEBUG_MODE) {
-//                for(Map.Entry<Double, Warp> entry : warpDistanceMap.entrySet()) {
-//                    LoggerUtils.logDebugInfo(entry.getValue().getName() + " : " + entry.getKey());
-//                }
-//            }
-//
-//            return warpDistanceMap.entrySet().iterator().next().getValue();
-//        }
-//        else {
-//            return null;
-//        }
-//    }
-
-}

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

@@ -1,3 +1,21 @@
+/**
+ * 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.WarpUtils;
 
 import com.olziedev.playerwarps.api.warp.Warp;
@@ -11,35 +29,54 @@ import org.jetbrains.annotations.Nullable;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.UUID;
 
+/**
+ * @author myzticbean & lukemango
+ */
 public class PlayerWarpsUtil {
 
     @Nullable
-    public Warp findNearestWarp(Location shopLocation) {
-        List<Warp> allWarps = PlayerWarpsPlugin.getAllWarps();
-        if(!allWarps.isEmpty()) {
+    public Warp findNearestWarp(Location shopLocation, UUID shopOwner) {
+        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<>();
-            allWarps.forEach(warp -> {
-                warpDistanceMap.put(CommonUtils.calculateDistance3D(
-                        shopLocation.getX(),
-                        shopLocation.getY(),
-                        shopLocation.getZ(),
-                        warp.getWarpLocation().getX(),
-                        warp.getWarpLocation().getY(),
-                        warp.getWarpLocation().getZ()
-                ), warp);
-            });
+            playersWarps.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());
+                    LoggerUtils.logDebugInfo("Warp Distance: " + entry.getKey() + " Warp Name: " + entry.getValue().getWarpName());
                 }
             }
-
-            return warpDistanceMap.entrySet().iterator().next().getValue();
-        }
-        else {
-            return null;
+            for (Map.Entry<Double, Warp> doubleWarpEntry : warpDistanceMap.entrySet()) {
+                Double distance3D = doubleWarpEntry.getKey();
+                Warp warp = doubleWarpEntry.getValue();
+                LoggerUtils.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;
     }
-
 }

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

@@ -1,3 +1,21 @@
+/**
+ * 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.WarpUtils;
 
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
@@ -7,8 +25,15 @@ 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

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

@@ -1,21 +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.Utils.WarpUtils;
 
 import io.myzticbean.finditemaddon.Dependencies.EssentialsXPlugin;
 import io.myzticbean.finditemaddon.Dependencies.PlayerWarpsPlugin;
 import io.myzticbean.finditemaddon.FindItemAddOn;
 
+/**
+ * @author myzticbean
+ */
 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();
-                }
+            if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 1
+                    && EssentialsXPlugin.isEnabled()) {
+                EssentialsXPlugin.updateAllWarps();
+
             }
-            else if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 2) {
-                if(PlayerWarpsPlugin.getIsEnabled()) {
-                    PlayerWarpsPlugin.updateAllWarpsFromAPI();
-                }
+            else if(FindItemAddOn.getConfigProvider().NEAREST_WARP_MODE == 2
+                    && PlayerWarpsPlugin.getIsEnabled()) {
+                PlayerWarpsPlugin.updateAllWarpsFromAPI();
             }
         }
     }

src/main/resources/config.yml

@@ -1,8 +1,8 @@
 # QuickShop Shop Search AddOn
-# Works with both Reremake and Hikari forks of QuickShop
+# Works with both Hikari and Reremake forks of QuickShop
 
 # PLEASE refer the below link to understand the meaning of all the fields and sample data:
-# https://gitlab.com/ronsane/QSFindItemAddOn/-/wikis/Sample-config.yml
+# https://github.com/myzticbean/QSFindItemAddOn/wiki/Sample-config.yml
 
 plugin-prefix: "&8[&a&lShop Search&8] &r"
 find-item-command:
@@ -25,14 +25,16 @@ find-item-command:
   shop-already-public-message: "&cThis shop is already public!"
   invalid-shop-block-message: "&cThe block you are looking at is not a shop!"
   hiding-shop-owner-invalid-message: "&cThat shop is not yours!"
+  remove-hideshop-revealshop-subcommands: false
+  disable-search-all-shops: false
 shop-sorting-method: 2
 search-loaded-shops-only: false
 shop-search-gui-title: "&l» &rShops"
 nearest-warp-mode: 1
 shop-gui-item-lore:
   - ""
-  - "&fPrice: &a${ITEM_PRICE}"
-  - "&fStock: &7{SHOP_STOCK}"
+  - "&fPrice: &a${ITEM_PRICE} per {ITEM_STACK_SIZE} item(s)"
+  - "&fStock/Space: &7{SHOP_STOCK}"
   - "&fOwner: &7{SHOP_OWNER}"
   - "&fLocation: &7{SHOP_LOC}"
   - "&fWorld: &7{SHOP_WORLD}"
@@ -45,23 +47,39 @@ player-shop-teleportation:
     click-to-teleport-message: "&6&lClick to teleport to the shop!"
     shop-tp-no-permission-message: "&cYou don't have permission to teleport to shop!"
     unsafe-shop-area-message: "&cThe area around the shop is unsafe!"
+    tp-delay-in-seconds: 0
+    tp-delay-message: "&6You will be teleported in &c{DELAY} &6seconds..."
+    tp-to-own-shop-no-permission-message: "&cYou cannot teleport to your own shop!"
   nearest-warp-tp-mode:
     tp-player-to-nearest-warp: false
-shop-gui-back-button-material: ""
-shop-gui-back-button-text: "&7&l« &cBack"
-shop-gui-next-button-material: ""
-shop-gui-next-button-text: "&aNext &7&l»"
-shop-gui-filler-item: "GRAY_STAINED_GLASS_PANE"
-shop-gui-close-button-material: "BARRIER"
-shop-gui-close-button-text: "&fClose Search"
-shop-gui-back-button-custom-model-data: ""
-shop-gui-next-button-custom-model-data: ""
-shop-gui-close-button-custom-model-data: ""
-shop-navigation-first-page-alert-message: "&cYou are already on first page!"
-shop-navigation-last-page-alert-message: "&cYou are already on last page!"
+    do-not-tp-if-warp-locked: true
+    only-show-player-owned-warps: true
+shop-gui:
+  back-button-material: "RED_CONCRETE"
+  back-button-text: "&7&l« &cBack"
+  next-button-material: "GREEN_CONCRETE"
+  next-button-text: "&aNext &7&l»"
+  filler-item: "GRAY_STAINED_GLASS_PANE"
+  close-button-material: "BARRIER"
+  close-button-text: "&fClose Search"
+  goto-first-page-button-material: ""
+  goto-first-page-button-text: "&7&l« &cGo to First Page"
+  goto-last-page-button-material: ""
+  goto-last-page-button-text: "&aGo to Last Page &7&l»"
+  shop-navigation:
+    first-page-alert-message: "&cYou are already on first page!"
+    last-page-alert-message: "&cYou are already on last page!"
+  custom-model-data:
+    back-button-custom-model-data: ""
+    next-button-custom-model-data: ""
+    close-button-custom-model-data: ""
+    goto-first-page-button-custom-model-data: ""
+    goto-last-page-button-custom-model-data: ""
+  use-shorter-currency-format: true
 shop-player-visit-cooldown-in-minutes: 5
+ignore-empty-chests: true
 blacklisted-worlds:
   - "world_number_1"
   - "world_number_2"
 debug-mode: false
-config-version: 11
+config-version: 16

src/main/resources/plugin.yml

@@ -2,7 +2,7 @@ name: QSFindItemAddOn
 version: ${project.version}
 main: io.myzticbean.finditemaddon.FindItemAddOn
 api-version: 1.16
-authors: [ ronsane ]
+authors: [ myzticbean ]
 softdepend:
   - QuickShop
   - QuickShop-Hikari
@@ -18,14 +18,17 @@ permissions:
     description: Enables players to use the /finditem hideshop & /finditem revealshop
     default: true
   finditem.reload:
-    description: For OP. Enables use of '/finditem reload' to reload the config
-    default: op
-  finditem.restart:
-    description: For OP. Enables use of '/finditem restart' to restart the plugin
+    description: For OP. Enables use of '/finditemadmin reload' to reload the config
     default: op
   finditem.admin:
     description: For OP. Enables use of all admin commands
     default: op
   finditem.shoptp:
     description: If 'allow-direct-shop-tp' is enabled in config, players require this permission to be able to teleport
+    default: op
+  finditem.shoptp.own:
+    description: Allows teleporting to own shops
+    default: true
+  finditem.shoptp-delay.bypass:
+    description: Bypass the TP delay for teleporting to shop
     default: op

src/main/resources/sample-config.yml

@@ -1,4 +1,4 @@
-# QuickShop Reremake and Hikari Shop Search AddOn
+# QuickShop Hikari and Reremake Shop Search AddOn
 
 ########################################
 # THIS IS JUST A SAMPLE CONFIG FILE
@@ -48,6 +48,11 @@ find-item-command:
   shop-already-hidden-message: "&cThis shop is already hidden!"
   shop-already-public-message: "&cThis shop is already public!"
   invalid-shop-block-message: "&cThe block you are looking at is not a shop!"
+  # Added this config option to temporarily remove hideshop/revealshop sub-commands (Issue #5)
+  # Set it to 'true' if you want to remove those sub-commands
+  remove-hideshop-revealshop-subcommands: false
+  # If below option is set to 'true', it will remove the 'finditem TO_BUY/TO_SELL *' command
+  disable-search-all-shops: false
 
 
 # Shop sorting methods:
@@ -78,7 +83,8 @@ nearest-warp-mode: 1
 # Shop Search GUI Item Lore
 # Placeholders for shop-item-lore:
 # {ITEM_PRICE}          -> Item price in shop
-# {SHOP_STOCK}          -> Remaining stock in shop
+# {SHOP_STOCK}          -> Remaining stock or space in shop depending on type of shop
+# {ITEM_STACK_SIZE}     -> Stack size of the item being sold or bought for the above price
 # {SHOP_OWNER}          -> Owner of shop
 # {SHOP_LOC}            -> Shop coordinates
 # {SHOP_WORLD}          -> Name of the world the shop is in
@@ -91,8 +97,8 @@ nearest-warp-mode: 1
 #    set the below field as shop-gui-item-lore: []
 shop-gui-item-lore:
   - ""
-  - "&fPrice: &a${ITEM_PRICE}"
-  - "&fStock: &7{SHOP_STOCK}"
+  - "&fPrice: &a${ITEM_PRICE} per {ITEM_STACK_SIZE} item(s)"
+  - "&fStock/Space: &7{SHOP_STOCK}"
   - "&fOwner: &7{SHOP_OWNER}"
   - "&fLocation: &7{SHOP_LOC}"
   - "&fWorld: &7{SHOP_WORLD}"
@@ -113,33 +119,60 @@ player-shop-teleportation:
     click-to-teleport-message: '&6&lClick to teleport to the shop!'
     shop-tp-no-permission-message: '&cYou don''t have permission to teleport to shop!'
     unsafe-shop-area-message: '&cThe area around the shop is unsafe!'
+    # When player clicks on a shop, how long to wait before teleporting to the shop (in seconds)
+    tp-delay-in-seconds: 0
+    # Message to show a player when they have clicked on a shop in GUI (Shown only if there is a non-zero TP delay)
+    # Set as '' if you do not want to show any message to player
+    # {DELAY} will be automatically replaced with value set in 'tp-delay-in-seconds'
+    tp-delay-message: "&6You will be teleported in &c{DELAY} &6seconds..."
+    # Players require 'finditem.shoptp.own' permission to teleport to their own shop.
+    # If no permission, below message will be shown.
+    tp-to-own-shop-no-permission-message: "&cYou cannot teleport to your own shop!"
   nearest-warp-tp-mode:
     # The player will be teleported to the nearest warp as if they ran the warp command
     # Only works with EssentialsX Warps or PlayerWarps (configurable using 'nearest-warp-mode' in this config)
     tp-player-to-nearest-warp: false
+    # Below option is applicable to PlayerWarps only. If set to true, player will not be teleported if the warp is locked
+    # So it will try to find a PlayerWarp that is not locked, if unable to find, an error will be shown
+    do-not-tp-if-warp-locked: true
+    # Below option is applicable to PlayerWarps only. If set to true, player will only be shown the warps in GUI which the player owns
+    only-show-player-owned-warps: true
 
-shop-gui-back-button-material: "RED_CONCRETE"
-shop-gui-back-button-text: "&7&l« &cBack"
-shop-gui-next-button-material: "GREEN_CONCRETE"
-shop-gui-next-button-text: "&aNext &7&l»"
-shop-gui-filler-item: "GRAY_STAINED_GLASS_PANE"
-shop-gui-close-button-material: "BARRIER"
-shop-gui-close-button-text: "&fClose Search"
-# Enter Item Custom Model Data below, if available, within quotes
-# or leave as "" if not available
-shop-gui-back-button-custom-model-data: ""
-shop-gui-next-button-custom-model-data: ""
-shop-gui-close-button-custom-model-data: ""
+shop-gui:
+  back-button-material: "RED_CONCRETE"
+  back-button-text: "&7&l« &cBack"
+  next-button-material: "GREEN_CONCRETE"
+  next-button-text: "&aNext &7&l»"
+  filler-item: "GRAY_STAINED_GLASS_PANE"
+  close-button-material: "BARRIER"
+  close-button-text: "&fClose Search"
+  goto-first-page-button-material: ""
+  goto-first-page-button-text: "&7&l« &cGo to First Page"
+  goto-last-page-button-material: ""
+  goto-last-page-button-text: "&aGo to Last Page &7&l»"
+  # Alert shown when player is already on first/last page and clicks back/next button
+  shop-navigation:
+    first-page-alert-message: "&cYou are already on first page!"
+    last-page-alert-message: "&cYou are already on last page!"
+  # Enter Item Custom Model Data below, if available, within quotes
+  # or leave as "" if not available
+  custom-model-data:
+    back-button-custom-model-data: ""
+    next-button-custom-model-data: ""
+    close-button-custom-model-data: ""
+    goto-first-page-button-custom-model-data: ""
+    goto-last-page-button-custom-model-data: ""
+  # Enabling this will convert currency values to a shorter format
+  # For example: $10,210,100 will be shown as $10.21M
+  use-shorter-currency-format: true
 
-
-# Alert shown when player is already on first/last page and clicks back/next button
-shop-navigation-first-page-alert-message: "&cYou are already on first page!"
-shop-navigation-last-page-alert-message: "&cYou are already on last page!"
-
-# Specify (in minutes) how long the plugin will wait before incrementing the player
-# shop visit when teleporting to it from Search GUI
+# Specify (in minutes) how long the plugin will wait before incrementing the player shop visit count
+# when teleporting to it from Search GUI
 shop-player-visit-cooldown-in-minutes: 5
 
+# Ignore empty chests from search result
+ignore-empty-chests: true
+
 # When fetching shops, the below worlds will be ignored
 blacklisted-worlds:
   - "world_number_1"
@@ -151,4 +184,4 @@ blacklisted-worlds:
 debug-mode: false
 
 # Do not change the below value
-config-version: 11
+config-version: 16