Update to Minecraft 1.15

By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2019-12-11 09:00:00 +11:00
parent fb6a646cbc
commit 7887b38ac0
21 changed files with 299 additions and 322 deletions

View File

@@ -0,0 +1,82 @@
package org.bukkit.entity;
import org.bukkit.Location;
import org.jetbrains.annotations.Nullable;
/**
* Represents a Bee.
*/
public interface Bee extends Animals {
/**
* Get the bee's hive location.
*
* @return hive location or null
*/
@Nullable
Location getHive();
/**
* Set the bee's hive location.
*
* @param location or null
*/
void setHive(@Nullable Location location);
/**
* Get the bee's flower location.
*
* @return flower location or null
*/
@Nullable
Location getFlower();
/**
* Set the bee's flower location.
*
* @param location or null
*/
void setFlower(@Nullable Location location);
/**
* Get if the bee has nectar.
*
* @return nectar
*/
boolean hasNectar();
/**
* Set if the bee has nectar.
*
* @param nectar whether the entity has nectar
*/
void setHasNectar(boolean nectar);
/**
* Get if the bee has stung.
*
* @return has stung
*/
boolean hasStung();
/**
* Set if the bee has stung.
*
* @param stung has stung
*/
void setHasStung(boolean stung);
/**
* Get the bee's anger level.
*
* @return anger level
*/
int getAnger();
/**
* Set the bee's new anger level.
*
* @param anger new anger
*/
void setAnger(int anger);
}

View File

@@ -260,6 +260,7 @@ public enum EntityType implements Keyed {
TRADER_LLAMA("trader_llama", TraderLlama.class, -1),
WANDERING_TRADER("wandering_trader", WanderingTrader.class, -1),
FOX("fox", Fox.class, -1),
BEE("bee", Bee.class, -1),
/**
* A fishing line and bobber.
*/

View File

@@ -1,7 +1,6 @@
package org.bukkit.entity;
import java.net.InetSocketAddress;
import org.bukkit.Achievement;
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -452,39 +451,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Deprecated
public void updateInventory();
/**
* Awards the given achievement and any parent achievements that the
* player does not have.
*
* @param achievement Achievement to award
* @throws IllegalArgumentException if achievement is null
* @deprecated future versions of Minecraft do not have achievements
*/
@Deprecated
public void awardAchievement(@NotNull Achievement achievement);
/**
* Removes the given achievement and any children achievements that the
* player has.
*
* @param achievement Achievement to remove
* @throws IllegalArgumentException if achievement is null
* @deprecated future versions of Minecraft do not have achievements
*/
@Deprecated
public void removeAchievement(@NotNull Achievement achievement);
/**
* Gets whether this player has the given achievement.
*
* @param achievement the achievement to check
* @return whether the player has the achievement
* @throws IllegalArgumentException if achievement is null
* @deprecated future versions of Minecraft do not have achievements
*/
@Deprecated
public boolean hasAchievement(@NotNull Achievement achievement);
/**
* Increments the given statistic for this player.
* <p>

View File

@@ -49,6 +49,7 @@ public final class MemoryKey<T> implements Keyed {
public static final MemoryKey<Location> MEETING_POINT = new MemoryKey<>(NamespacedKey.minecraft("meeting_point"), Location.class);
public static final MemoryKey<Location> JOB_SITE = new MemoryKey<>(NamespacedKey.minecraft("job_site"), Location.class);
public static final MemoryKey<Long> LAST_SLEPT = new MemoryKey<>(NamespacedKey.minecraft("last_slept"), Long.class);
public static final MemoryKey<Long> LAST_WOKEN = new MemoryKey<>(NamespacedKey.minecraft("last_woken"), Long.class);
public static final MemoryKey<Long> LAST_WORKED_AT_POI = new MemoryKey<>(NamespacedKey.minecraft("last_worked_at_poi"), Long.class);
/**