Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Java 1.6 Compliance. Dynmap as jar dependency. Their maven repo does not seem to work.

Browse Source
This commit is contained in:
Olof Larsson 2014-11-07 08:38:26 +01:00
parent 2ac847fe14
commit caeb907a03
7 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/dynmap-2.0.0.jar Normal file
View File

Binary file not shown.

BIN
media/Thumbs.db
View File

Binary file not shown.

24
pom.xml
View File

@ -33,8 +33,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
@ -47,14 +47,11 @@
<version>LATEST</version>
</dependency>
<dependency>
<groupId>us.dynmap</groupId>
<artifactId>dynmap-api</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>us.dynmap</groupId>
<artifactId>DynmapCore</artifactId>
<version>2.0.0-SNAPSHOT</version>
<groupId>org.dynmap</groupId>
<artifactId>dynmap</artifactId>
<version>2.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/dynmap-2.0.0.jar</systemPath>
</dependency>
<dependency>
<groupId>org.dthielke</groupId>
@ -72,11 +69,4 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>dynmap-repo</id>
<url>http://repo.mikeprimm.com/</url>
</repository>
</repositories>
</project>

2
src/main/java/com/massivecraft/factions/cmd/CmdFactions.java
View File

@ -99,7 +99,7 @@ public class CmdFactions extends FactionsCommand
this.addSubCommand(new CmdFactionsXDeprecated(this.cmdFactionsSet, "unclaim"));
this.addSubCommand(new CmdFactionsXDeprecated(this.cmdFactionsSet, "autoclaim"));
this.addSubCommand(new CmdFactionsXDeprecated(this.cmdFactionsSet, "unclaimall"));
this.addSubCommand(new CmdFactionsXDeprecated(this.cmdFactionsFlag, "open"));
this.addSubCommand(new CmdFactionsXDeprecated(this.cmdFactionsFaction, "show", "who"));
}

6
src/main/java/com/massivecraft/factions/entity/Board.java
View File

@ -202,7 +202,7 @@ public class Board extends Entity<Board> implements BoardInterface
@Override
public Map<Faction, Set<PS>> getFactionToChunks()
{
Map<Faction, Set<PS>> ret = new MassiveMap<>();
Map<Faction, Set<PS>> ret = new MassiveMap<Faction, Set<PS>>();
for (Entry<PS, TerritoryAccess> entry : this.map.entrySet())
{
@ -215,7 +215,7 @@ public class Board extends Entity<Board> implements BoardInterface
Set<PS> chunks = ret.get(faction);
if (chunks == null)
{
chunks = new MassiveSet<>();
chunks = new MassiveSet<PS>();
ret.put(faction, chunks);
}
@ -251,7 +251,7 @@ public class Board extends Entity<Board> implements BoardInterface
@Override
public Map<Faction, Integer> getFactionToCount()
{
Map<Faction, Integer> ret = new MassiveMap<>();
Map<Faction, Integer> ret = new MassiveMap<Faction, Integer>();
for (Entry<PS, TerritoryAccess> entry : this.map.entrySet())
{

4
src/main/java/com/massivecraft/factions/entity/BoardColl.java
View File

@ -171,7 +171,7 @@ public class BoardColl extends Coll<Board> implements BoardInterface
}
}
if (ret == null) ret = new MassiveMap<>();
if (ret == null) ret = new MassiveMap<Faction, Set<PS>>();
return ret;
}
@ -224,7 +224,7 @@ public class BoardColl extends Coll<Board> implements BoardInterface
}
}
if (ret == null) ret = new MassiveMap<>();
if (ret == null) ret = new MassiveMap<Faction, Integer>();
return ret;
}

2
src/main/java/com/massivecraft/factions/entity/MFlag.java
View File

@ -214,7 +214,7 @@ public class MFlag extends Entity<MFlag> implements Prioritized, Registerable
public String getStateDesc(boolean value, boolean withValue, boolean monospaceValue, boolean withName, boolean withDesc, boolean specificDesc)
{
List<String> parts = new MassiveList<>();
List<String> parts = new MassiveList<String>();
if (withValue)
{