From 2902de50c233fdc147def8533b23ccfdd7557b5b Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sat, 22 May 2021 02:43:39 +1200 Subject: [PATCH] Attempt to serialize metadata with a saved disguise. Use linked hash map instead of HashMap --- .../java/me/libraryaddict/disguise/disguisetypes/Disguise.java | 2 +- .../me/libraryaddict/disguise/utilities/DisguiseUtilities.java | 2 +- .../disguise/utilities/watchers/DisguiseMethods.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java index cc13bfd8..289c4ce7 100644 --- a/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java +++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java @@ -76,7 +76,7 @@ public abstract class Disguise { * For when plugins may want to assign custom data to a disguise, such as who owns it */ @Getter - private final HashMap customData = new HashMap<>(); + private final LinkedHashMap customData = new LinkedHashMap<>(); @Getter private String disguiseName; /** diff --git a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java index eb4bb2d1..f7209109 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java @@ -632,7 +632,7 @@ public class DisguiseUtilities { PrintWriter writer = new PrintWriter(disguiseFile, "12345".equals("%%__USER__%%") ? "US-ASCII" : "UTF-8"); for (int i = 0; i < disguise.length; i++) { - writer.write(DisguiseParser.parseToString(disguise[i])); + writer.write(DisguiseParser.parseToString(disguise[i], true, true)); if (i + 1 < disguise.length) { writer.write("\n"); diff --git a/src/main/java/me/libraryaddict/disguise/utilities/watchers/DisguiseMethods.java b/src/main/java/me/libraryaddict/disguise/utilities/watchers/DisguiseMethods.java index b3f81437..80d7d5c8 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/watchers/DisguiseMethods.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/watchers/DisguiseMethods.java @@ -182,7 +182,7 @@ public class DisguiseMethods { * @param className The class name, never `null` * @throws IllegalArgumentException if no class can be loaded */ - private Class parseType(final String className) throws ClassNotFoundException { + public static Class parseType(final String className) throws ClassNotFoundException { if (className == null) { return null; }