From b4c962ebe474628c9d24f8255087e766a8939109 Mon Sep 17 00:00:00 2001 From: MizPablito Date: Wed, 7 Aug 2019 21:53:54 +0200 Subject: [PATCH 1/5] Update for WE and WG to 7.0.1-SNAPSHOT --- .gitignore | 6 +++++- pom.xml | 11 +++-------- .../org/dynmap/worldguard/DynmapWorldGuardPlugin.java | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 408c231..a625408 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,8 @@ /manifest.mf # Mac filesystem dust -/.DS_Store \ No newline at end of file +/.DS_Store + +#IntelliJ IDEA +/.idea +*.iml \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5022b12..7479694 100644 --- a/pom.xml +++ b/pom.xml @@ -95,18 +95,13 @@ com.sk89q.worldguard worldguard-bukkit - 7.0.0 + 7.0.1-SNAPSHOT com.sk89q.worldedit worldedit-bukkit - 7.0.0 - - - com.sk89q - squirrelid - 0.2.0 + 7.0.1-SNAPSHOT - 1.2-SNAPSHOT + 1.3-SNAPSHOT diff --git a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java index 51df3b7..960cfd6 100644 --- a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java +++ b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java @@ -26,7 +26,6 @@ import org.dynmap.markers.MarkerAPI; import org.dynmap.markers.MarkerSet; -import com.sk89q.squirrelid.cache.ProfileCache; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.world.World; @@ -41,6 +40,7 @@ import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.RegionContainer; import com.sk89q.worldguard.protection.regions.RegionType; +import com.sk89q.worldguard.util.profile.cache.ProfileCache; public class DynmapWorldGuardPlugin extends JavaPlugin { private static Logger log; From 6261dd7de279186e9273146e1e17ebe08ce2f73f Mon Sep 17 00:00:00 2001 From: NgLoader Date: Fri, 22 Nov 2019 01:46:09 +0100 Subject: [PATCH 2/5] feat: updated to 1.14.4 --- pom.xml | 140 +++++++++--------- .../worldguard/DynmapWorldGuardPlugin.java | 2 +- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/pom.xml b/pom.xml index 5022b12..a721dce 100644 --- a/pom.xml +++ b/pom.xml @@ -1,30 +1,32 @@ - - 4.0.0 - org.dynmap - Dynmap-WorldGuard - - - - - src/main/resources - true - - *.yml - *.txt - - - - src/main/resources - false - - *.yml - *.txt - - - - - - + + 4.0.0 + org.dynmap + Dynmap-WorldGuard + + + + + src/main/resources + true + + *.yml + *.txt + + + + src/main/resources + false + + *.yml + *.txt + + + + + + org.apache.maven.plugins maven-compiler-plugin 2.0.2 @@ -59,54 +61,52 @@ - - - - + + + + - - - - dynmap-repo - http://repo.mikeprimm.com/ + https://repo.mikeprimm.com/ - - - - sk89q-repo - http://maven.sk89q.com/repo/ + https://maven.sk89q.com/repo/ + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - us.dynmap - dynmap-api - 3.0-SNAPSHOT - - - org.bukkit - bukkit - 1.7.10-R0.1-SNAPSHOT - - - com.sk89q.worldguard - worldguard-bukkit - 7.0.0 - - - com.sk89q.worldedit - worldedit-bukkit - 7.0.0 - - - com.sk89q - squirrelid - 0.2.0 - - - 1.2-SNAPSHOT + + + + us.dynmap + dynmap-api + 3.0-SNAPSHOT + + + org.spigotmc + spigot + 1.14.4-R0.1-SNAPSHOT + jar + provided + + + com.sk89q.worldguard + worldguard-bukkit + 7.0.1-SNAPSHOT + + + com.sk89q.worldedit + worldedit-bukkit + 7.1.0-SNAPSHOT + + + com.sk89q + squirrelid + 0.2.0-SNAPSHOT + + + 1.2-SNAPSHOT diff --git a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java index 51df3b7..960cfd6 100644 --- a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java +++ b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java @@ -26,7 +26,6 @@ import org.dynmap.markers.MarkerAPI; import org.dynmap.markers.MarkerSet; -import com.sk89q.squirrelid.cache.ProfileCache; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.world.World; @@ -41,6 +40,7 @@ import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.RegionContainer; import com.sk89q.worldguard.protection.regions.RegionType; +import com.sk89q.worldguard.util.profile.cache.ProfileCache; public class DynmapWorldGuardPlugin extends JavaPlugin { private static Logger log; From de151af5e689cfc121ad3c0015da1c58decdae4a Mon Sep 17 00:00:00 2001 From: Miles B Huff Date: Wed, 27 Nov 2019 16:47:35 -0500 Subject: [PATCH 3/5] Autobeautified --- pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6612a3f..13f71c7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 org.dynmap Dynmap-WorldGuard From b3765de5dd0bf63c6ec1f2d4cd3603469555ef70 Mon Sep 17 00:00:00 2001 From: Miles B Huff Date: Wed, 27 Nov 2019 16:49:28 -0500 Subject: [PATCH 4/5] Changed TeamWuffy's Spigot dependency back to a Bukkit dependency --- pom.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 13f71c7..d8db09f 100644 --- a/pom.xml +++ b/pom.xml @@ -84,12 +84,11 @@ 3.0-SNAPSHOT - org.spigotmc - spigot - 1.14.4-R0.1-SNAPSHOT - jar - provided - + org.bukkit + bukkit + 1.14.4-R0.1-SNAPSHOT + provided + com.sk89q.worldguard worldguard-bukkit From a10288e6ffcee62bc57699d7bd3bdc08ddc86ed2 Mon Sep 17 00:00:00 2001 From: Miles B Huff Date: Wed, 27 Nov 2019 17:02:45 -0500 Subject: [PATCH 5/5] Disabled https for sk89q due to build error --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d8db09f..cb7d685 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ sk89q-repo - https://maven.sk89q.com/repo/ + http://maven.sk89q.com/repo/ spigot-repo