Skip to content

Commit 425f2ee

Browse files
committed
add missing ATs and fix some compile issues
Added the new SADDLE equipment slot too
1 parent 0418fd5 commit 425f2ee

File tree

137 files changed

+356
-653
lines changed

Some content is hidden

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

137 files changed

+356
-653
lines changed

build-data/paper.at

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public net.minecraft.server.MinecraftServer$ReloadableResources
5353
public net.minecraft.server.RegistryLayer STATIC_ACCESS
5454
public net.minecraft.server.ReloadableServerResources
5555
public net.minecraft.server.ServerAdvancementManager advancements
56+
public net.minecraft.server.Services USERID_CACHE_FILE
5657
public net.minecraft.server.dedicated.DedicatedServerProperties$WorldDimensionData
5758
public net.minecraft.server.dedicated.Settings getStringRaw(Ljava/lang/String;)Ljava/lang/String;
5859
public net.minecraft.server.dedicated.Settings properties
@@ -76,6 +77,7 @@ public net.minecraft.server.level.ChunkMap$TrackedEntity
7677
public net.minecraft.server.level.ChunkMap$TrackedEntity seenBy
7778
public net.minecraft.server.level.ChunkMap$TrackedEntity serverEntity
7879
public net.minecraft.server.level.DistanceManager simulationDistance
80+
public net.minecraft.server.level.DistanceManager ticketStorage
7981
public net.minecraft.server.level.DistanceManager tickets
8082
public net.minecraft.server.level.ServerBossEvent broadcast(Ljava/util/function/Function;)V
8183
public net.minecraft.server.level.ServerBossEvent visible
@@ -116,6 +118,7 @@ public net.minecraft.server.packs.repository.Pack resources
116118
public net.minecraft.server.players.PlayerList playerIo
117119
public net.minecraft.server.players.PlayerList players
118120
public net.minecraft.server.players.PlayerList updateEntireScoreboard(Lnet/minecraft/server/ServerScoreboard;Lnet/minecraft/server/level/ServerPlayer;)V
121+
public net.minecraft.server.players.PlayerList verifyChatTrusted(Lnet/minecraft/network/chat/PlayerChatMessage;)Z
119122
public net.minecraft.server.players.StoredUserEntry getUser()Ljava/lang/Object;
120123
public net.minecraft.stats.ServerRecipeBook known
121124
public net.minecraft.tags.TagEntry id
@@ -202,6 +205,7 @@ public net.minecraft.world.entity.Entity teleportPassengers()V
202205
public net.minecraft.world.entity.Entity unsetRemoved()V
203206
public net.minecraft.world.entity.Entity wasTouchingWater
204207
public net.minecraft.world.entity.ExperienceOrb count
208+
public net.minecraft.world.entity.ExperienceOrb setValue(I)V
205209
public net.minecraft.world.entity.ExperienceOrb value
206210
public net.minecraft.world.entity.GlowSquid setDarkTicks(I)V
207211
public net.minecraft.world.entity.Interaction attack
@@ -234,7 +238,9 @@ public net.minecraft.world.entity.LivingEntity lastHurt
234238
public net.minecraft.world.entity.LivingEntity lastHurtByMob
235239
public net.minecraft.world.entity.LivingEntity lastHurtByMobTimestamp
236240
public net.minecraft.world.entity.LivingEntity lastHurtByPlayer
241+
public net.minecraft.world.entity.LivingEntity lastHurtByPlayerMemoryTime
237242
public net.minecraft.world.entity.LivingEntity lastHurtByPlayerTime
243+
public net.minecraft.world.entity.LivingEntity playSecondaryHurtSound(Lnet/minecraft/world/damagesource/DamageSource;)V
238244
public net.minecraft.world.entity.LivingEntity setLivingEntityFlag(IZ)V
239245
public net.minecraft.world.entity.LivingEntity useItemRemaining
240246
public net.minecraft.world.entity.Mob armorDropChances
@@ -274,6 +280,7 @@ public net.minecraft.world.entity.animal.Fox isDefending()Z
274280
public net.minecraft.world.entity.animal.Fox setDefending(Z)V
275281
public net.minecraft.world.entity.animal.Fox setFaceplanted(Z)V
276282
public net.minecraft.world.entity.animal.Fox setSleeping(Z)V
283+
public net.minecraft.world.entity.animal.Fox setVariant(Lnet/minecraft/world/entity/animal/Fox$Variant;)V
277284
public net.minecraft.world.entity.animal.MushroomCow stewEffects
278285
public net.minecraft.world.entity.animal.Ocelot isTrusting()Z
279286
public net.minecraft.world.entity.animal.Ocelot setTrusting(Z)V
@@ -284,10 +291,13 @@ public net.minecraft.world.entity.animal.Pig setVariant(Lnet/minecraft/core/Hold
284291
public net.minecraft.world.entity.animal.Pig steering
285292
public net.minecraft.world.entity.animal.Rabbit moreCarrotTicks
286293
public net.minecraft.world.entity.animal.Rabbit registerGoals()V
294+
public net.minecraft.world.entity.animal.Rabbit setVariant(Lnet/minecraft/world/entity/animal/Rabbit$Variant;)V
287295
public net.minecraft.world.entity.animal.Salmon setVariant(Lnet/minecraft/world/entity/animal/Salmon$Variant;)V
288296
public net.minecraft.world.entity.animal.TropicalFish getPackedVariant()I
289297
public net.minecraft.world.entity.animal.TropicalFish setPackedVariant(I)V
290298
public net.minecraft.world.entity.animal.Turtle getHomePos()Lnet/minecraft/core/BlockPos;
299+
public net.minecraft.world.entity.animal.Turtle goingHome
300+
public net.minecraft.world.entity.animal.Turtle homePos
291301
public net.minecraft.world.entity.animal.Turtle isGoingHome()Z
292302
public net.minecraft.world.entity.animal.Turtle isTravelling()Z
293303
public net.minecraft.world.entity.animal.Turtle setGoingHome(Z)V
@@ -305,6 +315,7 @@ public net.minecraft.world.entity.animal.goat.Goat DATA_HAS_LEFT_HORN
305315
public net.minecraft.world.entity.animal.goat.Goat DATA_HAS_RIGHT_HORN
306316
public net.minecraft.world.entity.animal.horse.AbstractHorse createInventory()V
307317
public net.minecraft.world.entity.animal.horse.AbstractHorse inventory
318+
public net.minecraft.world.entity.animal.horse.AbstractHorse owner
308319
public net.minecraft.world.entity.animal.horse.Horse setVariantAndMarkings(Lnet/minecraft/world/entity/animal/horse/Variant;Lnet/minecraft/world/entity/animal/horse/Markings;)V
309320
public net.minecraft.world.entity.animal.horse.SkeletonHorse trapTime
310321
public net.minecraft.world.entity.animal.sniffer.Sniffer calculateDigPosition()Ljava/util/Optional;
@@ -357,8 +368,8 @@ public net.minecraft.world.entity.monster.Drowned waterNavigation
357368
public net.minecraft.world.entity.monster.EnderMan teleport()Z
358369
public net.minecraft.world.entity.monster.EnderMan teleportTowards(Lnet/minecraft/world/entity/Entity;)Z
359370
public net.minecraft.world.entity.monster.Endermite life
360-
public net.minecraft.world.entity.monster.Evoker getWololoTarget()Lnet/minecraft/world/entity/animal/Sheep;
361-
public net.minecraft.world.entity.monster.Evoker setWololoTarget(Lnet/minecraft/world/entity/animal/Sheep;)V
371+
public net.minecraft.world.entity.monster.Evoker getWololoTarget()Lnet/minecraft/world/entity/animal/sheep/Sheep;
372+
public net.minecraft.world.entity.monster.Evoker setWololoTarget(Lnet/minecraft/world/entity/animal/sheep/Sheep;)V
362373
public net.minecraft.world.entity.monster.Guardian randomStrollGoal
363374
public net.minecraft.world.entity.monster.Guardian setActiveAttackTarget(I)V
364375
public net.minecraft.world.entity.monster.Guardian$GuardianAttackGoal
@@ -415,10 +426,19 @@ public net.minecraft.world.entity.player.Player DATA_PLAYER_MODE_CUSTOMISATION
415426
public net.minecraft.world.entity.player.Player closeContainer()V
416427
public net.minecraft.world.entity.player.Player enchantmentSeed
417428
public net.minecraft.world.entity.player.Player getFireImmuneTicks()I
429+
public net.minecraft.world.entity.player.Player hurtDir
418430
public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V
419431
public net.minecraft.world.entity.player.Player setShoulderEntityLeft(Lnet/minecraft/nbt/CompoundTag;)V
420432
public net.minecraft.world.entity.player.Player setShoulderEntityRight(Lnet/minecraft/nbt/CompoundTag;)V
421433
public net.minecraft.world.entity.player.Player sleepCounter
434+
public net.minecraft.world.entity.projectile.AbstractArrow baseDamage
435+
public net.minecraft.world.entity.projectile.AbstractArrow firedFromWeapon
436+
public net.minecraft.world.entity.projectile.AbstractArrow getHitGroundSoundEvent()Lnet/minecraft/sounds/SoundEvent;
437+
public net.minecraft.world.entity.projectile.AbstractArrow getPickupItem()Lnet/minecraft/world/item/ItemStack;
438+
public net.minecraft.world.entity.projectile.AbstractArrow isInGround()Z
439+
public net.minecraft.world.entity.projectile.AbstractArrow life
440+
public net.minecraft.world.entity.projectile.AbstractArrow pickupItemStack
441+
public net.minecraft.world.entity.projectile.AbstractArrow setPierceLevel(B)V
422442
public net.minecraft.world.entity.projectile.AbstractHurtingProjectile assignDirectionalMovement(Lnet/minecraft/world/phys/Vec3;D)V
423443
public net.minecraft.world.entity.projectile.Arrow NO_EFFECT_COLOR
424444
public net.minecraft.world.entity.projectile.Arrow getPotionContents()Lnet/minecraft/world/item/alchemy/PotionContents;
@@ -690,6 +710,7 @@ public net.minecraft.world.level.levelgen.SurfaceRules$LazyCondition
690710
public net.minecraft.world.level.levelgen.SurfaceRules$LazyYCondition
691711
public net.minecraft.world.level.levelgen.SurfaceRules$SurfaceRule
692712
public net.minecraft.world.level.levelgen.SurfaceRules$VerticalGradientConditionSource
713+
public net.minecraft.world.level.levelgen.structure.StructurePiece SHAPE_CHECK_BLOCKS
693714
public net.minecraft.world.level.levelgen.structure.placement.StructurePlacement exclusionZone
694715
public net.minecraft.world.level.levelgen.structure.placement.StructurePlacement frequency
695716
public net.minecraft.world.level.levelgen.structure.placement.StructurePlacement frequencyReductionMethod

paper-api/src/main/java/org/bukkit/block/Campfire.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ public interface Campfire extends TileState {
7070
*/
7171
void setCookTimeTotal(int index, int cookTimeTotal);
7272

73-
// Paper start
7473
/**
7574
* Disable cooking in all slots.
7675
*/
@@ -104,5 +103,4 @@ public interface Campfire extends TileState {
104103
* @return {@code true} if the specified slot index cannot cook
105104
*/
106105
boolean isCookingDisabled(int index);
107-
// Paper end
108106
}

paper-api/src/main/java/org/bukkit/entity/Damageable.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public interface Damageable extends Entity {
5353
*/
5454
void setHealth(double health);
5555

56-
// Paper start - entity heal API
5756
/**
5857
* Heal this entity by the given amount. This will call {@link org.bukkit.event.entity.EntityRegainHealthEvent}.
5958
*
@@ -70,7 +69,6 @@ default void heal(final double amount) {
7069
* @param reason heal reason
7170
*/
7271
void heal(double amount, @NotNull org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason reason);
73-
// Paper end - entity heal API
7472

7573
/**
7674
* Gets the entity's absorption amount.

paper-api/src/main/java/org/bukkit/entity/Dolphin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.bukkit.Location;
44

5-
public interface Dolphin extends Ageable, WaterMob { // Paper start - Dolphin API
5+
public interface Dolphin extends Ageable, WaterMob {
66

77
/**
88
* Gets the moistness level of this dolphin
@@ -49,4 +49,4 @@ public interface Dolphin extends Ageable, WaterMob { // Paper start - Dolphin AP
4949
* @param location location to guide to
5050
*/
5151
void setTreasureLocation(@org.jetbrains.annotations.NotNull Location location);
52-
} // Paper end - Dolphin API
52+
}

paper-api/src/main/java/org/bukkit/entity/Evoker.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public enum Spell {
6565
@Deprecated(since = "1.11.2")
6666
void setCurrentSpell(@Nullable Spell spell);
6767

68-
// Paper start
6968
/**
7069
* @return the sheep being targeted by the {@link Spell#WOLOLO wololo spell}, or {@code null} if none
7170
*/
@@ -78,5 +77,4 @@ public enum Spell {
7877
* @param sheep new wololo target
7978
*/
8079
void setWololoTarget(@Nullable Sheep sheep);
81-
// Paper end
8280
}

paper-api/src/main/java/org/bukkit/entity/Ghast.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public interface Ghast extends Flying, Enemy {
1919
*/
2020
void setCharging(boolean flag);
2121

22-
// Paper start
2322
/**
2423
* Returns the explosion power of shot fireballs.
2524
*
@@ -34,5 +33,4 @@ public interface Ghast extends Flying, Enemy {
3433
* @throws IllegalArgumentException if the explosion power is less than 0 or greater than 127
3534
*/
3635
void setExplosionPower(int explosionPower);
37-
// Paper end
3836
}

paper-api/src/main/java/org/bukkit/entity/Goat.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,9 @@ public interface Goat extends Animals {
5353
*/
5454
void setScreaming(boolean screaming);
5555

56-
// Paper start - Goat ram API
5756
/**
5857
* Makes the goat ram at the specified entity
5958
* @param entity the entity to ram at
6059
*/
6160
void ram(@org.jetbrains.annotations.NotNull LivingEntity entity);
62-
// Paper end
6361
}

paper-api/src/main/java/org/bukkit/entity/HumanEntity.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -382,24 +382,20 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
382382
*/
383383
public void setCooldown(Material material, int ticks);
384384

385-
// Paper start
386385
/**
387386
* Sets player hurt direction
388387
*
389388
* @param hurtDirection hurt direction
390389
*/
391390
@Override
392391
void setHurtDirection(float hurtDirection);
393-
// Paper end
394392

395-
// Paper start
396393
/**
397394
* If the player has slept enough to count towards passing the night.
398395
*
399396
* @return true if the player has slept enough
400397
*/
401398
public boolean isDeeplySleeping();
402-
// Paper end
403399

404400
/**
405401
* Check whether a cooldown is active on the specified item.
@@ -440,7 +436,6 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
440436
public int getSleepTicks();
441437

442438

443-
// Paper start - Potential bed api
444439
/**
445440
* Gets the Location of the player's bed, null if they have not slept
446441
* in one. This method will not attempt to validate if the current bed
@@ -466,14 +461,12 @@ default Location getPotentialBedLocation() {
466461
*/
467462
@Nullable
468463
Location getPotentialRespawnLocation();
469-
// Paper end
470-
// Paper start
464+
471465
/**
472466
* @return the player's fishing hook if they are fishing
473467
*/
474468
@Nullable
475469
FishHook getFishHook();
476-
// Paper end
477470

478471
/**
479472
* Attempts to make the entity sleep at the given location.

paper-api/src/main/java/org/bukkit/entity/LivingEntity.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -663,14 +663,12 @@ default void setArrowsInBody(final int count) {
663663
@NotNull
664664
public Collection<PotionEffect> getActivePotionEffects();
665665

666-
// Paper start - LivingEntity#clearActivePotionEffects();
667666
/**
668667
* Removes all active potion effects for this entity.
669668
*
670669
* @return true if any were removed
671670
*/
672671
boolean clearActivePotionEffects();
673-
// Paper end
674672

675673
/**
676674
* Checks whether the living entity has block line of sight to another.
@@ -683,7 +681,6 @@ default void setArrowsInBody(final int count) {
683681
*/
684682
public boolean hasLineOfSight(@NotNull Entity other);
685683

686-
// Paper start
687684
/**
688685
* Checks whether the living entity has block line of sight to the given block.
689686
* <p>
@@ -694,7 +691,6 @@ default void setArrowsInBody(final int count) {
694691
* @return true if there is a line of sight, false if not
695692
*/
696693
public boolean hasLineOfSight(@NotNull Location location);
697-
// Paper end
698694

699695
/**
700696
* Returns if the living entity despawns when away from players or not.
@@ -1076,7 +1072,6 @@ default void setArrowsInBody(final int count) {
10761072
@Override // Paper - move invisibility up to Entity
10771073
public boolean isInvisible();
10781074

1079-
// Paper start
10801075
/**
10811076
* Get the number of arrows stuck in this entity
10821077
* @return Number of arrows stuck
@@ -1108,9 +1103,7 @@ default void setArrowsInBody(final int count) {
11081103
* @param delay Delay in ticks
11091104
*/
11101105
void setShieldBlockingDelay(int delay);
1111-
// Paper end
11121106

1113-
// Paper start - missing entity API
11141107
/**
11151108
* Retrieves the sideways movement direction of the entity.
11161109
* <p>
@@ -1167,7 +1160,6 @@ default void setArrowsInBody(final int count) {
11671160
* @return Forwards movement direction, ranging from -1 (backward) to 1 (forward).
11681161
*/
11691162
float getForwardsMovement();
1170-
// Paper end - missing entity API
11711163

11721164
// Paper start - active item API
11731165
/**

paper-api/src/main/java/org/bukkit/entity/Piglin.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public interface Piglin extends PiglinAbstract, InventoryHolder, com.destroystok
9191
@NotNull
9292
public Set<Material> getBarterList();
9393

94-
// Paper start
9594
/**
9695
* Causes the piglin to appear as if they are charging
9796
* a crossbow.
@@ -131,6 +130,5 @@ public interface Piglin extends PiglinAbstract, InventoryHolder, com.destroystok
131130
* @return is dancing
132131
*/
133132
boolean isDancing();
134-
// Paper end
135133

136134
}

paper-api/src/main/java/org/bukkit/entity/PolarBear.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
/**
44
* Represents a polar bear.
55
*/
6-
// Paper start
76
public interface PolarBear extends Animals {
87

98
/**
@@ -21,4 +20,3 @@ public interface PolarBear extends Animals {
2120
void setStanding(boolean standing);
2221

2322
}
24-
// Paper end

paper-api/src/main/java/org/bukkit/entity/Ravager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
/**
44
* Illager beast.
55
*/
6-
// Paper start - Missing Entity Behavior
76
public interface Ravager extends Raider {
87

98
/**
@@ -60,4 +59,3 @@ public interface Ravager extends Raider {
6059
void setRoarTicks(int ticks);
6160

6261
}
63-
// Paper end

paper-api/src/main/java/org/bukkit/entity/Skeleton.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ public interface Skeleton extends AbstractSkeleton {
4141
*/
4242
void setConversionTime(int time);
4343

44-
// Paper start
4544
/**
4645
* Gets the time the skeleton
4746
* has been inside powdered snow.
4847
*
4948
* @return time in ticks
5049
*/
5150
int inPowderedSnowTime();
52-
// Paper end
5351

5452
/**
5553
* A legacy enum that defines the different variances of skeleton-like

paper-api/src/main/java/org/bukkit/entity/SkeletonHorse.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,19 @@ public interface SkeletonHorse extends AbstractHorse {
4444
*/
4545
void setTrapTime(int trapTime);
4646

47-
// Paper start
4847
/**
4948
* @deprecated use {@link #isTrapped()}
5049
*/
5150
@Deprecated
52-
boolean isTrap();
51+
default boolean isTrap() {
52+
return this.isTrapped();
53+
}
5354

5455
/**
5556
* @deprecated use {@link #setTrapped(boolean)}
5657
*/
5758
@Deprecated
58-
void setTrap(boolean trap);
59-
// Paper end
59+
default void setTrap(boolean trap) {
60+
this.setTrapped(trap);
61+
}
6062
}

paper-api/src/main/java/org/bukkit/entity/Slime.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public interface Slime extends Mob, Enemy {
2525
*/
2626
public void setSize(int sz);
2727

28-
// Paper start
2928
/**
3029
* Get whether this slime can randomly wander/jump around on its own
3130
*
@@ -39,5 +38,4 @@ public interface Slime extends Mob, Enemy {
3938
* @param canWander true if can wander
4039
*/
4140
public void setWander(boolean canWander);
42-
// Paper end
4341
}

0 commit comments

Comments
 (0)