EpicKnarvik97/Dynmap-Factions
EpicKnarvik97/Dynmap-Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.8.2, add 'boost' style attribute to enable resolution boosting

Browse Source
This commit is contained in:
Mike Primm 2013-05-16 23:59:49 -05:00
parent 0e509bdd96
commit 2e0f40d059
4 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Factions.jar → Factions-1.8.2.jar
View File

Binary file not shown.

30
pom.xml
View File

@ -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>
<repositories> <repositories>
@ -83,7 +59,7 @@
<dependency> <dependency>
<groupId>org.dynmap</groupId> <groupId>org.dynmap</groupId>
<artifactId>dynmap-api</artifactId> <artifactId>dynmap-api</artifactId>
<version>1.0</version> <version>1.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
@ -93,9 +69,9 @@
<dependency> <dependency>
<groupId>com.massivecraft</groupId> <groupId>com.massivecraft</groupId>
<artifactId>Factions</artifactId> <artifactId>Factions</artifactId>
<version>1.8.0</version> <version>1.8.2</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/Factions.jar</systemPath> <systemPath>${project.basedir}/Factions-1.8.2.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>

4
src/main/java/org/dynmap/factions/DynmapFactionsPlugin.java
View File

@ -83,6 +83,7 @@ public class DynmapFactionsPlugin extends JavaPlugin {
double fillopacity; double fillopacity;
String homemarker; String homemarker;
MarkerIcon homeicon; MarkerIcon homeicon;
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);
@ -98,6 +99,7 @@ public class DynmapFactionsPlugin extends JavaPlugin {
homeicon = markerapi.getMarkerIcon("blueicon"); homeicon = markerapi.getMarkerIcon("blueicon");
} }
} }
boost = cfg.getBoolean(path+".boost", def.boost);
} }
AreaStyle(FileConfiguration cfg, String path) { AreaStyle(FileConfiguration cfg, String path) {
@ -114,6 +116,7 @@ public class DynmapFactionsPlugin extends JavaPlugin {
homeicon = markerapi.getMarkerIcon("blueicon"); 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.setLineStyle(as.strokeweight, as.strokeopacity, sc);
m.setFillStyle(as.fillopacity, fc); m.setFillStyle(as.fillopacity, fc);
m.setBoostFlag(as.boost);
} }
private MarkerIcon getMarkerIcon(String factname, Faction fact) { private MarkerIcon getMarkerIcon(String factname, Faction fact) {

4
src/main/resources/config.yml
View File

@ -26,6 +26,7 @@ regionstyle:
fillColor: "#FF0000" fillColor: "#FF0000"
fillOpacity: 0.35 fillOpacity: 0.35
homeicon: "redflag" homeicon: "redflag"
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,9 @@ custstyle:
SafeZone: SafeZone:
strokeColor: "#0000FF" strokeColor: "#0000FF"
fillColor: "#0000FF" fillColor: "#0000FF"
boost: false
WarZone: WarZone:
strokeColor: "#404040" strokeColor: "#404040"
fillColor: "#404040" fillColor: "#404040"
boost: false