Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix setting of locations to LazyLocations + Shade CheckerQual #4208

Merged
merged 2 commits into from
Jun 8, 2021
Merged

Fix setting of locations to LazyLocations + Shade CheckerQual #4208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21b0632
Fix setting of locations to LazyLocations
JRoy Jun 7, 2021
2ff0d1f
Actually shade checkerframework
JRoy Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Essentials/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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'))
JRoy marked this conversation as resolved.
Show resolved Hide resolved
include (project(':providers:BaseProviders'))
include (project(':providers:PaperProvider'))
include (project(':providers:NMSReflectionProvider'))
Expand All @@ -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'
}
2 changes: 1 addition & 1 deletion Essentials/src/main/java/com/earth2me/essentials/config/EssentialsConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down