Implement VaultUnlocked (#1828)

* update translations manually to reset crowdin * Update typo in worldguard compatibility. * Remove outdated platform spec. * Update changelog, and VaultUnlocked implementation * Slim down economy adapters to Vault and VaultUnlocked.
QuickShop-Community · Dec 25, 2024 · 47ff177 · 47ff177
1 parent 9a418a2
commit 47ff177
Show file tree

Hide file tree

Showing 73 changed files with 275 additions and 1,725 deletions.
diff --git a/.changelog/6.2.0.8.md b/.changelog/6.2.0.8.md
@@ -9,7 +9,8 @@
   - If protocol lib is not up-to-date/installed it will default to no display.
 - Added /qs browse [world], which allows a player to view the shops by server or by world depending of if they attach world as an argument
 - Added TRADE_UI interaction, which opens up a GUI-based trading menu for the player to buy/sell predefined, and custom amounts from/to a shop.
-- Updated to MC 1.21.3.
+- Updated to MC 1.21.3, MC 1.21.4.
+- Added VaultUnlocked Support
 
 ## Minor Changes
 - Added 2 new interaction behaviours that will be coming soon. CONTROL_PANEL_UI and TRADE_UI

diff --git a/.gitignore b/.gitignore
@@ -117,6 +117,7 @@ run/
 /.vscode/settings.json
 /.run
 .run
-/${rootDir}/build-artifacts/quickshop-hikari-6.2.0.7-shaded.pom
-/${rootDir}/build-artifacts/quickshop-hikari-6.2.0.7-shaded-sources.pom
-/${rootDir}/build-artifacts/quickshop-hikari-6.2.0.7-shaded-test-sources.pom
+/${rootDir}/build-artifacts/quickshop-hikari-6.2.0.8-SNAPSHOT-1-shaded.pom
+/${rootDir}/build-artifacts/quickshop-hikari-6.2.0.8-SNAPSHOT-1-shaded-sources.pom
+/${rootDir}/build-artifacts/quickshop-hikari-6.2.0.8-SNAPSHOT-1-shaded-test-sources.pom
+/.paper-nms/
diff --git a/addon/bluemap/pom.xml b/addon/bluemap/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/discordsrv/pom.xml b/addon/discordsrv/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/discount/pom.xml b/addon/discount/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/displaycontrol/pom.xml b/addon/displaycontrol/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/dynmap/pom.xml b/addon/dynmap/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/limited/pom.xml b/addon/limited/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/list/pom.xml b/addon/list/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/plan/pom.xml b/addon/plan/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/reremake-migrator/pom.xml b/addon/reremake-migrator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/shopitemonly/pom.xml b/addon/shopitemonly/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/compatibility/advancedregionmarket/pom.xml b/compatibility/advancedregionmarket/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/angelchest/pom.xml b/compatibility/angelchest/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/bentobox/pom.xml b/compatibility/bentobox/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/bungeecord-geyser/pom.xml b/compatibility/bungeecord-geyser/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/bungeecord/pom.xml b/compatibility/bungeecord/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/chestprotect/pom.xml b/compatibility/chestprotect/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/clearlag/pom.xml b/compatibility/clearlag/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/common/pom.xml b/compatibility/common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/ecoenchants/pom.xml b/compatibility/ecoenchants/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/elitemobs/pom.xml b/compatibility/elitemobs/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/griefprevention/pom.xml b/compatibility/griefprevention/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/itemsadder/pom.xml b/compatibility/itemsadder/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/lands/pom.xml b/compatibility/lands/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/openinv/pom.xml b/compatibility/openinv/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/plotsquared/pom.xml b/compatibility/plotsquared/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/reforges/pom.xml b/compatibility/reforges/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/residence/pom.xml b/compatibility/residence/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/slimefun/pom.xml b/compatibility/slimefun/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/superiorskyblock/pom.xml b/compatibility/superiorskyblock/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/towny/pom.xml b/compatibility/towny/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/...ny/src/main/java/com/ghostchu/quickshop/compatibility/towny/compat/tne/TNEConversion.java b/...ny/src/main/java/com/ghostchu/quickshop/compatibility/towny/compat/tne/TNEConversion.java
@@ -32,7 +32,7 @@
  * TNEConversion
  *
  * @author creatorfromhell
- * @since 6.2.0.7
+ * @since 6.2.0.8-SNAPSHOT-1
  */
 public class TNEConversion implements UuidConversion {
 

diff --git a/compatibility/velocity/pom.xml b/compatibility/velocity/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/voidchest/pom.xml b/compatibility/voidchest/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/worldedit/pom.xml b/compatibility/worldedit/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/worldguard/pom.xml b/compatibility/worldguard/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/platform/quickshop-platform-interface/pom.xml b/platform/quickshop-platform-interface/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/platform/quickshop-platform-paper/pom.xml b/platform/quickshop-platform-paper/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20.4-R0.1-SNAPSHOT</version>
+            <version>1.21.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/platform/quickshop-platform-spigot-abstract/pom.xml b/platform/quickshop-platform-spigot-abstract/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/platform/quickshop-platform-spigot-v1_18_R1/pom.xml b/platform/quickshop-platform-spigot-v1_18_R1/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/platform/quickshop-platform-spigot-v1_18_R2/pom.xml b/platform/quickshop-platform-spigot-v1_18_R2/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/platform/quickshop-platform-spigot-v1_19_R1/pom.xml b/platform/quickshop-platform-spigot-v1_19_R1/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.7</version>
+        <version>6.2.0.8-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>