spigot/Bukkit-Patches/0002-Skeleton-API-Implementations.patch
2019-12-18 08:00:00 +11:00

168 lines
4.6 KiB
Diff

From eb070133099bf6f141495aad03d955ea12b217d0 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
index 4eecd555..940c643d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1473,4 +1473,10 @@ public final class Bukkit {
public static UnsafeValues getUnsafe() {
return server.getUnsafe();
}
+
+ @NotNull
+ 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
index 7a03e93e..baa1edac 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1239,4 +1239,14 @@ public interface Server extends PluginMessageRecipient {
@Deprecated
@NotNull
UnsafeValues getUnsafe();
+
+ // Spigot start
+ public class Spigot
+ {
+
+ }
+
+ @NotNull
+ Spigot spigot();
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 50fe188e..551f37ce 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2059,6 +2059,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);
+ // Spigot start
+ public class Spigot
+ {
+
+ }
+
+ @NotNull
+ Spigot spigot();
+ // Spigot end
+
/**
* 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
index d247b0d8..bf0f8cc4 100644
--- a/src/main/java/org/bukkit/command/CommandSender.java
+++ b/src/main/java/org/bukkit/command/CommandSender.java
@@ -35,4 +35,14 @@ public interface CommandSender extends Permissible {
*/
@NotNull
public String getName();
+
+ // Spigot start
+ public class Spigot
+ {
+
+ }
+
+ @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
index dd3b7606..d708d62b 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -588,4 +588,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull
Pose getPose();
+
+ // Spigot start
+ public class Spigot extends CommandSender.Spigot
+ {
+
+ }
+
+ @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
index 76aad05f..39ceb444 100644
--- a/src/main/java/org/bukkit/entity/LightningStrike.java
+++ b/src/main/java/org/bukkit/entity/LightningStrike.java
@@ -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.
*/
@@ -12,4 +14,14 @@ public interface LightningStrike extends Entity {
*/
public boolean isEffect();
+ // Spigot start
+ public class Spigot extends Entity.Spigot
+ {
+
+ }
+
+ @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
index 89d05d9f..b28e03b4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1466,4 +1466,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param book The book to open for this player
*/
public void openBook(@NotNull ItemStack book);
+
+ // Spigot start
+ public class Spigot extends Entity.Spigot
+ {
+
+ }
+
+ @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
index 976a6c82..5a1acbf1 100644
--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
@@ -185,4 +185,13 @@ public interface BookMeta extends ItemMeta {
@Override
@NotNull
BookMeta clone();
+
+ // Spigot start
+ public class Spigot {
+
+ }
+
+ @NotNull
+ Spigot spigot();
+ // Spigot end
}
--
2.20.1