Update to Minecraft 1.20

By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2023-06-08 01:30:00 +10:00
parent 217583e495
commit 59e77b485a
49 changed files with 316 additions and 631 deletions

View File

@@ -1,15 +1,11 @@
package org.bukkit.inventory;
import org.bukkit.MinecraftExperimental;
import org.bukkit.block.ChiseledBookshelf;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
/**
* Interface to the inventory of a chiseled bookshelf.
*/
@MinecraftExperimental
@ApiStatus.Experimental
public interface ChiseledBookshelfInventory extends Inventory {
@Nullable

View File

@@ -1,8 +1,5 @@
package org.bukkit.inventory;
import org.bukkit.MinecraftExperimental;
import org.jetbrains.annotations.ApiStatus;
/**
* A ItemFlag can hide some Attributes from ItemStacks
*/
@@ -40,7 +37,5 @@ public enum ItemFlag {
/**
* Setting to show/hide armor trim from leather armor.
*/
@MinecraftExperimental
@ApiStatus.Experimental
HIDE_ARMOR_TRIM;
}

View File

@@ -1,15 +1,10 @@
package org.bukkit.inventory;
import org.bukkit.MinecraftExperimental;
import org.jetbrains.annotations.Nullable;
/**
* Interface to the inventory of a Smithing table.
*
* @apiNote Check {@link #getType()} to better handle either the current or experimental
* variant of this inventory
*/
@MinecraftExperimental
public interface SmithingInventory extends Inventory {
/**

View File

@@ -1,19 +1,12 @@
package org.bukkit.inventory;
import org.bukkit.Material;
import org.bukkit.MinecraftExperimental;
import org.bukkit.NamespacedKey;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
/**
* Represents a smithing trim recipe.
*
* @apiNote This recipe is part of an experimental feature of Minecraft and
* hence subject to change.
*/
@MinecraftExperimental
@ApiStatus.Experimental
public class SmithingTrimRecipe extends SmithingRecipe implements ComplexRecipe {
private final RecipeChoice template;

View File

@@ -1,8 +1,6 @@
package org.bukkit.inventory.meta;
import org.bukkit.MinecraftExperimental;
import org.bukkit.inventory.meta.trim.ArmorTrim;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -12,8 +10,6 @@ import org.jetbrains.annotations.Nullable;
* <strong>Note: Armor trims are part of an experimental feature of Minecraft
* and hence subject to change.</strong>
*/
@MinecraftExperimental
@ApiStatus.Experimental
public interface ArmorMeta extends ItemMeta {
/**

View File

@@ -1,14 +1,10 @@
package org.bukkit.inventory.meta;
import java.util.List;
import org.bukkit.MinecraftExperimental;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@MinecraftExperimental
@ApiStatus.Experimental
public interface BundleMeta extends ItemMeta {
/**

View File

@@ -1,10 +1,8 @@
package org.bukkit.inventory.meta;
import org.bukkit.MinecraftExperimental;
import org.bukkit.NamespacedKey;
import org.bukkit.OfflinePlayer;
import org.bukkit.profile.PlayerProfile;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -90,8 +88,6 @@ public interface SkullMeta extends ItemMeta {
*
* @param noteBlockSound the key of the sound to be played, or null
*/
@MinecraftExperimental
@ApiStatus.Experimental
void setNoteBlockSound(@Nullable NamespacedKey noteBlockSound);
/**
@@ -102,8 +98,6 @@ public interface SkullMeta extends ItemMeta {
*
* @return the key of the sound, or null
*/
@MinecraftExperimental
@ApiStatus.Experimental
@Nullable
NamespacedKey getNoteBlockSound();

View File

@@ -2,20 +2,14 @@ package org.bukkit.inventory.meta.trim;
import com.google.common.base.Preconditions;
import java.util.Objects;
import org.bukkit.MinecraftExperimental;
import org.bukkit.inventory.meta.ArmorMeta;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
/**
* Represents an armor trim that may be applied to an item.
*
* @see ArmorMeta#setTrim(ArmorTrim)
* @apiNote Armor trims are part of an experimental feature of Minecraft and
* hence subject to change.
*/
@MinecraftExperimental
@ApiStatus.Experimental
public class ArmorTrim {
private final TrimMaterial material;

View File

@@ -2,20 +2,12 @@ package org.bukkit.inventory.meta.trim;
import org.bukkit.Keyed;
import org.bukkit.Material;
import org.bukkit.MinecraftExperimental;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
import org.jetbrains.annotations.ApiStatus;
/**
* Represents a material that may be used in an {@link ArmorTrim}.
*
* @apiNote Armor trims are part of an experimental feature of Minecraft and
* hence subject to change. Constants in this class may be null if a data pack
* is not present to enable these features.
*/
@MinecraftExperimental
@ApiStatus.Experimental
public interface TrimMaterial extends Keyed {
/**

View File

@@ -2,20 +2,12 @@ package org.bukkit.inventory.meta.trim;
import org.bukkit.Keyed;
import org.bukkit.Material;
import org.bukkit.MinecraftExperimental;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
import org.jetbrains.annotations.ApiStatus;
/**
* Represents a pattern that may be used in an {@link ArmorTrim}.
*
* @apiNote Armor trims are part of an experimental feature of Minecraft and
* hence subject to change. Constants in this class may be null if a data pack
* is not present to enable these features.
*/
@MinecraftExperimental
@ApiStatus.Experimental
public interface TrimPattern extends Keyed {
/**