From 7642f7280299b232d1af084ba0731080d59e9ede 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 c19f89f7..2a99aa16 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -2136,4 +2136,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 bea7a3cc..d8b79a79 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1821,4 +1821,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 a1f398fa..58328092 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -2801,6 +2801,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient @Nullable StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored); + // Spigot start + public class Spigot { + + } + + @NotNull + Spigot spigot(); + // Spigot end + /** * Find the closest nearby location with a biome matching the provided * {@link Biome}(s). Finding biomes can, and will, block if the world is looking diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java index a7a2587b..4b6b9540 100644 --- a/src/main/java/org/bukkit/command/CommandSender.java +++ b/src/main/java/org/bukkit/command/CommandSender.java @@ -53,4 +53,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 dee99ac2..558fe6e2 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -766,4 +766,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @NotNull @ApiStatus.Experimental Entity copy(@NotNull Location to); + + // 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 158ac20f..d913298e 100644 --- a/src/main/java/org/bukkit/entity/LightningStrike.java +++ b/src/main/java/org/bukkit/entity/LightningStrike.java @@ -2,6 +2,7 @@ package org.bukkit.entity; import org.bukkit.GameEvent; import org.bukkit.enchantments.Enchantment; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -82,4 +83,13 @@ public interface LightningStrike extends Entity { */ public void setCausingPlayer(@Nullable Player player); + // 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 89107bd4..f2d7e907 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -2194,4 +2194,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @return whether the player allows server listings */ public boolean isAllowingServerListings(); + + // 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 1be27b04..8a01c92d 100644 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java @@ -113,4 +113,13 @@ public interface BookMeta extends WritableBookMeta { @Override @NotNull BookMeta clone(); + + // Spigot start + public class Spigot { + + } + + @NotNull + Spigot spigot(); + // Spigot end } -- 2.43.2