From b17ad46e46fdf5daa92dcdc14cfbab0484fa6a9c Mon Sep 17 00:00:00 2001 From: md_5 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 03793b77..0b6ff0fe 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1563,4 +1563,9 @@ 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 7a97a26b..a4bb9742 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1319,4 +1319,13 @@ 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 9ba89dd2..b6b004a8 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -2292,6 +2292,15 @@ 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..8e42cb9d 100644 --- a/src/main/java/org/bukkit/command/CommandSender.java +++ b/src/main/java/org/bukkit/command/CommandSender.java @@ -35,4 +35,13 @@ 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..6b550dda 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -588,4 +588,14 @@ 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..4d308c5a 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,13 @@ 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 263b242b..8182eace 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1273,4 +1273,14 @@ 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 d650da50..f740bebe 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.25.1