From 1f5e11ceb3e27100c9ac6a85bd2d25486ba75cc5 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 beca3b49..2bb33094 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1487,4 +1487,10 @@ 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 f3aa7aef..142bd809 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1253,4 +1253,14 @@ 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 3abeab09..b2193445 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1845,6 +1845,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 + { + + } + + @NotNull + 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 d247b0d8..bf0f8cc4 100644 --- a/src/main/java/org/bukkit/command/CommandSender.java +++ b/src/main/java/org/bukkit/command/CommandSender.java @@ -35,4 +35,14 @@ 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/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java index ef6e348b..23a089ec 100644 --- a/src/main/java/org/bukkit/entity/Arrow.java +++ b/src/main/java/org/bukkit/entity/Arrow.java @@ -111,4 +111,15 @@ public interface Arrow extends Projectile { */ CREATIVE_ONLY } + + // Spigot start + public class Spigot extends Entity.Spigot + { + + } + + @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 index a1e74cb0..f0833bbf 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -571,4 +571,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable { */ @NotNull BlockFace getFacing(); + + // 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..39ceb444 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,14 @@ 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 e77eb822..bf114e95 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1465,4 +1465,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * after permission changes are done. */ public void updateCommands(); + + // 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 cb655ae8..8fd14d1b 100644 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java @@ -185,4 +185,14 @@ public interface BookMeta extends ItemMeta { @NotNull BookMeta clone(); + + // Spigot start + public class Spigot extends ItemMeta.Spigot { + + } + + @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 index 4cd8a941..11208796 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -385,4 +385,14 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable { @SuppressWarnings("javadoc") @NotNull ItemMeta clone(); + + // Spigot start + public class Spigot + { + + } + + @NotNull + Spigot spigot(); + // Spigot end } -- 2.20.1