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

Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0

Browse source
This commit is contained in:
Mike Primm 2021-01-09 19:49:57 -06:00
commit c77d3b444a
16 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
DynmapCore/src/main/java/org/dynmap/MapType.java
View file

@ -73,7 +73,8 @@ public abstract class MapType {
FORMAT_WEBP("webp", 85, ImageEncoding.WEBP),
FORMAT_WEBP90("webp-q90", 90, ImageEncoding.WEBP),
FORMAT_WEBP95("webp-q95", 95, ImageEncoding.WEBP),
FORMAT_WEBP100("webp-q100", 100, ImageEncoding.WEBP);
FORMAT_WEBP100("webp-q100", 100, ImageEncoding.WEBP),
FORMAT_WEBPL("webp-l", 85, ImageEncoding.WEBP);
String id;
float qual;
ImageEncoding enc;

2
DynmapCore/src/main/java/org/dynmap/utils/ImageIOManager.java
View file

@ -59,7 +59,7 @@ public class ImageIOManager {
fos.close();
// Run encoder to new new temp file
File tmpfile2 = File.createTempFile("pngToWebp", "webp");
String args[] = { core.getCWEBPPath(), "-q", Integer.toString((int)fmt.getQuality()), tmpfile.getAbsolutePath(), "-o", tmpfile2.getAbsolutePath() };
String args[] = { core.getCWEBPPath(), fmt.getID().endsWith("-l")?"-lossless":"", "-q", Integer.toString((int)fmt.getQuality()), tmpfile.getAbsolutePath(), "-o", tmpfile2.getAbsolutePath() };
Process pr = Runtime.getRuntime().exec(args);
try {
pr.waitFor();

6
DynmapCore/src/main/resources/extracted/web/js/minecraft.js
View file

@ -8,9 +8,9 @@ function createMinecraftHead(player,size,completed,failed) {
};
var faceimg;
if(size == 'body')
faceimg = 'faces/body/' + player + '.png';
faceimg = 'faces/body/' + encodeURIComponent(player) + '.png';
else
faceimg = 'faces/' + size + 'x' + size + '/' + player + '.png';
faceimg = 'faces/' + size + 'x' + size + '/' + encodeURIComponent(player) + '.png';
faceImage.src = concatURL(dynmap.options.url.markers, faceimg);
}
@ -57,4 +57,4 @@ function chat_encoder(message) {
}
}
return message.text;
}
}