SpigotMC/GriefPreventionQuickShopBridge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for latest QuickShop and GriefPrevention versions

Browse Source 
Pom file was cleaned with new dependencies, and imported classes have been fixed.
This commit is contained in:
Bea 2022-10-30 21:31:30 +01:00
parent f82177cf22
commit 7c2ed6af7d
5 changed files with 57 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.idea/jarRepositories.xml Normal file
View File

@ -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>

49
pom.xml
View File

@ -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>

5
src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/GriefPreventionListener.java
View File

@ -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;

2
src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/QuickShopListener.java
View File

@ -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;

4
src/main/resources/plugin.yml
View File

@ -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: