diff --git a/src/main/java/org/dynmap/DynmapPlugin.java b/src/main/java/org/dynmap/DynmapPlugin.java index 2413be87..150e1024 100644 --- a/src/main/java/org/dynmap/DynmapPlugin.java +++ b/src/main/java/org/dynmap/DynmapPlugin.java @@ -167,7 +167,8 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI { } /* Table of default templates - all are resources in dynmap.jar unnder templates/, and go in templates directory when needed */ private static final String[] stdtemplates = { "normal.txt", "nether.txt", "skylands.txt", "normal-lowres.txt", - "nether-lowres.txt", "skylands-lowres.txt", "normal-hires.txt", "nether-hires.txt", "skylands-hires.txt" + "nether-lowres.txt", "skylands-lowres.txt", "normal-hires.txt", "nether-hires.txt", "skylands-hires.txt", + "normal-vlowres.txt", "skylands-vlowres.txt", "nether-vlowres.txt" }; private static final String CUSTOM_PREFIX = "custom-"; diff --git a/src/main/resources/configuration.txt b/src/main/resources/configuration.txt index 226febfb..00f4b6dc 100644 --- a/src/main/resources/configuration.txt +++ b/src/main/resources/configuration.txt @@ -1,7 +1,12 @@ # All paths in this configuration file are relative to Dynmap's data-folder: minecraft_server/plugins/dynmap/ # All map templates are defined in the templates directory -# By default, the 'classic' FlatMap and KzedMap templates are used, which can be found in normal.txt, nether.txt, and skylands.txt +# The 'classic' FlatMap and KzedMap templates are used, which can be found in normal.txt, nether.txt, and skylands.txt +# To use these, do not set deftemplatesuffix (make sure deftemplatesuffix is commented, below) +# +# To use the HDMap very-low-res map templates as world defaults (normal-vlowres, nether-vlowres and skylands-vlowres), uncomment the following line +# The definitions of these templates are in normal-vlowres.txt, nether-vlowres.txt, and skylands-vlowres.txt +deftemplatesuffix: vlowres # # To use the HDMap low-res map templates as world defaults (normal-lowres, nether-lowres and skylands-lowres), uncomment the following line # The definitions of these templates are in normal-lowres.txt, nether-lowres.txt, and skylands-lowres.txt diff --git a/src/main/resources/perspectives.txt b/src/main/resources/perspectives.txt index cd20963d..2303b64a 100644 --- a/src/main/resources/perspectives.txt +++ b/src/main/resources/perspectives.txt @@ -17,6 +17,12 @@ perspectives: inclination: 60 scale: 1.4 # High angle (60 degree) views + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_S_60_vlowres + azimuth: 180 + inclination: 60 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_S_60_lowres azimuth: 180 @@ -35,6 +41,12 @@ perspectives: inclination: 60 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_SE_60_vlowres + azimuth: 135 + inclination: 60 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_SE_60_lowres azimuth: 135 @@ -53,6 +65,12 @@ perspectives: inclination: 60 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_E_60_vlowres + azimuth: 90 + inclination: 60 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_E_60_lowres azimuth: 90 @@ -71,6 +89,12 @@ perspectives: inclination: 60 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_NE_60_vlowres + azimuth: 45 + inclination: 60 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_NE_60_lowres azimuth: 45 @@ -89,6 +113,12 @@ perspectives: inclination: 60 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_N_60_vlowres + azimuth: 0 + inclination: 60 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_N_60_lowres azimuth: 0 @@ -107,6 +137,12 @@ perspectives: inclination: 60 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_NW_60_vlowres + azimuth: 315 + inclination: 60 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_NW_60_lowres azimuth: 315 @@ -125,6 +161,12 @@ perspectives: inclination: 60 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_W_60_vlowres + azimuth: 270 + inclination: 60 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_W_60_lowres azimuth: 270 @@ -143,6 +185,12 @@ perspectives: inclination: 60 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_SW_60_vlowres + azimuth: 225 + inclination: 60 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_SW_60_lowres azimuth: 225 @@ -162,6 +210,12 @@ perspectives: scale: 16 # Low angle perspectives (30 degrees) + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_S_30_vlowres + azimuth: 180 + inclination: 30 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_S_30_lowres azimuth: 180 @@ -180,6 +234,12 @@ perspectives: inclination: 30 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_SE_30_vlowres + azimuth: 135 + inclination: 30 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_SE_30_lowres azimuth: 135 @@ -198,6 +258,12 @@ perspectives: inclination: 30 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_E_30_vlowres + azimuth: 90 + inclination: 30 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_E_30_lowres azimuth: 90 @@ -216,6 +282,12 @@ perspectives: inclination: 30 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_NE_30_vlowres + azimuth: 45 + inclination: 30 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_NE_30_lowres azimuth: 45 @@ -234,6 +306,12 @@ perspectives: inclination: 30 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_N_30_vlowres + azimuth: 0 + inclination: 30 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_N_30_lowres azimuth: 0 @@ -252,6 +330,12 @@ perspectives: inclination: 30 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_NW_30_vlowres + azimuth: 315 + inclination: 30 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_NW_30_lowres azimuth: 315 @@ -270,6 +354,12 @@ perspectives: inclination: 30 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_W_30_vlowres + azimuth: 270 + inclination: 30 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_W_30_lowres azimuth: 270 @@ -288,6 +378,12 @@ perspectives: inclination: 30 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_SW_30_vlowres + azimuth: 225 + inclination: 30 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_SW_30_lowres azimuth: 225 @@ -307,6 +403,12 @@ perspectives: scale: 16 # Vertical perspectives (90 deg) + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_N_90_vlowres + azimuth: 0 + inclination: 90 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_N_90_lowres azimuth: 0 @@ -325,6 +427,12 @@ perspectives: inclination: 90 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_S_90_vlowres + azimuth: 180 + inclination: 90 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_S_90_lowres azimuth: 180 @@ -343,6 +451,12 @@ perspectives: inclination: 90 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_E_90_vlowres + azimuth: 90 + inclination: 90 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_E_90_lowres azimuth: 90 @@ -361,6 +475,12 @@ perspectives: inclination: 90 scale: 16 + - class: org.dynmap.hdmap.IsoHDPerspective + name: iso_W_90_vlowres + azimuth: 270 + inclination: 90 + scale: 2 + - class: org.dynmap.hdmap.IsoHDPerspective name: iso_W_90_lowres azimuth: 270 diff --git a/src/main/resources/templates/nether-hires.txt b/src/main/resources/templates/nether-hires.txt index b6c6abd3..eb364539 100644 --- a/src/main/resources/templates/nether-hires.txt +++ b/src/main/resources/templates/nether-hires.txt @@ -22,7 +22,7 @@ templates: prefix: flat perspective: iso_S_90_lowres shader: stdtexture - lighting: default + lighting: nethershadows # Map background color (day or night) background: "#300806" mapzoomin: 1 diff --git a/src/main/resources/templates/nether-lowres.txt b/src/main/resources/templates/nether-lowres.txt index 75c89820..014a271f 100644 --- a/src/main/resources/templates/nether-lowres.txt +++ b/src/main/resources/templates/nether-lowres.txt @@ -22,7 +22,7 @@ templates: prefix: flat perspective: iso_S_90_lowres shader: stdtexture - lighting: default + lighting: nethershadows # Map background color (day or night) background: "#300806" # Adjust extra zoom in levels - default is 2 diff --git a/src/main/resources/templates/nether-vlowres.txt b/src/main/resources/templates/nether-vlowres.txt new file mode 100644 index 00000000..b092bf5f --- /dev/null +++ b/src/main/resources/templates/nether-vlowres.txt @@ -0,0 +1,40 @@ +version: 0.24 +# +# Default template for "Nether" environment worlds (deftemplatesuffix="vlowres") +# Uses the HDMap renderer with view from the SE with the "vlowres" resolution (2 pixels per block edge) +# +# This file MAY need to be replaced during an upgrade - rename file to 'custom-nether-vlowres.txt' if you wish to customize it +# +templates: + # Nether world template (HDMap vlowres) + nether-vlowres: + enabled: true + # Number of extra zoom-out levels for world (each level is twice as big as the previous one) + extrazoomout: 2 + #center: + # x: 0 + # y: 64 + # z: 0 + maps: + - class: org.dynmap.hdmap.HDMap + name: flat + title: "Flat" + prefix: flat + perspective: iso_S_90_vlowres + shader: stdtexture + lighting: nethershadows + # Map background color (day or night) + background: "#300806" + # Adjust extra zoom in levels - default is 2 + mapzoomin: 2 + - class: org.dynmap.hdmap.HDMap + name: nether + title: "Surface" + prefix: nt + perspective: iso_SE_60_vlowres + shader: stdtexture + lighting: nethershadows + # Map background color (day or night) + background: "#300806" + # Adjust extra zoom in levels - default is 2 + mapzoomin: 2 diff --git a/src/main/resources/templates/normal-hires.txt b/src/main/resources/templates/normal-hires.txt index aede4349..e1b84f37 100644 --- a/src/main/resources/templates/normal-hires.txt +++ b/src/main/resources/templates/normal-hires.txt @@ -22,7 +22,7 @@ templates: prefix: flat perspective: iso_S_90_lowres shader: stdtexture - lighting: default + lighting: shadows mapzoomin: 1 - class: org.dynmap.hdmap.HDMap name: surface diff --git a/src/main/resources/templates/normal-lowres.txt b/src/main/resources/templates/normal-lowres.txt index 1934ac63..20b1c8bc 100644 --- a/src/main/resources/templates/normal-lowres.txt +++ b/src/main/resources/templates/normal-lowres.txt @@ -22,7 +22,7 @@ templates: prefix: flat perspective: iso_S_90_lowres shader: stdtexture - lighting: default + lighting: shadows # Adjust extra zoom in levels - default is 2 mapzoomin: 2 - class: org.dynmap.hdmap.HDMap diff --git a/src/main/resources/templates/normal-vlowres.txt b/src/main/resources/templates/normal-vlowres.txt new file mode 100644 index 00000000..1c11ab56 --- /dev/null +++ b/src/main/resources/templates/normal-vlowres.txt @@ -0,0 +1,45 @@ +version: 0.24 +# +# Default template for "Normal" environment worlds (deftemplatesuffix="vlowres") +# Uses the HDMap renderer with view from the SE with the "vlowres" resolution (2 pixels per block edge) +# +# This file MAY need to be replaced during an upgrade - rename file to 'custom-normal-vlowres.txt' if you wish to customize it +# +templates: + # Template for normal world (HDMap vlowres) + normal-vlowres: + enabled: true + # Number of extra zoom-out levels for world (each level is twice as big as the previous one) + extrazoomout: 2 + #center: + # x: 0 + # y: 64 + # z: 0 + maps: + - class: org.dynmap.hdmap.HDMap + name: flat + title: "Flat" + prefix: flat + perspective: iso_S_90_vlowres + shader: stdtexture + lighting: shadows + # Adjust extra zoom in levels - default is 2 + mapzoomin: 2 + - class: org.dynmap.hdmap.HDMap + name: surface + title: "Surface" + prefix: t + perspective: iso_SE_60_vlowres + shader: stdtexture + lighting: shadows + # Adjust extra zoom in levels - default is 2 + mapzoomin: 2 + - class: org.dynmap.hdmap.HDMap + name: cave + title: "Cave" + prefix: ct + perspective: iso_SE_60_vlowres + shader: cave + lighting: default + # Adjust extra zoom in levels - default is 2 + mapzoomin: 2 diff --git a/src/main/resources/templates/skylands-hires.txt b/src/main/resources/templates/skylands-hires.txt index 9340788f..0a537bef 100644 --- a/src/main/resources/templates/skylands-hires.txt +++ b/src/main/resources/templates/skylands-hires.txt @@ -22,7 +22,7 @@ templates: prefix: flat perspective: iso_S_90_lowres shader: stdtexture - lighting: default + lighting: shadows # Background color for map during the day backgroundday: "#153E7E" # Background color for map during the night diff --git a/src/main/resources/templates/skylands-lowres.txt b/src/main/resources/templates/skylands-lowres.txt index 8895adc3..4a0a7fb4 100644 --- a/src/main/resources/templates/skylands-lowres.txt +++ b/src/main/resources/templates/skylands-lowres.txt @@ -22,7 +22,7 @@ templates: prefix: flat perspective: iso_S_90_lowres shader: stdtexture - lighting: default + lighting: shadows # Background color for map during the day backgroundday: "#153E7E" # Background color for map during the night diff --git a/src/main/resources/templates/skylands-vlowres.txt b/src/main/resources/templates/skylands-vlowres.txt new file mode 100644 index 00000000..6f608959 --- /dev/null +++ b/src/main/resources/templates/skylands-vlowres.txt @@ -0,0 +1,45 @@ +version: 0.24 +# +# Default template for "Skylands" environment worlds (deftemplatesuffix="vlowres") +# Uses the HDMap renderer with view from the SE with the "vlowres" resolution (2 pixels per block edge) +# +# This file MAY need to be replaced during an upgrade - rename file to 'custom-skylands-vlowres.txt' if you wish to customize it +# +templates: + # Skylands world template (HDMap vlowres) + skylands-vlowres: + enabled: true + # Number of extra zoom-out levels for world (each level is twice as big as the previous one) + extrazoomout: 2 + #center: + # x: 0 + # y: 64 + # z: 0 + maps: + - class: org.dynmap.hdmap.HDMap + name: flat + title: "Flat" + prefix: flat + perspective: iso_S_90_vlowres + shader: stdtexture + lighting: shadows + # Background color for map during the day + backgroundday: "#153E7E" + # Background color for map during the night + backgroundnight: "#000000" + # Adjust extra zoom in levels - default is 2 + mapzoomin: 2 + - class: org.dynmap.hdmap.HDMap + name: skylands + title: "Surface" + prefix: st + perspective: iso_SE_60_vlowres + shader: stdtexture + lighting: shadows + # Background color for map during the day + backgroundday: "#153E7E" + # Background color for map during the night + backgroundnight: "#000000" + # Adjust extra zoom in levels - default is 2 + mapzoomin: 2 + \ No newline at end of file