Fix compilation
This commit is contained in:
Shane Freeder
parent
504a4d9c6e
commit
8353831ea5
34 changed files with 124 additions and 382 deletions
|
|
@ -5,23 +5,8 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
|
|||
|
||||
Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
|
||||
index ffebffd8..f5e3929a 100644
|
||||
--- a/src/main/java/org/bukkit/NamespacedKey.java
|
||||
+++ b/src/main/java/org/bukkit/NamespacedKey.java
|
||||
@@ -0,0 +0,0 @@ public final class NamespacedKey {
|
||||
/**
|
||||
* Create a key in a specific namespace.
|
||||
*
|
||||
- * @param namespace
|
||||
- * @param key
|
||||
+ * @param namespace String representing a grouping of keys
|
||||
+ * @param key Name for this specific key
|
||||
* @deprecated should never be used by plugins, for internal use only!!
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index 80608e7a..d8d42c84 100644
|
||||
index d1d64fb60..2fe46faf0 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
|
|
@ -88,21 +73,8 @@ index 80608e7a..d8d42c84 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java
|
||||
index 2f195672..234aa9dd 100644
|
||||
--- a/src/main/java/org/bukkit/entity/AbstractHorse.java
|
||||
+++ b/src/main/java/org/bukkit/entity/AbstractHorse.java
|
||||
@@ -0,0 +0,0 @@ public interface AbstractHorse extends Animals, Vehicle, InventoryHolder, Tameab
|
||||
public Horse.Variant getVariant();
|
||||
|
||||
/**
|
||||
- * @param variant
|
||||
+ * @param variant Variant to set
|
||||
* @deprecated you are required to spawn a different entity
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
|
||||
index 290aff28..9fd54b96 100644
|
||||
index c2096b534..bca9d3659 100644
|
||||
--- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
|
||||
+++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
|
||||
@@ -0,0 +0,0 @@ public interface AreaEffectCloud extends Entity {
|
||||
|
|
@ -113,34 +85,8 @@ index 290aff28..9fd54b96 100644
|
|||
*/
|
||||
<T> void setParticle(@NotNull Particle particle, @Nullable T data);
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Guardian.java b/src/main/java/org/bukkit/entity/Guardian.java
|
||||
index 5d9698dc..2c56eb85 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Guardian.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Guardian.java
|
||||
@@ -0,0 +0,0 @@ public interface Guardian extends Monster {
|
||||
public boolean isElder();
|
||||
|
||||
/**
|
||||
- * @param shouldBeElder
|
||||
+ * @param shouldBeElder Sets whether the Guardian is an Elder
|
||||
* @deprecated Must spawn a new {@link ElderGuardian}.
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/entity/Horse.java b/src/main/java/org/bukkit/entity/Horse.java
|
||||
index 734f5ac7..5efa4e60 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Horse.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Horse.java
|
||||
@@ -0,0 +0,0 @@ public interface Horse extends AbstractHorse {
|
||||
public boolean isCarryingChest();
|
||||
|
||||
/**
|
||||
- * @param chest
|
||||
+ * @param chest Sets whether the Horse is carrying a chest
|
||||
* @deprecated see {@link ChestedHorse}
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 27ecae8b..c30f9791 100644
|
||||
index fe7827fda..290b9d75d 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
|
|
@ -232,62 +178,8 @@ index 27ecae8b..c30f9791 100644
|
|||
*/
|
||||
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
|
||||
index 2a0b0109..2ac30c0f 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Skeleton.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Skeleton.java
|
||||
@@ -0,0 +0,0 @@ public interface Skeleton extends Monster {
|
||||
public SkeletonType getSkeletonType();
|
||||
|
||||
/**
|
||||
+ * @param type Type to set
|
||||
* @deprecated Must spawn a new subtype variant
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
|
||||
index 756f285e..ee2e70c6 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Zombie.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Zombie.java
|
||||
@@ -0,0 +0,0 @@ public interface Zombie extends Monster {
|
||||
public boolean isVillager();
|
||||
|
||||
/**
|
||||
- * @param flag
|
||||
+ * @param flag Sets whether the Zombie is a villager
|
||||
* @deprecated must spawn {@link ZombieVillager}.
|
||||
*/
|
||||
@Deprecated
|
||||
@@ -0,0 +0,0 @@ public interface Zombie extends Monster {
|
||||
public void setVillager(boolean flag);
|
||||
|
||||
/**
|
||||
- * @param profession
|
||||
+ * @param profession Sets the ZombieVillager's profession
|
||||
* @see ZombieVillager#getVillagerProfession()
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
|
||||
index 1ca8de5e..0dba5d01 100644
|
||||
--- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
|
||||
@@ -0,0 +0,0 @@ public class PlayerLoginEvent extends PlayerEvent {
|
||||
* @param hostname The hostname that was used to connect to the server
|
||||
* @param address The address the player used to connect, provided for
|
||||
* timing issues
|
||||
+ * @param realAddress The unspoofed, actual address, that the player used to connect
|
||||
*/
|
||||
public PlayerLoginEvent(@NotNull final Player player, @NotNull final String hostname, @NotNull final InetAddress address, final @NotNull InetAddress realAddress) { // Spigot
|
||||
super(player);
|
||||
@@ -0,0 +0,0 @@ public class PlayerLoginEvent extends PlayerEvent {
|
||||
* timing issues
|
||||
* @param result The result status for this event
|
||||
* @param message The message to be displayed if result denies login
|
||||
+ * @param realAddress The unspoofed, actual address, that the player used to connect
|
||||
*/
|
||||
public PlayerLoginEvent(@NotNull final Player player, @NotNull String hostname, @NotNull final InetAddress address, @NotNull final Result result, @NotNull final String message, @NotNull final InetAddress realAddress) { // Spigot
|
||||
this(player, hostname, address, realAddress); // Spigot
|
||||
diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
||||
index 1b2267f4..1a58734d 100644
|
||||
index 1b2267f4e..1a58734d9 100644
|
||||
--- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
||||
@@ -0,0 +0,0 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
|
||||
|
|
@ -299,99 +191,4 @@ index 1b2267f4..1a58734d 100644
|
|||
public Location getTo() {
|
||||
return to;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
index 07d2b4cf..cbcbe8c8 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
@@ -0,0 +0,0 @@ public interface ItemFactory {
|
||||
* Apply a material change for an item meta. Do not use under any
|
||||
* circumstances.
|
||||
*
|
||||
- * @param meta
|
||||
- * @param material
|
||||
+ * @param meta meta
|
||||
+ * @param material material
|
||||
* @return updated material
|
||||
- * @throws IllegalArgumentException
|
||||
+ * @throws IllegalArgumentException exception
|
||||
* @deprecated for internal use only
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java
|
||||
index ab2b5958..4b0aef05 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/Merchant.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/Merchant.java
|
||||
@@ -0,0 +0,0 @@ public interface Merchant {
|
||||
*
|
||||
* @param i the index
|
||||
* @return the recipe
|
||||
- * @throws IndexOutOfBoundsException
|
||||
+ * @throws IndexOutOfBoundsException Throws when specified index is larger than Merchant's inventory
|
||||
*/
|
||||
@NotNull
|
||||
MerchantRecipe getRecipe(int i) throws IndexOutOfBoundsException;
|
||||
@@ -0,0 +0,0 @@ public interface Merchant {
|
||||
*
|
||||
* @param i the index
|
||||
* @param recipe the recipe
|
||||
- * @throws IndexOutOfBoundsException
|
||||
+ * @throws IndexOutOfBoundsException Throws when specified index is larger than Merchant's inventory
|
||||
*/
|
||||
void setRecipe(int i, @NotNull MerchantRecipe recipe) throws IndexOutOfBoundsException;
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java
|
||||
index 57d893a4..77846f32 100644
|
||||
--- a/src/main/java/org/bukkit/potion/Potion.java
|
||||
+++ b/src/main/java/org/bukkit/potion/Potion.java
|
||||
@@ -0,0 +0,0 @@ public class Potion {
|
||||
}
|
||||
|
||||
/**
|
||||
+ * @param name Unused, always uses {@link PotionType#WATER}
|
||||
* @deprecated
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/potion/PotionBrewer.java b/src/main/java/org/bukkit/potion/PotionBrewer.java
|
||||
index 91ddadbb..d21f407c 100644
|
||||
--- a/src/main/java/org/bukkit/potion/PotionBrewer.java
|
||||
+++ b/src/main/java/org/bukkit/potion/PotionBrewer.java
|
||||
@@ -0,0 +0,0 @@ public interface PotionBrewer {
|
||||
* a potion with the given type.
|
||||
*
|
||||
* @param type The type of the potion
|
||||
+ * @param upgraded Whether the potion is upgraded
|
||||
+ * @param extended Whether the potion is extended
|
||||
* @return The list of effects
|
||||
*/
|
||||
@NotNull
|
||||
diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
|
||||
index 1952dd9c..8b2e3439 100644
|
||||
--- a/src/main/java/org/bukkit/potion/PotionType.java
|
||||
+++ b/src/main/java/org/bukkit/potion/PotionType.java
|
||||
@@ -0,0 +0,0 @@ public enum PotionType {
|
||||
}
|
||||
|
||||
/**
|
||||
+ * @return Damage value associated with this PotionType, broken
|
||||
* @deprecated Non-functional
|
||||
*/
|
||||
@Deprecated
|
||||
@@ -0,0 +0,0 @@ public enum PotionType {
|
||||
}
|
||||
|
||||
/**
|
||||
+ * @param damage Damage value associated with a PotionType
|
||||
+ * @return PotionType for given damage value, broken
|
||||
* @deprecated Non-functional
|
||||
*/
|
||||
@Deprecated
|
||||
@@ -0,0 +0,0 @@ public enum PotionType {
|
||||
}
|
||||
|
||||
/**
|
||||
+ * @param effectType EffectType
|
||||
+ * @return Associated PotionType
|
||||
* @deprecated Misleading
|
||||
*/
|
||||
@Deprecated
|
||||
--
|
||||
Loading…
Add table
Add a link
Reference in a new issue