Skip to content

Commit fc6e3fe

Browse files
committed
Update for Dynmap 1.7 - Add support for marking WG regions for resolution boosting
1 parent 337dd79 commit fc6e3fe

File tree

5 files changed

+12
-30
lines changed

5 files changed

+12
-30
lines changed

pom.xml

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,6 @@
3434
<target>1.6</target>
3535
</configuration>
3636
</plugin>
37-
<plugin>
38-
<artifactId>maven-assembly-plugin</artifactId>
39-
<configuration>
40-
<descriptors>
41-
<descriptor>src/main/assembly/package.xml</descriptor>
42-
</descriptors>
43-
<!-- Hack for bug in maven-assembly: http://jira.codehaus.org/browse/MASSEMBLY-449 -->
44-
<archiverConfig>
45-
<fileMode>420</fileMode> <!-- 420(dec) = 644(oct) -->
46-
<directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) -->
47-
<defaultDirectoryMode>493</defaultDirectoryMode>
48-
</archiverConfig>
49-
</configuration>
50-
51-
<executions>
52-
<execution>
53-
<id>build</id>
54-
<phase>package</phase>
55-
<goals>
56-
<goal>single</goal>
57-
</goals>
58-
</execution>
59-
</executions>
60-
</plugin>
6137
</plugins>
6238
</build>
6339

@@ -84,26 +60,26 @@
8460
<dependency>
8561
<groupId>org.dynmap</groupId>
8662
<artifactId>dynmap-api</artifactId>
87-
<version>1.3</version>
63+
<version>1.7</version>
8864
</dependency>
8965
<dependency>
9066
<groupId>org.bukkit</groupId>
9167
<artifactId>bukkit</artifactId>
92-
<version>1.4.5-R1.0</version>
68+
<version>1.5.2-R0.1</version>
9369
</dependency>
9470
<dependency>
9571
<groupId>com.sk89q</groupId>
9672
<artifactId>WorldGuard</artifactId>
97-
<version>5.7</version>
73+
<version>5.7.3</version>
9874
<scope>system</scope>
99-
<systemPath>${project.basedir}/worldguard-5.7.jar</systemPath>
75+
<systemPath>${project.basedir}/worldguard-5.7.3.jar</systemPath>
10076
</dependency>
10177
<dependency>
10278
<groupId>com.sk89q</groupId>
10379
<artifactId>WorldEdit</artifactId>
104-
<version>5.5</version>
80+
<version>5.5.6</version>
10581
<scope>system</scope>
106-
<systemPath>${project.basedir}/worldedit-5.5.jar</systemPath>
82+
<systemPath>${project.basedir}/worldedit-5.5.6.jar</systemPath>
10783
</dependency>
10884
</dependencies>
10985
</project>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ private static class AreaStyle {
6868
String fillcolor;
6969
double fillopacity;
7070
String label;
71+
boolean boost;
7172

7273
AreaStyle(FileConfiguration cfg, String path, AreaStyle def) {
7374
strokecolor = cfg.getString(path+".strokeColor", def.strokecolor);
@@ -77,6 +78,7 @@ private static class AreaStyle {
7778
fillcolor = cfg.getString(path+".fillColor", def.fillcolor);
7879
fillopacity = cfg.getDouble(path+".fillOpacity", def.fillopacity);
7980
label = cfg.getString(path+".label", null);
81+
boost = cfg.getBoolean(path+".boost", def.boost);
8082
}
8183

8284
AreaStyle(FileConfiguration cfg, String path) {
@@ -86,6 +88,7 @@ private static class AreaStyle {
8688
strokeweight = cfg.getInt(path+".strokeWeight", 3);
8789
fillcolor = cfg.getString(path+".fillColor", "#FF0000");
8890
fillopacity = cfg.getDouble(path+".fillOpacity", 0.35);
91+
boost = cfg.getBoolean(path+".boost", false);
8992
}
9093
}
9194

@@ -197,6 +200,7 @@ else if((tok.length >= 2) && resid.startsWith(tok[0]) && resid.endsWith(tok[1]))
197200
if(as.label != null) {
198201
m.setLabel(as.label);
199202
}
203+
m.setBoostFlag(as.boost);
200204
}
201205

202206
/* Handle specific region */

src/main/resources/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ regionstyle:
2626
fillColor: "#FF0000"
2727
fillOpacity: 0.35
2828
unownedStrokeColor: "#00FF00"
29+
boost: false
2930

3031
# Optional setting to limit which regions to show, by name - if commented out, all regions are shown
3132
# To show all regions on a given world, add 'world:<worldname>' to the list
@@ -40,6 +41,7 @@ hiddenregions: [ ]
4041
custstyle:
4142
customregion1:
4243
strokeColor: "#00FF00"
44+
boost: true
4345

4446
# Optional per-owner overrides for regionstyle (lower priority than custstyle) - works for group or user names
4547
ownerstyle:
747 KB
Binary file not shown.
316 KB
Binary file not shown.

0 commit comments

Comments
 (0)