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

Fixed #1184

Browse Source
This commit is contained in:
Anuken
2019-12-08 21:29:03 -05:00
parent e06d61dcc9
commit 2554433f8d
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/src/io/anuke/mindustry/mod/ContentParser.java
View File

@@ -173,20 +173,26 @@ public class ContentParser{
} }
}else{ }else{
//TODO generate dynamically instead of doing.. this //TODO generate dynamically instead of doing.. this
Class<? extends Block> type = resolve(getType(value), Class<? extends Block> type;
"io.anuke.mindustry.world",
"io.anuke.mindustry.world.blocks", try{
"io.anuke.mindustry.world.blocks.defense", type = resolve(getType(value),
"io.anuke.mindustry.world.blocks.defense.turrets", "io.anuke.mindustry.world",
"io.anuke.mindustry.world.blocks.distribution", "io.anuke.mindustry.world.blocks",
"io.anuke.mindustry.world.blocks.liquid", "io.anuke.mindustry.world.blocks.defense",
"io.anuke.mindustry.world.blocks.logic", "io.anuke.mindustry.world.blocks.defense.turrets",
"io.anuke.mindustry.world.blocks.power", "io.anuke.mindustry.world.blocks.distribution",
"io.anuke.mindustry.world.blocks.production", "io.anuke.mindustry.world.blocks.liquid",
"io.anuke.mindustry.world.blocks.sandbox", "io.anuke.mindustry.world.blocks.logic",
"io.anuke.mindustry.world.blocks.storage", "io.anuke.mindustry.world.blocks.power",
"io.anuke.mindustry.world.blocks.units" "io.anuke.mindustry.world.blocks.production",
); "io.anuke.mindustry.world.blocks.sandbox",
"io.anuke.mindustry.world.blocks.storage",
"io.anuke.mindustry.world.blocks.units"
);
}catch(IllegalArgumentException e){
type = Block.class;
}
block = make(type, mod + "-" + name); block = make(type, mod + "-" + name);
} }

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

@@ -107,6 +107,9 @@ public class DesktopLauncher extends ClientLauncher{
if(SteamAPI.restartAppIfNecessary(SVars.steamID)){ if(SteamAPI.restartAppIfNecessary(SVars.steamID)){
System.exit(0); System.exit(0);
} }
}catch(NullPointerException ignored){
steam = false;
Log.info("Running in offline mode.");
}catch(Throwable e){ }catch(Throwable e){
steam = false; steam = false;
Log.err("Failed to load Steam native libraries."); Log.err("Failed to load Steam native libraries.");