mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-07 16:14:42 +02:00
Compare commits
8 Commits
7.5.2
...
world-stat
Author | SHA1 | Date | |
---|---|---|---|
dcd87131dd | |||
9626302f04 | |||
1b4a347e8b | |||
19e6ed4b9b | |||
6b1b0f2d6a | |||
e499bc02ec | |||
62084fffdd | |||
d012f79349 |
12
.github/workflows/build.yml
vendored
12
.github/workflows/build.yml
vendored
@ -29,18 +29,18 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
- name: Publish Release
|
- name: Publish Release
|
||||||
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
|
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
|
||||||
run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
|
run: ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
|
||||||
env:
|
env:
|
||||||
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
|
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
|
||||||
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
|
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }}
|
||||||
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
|
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
|
||||||
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
|
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
|
||||||
- name: Publish Snapshot
|
- name: Publish Snapshot
|
||||||
if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
|
if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
|
||||||
run: ./gradlew publishToSonatype
|
run: ./gradlew publishAllPublicationsToMavenCentralRepository
|
||||||
env:
|
env:
|
||||||
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
|
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
|
||||||
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
|
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }}
|
||||||
- name: Publish core javadoc
|
- name: Publish core javadoc
|
||||||
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
|
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
|
||||||
uses: cpina/github-action-push-to-another-repository@main
|
uses: cpina/github-action-push-to-another-repository@main
|
||||||
|
@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
|||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
name = "PlaceholderAPI"
|
name = "PlaceholderAPI"
|
||||||
url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/")
|
url = uri("https://repo.extendedclip.com/releases/")
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
|
@ -144,6 +144,7 @@ public class Buy extends Command {
|
|||||||
plot.getPlotModificationManager().setSign(player.getName());
|
plot.getPlotModificationManager().setSign(player.getName());
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("working.claimed"),
|
TranslatableCaption.of("working.claimed"),
|
||||||
|
TagResolver.resolver("world", Tag.inserting(Component.text(plot.getArea().getWorldName()))),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||||
);
|
);
|
||||||
this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price);
|
this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price);
|
||||||
|
@ -131,6 +131,7 @@ public class Clear extends Command {
|
|||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("working.clearing_done"),
|
TranslatableCaption.of("working.clearing_done"),
|
||||||
TagResolver.builder()
|
TagResolver.builder()
|
||||||
|
.tag("world", Tag.inserting(Component.text(plot.getArea().getWorldName())))
|
||||||
.tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
|
.tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
|
||||||
.tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
.tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||||
.build()
|
.build()
|
||||||
|
@ -124,6 +124,7 @@ public class Delete extends SubCommand {
|
|||||||
"amount",
|
"amount",
|
||||||
Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start)))
|
Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start)))
|
||||||
),
|
),
|
||||||
|
TagResolver.resolver("world", Tag.inserting(Component.text(plotArea.getWorldName()))),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||||
);
|
);
|
||||||
eventDispatcher.callPostDelete(plot);
|
eventDispatcher.callPostDelete(plot);
|
||||||
|
@ -444,7 +444,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get this player's UUID.
|
* Get this player's UUID.
|
||||||
* === !IMPORTANT ===<br>
|
* <p>=== !IMPORTANT ===</p>
|
||||||
* The UUID is dependent on the mode chosen in the settings.yml and may not be the same as Bukkit has
|
* The UUID is dependent on the mode chosen in the settings.yml and may not be the same as Bukkit has
|
||||||
* (especially if using an old version of Bukkit that does not support UUIDs)
|
* (especially if using an old version of Bukkit that does not support UUIDs)
|
||||||
*
|
*
|
||||||
|
@ -1717,6 +1717,7 @@ public class Plot {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("working.claimed"),
|
TranslatableCaption.of("working.claimed"),
|
||||||
|
TagResolver.resolver("world", Tag.inserting(Component.text(this.getWorldName()))),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(this.getId().toString())))
|
TagResolver.resolver("plot", Tag.inserting(Component.text(this.getId().toString())))
|
||||||
);
|
);
|
||||||
if (teleport) {
|
if (teleport) {
|
||||||
|
@ -390,11 +390,11 @@
|
|||||||
"info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
|
"info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
|
||||||
"info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",
|
"info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",
|
||||||
"working.generating_component": "<prefix><gold>Started generating component from your settings.</gold>",
|
"working.generating_component": "<prefix><gold>Started generating component from your settings.</gold>",
|
||||||
"working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
|
"working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
|
||||||
"working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
|
"working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
|
||||||
"working.plot_not_claimed": "<prefix><gray>Plot not claimed.</gray>",
|
"working.plot_not_claimed": "<prefix><gray>Plot not claimed.</gray>",
|
||||||
"working.plot_is_claimed": "<prefix><gray>This plot is already claimed.</gray>",
|
"working.plot_is_claimed": "<prefix><gray>This plot is already claimed.</gray>",
|
||||||
"working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><plot></gold><dark_aqua>.</dark_aqua>",
|
"working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><world>;<plot></gold><dark_aqua>.</dark_aqua>",
|
||||||
"working.progress": "<prefix><gray>Current progress: </gray><gold><progress></gold><gray>%</gray>",
|
"working.progress": "<prefix><gray>Current progress: </gray><gold><progress></gold><gray>%</gray>",
|
||||||
"working.component_complete": "<prefix><gold>Component generation has finished for plot <plot>.</gold>",
|
"working.component_complete": "<prefix><gold>Component generation has finished for plot <plot>.</gold>",
|
||||||
"list.comment_list_header_paged": "<gray>(Page </gray><gold><cur></gold><gray>/</gray><gold><max></gold><gray>) </gray><gold>List of <amount> comment(s):</gold>",
|
"list.comment_list_header_paged": "<gray>(Page </gray><gold><cur></gold><gray>/</gray><gold><max></gold><gray>) </gray><gold>List of <amount> comment(s):</gold>",
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import com.diffplug.gradle.spotless.SpotlessPlugin
|
import com.diffplug.gradle.spotless.SpotlessPlugin
|
||||||
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
|
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
|
||||||
|
import com.vanniktech.maven.publish.SonatypeHost
|
||||||
import groovy.json.JsonSlurper
|
import groovy.json.JsonSlurper
|
||||||
import xyz.jpenilla.runpaper.task.RunServer
|
import xyz.jpenilla.runpaper.task.RunServer
|
||||||
import java.net.URI
|
import java.net.URI
|
||||||
@ -7,13 +8,12 @@ import java.net.URI
|
|||||||
plugins {
|
plugins {
|
||||||
java
|
java
|
||||||
`java-library`
|
`java-library`
|
||||||
`maven-publish`
|
|
||||||
signing
|
signing
|
||||||
|
|
||||||
alias(libs.plugins.shadow)
|
alias(libs.plugins.shadow)
|
||||||
alias(libs.plugins.spotless)
|
alias(libs.plugins.spotless)
|
||||||
alias(libs.plugins.grgit)
|
alias(libs.plugins.grgit)
|
||||||
alias(libs.plugins.nexus)
|
alias(libs.plugins.publish)
|
||||||
|
|
||||||
eclipse
|
eclipse
|
||||||
idea
|
idea
|
||||||
@ -22,7 +22,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.intellectualsites.plotsquared"
|
group = "com.intellectualsites.plotsquared"
|
||||||
version = "7.5.2"
|
version = "7.5.3-SNAPSHOT"
|
||||||
|
|
||||||
if (!File("$rootDir/.git").exists()) {
|
if (!File("$rootDir/.git").exists()) {
|
||||||
logger.lifecycle("""
|
logger.lifecycle("""
|
||||||
@ -41,16 +41,6 @@ subprojects {
|
|||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
|
||||||
maven {
|
|
||||||
name = "Sonatype OSS"
|
|
||||||
url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
|
|
||||||
}
|
|
||||||
|
|
||||||
maven {
|
|
||||||
name = "Sonatype OSS (S01)"
|
|
||||||
url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
|
|
||||||
}
|
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
name = "Jitpack"
|
name = "Jitpack"
|
||||||
url = uri("https://jitpack.io")
|
url = uri("https://jitpack.io")
|
||||||
@ -68,7 +58,7 @@ subprojects {
|
|||||||
apply {
|
apply {
|
||||||
plugin<JavaPlugin>()
|
plugin<JavaPlugin>()
|
||||||
plugin<JavaLibraryPlugin>()
|
plugin<JavaLibraryPlugin>()
|
||||||
plugin<MavenPublishPlugin>()
|
plugin<com.vanniktech.maven.publish.MavenPublishPlugin>()
|
||||||
plugin<ShadowPlugin>()
|
plugin<ShadowPlugin>()
|
||||||
plugin<SpotlessPlugin>()
|
plugin<SpotlessPlugin>()
|
||||||
plugin<SigningPlugin>()
|
plugin<SigningPlugin>()
|
||||||
@ -79,8 +69,8 @@ subprojects {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// Tests
|
// Tests
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter:5.12.1")
|
testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
|
||||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.1")
|
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.2")
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins.withId("java") {
|
plugins.withId("java") {
|
||||||
@ -107,11 +97,6 @@ subprojects {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
|
||||||
withSourcesJar()
|
|
||||||
withJavadocJar()
|
|
||||||
}
|
|
||||||
|
|
||||||
val javaComponent = components["java"] as AdhocComponentWithVariants
|
val javaComponent = components["java"] as AdhocComponentWithVariants
|
||||||
javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
|
javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
|
||||||
skip()
|
skip()
|
||||||
@ -127,14 +112,15 @@ subprojects {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
mavenPublishing {
|
||||||
publications {
|
coordinates(
|
||||||
create<MavenPublication>("maven") {
|
groupId = "$group",
|
||||||
from(components["java"])
|
artifactId = project.name,
|
||||||
|
version = "${project.version}",
|
||||||
|
)
|
||||||
|
|
||||||
pom {
|
pom {
|
||||||
|
name.set(project.name)
|
||||||
name.set(project.name + " " + project.version)
|
|
||||||
description.set("PlotSquared, a land and world management plugin for Minecraft.")
|
description.set("PlotSquared, a land and world management plugin for Minecraft.")
|
||||||
url.set("https://github.com/IntellectualSites/PlotSquared")
|
url.set("https://github.com/IntellectualSites/PlotSquared")
|
||||||
|
|
||||||
@ -185,8 +171,8 @@ subprojects {
|
|||||||
system.set("GitHub")
|
system.set("GitHub")
|
||||||
url.set("https://github.com/IntellectualSites/PlotSquared/issues")
|
url.set("https://github.com/IntellectualSites/PlotSquared/issues")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -194,7 +180,6 @@ subprojects {
|
|||||||
|
|
||||||
compileJava {
|
compileJava {
|
||||||
options.compilerArgs.add("-parameters")
|
options.compilerArgs.add("-parameters")
|
||||||
options.isDeprecation = true
|
|
||||||
options.encoding = "UTF-8"
|
options.encoding = "UTF-8"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -217,15 +202,6 @@ subprojects {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
nexusPublishing {
|
|
||||||
this.repositories {
|
|
||||||
sonatype {
|
|
||||||
nexusUrl.set(URI.create("https://s01.oss.sonatype.org/service/local/"))
|
|
||||||
snapshotRepositoryUrl.set(URI.create("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.getByName<Jar>("jar") {
|
tasks.getByName<Jar>("jar") {
|
||||||
enabled = false
|
enabled = false
|
||||||
}
|
}
|
||||||
|
@ -30,13 +30,13 @@ bstats = "3.1.0"
|
|||||||
paperlib = "1.0.8"
|
paperlib = "1.0.8"
|
||||||
informative-annotations = "1.5"
|
informative-annotations = "1.5"
|
||||||
vault = "1.7.1"
|
vault = "1.7.1"
|
||||||
serverlib = "2.3.6"
|
serverlib = "2.3.7"
|
||||||
|
|
||||||
# Gradle plugins
|
# Gradle plugins
|
||||||
shadow = "8.3.6"
|
shadow = "8.3.6"
|
||||||
grgit = "4.1.1"
|
grgit = "4.1.1"
|
||||||
spotless = "7.0.2"
|
spotless = "7.0.3"
|
||||||
nexus = "2.0.0"
|
publish = "0.31.0"
|
||||||
runPaper = "2.3.1"
|
runPaper = "2.3.1"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
@ -81,5 +81,5 @@ serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.re
|
|||||||
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
|
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
|
||||||
grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
|
grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
|
||||||
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
|
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
|
||||||
nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
|
publish = { id = "com.vanniktech.maven.publish", version.ref = "publish" }
|
||||||
runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }
|
runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }
|
||||||
|
Reference in New Issue
Block a user