From c6b4a10634639ded4c19c6d3472b31f1c4674542 Mon Sep 17 00:00:00 2001 From: barpec12 Date: Mon, 28 Jan 2019 11:11:07 +0100 Subject: [PATCH 1/2] Add possibility to load schems with non-lowercase names. --- .../world/bentobox/bentobox/managers/SchemsManager.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/managers/SchemsManager.java b/src/main/java/world/bentobox/bentobox/managers/SchemsManager.java index 51eef5bf8..5d1e85041 100644 --- a/src/main/java/world/bentobox/bentobox/managers/SchemsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/SchemsManager.java @@ -3,10 +3,7 @@ package world.bentobox.bentobox.managers; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.jar.JarFile; import org.bukkit.World; @@ -74,7 +71,7 @@ public class SchemsManager { * @return map of schems for this world or an empty map if there are none registered */ public Map get(World world) { - return islandSchems.getOrDefault(world, new HashMap<>()); + return islandSchems.getOrDefault(world, new TreeMap<>(String.CASE_INSENSITIVE_ORDER)); } /** @@ -107,7 +104,7 @@ public class SchemsManager { private boolean loadSchem(World world, File schems, String name) { plugin.log("Loading " + name + ".schem for " + world.getName()); - Map schemList = islandSchems.getOrDefault(world, new HashMap<>()); + Map schemList = islandSchems.getOrDefault(world, new TreeMap<>(String.CASE_INSENSITIVE_ORDER)); try { Clipboard cb = new Clipboard(plugin, schems); cb.load(name); From c5c2ae5fc1a357e588a8674a37d59464249c067e Mon Sep 17 00:00:00 2001 From: barpec12 Date: Mon, 28 Jan 2019 13:47:55 +0100 Subject: [PATCH 2/2] Change imports --- .../world/bentobox/bentobox/managers/SchemsManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/world/bentobox/bentobox/managers/SchemsManager.java b/src/main/java/world/bentobox/bentobox/managers/SchemsManager.java index 5d1e85041..a535eeb83 100644 --- a/src/main/java/world/bentobox/bentobox/managers/SchemsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/SchemsManager.java @@ -3,8 +3,13 @@ package world.bentobox.bentobox.managers; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; -import java.util.*; + +import java.util.Objects; +import java.util.TreeMap; import java.util.jar.JarFile; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; import org.bukkit.World; import org.bukkit.configuration.InvalidConfigurationException;