mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-26 01:32:02 -07:00
Begin update to 1.20.5
This commit is contained in:
Jake Potrebic
@@ -254,6 +254,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
BEE_SPAWN_EGG(22924),
|
||||
BLAZE_SPAWN_EGG(4759),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
BOGGED_SPAWN_EGG(12042),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
BREEZE_SPAWN_EGG(7580),
|
||||
CAT_SPAWN_EGG(29583),
|
||||
@@ -363,8 +366,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_KEY(12725),
|
||||
/**
|
||||
* BlockData: {@link Levelled}
|
||||
@MinecraftExperimental
|
||||
OMINOUS_TRIAL_KEY(4986),
|
||||
diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/Particle.java
|
||||
@@ -377,15 +380,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
GUST("gust"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
GUST_EMITTER("gust_emitter"),
|
||||
SMALL_GUST("small_gust"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
GUST_DUST("gust_dust"),
|
||||
GUST_EMITTER_LARGE("gust_emitter_large"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
GUST_EMITTER_SMALL("gust_emitter_small"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_SPAWNER_DETECTION("trial_spawner_detection"),
|
||||
/**
|
||||
* Uses {@link BlockData} as DataType
|
||||
@MinecraftExperimental
|
||||
TRIAL_SPAWNER_DETECTION_OMINOUS("trial_spawner_detection_ominous"),
|
||||
diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/Sound.java
|
||||
@@ -468,15 +474,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
BLOCK_PORTAL_AMBIENT("block.portal.ambient"),
|
||||
BLOCK_PORTAL_TRAVEL("block.portal.travel"),
|
||||
@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
|
||||
BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES("block.sweet_berry_bush.pick_berries"),
|
||||
BLOCK_SWEET_BERRY_BUSH_PLACE("block.sweet_berry_bush.place"),
|
||||
@MinecraftExperimental
|
||||
BLOCK_TRIAL_SPAWNER_ABOUT_TO_SPAWN_ITEM("block.trial_spawner.about_to_spawn_item"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
BLOCK_TRIAL_SPAWNER_AMBIENT("block.trial_spawner.ambient"),
|
||||
@MinecraftExperimental
|
||||
BLOCK_TRIAL_SPAWNER_AMBIENT_CHARGED("block.trial_spawner.ambient_charged"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
BLOCK_TRIAL_SPAWNER_BREAK("block.trial_spawner.break"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
BLOCK_TRIAL_SPAWNER_CHARGE_ACTIVATE("block.trial_spawner.charge_activate"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER("block.trial_spawner.close_shutter"),
|
||||
@MinecraftExperimental
|
||||
@@ -498,6 +509,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
BLOCK_TRIAL_SPAWNER_PLACE("block.trial_spawner.place"),
|
||||
@MinecraftExperimental
|
||||
BLOCK_TRIAL_SPAWNER_SPAWN_ITEM("block.trial_spawner.spawn_item"),
|
||||
@MinecraftExperimental
|
||||
BLOCK_TRIAL_SPAWNER_SPAWN_ITEM_BEGIN("block.trial_spawner.spawn_item_begin"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
BLOCK_TRIAL_SPAWNER_SPAWN_MOB("block.trial_spawner.spawn_mob"),
|
||||
@MinecraftExperimental
|
||||
@@ -529,9 +544,29 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
ENTITY_BOAT_PADDLE_LAND("entity.boat.paddle_land"),
|
||||
ENTITY_BOAT_PADDLE_WATER("entity.boat.paddle_water"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
ENTITY_BOGGED_AMBIENT("entity.bogged.ambient"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
ENTITY_BOGGED_DEATH("entity.bogged.death"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
ENTITY_BOGGED_HURT("entity.bogged.hurt"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
ENTITY_BOGGED_SHEAR("entity.bogged.shear"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
ENTITY_BOGGED_STEP("entity.bogged.step"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
ENTITY_BREEZE_CHARGE("entity.breeze.charge"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
ENTITY_BREEZE_DEATH("entity.breeze.death"),
|
||||
@MinecraftExperimental
|
||||
ENTITY_BREEZE_DEFLECT("entity.breeze.deflect"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
ENTITY_BREEZE_HURT("entity.breeze.hurt"),
|
||||
@MinecraftExperimental
|
||||
@@ -555,19 +590,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
ENTITY_BREEZE_SLIDE("entity.breeze.slide"),
|
||||
ENTITY_CAMEL_AMBIENT("entity.camel.ambient"),
|
||||
ENTITY_CAMEL_DASH("entity.camel.dash"),
|
||||
@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
|
||||
ENTITY_GENERIC_SPLASH("entity.generic.splash"),
|
||||
ENTITY_GENERIC_SWIM("entity.generic.swim"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
ENTITY_GENERIC_WIND_BURST("entity.generic.wind_burst"),
|
||||
ENTITY_GHAST_AMBIENT("entity.ghast.ambient"),
|
||||
ENTITY_GHAST_DEATH("entity.ghast.death"),
|
||||
ENTITY_BREEZE_WHIRL("entity.breeze.whirl"),
|
||||
@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
|
||||
ENTITY_PARROT_HURT("entity.parrot.hurt"),
|
||||
ENTITY_PARROT_IMITATE_BLAZE("entity.parrot.imitate.blaze"),
|
||||
@MinecraftExperimental
|
||||
ENTITY_PARROT_IMITATE_BOGGED("entity.parrot.imitate.bogged"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
ENTITY_PARROT_IMITATE_BREEZE("entity.parrot.imitate.breeze"),
|
||||
@@ -593,22 +620,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+++ b/src/main/java/org/bukkit/Tag.java
|
||||
@@ -0,0 +0,0 @@ public interface Tag<T extends Keyed> extends Keyed {
|
||||
/**
|
||||
* Vanilla tag representing entities which deflect arrows.
|
||||
* Vanilla tag representing entities which deflect projectiles.
|
||||
*/
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation
|
||||
Tag<EntityType> ENTITY_TYPES_DEFLECTS_ARROWS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_arrows"), EntityType.class);
|
||||
Tag<EntityType> ENTITY_TYPES_DEFLECTS_PROJECTILES = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_projectiles"), EntityType.class);
|
||||
/**
|
||||
* Vanilla tag representing entities which deflect tridents.
|
||||
*/
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation
|
||||
Tag<EntityType> ENTITY_TYPES_DEFLECTS_TRIDENTS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_tridents"), EntityType.class);
|
||||
* Vanilla tag representing entities which deflect arrows.
|
||||
@@ -0,0 +0,0 @@ public interface Tag<T extends Keyed> extends Keyed {
|
||||
/**
|
||||
* Vanilla tag representing entities which can turn in boats.
|
||||
*/
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation
|
||||
Tag<EntityType> ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class);
|
||||
|
||||
// Paper start
|
||||
/**
|
||||
* Vanilla tag representing all entities sensitive to illager enchantments.
|
||||
diff --git a/src/main/java/org/bukkit/generator/structure/Structure.java b/src/main/java/org/bukkit/generator/structure/Structure.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/generator/structure/Structure.java
|
||||
@@ -632,6 +657,27 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBERS_REWARD("chests/trial_chambers/reward"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBERS_REWARD_COMMON("chests/trial_chambers/reward_common"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBERS_REWARD_RARE("chests/trial_chambers/reward_rare"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBERS_REWARD_UNIQUE("chests/trial_chambers/reward_unique"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBERS_REWARD_OMINOUS("chests/trial_chambers/reward_ominous"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBERS_REWARD_OMINOUS_COMMON("chests/trial_chambers/reward_ominous_common"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBERS_REWARD_OMINOUS_RARE("chests/trial_chambers/reward_ominous_rare"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBERS_REWARD_OMINOUS_UNIQUE("chests/trial_chambers/reward_ominous_unique"),
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBERS_SUPPLY("chests/trial_chambers/supply"),
|
||||
@MinecraftExperimental
|
||||
@@ -658,8 +704,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBERS_CORRIDOR_POT("pots/trial_chambers/corridor"),
|
||||
SHIPWRECK_MAP("chests/shipwreck_map"),
|
||||
SHIPWRECK_SUPPLY("chests/shipwreck_supply"),
|
||||
@MinecraftExperimental
|
||||
EQUIPMENT_TRIAL_CHAMBER("equipment/trial_chamber"),
|
||||
@@ -0,0 +0,0 @@ public enum LootTables implements Keyed {
|
||||
PIGLIN_BARTERING("gameplay/piglin_bartering"),
|
||||
// Spawners
|
||||
@@ -669,5 +715,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
@MinecraftExperimental
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
||||
TRIAL_CHAMBER_CONSUMABLES("spawners/trial_chamber/consumables"),
|
||||
// Archaeology
|
||||
DESERT_WELL_ARCHAEOLOGY("archaeology/desert_well"),
|
||||
@MinecraftExperimental
|
||||
OMINOUS_TRIAL_CHAMBER_KEY("spawners/ominous/trial_chamber/key"),
|
||||
|
||||
Reference in New Issue
Block a user