Compare commits

...

5 Commits

Author SHA1 Message Date
cb7d1d30a4 Reset wall filling on clear
- Implements #3591
2022-06-13 21:06:08 +01:00
bb0aa8d5cc fix: Don't publish root directory to maven repository (#3676)
* fix: Don't publish root directory (Fixes #3647)

* fix: More investigations

* fix: Exclude task 'jar' from root project

* chore: Keep group ID in the root scope
2022-06-13 15:23:12 +02:00
d69f3b0893 build: Update dependency com.intellectualsites.bom:bom-1.18.x to v1.5 (#3677)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2022-06-13 11:38:28 +02:00
565838ad43 [ci skip] chore: Update renovate excludes (Closes #3678) 2022-06-13 11:36:46 +02:00
8b52461271 build: Back to snapshot for development 2022-06-13 11:25:07 +02:00
6 changed files with 16 additions and 31 deletions

View File

@ -100,7 +100,7 @@ tasks {
opt.links("https://jd.papermc.io/paper/1.18/")
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
opt.links("https://javadoc.io/doc/com.plotsquared/PlotSquared-Core/latest/")
opt.links("https://jd.adventure.kyori.net/api/" + libs.adventure.get().versionConstraint.toString())
opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
opt.links("https://checkerframework.org/api/")
}

View File

@ -59,7 +59,7 @@ tasks {
withType<Javadoc> {
val opt = options as StandardJavadocDocletOptions
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
opt.links("https://jd.adventure.kyori.net/api/" + libs.adventure.get().versionConstraint.toString())
opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
opt.links("https://checkerframework.org/api/")
}

View File

@ -37,6 +37,7 @@ import com.plotsquared.core.events.PlotComponentSetEvent;
import com.plotsquared.core.events.PlotMergeEvent;
import com.plotsquared.core.events.PlotUnlinkEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.generator.ClassicPlotWorld;
import com.plotsquared.core.generator.SquarePlotWorld;
import com.plotsquared.core.inject.factory.ProgressSubscriberFactory;
import com.plotsquared.core.location.Direction;
@ -255,6 +256,9 @@ public final class PlotModificationManager {
manager.unClaimPlot(current, null, queue);
} else {
manager.claimPlot(current, queue);
if (plot.getArea() instanceof ClassicPlotWorld cpw) {
manager.setComponent(current.getId(), "wall", cpw.WALL_FILLING.toPattern(), actor, queue);
}
}
}
if (queue.size() > 0) {

View File

@ -18,10 +18,11 @@ plugins {
idea
}
version = "6.9.0"
group = "com.plotsquared"
version = "6.9.1-SNAPSHOT"
allprojects {
group = "com.plotsquared"
subprojects {
group = rootProject.group
version = rootProject.version
repositories {
@ -50,9 +51,7 @@ allprojects {
url = uri("https://maven.enginehub.org/repo/")
}
}
}
subprojects {
apply {
plugin<JavaPlugin>()
plugin<JavaLibraryPlugin>()
@ -66,11 +65,9 @@ subprojects {
}
dependencies {
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.2"))
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.5"))
}
}
allprojects {
dependencies {
// Tests
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
@ -165,7 +162,7 @@ allprojects {
developerConnection.set("scm:git://github.com/IntellectualSites/PlotSquared.git")
}
issueManagement{
issueManagement {
system.set("GitHub")
url.set("https://github.com/IntellectualSites/PlotSquared/issues")
}
@ -188,7 +185,6 @@ allprojects {
shadowJar {
this.archiveClassifier.set(null as String?)
this.archiveFileName.set("${project.name}-${project.version}.${this.archiveExtension.getOrElse("jar")}")
this.destinationDirectory.set(rootProject.tasks.shadowJar.get().destinationDirectory.get())
}
named("build") {
@ -198,7 +194,6 @@ allprojects {
useJUnitPlatform()
}
}
}
nexusPublishing {
@ -209,3 +204,7 @@ nexusPublishing {
}
}
}
tasks.getByName<Jar>("jar") {
enabled = false
}

View File

@ -5,11 +5,6 @@ checker-qual = "3.22.0"
guice = "5.1.0"
spotbugs = "4.7.0"
# Adventure & MiniMessage
adventure-api = "4.9.3"
adventure-text-minimessage = "4.1.0-SNAPSHOT"
adventure-platform-bukkit = "4.0.1"
# Plugins
worldedit = "7.2.10"
placeholderapi = "2.11.1"
@ -41,11 +36,6 @@ guice = { group = "com.google.inject", name = "guice", version.ref = "guice" }
guiceassistedinject = { group = "com.google.inject.extensions", name = "guice-assistedinject", version.ref = "guice" }
spotbugs = { group = "com.github.spotbugs", name = "spotbugs-annotations", version.ref = "spotbugs" }
# Adventure & MiniMessage
adventure = { group = "net.kyori", name = "adventure-api", version.ref = "adventure-api" }
minimessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure-text-minimessage" }
adventurePlatformBukkit = { group = "net.kyori", name = "adventure-platform-bukkit", version.ref = "adventure-platform-bukkit" }
# Plugins
worldeditCore = { group = "com.sk89q.worldedit", name = "worldedit-core", version.ref = "worldedit" }
worldeditBukkit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", version.ref = "worldedit" }

View File

@ -3,14 +3,6 @@
"config:base",
":disableDependencyDashboard"
],
"ignoreDeps": [
"guava",
"com.google.guava:guava",
"com.google.code.gson:gson",
"gson",
"snakeyaml",
"net.kyori"
],
"timezone": "Europe/Berlin",
"schedule": [
"every monday"