From 0f0c24d31b13ce1f5fe797c727094d1861910d5e Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Fri, 13 Aug 2021 20:12:35 +0200 Subject: [PATCH 1/3] Remove system.out's --- src/main/java/com/volmit/iris/Iris.java | 9 +++++++-- src/main/java/com/volmit/iris/util/reflect/Violator.java | 2 +- src/main/java/com/volmit/iris/util/scheduling/J.java | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 76eb3cc77..2c4d2436e 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -480,9 +480,14 @@ public class Iris extends VolmitPlugin implements Listener { public static void msg(String string) { try { sender.sendMessage(string); - } catch (Throwable ignored) { + } catch (Throwable e) { try { - System.out.println(string); + if (sender.isPlayer()) { + Iris.reportError(e); + Iris.error("Failed to send message to player: " + string); + } else { + System.out.println("Failed to send message through logger: " + string + " because of " + e.getMessage()); + } } catch (Throwable ignored1) { } diff --git a/src/main/java/com/volmit/iris/util/reflect/Violator.java b/src/main/java/com/volmit/iris/util/reflect/Violator.java index 51b98b4f6..6d5fdfa4e 100644 --- a/src/main/java/com/volmit/iris/util/reflect/Violator.java +++ b/src/main/java/com/volmit/iris/util/reflect/Violator.java @@ -265,7 +265,7 @@ public class Violator { T f = c.getDeclaredAnnotation(a); p(id(f, c), f); - System.out.println("Set as " + id(f, c) + " as " + ("@" + a.getCanonicalName() + "[" + id(c, null) + "]")); + Iris.debug("Set as " + id(f, c) + " as " + ("@" + a.getCanonicalName() + "[" + id(c, null) + "]")); } return (T) g("@" + a.getCanonicalName() + "[" + id(c, null) + "]"); diff --git a/src/main/java/com/volmit/iris/util/scheduling/J.java b/src/main/java/com/volmit/iris/util/scheduling/J.java index 3ecda344d..6806bf6a3 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/J.java +++ b/src/main/java/com/volmit/iris/util/scheduling/J.java @@ -65,7 +65,7 @@ public class J { a.run(); } catch (Throwable e) { Iris.reportError(e); - System.out.println("Failed to run async task"); + Iris.error("Failed to run async task"); e.printStackTrace(); } }); @@ -77,7 +77,7 @@ public class J { a.run(); } catch (Throwable e) { Iris.reportError(e); - System.out.println("Failed to run async task"); + Iris.error.println("Failed to run async task"); e.printStackTrace(); } }); From 69eb7979c1ee507eaf630aabca341f58eefe5551 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Fri, 13 Aug 2021 20:20:57 +0200 Subject: [PATCH 2/3] oops --- src/main/java/com/volmit/iris/util/scheduling/J.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/util/scheduling/J.java b/src/main/java/com/volmit/iris/util/scheduling/J.java index 6806bf6a3..0394dbd60 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/J.java +++ b/src/main/java/com/volmit/iris/util/scheduling/J.java @@ -77,7 +77,7 @@ public class J { a.run(); } catch (Throwable e) { Iris.reportError(e); - Iris.error.println("Failed to run async task"); + Iris.error("Failed to run async task"); e.printStackTrace(); } }); From c0bf529a6b966a7a5a46cddab43a1a0125f64529 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Sat, 14 Aug 2021 09:34:26 +0200 Subject: [PATCH 3/3] ok --- src/main/java/com/volmit/iris/Iris.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 2c4d2436e..c073279e2 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -482,12 +482,7 @@ public class Iris extends VolmitPlugin implements Listener { sender.sendMessage(string); } catch (Throwable e) { try { - if (sender.isPlayer()) { - Iris.reportError(e); - Iris.error("Failed to send message to player: " + string); - } else { - System.out.println("Failed to send message through logger: " + string + " because of " + e.getMessage()); - } + System.out.println(string); } catch (Throwable ignored1) { }