Update for Dynmap 1.7 - Add support for marking WG regions for resolution boosting

recommended
Mike Primm 12 years ago
parent 337dd79159
commit fc6e3fe7ef
  1. 36
      pom.xml
  2. 4
      src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
  3. 2
      src/main/resources/config.yml
  4. BIN
      worldedit-5.5.6.jar
  5. BIN
      worldguard-5.7.3.jar

@ -34,30 +34,6 @@
<target>1.6</target> <target>1.6</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
</descriptors>
<!-- Hack for bug in maven-assembly: http://jira.codehaus.org/browse/MASSEMBLY-449 -->
<archiverConfig>
<fileMode>420</fileMode> <!-- 420(dec) = 644(oct) -->
<directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) -->
<defaultDirectoryMode>493</defaultDirectoryMode>
</archiverConfig>
</configuration>
<executions>
<execution>
<id>build</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
@ -84,26 +60,26 @@
<dependency> <dependency>
<groupId>org.dynmap</groupId> <groupId>org.dynmap</groupId>
<artifactId>dynmap-api</artifactId> <artifactId>dynmap-api</artifactId>
<version>1.3</version> <version>1.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.4.5-R1.0</version> <version>1.5.2-R0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sk89q</groupId> <groupId>com.sk89q</groupId>
<artifactId>WorldGuard</artifactId> <artifactId>WorldGuard</artifactId>
<version>5.7</version> <version>5.7.3</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/worldguard-5.7.jar</systemPath> <systemPath>${project.basedir}/worldguard-5.7.3.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sk89q</groupId> <groupId>com.sk89q</groupId>
<artifactId>WorldEdit</artifactId> <artifactId>WorldEdit</artifactId>
<version>5.5</version> <version>5.5.6</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/worldedit-5.5.jar</systemPath> <systemPath>${project.basedir}/worldedit-5.5.6.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

@ -68,6 +68,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
String fillcolor; String fillcolor;
double fillopacity; double fillopacity;
String label; String label;
boolean boost;
AreaStyle(FileConfiguration cfg, String path, AreaStyle def) { AreaStyle(FileConfiguration cfg, String path, AreaStyle def) {
strokecolor = cfg.getString(path+".strokeColor", def.strokecolor); strokecolor = cfg.getString(path+".strokeColor", def.strokecolor);
@ -77,6 +78,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
fillcolor = cfg.getString(path+".fillColor", def.fillcolor); fillcolor = cfg.getString(path+".fillColor", def.fillcolor);
fillopacity = cfg.getDouble(path+".fillOpacity", def.fillopacity); fillopacity = cfg.getDouble(path+".fillOpacity", def.fillopacity);
label = cfg.getString(path+".label", null); label = cfg.getString(path+".label", null);
boost = cfg.getBoolean(path+".boost", def.boost);
} }
AreaStyle(FileConfiguration cfg, String path) { AreaStyle(FileConfiguration cfg, String path) {
@ -86,6 +88,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
strokeweight = cfg.getInt(path+".strokeWeight", 3); strokeweight = cfg.getInt(path+".strokeWeight", 3);
fillcolor = cfg.getString(path+".fillColor", "#FF0000"); fillcolor = cfg.getString(path+".fillColor", "#FF0000");
fillopacity = cfg.getDouble(path+".fillOpacity", 0.35); fillopacity = cfg.getDouble(path+".fillOpacity", 0.35);
boost = cfg.getBoolean(path+".boost", false);
} }
} }
@ -197,6 +200,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
if(as.label != null) { if(as.label != null) {
m.setLabel(as.label); m.setLabel(as.label);
} }
m.setBoostFlag(as.boost);
} }
/* Handle specific region */ /* Handle specific region */

@ -26,6 +26,7 @@ regionstyle:
fillColor: "#FF0000" fillColor: "#FF0000"
fillOpacity: 0.35 fillOpacity: 0.35
unownedStrokeColor: "#00FF00" unownedStrokeColor: "#00FF00"
boost: false
# Optional setting to limit which regions to show, by name - if commented out, all regions are shown # Optional setting to limit which regions to show, by name - if commented out, all regions are shown
# To show all regions on a given world, add 'world:<worldname>' to the list # To show all regions on a given world, add 'world:<worldname>' to the list
@ -40,6 +41,7 @@ hiddenregions: [ ]
custstyle: custstyle:
customregion1: customregion1:
strokeColor: "#00FF00" strokeColor: "#00FF00"
boost: true
# Optional per-owner overrides for regionstyle (lower priority than custstyle) - works for group or user names # Optional per-owner overrides for regionstyle (lower priority than custstyle) - works for group or user names
ownerstyle: ownerstyle:

Loading…
Cancel
Save