2018-09-21 20:57:04 +10:00
|
|
|
From 237f8a067357fe78e4cc6122d30c51b79785785d 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
|
2018-08-16 07:48:58 +10:00
|
|
|
index 5bea055b..97e3e046 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
|
2018-08-16 07:48:58 +10:00
|
|
|
@@ -1272,4 +1272,9 @@ public final class Bukkit {
|
2017-05-15 15:44:15 +10:00
|
|
|
public static UnsafeValues getUnsafe() {
|
|
|
|
return server.getUnsafe();
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ 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
|
2018-08-16 07:48:58 +10:00
|
|
|
index c3535e90..4ab47d09 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
|
2018-08-16 07:48:58 +10:00
|
|
|
@@ -1051,4 +1051,13 @@ public interface Server extends PluginMessageRecipient {
|
2017-05-15 15:44:15 +10:00
|
|
|
*/
|
|
|
|
@Deprecated
|
|
|
|
UnsafeValues getUnsafe();
|
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ Spigot spigot();
|
|
|
|
+ // Spigot end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
2018-08-26 18:48:43 +10:00
|
|
|
index 9ce8ecbc..6392c31b 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
|
2018-08-26 18:48:43 +10:00
|
|
|
@@ -1522,6 +1522,14 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
2017-05-15 15:44:15 +10:00
|
|
|
*/
|
2018-08-26 18:48:43 +10:00
|
|
|
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force);
|
2017-05-15 15:44:15 +10:00
|
|
|
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ Spigot spigot();
|
|
|
|
+ // Spigot end
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Represents various map environment types that a world may be
|
|
|
|
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
|
|
|
|
index 148756b9..5dcd2218 100644
|
|
|
|
--- a/src/main/java/org/bukkit/command/CommandSender.java
|
|
|
|
+++ b/src/main/java/org/bukkit/command/CommandSender.java
|
|
|
|
@@ -32,4 +32,13 @@ public interface CommandSender extends Permissible {
|
|
|
|
* @return Name of the sender
|
|
|
|
*/
|
|
|
|
public String getName();
|
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ Spigot spigot();
|
|
|
|
+ // Spigot end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
|
2018-06-20 13:18:48 +10:00
|
|
|
index 752eeb5e..c77f3a4f 100644
|
2017-05-15 15:44:15 +10:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Arrow.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Arrow.java
|
2018-06-20 13:18:48 +10:00
|
|
|
@@ -89,4 +89,14 @@ public interface Arrow extends Projectile {
|
2017-05-15 15:44:15 +10:00
|
|
|
*/
|
|
|
|
CREATIVE_ONLY
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot extends Entity.Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @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
|
2018-09-03 18:09:28 +10:00
|
|
|
index 2cc60fe9..1184bc15 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
|
2018-09-03 18:09:28 +10:00
|
|
|
@@ -526,4 +526,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
|
|
|
|
* @see Directional#getFacing()
|
2017-05-15 15:44:15 +10:00
|
|
|
*/
|
2018-09-03 18:09:28 +10:00
|
|
|
BlockFace getFacing();
|
2017-05-15 15:44:15 +10:00
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot extends CommandSender.Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @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 c8b5154e..ee2218c1 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/LightningStrike.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/LightningStrike.java
|
|
|
|
@@ -12,4 +12,13 @@ public interface LightningStrike extends Weather {
|
|
|
|
*/
|
|
|
|
public boolean isEffect();
|
|
|
|
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot extends Entity.Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @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
|
2018-09-03 18:09:28 +10:00
|
|
|
index c7e58249..274643b3 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
|
2018-09-03 18:09:28 +10:00
|
|
|
@@ -1482,4 +1482,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
2018-08-12 09:43:06 +10:00
|
|
|
* after permission changes are done.
|
2017-05-15 15:44:15 +10:00
|
|
|
*/
|
2018-08-12 09:43:06 +10:00
|
|
|
public void updateCommands();
|
2017-05-15 15:44:15 +10:00
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot extends Entity.Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @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
|
2018-07-15 10:00:00 +10:00
|
|
|
index b2851209..a252e3a8 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
|
|
|
|
@@ -173,4 +173,13 @@ public interface BookMeta extends ItemMeta {
|
|
|
|
int getPageCount();
|
|
|
|
|
|
|
|
BookMeta clone();
|
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot extends ItemMeta.Spigot {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @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
|
2018-09-21 20:57:04 +10:00
|
|
|
index 73bdcebd..a5014166 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
|
2018-09-21 20:57:04 +10:00
|
|
|
@@ -318,4 +318,13 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
|
2017-05-15 15:44:15 +10:00
|
|
|
|
|
|
|
@SuppressWarnings("javadoc")
|
|
|
|
ItemMeta clone();
|
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ public class Spigot
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ Spigot spigot();
|
|
|
|
+ // Spigot end
|
|
|
|
}
|
|
|
|
--
|
2018-06-20 13:18:48 +10:00
|
|
|
2.17.1
|
2017-05-15 15:44:15 +10:00
|
|
|
|