Compare commits

...

12 Commits

Author SHA1 Message Date
7c911c919e feat: add projectile-change-block flag
- closes #4081
2023-10-01 11:14:42 +01:00
d95c74d8c9 Addresses issues related to maven publish scm block (#4179)
- Fixes https://github.com/IntellectualSites/PlotSquared/issues/4158
- Fixes https://github.com/IntellectualSites/PlotSquared/issues/4159
- Resolves https://github.com/IntellectualSites/PlotSquared/issues/4160
2023-10-01 11:54:47 +02:00
c1555ddbc7 Fix #isAccessible() deprecation in HybridPlotWorld (#4177)
Fixes https://github.com/IntellectualSites/PlotSquared/issues/4165
2023-10-01 11:50:19 +02:00
4fe0c586d9 Address deprecated URL instantiation (#4178)
Fixes https://github.com/IntellectualSites/PlotSquared/issues/4166
2023-10-01 11:50:12 +02:00
aae6ea4fee Update dependency net.kyori:adventure-platform-bukkit to v4.3.1 (#4182)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-01 11:50:03 +02:00
385d018504 Update worldedit to v7.2.16 (#4183)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-01 11:49:53 +02:00
f4def082c1 Update dependency cloud.commandframework:cloud-services to v1.8.4 (#4175)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-01 11:25:05 +02:00
69c9f1df83 Update dependency me.clip:placeholderapi to v2.11.4 (#4176)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-01 11:24:58 +02:00
e138dc0267 Update runServer gradle tasks (#4173)
* chore/feat: download fawe & only use latest patch versions in runServer

* chore: gitignore runServer-1.20 folder as well

* chore: exclude minor versions >= 10 by default (no need for < 10)

* chore: update gradle plugin
2023-09-30 01:32:50 +02:00
ca50b53f94 Update api.spigotmc.org from 0.1 to 0.2 (#4167) 2023-09-17 20:14:30 +02:00
f705487055 Ignore deprecations we can't address (yet) 2023-09-16 21:48:13 +02:00
b7c9453a1a Rewrite javadocs for PlotId class (#4157) 2023-09-15 13:17:42 -04:00
19 changed files with 151 additions and 70 deletions

5
.gitignore vendored
View File

@ -138,6 +138,5 @@ build/
.DS_Store .DS_Store
# Ignore run folders # Ignore run folders
run-[0-0].[0-9]/ run-[0-9].[0-9][0-9]/
run-[0-0].[0-9].[0-9]/ run-[0-9].[0-9][0-9].[0-9]/

View File

@ -252,6 +252,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
} }
@Override @Override
@SuppressWarnings("deprecation") // Paper deprecation
public void onEnable() { public void onEnable() {
this.pluginName = getDescription().getName(); this.pluginName = getDescription().getName();
@ -1160,6 +1161,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
return new BukkitPlotGenerator(world, generator, this.plotAreaManager); return new BukkitPlotGenerator(world, generator, this.plotAreaManager);
} }
@SuppressWarnings("deprecation") // Paper deprecation
@Override @Override
public @NonNull String pluginsFormatted() { public @NonNull String pluginsFormatted() {
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
@ -1181,7 +1183,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
} }
@Override @Override
@SuppressWarnings("ConstantConditions") @SuppressWarnings({"ConstantConditions", "deprecation"}) // Paper deprecation
public @NonNull String worldEditImplementations() { public @NonNull String worldEditImplementations() {
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
if (Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null) { if (Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null) {

View File

@ -74,6 +74,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
private HorseStats horse; private HorseStats horse;
private boolean noGravity; private boolean noGravity;
@SuppressWarnings("deprecation") // Deprecation exists since 1.20, while we support 1.16 onwards
public ReplicatingEntityWrapper(Entity entity, short depth) { public ReplicatingEntityWrapper(Entity entity, short depth) {
super(entity); super(entity);

View File

@ -35,6 +35,7 @@ import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag; import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag;
import com.plotsquared.core.plot.flag.implementations.ExplosionFlag; import com.plotsquared.core.plot.flag.implementations.ExplosionFlag;
import com.plotsquared.core.plot.flag.implementations.InvincibleFlag; import com.plotsquared.core.plot.flag.implementations.InvincibleFlag;
import com.plotsquared.core.plot.flag.implementations.ProjectileChangeBlockFlag;
import com.plotsquared.core.plot.world.PlotAreaManager; import com.plotsquared.core.plot.world.PlotAreaManager;
import com.plotsquared.core.util.EventDispatcher; import com.plotsquared.core.util.EventDispatcher;
import com.plotsquared.core.util.PlotFlagUtil; import com.plotsquared.core.util.PlotFlagUtil;
@ -360,7 +361,7 @@ public class EntityEventListener implements Listener {
} }
return; return;
} }
if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) { if (plot.isAdded(pp.getUUID()) || plot.getFlag(ProjectileChangeBlockFlag.class) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
return; return;
} }
entity.remove(); entity.remove();

View File

@ -369,6 +369,7 @@ public class PlayerEventListener implements Listener {
} }
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@SuppressWarnings("deprecation") // Paper deprecation
public void onConnect(PlayerJoinEvent event) { public void onConnect(PlayerJoinEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
PlotSquared.platform().playerManager().removePlayer(player.getUniqueId()); PlotSquared.platform().playerManager().removePlayer(player.getUniqueId());
@ -733,6 +734,7 @@ public class PlayerEventListener implements Listener {
} }
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
@SuppressWarnings("deprecation") // Paper deprecation
public void onChat(AsyncPlayerChatEvent event) { public void onChat(AsyncPlayerChatEvent event) {
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
@ -1063,6 +1065,7 @@ public class PlayerEventListener implements Listener {
} }
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
@SuppressWarnings("deprecation") // Paper deprecation
public void onCancelledInteract(PlayerInteractEvent event) { public void onCancelledInteract(PlayerInteractEvent event) {
if (event.isCancelled() && event.getAction() == Action.RIGHT_CLICK_AIR) { if (event.isCancelled() && event.getAction() == Action.RIGHT_CLICK_AIR) {
Player player = event.getPlayer(); Player player = event.getPlayer();

View File

@ -44,6 +44,7 @@ import java.util.stream.IntStream;
@Singleton @Singleton
public class BukkitInventoryUtil extends InventoryUtil { public class BukkitInventoryUtil extends InventoryUtil {
@SuppressWarnings("deprecation") // Paper deprecation
private static @Nullable ItemStack getItem(PlotItemStack item) { private static @Nullable ItemStack getItem(PlotItemStack item) {
if (item == null) { if (item == null) {
return null; return null;

View File

@ -67,6 +67,7 @@ public class BukkitSetupUtils extends SetupUtils {
this.worldFile = worldFile; this.worldFile = worldFile;
} }
@SuppressWarnings("deprecation") // Paper deprecation
@Override @Override
public void updateGenerators(final boolean force) { public void updateGenerators(final boolean force) {
if (loaded && !SetupUtils.generators.isEmpty() && !force) { if (loaded && !SetupUtils.generators.isEmpty() && !force) {

View File

@ -35,7 +35,7 @@ import org.bukkit.scheduler.BukkitTask;
import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.HttpsURLConnection;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.URL; import java.net.URI;
public class UpdateUtility implements Listener { public class UpdateUtility implements Listener {
@ -59,8 +59,9 @@ public class UpdateUtility implements Listener {
public void updateChecker() { public void updateChecker() {
task = Bukkit.getScheduler().runTaskTimerAsynchronously(this.javaPlugin, () -> { task = Bukkit.getScheduler().runTaskTimerAsynchronously(this.javaPlugin, () -> {
try { try {
HttpsURLConnection connection = (HttpsURLConnection) new URL( HttpsURLConnection connection = (HttpsURLConnection) URI.create(
"https://api.spigotmc.org/simple/0.1/index.php?action=getResource&id=77506") "https://api.spigotmc.org/simple/0.2/index.php?action=getResource&id=77506")
.toURL()
.openConnection(); .openConnection();
connection.setRequestMethod("GET"); connection.setRequestMethod("GET");
JsonObject result = new JsonParser() JsonObject result = new JsonParser()

View File

@ -84,7 +84,7 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.net.MalformedURLException; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.nio.file.Files; import java.nio.file.Files;
@ -210,9 +210,10 @@ public class PlotSquared {
try { try {
URL logurl = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation(); URL logurl = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
this.jarFile = new File( this.jarFile = new File(
new URL(logurl.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file")) URI.create(
.toURI().getPath()); logurl.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
} catch (MalformedURLException | URISyntaxException | SecurityException e) { .getPath());
} catch (URISyntaxException | SecurityException e) {
e.printStackTrace(); e.printStackTrace();
this.jarFile = new File(this.platform.getDirectory().getParentFile(), "PlotSquared.jar"); this.jarFile = new File(this.platform.getDirectory().getParentFile(), "PlotSquared.jar");
if (!this.jarFile.exists()) { if (!this.jarFile.exists()) {

View File

@ -41,6 +41,7 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL; import java.net.URL;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -116,7 +117,7 @@ public class Load extends SubCommand {
} }
final URL url; final URL url;
try { try {
url = new URL(Settings.Web.URL + "saves/" + player.getUUID() + '/' + schematic); url = URI.create(Settings.Web.URL + "saves/" + player.getUUID() + '/' + schematic).toURL();
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
e.printStackTrace(); e.printStackTrace();
player.sendMessage(TranslatableCaption.of("web.load_failed")); player.sendMessage(TranslatableCaption.of("web.load_failed"));

View File

@ -40,6 +40,7 @@ import net.kyori.adventure.text.minimessage.tag.Tag;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import java.net.URI;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -130,8 +131,7 @@ public class SchematicCmd extends SubCommand {
if (location.startsWith("url:")) { if (location.startsWith("url:")) {
try { try {
UUID uuid = UUID.fromString(location.substring(4)); UUID uuid = UUID.fromString(location.substring(4));
URL base = new URL(Settings.Web.URL); URL url = URI.create(Settings.Web.URL + "uploads/" + uuid + ".schematic").toURL();
URL url = new URL(base, "uploads/" + uuid + ".schematic");
schematic = this.schematicHandler.getSchematic(url); schematic = this.schematicHandler.getSchematic(url);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

View File

@ -189,7 +189,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
} }
Object value; Object value;
try { try {
final boolean accessible = field.isAccessible(); final boolean accessible = field.canAccess(this);
field.setAccessible(true); field.setAccessible(true);
value = field.get(this); value = field.get(this);
field.setAccessible(accessible); field.setAccessible(accessible);

View File

@ -26,8 +26,8 @@ import java.util.Iterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
/** /**
* Plot (X,Y) tuples for plot locations * The PlotId class represents a Plot's x and y coordinates within a {@link PlotArea}. PlotId x,y values do not correspond to Block locations.
* within a plot area * A PlotId instance can be created using the {@link #of(int, int)} method or parsed from a string using the {@link #fromString(String)} method.
*/ */
public final class PlotId { public final class PlotId {
@ -36,10 +36,10 @@ public final class PlotId {
private final int hash; private final int hash;
/** /**
* PlotId class (PlotId x,y values do not correspond to Block locations) * Constructs a new PlotId with the given x and y coordinates.
* *
* @param x The plot x coordinate * @param x the x-coordinate of the plot
* @param y The plot y coordinate * @param y the y-coordinate of the plot
*/ */
private PlotId(final int x, final int y) { private PlotId(final int x, final int y) {
this.x = x; this.x = x;
@ -48,11 +48,11 @@ public final class PlotId {
} }
/** /**
* Create a new plot ID instance * Returns a new PlotId instance with the specified x and y coordinates.
* *
* @param x The plot x coordinate * @param x the x-coordinate of the plot
* @param y The plot y coordinate * @param y the y-coordinate of the plot
* @return a new PlotId at x,y * @return a new PlotId instance with the specified x and y coordinates
*/ */
public static @NonNull PlotId of(final int x, final int y) { public static @NonNull PlotId of(final int x, final int y) {
return new PlotId(x, y); return new PlotId(x, y);
@ -74,10 +74,13 @@ public final class PlotId {
} }
/** /**
* Attempt to parse a plot ID from a string * Returns a PlotId object from the given string, or null if the string is invalid.
* The string should be in the format "x;y" where x and y are integers.
* The string can also contain any combination of the characters ";_,."
* as delimiters.
* *
* @param string ID string * @param string the string to parse
* @return Plot ID, or {@code null} if none could be parsed * @return a PlotId object parsed from the given string, or null if the string is invalid
*/ */
public static @Nullable PlotId fromStringOrNull(final @NonNull String string) { public static @Nullable PlotId fromStringOrNull(final @NonNull String string) {
final String[] parts = string.split("[;_,.]"); final String[] parts = string.split("[;_,.]");
@ -95,39 +98,39 @@ public final class PlotId {
return of(x, y); return of(x, y);
} }
/** /**
* Gets the PlotId from the HashCode<br> * Returns a new PlotId instance from the given hash.
* Note: Only accurate for small x,z values (short)
* *
* @param hash ID hash * @param hash the hash to unpair
* @return Plot ID * @return a new PlotId instance
*/ */
public static @NonNull PlotId unpair(final int hash) { public static @NonNull PlotId unpair(final int hash) {
return PlotId.of(hash >> 16, hash & 0xFFFF); return PlotId.of(hash >> 16, hash & 0xFFFF);
} }
/** /**
* Get the ID X component * Returns the x-coordinate of this Plot ID.
* *
* @return X component * @return the x-coordinate of this Plot ID
*/ */
public int getX() { public int getX() {
return this.x; return this.x;
} }
/** /**
* Get the ID Y component * Returns the y-coordinate of this Plot ID.
* *
* @return Y component * @return the y-coordinate of this Plot ID
*/ */
public int getY() { public int getY() {
return this.y; return this.y;
} }
/** /**
* Get the next plot ID for claiming purposes * Returns the next Plot ID for claiming purposes based on the current Plot ID.
* *
* @return Next plot ID * @return the next Plot ID
*/ */
public @NonNull PlotId getNextId() { public @NonNull PlotId getNextId() {
final int absX = Math.abs(x); final int absX = Math.abs(x);
@ -159,10 +162,11 @@ public final class PlotId {
} }
/** /**
* Get the PlotId in a relative direction * Returns a new Plot ID in the specified relative direction based on the
* current Plot ID.
* *
* @param direction Direction * @param direction the direction in which to get the relative Plot ID
* @return Relative plot ID * @return the relative Plot ID
*/ */
public @NonNull PlotId getRelative(final @NonNull Direction direction) { public @NonNull PlotId getRelative(final @NonNull Direction direction) {
return switch (direction) { return switch (direction) {
@ -193,10 +197,11 @@ public final class PlotId {
} }
/** /**
* Get a String representation of the plot ID where the * Returns a string representation of this Plot ID in the format "x;y".
* components are separated by ";"
* *
* @return {@code x + ";" + y} * <p> The format is {@code x + ";" + y}
*
* @return a string representation of this Plot ID
*/ */
@Override @Override
public @NonNull String toString() { public @NonNull String toString() {
@ -204,41 +209,40 @@ public final class PlotId {
} }
/** /**
* Get a String representation of the plot ID where the * Returns a string representation of this Plot ID with the specified separator.
* components are separated by a specified string * <p>
* The format is {@code x + separator + y}
* *
* @param separator Separator * @param separator the separator to use between the X and Y coordinates
* @return {@code x + separator + y} * @return a string representation of this Plot ID with the specified separator
*/ */
public @NonNull String toSeparatedString(String separator) { public @NonNull String toSeparatedString(String separator) {
return this.getX() + separator + this.getY(); return this.getX() + separator + this.getY();
} }
/** /**
* Get a String representation of the plot ID where the * Returns a string representation of this Plot ID in the format "x,y".
* components are separated by ","
* *
* @return {@code x + "," + y} * @return a string representation of this Plot ID
*/ */
public @NonNull String toCommaSeparatedString() { public @NonNull String toCommaSeparatedString() {
return this.getX() + "," + this.getY(); return this.getX() + "," + this.getY();
} }
/** /**
* Get a String representation of the plot ID where the * Returns a string representation of this Plot ID in the format "x_y".
* components are separated by "_"
* *
* @return {@code x + "_" + y} * @return a string representation of this Plot ID
*/ */
public @NonNull String toUnderscoreSeparatedString() { public @NonNull String toUnderscoreSeparatedString() {
return this.getX() + "_" + this.getY(); return this.getX() + "_" + this.getY();
} }
/** /**
* Get a String representation of the plot ID where the * Returns a string representation of this Plot ID in the format "x-y".
* components are separated by "-"
* *
* @return {@code x + "-" + y} * @return a string representation of this Plot ID
*/ */
public @NonNull String toDashSeparatedString() { public @NonNull String toDashSeparatedString() {
return this.getX() + "-" + this.getY(); return this.getX() + "-" + this.getY();
@ -250,6 +254,10 @@ public final class PlotId {
} }
/**
* An iterator that iterates over a range of {@link PlotId}s.
* The range is defined by a start and end {@link PlotId}.
*/
public static final class PlotRangeIterator implements Iterator<PlotId>, Iterable<PlotId> { public static final class PlotRangeIterator implements Iterator<PlotId>, Iterable<PlotId> {
private final PlotId start; private final PlotId start;
@ -265,6 +273,13 @@ public final class PlotId {
this.y = this.start.getY(); this.y = this.start.getY();
} }
/**
* Returns a new {@link PlotRangeIterator} that iterates over the range of Plots between the specified start and end Plots (inclusive).
*
* @param start the starting Plot of the range
* @param end the ending Plot of the range
* @return a new {@link PlotRangeIterator} that iterates over the range of Plots between the specified start and end Plots (inclusive)
*/
public static PlotRangeIterator range(final @NonNull PlotId start, final @NonNull PlotId end) { public static PlotRangeIterator range(final @NonNull PlotId start, final @NonNull PlotId end) {
return new PlotRangeIterator(start, end); return new PlotRangeIterator(start, end);
} }

View File

@ -87,6 +87,7 @@ import com.plotsquared.core.plot.flag.implementations.PlayerInteractFlag;
import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag; import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag;
import com.plotsquared.core.plot.flag.implementations.PreventCreativeCopyFlag; import com.plotsquared.core.plot.flag.implementations.PreventCreativeCopyFlag;
import com.plotsquared.core.plot.flag.implementations.PriceFlag; import com.plotsquared.core.plot.flag.implementations.PriceFlag;
import com.plotsquared.core.plot.flag.implementations.ProjectileChangeBlockFlag;
import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag; import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
import com.plotsquared.core.plot.flag.implementations.PveFlag; import com.plotsquared.core.plot.flag.implementations.PveFlag;
import com.plotsquared.core.plot.flag.implementations.PvpFlag; import com.plotsquared.core.plot.flag.implementations.PvpFlag;
@ -181,6 +182,7 @@ public final class GlobalFlagContainer extends FlagContainer {
this.addFlag(NoWorldeditFlag.NO_WORLDEDIT_FALSE); this.addFlag(NoWorldeditFlag.NO_WORLDEDIT_FALSE);
this.addFlag(PlayerInteractFlag.PLAYER_INTERACT_FALSE); this.addFlag(PlayerInteractFlag.PLAYER_INTERACT_FALSE);
this.addFlag(PreventCreativeCopyFlag.PREVENT_CREATIVE_COPY_FALSE); this.addFlag(PreventCreativeCopyFlag.PREVENT_CREATIVE_COPY_FALSE);
this.addFlag(ProjectileChangeBlockFlag.PROJECTILE_CHANGE_BLOCK_FALSE);
this.addFlag(PveFlag.PVE_FALSE); this.addFlag(PveFlag.PVE_FALSE);
this.addFlag(PvpFlag.PVP_FALSE); this.addFlag(PvpFlag.PVP_FALSE);
this.addFlag(RedstoneFlag.REDSTONE_TRUE); this.addFlag(RedstoneFlag.REDSTONE_TRUE);

View File

@ -0,0 +1,39 @@
/*
* PlotSquared, a land and world management plugin for Minecraft.
* Copyright (C) IntellectualSites <https://intellectualsites.com>
* Copyright (C) IntellectualSites team and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.plotsquared.core.plot.flag.implementations;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.plot.flag.types.BooleanFlag;
import org.checkerframework.checker.nullness.qual.NonNull;
public class ProjectileChangeBlockFlag extends BooleanFlag<ProjectileChangeBlockFlag> {
public static final ProjectileChangeBlockFlag PROJECTILE_CHANGE_BLOCK_TRUE = new ProjectileChangeBlockFlag(true);
public static final ProjectileChangeBlockFlag PROJECTILE_CHANGE_BLOCK_FALSE = new ProjectileChangeBlockFlag(false);
private ProjectileChangeBlockFlag(boolean value) {
super(value, TranslatableCaption.of("flags.flag_description_projectile_change_block"));
}
@Override
protected ProjectileChangeBlockFlag flagOf(@NonNull Boolean value) {
return value ? PROJECTILE_CHANGE_BLOCK_TRUE : PROJECTILE_CHANGE_BLOCK_FALSE;
}
}

View File

@ -83,6 +83,7 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.nio.channels.Channels; import java.nio.channels.Channels;
@ -144,7 +145,7 @@ public abstract class SchematicHandler {
} }
final URL url; final URL url;
try { try {
url = new URL(Settings.Web.URL + "?key=" + uuid + "&type=" + extension); url = URI.create(Settings.Web.URL + "?key=" + uuid + "&type=" + extension).toURL();
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
e.printStackTrace(); e.printStackTrace();
whenDone.run(); whenDone.run();
@ -153,7 +154,7 @@ public abstract class SchematicHandler {
TaskManager.runTaskAsync(() -> { TaskManager.runTaskAsync(() -> {
try { try {
String boundary = Long.toHexString(System.currentTimeMillis()); String boundary = Long.toHexString(System.currentTimeMillis());
URLConnection con = new URL(website).openConnection(); URLConnection con = URI.create(website).toURL().openConnection();
con.setDoOutput(true); con.setDoOutput(true);
con.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary); con.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
try (OutputStream output = con.getOutputStream(); try (OutputStream output = con.getOutputStream();
@ -498,9 +499,10 @@ public abstract class SchematicHandler {
public List<String> getSaves(UUID uuid) { public List<String> getSaves(UUID uuid) {
String rawJSON; String rawJSON;
try { try {
String website = Settings.Web.URL + "list.php?" + uuid.toString(); URLConnection connection = URI.create(
URL url = new URL(website); Settings.Web.URL + "list.php?" + uuid.toString())
URLConnection connection = new URL(url.toString()).openConnection(); .toURL()
.openConnection();
connection.setRequestProperty("User-Agent", "Mozilla/5.0"); connection.setRequestProperty("User-Agent", "Mozilla/5.0");
try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) { try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
rawJSON = reader.lines().collect(Collectors.joining()); rawJSON = reader.lines().collect(Collectors.joining());

View File

@ -587,6 +587,7 @@
"flags.flag_description_place": "<gray>Define a list of materials players should be able to place in the plot.</gray>", "flags.flag_description_place": "<gray>Define a list of materials players should be able to place in the plot.</gray>",
"flags.flag_description_player_interact": "<gray>Set to `true` to allow guests to interact with players in the plot.</gray>", "flags.flag_description_player_interact": "<gray>Set to `true` to allow guests to interact with players in the plot.</gray>",
"flags.flag_description_price": "<gray>Set a price for a plot. Must be a positive decimal number.</gray>", "flags.flag_description_price": "<gray>Set a price for a plot. Must be a positive decimal number.</gray>",
"flags.flag_description_projectile_change_block": "<gray>Set to `true` to allow projectiles to change blocks (tnt, etc.) on the plot.</gray>",
"flags.flag_description_pve": "<gray>Set to `true` to enable PVE inside the plot.</gray>", "flags.flag_description_pve": "<gray>Set to `true` to enable PVE inside the plot.</gray>",
"flags.flag_description_pvp": "<gray>Set to `true` to enable PVP inside the plot.</gray>", "flags.flag_description_pvp": "<gray>Set to `true` to enable PVP inside the plot.</gray>",
"flags.flag_description_redstone": "<gray>Set to `false` to disable redstone in the plot.</gray>", "flags.flag_description_redstone": "<gray>Set to `false` to disable redstone in the plot.</gray>",

View File

@ -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 groovy.json.JsonSlurper
import java.net.URI import java.net.URI
import xyz.jpenilla.runpaper.task.RunServer import xyz.jpenilla.runpaper.task.RunServer
@ -170,8 +171,9 @@ subprojects {
scm { scm {
url.set("https://github.com/IntellectualSites/PlotSquared") url.set("https://github.com/IntellectualSites/PlotSquared")
connection.set("scm:https://IntellectualSites@github.com/IntellectualSites/PlotSquared.git") connection.set("scm:git:https://github.com/IntellectualSites/PlotSquared.git")
developerConnection.set("scm:git://github.com/IntellectualSites/PlotSquared.git") developerConnection.set("scm:git:git@github.com:IntellectualSites/PlotSquared.git")
tag.set("${project.version}")
} }
issueManagement { issueManagement {
@ -218,14 +220,23 @@ tasks.getByName<Jar>("jar") {
enabled = false enabled = false
} }
val supportedVersions = listOf("1.16.5", "1.17", "1.17.1", "1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20") val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1")
tasks { tasks {
val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>)
.map { it as Map<*, *> }
.map { it["fileName"] as String }
.first { it.contains("Bukkit") }
supportedVersions.forEach { supportedVersions.forEach {
register<RunServer>("runServer-$it") { register<RunServer>("runServer-$it") {
minecraftVersion(it) minecraftVersion(it)
pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile } pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
.toTypedArray()) .toTypedArray())
jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true") jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
downloadPlugins {
url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/$artifact")
}
group = "run paper" group = "run paper"
runDirectory.set(file("run-$it")) runDirectory.set(file("run-$it"))
} }

View File

@ -8,13 +8,13 @@ gson = "2.10"
guava = "31.1-jre" guava = "31.1-jre"
snakeyaml = "2.0" snakeyaml = "2.0"
adventure = "4.14.0" adventure = "4.14.0"
adventure-bukkit = "4.3.0" adventure-bukkit = "4.3.1"
log4j = "2.19.0" log4j = "2.19.0"
# Plugins # Plugins
worldedit = "7.2.15" worldedit = "7.2.16"
fawe = "2.7.1" fawe = "2.7.1"
placeholderapi = "2.11.3" placeholderapi = "2.11.4"
luckperms = "5.4" luckperms = "5.4"
essentialsx = "2.20.1" essentialsx = "2.20.1"
mvdwapi = "3.1.1" mvdwapi = "3.1.1"
@ -22,7 +22,7 @@ mvdwapi = "3.1.1"
# Third party # Third party
prtree = "2.0.1" prtree = "2.0.1"
aopalliance = "1.0" aopalliance = "1.0"
cloud-services = "1.8.3" cloud-services = "1.8.4"
arkitektonika = "2.1.2" arkitektonika = "2.1.2"
squirrelid = "0.3.2" squirrelid = "0.3.2"
paster = "1.1.5" paster = "1.1.5"
@ -37,7 +37,7 @@ shadow = "8.1.1"
grgit = "4.1.1" grgit = "4.1.1"
spotless = "6.21.0" spotless = "6.21.0"
nexus = "1.3.0" nexus = "1.3.0"
runPaper = "2.1.0" runPaper = "2.2.0"
[libraries] [libraries]
# Platform expectations # Platform expectations