From feaf21c7025d69557570cca9084f96978c7ac187 Mon Sep 17 00:00:00 2001 From: CocoTheOwner <65736624+CocoTheOwner@users.noreply.github.com> Date: Sat, 30 Jan 2021 17:21:59 +0100 Subject: [PATCH] Fix compat error by continuing the throw from Java's fileReader class --- src/main/java/com/volmit/iris/Iris.java | 12 ++---------- src/main/java/com/volmit/iris/object/IrisCompat.java | 8 +++++--- src/main/java/com/volmit/iris/util/IO.java | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index a695a786c..68a16c804 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -149,18 +149,10 @@ public class Iris extends VolmitPlugin public void onEnable() { instance = this; - if (!new File("compat.json").exists()) { - msg("Creating Compat file"); - try { - new File("compat.json").createNewFile(); - } catch (IOException e) { - msg("Could not forcefully initiate Compat"); - } - } try { compat = IrisCompat.configured(getDataFile("compat.json")); - } catch (Exception e) { - msg("Could not find Compat file despite forceful initiation"); + } catch (IOException e){ + // Do nothing. Everything continues properly but the exception is still there. } proj = new ProjectManager(); convert = new ConversionManager(); diff --git a/src/main/java/com/volmit/iris/object/IrisCompat.java b/src/main/java/com/volmit/iris/object/IrisCompat.java index 3db32af2b..ee1e2ef24 100644 --- a/src/main/java/com/volmit/iris/object/IrisCompat.java +++ b/src/main/java/com/volmit/iris/object/IrisCompat.java @@ -149,7 +149,7 @@ public class IrisCompat } } - public static IrisCompat configured(File f) + public static IrisCompat configured(File f) throws IOException { IrisCompat def = new IrisCompat(); String defa = new JSONObject(new Gson().toJson(def)).toString(4); @@ -174,11 +174,13 @@ public class IrisCompat def.getItemFilters().add(i); } } - - catch(JsonSyntaxException | IOException e) + catch(JsonSyntaxException e) { e.printStackTrace(); } + catch(IOException e){ + throw e; + } return def; } diff --git a/src/main/java/com/volmit/iris/util/IO.java b/src/main/java/com/volmit/iris/util/IO.java index aa9965e23..a19722976 100644 --- a/src/main/java/com/volmit/iris/util/IO.java +++ b/src/main/java/com/volmit/iris/util/IO.java @@ -410,7 +410,7 @@ public class IO try { fr = new FileReader(f); } catch (IOException e) { - throw new IOException(e); + throw e; } BufferedReader bu = new BufferedReader(fr); String c = "";