diff --git a/libs/downloads.txt b/libs/downloads.txt index ed361ade..caed9448 100644 --- a/libs/downloads.txt +++ b/libs/downloads.txt @@ -6,15 +6,9 @@ download paperclip and run server. then, copy ./cache/patched_.jar into libs. finally, rename patched_.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 index 2f42ff40..61da86c3 100644 --- a/pom.xml +++ b/pom.xml @@ -14,14 +14,15 @@ enginehub-maven https://maven.enginehub.org/repo/ - - vault-repo - http://nexus.hc.to/content/repositories/pub_releases - essentialsx-repo https://ci.ender.zone/plugin/repository/everything/ + + + elMakers-repo + http://maven.elmakers.com/repository/ + @@ -29,22 +30,22 @@ com.dropbox.core dropbox-core-sdk - 3.1.3 + 3.1.5 com.google.api-client google-api-client - 1.30.7 + 1.30.11 com.google.apis google-api-services-drive - v3-rev20191108-1.30.3 + v3-rev197-1.25.0 com.google.auth google-auth-library-oauth2-http - 0.19.0 + 0.22.0 com.jcraft @@ -54,44 +55,38 @@ commons-net commons-net - 3.6 + 3.7.2 com.sk89q.worldedit worldedit-bukkit - 7.0.0-SNAPSHOT + 7.2.0 provided com.sk89q.worldguard worldguard-bukkit - 7.0.0 + 7.0.4 provided - net.milkbowl.vault - Vault - 1.7.3 + com.github.MilkBowl + VaultAPI + 1.7 provided net.ess3 EssentialsX - 2.17.0 - provided - - - com.griefcraft.lwc - LWCX - 2.2.0 + 2.18.1 provided com.griefcraft.lwc LWCX - 2.2.0 + 2.2.6 provided @@ -106,12 +101,24 @@ v0.2.0 provided + + net.sacredlabyrinth.Phaed + PreciousStones + 1.16.1.12 + provided + + + com.github.TownyAdvanced + Towny + 0.96.3.0 + provided + com.destroystokyo.paper paper - 1.15.2-R0.1-SNAPSHOT + 1.16.4-R0.1-SNAPSHOT system ${basedir}/libs/paperspigot.jar @@ -129,27 +136,13 @@ system ${basedir}/libs/Factions.jar - - net.sacredlabyrinth.Phaed - PreciousStones - 9.5.5 - system - ${basedir}/libs/PreciousStones.jar - com.bekvon.bukkit.residence Residence - 4.8.8.2 + 4.9.2.0 system ${basedir}/libs/Residence.jar - - com.palmergames.bukkit.towny - Towny - 0.95.2.2 - system - ${basedir}/libs/Towny.jar - io.github.mywarp.mywarp MyWarp diff --git a/src/main/java/autosaveworld/features/worldregen/plugins/PStonesDataProvider.java b/src/main/java/autosaveworld/features/worldregen/plugins/PStonesDataProvider.java index 7f25ddcf..1753f66a 100644 --- 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 index 92109322..15c6ea88 100644 --- 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());