From 7c2ed6af7da8a4a4c36e82e3cd83e9919c07b526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beatrice=20Dellac=C3=A0?= <hello@beatrice.wtf>
Date: Sun, 30 Oct 2022 21:31:30 +0100
Subject: [PATCH] Update for latest QuickShop and GriefPrevention versions

Pom file was cleaned with new dependencies, and imported classes have been fixed.
---
 .idea/jarRepositories.xml                     | 40 +++++++++++++++
 pom.xml                                       | 49 +++++--------------
 .../listeners/GriefPreventionListener.java    |  5 +-
 .../listeners/QuickShopListener.java          |  2 +-
 src/main/resources/plugin.yml                 |  4 +-
 5 files changed, 57 insertions(+), 43 deletions(-)
 create mode 100644 .idea/jarRepositories.xml

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..9635470
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jitpack.io" />
+      <option name="name" value="jitpack.io" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="quickshop-repo" />
+      <option name="name" value="quickshop-repo" />
+      <option name="url" value="https://repo.codemc.io/repository/maven-public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="spigot-repo" />
+      <option name="name" value="spigot-repo" />
+      <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="vault-repo" />
+      <option name="name" value="vault-repo" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 644d9f0..007fa90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.judgetread</groupId>
     <artifactId>GriefPreventionQuickShopBridge</artifactId>
-    <version>1.1.1</version>
+    <version>1.2.0</version>
 
     <licenses>
         <license>
@@ -39,37 +39,14 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                     <encoding>UTF-8</encoding>
                     <outputFileName>${project.artifactId}</outputFileName>
                     <!--Use this comments args when compiler is NullPointerException-->
                     <!--<forceJavacCompilerUse>true</forceJavacCompilerUse>-->
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.1</version>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                    <!--<aggregate>true</aggregate>
-                    <charmvnset>UTF-8</charmvnset>
-                    <docencoding>UTF-8</docencoding>-->
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <failOnError>false</failOnError>
-                            <!--<additionalparam>-Xdoclint:none</additionalparam>-->
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -98,6 +75,10 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+        <repository>
+            <id>quickshop-repo</id>
+            <url>https://repo.codemc.io/repository/maven-public/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -122,7 +103,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
+            <version>1.18.24</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -134,20 +115,14 @@
         <dependency>
             <groupId>com.github.TechFortress</groupId>
             <artifactId>GriefPrevention</artifactId>
-            <version>16.7.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bukkit</groupId>
-                    <artifactId>bukkit</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>16.18</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.maxgamer</groupId>
             <artifactId>QuickShop</artifactId>
-            <version>Reremake 3.0.2</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/QuickShop-Reremake.2.4.9.jar</systemPath>
+            <version>5.1.0.9</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/GriefPreventionListener.java b/src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/GriefPreventionListener.java
index 3df15e2..635a1b6 100644
--- a/src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/GriefPreventionListener.java
+++ b/src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/GriefPreventionListener.java
@@ -9,10 +9,9 @@ import me.ryanhamshire.GriefPrevention.events.ClaimExpirationEvent;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.maxgamer.quickshop.Event.ShopPreCreateEvent;
 import org.maxgamer.quickshop.QuickShop;
-import org.maxgamer.quickshop.Shop.ContainerShop;
-import org.maxgamer.quickshop.Shop.Shop;
+import org.maxgamer.quickshop.api.shop.Shop;
+import org.maxgamer.quickshop.shop.ContainerShop;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/QuickShopListener.java b/src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/QuickShopListener.java
index 45b9828..1427053 100644
--- a/src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/QuickShopListener.java
+++ b/src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/QuickShopListener.java
@@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.maxgamer.quickshop.Event.ShopPreCreateEvent;
+import org.maxgamer.quickshop.api.event.ShopPreCreateEvent;
 
 import java.util.Optional;
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 73e01e7..3e9b193 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,12 +1,12 @@
 name: ${name}
 main: ${package}.${name}
 version: ${project.version}
-authors: [Judgetread, Ajoobe]
+authors: [astro_bea, Judgetread, Ajoobe]
 
 description: QuickShop Reremake GriefPrevtion Bridge
 softdepend: [GriefPrevention, QuickShop]
 
-api-version: 1.13
+api-version: 1.18
 
 commands:
   GriefPreventionQuickShopBridge: