diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..dff5f3a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1 @@
+language: java
diff --git a/pom.xml b/pom.xml
index 2442a2d..b3803c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,14 @@
dynmap-repo
http://repo.mikeprimm.com/
+
+
+
+
+
+ sk89q-repo
+ http://maven.sk89q.com/repo/
+
@@ -59,19 +67,15 @@
1.7.10-R0.1-SNAPSHOT
- com.sk89q
- WorldGuard
- 7.0.0-beta-02
- system
- ${project.basedir}/worldguard-legacy-7.0.0-beta-02.jar
+ com.sk89q.worldguard
+ worldguard-core
+ 7.0.0-SNAPSHOT
- com.sk89q
- WorldEdit
- 7.0.0-beta-04
- system
- ${project.basedir}/worldedit-bukkit-7.0.0-beta-04.jar
+ com.sk89q.worldedit
+ worldedit-core
+ 7.0.0-SNAPSHOT
1.1-SNAPSHOT
-
\ No newline at end of file
+
diff --git a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
index 4f60c1e..52940e7 100644
--- a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
+++ b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
@@ -30,7 +30,6 @@ import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.domains.DefaultDomain;
import com.sk89q.worldguard.domains.PlayerDomain;
import com.sk89q.worldguard.internal.platform.WorldGuardPlatform;
@@ -42,7 +41,6 @@ import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
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;
@@ -51,9 +49,6 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
Plugin dynmap;
DynmapAPI api;
MarkerAPI markerapi;
- WorldGuardPlugin wg;
- private WorldGuardPlatform platform;
- private ProfileCache cache;
BooleanFlag boost_flag;
int updatesPerTick = 20;
@@ -118,9 +113,9 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
private String formatInfoWindow(ProtectedRegion region, AreaMarker m) {
String v = ""+infowindow+"
";
v = v.replace("%regionname%", m.getLabel());
- v = v.replace("%playerowners%", region.getOwners().toPlayersString(cache));
+ v = v.replace("%playerowners%", region.getOwners().toPlayersString(WorldGuard.getInstance().getProfileCache()));
v = v.replace("%groupowners%", region.getOwners().toGroupsString());
- v = v.replace("%playermembers%", region.getMembers().toPlayersString(cache));
+ v = v.replace("%playermembers%", region.getMembers().toPlayersString(WorldGuard.getInstance().getProfileCache()));
v = v.replace("%groupmembers%", region.getMembers().toGroupsString());
if(region.getParent() != null)
v = v.replace("%parent%", region.getParent().getId());
@@ -310,7 +305,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
List w = Bukkit.getWorlds();
worldsToDo = new ArrayList();
for (org.bukkit.World wrld : w) {
- worldsToDo.add(platform.getWorldByName(wrld.getName()));
+ worldsToDo.add(WorldGuard.getInstance().getPlatform().getMatcher().getWorldByName(wrld.getName()));
}
}
while (regionsToDo == null) { // No pending regions for world
@@ -327,7 +322,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
}
else {
curworld = worldsToDo.remove(0);
- RegionContainer rc = platform.getRegionContainer();
+ RegionContainer rc = WorldGuard.getInstance().getPlatform().getRegionContainer();
RegionManager rm = rc.get(curworld); /* Get region manager for world */
if(rm != null) {
Map regions = rm.getRegions(); /* Get all the regions */
@@ -364,9 +359,12 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
public void onPluginEnable(PluginEnableEvent event) {
Plugin p = event.getPlugin();
String name = p.getDescription().getName();
- if(name.equals("dynmap") || name.equals("WorldGuard")) {
- if(dynmap.isEnabled() && wg.isEnabled())
+ if(name.equals("dynmap")) {
+ Plugin wg = p.getServer().getPluginManager().getPlugin("WorldGuard");
+ if(wg != null && wg.isEnabled())
activate();
+ } else if(name.equals("WorldGuard") && dynmap.isEnabled()) {
+ activate();
}
}
}
@@ -382,20 +380,16 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
}
api = (DynmapAPI)dynmap; /* Get API */
/* Get WorldGuard */
- Plugin p = pm.getPlugin("WorldGuard");
- if(p == null) {
+ Plugin wgp = pm.getPlugin("WorldGuard");
+ if(wgp == null) {
severe("Cannot find WorldGuard!");
return;
}
- wg = (WorldGuardPlugin)p;
-
- platform = WorldGuard.getInstance().getPlatform();
- cache = WorldGuard.getInstance().getProfileCache();
getServer().getPluginManager().registerEvents(new OurServerListener(), this);
/* If both enabled, activate */
- if(dynmap.isEnabled() && wg.isEnabled())
+ if(dynmap.isEnabled() && wgp.isEnabled())
activate();
/* Start up metrics */
try {
diff --git a/worldedit-bukkit-7.0.0-beta-04.jar b/worldedit-bukkit-7.0.0-beta-04.jar
deleted file mode 100644
index d718515..0000000
Binary files a/worldedit-bukkit-7.0.0-beta-04.jar and /dev/null differ
diff --git a/worldguard-legacy-7.0.0-beta-02.jar b/worldguard-legacy-7.0.0-beta-02.jar
deleted file mode 100644
index 729457b..0000000
Binary files a/worldguard-legacy-7.0.0-beta-02.jar and /dev/null differ