Skip to content

Commit 02bca1e

Browse files
kennytvkennytv
committed
Remove timings impl
1 parent 12ed021 commit 02bca1e

File tree

665 files changed

+2226
-3556
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

665 files changed

+2226
-3556
lines changed

‎patches/api/0011-Timings-v2.patch

+15-47
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ expose isRunning
88

99
diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
1010
new file mode 100644
11-
index 0000000000000000000000000000000000000000..3e747abde6fefae90f1c15cb00158bc5303cbe50
11+
index 0000000000000000000000000000000000000000..73b125979e2f2dfd13cbf689a90b29cc68a36e09
1212
--- /dev/null
1313
+++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
1414
@@ -0,0 +1,89 @@
@@ -94,7 +94,7 @@ index 0000000000000000000000000000000000000000..3e747abde6fefae90f1c15cb00158bc5
9494
+ TimingsManager.HISTORY.add(new TimingHistory());
9595
+ TimingsManager.resetTimings();
9696
+ }
97-
+ Bukkit.getUnsafe().reportTimings();
97+
+ //Bukkit.getUnsafe().reportTimings();
9898
+ }
9999
+
100100
+ boolean isViolated() {
@@ -1275,10 +1275,10 @@ index 0000000000000000000000000000000000000000..df142a89b8c43acb81eb383eac0ef048
12751275
+}
12761276
diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
12771277
new file mode 100644
1278-
index 0000000000000000000000000000000000000000..e81d0bc309de877ed2b5da6122f55c162e9b5f10
1278+
index 0000000000000000000000000000000000000000..95b7cdf0677ef71e6885fa78aa5c75bb500f5f53
12791279
--- /dev/null
12801280
+++ b/src/main/java/co/aikar/timings/Timings.java
1281-
@@ -0,0 +1,331 @@
1281+
@@ -0,0 +1,325 @@
12821282
+/*
12831283
+ * This file is licensed under the MIT License (MIT).
12841284
+ *
@@ -1426,22 +1426,16 @@ index 0000000000000000000000000000000000000000..e81d0bc309de877ed2b5da6122f55c16
14261426
+ * @param enabled Should timings be reported
14271427
+ */
14281428
+ public static void setTimingsEnabled(boolean enabled) {
1429-
+ timingsEnabled = enabled;
1430-
+ warnAboutDeprecationOnEnable();
1431-
+ reset();
1432-
+ }
1433-
+
1434-
+ private static void warnAboutDeprecationOnEnable() {
1435-
+ if (timingsEnabled && !warnedAboutDeprecationOnEnable) {
1436-
+ Bukkit.getLogger().warning(PlainTextComponentSerializer.plainText().serialize(deprecationMessage()));
1429+
+ if (enabled && !warnedAboutDeprecationOnEnable) {
1430+
+ Bukkit.getLogger().severe(PlainTextComponentSerializer.plainText().serialize(deprecationMessage()));
14371431
+ warnedAboutDeprecationOnEnable = true;
14381432
+ }
14391433
+ }
14401434
+
14411435
+ public static Component deprecationMessage() {
14421436
+ return Component.text()
14431437
+ .color(TextColor.color(0xffc93a))
1444-
+ .append(Component.text("[!] The timings profiler has been enabled but has been scheduled for removal from Paper in the future."))
1438+
+ .append(Component.text("[!] The timings profiler is in no-op mode and will be fully removed in a later update."))
14451439
+ .append(Component.newline())
14461440
+ .append(Component.text(" We recommend migrating to the spark profiler."))
14471441
+ .append(Component.newline())
@@ -1612,10 +1606,10 @@ index 0000000000000000000000000000000000000000..e81d0bc309de877ed2b5da6122f55c16
16121606
+
16131607
diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
16141608
new file mode 100644
1615-
index 0000000000000000000000000000000000000000..95d87c9dbf2b237787294dfbe7fed87a36e6dedf
1609+
index 0000000000000000000000000000000000000000..b83e5ff7ada8771fdf27ba9807c77ba6a4ce12da
16161610
--- /dev/null
16171611
+++ b/src/main/java/co/aikar/timings/TimingsCommand.java
1618-
@@ -0,0 +1,126 @@
1612+
@@ -0,0 +1,127 @@
16191613
+/*
16201614
+ * This file is licensed under the MIT License (MIT).
16211615
+ *
@@ -1674,8 +1668,9 @@ index 0000000000000000000000000000000000000000..95d87c9dbf2b237787294dfbe7fed87a
16741668
+ if (!testPermission(sender)) {
16751669
+ return true;
16761670
+ }
1677-
+ if (false) {
1671+
+ if (true) {
16781672
+ sender.sendMessage(Timings.deprecationMessage());
1673+
+ return true;
16791674
+ }
16801675
+ if (args.length < 1) {
16811676
+ sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED));
@@ -2906,35 +2901,6 @@ index fa6ad07214d5e38866bf6bee9139c6c938e9f51a..57c9b560c77a56588870598acb543469
29062901
/**
29072902
* Sends the component to the player
29082903
*
2909-
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
2910-
index d8b346fe0f9634218954fe818d53272a0896af9c..12ef99f1c91b92a133611c5f5aeaaeebd02ce232 100644
2911-
--- a/src/main/java/org/bukkit/UnsafeValues.java
2912-
+++ b/src/main/java/org/bukkit/UnsafeValues.java
2913-
@@ -40,6 +40,11 @@ public interface UnsafeValues {
2914-
net.kyori.adventure.text.Component resolveWithContext(net.kyori.adventure.text.Component component, org.bukkit.command.CommandSender context, org.bukkit.entity.Entity scoreboardSubject, boolean bypassPermissions) throws java.io.IOException;
2915-
// Paper end
2916-
2917-
+ /**
2918-
+ * @deprecated Timings will be removed in the future
2919-
+ */
2920-
+ @Deprecated(forRemoval = true)
2921-
+ void reportTimings(); // Paper
2922-
Material toLegacy(Material material);
2923-
2924-
Material fromLegacy(Material material);
2925-
@@ -151,4 +156,12 @@ public interface UnsafeValues {
2926-
return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
2927-
}
2928-
// Paper end
2929-
+
2930-
+ // Paper start
2931-
+ /**
2932-
+ * @deprecated Timings will be removed in the future
2933-
+ */
2934-
+ @Deprecated(forRemoval = true)
2935-
+ String getTimingsServerName();
2936-
+ // Paper end
2937-
}
29382904
diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java
29392905
new file mode 100644
29402906
index 0000000000000000000000000000000000000000..45ed63797b13e114bf3795c80a6c3967d8eb2351
@@ -3508,7 +3474,7 @@ index 84befa1e5123038b80e0734622a5174634f5a982..22de066aef71ad2cf135d5b6f5d6f224
35083474

35093475
@NotNull
35103476
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
3511-
index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15dc2730cb 100644
3477+
index 46c7be5fa69f13900860b9944523beea16f2409b..f97669c8b58bc287fc289eeb098836ae314b053a 100644
35123478
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
35133479
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
35143480
@@ -381,7 +381,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -3559,9 +3525,11 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15
35593525
}
35603526

35613527
/**
3562-
@@ -933,7 +933,7 @@ public final class SimplePluginManager implements PluginManager {
3528+
@@ -932,8 +932,9 @@ public final class SimplePluginManager implements PluginManager {
3529+
*
35633530
* @param use True if per event timing code should be used
35643531
*/
3532+
+ @Deprecated(forRemoval = true)
35653533
public void useTimings(boolean use) {
35663534
- useTimings = use;
35673535
+ co.aikar.timings.Timings.setTimingsEnabled(use); // Paper

‎patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ index 57c9b560c77a56588870598acb543469040ceec1..8949b8e29ae7f412481291630a5cb7b5
5555
* Used for all administrative messages, such as an operator using a
5656
* command.
5757
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
58-
index 6018574cd15b802833613beefa88da15dc2730cb..e7b1895d3918487d711afcbe41d76863d85c0a62 100644
58+
index f97669c8b58bc287fc289eeb098836ae314b053a..2c77b6ab388bd689acb8d84ec62bd5df1eb9373e 100644
5959
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
6060
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
6161
@@ -117,9 +117,22 @@ public final class SimplePluginManager implements PluginManager {

‎patches/api/0015-Expose-server-build-information.patch

+7-6
Original file line numberDiff line numberDiff line change
@@ -316,21 +316,22 @@ index ba28d9f3213ca4b5f15178dc637bff37a8896edc..8a07f21eeb04fb54032ce377a1478f60
316316
* Gets a view of all currently logged in players. This {@linkplain
317317
* Collections#unmodifiableCollection(Collection) view} is a reused
318318
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
319-
index 12ef99f1c91b92a133611c5f5aeaaeebd02ce232..6e67fdb091a006d2d13bc2d93db4d55348af4c8f 100644
319+
index d8b346fe0f9634218954fe818d53272a0896af9c..45ed0007d6de20b98794b3ccaef57aed213e72d4 100644
320320
--- a/src/main/java/org/bukkit/UnsafeValues.java
321321
+++ b/src/main/java/org/bukkit/UnsafeValues.java
322-
@@ -163,5 +163,12 @@ public interface UnsafeValues {
323-
*/
324-
@Deprecated(forRemoval = true)
325-
String getTimingsServerName();
322+
@@ -151,4 +151,13 @@ public interface UnsafeValues {
323+
return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
324+
}
325+
// Paper end
326326
+
327+
+ // Paper start
327328
+ /**
328329
+ * Called once by the version command on first use, then cached.
329330
+ */
330331
+ default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
331332
+ return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
332333
+ }
333-
// Paper end
334+
+ // Paper end
334335
}
335336
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
336337
index 263208d3cba36cb80c9ee4e3022ef702ea113df2..e64bb57f74e6d6f78927be228825b3e0bdf41f48 100644

‎patches/api/0021-Add-exception-reporting-event.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ index 36fc2c35395c72f8b81a2a2f3265fd205384ce26..c7fa1d235cea78bda4656ed66b8d42b1
494494
}
495495

496496
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
497-
index e7b1895d3918487d711afcbe41d76863d85c0a62..003bece642b682985625db93cad93026352bfc66 100644
497+
index 2c77b6ab388bd689acb8d84ec62bd5df1eb9373e..b878e7167cfcdea0e224c182b40abeadd339d3b3 100644
498498
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
499499
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
500500
@@ -528,7 +528,8 @@ public final class SimplePluginManager implements PluginManager {

‎patches/api/0182-Add-Raw-Byte-ItemStack-Serialization.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Serializes using NBT which is safer for server data migrations than bukkits form
88
Co-authored-by: Nassim Jahnke <[email protected]>
99

1010
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
11-
index 6e67fdb091a006d2d13bc2d93db4d55348af4c8f..e41d5d9b810c8816cd0d1eba5fd1ea56252fb0df 100644
11+
index 45ed0007d6de20b98794b3ccaef57aed213e72d4..dd81e309c584e37e4bc7644261ecc649e1237570 100644
1212
--- a/src/main/java/org/bukkit/UnsafeValues.java
1313
+++ b/src/main/java/org/bukkit/UnsafeValues.java
14-
@@ -170,5 +170,9 @@ public interface UnsafeValues {
14+
@@ -159,5 +159,9 @@ public interface UnsafeValues {
1515
default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
1616
return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
1717
}

‎patches/api/0205-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
66

77

88
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
9-
index e41d5d9b810c8816cd0d1eba5fd1ea56252fb0df..64be4e60a03cb7cdc21013837d241d288695b69d 100644
9+
index dd81e309c584e37e4bc7644261ecc649e1237570..db48f30704efa6928599a5cebf5ce577c8430198 100644
1010
--- a/src/main/java/org/bukkit/UnsafeValues.java
1111
+++ b/src/main/java/org/bukkit/UnsafeValues.java
12-
@@ -174,5 +174,12 @@ public interface UnsafeValues {
12+
@@ -163,5 +163,12 @@ public interface UnsafeValues {
1313
byte[] serializeItem(ItemStack item);
1414

1515
ItemStack deserializeItem(byte[] data);

‎patches/api/0253-Expand-world-key-API.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ index 943f8881ea23481ea5d5125b6ec7c9c6f763f0b0..42930006b6425b5d82233e4ffe7025ce
100100
* Create a new virtual {@link WorldBorder}.
101101
* <p>
102102
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
103-
index 64be4e60a03cb7cdc21013837d241d288695b69d..0231b79d96d535e0ae37296b3e806844740783ca 100644
103+
index db48f30704efa6928599a5cebf5ce577c8430198..4229db3c6abb693803a4bdd5a71e426c688f26cc 100644
104104
--- a/src/main/java/org/bukkit/UnsafeValues.java
105105
+++ b/src/main/java/org/bukkit/UnsafeValues.java
106-
@@ -181,5 +181,10 @@ public interface UnsafeValues {
106+
@@ -170,5 +170,10 @@ public interface UnsafeValues {
107107
* Use this when sending custom packets, so that there are no collisions on the client or server.
108108
*/
109109
public int nextEntityId();

‎patches/api/0255-Expose-protocol-version.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose protocol version
55

66

77
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
8-
index 0231b79d96d535e0ae37296b3e806844740783ca..51473ffbec65a2344449daa8ff5cf535b0b60520 100644
8+
index 4229db3c6abb693803a4bdd5a71e426c688f26cc..f33426207c403906c3c6fb99e848fd7ecbffd127 100644
99
--- a/src/main/java/org/bukkit/UnsafeValues.java
1010
+++ b/src/main/java/org/bukkit/UnsafeValues.java
11-
@@ -186,5 +186,12 @@ public interface UnsafeValues {
11+
@@ -175,5 +175,12 @@ public interface UnsafeValues {
1212
* Just don't use it.
1313
*/
1414
@org.jetbrains.annotations.NotNull String getMainLevelName();

‎patches/api/0272-ItemStack-repair-check-API.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack repair check API
55

66

77
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
8-
index 51473ffbec65a2344449daa8ff5cf535b0b60520..07669aad6d9910174fbc8fdf3cdd54211fbfcee3 100644
8+
index f33426207c403906c3c6fb99e848fd7ecbffd127..3ef6ffb506a7fdd05a08353f342e45de8066ca19 100644
99
--- a/src/main/java/org/bukkit/UnsafeValues.java
1010
+++ b/src/main/java/org/bukkit/UnsafeValues.java
11-
@@ -193,5 +193,15 @@ public interface UnsafeValues {
11+
@@ -182,5 +182,15 @@ public interface UnsafeValues {
1212
* @return the server's protocol version
1313
*/
1414
int getProtocolVersion();

‎patches/api/0304-Get-entity-default-attributes.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Get entity default attributes
55

66

77
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
8-
index 07669aad6d9910174fbc8fdf3cdd54211fbfcee3..a25f7378e5cef3899c38dd34d369da0441951f24 100644
8+
index 3ef6ffb506a7fdd05a08353f342e45de8066ca19..b8627d845bbc8c845af364408d3b6abb57c7308b 100644
99
--- a/src/main/java/org/bukkit/UnsafeValues.java
1010
+++ b/src/main/java/org/bukkit/UnsafeValues.java
11-
@@ -203,5 +203,22 @@ public interface UnsafeValues {
11+
@@ -192,5 +192,22 @@ public interface UnsafeValues {
1212
* @return true if valid repair, false if not
1313
*/
1414
public boolean isValidRepairItemStack(@org.jetbrains.annotations.NotNull ItemStack itemToBeRepaired, @org.jetbrains.annotations.NotNull ItemStack repairMaterial);

‎patches/api/0312-Add-Raw-Byte-Entity-Serialization.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
55

66

77
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
8-
index a25f7378e5cef3899c38dd34d369da0441951f24..3aeac7b102f7c6e6186d168294ea73ff022f9349 100644
8+
index b8627d845bbc8c845af364408d3b6abb57c7308b..ef22077e2bf9709bef21e259cfa6435f80305b5e 100644
99
--- a/src/main/java/org/bukkit/UnsafeValues.java
1010
+++ b/src/main/java/org/bukkit/UnsafeValues.java
11-
@@ -175,6 +175,14 @@ public interface UnsafeValues {
11+
@@ -164,6 +164,14 @@ public interface UnsafeValues {
1212

1313
ItemStack deserializeItem(byte[] data);
1414

‎patches/api/0358-Add-NamespacedKey-biome-methods.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: [PATCH] Add NamespacedKey biome methods
66
Co-authored-by: Thonk <[email protected]>
77

88
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
9-
index 3aeac7b102f7c6e6186d168294ea73ff022f9349..4f3e6e2698b28922e7b6448eddd5b166f4631759 100644
9+
index ef22077e2bf9709bef21e259cfa6435f80305b5e..14cf57a96f47ba666f05cedbc0005ff0fec6a33d 100644
1010
--- a/src/main/java/org/bukkit/UnsafeValues.java
1111
+++ b/src/main/java/org/bukkit/UnsafeValues.java
12-
@@ -229,4 +229,33 @@ public interface UnsafeValues {
12+
@@ -218,4 +218,33 @@ public interface UnsafeValues {
1313
*/
1414
@org.jetbrains.annotations.NotNull org.bukkit.attribute.Attributable getDefaultEntityAttributes(@org.jetbrains.annotations.NotNull NamespacedKey entityKey);
1515
// Paper end

‎patches/api/0402-Fix-custom-statistic-criteria-creation.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix custom statistic criteria creation
55

66

77
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
8-
index 4f3e6e2698b28922e7b6448eddd5b166f4631759..334e392800803816cf502c2920c4a85774d6b0b2 100644
8+
index 14cf57a96f47ba666f05cedbc0005ff0fec6a33d..57b51acd566f6ccabeea0b3f4c76b19547d35b5a 100644
99
--- a/src/main/java/org/bukkit/UnsafeValues.java
1010
+++ b/src/main/java/org/bukkit/UnsafeValues.java
11-
@@ -258,4 +258,6 @@ public interface UnsafeValues {
11+
@@ -247,4 +247,6 @@ public interface UnsafeValues {
1212
*/
1313
void setBiomeKey(RegionAccessor accessor, int x, int y, int z, NamespacedKey biomeKey);
1414
// Paper end - namespaced key biome methods

‎patches/api/0440-Add-api-for-spawn-egg-texture-colors.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add api for spawn egg texture colors
55

66

77
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
8-
index 334e392800803816cf502c2920c4a85774d6b0b2..27ac8e80192924eb38e5ceaee575ac418e92b410 100644
8+
index 57b51acd566f6ccabeea0b3f4c76b19547d35b5a..38e84d98670b45b1f855885cf07ce13f0433fa49 100644
99
--- a/src/main/java/org/bukkit/UnsafeValues.java
1010
+++ b/src/main/java/org/bukkit/UnsafeValues.java
11-
@@ -260,4 +260,17 @@ public interface UnsafeValues {
11+
@@ -249,4 +249,17 @@ public interface UnsafeValues {
1212
// Paper end - namespaced key biome methods
1313

1414
String getStatisticCriteriaKey(@NotNull org.bukkit.Statistic statistic); // Paper - fix custom stats criteria creation

‎patches/api/0441-Add-Lifecycle-Event-system.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -546,10 +546,10 @@ index 0000000000000000000000000000000000000000..f70814de0d6c40b2c1c9921b8abdd116
546546
+ }
547547
+}
548548
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
549-
index 27ac8e80192924eb38e5ceaee575ac418e92b410..141d5a964cc299284aecd4d34d57008a32f94247 100644
549+
index 38e84d98670b45b1f855885cf07ce13f0433fa49..81b1c024e27a7021982336b94fc1e1ba33308f6c 100644
550550
--- a/src/main/java/org/bukkit/UnsafeValues.java
551551
+++ b/src/main/java/org/bukkit/UnsafeValues.java
552-
@@ -273,4 +273,12 @@ public interface UnsafeValues {
552+
@@ -262,4 +262,12 @@ public interface UnsafeValues {
553553
*/
554554
@Nullable org.bukkit.Color getSpawnEggLayerColor(org.bukkit.entity.EntityType entityType, int layer);
555555
// Paper end - spawn egg color visibility

‎patches/api/0442-ItemStack-Tooltip-API.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ index 0000000000000000000000000000000000000000..a649b90dfac6000c01579a48234a1138
110110
+ }
111111
+}
112112
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
113-
index 141d5a964cc299284aecd4d34d57008a32f94247..31217b38e769f97801fa1afefeb223d1c755cabd 100644
113+
index 81b1c024e27a7021982336b94fc1e1ba33308f6c..e5144471056e69586c1693a9264a3995387de3cc 100644
114114
--- a/src/main/java/org/bukkit/UnsafeValues.java
115115
+++ b/src/main/java/org/bukkit/UnsafeValues.java
116-
@@ -281,4 +281,6 @@ public interface UnsafeValues {
116+
@@ -270,4 +270,6 @@ public interface UnsafeValues {
117117
@org.jetbrains.annotations.ApiStatus.Internal
118118
io.papermc.paper.plugin.lifecycle.event.LifecycleEventManager<org.bukkit.plugin.Plugin> createPluginLifecycleEventManager(final org.bukkit.plugin.java.JavaPlugin plugin, final java.util.function.BooleanSupplier registrationCheck);
119119
// Paper end - lifecycle event API

‎patches/api/0472-Registry-Modification-API.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -900,10 +900,10 @@ index 67cf3fcad21a8977d6fad172cc776b628ab68f25..b4ef3133fdd9d79a3381cf8f659ff561
900900
}
901901
}
902902
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
903-
index 31217b38e769f97801fa1afefeb223d1c755cabd..9bdba60fa96edbc4be5dcf54a815579db887048b 100644
903+
index e5144471056e69586c1693a9264a3995387de3cc..2c365ecf3f5a5252e489bc1dc04359e766a2d739 100644
904904
--- a/src/main/java/org/bukkit/UnsafeValues.java
905905
+++ b/src/main/java/org/bukkit/UnsafeValues.java
906-
@@ -283,4 +283,6 @@ public interface UnsafeValues {
906+
@@ -272,4 +272,6 @@ public interface UnsafeValues {
907907
// Paper end - lifecycle event API
908908

909909
@NotNull java.util.List<net.kyori.adventure.text.Component> computeTooltipLines(@NotNull ItemStack itemStack, @NotNull io.papermc.paper.inventory.tooltip.TooltipContext tooltipContext, @Nullable org.bukkit.entity.Player player); // Paper - expose itemstack tooltip lines

0 commit comments

Comments
 (0)