From e31c5dbce193a2d4aaedd1094e2d37821bdeba7b 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 629e6b8..4b3fcac 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1642,4 +1642,14 @@ public final class CraftServer implements Server { public UnsafeValues getUnsafe() { return CraftMagicNumbers.INSTANCE; } + + private final Spigot spigot = new Spigot() + { + + }; + + public Spigot spigot() + { + return spigot; + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 621c89f..20357f9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1353,4 +1353,14 @@ public class CraftWorld implements World { cps.queueUnload(chunk.locX, chunk.locZ); } } + // Spigot start + private final Spigot spigot = new Spigot() + { + }; + + public Spigot spigot() + { + return spigot; + } + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java index dca8520..bf48e6e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java @@ -71,4 +71,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow { public void _INVALID_setShooter(LivingEntity shooter) { getHandle().shooter = ((CraftLivingEntity) shooter).getHandle(); } + + // Spigot start + private final Arrow.Spigot spigot = new Arrow.Spigot() + { + }; + + public Arrow.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 705381f..7a9b11c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -535,4 +535,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public void setOp(boolean value) { perm.setOp(value); } + + // Spigot start + private final Spigot spigot = new Spigot() + { + }; + + public 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 64e346d..243e8e5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java @@ -27,4 +27,15 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike public EntityType getType() { return EntityType.LIGHTNING; } + + // 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 05923b4..058141d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1313,4 +1313,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } collection.add(new AttributeModifiable(getHandle().getAttributeMap(), (new AttributeRanged(null, "generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true))); } + + // 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/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java index 9e426ba..661bc0c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -790,4 +790,16 @@ class CraftMetaItem implements ItemMeta, Repairable { return HANDLED_TAGS; } } + + // Spigot start + private final Spigot spigot = new Spigot() + { + }; + + @Override + public Spigot spigot() + { + return spigot; + } + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java index d3ae91b..0b71b53 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java @@ -59,4 +59,11 @@ final class CraftScore implements Score { public CraftScoreboard getScoreboard() { return objective.getScoreboard(); } + + // Spigot start + @Override + public boolean isScoreSet() throws IllegalStateException { + throw new UnsupportedOperationException("Not supported yet."); + } + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java index ce42b30..342d4af 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java @@ -212,5 +212,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { return !(this.team != other.team && (this.team == null || !this.team.equals(other.team))); } + // Spigot start + @Override + public Set getEntries() throws IllegalStateException { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void addEntry(String entry) throws IllegalStateException, IllegalArgumentException { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public boolean removeEntry(String entry) throws IllegalStateException, IllegalArgumentException { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public boolean hasEntry(String entry) throws IllegalArgumentException, IllegalStateException { + throw new UnsupportedOperationException("Not supported yet."); + } + // Spigot end } -- 2.1.0