2019-07-20 09:00:00 +10:00
|
|
|
From 8d3350c639b9abeaf5451dfeeab4fe2494a5c0ca Mon Sep 17 00:00:00 2001
|
2017-05-15 15:44:15 +10:00
|
|
|
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-05-12 11:18:39 +10:00
|
|
|
index d24d99e7..42c33584 100644
|
2017-05-15 15:44:15 +10:00
|
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
2019-05-12 11:18:39 +10:00
|
|
|
@@ -1482,4 +1482,10 @@ public final class Bukkit {
|
2017-05-15 15:44:15 +10:00
|
|
|
public static UnsafeValues getUnsafe() {
|
|
|
|
return server.getUnsafe();
|
|
|
|
}
|
|
|
|
+
|
2019-03-13 17:43:06 +11:00
|
|
|
+ @NotNull
|
2017-05-15 15:44:15 +10: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
|
2019-05-12 11:18:39 +10:00
|
|
|
index b4fb0522..aa7c90cb 100644
|
2017-05-15 15:44:15 +10:00
|
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
2019-05-12 11:18:39 +10:00
|
|
|
@@ -1248,4 +1248,14 @@ public interface Server extends PluginMessageRecipient {
|
2017-05-15 15:44:15 +10:00
|
|
|
@Deprecated
|
2019-03-13 17:43:06 +11:00
|
|
|
@NotNull
|
2017-05-15 15:44:15 +10:00
|
|
|
UnsafeValues getUnsafe();
|
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-13 17:43:06 +11:00
|
|
|
+ @NotNull
|
2017-05-15 15:44:15 +10:00
|
|
|
+ Spigot spigot();
|
|
|
|
+ // Spigot end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
2019-07-10 10:11:27 +10:00
|
|
|
index 5de5774f..3498f4d9 100644
|
2017-05-15 15:44:15 +10:00
|
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
|
|
+++ b/src/main/java/org/bukkit/World.java
|
2019-07-10 10:11:27 +10:00
|
|
|
@@ -1961,6 +1961,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
2019-03-13 17:43:06 +11:00
|
|
|
@Nullable
|
|
|
|
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);
|
2017-05-15 15:44:15 +10:00
|
|
|
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-13 17:43:06 +11:00
|
|
|
+ @NotNull
|
2017-05-15 15:44:15 +10:00
|
|
|
+ Spigot spigot();
|
|
|
|
+ // Spigot end
|
2018-09-22 17:13:03 +10:00
|
|
|
+
|
2017-05-15 15:44:15 +10:00
|
|
|
/**
|
|
|
|
* Represents various map environment types that a world may be
|
2018-09-22 17:13:03 +10:00
|
|
|
*/
|
2017-05-15 15:44:15 +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
|
2017-05-15 15:44:15 +10:00
|
|
|
--- 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 {
|
2017-05-15 15:44:15 +10:00
|
|
|
*/
|
2019-03-13 17:43:06 +11:00
|
|
|
@NotNull
|
2017-05-15 15:44:15 +10:00
|
|
|
public String getName();
|
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-13 17:43:06 +11:00
|
|
|
+ @NotNull
|
2017-05-15 15:44:15 +10:00
|
|
|
+ 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-04-28 11:41:06 +10:00
|
|
|
index cd6642f5..148c3022 100644
|
2017-05-15 15:44:15 +10:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
2019-04-28 11:41:06 +10:00
|
|
|
@@ -584,4 +584,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
2017-05-15 15:44:15 +10:00
|
|
|
*/
|
2019-03-13 17:43:06 +11:00
|
|
|
@NotNull
|
2019-04-27 10:30:04 +10:00
|
|
|
Pose getPose();
|
2017-05-15 15:44:15 +10:00
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot extends CommandSender.Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-13 17:43:06 +11:00
|
|
|
+ @NotNull
|
2017-05-15 15:44:15 +10:00
|
|
|
+ @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-04-23 12:00:00 +10:00
|
|
|
index 76aad05f..39ceb444 100644
|
2017-05-15 15:44:15 +10:00
|
|
|
--- 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.
|
|
|
|
*/
|
2019-04-23 12:00:00 +10:00
|
|
|
@@ -12,4 +14,14 @@ public interface LightningStrike extends Entity {
|
2017-05-15 15:44:15 +10:00
|
|
|
*/
|
|
|
|
public boolean isEffect();
|
|
|
|
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot extends Entity.Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-13 17:43:06 +11:00
|
|
|
+ @NotNull
|
2017-05-15 15:44:15 +10:00
|
|
|
+ @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-06-25 06:49:54 +10:00
|
|
|
index ea112e45..6d68515c 100644
|
2017-05-15 15:44:15 +10:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
2019-06-25 06:49:54 +10:00
|
|
|
@@ -1500,4 +1500,15 @@ 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
|
2017-05-15 15:44:15 +10:00
|
|
|
*/
|
2019-06-08 19:53:26 +10:00
|
|
|
public void openBook(@NotNull ItemStack book);
|
2017-05-15 15:44:15 +10:00
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot extends Entity.Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-13 17:43:06 +11:00
|
|
|
+ @NotNull
|
2017-05-15 15:44:15 +10:00
|
|
|
+ @Override
|
|
|
|
+ Spigot spigot();
|
2017-12-03 14:11:51 +11:00
|
|
|
+ // 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-04-28 11:41:06 +10:00
|
|
|
index 976a6c82..5f3862bc 100644
|
2017-12-03 14:11:51 +11:00
|
|
|
--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
|
2019-04-28 11:41:06 +10:00
|
|
|
@@ -185,4 +185,14 @@ public interface BookMeta extends ItemMeta {
|
|
|
|
@Override
|
2019-03-13 17:43:06 +11:00
|
|
|
@NotNull
|
2017-12-03 14:11:51 +11:00
|
|
|
BookMeta clone();
|
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot extends ItemMeta.Spigot {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-13 17:43:06 +11:00
|
|
|
+ @NotNull
|
2017-12-03 14:11:51 +11:00
|
|
|
+ @Override
|
|
|
|
+ Spigot spigot();
|
2017-05-15 15:44:15 +10:00
|
|
|
+ // 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-05-20 20:45:24 +10:00
|
|
|
index 1df31be7..0bc410ae 100644
|
2017-05-15 15:44:15 +10:00
|
|
|
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
|
2019-04-25 14:39:43 +10:00
|
|
|
@@ -388,4 +388,14 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
2017-05-15 15:44:15 +10:00
|
|
|
@SuppressWarnings("javadoc")
|
2019-03-13 17:43:06 +11:00
|
|
|
@NotNull
|
2017-05-15 15:44:15 +10:00
|
|
|
ItemMeta clone();
|
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-13 17:43:06 +11:00
|
|
|
+ @NotNull
|
2017-05-15 15:44:15 +10:00
|
|
|
+ Spigot spigot();
|
|
|
|
+ // Spigot end
|
|
|
|
}
|
|
|
|
--
|
2019-04-23 09:33:25 +10:00
|
|
|
2.20.1
|
2017-05-15 15:44:15 +10:00
|
|
|
|