From 5b2afb33d12b9e62508ea8cdb1752cebe0e91a45 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 2acdf4052f..ba1700b154 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2362,4 +2362,16 @@ public final class CraftServer implements Server { public UnsafeValues getUnsafe() { return CraftMagicNumbers.INSTANCE; } + + // Spigot start + private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot() + { + + }; + + public org.bukkit.Server.Spigot spigot() + { + return spigot; + } + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index dd58deafbc..8dc870a5d9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1925,4 +1925,15 @@ public class CraftWorld extends CraftRegionAccessor implements World { this.persistentDataContainer.putAll((NBTTagCompound) c); } } + + // Spigot start + private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot() + { + }; + + public org.bukkit.World.Spigot spigot() + { + return spigot; + } + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java index f9d3b5a499..b63472322d 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java @@ -132,4 +132,11 @@ public class ProxiedNativeCommandSender implements ProxiedCommandSender { getCaller().setOp(value); } + // Spigot start + @Override + public org.bukkit.command.CommandSender.Spigot spigot() + { + return getCaller().spigot(); + } + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java index 7fa2588b89..e0acbada89 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java @@ -90,4 +90,16 @@ public abstract class ServerCommandSender implements CommandSender { public void sendMessage(UUID uuid, String... messages) { this.sendMessage(messages); // ServerCommandSenders have no use for senders } + + // Spigot start + private final org.bukkit.command.CommandSender.Spigot spigot = new org.bukkit.command.CommandSender.Spigot() + { + }; + + @Override + public org.bukkit.command.CommandSender.Spigot spigot() + { + return spigot; + } + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 4bc06b5ad3..6917e5f088 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1154,4 +1154,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } return perm; } + + // Spigot start + private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot() + { + }; + + public org.bukkit.entity.Entity.Spigot spigot() + { + return spigot; + } + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java index 381f448b01..75d1cc7b1f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java @@ -23,4 +23,15 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike public String toString() { return "CraftLightningStrike"; } + + // Spigot start + private final LightningStrike.Spigot spigot = new LightningStrike.Spigot() { + + }; + + @Override + public LightningStrike.Spigot spigot() { + return spigot; + } + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index a3245bf71c..b887b19c82 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2153,4 +2153,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public boolean isAllowingServerListings() { return getHandle().allowsListing(); } + + // Spigot start + private final Player.Spigot spigot = new Player.Spigot() + { + }; + + public Player.Spigot spigot() + { + return spigot; + } + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java index d522ff8813..03b5764552 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -347,6 +347,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { if (this.pages != null) { meta.pages = new ArrayList(this.pages); } + meta.spigot = meta.new SpigotMeta(); // Spigot return meta; } @@ -419,4 +420,15 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { return builder; } + + // Spigot start + private BookMeta.Spigot spigot = new SpigotMeta(); + private class SpigotMeta extends BookMeta.Spigot { + }; + + @Override + public BookMeta.Spigot spigot() { + return spigot; + } + // Spigot end } -- 2.42.0