From dd2f764ab4f00364a609656f0c2129e603c62b64 Mon Sep 17 00:00:00 2001 From: Mgazul Date: Mon, 30 Nov 2020 13:40:49 +0800 Subject: [PATCH] Remove outdated methods(yaml) --- build.gradle | 1 - .../com/mohistmc/worldeditfix/WorldEditFix.java | 2 -- .../java/com/sk89q/util/yaml/YAMLProcessor.java | 16 +--------------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index a922fa6..ef75685 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,6 @@ repositories { maven { url "http://repo.bukkit.org/content/groups/public" } maven { url "http://maven.sk89q.com/repo/" } maven { url "http://repo.maven.apache.org/maven2" } - maven { url "https://hub.spigotmc.org/nexus/content/groups/public" } } dependencies { diff --git a/src/main/java/com/mohistmc/worldeditfix/WorldEditFix.java b/src/main/java/com/mohistmc/worldeditfix/WorldEditFix.java index 62dfae5..9097d0c 100644 --- a/src/main/java/com/mohistmc/worldeditfix/WorldEditFix.java +++ b/src/main/java/com/mohistmc/worldeditfix/WorldEditFix.java @@ -1,9 +1,7 @@ package com.mohistmc.worldeditfix; import com.sk89q.worldedit.blocks.BlockType; -import java.util.Map; import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java b/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java index e0ecdf3..13c0fa6 100644 --- a/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java +++ b/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java @@ -82,7 +82,7 @@ public YAMLProcessor(File file, boolean writeDefaults, YAMLFormat format) { super(new LinkedHashMap(), writeDefaults); this.format = format; - DumperOptions options = new FancyDumperOptions(); + DumperOptions options = new DumperOptions(); options.setIndent(4); options.setDefaultFlowStyle(format.getStyle()); Representer representer = new FancyRepresenter(); @@ -305,20 +305,6 @@ public static YAMLNode getEmptyNode(boolean writeDefaults) { return new YAMLNode(new LinkedHashMap(), writeDefaults); } - // This will be included in snakeyaml 1.10, but until then we have to do it manually. - private class FancyDumperOptions extends DumperOptions { - @Override - public DumperOptions.ScalarStyle calculateScalarStyle(ScalarAnalysis analysis, - DumperOptions.ScalarStyle style) { - if (format == YAMLFormat.EXTENDED - && (analysis.scalar.contains("\n") || analysis.scalar.contains("\r"))) { - return ScalarStyle.LITERAL; - } else { - return super.calculateScalarStyle(analysis, style); - } - } - } - private static class FancyRepresenter extends Representer { private FancyRepresenter() { this.nullRepresenter = new Represent() {