Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0

Browse Source 
# Conflicts:
#	core/src/mindustry/core/Logic.java
#	gradle.properties
This commit is contained in:
Anuken
2020-03-03 12:12:25 -05:00
parent 3858cdd4c5 64c1800391
commit f1aadd97a8
17 changed files with 195 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/mod/Mods.java
View File

@@ -117,7 +117,7 @@ public class Mods implements Loadable{
private void packSprites(Array<Fi> sprites, LoadedMod mod, boolean prefix){
for(Fi file : sprites){
try(InputStream stream = file.read()){
byte[] bytes = Streams.copyStreamToByteArray(stream, Math.max((int)file.length(), 512));
byte[] bytes = Streams.copyBytes(stream, Math.max((int)file.length(), 512));
Pixmap pixmap = new Pixmap(bytes, 0, bytes.length);
packer.add(getPage(file), (prefix ? mod.name + "-" : "") + file.nameWithoutExtension(), new PixmapRegion(pixmap));
pixmap.dispose();