mirror of
https://github.com/webbukkit/dynmap.git
synced 2025-02-17 20:31:37 +01:00
Made colors load from jar when not found in filesystem.
This commit is contained in:
parent
4f0e89b1d8
commit
342a72f39f
@ -20,12 +20,12 @@
|
|||||||
<fileset dir="${bin}"/>
|
<fileset dir="${bin}"/>
|
||||||
<fileset file="${src}/main/resources/plugin.yml"/>
|
<fileset file="${src}/main/resources/plugin.yml"/>
|
||||||
<zipfileset dir="web" prefix="web/"/>
|
<zipfileset dir="web" prefix="web/"/>
|
||||||
|
<zipfileset file="${src}/main/resources/colors.txt"/>
|
||||||
</jar>
|
</jar>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="deploy" depends="dist">
|
<target name="deploy" depends="dist">
|
||||||
<copy file="${dist}/${pluginname}.jar" todir="${plugins}"/>
|
<copy file="${dist}/${pluginname}.jar" todir="${plugins}"/>
|
||||||
<copy file="colors.txt" todir="${minecraft}"/>
|
|
||||||
<copy todir="${http_root}">
|
<copy todir="${http_root}">
|
||||||
<fileset dir="web"/>
|
<fileset dir="web"/>
|
||||||
</copy>
|
</copy>
|
||||||
|
@ -82,6 +82,12 @@ public class MapManager extends Thread {
|
|||||||
this.debugger = debugger;
|
this.debugger = debugger;
|
||||||
this.staleQueue = new StaleQueue();
|
this.staleQueue = new StaleQueue();
|
||||||
|
|
||||||
|
|
||||||
|
File tilepathFile = new File(tilepath);
|
||||||
|
if (!tilepathFile.isDirectory())
|
||||||
|
tilepathFile.mkdirs();
|
||||||
|
|
||||||
|
|
||||||
serverport = 8123;
|
serverport = 8123;
|
||||||
bindaddress = "0.0.0.0";
|
bindaddress = "0.0.0.0";
|
||||||
//webPath = "/srv/http/dynmap/";
|
//webPath = "/srv/http/dynmap/";
|
||||||
|
@ -2,6 +2,8 @@ package org.dynmap.kzedmap;
|
|||||||
|
|
||||||
import java.awt.Color;
|
import java.awt.Color;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.InputStream;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Scanner;
|
import java.util.Scanner;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
@ -35,8 +37,11 @@ public class KzedMap extends Map {
|
|||||||
|
|
||||||
public KzedMap(MapManager manager, World world, Debugger debugger) {
|
public KzedMap(MapManager manager, World world, Debugger debugger) {
|
||||||
super(manager, world, debugger);
|
super(manager, world, debugger);
|
||||||
if (colors == null)
|
getDebugger().debug("Loading colors...");
|
||||||
|
if (colors == null) {
|
||||||
|
getDebugger().debug("Loading colors2...");
|
||||||
colors = loadColorSet("colors.txt");
|
colors = loadColorSet("colors.txt");
|
||||||
|
}
|
||||||
renderers = new MapTileRenderer[] {
|
renderers = new MapTileRenderer[] {
|
||||||
new DefaultTileRenderer("t", debugger),
|
new DefaultTileRenderer("t", debugger),
|
||||||
new CaveTileRenderer("ct", debugger),
|
new CaveTileRenderer("ct", debugger),
|
||||||
@ -312,14 +317,21 @@ public class KzedMap extends Map {
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public static java.util.Map<Integer, Color[]> loadColorSet(String colorsetpath) {
|
public java.util.Map<Integer, Color[]> loadColorSet(String colorsetpath) {
|
||||||
java.util.Map<Integer, Color[]> colors = new HashMap<Integer, Color[]>();
|
java.util.Map<Integer, Color[]> colors = new HashMap<Integer, Color[]>();
|
||||||
|
|
||||||
/* load colorset */
|
InputStream stream;
|
||||||
File cfile = new File(colorsetpath);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Scanner scanner = new Scanner(cfile);
|
/* load colorset */
|
||||||
|
File cfile = new File(colorsetpath);
|
||||||
|
if (cfile.exists()) {
|
||||||
|
stream = new FileInputStream(cfile);
|
||||||
|
} else {
|
||||||
|
stream = KzedMap.class.getResourceAsStream("/colors.txt");
|
||||||
|
}
|
||||||
|
|
||||||
|
Scanner scanner = new Scanner(stream);
|
||||||
int nc = 0;
|
int nc = 0;
|
||||||
while(scanner.hasNextLine()) {
|
while(scanner.hasNextLine()) {
|
||||||
String line = scanner.nextLine();
|
String line = scanner.nextLine();
|
||||||
@ -347,6 +359,7 @@ public class KzedMap extends Map {
|
|||||||
}
|
}
|
||||||
scanner.close();
|
scanner.close();
|
||||||
} catch(Exception e) {
|
} catch(Exception e) {
|
||||||
|
getDebugger().error("Could not load colors", e);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return colors;
|
return colors;
|
||||||
|
Loading…
Reference in New Issue
Block a user