Skip to content

Commit df3c3a3

Browse files
committed
Initial 25w42a update
1 parent 5a66376 commit df3c3a3

File tree

169 files changed

+2205
-1471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+2205
-1471
lines changed

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
group=io.papermc.paper
2-
version=1.21.10-R0.1-SNAPSHOT
3-
mcVersion=1.21.10
2+
version=25w42a-R0.1-SNAPSHOT
3+
mcVersion=25w42a
44

55
# Set to true while updating Minecraft version
6-
updatingMinecraft=false
6+
updatingMinecraft=true
77

88
org.gradle.configuration-cache=true
99
org.gradle.caching=true

paper-api/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
298298

299299
GoalKey<Monster> RANGED_CROSSBOW_ATTACK = create("ranged_crossbow_attack", Monster.class);
300300

301+
GoalKey<Monster> SPEAR_USE = create("spear_use", Monster.class);
302+
301303
GoalKey<Ocelot> OCELOT_AVOID_ENTITY = create("ocelot_avoid_entity", Ocelot.class);
302304

303305
GoalKey<Ocelot> OCELOT_TEMPT = create("ocelot_tempt", Ocelot.class);

paper-api/src/generated/java/io/papermc/paper/registry/keys/DamageTypeKeys.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,13 @@ public final class DamageTypeKeys {
284284
*/
285285
public static final TypedKey<DamageType> SONIC_BOOM = create(key("sonic_boom"));
286286

287+
/**
288+
* {@code minecraft:spear}
289+
*
290+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
291+
*/
292+
public static final TypedKey<DamageType> SPEAR = create(key("spear"));
293+
287294
/**
288295
* {@code minecraft:spit}
289296
*

paper-api/src/generated/java/io/papermc/paper/registry/keys/DataComponentTypeKeys.java

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,13 @@ public final class DataComponentTypeKeys {
214214
*/
215215
public static final TypedKey<DataComponentType> DAMAGE_RESISTANT = create(key("damage_resistant"));
216216

217+
/**
218+
* {@code minecraft:damage_type}
219+
*
220+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
221+
*/
222+
public static final TypedKey<DataComponentType> DAMAGE_TYPE = create(key("damage_type"));
223+
217224
/**
218225
* {@code minecraft:death_protection}
219226
*
@@ -354,6 +361,13 @@ public final class DataComponentTypeKeys {
354361
*/
355362
public static final TypedKey<DataComponentType> JUKEBOX_PLAYABLE = create(key("jukebox_playable"));
356363

364+
/**
365+
* {@code minecraft:kinetic_weapon}
366+
*
367+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
368+
*/
369+
public static final TypedKey<DataComponentType> KINETIC_WEAPON = create(key("kinetic_weapon"));
370+
357371
/**
358372
* {@code minecraft:llama/variant}
359373
*
@@ -424,6 +438,13 @@ public final class DataComponentTypeKeys {
424438
*/
425439
public static final TypedKey<DataComponentType> MAX_STACK_SIZE = create(key("max_stack_size"));
426440

441+
/**
442+
* {@code minecraft:minimum_attack_charge}
443+
*
444+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
445+
*/
446+
public static final TypedKey<DataComponentType> MINIMUM_ATTACK_CHARGE = create(key("minimum_attack_charge"));
447+
427448
/**
428449
* {@code minecraft:mooshroom/variant}
429450
*
@@ -459,6 +480,13 @@ public final class DataComponentTypeKeys {
459480
*/
460481
public static final TypedKey<DataComponentType> PARROT_VARIANT = create(key("parrot/variant"));
461482

483+
/**
484+
* {@code minecraft:piercing_weapon}
485+
*
486+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
487+
*/
488+
public static final TypedKey<DataComponentType> PIERCING_WEAPON = create(key("piercing_weapon"));
489+
462490
/**
463491
* {@code minecraft:pig/variant}
464492
*
@@ -578,6 +606,13 @@ public final class DataComponentTypeKeys {
578606
*/
579607
public static final TypedKey<DataComponentType> SUSPICIOUS_STEW_EFFECTS = create(key("suspicious_stew_effects"));
580608

609+
/**
610+
* {@code minecraft:swing_animation}
611+
*
612+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
613+
*/
614+
public static final TypedKey<DataComponentType> SWING_ANIMATION = create(key("swing_animation"));
615+
581616
/**
582617
* {@code minecraft:tool}
583618
*
@@ -641,6 +676,13 @@ public final class DataComponentTypeKeys {
641676
*/
642677
public static final TypedKey<DataComponentType> USE_COOLDOWN = create(key("use_cooldown"));
643678

679+
/**
680+
* {@code minecraft:use_effects}
681+
*
682+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
683+
*/
684+
public static final TypedKey<DataComponentType> USE_EFFECTS = create(key("use_effects"));
685+
644686
/**
645687
* {@code minecraft:use_remainder}
646688
*

paper-api/src/generated/java/io/papermc/paper/registry/keys/EnchantmentKeys.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,13 @@ public final class EnchantmentKeys {
172172
*/
173173
public static final TypedKey<Enchantment> LUCK_OF_THE_SEA = create(key("luck_of_the_sea"));
174174

175+
/**
176+
* {@code minecraft:lunge}
177+
*
178+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
179+
*/
180+
public static final TypedKey<Enchantment> LUNGE = create(key("lunge"));
181+
175182
/**
176183
* {@code minecraft:lure}
177184
*

paper-api/src/generated/java/io/papermc/paper/registry/keys/ItemTypeKeys.java

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2139,6 +2139,13 @@ public final class ItemTypeKeys {
21392139
*/
21402140
public static final TypedKey<ItemType> COPPER_LEGGINGS = create(key("copper_leggings"));
21412141

2142+
/**
2143+
* {@code minecraft:copper_nautilus_armor}
2144+
*
2145+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
2146+
*/
2147+
public static final TypedKey<ItemType> COPPER_NAUTILUS_ARMOR = create(key("copper_nautilus_armor"));
2148+
21422149
/**
21432150
* {@code minecraft:copper_nugget}
21442151
*
@@ -2167,6 +2174,13 @@ public final class ItemTypeKeys {
21672174
*/
21682175
public static final TypedKey<ItemType> COPPER_SHOVEL = create(key("copper_shovel"));
21692176

2177+
/**
2178+
* {@code minecraft:copper_spear}
2179+
*
2180+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
2181+
*/
2182+
public static final TypedKey<ItemType> COPPER_SPEAR = create(key("copper_spear"));
2183+
21702184
/**
21712185
* {@code minecraft:copper_sword}
21722186
*
@@ -3063,6 +3077,13 @@ public final class ItemTypeKeys {
30633077
*/
30643078
public static final TypedKey<ItemType> DIAMOND_LEGGINGS = create(key("diamond_leggings"));
30653079

3080+
/**
3081+
* {@code minecraft:diamond_nautilus_armor}
3082+
*
3083+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
3084+
*/
3085+
public static final TypedKey<ItemType> DIAMOND_NAUTILUS_ARMOR = create(key("diamond_nautilus_armor"));
3086+
30663087
/**
30673088
* {@code minecraft:diamond_ore}
30683089
*
@@ -3084,6 +3105,13 @@ public final class ItemTypeKeys {
30843105
*/
30853106
public static final TypedKey<ItemType> DIAMOND_SHOVEL = create(key("diamond_shovel"));
30863107

3108+
/**
3109+
* {@code minecraft:diamond_spear}
3110+
*
3111+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
3112+
*/
3113+
public static final TypedKey<ItemType> DIAMOND_SPEAR = create(key("diamond_spear"));
3114+
30873115
/**
30883116
* {@code minecraft:diamond_sword}
30893117
*
@@ -3952,6 +3980,13 @@ public final class ItemTypeKeys {
39523980
*/
39533981
public static final TypedKey<ItemType> GOLDEN_LEGGINGS = create(key("golden_leggings"));
39543982

3983+
/**
3984+
* {@code minecraft:golden_nautilus_armor}
3985+
*
3986+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
3987+
*/
3988+
public static final TypedKey<ItemType> GOLDEN_NAUTILUS_ARMOR = create(key("golden_nautilus_armor"));
3989+
39553990
/**
39563991
* {@code minecraft:golden_pickaxe}
39573992
*
@@ -3966,6 +4001,13 @@ public final class ItemTypeKeys {
39664001
*/
39674002
public static final TypedKey<ItemType> GOLDEN_SHOVEL = create(key("golden_shovel"));
39684003

4004+
/**
4005+
* {@code minecraft:golden_spear}
4006+
*
4007+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
4008+
*/
4009+
public static final TypedKey<ItemType> GOLDEN_SPEAR = create(key("golden_spear"));
4010+
39694011
/**
39704012
* {@code minecraft:golden_sword}
39714013
*
@@ -4568,6 +4610,13 @@ public final class ItemTypeKeys {
45684610
*/
45694611
public static final TypedKey<ItemType> IRON_LEGGINGS = create(key("iron_leggings"));
45704612

4613+
/**
4614+
* {@code minecraft:iron_nautilus_armor}
4615+
*
4616+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
4617+
*/
4618+
public static final TypedKey<ItemType> IRON_NAUTILUS_ARMOR = create(key("iron_nautilus_armor"));
4619+
45714620
/**
45724621
* {@code minecraft:iron_nugget}
45734622
*
@@ -4596,6 +4645,13 @@ public final class ItemTypeKeys {
45964645
*/
45974646
public static final TypedKey<ItemType> IRON_SHOVEL = create(key("iron_shovel"));
45984647

4648+
/**
4649+
* {@code minecraft:iron_spear}
4650+
*
4651+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
4652+
*/
4653+
public static final TypedKey<ItemType> IRON_SPEAR = create(key("iron_spear"));
4654+
45994655
/**
46004656
* {@code minecraft:iron_sword}
46014657
*
@@ -5940,6 +5996,13 @@ public final class ItemTypeKeys {
59405996
*/
59415997
public static final TypedKey<ItemType> NAUTILUS_SHELL = create(key("nautilus_shell"));
59425998

5999+
/**
6000+
* {@code minecraft:nautilus_spawn_egg}
6001+
*
6002+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
6003+
*/
6004+
public static final TypedKey<ItemType> NAUTILUS_SPAWN_EGG = create(key("nautilus_spawn_egg"));
6005+
59436006
/**
59446007
* {@code minecraft:nether_brick}
59456008
*
@@ -6080,6 +6143,13 @@ public final class ItemTypeKeys {
60806143
*/
60816144
public static final TypedKey<ItemType> NETHERITE_LEGGINGS = create(key("netherite_leggings"));
60826145

6146+
/**
6147+
* {@code minecraft:netherite_nautilus_armor}
6148+
*
6149+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
6150+
*/
6151+
public static final TypedKey<ItemType> NETHERITE_NAUTILUS_ARMOR = create(key("netherite_nautilus_armor"));
6152+
60836153
/**
60846154
* {@code minecraft:netherite_pickaxe}
60856155
*
@@ -6101,6 +6171,13 @@ public final class ItemTypeKeys {
61016171
*/
61026172
public static final TypedKey<ItemType> NETHERITE_SHOVEL = create(key("netherite_shovel"));
61036173

6174+
/**
6175+
* {@code minecraft:netherite_spear}
6176+
*
6177+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
6178+
*/
6179+
public static final TypedKey<ItemType> NETHERITE_SPEAR = create(key("netherite_spear"));
6180+
61046181
/**
61056182
* {@code minecraft:netherite_sword}
61066183
*
@@ -8733,6 +8810,13 @@ public final class ItemTypeKeys {
87338810
*/
87348811
public static final TypedKey<ItemType> STONE_SLAB = create(key("stone_slab"));
87358812

8813+
/**
8814+
* {@code minecraft:stone_spear}
8815+
*
8816+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
8817+
*/
8818+
public static final TypedKey<ItemType> STONE_SPEAR = create(key("stone_spear"));
8819+
87368820
/**
87378821
* {@code minecraft:stone_stairs}
87388822
*
@@ -10273,6 +10357,13 @@ public final class ItemTypeKeys {
1027310357
*/
1027410358
public static final TypedKey<ItemType> WOODEN_SHOVEL = create(key("wooden_shovel"));
1027510359

10360+
/**
10361+
* {@code minecraft:wooden_spear}
10362+
*
10363+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
10364+
*/
10365+
public static final TypedKey<ItemType> WOODEN_SPEAR = create(key("wooden_spear"));
10366+
1027610367
/**
1027710368
* {@code minecraft:wooden_sword}
1027810369
*
@@ -10420,6 +10511,13 @@ public final class ItemTypeKeys {
1042010511
*/
1042110512
public static final TypedKey<ItemType> ZOMBIE_HORSE_SPAWN_EGG = create(key("zombie_horse_spawn_egg"));
1042210513

10514+
/**
10515+
* {@code minecraft:zombie_nautilus_spawn_egg}
10516+
*
10517+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
10518+
*/
10519+
public static final TypedKey<ItemType> ZOMBIE_NAUTILUS_SPAWN_EGG = create(key("zombie_nautilus_spawn_egg"));
10520+
1042310521
/**
1042410522
* {@code minecraft:zombie_spawn_egg}
1042510523
*

paper-api/src/generated/java/io/papermc/paper/registry/keys/MobEffectKeys.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ public final class MobEffectKeys {
4646
*/
4747
public static final TypedKey<PotionEffectType> BLINDNESS = create(key("blindness"));
4848

49+
/**
50+
* {@code minecraft:breath_of_the_nautilus}
51+
*
52+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
53+
*/
54+
public static final TypedKey<PotionEffectType> BREATH_OF_THE_NAUTILUS = create(key("breath_of_the_nautilus"));
55+
4956
/**
5057
* {@code minecraft:conduit_power}
5158
*

0 commit comments

Comments
 (0)