spigot/Bukkit-Patches/0002-Skeleton-API-Implementations.patch

209 lines
5.6 KiB
Diff
Raw Normal View History

2019-04-27 10:30:04 +10:00
From 2ada2fc26391c42741c01b7e64708a311657de71 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
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 17d2a6ec..bd97796b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1484,4 +1484,10 @@ public final class Bukkit {
public static UnsafeValues getUnsafe() {
return server.getUnsafe();
}
+
2019-03-13 17:43:06 +11:00
+ @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 1b48b8ee..8ae6399a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1250,4 +1250,14 @@ public interface Server extends PluginMessageRecipient {
@Deprecated
2019-03-13 17:43:06 +11:00
@NotNull
UnsafeValues getUnsafe();
+
+ // Spigot start
+ public class Spigot
+ {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @NotNull
+ Spigot spigot();
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
2019-04-27 10:30:04 +10:00
index 498a0e64..21f77aab 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
2019-04-27 10:30:04 +10:00
@@ -1863,6 +1863,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
2019-03-13 17:43:06 +11:00
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);
+ // Spigot start
+ public class Spigot
+ {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @NotNull
+ Spigot spigot();
+ // Spigot end
2018-09-22 17:13:03 +10:00
+
/**
* Represents various map environment types that a world may be
2018-09-22 17:13:03 +10:00
*/
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
2019-03-13 17:43:06 +11:00
index d247b0d8..bf0f8cc4 100644
--- a/src/main/java/org/bukkit/command/CommandSender.java
+++ b/src/main/java/org/bukkit/command/CommandSender.java
2019-03-13 17:43:06 +11:00
@@ -35,4 +35,14 @@ public interface CommandSender extends Permissible {
*/
2019-03-13 17:43:06 +11:00
@NotNull
public String getName();
+
+ // Spigot start
+ public class Spigot
+ {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @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
2019-03-13 17:43:06 +11:00
index ef6e348b..23a089ec 100644
--- a/src/main/java/org/bukkit/entity/Arrow.java
+++ b/src/main/java/org/bukkit/entity/Arrow.java
2019-03-13 17:43:06 +11:00
@@ -111,4 +111,15 @@ public interface Arrow extends Projectile {
*/
CREATIVE_ONLY
}
+
+ // Spigot start
+ public class Spigot extends Entity.Spigot
+ {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @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
2019-04-27 10:30:04 +10:00
index 0d38a477..16fb7ae1 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
2019-04-27 10:30:04 +10:00
@@ -583,4 +583,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
2019-03-13 17:43:06 +11:00
@NotNull
2019-04-27 10:30:04 +10:00
Pose getPose();
+
+ // Spigot start
+ public class Spigot extends CommandSender.Spigot
+ {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @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
2019-04-23 12:00:00 +10:00
index 76aad05f..39ceb444 100644
--- a/src/main/java/org/bukkit/entity/LightningStrike.java
+++ b/src/main/java/org/bukkit/entity/LightningStrike.java
2019-03-13 17:43:06 +11:00
@@ -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.
*/
2019-04-23 12:00:00 +10:00
@@ -12,4 +14,14 @@ public interface LightningStrike extends Entity {
*/
public boolean isEffect();
+ // Spigot start
+ public class Spigot extends Entity.Spigot
+ {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @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 ab9045e2..3c7c2565 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1464,4 +1464,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
2018-08-12 09:43:06 +10:00
* after permission changes are done.
*/
2018-08-12 09:43:06 +10:00
public void updateCommands();
+
+ // Spigot start
+ public class Spigot extends Entity.Spigot
+ {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @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 9775dca7..9e6b4288 100644
--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
@@ -184,4 +184,14 @@ public interface BookMeta extends ItemMeta {
2019-03-13 17:43:06 +11:00
@NotNull
BookMeta clone();
+
+ // Spigot start
+ public class Spigot extends ItemMeta.Spigot {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @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
2019-04-25 14:39:43 +10:00
index 435766a3..68f89afc 100644
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
2019-04-25 14:39:43 +10:00
@@ -388,4 +388,14 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
@SuppressWarnings("javadoc")
2019-03-13 17:43:06 +11:00
@NotNull
ItemMeta clone();
+
+ // Spigot start
+ public class Spigot
+ {
+
+ }
+
2019-03-13 17:43:06 +11:00
+ @NotNull
+ Spigot spigot();
+ // Spigot end
}
--
2019-04-23 09:33:25 +10:00
2.20.1