[ci skip] build: Switch to bom (#1778)

* build: Switch to bom

* chore: Use javax over checkerframework
This commit is contained in:
Alexander Brandes
2022-06-10 01:26:48 +02:00
committed by GitHub
parent d7d43869e6
commit c5a50179f2
10 changed files with 47 additions and 57 deletions

View File

@ -23,5 +23,5 @@ configurations.all {
dependencies {
paperDevBundle("1.17.1-R0.1-20220414.034903-210")
compileOnly(libs.paperlib)
compileOnly("io.papermc:paperlib")
}

View File

@ -13,5 +13,5 @@ repositories {
dependencies {
paperDevBundle("1.18.1-R0.1-20220228.153921-147")
compileOnly(libs.paperlib)
compileOnly("io.papermc:paperlib")
}

View File

@ -14,5 +14,5 @@ repositories {
dependencies {
// https://papermc.io/repo/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
paperDevBundle("1.18.2-R0.1-20220424.184034-95")
compileOnly(libs.paperlib)
compileOnly("io.papermc:paperlib")
}

View File

@ -63,19 +63,19 @@ dependencies {
implementation(libs.fastutil)
// Platform expectations
compileOnly(libs.paper) {
compileOnly("io.papermc.paper:paper-api") {
exclude("junit", "junit")
exclude(group = "org.slf4j", module = "slf4j-api")
}
// Logging
localImplementation(libs.log4j)
localImplementation("org.apache.logging.log4j:log4j-api")
localImplementation(libs.log4jBom) {
because("Spigot provides Log4J (sort of, not in API, implicitly part of server)")
}
// Plugins
compileOnly(libs.vault) { isTransitive = false }
compileOnly("com.github.MilkBowl:VaultAPI") { isTransitive = false }
compileOnly(libs.dummypermscompat) {
exclude("com.github.MilkBowl", "VaultAPI")
}
@ -91,26 +91,26 @@ dependencies {
compileOnly(libs.mcore) { isTransitive = false }
compileOnly(libs.residence) { isTransitive = false }
compileOnly(libs.towny) { isTransitive = false }
compileOnly(libs.plotsquaredBukkit) { isTransitive = false }
compileOnly(libs.plotsquaredCore) { isTransitive = false }
compileOnly("com.plotsquared:PlotSquared-Bukkit") { isTransitive = false }
compileOnly("com.plotsquared:PlotSquared-Core") { isTransitive = false }
// Third party
implementation(libs.paperlib)
implementation(libs.bstatsBukkit) { isTransitive = false }
implementation("io.papermc:paperlib")
implementation("org.bstats:bstats-bukkit") { isTransitive = false }
implementation(libs.bstatsBase) { isTransitive = false }
implementation(libs.serverlib)
api(libs.paster) { isTransitive = false }
implementation("dev.notmyfault.serverlib:ServerLib")
api("com.intellectualsites.paster:Paster") { isTransitive = false }
api(libs.lz4Java) { isTransitive = false }
api(libs.sparsebitset) { isTransitive = false }
api(libs.parallelgzip) { isTransitive = false }
compileOnly(libs.adventure)
compileOnlyApi(libs.checkerqual)
compileOnly("net.kyori:adventure-api")
compileOnlyApi("org.checkerframework:checker-qual")
// Tests
testImplementation(libs.mockito)
testImplementation(libs.adventure)
testImplementation(libs.checkerqual)
testImplementation(libs.paper) { isTransitive = true }
testImplementation("net.kyori:adventure-api")
testImplementation("org.checkerframework:checker-qual")
testImplementation("io.papermc.paper:paper-api") { isTransitive = true }
}
tasks.named<Copy>("processResources") {

View File

@ -14,6 +14,7 @@ import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.util.SideEffectSet;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BaseBlock;
@ -86,6 +87,11 @@ public class FaweQueueCoordinator extends QueueCoordinator {
return false;
}
@Override
public void setBiomesEnabled(final boolean enabled) {
}
@Override
public boolean setEntity(@Nonnull Entity entity) {
return false;
@ -182,6 +188,16 @@ public class FaweQueueCoordinator extends QueueCoordinator {
}
@Override
public @Nullable SideEffectSet getSideEffectSet() {
return null;
}
@Override
public void setSideEffectSet(@Nullable final SideEffectSet sideEffectSet) {
}
@Override
public void regenChunk(int x, int z) {
instance.regenerateChunk(x, z, null, null);