From 2554433f8db17427d70503593ff9afe6a83a7435 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 8 Dec 2019 21:29:03 -0500
Subject: [PATCH] Fixed #1184

---
 .../io/anuke/mindustry/mod/ContentParser.java | 34 +++++++++++--------
 .../mindustry/desktop/DesktopLauncher.java    |  3 ++
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/core/src/io/anuke/mindustry/mod/ContentParser.java b/core/src/io/anuke/mindustry/mod/ContentParser.java
index ded39c15f0..78a4628473 100644
--- a/core/src/io/anuke/mindustry/mod/ContentParser.java
+++ b/core/src/io/anuke/mindustry/mod/ContentParser.java
@@ -173,20 +173,26 @@ public class ContentParser{
                 }
             }else{
                 //TODO generate dynamically instead of doing.. this
-                Class<? extends Block> type = resolve(getType(value),
-                "io.anuke.mindustry.world",
-                "io.anuke.mindustry.world.blocks",
-                "io.anuke.mindustry.world.blocks.defense",
-                "io.anuke.mindustry.world.blocks.defense.turrets",
-                "io.anuke.mindustry.world.blocks.distribution",
-                "io.anuke.mindustry.world.blocks.liquid",
-                "io.anuke.mindustry.world.blocks.logic",
-                "io.anuke.mindustry.world.blocks.power",
-                "io.anuke.mindustry.world.blocks.production",
-                "io.anuke.mindustry.world.blocks.sandbox",
-                "io.anuke.mindustry.world.blocks.storage",
-                "io.anuke.mindustry.world.blocks.units"
-                );
+                Class<? extends Block> type;
+
+                try{
+                    type = resolve(getType(value),
+                    "io.anuke.mindustry.world",
+                    "io.anuke.mindustry.world.blocks",
+                    "io.anuke.mindustry.world.blocks.defense",
+                    "io.anuke.mindustry.world.blocks.defense.turrets",
+                    "io.anuke.mindustry.world.blocks.distribution",
+                    "io.anuke.mindustry.world.blocks.liquid",
+                    "io.anuke.mindustry.world.blocks.logic",
+                    "io.anuke.mindustry.world.blocks.power",
+                    "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);
             }
diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
index 40cb76fad8..6b5236da58 100644
--- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
@@ -107,6 +107,9 @@ public class DesktopLauncher extends ClientLauncher{
                 if(SteamAPI.restartAppIfNecessary(SVars.steamID)){
                     System.exit(0);
                 }
+            }catch(NullPointerException ignored){
+                steam = false;
+                Log.info("Running in offline mode.");
             }catch(Throwable e){
                 steam = false;
                 Log.err("Failed to load Steam native libraries.");