Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for compass rose in all 8 cardinal directions

Browse source
This commit is contained in:
Mike Primm 2011-07-21 02:50:29 -05:00
parent b9882955af
commit ee3f07c6cd
13 changed files with 51 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/org/dynmap/DynmapPlugin.java
View file

@ -75,7 +75,7 @@ public class DynmapPlugin extends JavaPlugin {
/* Add/Replace branches in configuration tree with contribution from a separate file */
@SuppressWarnings("unchecked")
private void mergeConfigurationBranch(ConfigurationNode cfgnode, String branch, boolean replace_existing) {
private void mergeConfigurationBranch(ConfigurationNode cfgnode, String branch, boolean replace_existing, boolean islist) {
Object srcbranch = cfgnode.getObject(branch);
if(srcbranch == null)
return;
@ -86,9 +86,9 @@ public class DynmapPlugin extends JavaPlugin {
return;
}
/* If list, merge by "name" attribute */
if((srcbranch instanceof List) && (destbranch instanceof List)) {
List<ConfigurationNode> dest = (List<ConfigurationNode>)destbranch;
List<ConfigurationNode> src = (List<ConfigurationNode>)srcbranch;
if(islist) {
List<ConfigurationNode> dest = configuration.getNodes(branch);
List<ConfigurationNode> src = cfgnode.getNodes(branch);
/* Go through new records : see what to do with each */
for(ConfigurationNode node : src) {
String name = node.getString("name", null);
@ -96,7 +96,7 @@ public class DynmapPlugin extends JavaPlugin {
/* Walk destination - see if match */
boolean matched = false;
for(ConfigurationNode dnode : dest) {
String dname = node.getString("name", null);
String dname = dnode.getString("name", null);
if(dname == null) continue;
if(dname.equals(name)) { /* Match? */
if(replace_existing) {
@ -112,11 +112,12 @@ public class DynmapPlugin extends JavaPlugin {
dest.add(node);
}
}
configuration.put(branch,dest);
}
/* If configuration node, merge by key */
else if((srcbranch instanceof ConfigurationNode) && (destbranch instanceof ConfigurationNode)) {
ConfigurationNode src = (ConfigurationNode)srcbranch;
ConfigurationNode dest = (ConfigurationNode)destbranch;
else {
ConfigurationNode src = cfgnode.getNode(branch);
ConfigurationNode dest = configuration.getNode(branch);
for(String key : src.keySet()) { /* Check each contribution */
if(dest.containsKey(key)) { /* Exists? */
if(replace_existing) { /* If replacing, do so */
@ -173,7 +174,7 @@ public class DynmapPlugin extends JavaPlugin {
org.bukkit.util.config.Configuration cfg = new org.bukkit.util.config.Configuration(f);
cfg.load();
ConfigurationNode cn = new ConfigurationNode(cfg);
mergeConfigurationBranch(cn, "worlds", true);
mergeConfigurationBranch(cn, "worlds", true, true);
}
else {
try {
@ -192,7 +193,7 @@ public class DynmapPlugin extends JavaPlugin {
org.bukkit.util.config.Configuration cfg = new org.bukkit.util.config.Configuration(f);
cfg.load();
ConfigurationNode cn = new ConfigurationNode(cfg);
mergeConfigurationBranch(cn, "templates", false);
mergeConfigurationBranch(cn, "templates", false, false);
}
/* Now, process custom-templates.txt - these are user supplied, so override anything matcing */
@ -201,7 +202,7 @@ public class DynmapPlugin extends JavaPlugin {
org.bukkit.util.config.Configuration cfg = new org.bukkit.util.config.Configuration(f);
cfg.load();
ConfigurationNode cn = new ConfigurationNode(cfg);
mergeConfigurationBranch(cn, "templates", true);
mergeConfigurationBranch(cn, "templates", true, false);
}
else {
try {

1
src/main/java/org/dynmap/flat/FlatMap.java
View file

@ -518,6 +518,7 @@ public class FlatMap extends MapType {
s(o, "backgroundday", c.getString("backgroundday"));
s(o, "backgroundnight", c.getString("backgroundnight"));
s(o, "bigmap", this.isBigWorldMap(world));
s(o, "compassview", "S"); /* Always from south */
a(worldObject, "maps", o);
}
}

4
src/main/java/org/dynmap/hdmap/IsoHDPerspective.java
View file

@ -928,6 +928,7 @@ public class IsoHDPerspective implements HDPerspective {
return name;
}
private static String[] directions = { "N", "NE", "E", "SE", "S", "SW", "W", "NW" };
@Override
public void addClientConfiguration(JSONObject mapObject) {
s(mapObject, "perspective", name);
@ -936,5 +937,8 @@ public class IsoHDPerspective implements HDPerspective {
s(mapObject, "scale", scale);
s(mapObject, "worldtomap", world_to_map.toJSON());
s(mapObject, "maptoworld", map_to_world.toJSON());
int dir = ((360 + (int)(22.5+azimuth)) / 45) % 8;;
s(mapObject, "compassview", directions[dir]);
}
}

1
src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java
View file

@ -579,6 +579,7 @@ public class DefaultTileRenderer implements MapTileRenderer {
s(o, "backgroundday", c.getString("backgroundday"));
s(o, "backgroundnight", c.getString("backgroundnight"));
s(o, "bigmap", map.isBigWorldMap(world));
s(o, "compassview", "SE"); /* Always from southeast */
a(worldObject, "maps", o);
}
}