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

162 lines
4.7 KiB
Diff
Raw Normal View History

2023-10-03 07:37:55 +11:00
From 99090624fe335b1b2d2e5bb86bcaaf83fe6da6e0 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
2023-10-03 07:37:55 +11:00
index d0532011a..3ed50a5fc 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
2023-07-04 06:54:16 +10:00
@@ -2007,4 +2007,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
2023-10-03 07:37:55 +11:00
index e0df92531..5a0d6ec51 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
2023-07-04 06:54:16 +10:00
@@ -1709,4 +1709,13 @@ public interface Server extends PluginMessageRecipient {
@Deprecated
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
2023-10-03 07:37:55 +11:00
index e9a009310..361d3a4f9 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
2023-06-08 01:30:00 +10:00
@@ -2638,6 +2638,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
+
/**
2019-08-28 19:53:13 +10:00
* Finds the nearest raid close to the given location.
*
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
2023-10-03 07:37:55 +11:00
index a7a2587b4..4b6b95404 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
2023-10-03 07:37:55 +11:00
index 764c502c6..ead9a9aaa 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
2023-10-03 07:37:55 +11:00
@@ -714,4 +714,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
2019-03-13 17:43:06 +11:00
@NotNull
2022-02-07 18:54:42 +11:00
SpawnCategory getSpawnCategory();
+
+ // 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
2023-10-03 07:37:55 +11:00
index 158ac20f8..d913298ea 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
2023-10-03 07:37:55 +11:00
index de462c239..76bf37b54 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
2023-07-15 10:46:10 +10:00
@@ -1921,4 +1921,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
2023-10-03 07:37:55 +11:00
index d650da50e..f740bebee 100644
--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
2019-12-11 09:00:00 +11:00
@@ -185,4 +185,13 @@ public interface BookMeta extends ItemMeta {
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
}
--
2023-09-22 02:40:00 +10:00
2.42.0