Update dependencies

Shevchik · Nov 6, 2020 · 826f8f8 · 826f8f8
1 parent d8e42c3
commit 826f8f8
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 46 deletions.
diff --git a/libs/downloads.txt b/libs/downloads.txt
@@ -6,15 +6,9 @@ download paperclip and run server.
 then, copy ./cache/patched_<version>.jar into libs.
 finally, rename patched_<version>.jar to paperspigot.jar
 
-PreciousStones
-http://jenkins.elmakers.com/job/PreciousStones/
-
 Factions & MassiveCore
 https://www.spigotmc.org/resources/factions3-for-1-13.63602/
 
-Towny
-https://www.spigotmc.org/resources/towny-advanced.72694/
-
 Residence
 https://zrips.net/Residence/
 

diff --git a/pom.xml b/pom.xml
@@ -14,37 +14,38 @@
             <id>enginehub-maven</id>
             <url>https://maven.enginehub.org/repo/</url>
         </repository>
-        <repository>
-            <id>vault-repo</id>
-            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
-        </repository>
         <repository>
             <id>essentialsx-repo</id>
             <url>https://ci.ender.zone/plugin/repository/everything/</url>
         </repository>
+        <repository>
+            <!-- PresiousStones repo -->
+            <id>elMakers-repo</id>
+            <url>http://maven.elmakers.com/repository/</url>
+        </repository>
     </repositories>
 
     <dependencies>
         <!-- zlibs -->
         <dependency>
             <groupId>com.dropbox.core</groupId>
             <artifactId>dropbox-core-sdk</artifactId>
-            <version>3.1.3</version>
+            <version>3.1.5</version>
         </dependency>
         <dependency>
             <groupId>com.google.api-client</groupId>
             <artifactId>google-api-client</artifactId>
-            <version>1.30.7</version>
+            <version>1.30.11</version>
         </dependency>
         <dependency>
             <groupId>com.google.apis</groupId>
             <artifactId>google-api-services-drive</artifactId>
-            <version>v3-rev20191108-1.30.3</version>
+            <version>v3-rev197-1.25.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.auth</groupId>
             <artifactId>google-auth-library-oauth2-http</artifactId>
-            <version>0.19.0</version>
+            <version>0.22.0</version>
         </dependency>
         <dependency>
             <groupId>com.jcraft</groupId>
@@ -54,44 +55,38 @@
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>3.6</version>
+            <version>3.7.2</version>
         </dependency>
 
         <!-- available dependency -->
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>7.0.0-SNAPSHOT</version>
+            <version>7.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.0</version>
+            <version>7.0.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>net.milkbowl.vault</groupId>
-            <artifactId>Vault</artifactId>
-            <version>1.7.3</version>
+            <groupId>com.github.MilkBowl</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.7</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.ess3</groupId>
             <artifactId>EssentialsX</artifactId>
-            <version>2.17.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.griefcraft.lwc</groupId>
-            <artifactId>LWCX</artifactId>
-            <version>2.2.0</version>
+            <version>2.18.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.griefcraft.lwc</groupId>
             <artifactId>LWCX</artifactId>
-            <version>2.2.0</version>
+            <version>2.2.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -106,12 +101,24 @@
             <version>v0.2.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>net.sacredlabyrinth.Phaed</groupId>
+            <artifactId>PreciousStones</artifactId>
+            <version>1.16.1.12</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.TownyAdvanced</groupId>
+            <artifactId>Towny</artifactId>
+            <version>0.96.3.0</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- unavailable libs in maven repo -->
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>
             <artifactId>paper</artifactId>
-            <version>1.15.2-R0.1-SNAPSHOT</version>
+            <version>1.16.4-R0.1-SNAPSHOT</version>
             <scope>system</scope>
             <systemPath>${basedir}/libs/paperspigot.jar</systemPath>
         </dependency>
@@ -129,27 +136,13 @@
             <scope>system</scope>
             <systemPath>${basedir}/libs/Factions.jar</systemPath>
         </dependency>
-        <dependency>
-            <groupId>net.sacredlabyrinth.Phaed</groupId>
-            <artifactId>PreciousStones</artifactId>
-            <version>9.5.5</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/libs/PreciousStones.jar</systemPath>
-        </dependency>
         <dependency>
             <groupId>com.bekvon.bukkit.residence</groupId>
             <artifactId>Residence</artifactId>
-            <version>4.8.8.2</version>
+            <version>4.9.2.0</version>
             <scope>system</scope>
             <systemPath>${basedir}/libs/Residence.jar</systemPath>
         </dependency>
-        <dependency>
-            <groupId>com.palmergames.bukkit.towny</groupId>
-            <artifactId>Towny</artifactId>
-            <version>0.95.2.2</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/libs/Towny.jar</systemPath>
-        </dependency>
         <dependency>
             <groupId>io.github.mywarp.mywarp</groupId>
             <artifactId>MyWarp</artifactId>

diff --git a/src/main/java/autosaveworld/features/worldregen/plugins/PStonesDataProvider.java b/src/main/java/autosaveworld/features/worldregen/plugins/PStonesDataProvider.java
@@ -20,7 +20,7 @@
 import org.bukkit.World;
 
 import net.sacredlabyrinth.Phaed.PreciousStones.PreciousStones;
-import net.sacredlabyrinth.Phaed.PreciousStones.vectors.Field;
+import net.sacredlabyrinth.Phaed.PreciousStones.field.Field;
 
 public class PStonesDataProvider extends DataProvider {
 

diff --git a/src/main/java/autosaveworld/features/worldregen/plugins/TownyDataProvider.java b/src/main/java/autosaveworld/features/worldregen/plugins/TownyDataProvider.java
@@ -32,7 +32,7 @@ public TownyDataProvider(World world) throws Throwable {
 
 	@Override
 	protected void init() throws NotRegisteredException {
-		for (Town town : TownyAPI.getInstance().getDataSource().getWorld(world.getName()).getTowns()) {
+		for (Town town : TownyAPI.getInstance().getDataSource().getWorld(world.getName()).getTowns().values()) {
 			for (TownBlock tb : town.getTownBlocks()) {
 				if (tb.getWorld().getName().equalsIgnoreCase(world.getName())) {
 					addChunkAtCoord(tb.getX(), tb.getZ());