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

209 lines
5.6 KiB
Diff
Raw Normal View History

2019-03-17 11:48:53 +11:00
From c25c76822a7e1934beffa3bf07e96c3908ea03e5 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
2019-03-13 17:43:06 +11:00
index 515da1e3..78725c49 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
2019-03-13 17:43:06 +11:00
@@ -1514,4 +1514,10 @@ public final class Bukkit {
public static UnsafeValues getUnsafe() {
return server.getUnsafe();
}
+
2019-03-13 17:43:06 +11:00
+ @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
2019-03-13 17:43:06 +11:00
index 3f3a06a0..7f03b2bb 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
2019-03-13 17:43:06 +11:00
@@ -1276,4 +1276,14 @@ public interface Server extends PluginMessageRecipient {
@Deprecated
2019-03-13 17:43:06 +11:00
@NotNull
UnsafeValues getUnsafe();
+
+ // Spigot start
+ 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
2019-03-17 11:48:53 +11:00
index 0c84737a..93b1db80 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
2019-03-13 17:43:06 +11:00
@@ -1874,6 +1874,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
+ {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @NotNull
+ Spigot spigot();
+ // Spigot end
2018-09-22 17:13:03 +10:00
+
/**
* Represents various map environment types that a world may be
2018-09-22 17:13:03 +10:00
*/
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
2019-03-13 17:43:06 +11:00
index d247b0d8..bf0f8cc4 100644
--- a/src/main/java/org/bukkit/command/CommandSender.java
+++ b/src/main/java/org/bukkit/command/CommandSender.java
2019-03-13 17:43:06 +11:00
@@ -35,4 +35,14 @@ public interface CommandSender extends Permissible {
*/
2019-03-13 17:43:06 +11:00
@NotNull
public String getName();
+
+ // Spigot start
+ 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/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
2019-03-13 17:43:06 +11:00
index ef6e348b..23a089ec 100644
--- a/src/main/java/org/bukkit/entity/Arrow.java
+++ b/src/main/java/org/bukkit/entity/Arrow.java
2019-03-13 17:43:06 +11:00
@@ -111,4 +111,15 @@ public interface Arrow extends Projectile {
*/
CREATIVE_ONLY
}
+
+ // Spigot start
+ 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/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
2019-03-13 17:43:06 +11:00
index 6d32ef71..954a6d9a 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
2019-03-13 17:43:06 +11:00
@@ -558,4 +558,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
*/
2019-03-13 17:43:06 +11:00
@NotNull
2018-09-03 18:09:28 +10:00
BlockFace getFacing();
+
+ // Spigot start
+ 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
2019-03-13 17:43:06 +11:00
index c8b5154e..627aef0e 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.
*/
@@ -12,4 +14,14 @@ public interface LightningStrike extends Weather {
*/
public boolean isEffect();
+ // Spigot start
+ 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
2019-03-13 17:43:06 +11:00
index e77eb822..bf114e95 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
2019-03-13 17:43:06 +11:00
@@ -1465,4 +1465,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
2018-08-12 09:43:06 +10:00
* after permission changes are done.
*/
2018-08-12 09:43:06 +10:00
public void updateCommands();
+
+ // Spigot start
+ 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
2019-03-13 17:43:06 +11:00
index cb655ae8..8fd14d1b 100644
--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
2019-03-13 17:43:06 +11:00
@@ -185,4 +185,14 @@ public interface BookMeta extends ItemMeta {
2019-03-13 17:43:06 +11:00
@NotNull
BookMeta clone();
+
+ // Spigot start
+ public class Spigot extends ItemMeta.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/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
2019-03-13 17:43:06 +11:00
index f7008a78..e45de7a4 100644
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
2019-03-13 17:43:06 +11:00
@@ -343,4 +343,14 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
@SuppressWarnings("javadoc")
2019-03-13 17:43:06 +11:00
@NotNull
ItemMeta clone();
+
+ // Spigot start
+ public class Spigot
+ {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @NotNull
+ Spigot spigot();
+ // Spigot end
}
--
2018-11-14 14:20:34 +11:00
2.19.1