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

Eliminated 8 characters

Browse Source
This commit is contained in:
Anuken
2019-12-15 20:01:06 -05:00
parent 95a1474b9a
commit 0cf39bf5c3
40 changed files with 195 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
View File

@@ -77,8 +77,8 @@ public class DesktopLauncher extends ClientLauncher{
if(useSteam){
//delete leftover dlls
FileHandle file = new FileHandle(".");
for(FileHandle other : file.parent().list()){
Fi file = new Fi(".");
for(Fi other : file.parent().list()){
if(other.name().contains("steam") && (other.extension().equals("dll") || other.extension().equals("so") || other.extension().equals("dylib"))){
other.delete();
}
@@ -202,7 +202,7 @@ public class DesktopLauncher extends ClientLauncher{
}
@Override
public Array<FileHandle> getWorkshopContent(Class<? extends Publishable> type){
public Array<Fi> getWorkshopContent(Class<? extends Publishable> type){
return !steam ? super.getWorkshopContent(type) : SVars.workshop.getWorkshopFiles(type);
}

8
desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java
View File

@@ -21,7 +21,7 @@ import static io.anuke.mindustry.Vars.*;
public class SWorkshop implements SteamUGCCallback{
public final SteamUGC ugc = new SteamUGC(this);
private ObjectMap<Class<? extends Publishable>, Array<FileHandle>> workshopFiles = new ObjectMap<>();
private ObjectMap<Class<? extends Publishable>, Array<Fi>> workshopFiles = new ObjectMap<>();
private ObjectMap<SteamUGCQuery, Cons2<Array<SteamUGCDetails>, SteamResult>> detailHandlers = new ObjectMap<>();
private Array<Cons<SteamPublishedFileID>> itemHandlers = new Array<>();
private ObjectMap<SteamPublishedFileID, Runnable> updatedHandlers = new ObjectMap<>();
@@ -32,9 +32,9 @@ public class SWorkshop implements SteamUGCCallback{
ItemInstallInfo info = new ItemInstallInfo();
ugc.getSubscribedItems(ids);
Array<FileHandle> folders = Array.with(ids).map(f -> {
Array<Fi> folders = Array.with(ids).map(f -> {
ugc.getItemInstallInfo(f, info);
return new FileHandle(info.getFolder());
return new Fi(info.getFolder());
}).select(f -> f != null && f.list().length > 0);
workshopFiles.put(Map.class, folders.select(f -> f.list().length == 1 && f.list()[0].extension().equals(mapExtension)).map(f -> f.list()[0]));
@@ -50,7 +50,7 @@ public class SWorkshop implements SteamUGCCallback{
});
}
public Array<FileHandle> getWorkshopFiles(Class<? extends Publishable> type){
public Array<Fi> getWorkshopFiles(Class<? extends Publishable> type){
return workshopFiles.getOr(type, () -> new Array<>(0));
}