From 27aeb73157e7a86360e8a5cbfbbd578c29ac7657 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 10 Jan 2021 16:55:49 -0700 Subject: [PATCH] fix minor version issues --- .../transform/AttemptsFailedException.java | 19 +++++++++---------- .../terra/api/transform/Transformer.java | 12 ++---------- .../dfsek/terra/registry/TreeRegistry.java | 2 +- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/common/src/main/java/com/dfsek/terra/api/transform/AttemptsFailedException.java b/common/src/main/java/com/dfsek/terra/api/transform/AttemptsFailedException.java index 256ad5e57..dc97b7e31 100644 --- a/common/src/main/java/com/dfsek/terra/api/transform/AttemptsFailedException.java +++ b/common/src/main/java/com/dfsek/terra/api/transform/AttemptsFailedException.java @@ -1,19 +1,18 @@ package com.dfsek.terra.api.transform; +import com.dfsek.terra.api.util.GlueList; + +import java.util.List; + public class AttemptsFailedException extends RuntimeException { - public AttemptsFailedException() { - super(); - } + private final List causes; - public AttemptsFailedException(String message) { + public AttemptsFailedException(String message, List causes) { super(message); + this.causes = causes; } - public AttemptsFailedException(String message, Throwable cause) { - super(message, cause); - } - - public AttemptsFailedException(Throwable cause) { - super(cause); + public List getCauses() { + return new GlueList<>(causes); } } diff --git a/common/src/main/java/com/dfsek/terra/api/transform/Transformer.java b/common/src/main/java/com/dfsek/terra/api/transform/Transformer.java index aabdf331c..58feecf8b 100644 --- a/common/src/main/java/com/dfsek/terra/api/transform/Transformer.java +++ b/common/src/main/java/com/dfsek/terra/api/transform/Transformer.java @@ -1,7 +1,5 @@ package com.dfsek.terra.api.transform; -import java.io.PrintWriter; -import java.io.StringWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashMap; @@ -28,7 +26,7 @@ public class Transformer { * @return Result */ public T translate(F from) { - List exceptions = new ArrayList<>(); + List exceptions = new ArrayList<>(); for(Map.Entry, List>> transform : transformers.entrySet()) { try { T result = transform.getKey().transform(from); @@ -42,13 +40,7 @@ public class Transformer { exceptions.add(exception); } } - StringBuilder exBuilder = new StringBuilder("Could not transform input; all attempts failed: ").append(from.toString()).append("\n"); - for(Exception exception : exceptions) { - StringWriter writer = new StringWriter(); - exception.printStackTrace(new PrintWriter(writer)); - exBuilder.append("\n").append(writer.toString()); - } - throw new AttemptsFailedException(exBuilder.toString()); + throw new AttemptsFailedException("Could not transform input; all attempts failed: " + from.toString() + "\n", exceptions); } /** diff --git a/common/src/main/java/com/dfsek/terra/registry/TreeRegistry.java b/common/src/main/java/com/dfsek/terra/registry/TreeRegistry.java index d4086e710..1e71c2662 100644 --- a/common/src/main/java/com/dfsek/terra/registry/TreeRegistry.java +++ b/common/src/main/java/com/dfsek/terra/registry/TreeRegistry.java @@ -57,7 +57,7 @@ public class TreeRegistry extends TerraRegistry { private void addTree(String id) { try { add(id, main.getWorldHandle().getTree(id)); - } catch(IllegalArgumentException e) { + } catch(Exception e) { main.getLogger().warning("Unable to load tree " + id + ": " + e.getMessage()); } }