Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-25 03:35:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #395 from mikeprimm/master

Browse Source 
Handle texture packs that do not include all required files
This commit is contained in:
mikeprimm 2011-08-10 12:58:30 -07:00
commit 0a60c35be0
1 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/org/dynmap/hdmap/TexturePack.java
View File

@ -54,6 +54,7 @@ public class TexturePack {
private static final String CUSTOMWATERSTILL_PNG = "custom_water_still.png"; private static final String CUSTOMWATERSTILL_PNG = "custom_water_still.png";
private static final String CUSTOMWATERFLOWING_PNG = "custom_water_flowing.png"; private static final String CUSTOMWATERFLOWING_PNG = "custom_water_flowing.png";
private static final String STANDARDTP = "standard";
/* Color modifier codes (x1000 for value in mapping code) */ /* Color modifier codes (x1000 for value in mapping code) */
private static final int COLORMOD_NONE = 0; private static final int COLORMOD_NONE = 0;
private static final int COLORMOD_GRASSTONED = 1; private static final int COLORMOD_GRASSTONED = 1;
@ -190,36 +191,57 @@ public class TexturePack {
/* Try to open zip */ /* Try to open zip */
zf = new ZipFile(f); zf = new ZipFile(f);
/* Find and load terrain.png */ /* Find and load terrain.png */
InputStream is;
ZipEntry ze = zf.getEntry(TERRAIN_PNG); /* Try to find terrain.png */ ZipEntry ze = zf.getEntry(TERRAIN_PNG); /* Try to find terrain.png */
if(ze == null) { if(ze == null) {
throw new FileNotFoundException(); /* Check for terrain.png under standard texture pack*/
File ff = new File(texturedir, STANDARDTP + "/" + TERRAIN_PNG);
is = new FileInputStream(ff);
}
else {
is = zf.getInputStream(ze); /* Get input stream for terrain.png */
} }
InputStream is = zf.getInputStream(ze); /* Get input stream for terrain.png */
loadTerrainPNG(is); loadTerrainPNG(is);
is.close(); is.close();
/* Try to find and load misc/grasscolor.png */ /* Try to find and load misc/grasscolor.png */
ze = zf.getEntry(GRASSCOLOR_PNG); ze = zf.getEntry(GRASSCOLOR_PNG);
if(ze == null) if(ze == null) { /* Fall back to standard file */
throw new FileNotFoundException(); /* Check for misc/grasscolor.png under standard texture pack*/
File ff = new File(texturedir, STANDARDTP + "/" + GRASSCOLOR_PNG);
is = new FileInputStream(ff);
}
else {
is = zf.getInputStream(ze); is = zf.getInputStream(ze);
}
loadBiomeShadingImage(is, IMG_GRASSCOLOR); loadBiomeShadingImage(is, IMG_GRASSCOLOR);
is.close(); is.close();
/* Try to find and load misc/foliagecolor.png */ /* Try to find and load misc/foliagecolor.png */
ze = zf.getEntry(FOLIAGECOLOR_PNG); ze = zf.getEntry(FOLIAGECOLOR_PNG);
if(ze == null) if(ze == null) {
throw new FileNotFoundException(); /* Check for misc/foliagecolor.png under standard texture pack*/
File ff = new File(texturedir, STANDARDTP + "/" + FOLIAGECOLOR_PNG);
is = new FileInputStream(ff);
}
else {
is = zf.getInputStream(ze); is = zf.getInputStream(ze);
}
loadBiomeShadingImage(is, IMG_FOLIAGECOLOR); loadBiomeShadingImage(is, IMG_FOLIAGECOLOR);
is.close(); is.close();
/* Try to find and load misc/water.png */ /* Try to find and load misc/water.png */
ze = zf.getEntry(WATER_PNG); ze = zf.getEntry(WATER_PNG);
if(ze == null) if(ze == null) {
throw new FileNotFoundException(); File ff = new File(texturedir, STANDARDTP + "/" + WATER_PNG);
is = new FileInputStream(ff);
}
else {
is = zf.getInputStream(ze); is = zf.getInputStream(ze);
}
loadImage(is, IMG_WATER); loadImage(is, IMG_WATER);
patchTextureWithImage(IMG_WATER, BLOCKINDEX_STATIONARYWATER); patchTextureWithImage(IMG_WATER, BLOCKINDEX_STATIONARYWATER);
patchTextureWithImage(IMG_WATER, BLOCKINDEX_MOVINGWATER); patchTextureWithImage(IMG_WATER, BLOCKINDEX_MOVINGWATER);
is.close(); is.close();
/* Optional files - process if they exist */ /* Optional files - process if they exist */
ze = zf.getEntry(CUSTOMLAVAFLOWING_PNG); ze = zf.getEntry(CUSTOMLAVAFLOWING_PNG);
if(ze != null) { if(ze != null) {
@ -258,21 +280,33 @@ public class TexturePack {
try { try {
/* Open and load terrain.png */ /* Open and load terrain.png */
f = new File(texturedir, tpname + "/" + TERRAIN_PNG); f = new File(texturedir, tpname + "/" + TERRAIN_PNG);
if(!f.canRead()) {
f = new File(texturedir, STANDARDTP + "/" + TERRAIN_PNG);
}
fis = new FileInputStream(f); fis = new FileInputStream(f);
loadTerrainPNG(fis); loadTerrainPNG(fis);
fis.close(); fis.close();
/* Check for misc/grasscolor.png */ /* Check for misc/grasscolor.png */
f = new File(texturedir, tpname + "/" + GRASSCOLOR_PNG); f = new File(texturedir, tpname + "/" + GRASSCOLOR_PNG);
if(!f.canRead()) {
f = new File(texturedir, STANDARDTP + "/" + GRASSCOLOR_PNG);
}
fis = new FileInputStream(f); fis = new FileInputStream(f);
loadBiomeShadingImage(fis, IMG_GRASSCOLOR); loadBiomeShadingImage(fis, IMG_GRASSCOLOR);
fis.close(); fis.close();
/* Check for misc/foliagecolor.png */ /* Check for misc/foliagecolor.png */
f = new File(texturedir, tpname + "/" + FOLIAGECOLOR_PNG); f = new File(texturedir, tpname + "/" + FOLIAGECOLOR_PNG);
if(!f.canRead()) {
f = new File(texturedir, STANDARDTP + "/" + FOLIAGECOLOR_PNG);
}
fis = new FileInputStream(f); fis = new FileInputStream(f);
loadBiomeShadingImage(fis, IMG_FOLIAGECOLOR); loadBiomeShadingImage(fis, IMG_FOLIAGECOLOR);
fis.close(); fis.close();
/* Check for misc/water.png */ /* Check for misc/water.png */
f = new File(texturedir, tpname + "/" + WATER_PNG); f = new File(texturedir, tpname + "/" + WATER_PNG);
if(!f.canRead()) {
f = new File(texturedir, STANDARDTP + "/" + WATER_PNG);
}
fis = new FileInputStream(f); fis = new FileInputStream(f);
loadImage(fis, IMG_WATER); loadImage(fis, IMG_WATER);
patchTextureWithImage(IMG_WATER, BLOCKINDEX_STATIONARYWATER); patchTextureWithImage(IMG_WATER, BLOCKINDEX_STATIONARYWATER);