mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-31 17:43:44 +01:00 
			
		
		
		
	Compare commits
	
		
			21 Commits
		
	
	
		
			fix/IOOBE-
			...
			brand-dp
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 092ee41e52 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 7dbd0bcff8 | ||
|   | 9626302f04 | ||
|   | 1b4a347e8b | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 19e6ed4b9b | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 6b1b0f2d6a | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | e499bc02ec | ||
|   | 62084fffdd | ||
|   | d012f79349 | ||
|   | 139d6efc70 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 6f5cb917f2 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 9bf66f1b7c | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 92875ebe7f | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 25a4545f14 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 3fdeed019b | ||
|   | f3400df811 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | beb7cb40f4 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 2c0bb03e5c | ||
|   | e8c170686c | ||
|   | ff8676cde3 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 817effb735 | 
							
								
								
									
										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 { | ||||||
|   | |||||||
| @@ -252,6 +252,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | |||||||
|         return Bukkit.getVersion(); |         return Bukkit.getVersion(); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     @Override | ||||||
|  |     public @NonNull String serverBrand() { | ||||||
|  |         return Bukkit.getName(); | ||||||
|  |     } | ||||||
|  |  | ||||||
|     @Override |     @Override | ||||||
|     @SuppressWarnings("deprecation") // Paper deprecation |     @SuppressWarnings("deprecation") // Paper deprecation | ||||||
|     public void onEnable() { |     public void onEnable() { | ||||||
|   | |||||||
| @@ -134,7 +134,7 @@ public class BlockEventListener117 implements Listener { | |||||||
|     public void onBlockFertilize(BlockFertilizeEvent event) { |     public void onBlockFertilize(BlockFertilizeEvent event) { | ||||||
|         Block block = event.getBlock(); |         Block block = event.getBlock(); | ||||||
|         List<org.bukkit.block.BlockState> blocks = event.getBlocks(); |         List<org.bukkit.block.BlockState> blocks = event.getBlocks(); | ||||||
|         Location location = BukkitUtil.adapt(blocks.get(0).getLocation()); |         Location location = BukkitUtil.adapt(block.getLocation()); | ||||||
|  |  | ||||||
|         PlotArea area = location.getPlotArea(); |         PlotArea area = location.getPlotArea(); | ||||||
|         if (area == null) { |         if (area == null) { | ||||||
|   | |||||||
| @@ -593,7 +593,7 @@ public class PlayerEventListener implements Listener { | |||||||
|                     return; |                     return; | ||||||
|                 } |                 } | ||||||
|                 Plot plot = area.getPlot(location); |                 Plot plot = area.getPlot(location); | ||||||
|                 if (plot != null) { |                 if (plot != null && !plot.equals(lastPlot)) { | ||||||
|                     final boolean result = DenyTeleportFlag.allowsTeleport(pp, plot); |                     final boolean result = DenyTeleportFlag.allowsTeleport(pp, plot); | ||||||
|                     // there is one possibility to still allow teleportation: |                     // there is one possibility to still allow teleportation: | ||||||
|                     // to is identical to the plot's home location, and untrusted-visit is true |                     // to is identical to the plot's home location, and untrusted-visit is true | ||||||
|   | |||||||
| @@ -120,6 +120,14 @@ public interface PlotPlatform<P> extends LocaleHolder { | |||||||
|      */ |      */ | ||||||
|     @NonNull String serverImplementation(); |     @NonNull String serverImplementation(); | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Gets the server brand name | ||||||
|  |      * | ||||||
|  |      * @return server brand | ||||||
|  |      * @since TODO | ||||||
|  |      */ | ||||||
|  |     @NonNull String serverBrand(); | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Gets the native server code package prefix. |      * Gets the native server code package prefix. | ||||||
|      * |      * | ||||||
|   | |||||||
| @@ -86,7 +86,8 @@ public class DebugPaste extends SubCommand { | |||||||
|                 b.append("# WorldEdit implementation:\n"); |                 b.append("# WorldEdit implementation:\n"); | ||||||
|                 b.append(PlotSquared.platform().worldEditImplementations()).append("\n\n"); |                 b.append(PlotSquared.platform().worldEditImplementations()).append("\n\n"); | ||||||
|                 b.append("# Server Information\n"); |                 b.append("# Server Information\n"); | ||||||
|                 b.append("Server Version: ").append(PlotSquared.platform().serverImplementation()) |                 b.append("Server Version: ").append(PlotSquared.platform().serverBrand()).append(": ") | ||||||
|  |                         .append(PlotSquared.platform().serverImplementation()).append("\n") | ||||||
|                         .append("\n"); |                         .append("\n"); | ||||||
|                 b.append("online_mode: ").append(!Settings.UUID.OFFLINE).append(';') |                 b.append("online_mode: ").append(!Settings.UUID.OFFLINE).append(';') | ||||||
|                         .append(!Settings.UUID.OFFLINE).append('\n'); |                         .append(!Settings.UUID.OFFLINE).append('\n'); | ||||||
|   | |||||||
| @@ -44,8 +44,13 @@ import org.apache.logging.log4j.Logger; | |||||||
| import java.util.Arrays; | import java.util.Arrays; | ||||||
| import java.util.LinkedList; | import java.util.LinkedList; | ||||||
| import java.util.List; | import java.util.List; | ||||||
|  | import java.util.Objects; | ||||||
|  | import java.util.Optional; | ||||||
| import java.util.concurrent.CompletableFuture; | import java.util.concurrent.CompletableFuture; | ||||||
|  |  | ||||||
|  | import javax.annotation.Nonnull; | ||||||
|  | import javax.annotation.Nullable; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * PlotSquared command class. |  * PlotSquared command class. | ||||||
|  */ |  */ | ||||||
| @@ -147,8 +152,7 @@ public class MainCommand extends Command { | |||||||
|                 try { |                 try { | ||||||
|                     injector.getInstance(command); |                     injector.getInstance(command); | ||||||
|                 } catch (final Exception e) { |                 } catch (final Exception e) { | ||||||
|                     LOGGER.error("Failed to register command {}", command.getCanonicalName()); |                     LOGGER.error("Failed to register command {}", command.getCanonicalName(), e); | ||||||
|                     e.printStackTrace(); |  | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|  |  | ||||||
| @@ -236,110 +240,170 @@ public class MainCommand extends Command { | |||||||
|             RunnableVal3<Command, Runnable, Runnable> confirm, |             RunnableVal3<Command, Runnable, Runnable> confirm, | ||||||
|             RunnableVal2<Command, CommandResult> whenDone |             RunnableVal2<Command, CommandResult> whenDone | ||||||
|     ) { |     ) { | ||||||
|         // Optional command scope // |         prepareArguments(new CommandExecutionData(player, args, confirm, whenDone, null)) | ||||||
|         Location location = null; |                 .thenCompose(executionData -> { | ||||||
|         Plot plot = null; |                     if (executionData.isEmpty()) { | ||||||
|         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); |                         return CompletableFuture.completedFuture(false); | ||||||
|                     } |                     } | ||||||
|                 // Trim command |                     var data = executionData.get(); | ||||||
|                 args = Arrays.copyOfRange(args, 1, args.length); |                     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")); | ||||||
|                         } |                         } | ||||||
|             if (args.length >= 2 && !args[0].isEmpty() && args[0].charAt(0) == '-') { |                     } finally { | ||||||
|                 if ("f".equals(args[0].substring(1))) { |                         if (data.postCommandData() != null) { | ||||||
|                     confirm = new RunnableVal3<>() { |                             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<>() { | ||||||
|             @Override |             @Override | ||||||
|             public void run(Command cmd, Runnable success, Runnable failure) { |             public void run(Command cmd, Runnable success, Runnable failure) { | ||||||
|                             if (area != null && PlotSquared.platform().econHandler().isEnabled(area)) { |                 if (area != null && PlotSquared.platform().econHandler().isEnabled(area) | ||||||
|                                 PlotExpression priceEval = |                         && Optional.of(area.getPrices().get(cmd.getFullId())) | ||||||
|                                         area.getPrices().get(cmd.getFullId()); |                         .map(priceEval -> priceEval.evaluate(0d)) | ||||||
|                                 double price = priceEval != null ? priceEval.evaluate(0d) : 0d; |                         .filter(price -> price != 0d) | ||||||
|                                 if (price != 0d |                         .filter(price -> PlotSquared.platform().econHandler().getMoney(player) < price) | ||||||
|                                         && PlotSquared.platform().econHandler().getMoney(player) < price) { |                         .isPresent()) { | ||||||
|                     if (failure != null) { |                     if (failure != null) { | ||||||
|                         failure.run(); |                         failure.run(); | ||||||
|                     } |                     } | ||||||
|                     return; |                     return; | ||||||
|                 } |                 } | ||||||
|                             } |  | ||||||
|                 if (success != null) { |                 if (success != null) { | ||||||
|                     success.run(); |                     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) { | ||||||
|         try { |         Objects.requireNonNull(commandMeta.location()); | ||||||
|             super.execute(player, args, confirm, whenDone); |         Objects.requireNonNull(commandMeta.plot()); | ||||||
|         } catch (CommandException e) { |         Location location; | ||||||
|             throw e; |         Plot plot; | ||||||
|         } 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 |         try (final MetaDataAccess<Location> locationMetaDataAccess | ||||||
|                      = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) { |                      = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) { | ||||||
|                 if (location == null) { |             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) { | ||||||
|                 locationMetaDataAccess.remove(); |                 locationMetaDataAccess.remove(); | ||||||
|             } else { |             } else { | ||||||
|                     locationMetaDataAccess.set(location); |                 locationMetaDataAccess.set(commandMeta.location()); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         try (final MetaDataAccess<Plot> plotMetaDataAccess |         try (final MetaDataAccess<Plot> plotMetaDataAccess | ||||||
|                      = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) { |                      = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) { | ||||||
|                 if (plot == null) { |             if (commandMeta.plot() == null) { | ||||||
|                 plotMetaDataAccess.remove(); |                 plotMetaDataAccess.remove(); | ||||||
|             } else { |             } else { | ||||||
|                     plotMetaDataAccess.set(plot); |                 plotMetaDataAccess.set(commandMeta.plot()); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|         return CompletableFuture.completedFuture(true); |  | ||||||
|     } |     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) {} | ||||||
|  |  | ||||||
|     @Override |     @Override | ||||||
|     public boolean canExecute(PlotPlayer<?> player, boolean message) { |     public boolean canExecute(PlotPlayer<?> player, boolean message) { | ||||||
|   | |||||||
| @@ -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) | ||||||
|      * |      * | ||||||
|   | |||||||
| @@ -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-SNAPSHOT" | 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.0") |         testImplementation("org.junit.jupiter:junit-jupiter:5.12.2") | ||||||
|         testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.0") |         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 | ||||||
| } | } | ||||||
|   | |||||||
| @@ -2,12 +2,12 @@ | |||||||
| # Platform expectations | # Platform expectations | ||||||
| paper = "1.20.4-R0.1-SNAPSHOT" | paper = "1.20.4-R0.1-SNAPSHOT" | ||||||
| guice = "7.0.0" | guice = "7.0.0" | ||||||
| spotbugs = "4.9.1" | spotbugs = "4.9.3" | ||||||
| checkerqual = "3.49.0" | checkerqual = "3.49.2" | ||||||
| gson = "2.10" | gson = "2.10" | ||||||
| guava = "31.1-jre" | guava = "31.1-jre" | ||||||
| snakeyaml = "2.0" | snakeyaml = "2.0" | ||||||
| adventure = "4.19.0" | adventure = "4.20.0" | ||||||
| adventure-bukkit = "4.3.4" | adventure-bukkit = "4.3.4" | ||||||
| log4j = "2.19.0" | log4j = "2.19.0" | ||||||
|  |  | ||||||
| @@ -16,7 +16,7 @@ worldedit = "7.2.20" | |||||||
| fawe = "2.13.0" | fawe = "2.13.0" | ||||||
| placeholderapi = "2.11.6" | placeholderapi = "2.11.6" | ||||||
| luckperms = "5.4" | luckperms = "5.4" | ||||||
| essentialsx = "2.20.1" | essentialsx = "2.21.0" | ||||||
| mvdwapi = "3.1.1" | mvdwapi = "3.1.1" | ||||||
|  |  | ||||||
| # Third party | # Third party | ||||||
| @@ -28,15 +28,15 @@ squirrelid = "0.3.2" | |||||||
| paster = "1.1.6" | paster = "1.1.6" | ||||||
| bstats = "3.1.0" | bstats = "3.1.0" | ||||||
| paperlib = "1.0.8" | paperlib = "1.0.8" | ||||||
| informative-annotations = "1.5" | informative-annotations = "1.6" | ||||||
| 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" } | ||||||
|   | |||||||
							
								
								
									
										
											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 | distributionBase=GRADLE_USER_HOME | ||||||
| distributionPath=wrapper/dists | distributionPath=wrapper/dists | ||||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip | ||||||
| networkTimeout=10000 | networkTimeout=10000 | ||||||
| validateDistributionUrl=true | validateDistributionUrl=true | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								gradlew
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradlew
									
									
									
									
										vendored
									
									
								
							| @@ -205,7 +205,7 @@ fi | |||||||
| DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' | DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' | ||||||
|  |  | ||||||
| # Collect all arguments for the java command: | # Collect all arguments for the java command: | ||||||
| #   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, | #   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, | ||||||
| #     and any embedded shellness will be escaped. | #     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 | #   * 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. | #     treated as '${Hostname}' itself on the command line. | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user