TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-22 08:25:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix setting of locations to LazyLocations + Shade CheckerQual (#4208)

Browse source
This commit is contained in:
Josh Roy 2021-06-07 23:30:37 -04:00 committed by GitHub
parent 3d09ea386b
commit 8b1db22a53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Essentials/build.gradle
View file

@ -14,7 +14,7 @@ dependencies {
implementation 'org.spongepowered:configurate-yaml:4.1.1' implementation 'org.spongepowered:configurate-yaml:4.1.1'
implementation 'org.yaml:snakeyaml:1.+' implementation 'org.yaml:snakeyaml:1.+'
testImplementation 'org.checkerframework:checker-qual:3.7.1' implementation 'org.checkerframework:checker-qual:3.7.1'
// Providers // Providers
api project(':providers:BaseProviders') api project(':providers:BaseProviders')
@ -35,6 +35,7 @@ shadowJar {
include (dependency('org.spongepowered:configurate-core')) include (dependency('org.spongepowered:configurate-core'))
include (dependency('org.yaml:snakeyaml')) include (dependency('org.yaml:snakeyaml'))
include (dependency('io.leangen.geantyref:geantyref')) include (dependency('io.leangen.geantyref:geantyref'))
include (dependency('org.checkerframework:checker-qual'))
include (project(':providers:BaseProviders')) include (project(':providers:BaseProviders'))
include (project(':providers:PaperProvider')) include (project(':providers:PaperProvider'))
include (project(':providers:NMSReflectionProvider')) include (project(':providers:NMSReflectionProvider'))
@ -45,4 +46,5 @@ shadowJar {
relocate 'org.spongepowered.configurate', 'com.earth2me.essentials.libs.configurate' relocate 'org.spongepowered.configurate', 'com.earth2me.essentials.libs.configurate'
relocate 'org.yaml.snakeyaml', 'com.earth2me.essentials.libs.snakeyaml' relocate 'org.yaml.snakeyaml', 'com.earth2me.essentials.libs.snakeyaml'
relocate 'io.leangen.geantyref', 'com.earth2me.essentials.libs.geantyref' relocate 'io.leangen.geantyref', 'com.earth2me.essentials.libs.geantyref'
relocate 'org.checkerframework', 'com.earth2me.essentials.libs.checkerframework'
} }

2
Essentials/src/main/java/com/earth2me/essentials/config/EssentialsConfiguration.java
View file

@ -100,7 +100,7 @@ public class EssentialsConfiguration {
public void setProperty(String path, final Location location) { public void setProperty(String path, final Location location) {
path = path == null ? "" : path; path = path == null ? "" : path;
setInternal(path, location); setInternal(path, LazyLocation.fromLocation(location));
} }
public LazyLocation getLocation(final String path) throws InvalidWorldException { public LazyLocation getLocation(final String path) throws InvalidWorldException {