spigot/Bukkit-Patches/0002-Skeleton-API-Implementations.patch

162 lines
4.8 KiB
Diff
Raw Normal View History

2025-03-26 03:05:00 +11:00
From 0bbdc4139e08c26af9262e0cc5fe91e8e0e40c5a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 15 May 2017 15:16:15 +1000
Subject: [PATCH] Skeleton API Implementations
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
2025-03-26 03:05:00 +11:00
index 668d1aa2..044ec281 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2189,4 +2189,9 @@ public final class Bukkit {
public static UnsafeValues getUnsafe() {
return server.getUnsafe();
}
+
2019-03-13 17:43:06 +11:00
+ @NotNull
2020-01-24 17:56:32 +11:00
+ public static Server.Spigot spigot() {
+ return server.spigot();
+ }
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
2025-03-26 03:05:00 +11:00
index 38f444cb..2c2fbe9a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1864,4 +1864,13 @@ public interface Server extends PluginMessageRecipient {
2024-11-25 07:52:36 +11:00
@Deprecated(since = "1.7.2")
2019-03-13 17:43:06 +11:00
@NotNull
UnsafeValues getUnsafe();
+
+ // Spigot start
2020-01-24 17:56:32 +11:00
+ public class Spigot {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @NotNull
+ Spigot spigot();
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
2025-03-26 03:05:00 +11:00
index dff198dd..35c64636 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
2024-06-14 01:05:00 +10:00
@@ -2828,6 +2828,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
2019-03-13 17:43:06 +11:00
@Nullable
2022-07-01 20:42:44 +10:00
StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
+ // Spigot start
2020-01-24 17:56:32 +11:00
+ public class Spigot {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @NotNull
+ Spigot spigot();
+ // Spigot end
2018-09-22 17:13:03 +10:00
+
/**
2023-10-15 11:02:21 +11:00
* Find the closest nearby location with a biome matching the provided
* {@link Biome}(s). Finding biomes can, and will, block if the world is looking
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
2025-03-26 03:05:00 +11:00
index a7a2587b..4b6b9540 100644
--- a/src/main/java/org/bukkit/command/CommandSender.java
+++ b/src/main/java/org/bukkit/command/CommandSender.java
2020-10-17 17:47:20 +11:00
@@ -53,4 +53,13 @@ public interface CommandSender extends Permissible {
*/
2019-03-13 17:43:06 +11:00
@NotNull
public String getName();
+
+ // Spigot start
2020-01-24 17:56:32 +11:00
+ public class Spigot {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @NotNull
+ Spigot spigot();
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
2025-03-26 03:05:00 +11:00
index b57969f1..a4cf548b 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
2024-04-24 01:15:00 +10:00
@@ -766,4 +766,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
2019-03-13 17:43:06 +11:00
@NotNull
2023-11-19 19:06:46 +13:00
@ApiStatus.Experimental
Entity copy(@NotNull Location to);
+
+ // Spigot start
2020-01-24 17:56:32 +11:00
+ public class Spigot extends CommandSender.Spigot {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @NotNull
+ @Override
+ Spigot spigot();
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java
2025-03-26 03:05:00 +11:00
index 158ac20f..d913298e 100644
--- a/src/main/java/org/bukkit/entity/LightningStrike.java
+++ b/src/main/java/org/bukkit/entity/LightningStrike.java
2023-10-03 07:37:55 +11:00
@@ -2,6 +2,7 @@ package org.bukkit.entity;
2019-03-13 17:43:06 +11:00
2023-10-03 07:37:55 +11:00
import org.bukkit.GameEvent;
import org.bukkit.enchantments.Enchantment;
2019-03-13 17:43:06 +11:00
+import org.jetbrains.annotations.NotNull;
2023-10-03 07:37:55 +11:00
import org.jetbrains.annotations.Nullable;
2019-03-13 17:43:06 +11:00
/**
2023-10-03 07:37:55 +11:00
@@ -82,4 +83,13 @@ public interface LightningStrike extends Entity {
*/
2023-10-03 07:37:55 +11:00
public void setCausingPlayer(@Nullable Player player);
+ // Spigot start
2020-01-24 17:56:32 +11:00
+ public class Spigot extends Entity.Spigot {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @NotNull
+ @Override
+ Spigot spigot();
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
2025-03-26 03:05:00 +11:00
index 3e044e1b..da0ddce5 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
2024-10-24 06:15:00 +11:00
@@ -2287,4 +2287,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
2021-11-23 09:01:35 +11:00
* @return whether the player allows server listings
*/
2021-11-23 09:01:35 +11:00
public boolean isAllowingServerListings();
+
+ // Spigot start
2020-01-24 17:56:32 +11:00
+ public class Spigot extends Entity.Spigot {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @NotNull
+ @Override
+ Spigot spigot();
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
2025-03-26 03:05:00 +11:00
index 1be27b04..8a01c92d 100644
--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
2024-04-24 01:15:00 +10:00
@@ -113,4 +113,13 @@ public interface BookMeta extends WritableBookMeta {
2019-04-28 11:41:06 +10:00
@Override
2019-03-13 17:43:06 +11:00
@NotNull
BookMeta clone();
+
+ // Spigot start
2019-12-11 09:00:00 +11:00
+ public class Spigot {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @NotNull
+ Spigot spigot();
+ // Spigot end
}
--
2025-03-26 03:05:00 +11:00
2.49.0