Merge pull request #938 from Ghost-chu/hikari

4.2.2.4

Author: Ghost-chu

.github/workflows/mc-publish.yml

@@ -26,34 +26,18 @@ jobs:
           cache: maven
       - name: Build with Maven
         run: mvn -B package -T 1.5C --file pom.xml
-      - uses: Kir-Antipov/mc-publish@v3.2
+      - uses: Kir-Antipov/mc-publish@v3.3
         with:
           modrinth-id: ijC5dDkD
           modrinth-featured: true
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          modrinth-dependencies: |
-            hXiIvTyT | recommends | *
-            nfGCP9fk | recommends | *
-            UmLGoGij | recommends | *
-            swbUV1cr | recommends | *
-            fRQREgAc | recommends | *
 
           github-discussion: Announcements
           github-token: ${{ secrets.GITHUB_TOKEN }}
           github-draft: false
-
-          #curseforge-id: 709851
-          #curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-          #curseforge-name: QuickShop-Hikari
-          #curseforge-dependencies: |
-          #  vault | depends | *
-          #  protocollib | recommends | *
-          #  essentialsx | recommends | *
-          #  worldedit | recommends | *
-          #  nbt-api | recommends | *
-
-          files-primary: "quickshop-bukkit/target/QuickShop-Hikari-*.jar"
-          files-secondary: "**/target/+(Compat*|Addon*).jar"
+          files: |
+            quickshop-bukkit/target/QuickShop-Hikari-*.jar
+            **/target/+(Compat*|Addon*).jar
           loaders: |
             spigot
             paper
@@ -65,8 +49,34 @@ jobs:
             1.19.2
             1.19.3
             1.19.4
+            1.20
           java: |
             17
+          dependencies: |
+            essentialsx(optional)
+            nbtapi(optional)
+            discordsrv(optional)
+            bluemap(optional)
+            dynmap(optional)
+            worldedit(optional)
+            worldguard(optional)
+            plan(optional)
+            bentobox(optional)
+            clearlag(optional)
+            elitemobs(optional)
+            griefprevention(optional)
+            lands(optional)
+            openinv(optional)
+            placeholderapi(optional)
+            residence(optional)
+            towny(optional)
+            superiorskyblock(optional)
+            velocity(optional)
+            bungeecord(optional)
+            waterfall(optional)
+            luckperms(optional)
+            vault(optional)
+            packetlistenerapi(conflicting)
       # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
       - name: Update dependency graph
         uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

addon/bluemap/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>4.2.2.3</version>
+        <version>4.2.2.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

addon/discordsrv/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>4.2.2.3</version>
+        <version>4.2.2.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

addon/discount/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>4.2.2.3</version>
+        <version>4.2.2.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

addon/displaycontrol/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>4.2.2.3</version>
+        <version>4.2.2.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

addon/dynmap/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>4.2.2.3</version>
+        <version>4.2.2.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

addon/limited/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>4.2.2.3</version>
+        <version>4.2.2.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

addon/list/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>4.2.2.3</version>
+        <version>4.2.2.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

addon/plan/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>4.2.2.3</version>
+        <version>4.2.2.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

addon/shopitemonly/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>4.2.2.3</version>
+        <version>4.2.2.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>