Skip to content

Commit 52858f8

Browse files
mikeprimmmikeprimm
committed
Initial update for WorldGuard 7.0.0
1 parent c467dbe commit 52858f8

File tree

8 files changed

+35
-55
lines changed

8 files changed

+35
-55
lines changed

‎WGCustomFlags-1.7.jar‎

-105 KB
Binary file not shown.

‎pom.xml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>us.dynmap</groupId>
5454
<artifactId>dynmap-api</artifactId>
55-
<version>2.2-SNAPSHOT</version>
55+
<version>3.0-SNAPSHOT</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>org.bukkit</groupId>
@@ -62,23 +62,16 @@
6262
<dependency>
6363
<groupId>com.sk89q</groupId>
6464
<artifactId>WorldGuard</artifactId>
65-
<version>6.1</version>
65+
<version>7.0.0-SNAPSHOT</version>
6666
<scope>system</scope>
67-
<systemPath>${project.basedir}/worldguard-6.1.jar</systemPath>
67+
<systemPath>${project.basedir}/worldguard-legacy-7.0.0-SNAPSHOT-dist.jar</systemPath>
6868
</dependency>
6969
<dependency>
7070
<groupId>com.sk89q</groupId>
7171
<artifactId>WorldEdit</artifactId>
72-
<version>6.1</version>
72+
<version>7.0.0-SNAPSHOT</version>
7373
<scope>system</scope>
74-
<systemPath>${project.basedir}/worldedit-bukkit-6.1.jar</systemPath>
75-
</dependency>
76-
<dependency>
77-
<groupId>com.sk89q</groupId>
78-
<artifactId>WGCustomFlags</artifactId>
79-
<version>1.7</version>
80-
<scope>system</scope>
81-
<systemPath>${project.basedir}/WGCustomFlags-1.7.jar</systemPath>
74+
<systemPath>${project.basedir}/worldedit-bukkit-7.0.0-SNAPSHOT-dist.jar</systemPath>
8275
</dependency>
8376
</dependencies>
8477
</project>

‎src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java‎

Lines changed: 29 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import java.util.logging.Level;
1212
import java.util.logging.Logger;
1313

14-
import org.bukkit.World;
14+
import org.bukkit.Bukkit;
1515
import org.bukkit.configuration.ConfigurationSection;
1616
import org.bukkit.configuration.file.FileConfiguration;
1717
import org.bukkit.event.EventHandler;
@@ -26,20 +26,23 @@
2626
import org.dynmap.markers.MarkerAPI;
2727
import org.dynmap.markers.MarkerSet;
2828

29-
import com.mewin.WGCustomFlags.WGCustomFlagsPlugin;
3029
import com.sk89q.worldedit.BlockVector;
3130
import com.sk89q.worldedit.BlockVector2D;
31+
import com.sk89q.worldedit.world.World;
32+
import com.sk89q.worldguard.WorldGuard;
3233
import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
3334
import com.sk89q.worldguard.domains.DefaultDomain;
3435
import com.sk89q.worldguard.domains.PlayerDomain;
36+
import com.sk89q.worldguard.internal.platform.WorldGuardPlatform;
3537
import com.sk89q.worldguard.protection.flags.BooleanFlag;
3638
import com.sk89q.worldguard.protection.flags.Flag;
39+
import com.sk89q.worldguard.protection.flags.Flags;
40+
import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
3741
import com.sk89q.worldguard.protection.managers.RegionManager;
3842
import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
3943
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
44+
import com.sk89q.worldguard.protection.regions.RegionContainer;
4045
import com.sk89q.worldguard.protection.regions.RegionType;
41-
import com.sk89q.worldguard.util.profile.Profile;
42-
import com.sk89q.worldguard.util.profile.cache.ProfileCache;
4346

4447
public class DynmapWorldGuardPlugin extends JavaPlugin {
4548
private static Logger log;
@@ -51,8 +54,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
5154
WorldGuardPlugin wg;
5255
BooleanFlag boost_flag;
5356
int updatesPerTick = 20;
54-
ProfileCache pc;
55-
57+
5658
FileConfiguration cfg;
5759
MarkerSet set;
5860
long updperiod;
@@ -70,6 +72,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
7072
@Override
7173
public void onLoad() {
7274
log = this.getLogger();
75+
this.registerCustomFlags();
7376
}
7477

7578
private static class AreaStyle {
@@ -109,13 +112,15 @@ public static void severe(String msg) {
109112
}
110113

111114
private Map<String, AreaMarker> resareas = new HashMap<String, AreaMarker>();
115+
private WorldGuardPlatform platform;
116+
public WorldGuardPlatform p;
112117

113118
private String formatInfoWindow(ProtectedRegion region, AreaMarker m) {
114119
String v = "<div class=\"regioninfo\">"+infowindow+"</div>";
115120
v = v.replace("%regionname%", m.getLabel());
116-
v = v.replace("%playerowners%", region.getOwners().toPlayersString(pc));
121+
v = v.replace("%playerowners%", region.getOwners().toPlayersString());
117122
v = v.replace("%groupowners%", region.getOwners().toGroupsString());
118-
v = v.replace("%playermembers%", region.getMembers().toPlayersString(pc));
123+
v = v.replace("%playermembers%", region.getMembers().toPlayersString());
119124
v = v.replace("%groupmembers%", region.getMembers().toGroupsString());
120125
if(region.getParent() != null)
121126
v = v.replace("%parent%", region.getParent().getId());
@@ -177,8 +182,7 @@ else if((tok.length >= 2) && resid.startsWith(tok[0]) && resid.endsWith(tok[1]))
177182
}
178183
}
179184
if (as == null) {
180-
for(UUID uuid : pd.getUniqueIds()) {
181-
String p = resolveUUID(uuid);
185+
for(String p : pd.getPlayers()) {
182186
if (p != null) {
183187
as = ownerstyle.get(p.toLowerCase());
184188
if (as != null) break;
@@ -226,15 +230,7 @@ else if((tok.length >= 2) && resid.startsWith(tok[0]) && resid.endsWith(tok[1]))
226230
m.setBoostFlag((b == null)?false:b.booleanValue());
227231
}
228232
}
229-
230-
private String resolveUUID(UUID uuid) {
231-
Profile p = pc.getIfPresent(uuid);
232-
if (p != null) {
233-
return p.getName();
234-
}
235-
return null;
236-
}
237-
233+
238234
/* Handle specific region */
239235
private void handleRegion(World world, ProtectedRegion region, Map<String, AreaMarker> newmap) {
240236
String name = region.getId();
@@ -311,7 +307,11 @@ public void run() {
311307
}
312308
// If worlds list isn't primed, prime it
313309
if (worldsToDo == null) {
314-
worldsToDo = new ArrayList<World>(getServer().getWorlds());
310+
List<org.bukkit.World> w = Bukkit.getWorlds();
311+
worldsToDo = new ArrayList<World>();
312+
for (org.bukkit.World wrld : w) {
313+
worldsToDo.add(platform.getWorldByName(wrld.getName()));
314+
}
315315
}
316316
while (regionsToDo == null) { // No pending regions for world
317317
if (worldsToDo.isEmpty()) { // No more worlds?
@@ -327,7 +327,8 @@ public void run() {
327327
}
328328
else {
329329
curworld = worldsToDo.remove(0);
330-
RegionManager rm = wg.getRegionManager(curworld); /* Get region manager for world */
330+
RegionContainer rc = platform.getRegionContainer();
331+
RegionManager rm = rc.get(curworld); /* Get region manager for world */
331332
if(rm != null) {
332333
Map<String,ProtectedRegion> regions = rm.getRegions(); /* Get all the regions */
333334
if ((regions != null) && (regions.isEmpty() == false)) {
@@ -387,11 +388,11 @@ public void onEnable() {
387388
return;
388389
}
389390
wg = (WorldGuardPlugin)p;
390-
pc = wg.getProfileCache();
391+
392+
platform = WorldGuard.getInstance().getPlatform();
391393

392394
getServer().getPluginManager().registerEvents(new OurServerListener(), this);
393395

394-
registerCustomFlags();
395396
/* If both enabled, activate */
396397
if(dynmap.isEnabled() && wg.isEnabled())
397398
activate();
@@ -403,28 +404,15 @@ public void onEnable() {
403404

404405
}
405406
}
406-
407-
private WGCustomFlagsPlugin getWGCustomFlags()
408-
{
409-
Plugin plugin = getServer().getPluginManager().getPlugin("WGCustomFlags");
410-
411-
if (plugin == null || !(plugin instanceof WGCustomFlagsPlugin))
412-
{
413-
return null;
414-
}
415-
416-
return (WGCustomFlagsPlugin) plugin;
417-
}
418407

419408
private void registerCustomFlags() {
420409
try {
421-
WGCustomFlagsPlugin cf = getWGCustomFlags();
422-
if (cf != null) {
423-
BooleanFlag bf = new BooleanFlag(BOOST_FLAG);
424-
cf.addCustomFlag(bf);
425-
boost_flag = bf;
426-
}
410+
BooleanFlag bf = new BooleanFlag(BOOST_FLAG);
411+
FlagRegistry fr = WorldGuard.getInstance().getFlagRegistry();
412+
fr.register(bf);
413+
boost_flag = bf;
427414
} catch (Exception x) {
415+
log.info("Error registering flag - " + x.getMessage());
428416
}
429417
if (boost_flag == null) {
430418
log.info("Custom flag '" + BOOST_FLAG + "' not registered - WGCustomFlags not found");

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ name: Dynmap-WorldGuard
22
main: org.dynmap.worldguard.DynmapWorldGuardPlugin
33
version: "${project.version}"
44
author: mikeprimm
5-
depend: [ dynmap, WorldGuard ]
6-
softdepend: [ WGCustomFlags ]
5+
depend: [ dynmap, WorldGuard ]
76

‎worldedit-bukkit-6.1.jar‎

-1.51 MB
Binary file not shown.

‎worldedit-bukkit-7.0.0-SNAPSHOT-dist.jar‎

1.38 MB
Binary file not shown.

‎worldguard-6.1.jar‎

-1.26 MB
Binary file not shown.

‎worldguard-legacy-7.0.0-SNAPSHOT-dist.jar‎

1.04 MB
Binary file not shown.

0 commit comments

Comments
 (0)