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

162 lines
4.6 KiB
Diff
Raw Normal View History

2021-11-22 09:00:00 +11:00
From 913ed98b192911349322bee6169bb327bf2cd6b5 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
2021-11-22 09:00:00 +11:00
index f78e6848..e0ee8753 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
2021-11-22 09:00:00 +11:00
@@ -1712,4 +1712,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
2021-11-22 09:00:00 +11:00
index 1394f3bf..7c341673 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
2021-11-22 09:00:00 +11:00
@@ -1449,4 +1449,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
2021-10-05 12:35:38 +11:00
index 20e8e212..ada1876b 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
2021-10-05 12:35:38 +11:00
@@ -2426,6 +2426,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
2019-03-13 17:43:06 +11:00
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, 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
2021-08-07 16:35:21 +10: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
2021-06-15 18:31:06 +10:00
index 4ac66f71..25a6f931 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
2021-06-11 15:00:00 +10:00
@@ -638,4 +638,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
2019-03-13 17:43:06 +11:00
@NotNull
2019-04-27 10:30:04 +10:00
Pose getPose();
+
+ // 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
2020-01-24 17:56:32 +11:00
index 76aad05f..4d308c5a 100644
--- a/src/main/java/org/bukkit/entity/LightningStrike.java
+++ b/src/main/java/org/bukkit/entity/LightningStrike.java
2019-03-13 17:43:06 +11:00
@@ -1,5 +1,7 @@
package org.bukkit.entity;
+import org.jetbrains.annotations.NotNull;
+
/**
* Represents an instance of a lightning strike. May or may not do damage.
*/
2020-01-24 17:56:32 +11:00
@@ -12,4 +14,13 @@ public interface LightningStrike extends Entity {
*/
public boolean isEffect();
+ // 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
2021-11-22 09:00:00 +11:00
index cd4599b0..24f04564 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
2021-11-22 09:00:00 +11:00
@@ -1315,4 +1315,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
2019-06-08 19:53:26 +10:00
* @param book The book to open for this player
*/
2019-06-08 19:53:26 +10:00
public void openBook(@NotNull ItemStack book);
+
+ // 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
2020-02-02 11:20:00 +11:00
index d650da50..f740bebe 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
}
--
2.25.1