Closes #3217
Closes #3226
Closes #3227
Closes #3229
Closes #3230
This commit is contained in:
NotMyFault 2021-09-06 13:47:40 +02:00
parent be38086f6c
commit 4caaead7ee
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
4 changed files with 20 additions and 15 deletions

View File

@ -71,7 +71,7 @@ tasks.named<ShadowJar>("shadowJar") {
relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination") relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination")
relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib") relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
relocate("org.bstats", "com.plotsquared.metrics") relocate("org.bstats", "com.plotsquared.metrics")
relocate("com.sk89q.squirrelid", "com.plotsquared.squirrelid") relocate("org.enginehub", "com.plotsquared.squirrelid")
relocate("org.khelekore.prtree", "com.plotsquared.prtree") relocate("org.khelekore.prtree", "com.plotsquared.prtree")
relocate("com.google.inject", "com.plotsquared.google") relocate("com.google.inject", "com.plotsquared.google")
relocate("org.aopalliance", "com.plotsquared.core.aopalliance") relocate("org.aopalliance", "com.plotsquared.core.aopalliance")
@ -93,7 +93,7 @@ tasks {
opt.links("https://papermc.io/javadocs/paper/1.17/") opt.links("https://papermc.io/javadocs/paper/1.17/")
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/7.2.6/") opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/7.2.6/")
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/7.2.6/") opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/7.2.6/")
opt.links("https://jd.adventure.kyori.net/api/4.8.1/") opt.links("https://jd.adventure.kyori.net/api/4.9.0/")
opt.links("https://google.github.io/guice/api-docs/5.0.1/javadoc/") opt.links("https://google.github.io/guice/api-docs/5.0.1/javadoc/")
opt.links("https://checkerframework.org/api/") opt.links("https://checkerframework.org/api/")
} }

View File

@ -29,12 +29,12 @@ import com.google.common.util.concurrent.RateLimiter;
import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.uuid.UUIDMapping; import com.plotsquared.core.uuid.UUIDMapping;
import com.plotsquared.core.uuid.UUIDService; import com.plotsquared.core.uuid.UUIDService;
import com.sk89q.squirrelid.Profile;
import com.sk89q.squirrelid.resolver.HttpRepositoryService;
import com.sk89q.squirrelid.resolver.ProfileService;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.enginehub.squirrelid.Profile;
import org.enginehub.squirrelid.resolver.HttpRepositoryService;
import org.enginehub.squirrelid.resolver.ProfileService;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -73,7 +73,7 @@ public class SquirrelIdUUIDService implements UUIDService {
this.rateLimiter.acquire(uuids.size()); this.rateLimiter.acquire(uuids.size());
try { try {
try { try {
for (final Profile profile : this.profileService.findAllById(uuids)) { for (final Profile profile : this.profileService.findAllByUuid(uuids)) {
results.add(new UUIDMapping(profile.getUniqueId(), profile.getName())); results.add(new UUIDMapping(profile.getUniqueId(), profile.getName()));
} }
} catch (final IllegalArgumentException illegalArgumentException) { } catch (final IllegalArgumentException illegalArgumentException) {

View File

@ -6,20 +6,20 @@ log4j-api = "2.14.1" # Version set by Minecraft
# Platform expectations # Platform expectations
paper = "1.17.1-R0.1-SNAPSHOT" paper = "1.17.1-R0.1-SNAPSHOT"
checker-qual = "3.16.0" checker-qual = "3.18.0"
guice = "5.0.1" guice = "5.0.1"
findbugs = "3.0.1" findbugs = "3.0.1"
snakeyaml = "1.28" # Version set by Bukkit snakeyaml = "1.28" # Version set by Bukkit
# Adventure & MiniMessage # Adventure & MiniMessage
adventure-api = "4.8.1" adventure-api = "4.9.0"
adventure-text-minimessage = "4.1.0-SNAPSHOT" adventure-text-minimessage = "4.1.0-SNAPSHOT"
adventure-platform-bukkit = "4.0.0-SNAPSHOT" adventure-platform-bukkit = "4.0.0-SNAPSHOT"
# Plugins # Plugins
worldedit = "7.2.6" worldedit = "7.2.6"
fawe = "1.17-201" fawe = "1.17-201"
vault = "1.7" vault = "1.7.1"
placeholderapi = "2.10.10" placeholderapi = "2.10.10"
luckperms = "5.3" luckperms = "5.3"
essentialsx = "2.18.2" essentialsx = "2.18.2"
@ -27,14 +27,14 @@ hyperverse = "0.6.0-SNAPSHOT"
mvdwapi = "3.1.1" mvdwapi = "3.1.1"
# Third party # Third party
prtree = "1.7.0-SNAPSHOT" prtree = "1.5.0"
aopalliance = "1.0" aopalliance = "1.0"
pipeline = "1.4.0-SNAPSHOT" pipeline = "1.4.0-SNAPSHOT"
arkitektonika = "2.0-SNAPSHOT" arkitektonika = "2.1.0"
paster = "1.0.2-SNAPSHOT" paster = "1.1.1"
bstats = "2.2.1" bstats = "2.2.1"
paperlib = "1.0.6" paperlib = "1.0.6"
squirrelid = "1.0.0-SNAPSHOT" squirrelid = "0.3.0"
serverlib = "2.2.1" serverlib = "2.2.1"
http4j = "1.1-SNAPSHOT" http4j = "1.1-SNAPSHOT"
@ -80,7 +80,7 @@ prtree = { group = "org.khelekore", name = "prtree", version.ref = "prtree" }
aopalliance = { group = "aopalliance", name = "aopalliance", version.ref = "aopalliance" } aopalliance = { group = "aopalliance", name = "aopalliance", version.ref = "aopalliance" }
pipeline = { group = "com.intellectualsites", name = "Pipeline", version.ref = "pipeline" } pipeline = { group = "com.intellectualsites", name = "Pipeline", version.ref = "pipeline" }
mvdwapi = { group = "be.maximvdw", name = "MVdWPlaceholderAPI", version.ref = "mvdwapi" } mvdwapi = { group = "be.maximvdw", name = "MVdWPlaceholderAPI", version.ref = "mvdwapi" }
squirrelid = { group = "com.sk89q", name = "squirrelid", version.ref = "squirrelid" } squirrelid = { group = "org.enginehub", name = "squirrelid", version.ref = "squirrelid" }
serverlib = { group = "org.incendo.serverlib", name = "ServerLib", version.ref = "serverlib" } serverlib = { group = "org.incendo.serverlib", name = "ServerLib", version.ref = "serverlib" }
bstats = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" } bstats = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" } paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" }

View File

@ -1,5 +1,10 @@
{ {
"extends": [ "extends": [
"config:base" "config:base",
":disableDependencyDashboard"
],
"ignoreDeps": [
"guava",
"gson"
] ]
} }