From d5569ad3ed33d34a15dea32780475d73b3e8fd6c Mon Sep 17 00:00:00 2001 From: William Date: Tue, 15 Nov 2022 00:36:45 +0000 Subject: [PATCH] Fix event priorities in config, bump to 2.1.3 --- .../net/william278/husksync/config/Settings.java | 16 ++++++++++------ gradle.properties | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/net/william278/husksync/config/Settings.java b/common/src/main/java/net/william278/husksync/config/Settings.java index d6f3c483..01863667 100644 --- a/common/src/main/java/net/william278/husksync/config/Settings.java +++ b/common/src/main/java/net/william278/husksync/config/Settings.java @@ -126,12 +126,16 @@ public class Settings { } @YamlKey("synchronization.event_priorities") - public Map synchronizationEventPriorities = EventType.getDefaults(); + public Map synchronizationEventPriorities = EventType.getDefaults(); @NotNull public EventPriority getEventPriority(@NotNull Settings.EventType eventType) { - return Optional.ofNullable(synchronizationEventPriorities.get(eventType.name().toLowerCase())) - .orElse(EventPriority.NORMAL); + try { + return EventPriority.valueOf(synchronizationEventPriorities.get(eventType.name().toLowerCase())); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + return EventPriority.NORMAL; + } } @@ -211,13 +215,13 @@ public class Settings { this.defaultPriority = defaultPriority; } - private Map.Entry toEntry() { - return Map.entry(name(), defaultPriority); + private Map.Entry toEntry() { + return Map.entry(name().toLowerCase(), defaultPriority.name()); } @SuppressWarnings("unchecked") - private static Map getDefaults() { + private static Map getDefaults() { return Map.ofEntries(Arrays.stream(values()) .map(EventType::toEntry) .toArray(Map.Entry[]::new)); diff --git a/gradle.properties b/gradle.properties index 890ef7c4..4d77507c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.daemon=true javaVersion=16 -plugin_version=2.1.2 +plugin_version=2.1.3 plugin_archive=husksync jedis_version=4.2.3