2021-09-01 19:07:52 +10:00
From 42444148f664531c268f645c2ea70756684e8bd7 Mon Sep 17 00:00:00 2001
2013-06-02 15:15:15 +10:00
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
2014-07-05 20:34:22 +10:00
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.
2013-06-02 15:15:15 +10:00
2014-08-25 20:09:32 +01:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2021-09-01 19:07:52 +10:00
index 208f9b276..222e7fc24 100644
2014-08-25 20:09:32 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2021-09-01 19:07:52 +10:00
@@ -2177,4 +2177,16 @@ public final class CraftServer implements Server {
2014-08-25 20:09:32 +01:00
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}
+
2021-01-31 10:08:46 +11:00
+ // Spigot start
2021-03-09 08:47:45 +11:00
+ private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
2014-08-25 20:09:32 +01:00
+ {
+
+ };
+
2021-03-09 08:47:45 +11:00
+ public org.bukkit.Server.Spigot spigot()
2014-08-25 20:09:32 +01:00
+ {
+ return spigot;
+ }
2021-01-31 10:08:46 +11:00
+ // Spigot end
2014-08-25 20:09:32 +01:00
}
2013-06-02 16:15:22 +10:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2021-09-01 19:07:52 +10:00
index 08934eede..47defd2cd 100644
2013-06-02 16:15:22 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2021-09-01 19:07:52 +10:00
@@ -1711,4 +1711,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
2020-06-25 10:00:00 +10:00
public DragonBattle getEnderDragonBattle() {
return (getHandle().getDragonBattle() == null) ? null : new CraftDragonBattle(getHandle().getDragonBattle());
2013-06-02 16:15:22 +10:00
}
2019-04-23 12:00:00 +10:00
+
2013-06-02 16:15:22 +10:00
+ // Spigot start
2021-03-09 08:47:45 +11:00
+ private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
2013-06-02 16:15:22 +10:00
+ {
+ };
+
2021-03-09 08:47:45 +11:00
+ public org.bukkit.World.Spigot spigot()
2013-06-02 16:15:22 +10:00
+ {
+ return spigot;
+ }
+ // Spigot end
2017-05-15 15:44:15 +10:00
}
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
2021-07-22 09:57:18 +10:00
index f9d3b5a49..b63472322 100644
2017-05-15 15:44:15 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
2021-03-09 08:47:45 +11:00
@@ -132,4 +132,11 @@ public class ProxiedNativeCommandSender implements ProxiedCommandSender {
2017-05-15 15:44:15 +10:00
getCaller().setOp(value);
}
+ // Spigot start
+ @Override
2021-03-09 08:47:45 +11:00
+ public org.bukkit.command.CommandSender.Spigot spigot()
2017-05-15 15:44:15 +10:00
+ {
+ 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
2021-07-22 09:57:18 +10:00
index 7fa2588b8..e0acbada8 100644
2017-05-15 15:44:15 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
2020-10-17 17:47:20 +11:00
@@ -90,4 +90,16 @@ public abstract class ServerCommandSender implements CommandSender {
2021-07-22 09:57:18 +10:00
public void sendMessage(UUID uuid, String... messages) {
2020-10-17 17:47:20 +11:00
this.sendMessage(messages); // ServerCommandSenders have no use for senders
2017-05-15 15:44:15 +10:00
}
+
+ // Spigot start
2021-03-09 08:47:45 +11:00
+ private final org.bukkit.command.CommandSender.Spigot spigot = new org.bukkit.command.CommandSender.Spigot()
2017-05-15 15:44:15 +10:00
+ {
+ };
+
+ @Override
2021-03-09 08:47:45 +11:00
+ public org.bukkit.command.CommandSender.Spigot spigot()
2017-05-15 15:44:15 +10:00
+ {
+ return spigot;
+ }
2013-08-03 19:54:36 +10:00
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
2021-08-15 08:08:25 +10:00
index 04fea7c0b..ccb12067d 100644
2013-08-03 19:54:36 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
2021-08-15 08:08:25 +10:00
@@ -1075,4 +1075,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
2016-03-23 07:34:06 +11:00
}
return perm;
2013-08-03 19:54:36 +10:00
}
+
+ // Spigot start
2021-03-09 08:47:45 +11:00
+ private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot()
2013-08-03 19:54:36 +10:00
+ {
+ };
+
2021-03-09 08:47:45 +11:00
+ public org.bukkit.entity.Entity.Spigot spigot()
2013-08-03 19:54:36 +10:00
+ {
+ return spigot;
+ }
2014-11-26 08:27:08 +11:00
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
2021-06-15 18:31:06 +10:00
index 9ab9f0a31..e63833dcd 100644
2014-11-26 08:27:08 +11:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
2019-04-28 11:41:06 +10:00
@@ -29,4 +29,15 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
2014-11-26 08:27:08 +11:00
public EntityType getType() {
return EntityType.LIGHTNING;
}
+
+ // Spigot start
+ private final LightningStrike.Spigot spigot = new LightningStrike.Spigot() {
2016-11-17 12:41:12 +11:00
+
2014-11-26 08:27:08 +11:00
+ };
2016-11-17 12:41:12 +11:00
+
2014-11-26 08:27:08 +11:00
+ @Override
+ public LightningStrike.Spigot spigot() {
+ return spigot;
+ }
2013-06-02 15:22:22 +10:00
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2021-08-07 16:35:21 +10:00
index 09532a837..748823e95 100644
2013-06-02 15:22:22 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2021-08-07 16:35:21 +10:00
@@ -1723,4 +1723,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2021-03-16 09:00:00 +11:00
getHandle().openBook(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(book), net.minecraft.world.EnumHand.MAIN_HAND);
2019-06-08 19:53:26 +10:00
getInventory().setItemInMainHand(hand);
2013-06-02 15:22:22 +10:00
}
+
+ // Spigot start
2013-08-03 19:59:46 +10:00
+ private final Player.Spigot spigot = new Player.Spigot()
2013-06-02 15:22:22 +10:00
+ {
+ };
+
2013-08-03 19:59:46 +10:00
+ public Player.Spigot spigot()
2013-06-02 15:22:22 +10:00
+ {
+ return spigot;
+ }
2017-12-03 14:11:51 +11:00
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
2021-06-15 18:31:06 +10:00
index ef61d0233..6bd05ea36 100644
2017-12-03 14:11:51 +11:00
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
2021-03-09 08:47:45 +11:00
@@ -357,6 +357,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
2021-01-01 08:53:21 +11:00
if (this.pages != null) {
meta.pages = new ArrayList<String>(this.pages);
}
2021-01-09 09:33:44 +11:00
+ meta.spigot = meta.new SpigotMeta(); // Spigot
2020-07-25 09:36:37 +10:00
return meta;
}
2021-03-09 08:47:45 +11:00
@@ -430,4 +431,15 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
2017-12-03 14:11:51 +11:00
return builder;
}
+
+ // Spigot start
2020-07-25 09:36:37 +10:00
+ private BookMeta.Spigot spigot = new SpigotMeta();
+ private class SpigotMeta extends BookMeta.Spigot {
2017-12-03 14:11:51 +11:00
+ };
+
+ @Override
+ public BookMeta.Spigot spigot() {
+ return spigot;
+ }
2014-11-26 08:27:08 +11:00
+ // Spigot end
2013-06-02 15:15:15 +10:00
}
--
2021-01-31 10:08:46 +11:00
2.25.1
2013-06-02 15:15:15 +10:00