From 7ba7df5cb27afc4044fa2291568f1ef475c6fb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= Date: Thu, 14 May 2020 14:16:10 +0200 Subject: [PATCH] Make the upload task work --- .../java/com/plotsquared/core/command/SubCommand.java | 4 ++-- .../serialization/ConfigurationSerializable.java | 6 +++--- Core/src/main/java/com/plotsquared/core/plot/Plot.java | 3 +-- .../core/plot/flag/types/BlockTypeWrapper.java | 4 ++-- build.gradle | 10 +++++++++- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Core/src/main/java/com/plotsquared/core/command/SubCommand.java b/Core/src/main/java/com/plotsquared/core/command/SubCommand.java index 4b4dd1d89..4a8d0e9fd 100644 --- a/Core/src/main/java/com/plotsquared/core/command/SubCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/SubCommand.java @@ -35,8 +35,8 @@ import java.util.concurrent.CompletableFuture; /** * SubCommand class * - * @Deprecated In favor of normal Command class - * @see Command(Command, boolean) + * @deprecated In favor of normal Command class + * @see Command#Command(Command, boolean) */ public abstract class SubCommand extends Command { public SubCommand() { diff --git a/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerializable.java b/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerializable.java index 135864f55..b66c4a5a0 100644 --- a/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerializable.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/serialization/ConfigurationSerializable.java @@ -33,11 +33,11 @@ import java.util.Map; * the methods as defined by this interface: * * In addition to implementing this interface, you must register the class * with {@link ConfigurationSerialization#registerClass(Class)}. diff --git a/Core/src/main/java/com/plotsquared/core/plot/Plot.java b/Core/src/main/java/com/plotsquared/core/plot/Plot.java index d2111eadb..9461219ef 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/Plot.java +++ b/Core/src/main/java/com/plotsquared/core/plot/Plot.java @@ -321,7 +321,7 @@ public class Plot { * the owner of this particular subplot. *

* Unlike {@link #getOwner()} this method does not - * consider factors such as {@link com.github.intellectualsites.plotsquared.plot.flags.implementations.ServerPlotFlag} + * consider factors such as {@link com.plotsquared.core.plot.flag.implementations.ServerPlotFlag} * that could alter the de facto owner of the plot. * * @return The plot owner of this particular (sub-)plot @@ -2060,7 +2060,6 @@ public class Plot { * @param destination The other plot to swap with * @param whenDone A task to run when finished, or null * @return boolean if swap was successful - * @see ChunkManager#swap(Location, Location, Location, Location, Runnable) to swap terrain * @see #swapData(Plot) to swap plot settings */ public CompletableFuture swap(Plot destination, Runnable whenDone) { diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java index 8ed27a4f0..638653f0e 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java @@ -98,13 +98,13 @@ public class BlockTypeWrapper { /** * Returns the block category associated with this wrapper. - *
+ *
* Invocation will try to lazily initialize the block category if it's not * set yet but the category id is present. If {@link BlockCategory#REGISTRY} is already populated * but does not contain a category with the given name, a BlockCategory containing no items * is returned. * If this wrapper does not wrap a BlockCategory, null is returned. - *
+ *
* If {@link BlockCategory#REGISTRY} isn't populated yet, null is returned. * * @return the block category represented by this wrapper. diff --git a/build.gradle b/build.gradle index 5587cfd87..3723a1e1f 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,7 @@ buildscript { dependencies { classpath("com.github.jengelman.gradle.plugins:shadow:5.0.0") classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0' + classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1' } configurations.all { resolutionStrategy { @@ -41,7 +42,9 @@ version = ver + versuffix description = rootProject.name allprojects { - apply plugin: 'com.github.hierynomus.license' + apply(plugin: 'com.github.hierynomus.license') + apply(plugin: 'com.bmuschko.nexus') + gradle.projectsEvaluated { tasks.withType(JavaCompile) { options.compilerArgs << "-Xmaxerrs" << "1000" @@ -53,6 +56,11 @@ allprojects { ext.year = 2020 includes(["**/*.java","**/*.js"]) } + nexus { + sign = false + repositoryUrl = 'https://mvn.intellectualsites.com/content/repositories/releases/' + snapshotRepositoryUrl = 'https://mvn.intellectualsites.com/content/repositories/snapshots/' + } } subprojects {