Update to 1.8.2, add 'boost' style attribute to enable resolution boosting
This commit is contained in:
parent
0e509bdd96
commit
2e0f40d059
Binary file not shown.
30
pom.xml
30
pom.xml
@ -34,30 +34,6 @@
|
||||
<target>1.6</target>
|
||||
</configuration>
|
||||
</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>
|
||||
</build>
|
||||
<repositories>
|
||||
@ -83,7 +59,7 @@
|
||||
<dependency>
|
||||
<groupId>org.dynmap</groupId>
|
||||
<artifactId>dynmap-api</artifactId>
|
||||
<version>1.0</version>
|
||||
<version>1.7</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.bukkit</groupId>
|
||||
@ -93,9 +69,9 @@
|
||||
<dependency>
|
||||
<groupId>com.massivecraft</groupId>
|
||||
<artifactId>Factions</artifactId>
|
||||
<version>1.8.0</version>
|
||||
<version>1.8.2</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${project.basedir}/Factions.jar</systemPath>
|
||||
<systemPath>${project.basedir}/Factions-1.8.2.jar</systemPath>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<properties>
|
||||
|
@ -83,6 +83,7 @@ public class DynmapFactionsPlugin extends JavaPlugin {
|
||||
double fillopacity;
|
||||
String homemarker;
|
||||
MarkerIcon homeicon;
|
||||
boolean boost;
|
||||
|
||||
AreaStyle(FileConfiguration cfg, String path, AreaStyle def) {
|
||||
strokecolor = cfg.getString(path+".strokeColor", def.strokecolor);
|
||||
@ -98,6 +99,7 @@ public class DynmapFactionsPlugin extends JavaPlugin {
|
||||
homeicon = markerapi.getMarkerIcon("blueicon");
|
||||
}
|
||||
}
|
||||
boost = cfg.getBoolean(path+".boost", def.boost);
|
||||
}
|
||||
|
||||
AreaStyle(FileConfiguration cfg, String path) {
|
||||
@ -114,6 +116,7 @@ public class DynmapFactionsPlugin extends JavaPlugin {
|
||||
homeicon = markerapi.getMarkerIcon("blueicon");
|
||||
}
|
||||
}
|
||||
boost = cfg.getBoolean(path+".boost", false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -259,6 +262,7 @@ public class DynmapFactionsPlugin extends JavaPlugin {
|
||||
}
|
||||
m.setLineStyle(as.strokeweight, as.strokeopacity, sc);
|
||||
m.setFillStyle(as.fillopacity, fc);
|
||||
m.setBoostFlag(as.boost);
|
||||
}
|
||||
|
||||
private MarkerIcon getMarkerIcon(String factname, Faction fact) {
|
||||
|
@ -26,6 +26,7 @@ regionstyle:
|
||||
fillColor: "#FF0000"
|
||||
fillOpacity: 0.35
|
||||
homeicon: "redflag"
|
||||
boost: false
|
||||
|
||||
# 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
|
||||
@ -40,6 +41,9 @@ custstyle:
|
||||
SafeZone:
|
||||
strokeColor: "#0000FF"
|
||||
fillColor: "#0000FF"
|
||||
boost: false
|
||||
WarZone:
|
||||
strokeColor: "#404040"
|
||||
fillColor: "#404040"
|
||||
boost: false
|
||||
|
Loading…
Reference in New Issue
Block a user