Merge pull request #66 from Coflnet/fix/json-crash

Fix invalid config crashing minecraft 

3 files changed, 8 insertions, 5 deletions

diff --git a/src/main/java/de/torui/coflsky/CoflSky.java b/src/main/java/de/torui/coflsky/CoflSky.java
index 9811ec7..1274a25 100644
--- a/src/main/java/de/torui/coflsky/CoflSky.java
+++ b/src/main/java/de/torui/coflsky/CoflSky.java
@@ -28,7 +28,7 @@ import net.minecraftforge.fml.relauncher.Side;
 public class CoflSky
 {
     public static final String MODID = "CoflSky";
-    public static final String VERSION = "1.4-Alpha";
+    public static final String VERSION = "1.4.2-Alpha";
     
     public static WSClientWrapper Wrapper;
     public static KeyBinding[] keyBindings;
@@ -58,10 +58,10 @@ public class CoflSky
                 configString = new String(Files.readAllBytes(Paths.get(configFile.getPath())));
                 config = gson.fromJson(configString, LocalConfig.class);
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        if (configString == null) {
+        if (config == null) {
             config =  LocalConfig.createDefaultConfig();
         }
     }
diff --git a/src/main/java/de/torui/coflsky/configuration/LocalConfig.java b/src/main/java/de/torui/coflsky/configuration/LocalConfig.java
index 5c16fca..749d0bc 100644
--- a/src/main/java/de/torui/coflsky/configuration/LocalConfig.java
+++ b/src/main/java/de/torui/coflsky/configuration/LocalConfig.java
@@ -30,6 +30,6 @@ public class LocalConfig {
     }
 
     public static LocalConfig createDefaultConfig() {
-        return new LocalConfig(false,true);
+        return new LocalConfig(true,true);
     }
 }
diff --git a/src/main/java/de/torui/coflsky/handlers/DescriptionHandler.java b/src/main/java/de/torui/coflsky/handlers/DescriptionHandler.java
index 08eb819..48643bf 100644
--- a/src/main/java/de/torui/coflsky/handlers/DescriptionHandler.java
+++ b/src/main/java/de/torui/coflsky/handlers/DescriptionHandler.java
@@ -156,7 +156,10 @@ public class DescriptionHandler {
             return;
 
         for (DescModification datum : data) {
-            if (!(event.toolTip.size() >= datum.line)) return;
+            if (event.toolTip.size() <= datum.line) {
+                System.out.println("Skipped line modification " + datum.line + " for " + event.itemStack.getDisplayName());
+                continue;
+            }
             switch (datum.type) {
                 case "APPEND":
                     event.toolTip.add(datum.value);