From f8c173aae8ed9ba70443b04ea3f48c6b5a4b2ed3 Mon Sep 17 00:00:00 2001 From: ImDaBigBoss <67973871+ImDaBigBoss@users.noreply.github.com> Date: Wed, 12 Jan 2022 16:47:25 +0100 Subject: [PATCH] Actually did what Konicai wanted --- .../extension/GeyserExtensionDescription.java | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/extension/GeyserExtensionDescription.java b/core/src/main/java/org/geysermc/geyser/extension/GeyserExtensionDescription.java index 31d6c3a46..b14291b01 100644 --- a/core/src/main/java/org/geysermc/geyser/extension/GeyserExtensionDescription.java +++ b/core/src/main/java/org/geysermc/geyser/extension/GeyserExtensionDescription.java @@ -42,28 +42,10 @@ public class GeyserExtensionDescription implements org.geysermc.geyser.api.exten private final List authors = new ArrayList<>(); public GeyserExtensionDescription(InputStream inputStream) throws InvalidDescriptionException { - try { - InputStreamReader reader = new InputStreamReader(inputStream); - StringBuilder builder = new StringBuilder(); - String temp; - BufferedReader bufferedReader = new BufferedReader(reader); - temp = bufferedReader.readLine(); - while (temp != null) { - if (builder.length() != 0) { - builder.append("\n"); - } - builder.append(temp); - temp = bufferedReader.readLine(); - } - - this.loadString(builder.toString()); - } catch (IOException e) { - throw new InvalidDescriptionException(e); - } - } - - public GeyserExtensionDescription(String yamlString) throws InvalidDescriptionException { - this.loadString(yamlString); + DumperOptions dumperOptions = new DumperOptions(); + dumperOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + Yaml yaml = new Yaml(dumperOptions); + this.loadMap(yaml.loadAs(inputStream, LinkedHashMap.class)); } private void loadString(String yamlString) throws InvalidDescriptionException {