Skip to content

Commit 6aafe29

Browse files
lynxplayMachine-MakerjpenillaLulu13022002NoahvdAa
authored and
kennytv
committed
1.21.6 dev
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
1 parent ba7fb23 commit 6aafe29

File tree

774 files changed

+40227
-5569
lines changed

Some content is hidden

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

774 files changed

+40227
-5569
lines changed

‎build-data/paper.at‎

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,11 @@ public net.minecraft.world.effect.MobEffect attributeModifiers
140140
public net.minecraft.world.effect.MobEffect$AttributeTemplate
141141
public net.minecraft.world.effect.MobEffectInstance hiddenEffect
142142
public net.minecraft.world.entity.AreaEffectCloud durationOnUse
143-
public net.minecraft.world.entity.AreaEffectCloud ownerUUID
143+
public net.minecraft.world.entity.AreaEffectCloud owner
144144
public net.minecraft.world.entity.AreaEffectCloud potionContents
145145
public net.minecraft.world.entity.AreaEffectCloud radiusOnUse
146146
public net.minecraft.world.entity.AreaEffectCloud radiusPerTick
147147
public net.minecraft.world.entity.AreaEffectCloud reapplicationDelay
148-
public net.minecraft.world.entity.AreaEffectCloud updateColor()V
149148
public net.minecraft.world.entity.AreaEffectCloud waitTime
150149
public net.minecraft.world.entity.Display DATA_POS_ROT_INTERPOLATION_DURATION_ID
151150
public net.minecraft.world.entity.Display createTransformation(Lnet/minecraft/network/syncher/SynchedEntityData;)Lcom/mojang/math/Transformation;
@@ -330,14 +329,8 @@ public net.minecraft.world.entity.animal.wolf.Wolf setSoundVariant(Lnet/minecraf
330329
public net.minecraft.world.entity.animal.wolf.Wolf setVariant(Lnet/minecraft/core/Holder;)V
331330
public net.minecraft.world.entity.boss.enderdragon.EnderDragon subEntities
332331
public net.minecraft.world.entity.boss.wither.WitherBoss bossEvent
333-
public net.minecraft.world.entity.decoration.ArmorStand bodyPose
334332
public net.minecraft.world.entity.decoration.ArmorStand disabledSlots
335-
public net.minecraft.world.entity.decoration.ArmorStand headPose
336333
public net.minecraft.world.entity.decoration.ArmorStand isDisabled(Lnet/minecraft/world/entity/EquipmentSlot;)Z
337-
public net.minecraft.world.entity.decoration.ArmorStand leftArmPose
338-
public net.minecraft.world.entity.decoration.ArmorStand leftLegPose
339-
public net.minecraft.world.entity.decoration.ArmorStand rightArmPose
340-
public net.minecraft.world.entity.decoration.ArmorStand rightLegPose
341334
public net.minecraft.world.entity.decoration.ArmorStand setMarker(Z)V
342335
public net.minecraft.world.entity.decoration.ArmorStand setSmall(Z)V
343336
public net.minecraft.world.entity.decoration.HangingEntity setDirection(Lnet/minecraft/core/Direction;)V
@@ -364,8 +357,6 @@ public net.minecraft.world.entity.monster.Creeper explodeCreeper()V
364357
public net.minecraft.world.entity.monster.Creeper explosionRadius
365358
public net.minecraft.world.entity.monster.Creeper maxSwell
366359
public net.minecraft.world.entity.monster.Creeper swell
367-
public net.minecraft.world.entity.monster.Drowned groundNavigation
368-
public net.minecraft.world.entity.monster.Drowned waterNavigation
369360
public net.minecraft.world.entity.monster.EnderMan teleport()Z
370361
public net.minecraft.world.entity.monster.EnderMan teleportTowards(Lnet/minecraft/world/entity/Entity;)Z
371362
public net.minecraft.world.entity.monster.Endermite life
@@ -392,6 +383,7 @@ public net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell
392383
public net.minecraft.world.entity.monster.Strider steering
393384
public net.minecraft.world.entity.monster.Vex hasLimitedLife
394385
public net.minecraft.world.entity.monster.Vex limitedLifeTicks
386+
public net.minecraft.world.entity.monster.Vex owner
395387
public net.minecraft.world.entity.monster.Vindicator DOOR_BREAKING_PREDICATE
396388
public net.minecraft.world.entity.monster.Vindicator isJohnny
397389
public net.minecraft.world.entity.monster.Witch usingTime
@@ -450,9 +442,7 @@ public net.minecraft.world.entity.projectile.Arrow updateColor()V
450442
public net.minecraft.world.entity.projectile.EvokerFangs warmupDelayTicks
451443
public net.minecraft.world.entity.projectile.EyeOfEnder life
452444
public net.minecraft.world.entity.projectile.EyeOfEnder surviveAfterDeath
453-
public net.minecraft.world.entity.projectile.EyeOfEnder tx
454-
public net.minecraft.world.entity.projectile.EyeOfEnder ty
455-
public net.minecraft.world.entity.projectile.EyeOfEnder tz
445+
public net.minecraft.world.entity.projectile.EyeOfEnder target
456446
public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_ATTACHED_TO_TARGET
457447
public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_ID_FIREWORKS_ITEM
458448
public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_SHOT_AT_ANGLE
@@ -472,10 +462,9 @@ public net.minecraft.world.entity.projectile.FishingHook timeUntilHooked
472462
public net.minecraft.world.entity.projectile.FishingHook timeUntilLured
473463
public net.minecraft.world.entity.projectile.FishingHook$FishHookState
474464
public net.minecraft.world.entity.projectile.LargeFireball explosionPower
475-
public net.minecraft.world.entity.projectile.Projectile cachedOwner
476465
public net.minecraft.world.entity.projectile.Projectile hasBeenShot
477466
public net.minecraft.world.entity.projectile.Projectile leftOwner
478-
public net.minecraft.world.entity.projectile.Projectile ownerUUID
467+
public net.minecraft.world.entity.projectile.Projectile owner
479468
public net.minecraft.world.entity.projectile.ShulkerBullet currentMoveDirection
480469
public net.minecraft.world.entity.projectile.ShulkerBullet flightSteps
481470
public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaX
@@ -616,7 +605,7 @@ public net.minecraft.world.level.block.entity.BedBlockEntity color
616605
public net.minecraft.world.level.block.entity.BeehiveBlockEntity savedFlowerPos
617606
public net.minecraft.world.level.block.entity.BellBlockEntity resonating
618607
public net.minecraft.world.level.block.entity.BellBlockEntity resonationTicks
619-
public net.minecraft.world.level.block.entity.BlockEntity saveId(Lnet/minecraft/nbt/CompoundTag;)V
608+
public net.minecraft.world.level.block.entity.BlockEntity saveId(Lnet/minecraft/world/level/storage/ValueOutput;)V
620609
public net.minecraft.world.level.block.entity.BlockEntityType validBlocks
621610
public net.minecraft.world.level.block.entity.BrewingStandBlockEntity brewTime
622611
public net.minecraft.world.level.block.entity.BrewingStandBlockEntity fuel
@@ -628,10 +617,11 @@ public net.minecraft.world.level.block.entity.CampfireBlockEntity cookingTime
628617
public net.minecraft.world.level.block.entity.ChestBlockEntity openersCounter
629618
public net.minecraft.world.level.block.entity.ChestBlockEntity playSound(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/sounds/SoundEvent;)V
630619
public net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity lastInteractedSlot
620+
public net.minecraft.world.level.block.entity.ConduitBlockEntity MIN_KILL_SIZE
631621
public net.minecraft.world.level.block.entity.ConduitBlockEntity destroyTarget
632-
public net.minecraft.world.level.block.entity.ConduitBlockEntity destroyTargetUUID
633622
public net.minecraft.world.level.block.entity.ConduitBlockEntity effectBlocks
634623
public net.minecraft.world.level.block.entity.ConduitBlockEntity getDestroyRangeAABB(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/AABB;
624+
public net.minecraft.world.level.block.entity.ConduitBlockEntity updateDestroyTarget(Lnet/minecraft/world/entity/EntityReference;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Z)Lnet/minecraft/world/entity/EntityReference;
635625
public net.minecraft.world.level.block.entity.CrafterBlockEntity craftingTicksRemaining
636626
public net.minecraft.world.level.block.entity.DecoratedPotBlockEntity decorations
637627
public net.minecraft.world.level.block.entity.EnderChestBlockEntity openersCounter
@@ -665,13 +655,14 @@ public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity age
665655
public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity exactTeleport
666656
public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity exitPortal
667657
public net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity trialSpawner
658+
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner config
668659
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner isOminous
669660
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner stateAccessor
670-
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData cooldownEndsAt
671-
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData currentMobs
672-
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData detectedPlayers
673-
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData nextMobSpawnsAt
674-
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData nextSpawnData
661+
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData cooldownEndsAt
662+
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData currentMobs
663+
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData detectedPlayers
664+
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData nextMobSpawnsAt
665+
public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData nextSpawnData
675666
public net.minecraft.world.level.block.entity.vault.VaultBlockEntity serverData
676667
public net.minecraft.world.level.block.entity.vault.VaultServerData getRewardedPlayers()Ljava/util/Set;
677668
public net.minecraft.world.level.block.entity.vault.VaultServerData pauseStateUpdatingUntil(J)V
@@ -690,7 +681,7 @@ public net.minecraft.world.level.chunk.LevelChunk level
690681
public net.minecraft.world.level.chunk.LevelChunk loaded
691682
public net.minecraft.world.level.chunk.LevelChunkSection states
692683
public net.minecraft.world.level.chunk.PalettedContainer registry
693-
public net.minecraft.world.level.chunk.status.ChunkStatusTasks postLoadProtoChunk(Lnet/minecraft/server/level/ServerLevel;Ljava/util/List;)V
684+
public net.minecraft.world.level.chunk.status.ChunkStatusTasks postLoadProtoChunk(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/storage/ValueInput$ValueInputList;)V
694685
public net.minecraft.world.level.chunk.storage.EntityStorage entityDeserializerQueue
695686
public net.minecraft.world.level.chunk.storage.EntityStorage level
696687
public net.minecraft.world.level.chunk.storage.RegionFileStorage regionCache
@@ -777,10 +768,6 @@ public-f net.minecraft.world.level.LevelSettings hardcore
777768
public-f net.minecraft.world.level.LevelSettings levelName
778769
public-f net.minecraft.world.level.block.ChestBlock MENU_PROVIDER_COMBINER
779770
public-f net.minecraft.world.level.block.entity.BannerBlockEntity baseColor
780-
public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner normalConfig
781-
public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner ominousConfig
782-
public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner requiredPlayerRange
783-
public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner targetCooldownLength
784771
public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData centerX
785772
public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData centerZ
786773
public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData dimension

‎gradle.properties‎

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

55
# Set to true while updating Minecraft version
66
updatingMinecraft=true
7-
updateTaskListIssue=https://github.com/PaperMC/Paper/issues/11736
87

98
org.gradle.configuration-cache=true
109
org.gradle.caching=true

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.bukkit.entity.Fox;
2222
import org.bukkit.entity.Ghast;
2323
import org.bukkit.entity.Guardian;
24+
import org.bukkit.entity.HappyGhast;
2425
import org.bukkit.entity.Illager;
2526
import org.bukkit.entity.Illusioner;
2627
import org.bukkit.entity.IronGolem;
@@ -67,7 +68,7 @@
6768
"SpellCheckingInspection"
6869
})
6970
@NullMarked
70-
@GeneratedFrom("1.21.5")
71+
@GeneratedFrom("1.21.6-rc1")
7172
public interface VanillaGoal<T extends Mob> extends Goal<T> {
7273
GoalKey<AbstractHorse> RANDOM_STAND = create("random_stand", AbstractHorse.class);
7374

@@ -157,8 +158,6 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
157158

158159
GoalKey<Creature> STROLL_THROUGH_VILLAGE = create("stroll_through_village", Creature.class);
159160

160-
GoalKey<Creature> TEMPT = create("tempt", Creature.class);
161-
162161
GoalKey<Creature> TRY_FIND_WATER = create("try_find_water", Creature.class);
163162

164163
GoalKey<Creature> WATER_AVOIDING_RANDOM_FLYING = create("water_avoiding_random_flying", Creature.class);
@@ -231,14 +230,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
231230

232231
GoalKey<Fox> STALK_PREY = create("stalk_prey", Fox.class);
233232

234-
GoalKey<Ghast> GHAST_LOOK = create("ghast_look", Ghast.class);
235-
236233
GoalKey<Ghast> GHAST_SHOOT_FIREBALL = create("ghast_shoot_fireball", Ghast.class);
237234

238-
GoalKey<Ghast> RANDOM_FLOAT_AROUND = create("random_float_around", Ghast.class);
239-
240235
GoalKey<Guardian> GUARDIAN_ATTACK = create("guardian_attack", Guardian.class);
241236

237+
GoalKey<HappyGhast> HAPPY_GHAST_FLOAT = create("happy_ghast_float", HappyGhast.class);
238+
242239
GoalKey<Illager> HOLD_GROUND_ATTACK = create("hold_ground_attack", Illager.class);
243240

244241
GoalKey<Illager> RAIDER_OPEN_DOOR = create("raider_open_door", Illager.class);
@@ -269,6 +266,10 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
269266

270267
GoalKey<Mob> FOLLOW_MOB = create("follow_mob", Mob.class);
271268

269+
GoalKey<Mob> FOR_NON_PATHFINDERS = create("for_non_pathfinders", Mob.class);
270+
271+
GoalKey<Mob> GHAST_LOOK = create("ghast_look", Mob.class);
272+
272273
GoalKey<Mob> INTERACT = create("interact", Mob.class);
273274

274275
GoalKey<Mob> LEAP_AT = create("leap_at", Mob.class);
@@ -281,10 +282,14 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
281282

282283
GoalKey<Mob> OPEN_DOOR = create("open_door", Mob.class);
283284

285+
GoalKey<Mob> RANDOM_FLOAT_AROUND = create("random_float_around", Mob.class);
286+
284287
GoalKey<Mob> RANDOM_LOOK_AROUND = create("random_look_around", Mob.class);
285288

286289
GoalKey<Mob> RESET_UNIVERSAL_ANGER = create("reset_universal_anger", Mob.class);
287290

291+
GoalKey<Mob> TEMPT = create("tempt", Mob.class);
292+
288293
GoalKey<Mob> USE_ITEM = create("use_item", Mob.class);
289294

290295
GoalKey<Mob> VINDICATOR_BREAK_DOOR = create("vindicator_break_door", Mob.class);

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"SpellCheckingInspection"
2424
})
2525
@NullMarked
26-
@GeneratedFrom("1.21.5")
26+
@GeneratedFrom("1.21.6-rc1")
2727
public final class AttributeKeys {
2828
/**
2929
* {@code minecraft:armor}
@@ -81,6 +81,13 @@ public final class AttributeKeys {
8181
*/
8282
public static final TypedKey<Attribute> BURNING_TIME = create(key("burning_time"));
8383

84+
/**
85+
* {@code minecraft:camera_distance}
86+
*
87+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
88+
*/
89+
public static final TypedKey<Attribute> CAMERA_DISTANCE = create(key("camera_distance"));
90+
8491
/**
8592
* {@code minecraft:entity_interaction_range}
8693
*
@@ -249,6 +256,20 @@ public final class AttributeKeys {
249256
*/
250257
public static final TypedKey<Attribute> WATER_MOVEMENT_EFFICIENCY = create(key("water_movement_efficiency"));
251258

259+
/**
260+
* {@code minecraft:waypoint_receive_range}
261+
*
262+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
263+
*/
264+
public static final TypedKey<Attribute> WAYPOINT_RECEIVE_RANGE = create(key("waypoint_receive_range"));
265+
266+
/**
267+
* {@code minecraft:waypoint_transmit_range}
268+
*
269+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
270+
*/
271+
public static final TypedKey<Attribute> WAYPOINT_TRANSMIT_RANGE = create(key("waypoint_transmit_range"));
272+
252273
private AttributeKeys() {
253274
}
254275

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"SpellCheckingInspection"
2424
})
2525
@NullMarked
26-
@GeneratedFrom("1.21.5")
26+
@GeneratedFrom("1.21.6-rc1")
2727
public final class BannerPatternKeys {
2828
/**
2929
* {@code minecraft:base}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"SpellCheckingInspection"
2424
})
2525
@NullMarked
26-
@GeneratedFrom("1.21.5")
26+
@GeneratedFrom("1.21.6-rc1")
2727
public final class BiomeKeys {
2828
/**
2929
* {@code minecraft:badlands}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"SpellCheckingInspection"
2424
})
2525
@NullMarked
26-
@GeneratedFrom("1.21.5")
26+
@GeneratedFrom("1.21.6-rc1")
2727
public final class BlockTypeKeys {
2828
/**
2929
* {@code minecraft:acacia_button}
@@ -2475,6 +2475,13 @@ public final class BlockTypeKeys {
24752475
*/
24762476
public static final TypedKey<BlockType> DRAGON_WALL_HEAD = create(key("dragon_wall_head"));
24772477

2478+
/**
2479+
* {@code minecraft:dried_ghast}
2480+
*
2481+
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
2482+
*/
2483+
public static final TypedKey<BlockType> DRIED_GHAST = create(key("dried_ghast"));
2484+
24782485
/**
24792486
* {@code minecraft:dried_kelp_block}
24802487
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"SpellCheckingInspection"
2424
})
2525
@NullMarked
26-
@GeneratedFrom("1.21.5")
26+
@GeneratedFrom("1.21.6-rc1")
2727
public final class CatVariantKeys {
2828
/**
2929
* {@code minecraft:all_black}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"SpellCheckingInspection"
2424
})
2525
@NullMarked
26-
@GeneratedFrom("1.21.5")
26+
@GeneratedFrom("1.21.6-rc1")
2727
public final class ChickenVariantKeys {
2828
/**
2929
* {@code minecraft:cold}

0 commit comments

Comments
 (0)