mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-03 22:24:43 +02:00
Compare commits
1 Commits
world-stat
...
fix/IOOBE-
Author | SHA1 | Date | |
---|---|---|---|
9127e472b8 |
12
.github/workflows/build.yml
vendored
12
.github/workflows/build.yml
vendored
@ -29,18 +29,18 @@ jobs:
|
||||
fi
|
||||
- name: Publish Release
|
||||
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
|
||||
run: ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
|
||||
run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
|
||||
env:
|
||||
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
|
||||
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }}
|
||||
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
|
||||
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
|
||||
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
|
||||
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
|
||||
- name: Publish Snapshot
|
||||
if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
|
||||
run: ./gradlew publishAllPublicationsToMavenCentralRepository
|
||||
run: ./gradlew publishToSonatype
|
||||
env:
|
||||
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
|
||||
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }}
|
||||
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
|
||||
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
|
||||
- name: Publish core javadoc
|
||||
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
|
||||
|
@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||
repositories {
|
||||
maven {
|
||||
name = "PlaceholderAPI"
|
||||
url = uri("https://repo.extendedclip.com/releases/")
|
||||
url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/")
|
||||
}
|
||||
|
||||
maven {
|
||||
|
@ -593,7 +593,7 @@ public class PlayerEventListener implements Listener {
|
||||
return;
|
||||
}
|
||||
Plot plot = area.getPlot(location);
|
||||
if (plot != null && !plot.equals(lastPlot)) {
|
||||
if (plot != null) {
|
||||
final boolean result = DenyTeleportFlag.allowsTeleport(pp, plot);
|
||||
// there is one possibility to still allow teleportation:
|
||||
// to is identical to the plot's home location, and untrusted-visit is true
|
||||
|
@ -144,7 +144,6 @@ public class Buy extends Command {
|
||||
plot.getPlotModificationManager().setSign(player.getName());
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("working.claimed"),
|
||||
TagResolver.resolver("world", Tag.inserting(Component.text(plot.getArea().getWorldName()))),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
);
|
||||
this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price);
|
||||
|
@ -131,7 +131,6 @@ public class Clear extends Command {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("working.clearing_done"),
|
||||
TagResolver.builder()
|
||||
.tag("world", Tag.inserting(Component.text(plot.getArea().getWorldName())))
|
||||
.tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
|
||||
.tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
||||
.build()
|
||||
|
@ -124,7 +124,6 @@ public class Delete extends SubCommand {
|
||||
"amount",
|
||||
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())))
|
||||
);
|
||||
eventDispatcher.callPostDelete(plot);
|
||||
|
@ -44,13 +44,8 @@ import org.apache.logging.log4j.Logger;
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
/**
|
||||
* PlotSquared command class.
|
||||
*/
|
||||
@ -152,7 +147,8 @@ public class MainCommand extends Command {
|
||||
try {
|
||||
injector.getInstance(command);
|
||||
} catch (final Exception e) {
|
||||
LOGGER.error("Failed to register command {}", command.getCanonicalName(), e);
|
||||
LOGGER.error("Failed to register command {}", command.getCanonicalName());
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@ -240,170 +236,110 @@ public class MainCommand extends Command {
|
||||
RunnableVal3<Command, Runnable, Runnable> confirm,
|
||||
RunnableVal2<Command, CommandResult> whenDone
|
||||
) {
|
||||
prepareArguments(new CommandExecutionData(player, args, confirm, whenDone, null))
|
||||
.thenCompose(executionData -> {
|
||||
if (executionData.isEmpty()) {
|
||||
// Optional command scope //
|
||||
Location location = null;
|
||||
Plot plot = null;
|
||||
boolean tp = false;
|
||||
if (args.length >= 2) {
|
||||
PlotArea area = player.getApplicablePlotArea();
|
||||
Plot newPlot = Plot.fromString(area, args[0]);
|
||||
if (newPlot != null && (player instanceof ConsolePlayer || newPlot.getArea()
|
||||
.equals(area) || player.hasPermission(Permission.PERMISSION_ADMIN)
|
||||
|| player.hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO))
|
||||
&& !newPlot.isDenied(player.getUUID())) {
|
||||
final Location newLoc;
|
||||
if (newPlot.getArea() instanceof SinglePlotArea) {
|
||||
newLoc = newPlot.isLoaded() ? newPlot.getCenterSynchronous() : Location.at("", 0, 0, 0);
|
||||
} else {
|
||||
newLoc = newPlot.getCenterSynchronous();
|
||||
}
|
||||
if (player.canTeleport(newLoc)) {
|
||||
// Save meta
|
||||
try (final MetaDataAccess<Location> locationMetaDataAccess
|
||||
= player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
|
||||
location = locationMetaDataAccess.get().orElse(null);
|
||||
locationMetaDataAccess.set(newLoc);
|
||||
}
|
||||
try (final MetaDataAccess<Plot> plotMetaDataAccess
|
||||
= player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
|
||||
plot = plotMetaDataAccess.get().orElse(null);
|
||||
plotMetaDataAccess.set(newPlot);
|
||||
}
|
||||
tp = true;
|
||||
} else {
|
||||
player.sendMessage(TranslatableCaption.of("border.denied"));
|
||||
return CompletableFuture.completedFuture(false);
|
||||
}
|
||||
var data = executionData.get();
|
||||
try {
|
||||
return super.execute(data.player(), data.args(), data.confirm(), data.whenDone());
|
||||
} catch (CommandException e) {
|
||||
throw e;
|
||||
} catch (Throwable e) {
|
||||
LOGGER.error("A error occurred while executing plot command", e);
|
||||
String message = e.getMessage();
|
||||
if (message != null) {
|
||||
data.player().sendMessage(
|
||||
TranslatableCaption.of("errors.error"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(message)))
|
||||
);
|
||||
} else {
|
||||
data.player().sendMessage(
|
||||
TranslatableCaption.of("errors.error_console"));
|
||||
// Trim command
|
||||
args = Arrays.copyOfRange(args, 1, args.length);
|
||||
}
|
||||
} finally {
|
||||
if (data.postCommandData() != null) {
|
||||
resetCommandScope(data.player(), data.postCommandData());
|
||||
}
|
||||
}
|
||||
return CompletableFuture.completedFuture(true);
|
||||
});
|
||||
return CompletableFuture.completedFuture(true);
|
||||
}
|
||||
|
||||
private CompletableFuture<Optional<CommandExecutionData>> prepareArguments(CommandExecutionData data) {
|
||||
if (data.args().length >= 2) {
|
||||
PlotArea area = data.player().getApplicablePlotArea();
|
||||
Plot newPlot = Plot.fromString(area, data.args()[0]);
|
||||
return preparePlotArgument(newPlot, data, area)
|
||||
.thenApply(d -> d.flatMap(x -> prepareFlagArgument(x, area)));
|
||||
} else {
|
||||
return CompletableFuture.completedFuture(Optional.of(data));
|
||||
}
|
||||
}
|
||||
|
||||
private CompletableFuture<Optional<CommandExecutionData>> preparePlotArgument(@Nullable Plot newPlot,
|
||||
@Nonnull CommandExecutionData data,
|
||||
@Nullable PlotArea area) {
|
||||
if (newPlot != null && (data.player() instanceof ConsolePlayer
|
||||
|| (area != null && area.equals(newPlot.getArea()))
|
||||
|| data.player().hasPermission(Permission.PERMISSION_ADMIN)
|
||||
|| data.player().hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO))
|
||||
&& !newPlot.isDenied(data.player().getUUID())) {
|
||||
return fetchPlotCenterLocation(newPlot)
|
||||
.thenApply(newLoc -> {
|
||||
if (!data.player().canTeleport(newLoc)) {
|
||||
data.player().sendMessage(TranslatableCaption.of("border.denied"));
|
||||
return Optional.empty();
|
||||
}
|
||||
// Save meta
|
||||
var originalCommandMeta = setCommandScope(data.player(), new TemporaryCommandMeta(newLoc, newPlot));
|
||||
return Optional.of(new CommandExecutionData(
|
||||
data.player(),
|
||||
Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command
|
||||
data.confirm(),
|
||||
data.whenDone(),
|
||||
originalCommandMeta
|
||||
));
|
||||
});
|
||||
}
|
||||
return CompletableFuture.completedFuture(Optional.of(data));
|
||||
}
|
||||
|
||||
private Optional<CommandExecutionData> prepareFlagArgument(@Nonnull CommandExecutionData data, @Nonnull PlotArea area) {
|
||||
if (data.args().length >= 2 && !data.args()[0].isEmpty() && data.args()[0].charAt(0) == '-') {
|
||||
if ("f".equals(data.args()[0].substring(1))) {
|
||||
return Optional.of(new CommandExecutionData(
|
||||
data.player(),
|
||||
Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command
|
||||
createForcedConfirmation(data.player(), area),
|
||||
data.whenDone(),
|
||||
data.postCommandData()
|
||||
));
|
||||
} else {
|
||||
data.player().sendMessage(TranslatableCaption.of("errors.invalid_command_flag"));
|
||||
return Optional.empty();
|
||||
}
|
||||
}
|
||||
return Optional.of(data);
|
||||
}
|
||||
|
||||
private CompletableFuture<Location> fetchPlotCenterLocation(Plot plot) {
|
||||
if (plot.getArea() instanceof SinglePlotArea && !plot.isLoaded()) {
|
||||
return CompletableFuture.completedFuture(Location.at("", 0, 0, 0));
|
||||
}
|
||||
CompletableFuture<Location> future = new CompletableFuture<>();
|
||||
plot.getCenter(future::complete);
|
||||
return future;
|
||||
}
|
||||
|
||||
private @Nonnull RunnableVal3<Command, Runnable, Runnable> createForcedConfirmation(@Nonnull PlotPlayer<?> player,
|
||||
@Nullable PlotArea area) {
|
||||
return new RunnableVal3<>() {
|
||||
if (args.length >= 2 && !args[0].isEmpty() && args[0].charAt(0) == '-') {
|
||||
if ("f".equals(args[0].substring(1))) {
|
||||
confirm = new RunnableVal3<>() {
|
||||
@Override
|
||||
public void run(Command cmd, Runnable success, Runnable failure) {
|
||||
if (area != null && PlotSquared.platform().econHandler().isEnabled(area)
|
||||
&& Optional.of(area.getPrices().get(cmd.getFullId()))
|
||||
.map(priceEval -> priceEval.evaluate(0d))
|
||||
.filter(price -> price != 0d)
|
||||
.filter(price -> PlotSquared.platform().econHandler().getMoney(player) < price)
|
||||
.isPresent()) {
|
||||
if (area != null && PlotSquared.platform().econHandler().isEnabled(area)) {
|
||||
PlotExpression priceEval =
|
||||
area.getPrices().get(cmd.getFullId());
|
||||
double price = priceEval != null ? priceEval.evaluate(0d) : 0d;
|
||||
if (price != 0d
|
||||
&& PlotSquared.platform().econHandler().getMoney(player) < price) {
|
||||
if (failure != null) {
|
||||
failure.run();
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (success != null) {
|
||||
success.run();
|
||||
}
|
||||
}
|
||||
};
|
||||
args = Arrays.copyOfRange(args, 1, args.length);
|
||||
} else {
|
||||
player.sendMessage(TranslatableCaption.of("errors.invalid_command_flag"));
|
||||
return CompletableFuture.completedFuture(false);
|
||||
}
|
||||
|
||||
private @Nonnull TemporaryCommandMeta setCommandScope(@Nonnull PlotPlayer<?> player, @Nonnull TemporaryCommandMeta commandMeta) {
|
||||
Objects.requireNonNull(commandMeta.location());
|
||||
Objects.requireNonNull(commandMeta.plot());
|
||||
Location location;
|
||||
Plot plot;
|
||||
}
|
||||
}
|
||||
try {
|
||||
super.execute(player, args, confirm, whenDone);
|
||||
} catch (CommandException e) {
|
||||
throw e;
|
||||
} catch (Throwable e) {
|
||||
e.printStackTrace();
|
||||
String message = e.getMessage();
|
||||
if (message != null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.error"),
|
||||
TagResolver.resolver("value", Tag.inserting(Component.text(message)))
|
||||
);
|
||||
} else {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.error_console"));
|
||||
}
|
||||
}
|
||||
// Reset command scope //
|
||||
if (tp && !(player instanceof ConsolePlayer)) {
|
||||
try (final MetaDataAccess<Location> locationMetaDataAccess
|
||||
= player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
|
||||
location = locationMetaDataAccess.get().orElse(null);
|
||||
locationMetaDataAccess.set(commandMeta.location());
|
||||
}
|
||||
try (final MetaDataAccess<Plot> plotMetaDataAccess
|
||||
= player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
|
||||
plot = plotMetaDataAccess.get().orElse(null);
|
||||
plotMetaDataAccess.set(commandMeta.plot());
|
||||
}
|
||||
return new TemporaryCommandMeta(location, plot);
|
||||
}
|
||||
|
||||
private void resetCommandScope(@Nonnull PlotPlayer<?> player, @Nonnull TemporaryCommandMeta commandMeta) {
|
||||
try (final MetaDataAccess<Location> locationMetaDataAccess
|
||||
= player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
|
||||
if (commandMeta.location() == null) {
|
||||
if (location == null) {
|
||||
locationMetaDataAccess.remove();
|
||||
} else {
|
||||
locationMetaDataAccess.set(commandMeta.location());
|
||||
locationMetaDataAccess.set(location);
|
||||
}
|
||||
}
|
||||
try (final MetaDataAccess<Plot> plotMetaDataAccess
|
||||
= player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
|
||||
if (commandMeta.plot() == null) {
|
||||
if (plot == null) {
|
||||
plotMetaDataAccess.remove();
|
||||
} else {
|
||||
plotMetaDataAccess.set(commandMeta.plot());
|
||||
plotMetaDataAccess.set(plot);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private record CommandExecutionData(@Nonnull PlotPlayer<?> player, @Nonnull String[] args,
|
||||
@Nonnull RunnableVal3<Command, Runnable, Runnable> confirm,
|
||||
@Nonnull RunnableVal2<Command, CommandResult> whenDone,
|
||||
@Nullable TemporaryCommandMeta postCommandData) {}
|
||||
|
||||
private record TemporaryCommandMeta(@Nullable Location location, @Nullable Plot plot) {}
|
||||
return CompletableFuture.completedFuture(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canExecute(PlotPlayer<?> player, boolean message) {
|
||||
|
@ -444,7 +444,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
|
||||
|
||||
/**
|
||||
* Get this player's UUID.
|
||||
* <p>=== !IMPORTANT ===</p>
|
||||
* === !IMPORTANT ===<br>
|
||||
* 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)
|
||||
*
|
||||
|
@ -1717,7 +1717,6 @@ public class Plot {
|
||||
}
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("working.claimed"),
|
||||
TagResolver.resolver("world", Tag.inserting(Component.text(this.getWorldName()))),
|
||||
TagResolver.resolver("plot", Tag.inserting(Component.text(this.getId().toString())))
|
||||
);
|
||||
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_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.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><world>;<plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
|
||||
"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.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.plot_not_claimed": "<prefix><gray>Plot not 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><world>;<plot></gold><dark_aqua>.</dark_aqua>",
|
||||
"working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><plot></gold><dark_aqua>.</dark_aqua>",
|
||||
"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>",
|
||||
"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,6 +1,5 @@
|
||||
import com.diffplug.gradle.spotless.SpotlessPlugin
|
||||
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
|
||||
import com.vanniktech.maven.publish.SonatypeHost
|
||||
import groovy.json.JsonSlurper
|
||||
import xyz.jpenilla.runpaper.task.RunServer
|
||||
import java.net.URI
|
||||
@ -8,12 +7,13 @@ import java.net.URI
|
||||
plugins {
|
||||
java
|
||||
`java-library`
|
||||
`maven-publish`
|
||||
signing
|
||||
|
||||
alias(libs.plugins.shadow)
|
||||
alias(libs.plugins.spotless)
|
||||
alias(libs.plugins.grgit)
|
||||
alias(libs.plugins.publish)
|
||||
alias(libs.plugins.nexus)
|
||||
|
||||
eclipse
|
||||
idea
|
||||
@ -22,7 +22,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "com.intellectualsites.plotsquared"
|
||||
version = "7.5.3-SNAPSHOT"
|
||||
version = "7.5.2-SNAPSHOT"
|
||||
|
||||
if (!File("$rootDir/.git").exists()) {
|
||||
logger.lifecycle("""
|
||||
@ -41,6 +41,16 @@ subprojects {
|
||||
repositories {
|
||||
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 {
|
||||
name = "Jitpack"
|
||||
url = uri("https://jitpack.io")
|
||||
@ -58,7 +68,7 @@ subprojects {
|
||||
apply {
|
||||
plugin<JavaPlugin>()
|
||||
plugin<JavaLibraryPlugin>()
|
||||
plugin<com.vanniktech.maven.publish.MavenPublishPlugin>()
|
||||
plugin<MavenPublishPlugin>()
|
||||
plugin<ShadowPlugin>()
|
||||
plugin<SpotlessPlugin>()
|
||||
plugin<SigningPlugin>()
|
||||
@ -69,8 +79,8 @@ subprojects {
|
||||
|
||||
dependencies {
|
||||
// Tests
|
||||
testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
|
||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.2")
|
||||
testImplementation("org.junit.jupiter:junit-jupiter:5.12.0")
|
||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.0")
|
||||
}
|
||||
|
||||
plugins.withId("java") {
|
||||
@ -97,6 +107,11 @@ subprojects {
|
||||
}
|
||||
}
|
||||
|
||||
java {
|
||||
withSourcesJar()
|
||||
withJavadocJar()
|
||||
}
|
||||
|
||||
val javaComponent = components["java"] as AdhocComponentWithVariants
|
||||
javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
|
||||
skip()
|
||||
@ -112,15 +127,14 @@ subprojects {
|
||||
}
|
||||
}
|
||||
|
||||
mavenPublishing {
|
||||
coordinates(
|
||||
groupId = "$group",
|
||||
artifactId = project.name,
|
||||
version = "${project.version}",
|
||||
)
|
||||
publishing {
|
||||
publications {
|
||||
create<MavenPublication>("maven") {
|
||||
from(components["java"])
|
||||
|
||||
pom {
|
||||
name.set(project.name)
|
||||
|
||||
name.set(project.name + " " + project.version)
|
||||
description.set("PlotSquared, a land and world management plugin for Minecraft.")
|
||||
url.set("https://github.com/IntellectualSites/PlotSquared")
|
||||
|
||||
@ -171,8 +185,8 @@ subprojects {
|
||||
system.set("GitHub")
|
||||
url.set("https://github.com/IntellectualSites/PlotSquared/issues")
|
||||
}
|
||||
|
||||
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -180,6 +194,7 @@ subprojects {
|
||||
|
||||
compileJava {
|
||||
options.compilerArgs.add("-parameters")
|
||||
options.isDeprecation = true
|
||||
options.encoding = "UTF-8"
|
||||
}
|
||||
|
||||
@ -202,6 +217,15 @@ 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") {
|
||||
enabled = false
|
||||
}
|
||||
|
@ -2,12 +2,12 @@
|
||||
# Platform expectations
|
||||
paper = "1.20.4-R0.1-SNAPSHOT"
|
||||
guice = "7.0.0"
|
||||
spotbugs = "4.9.3"
|
||||
checkerqual = "3.49.2"
|
||||
spotbugs = "4.9.1"
|
||||
checkerqual = "3.49.0"
|
||||
gson = "2.10"
|
||||
guava = "31.1-jre"
|
||||
snakeyaml = "2.0"
|
||||
adventure = "4.20.0"
|
||||
adventure = "4.19.0"
|
||||
adventure-bukkit = "4.3.4"
|
||||
log4j = "2.19.0"
|
||||
|
||||
@ -16,7 +16,7 @@ worldedit = "7.2.20"
|
||||
fawe = "2.13.0"
|
||||
placeholderapi = "2.11.6"
|
||||
luckperms = "5.4"
|
||||
essentialsx = "2.21.0"
|
||||
essentialsx = "2.20.1"
|
||||
mvdwapi = "3.1.1"
|
||||
|
||||
# Third party
|
||||
@ -30,13 +30,13 @@ bstats = "3.1.0"
|
||||
paperlib = "1.0.8"
|
||||
informative-annotations = "1.5"
|
||||
vault = "1.7.1"
|
||||
serverlib = "2.3.7"
|
||||
serverlib = "2.3.6"
|
||||
|
||||
# Gradle plugins
|
||||
shadow = "8.3.6"
|
||||
grgit = "4.1.1"
|
||||
spotless = "7.0.3"
|
||||
publish = "0.31.0"
|
||||
spotless = "7.0.2"
|
||||
nexus = "2.0.0"
|
||||
runPaper = "2.3.1"
|
||||
|
||||
[libraries]
|
||||
@ -81,5 +81,5 @@ serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.re
|
||||
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
|
||||
grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
|
||||
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
|
||||
publish = { id = "com.vanniktech.maven.publish", version.ref = "publish" }
|
||||
nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
|
||||
runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }
|
||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
2
gradlew
vendored
2
gradlew
vendored
@ -205,7 +205,7 @@ fi
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
Reference in New Issue
Block a user