Update for latest QuickShop and GriefPrevention versions
Pom file was cleaned with new dependencies, and imported classes have been fixed.
This commit is contained in:
parent
f82177cf22
commit
7c2ed6af7d
40
.idea/jarRepositories.xml
Normal file
40
.idea/jarRepositories.xml
Normal 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
49
pom.xml
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>com.github.judgetread</groupId>
|
<groupId>com.github.judgetread</groupId>
|
||||||
<artifactId>GriefPreventionQuickShopBridge</artifactId>
|
<artifactId>GriefPreventionQuickShopBridge</artifactId>
|
||||||
<version>1.1.1</version>
|
<version>1.2.0</version>
|
||||||
|
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
@ -39,37 +39,14 @@
|
|||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.8.1</version>
|
<version>3.8.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>1.8</source>
|
<source>17</source>
|
||||||
<target>1.8</target>
|
<target>17</target>
|
||||||
<encoding>UTF-8</encoding>
|
<encoding>UTF-8</encoding>
|
||||||
<outputFileName>${project.artifactId}</outputFileName>
|
<outputFileName>${project.artifactId}</outputFileName>
|
||||||
<!--Use this comments args when compiler is NullPointerException-->
|
<!--Use this comments args when compiler is NullPointerException-->
|
||||||
<!--<forceJavacCompilerUse>true</forceJavacCompilerUse>-->
|
<!--<forceJavacCompilerUse>true</forceJavacCompilerUse>-->
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</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>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
@ -98,6 +75,10 @@
|
|||||||
<id>jitpack.io</id>
|
<id>jitpack.io</id>
|
||||||
<url>https://jitpack.io</url>
|
<url>https://jitpack.io</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>quickshop-repo</id>
|
||||||
|
<url>https://repo.codemc.io/repository/maven-public/</url>
|
||||||
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@ -122,7 +103,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
<version>1.18.10</version>
|
<version>1.18.24</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -134,20 +115,14 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.TechFortress</groupId>
|
<groupId>com.github.TechFortress</groupId>
|
||||||
<artifactId>GriefPrevention</artifactId>
|
<artifactId>GriefPrevention</artifactId>
|
||||||
<version>16.7.1</version>
|
<version>16.18</version>
|
||||||
<exclusions>
|
<scope>provided</scope>
|
||||||
<exclusion>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>bukkit</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.maxgamer</groupId>
|
<groupId>org.maxgamer</groupId>
|
||||||
<artifactId>QuickShop</artifactId>
|
<artifactId>QuickShop</artifactId>
|
||||||
<version>Reremake 3.0.2</version>
|
<version>5.1.0.9</version>
|
||||||
<scope>system</scope>
|
<scope>provided</scope>
|
||||||
<systemPath>${basedir}/lib/QuickShop-Reremake.2.4.9.jar</systemPath>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
@ -9,10 +9,9 @@ import me.ryanhamshire.GriefPrevention.events.ClaimExpirationEvent;
|
|||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.maxgamer.quickshop.Event.ShopPreCreateEvent;
|
|
||||||
import org.maxgamer.quickshop.QuickShop;
|
import org.maxgamer.quickshop.QuickShop;
|
||||||
import org.maxgamer.quickshop.Shop.ContainerShop;
|
import org.maxgamer.quickshop.api.shop.Shop;
|
||||||
import org.maxgamer.quickshop.Shop.Shop;
|
import org.maxgamer.quickshop.shop.ContainerShop;
|
||||||
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
|
|||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.maxgamer.quickshop.Event.ShopPreCreateEvent;
|
import org.maxgamer.quickshop.api.event.ShopPreCreateEvent;
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
name: ${name}
|
name: ${name}
|
||||||
main: ${package}.${name}
|
main: ${package}.${name}
|
||||||
version: ${project.version}
|
version: ${project.version}
|
||||||
authors: [Judgetread, Ajoobe]
|
authors: [astro_bea, Judgetread, Ajoobe]
|
||||||
|
|
||||||
description: QuickShop Reremake GriefPrevtion Bridge
|
description: QuickShop Reremake GriefPrevtion Bridge
|
||||||
softdepend: [GriefPrevention, QuickShop]
|
softdepend: [GriefPrevention, QuickShop]
|
||||||
|
|
||||||
api-version: 1.13
|
api-version: 1.18
|
||||||
|
|
||||||
commands:
|
commands:
|
||||||
GriefPreventionQuickShopBridge:
|
GriefPreventionQuickShopBridge:
|
||||||
|
Loading…
Reference in New Issue
Block a user