From 21b0632d7e7e7e91a8a05cf054a0173374c2ecbf Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Mon, 7 Jun 2021 19:42:05 -0400 Subject: [PATCH 1/2] Fix setting of locations to LazyLocations --- .../com/earth2me/essentials/config/EssentialsConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/config/EssentialsConfiguration.java b/Essentials/src/main/java/com/earth2me/essentials/config/EssentialsConfiguration.java index 3b87bd25b00..4ff18581e47 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/config/EssentialsConfiguration.java +++ b/Essentials/src/main/java/com/earth2me/essentials/config/EssentialsConfiguration.java @@ -100,7 +100,7 @@ public File getFile() { public void setProperty(String path, final Location location) { path = path == null ? "" : path; - setInternal(path, location); + setInternal(path, LazyLocation.fromLocation(location)); } public LazyLocation getLocation(final String path) throws InvalidWorldException { From 2ff0d1fa09155b4f89b3022efa3580abaef5812f Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Mon, 7 Jun 2021 19:44:21 -0400 Subject: [PATCH 2/2] Actually shade checkerframework --- Essentials/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Essentials/build.gradle b/Essentials/build.gradle index 09c3147a128..06053c01c29 100644 --- a/Essentials/build.gradle +++ b/Essentials/build.gradle @@ -14,7 +14,7 @@ dependencies { implementation 'org.spongepowered:configurate-yaml:4.1.1' implementation 'org.yaml:snakeyaml:1.+' - testImplementation 'org.checkerframework:checker-qual:3.7.1' + implementation 'org.checkerframework:checker-qual:3.7.1' // Providers api project(':providers:BaseProviders') @@ -35,6 +35,7 @@ shadowJar { include (dependency('org.spongepowered:configurate-core')) include (dependency('org.yaml:snakeyaml')) include (dependency('io.leangen.geantyref:geantyref')) + include (dependency('org.checkerframework:checker-qual')) include (project(':providers:BaseProviders')) include (project(':providers:PaperProvider')) include (project(':providers:NMSReflectionProvider')) @@ -45,4 +46,5 @@ shadowJar { relocate 'org.spongepowered.configurate', 'com.earth2me.essentials.libs.configurate' relocate 'org.yaml.snakeyaml', 'com.earth2me.essentials.libs.snakeyaml' relocate 'io.leangen.geantyref', 'com.earth2me.essentials.libs.geantyref' + relocate 'org.checkerframework', 'com.earth2me.essentials.libs.checkerframework' }