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

Misc bugfixes

Browse Source
This commit is contained in:
Anuken
2022-05-08 17:07:06 -04:00
parent a7ecdf8aab
commit 668b09e955
19 changed files with 52 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/src/mindustry/tools/ImagePacker.java
View File

@@ -134,7 +134,7 @@ public class ImagePacker{
Seq<UnlockableContent> lookupCont = new Seq<>();
for(ContentType t : GlobalConstants.lookableContent){
for(ContentType t : GlobalVars.lookableContent){
lookupCont.addAll(Vars.content.<UnlockableContent>getBy(t).select(UnlockableContent::logicVisible));
}
@@ -148,7 +148,7 @@ public class ImagePacker{
if(logicidfile.exists()){
try(DataInputStream in = new DataInputStream(logicidfile.readByteStream())){
for(ContentType ctype : GlobalConstants.lookableContent){
for(ContentType ctype : GlobalVars.lookableContent){
short amount = in.readShort();
for(int i = 0; i < amount; i++){
String name = in.readUTF();
@@ -183,7 +183,7 @@ public class ImagePacker{
//write the resulting IDs
try(DataOutputStream out = new DataOutputStream(logicidfile.write(false, 2048))){
for(ContentType t : GlobalConstants.lookableContent){
for(ContentType t : GlobalVars.lookableContent){
Seq<UnlockableContent> all = idToContent[t.ordinal()].values().toArray().sort(u -> registered[t.ordinal()].get(u));
out.writeShort(all.size);
for(UnlockableContent u : all){