mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
642956fe61
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@850b736 Close PRs opened from orgs or bot accounts (#10281) PaperMC/Paper@54a2340 check if itemstack is stackable first (#10285) PaperMC/Paper@9c4bb0d add rich message component support to configuration (#10225) PaperMC/Paper@8870d22 Fire EntityDamageByEntityEvent for unowned wither skulls patch (#10244) PaperMC/Paper@bbc03d8 improve BanList types (#10239) PaperMC/Paper@ce5c8dd Configurable max block/fluid ticks (#10266) PaperMC/Paper@880fef7 Deprecate extra ban methods with raw BanEntry (#9580) PaperMC/Paper@60218cd Don't tick empty worlds (#9025) PaperMC/Paper@b21eb4d add overloads to use suspicious effect entry to mushroom cow and suspicious stew meta (#10245) PaperMC/Paper@89d51d5 Allow enabling sand duping (#10191) PaperMC/Paper@6ad63fb Per world ticks per spawn settings (#6891)
342 lines
16 KiB
Diff
342 lines
16 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: YouHaveTrouble <youhavetrouble@youhavetrouble.me>
|
|
Date: Sat, 23 Jul 2022 14:40:17 +0200
|
|
Subject: [PATCH] Debug Marker API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 17bb5de3f1216ddfcb66152a0791c63334460051..afe47ecf0e7ae673aaf62b226e9cb07d2ed393eb 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -2916,5 +2916,89 @@ public final class Bukkit {
|
|
public static void removeFuel(@NotNull Material material) {
|
|
server.removeFuel(material);
|
|
}
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on the server.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ */
|
|
+ public static void sendBlockHighlight(@NotNull Location location, int duration) {
|
|
+ server.sendBlockHighlight(location, duration);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on the server.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param argb Color of the highlight. ARGB int. Will be ignored on some versions of vanilla client
|
|
+ */
|
|
+ public static void sendBlockHighlight(@NotNull Location location, int duration, int argb) {
|
|
+ server.sendBlockHighlight(location, duration, argb);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on the server.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param text Text to show above the highlight
|
|
+ */
|
|
+ public static void sendBlockHighlight(@NotNull Location location, int duration, @NotNull String text) {
|
|
+ server.sendBlockHighlight(location, duration, text);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on the server.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param text Text to show above the highlight
|
|
+ * @param argb Color of the highlight. ARGB int. Will be ignored on some versions of vanilla client
|
|
+ */
|
|
+ public static void sendBlockHighlight(@NotNull Location location, int duration, @NotNull String text, int argb) {
|
|
+ server.sendBlockHighlight(location, duration, text, argb);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on the server.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param color Color of the highlight. Will be ignored on some versions of vanilla client
|
|
+ * @param transparency Transparency of the highlight
|
|
+ * @throws IllegalArgumentException If transparency is outside 0-255 range
|
|
+ */
|
|
+ public static void sendBlockHighlight(@NotNull Location location, int duration, @NotNull org.bukkit.Color color, int transparency) {
|
|
+ server.sendBlockHighlight(location, duration, color, transparency);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on the server.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param text Text to show above the highlight
|
|
+ * @param color Color of the highlight. Will be ignored on some versions of vanilla client
|
|
+ * @param transparency Transparency of the highlight
|
|
+ * @throws IllegalArgumentException If transparency is outside 0-255 range
|
|
+ */
|
|
+ public static void sendBlockHighlight(@NotNull Location location, int duration, @NotNull String text, @NotNull org.bukkit.Color color, int transparency) {
|
|
+ server.sendBlockHighlight(location, duration, text, color, transparency);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Clears all debug block highlights for all players on the server.
|
|
+ */
|
|
+ public static void clearBlockHighlights() {
|
|
+ server.clearBlockHighlights();
|
|
+ }
|
|
// Purpur end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 109811ccc128006e29751e2242e171519c8557c7..90f109af3c83a1bc12cb27497d107de5029d0ce6 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -2554,5 +2554,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
* @param material The material that will no longer be a fuel
|
|
*/
|
|
public void removeFuel(@NotNull Material material);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on the server.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on the server.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param argb Color of the highlight. ARGB int. Will be ignored on some versions of vanilla client
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, int argb);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on the server.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param text Text to show above the highlight
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, @NotNull String text);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on the server.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param text Text to show above the highlight
|
|
+ * @param argb Color of the highlight. ARGB int. Will be ignored on some versions of vanilla client
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, @NotNull String text, int argb);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on the server.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param color Color of the highlight. Will be ignored on some versions of vanilla client
|
|
+ * @param transparency Transparency of the highlight
|
|
+ * @throws IllegalArgumentException If transparency is outside 0-255 range
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, @NotNull org.bukkit.Color color, int transparency);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on the server.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param text Text to show above the highlight
|
|
+ * @param color Color of the highlight. Will be ignored on some versions of vanilla client
|
|
+ * @param transparency Transparency of the highlight
|
|
+ * @throws IllegalArgumentException If transparency is outside 0-255 range
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, @NotNull String text, @NotNull org.bukkit.Color color, int transparency);
|
|
+
|
|
+ /**
|
|
+ * Clears all debug block highlights for all players on the server.
|
|
+ */
|
|
+ void clearBlockHighlights();
|
|
// Purpur end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
|
index 9ac1ee847e64427cb9b1b396c23b6689f7c99f9c..565ce4b0c5eb300953aaefa786b9f8938c771f2a 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -4221,6 +4221,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
* @return The local difficulty
|
|
*/
|
|
public float getLocalDifficultyAt(@NotNull Location location);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on this world.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on this world.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param argb Color of the highlight. ARGB int. Will be ignored on some versions of vanilla client
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, int argb);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on this world.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param text Text to show above the highlight
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, @NotNull String text);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on this world.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param text Text to show above the highlight
|
|
+ * @param argb Color of the highlight. ARGB int. Will be ignored on some versions of vanilla client
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, @NotNull String text, int argb);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on this world.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param color Color of the highlight. Will be ignored on some versions of vanilla client
|
|
+ * @param transparency Transparency of the highlight
|
|
+ * @throws IllegalArgumentException If transparency is outside 0-255 range
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, @NotNull org.bukkit.Color color, int transparency);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to all players on this world.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param text Text to show above the highlight
|
|
+ * @param color Color of the highlight. Will be ignored on some versions of vanilla client
|
|
+ * @param transparency Transparency of the highlight
|
|
+ * @throws IllegalArgumentException If transparency is outside 0-255 range
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, @NotNull String text, @NotNull org.bukkit.Color color, int transparency);
|
|
+
|
|
+ /**
|
|
+ * Clears all debug block highlights for all players on this world.
|
|
+ */
|
|
+ void clearBlockHighlights();
|
|
// Purpur end
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index 654516bb7545d74a9e00efc154b5b75707038c96..f2aa9de6b1b6475435f72e9b7939fa7af9583ed3 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -3739,5 +3739,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
* @deprecated Use {@link #resetIdleDuration()} instead
|
|
*/
|
|
void resetIdleTimer();
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to this player.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to this player.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param argb Color of the highlight. ARGB int. Will be ignored on some versions of vanilla client
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, int argb);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to this player.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param text Text to show above the highlight
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, @NotNull String text);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to this player.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param text Text to show above the highlight
|
|
+ * @param argb Color of the highlight. ARGB int. Will be ignored on some versions of vanilla client
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, @NotNull String text, int argb);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to this player.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param color Color of the highlight. Will be ignored on some versions of vanilla client
|
|
+ * @param transparency Transparency of the highlight
|
|
+ * @throws IllegalArgumentException If transparency is outside 0-255 range
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, @NotNull org.bukkit.Color color, int transparency);
|
|
+
|
|
+ /**
|
|
+ * Creates debug block highlight on specified block location and show it to this player.
|
|
+ * <p>
|
|
+ * Clients may be inconsistent in displaying it.
|
|
+ * @param location Location to highlight
|
|
+ * @param duration Duration for highlight to show in milliseconds
|
|
+ * @param text Text to show above the highlight
|
|
+ * @param color Color of the highlight. Will be ignored on some versions of vanilla client
|
|
+ * @param transparency Transparency of the highlight
|
|
+ * @throws IllegalArgumentException If transparency is outside 0-255 range
|
|
+ */
|
|
+ void sendBlockHighlight(@NotNull Location location, int duration, @NotNull String text, @NotNull org.bukkit.Color color, int transparency);
|
|
+
|
|
+ /**
|
|
+ * Clears all debug block highlights
|
|
+ */
|
|
+ void clearBlockHighlights();
|
|
// Purpur end
|
|
}
|