diff --git a/mappings/net/minecraft/block/CaveVines.mapping b/mappings/net/minecraft/block/CaveVines.mapping index 2e38800301..cab3ca85d4 100644 --- a/mappings/net/minecraft/block/CaveVines.mapping +++ b/mappings/net/minecraft/block/CaveVines.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/class_5803 net/minecraft/block/CaveVines METHOD method_33618 hasBerries (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_33619 pickBerries (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1269; + ARG 0 picker + ARG 1 state + ARG 2 world + ARG 3 pos METHOD method_37361 (ILnet/minecraft/class_2680;)I ARG 1 state METHOD method_37362 getLuminanceSupplier (I)Ljava/util/function/ToIntFunction; diff --git a/mappings/net/minecraft/block/ComposterBlock.mapping b/mappings/net/minecraft/block/ComposterBlock.mapping index 5bd59426c6..efea8a6c26 100644 --- a/mappings/net/minecraft/block/ComposterBlock.mapping +++ b/mappings/net/minecraft/block/ComposterBlock.mapping @@ -10,14 +10,32 @@ CLASS net/minecraft/class_3962 net/minecraft/block/ComposterBlock METHOD method_17755 ([Lnet/minecraft/class_265;)V ARG 0 shapes METHOD method_17756 addToComposter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2680; + ARG 0 user + ARG 1 state + ARG 2 world + ARG 3 pos + ARG 4 stack METHOD method_17758 registerDefaultCompostableItems ()V METHOD method_17759 emptyComposter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + ARG 0 user + ARG 1 state + ARG 2 world + ARG 3 pos METHOD method_18027 playEffects (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)V ARG 0 world ARG 1 pos ARG 2 fill METHOD method_26373 compost (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + ARG 0 user + ARG 1 state + ARG 2 world + ARG 3 stack + ARG 4 pos METHOD method_26374 emptyFullComposter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + ARG 0 user + ARG 1 state + ARG 2 world + ARG 3 pos CLASS class_3925 DummyInventory CLASS class_3963 ComposterInventory FIELD field_17569 state Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/block/FarmlandBlock.mapping b/mappings/net/minecraft/block/FarmlandBlock.mapping index d864452cec..2b509187d6 100644 --- a/mappings/net/minecraft/block/FarmlandBlock.mapping +++ b/mappings/net/minecraft/block/FarmlandBlock.mapping @@ -6,6 +6,10 @@ CLASS net/minecraft/class_2344 net/minecraft/block/FarmlandBlock ARG 0 world ARG 1 pos METHOD method_10125 setToDirt (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 0 entity + ARG 1 state + ARG 2 world + ARG 3 pos METHOD method_10126 isWaterNearby (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/LecternBlock.mapping b/mappings/net/minecraft/block/LecternBlock.mapping index 5d357f0497..100a49e8b7 100644 --- a/mappings/net/minecraft/block/LecternBlock.mapping +++ b/mappings/net/minecraft/block/LecternBlock.mapping @@ -21,16 +21,24 @@ CLASS net/minecraft/class_3715 net/minecraft/block/LecternBlock ARG 1 pos ARG 2 state METHOD method_17472 putBookIfAbsent (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)Z + ARG 0 user ARG 1 world ARG 2 pos ARG 3 state ARG 4 stack METHOD method_17473 setHasBook (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V + ARG 0 user + ARG 1 world + ARG 2 pos + ARG 3 state + ARG 4 hasBook METHOD method_17474 updateNeighborAlways (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 0 world ARG 1 pos ARG 2 state METHOD method_17475 putBook (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;)V + ARG 0 user + ARG 1 world ARG 2 pos ARG 3 state ARG 4 stack diff --git a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping index 8ab825eb6f..467e4e1ab5 100644 --- a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping +++ b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping @@ -12,6 +12,10 @@ CLASS net/minecraft/class_4969 net/minecraft/block/RespawnAnchorBlock ARG 0 state ARG 1 maxLevel METHOD method_26382 charge (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 0 charger + ARG 1 world + ARG 2 pos + ARG 3 state METHOD method_27353 isNether (Lnet/minecraft/class_1937;)Z ARG 0 world METHOD method_29289 isChargeItem (Lnet/minecraft/class_1799;)Z diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index bf1e6b478a..9f3b834fab 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -133,8 +133,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see Entity#removePassenger FIELD field_29988 DEFAULT_PORTAL_COOLDOWN I COMMENT @see Entity#getDefaultPortalCooldown - FIELD field_29989 MAX_SCOREBOARD_TAGS I - COMMENT @see Entity#addScoreboardTag + FIELD field_29989 MAX_COMMAND_TAGS I + COMMENT @see Entity#addCommandTag COMMENT @see Entity#readNbt FIELD field_29990 VELOCITY_AFFECTING_POS_Y_OFFSET D COMMENT @see Entity#getVelocityAffectingPos @@ -941,6 +941,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_48155 canSprintAsVehicle ()Z METHOD method_48850 onDataTrackerUpdate (Ljava/util/List;)V ARG 1 dataEntries + METHOD method_48921 couldAcceptPassenger ()Z + COMMENT {@return {@code true} if this entity supports passengers in general} METHOD method_48922 onDamaged (Lnet/minecraft/class_1282;)V ARG 1 damageSource METHOD method_48923 getDamageSources ()Lnet/minecraft/class_8109; @@ -1131,7 +1133,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

This is saved on the {@code Invulnerable} NBT key. COMMENT COMMENT @implNote Invulnerable entities are immune from all damages except {@link - COMMENT DamageSource#OUT_OF_WORLD} and damages by creative mode players by default. + COMMENT net.minecraft.entity.damage.DamageTypes#OUT_OF_WORLD} + COMMENT and damages by creative mode players by default. COMMENT COMMENT @see #isInvulnerableTo COMMENT @see #setInvulnerable @@ -1226,11 +1229,13 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT {@code super.isInvulnerableTo()} should be called in this case. COMMENT COMMENT @implNote Entity is invulnerable to all damages if it is {@linkplain #isRemoved - COMMENT removed}, and is invulnerable to all damages except {@link DamageSource#OUT_OF_WORLD} + COMMENT removed}, and is invulnerable to all damages except {@link + COMMENT net.minecraft.entity.damage.DamageTypes#OUT_OF_WORLD} COMMENT or damages from creative mode players if the entity is {@linkplain #isInvulnerable COMMENT invulnerable}. This also checks {@link #isFireImmune}. COMMENT - COMMENT @see DamageSource + COMMENT @see net.minecraft.entity.damage.DamageSources + COMMENT @see net.minecraft.registry.tag.DamageTypeTags COMMENT @see #isFireImmune COMMENT @see #damage COMMENT @see #isInvulnerable @@ -1259,7 +1264,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

This is saved on the {@code Invulnerable} NBT key. COMMENT COMMENT @implNote Invulnerable entities are immune from all damages except {@link - COMMENT DamageSource#OUT_OF_WORLD} and damages by creative mode players by default. + COMMENT net.minecraft.entity.damage.DamageTypes#OUT_OF_WORLD} + COMMENT and damages by creative mode players by default. COMMENT COMMENT @see #isInvulnerableTo COMMENT @see #isInvulnerable @@ -1612,7 +1618,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

Scoreboard tags are set using the {@linkplain net.minecraft.server.command.TagCommand COMMENT /tag command}, and is different from entity type tags defined in data packs. METHOD method_5753 isFireImmune ()Z - COMMENT {@return whether the entity is immune to {@linkplain DamageSource#setFire fire damage}} + COMMENT {@return whether the entity is immune to {@linkplain + COMMENT net.minecraft.registry.tag.DamageTypeTags#IS_FIRE fire damage}} COMMENT COMMENT @see EntityType.Builder#makeFireImmune METHOD method_5755 getMovementDirection ()Lnet/minecraft/class_2350; @@ -1983,7 +1990,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5825 tickInVoid ()V COMMENT Called when the entity is 64 blocks below the world's {@linkplain net.minecraft.world.HeightLimitView#getBottomY() minimum Y position}. COMMENT - COMMENT

{@linkplain LivingEntity Living entities} use this to deal {@linkplain net.minecraft.entity.damage.DamageSource#OUT_OF_WORLD out of world damage}. + COMMENT

{@linkplain LivingEntity Living entities} use this to deal {@linkplain net.minecraft.entity.damage.DamageTypes#OUT_OF_WORLD out of world damage}. METHOD method_5826 setUuid (Ljava/util/UUID;)V COMMENT Sets the UUID of the entity to {@code uuid}. COMMENT diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index b79b60a4a2..b31abffb24 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_30053 ENTITY_TAG_KEY Ljava/lang/String; FIELD field_36398 registryEntry Lnet/minecraft/class_6880$class_6883; FIELD field_40115 requiredFeatures Lnet/minecraft/class_7699; + FIELD field_42458 tickable Z FIELD field_6056 saveable Z FIELD field_6072 summonable Z FIELD field_6088 LOGGER Lorg/slf4j/Logger; @@ -27,6 +28,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 8 dimensions ARG 9 maxTrackDistance ARG 10 trackTickInterval + ARG 11 tickable + ARG 12 requiredFeatures METHOD method_16351 getLootTableId ()Lnet/minecraft/class_2960; METHOD method_17683 createSimpleBoundingBox (DDD)Lnet/minecraft/class_238; ARG 1 feetX @@ -102,6 +105,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 world ARG 2 stack ARG 3 player + METHOD method_48924 isTickable ()Z METHOD method_5881 loadFromEntityNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_2487;)V ARG 0 world ARG 1 player @@ -168,6 +172,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType FIELD field_24088 trackingTickInterval I FIELD field_25356 canSpawnInside Lcom/google/common/collect/ImmutableSet; FIELD field_40117 requiredFeatures Lnet/minecraft/class_7699; + FIELD field_42461 tickable Z FIELD field_6148 factory Lnet/minecraft/class_1299$class_4049; FIELD field_6149 spawnGroup Lnet/minecraft/class_1311; FIELD field_6150 summonable Z @@ -196,6 +201,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 blocks METHOD method_45323 requires ([Lnet/minecraft/class_7696;)Lnet/minecraft/class_1299$class_1300; ARG 1 features + METHOD method_48925 tickable (Z)Lnet/minecraft/class_1299$class_1300; + ARG 1 tickable METHOD method_5900 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index e6308fb348..d78f6c905d 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -346,6 +346,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_48157 getDamageTiltYaw ()F METHOD method_48565 updateLimbs (F)V ARG 1 posDelta + METHOD method_48761 tiltScreen (DD)V + ARG 1 deltaX + ARG 3 deltaZ METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/entity/damage/DamageEffects.mapping b/mappings/net/minecraft/entity/damage/DamageEffects.mapping index 73210e226d..8489593237 100644 --- a/mappings/net/minecraft/entity/damage/DamageEffects.mapping +++ b/mappings/net/minecraft/entity/damage/DamageEffects.mapping @@ -5,4 +5,4 @@ CLASS net/minecraft/class_8107 net/minecraft/entity/damage/DamageEffects METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_3414;)V ARG 3 id ARG 4 sound - METHOD method_48786 sound ()Lnet/minecraft/class_3414; + METHOD method_48786 getSound ()Lnet/minecraft/class_3414; diff --git a/mappings/net/minecraft/entity/decoration/Brightness.mapping b/mappings/net/minecraft/entity/decoration/Brightness.mapping index 227e6a42b7..56d83049c8 100644 --- a/mappings/net/minecraft/entity/decoration/Brightness.mapping +++ b/mappings/net/minecraft/entity/decoration/Brightness.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_8104 net/minecraft/entity/decoration/Brightness METHOD method_48763 pack ()I METHOD method_48764 unpack (I)Lnet/minecraft/class_8104; ARG 0 packed + METHOD method_48765 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index 8281cb9977..ee23296798 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity FIELD field_30422 EATING_GRASS_FLAG I FIELD field_30423 ANGRY_FLAG I FIELD field_30424 EATING_FLAG I + FIELD field_42462 ownerUuid Ljava/util/UUID; FIELD field_6955 temper I FIELD field_6956 IS_BRED_HORSE Ljava/util/function/Predicate; FIELD field_6957 tailWagTicks I @@ -74,7 +75,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 1 bitmask METHOD method_6731 updateSaddle ()V METHOD method_6732 setOwnerUuid (Ljava/util/UUID;)V - ARG 1 uuid + ARG 1 ownerUuid METHOD method_6733 playEatingAnimation ()V METHOD method_6734 canBreed ()Z METHOD method_6735 hasArmorSlot ()Z diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 3c257a4e5a..878e50ae2a 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -128,6 +128,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity ARG 5 maxYDifference METHOD method_18307 eatBerries ()V METHOD method_33586 pickGlowBerries (Lnet/minecraft/class_2680;)V + ARG 1 state METHOD method_33587 pickSweetBerries (Lnet/minecraft/class_2680;)V ARG 1 state CLASS class_4026 FoxSwimGoal diff --git a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping index 364d645b9b..725afe354d 100644 --- a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping +++ b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory ARG 2 world ARG 3 vehicle METHOD method_42284 open (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; + ARG 1 player METHOD method_42285 readInventoryFromNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_42286 removeInventoryStack (II)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/item/DecorationItem.mapping b/mappings/net/minecraft/item/DecorationItem.mapping index eda1874f1a..5d80c7f8e6 100644 --- a/mappings/net/minecraft/item/DecorationItem.mapping +++ b/mappings/net/minecraft/item/DecorationItem.mapping @@ -1,8 +1,13 @@ CLASS net/minecraft/class_1790 net/minecraft/item/DecorationItem + FIELD field_42467 RANDOM_TEXT Lnet/minecraft/class_2561; FIELD field_7999 entityType Lnet/minecraft/class_1299; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1792$class_1793;)V ARG 1 type ARG 2 settings + METHOD method_48959 (Ljava/util/List;Lnet/minecraft/class_5321;)V + ARG 1 key + METHOD method_48960 (Ljava/util/List;Lnet/minecraft/class_6880;)V + ARG 1 variant METHOD method_7834 canPlaceOn (Lnet/minecraft/class_1657;Lnet/minecraft/class_2350;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)Z ARG 1 player ARG 2 side diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 734e41585e..4fabb4317b 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -48,6 +48,12 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@link GlobalPos}{@link #readGlobalPos()}{@link #writeGlobalPos(GlobalPos)} COMMENT COMMENT + COMMENT {@link Vector3f}{@link #readVector3f()}{@link #writeVector3f(Vector3f)} + COMMENT + COMMENT + COMMENT {@link Quaternionf}{@link #readQuaternionf()}{@link #writeQuaternionf(Quaternionf)} + COMMENT + COMMENT COMMENT {@link Text}{@link #readText()}{@link #writeText(Text)} COMMENT COMMENT @@ -1059,11 +1065,27 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 registryEntries ARG 2 reader METHOD method_49067 writeQuaternionf (Lorg/joml/Quaternionf;)V + COMMENT Writes a {@link Quaternionf} to this buf. A {@link Quaternionf} is represented + COMMENT by four {@code float}s. + COMMENT + COMMENT @see #readQuaternionf() ARG 1 quaternionf METHOD method_49068 writeVector3f (Lorg/joml/Vector3f;)V + COMMENT Writes a {@link Vector3f} to this buf. A {@link Vector3f} is represented by + COMMENT three {@code float}s. + COMMENT + COMMENT @see #readVector3f() ARG 1 vector3f METHOD method_49069 readVector3f ()Lorg/joml/Vector3f; + COMMENT Reads a {@link Vector3f} from this buf. A {@link Vector3f} is represented by + COMMENT three {@code float}s. + COMMENT + COMMENT @see #writeVector3f(Vector3f) METHOD method_49070 readQuaternionf ()Lorg/joml/Quaternionf; + COMMENT Reads a {@link Quaternionf} from this buf. A {@link Quaternionf} is represented + COMMENT by four {@code float}s. + COMMENT + COMMENT @see #writeQuaternionf(Quaternionf) METHOD nioBuffer (II)Ljava/nio/ByteBuffer; ARG 1 index ARG 2 length diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping index d8abd71287..53e3273292 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -33,6 +33,10 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot METHOD method_34265 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 2 stack METHOD method_34266 getIndex ()I + METHOD method_48931 setStack (Lnet/minecraft/class_1799;)V + COMMENT Sets the slot's stack to {@code stack} and marks the slot as dirty. Subclasses + COMMENT may override this method to perform additional operations. + ARG 1 stack METHOD method_7667 onTakeItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack @@ -46,9 +50,8 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot ARG 1 amount METHOD method_7672 onTake (I)V ARG 1 amount - METHOD method_7673 setStack (Lnet/minecraft/class_1799;)V - COMMENT Sets the slot's stack to {@code stack} and marks the slot as dirty. Subclasses - COMMENT may override this method to perform additional operations. + METHOD method_7673 setStackNoCallbacks (Lnet/minecraft/class_1799;)V + COMMENT ARG 1 stack METHOD method_7674 canTakeItems (Lnet/minecraft/class_1657;)Z ARG 1 playerEntity diff --git a/mappings/net/minecraft/util/CachedMapper.mapping b/mappings/net/minecraft/util/CachedMapper.mapping new file mode 100644 index 0000000000..528f3a4837 --- /dev/null +++ b/mappings/net/minecraft/util/CachedMapper.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8105 net/minecraft/util/CachedMapper + COMMENT A mapper that caches the latest input-output pair, so that repeated calls with + COMMENT the same argument do not call the expensive mapper function. + COMMENT + COMMENT @see Util#cachedMapper + FIELD field_42269 mapper Ljava/util/function/Function; + FIELD field_42270 cachedInput Ljava/lang/Object; + FIELD field_42271 cachedOutput Ljava/lang/Object; + METHOD (Ljava/util/function/Function;)V + ARG 1 mapper + METHOD method_48782 map (Ljava/lang/Object;)Ljava/lang/Object; + COMMENT {@return the mapped {@code input}} + ARG 1 input diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index d3dfd25d8d..46dee48468 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -180,6 +180,11 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier ARG 1 prefix METHOD method_48331 withSuffixedPath (Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 1 suffix + METHOD method_48747 toTranslationKey (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + COMMENT {@return the {@linkplain #toTranslationKey() long translation key} prefixed with + COMMENT {@code prefix} and a dot, and suffixed with a dot and {@code suffix}} + ARG 1 prefix + ARG 2 suffix CLASS class_2961 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/util/Nullables.mapping b/mappings/net/minecraft/util/Nullables.mapping new file mode 100644 index 0000000000..e9f9868caa --- /dev/null +++ b/mappings/net/minecraft/util/Nullables.mapping @@ -0,0 +1,65 @@ +CLASS net/minecraft/class_8144 net/minecraft/util/Nullables + COMMENT Contains utility methods that accept or return nullable values. + METHOD method_49077 map (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; + COMMENT {@return the {@code value} with {@code mapper} applied if the value is not {@code null}, + COMMENT otherwise {@code null}} + COMMENT + COMMENT

This is the nullable equivalent to {@link java.util.Optional#map}. + ARG 0 value + ARG 1 mapper + METHOD method_49078 mapOrElse (Ljava/lang/Object;Ljava/util/function/Function;Ljava/lang/Object;)Ljava/lang/Object; + COMMENT {@return the {@code value} with {@code mapper} applied if the value is not {@code null}, + COMMENT otherwise {@code other}} + COMMENT + COMMENT

This is the nullable equivalent to {@link java.util.Optional#map} chained with + COMMENT {@link java.util.Optional#orElse}. + ARG 0 value + ARG 1 mapper + ARG 2 other + METHOD method_49079 mapOrElseGet (Ljava/lang/Object;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/lang/Object; + COMMENT {@return the {@code value} with {@code mapper} applied if the value is not {@code null}, + COMMENT otherwise {@code getter.get()}} + COMMENT + COMMENT

This is the nullable equivalent to {@link java.util.Optional#map} chained with + COMMENT {@link java.util.Optional#orElseGet}. + ARG 0 value + ARG 1 mapper + ARG 2 getter + METHOD method_49080 getFirst (Ljava/util/Collection;)Ljava/lang/Object; + COMMENT {@return the first element of {@code collection}, or {@code null} if it is empty} + ARG 0 collection + METHOD method_49081 getFirstOrElse (Ljava/util/Collection;Ljava/lang/Object;)Ljava/lang/Object; + COMMENT {@return the first element of {@code collection}, or {@code defaultValue} if it is empty} + ARG 0 collection + ARG 1 defaultValue + METHOD method_49082 getFirstOrElseGet (Ljava/util/Collection;Ljava/util/function/Supplier;)Ljava/lang/Object; + COMMENT {@return the first element of {@code collection}, or {@code getter.get()} if it is empty} + ARG 0 collection + ARG 1 getter + METHOD method_49083 isEmpty ([B)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49084 isEmpty ([C)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49085 isEmpty ([D)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49086 isEmpty ([F)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49087 isEmpty ([I)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49088 isEmpty ([J)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49089 isEmpty ([Ljava/lang/Object;)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49090 isEmpty ([S)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array + METHOD method_49091 isEmpty ([Z)Z + COMMENT {@return whether {@code array} is {@code null} or empty} + ARG 0 array diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 72c01bd4bc..9bffcab00e 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -298,6 +298,8 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT {@return the result wrapped in {@code result}} ARG 0 result ARG 1 exceptionGetter + METHOD method_48746 cachedMapper (Ljava/util/function/Function;)Lnet/minecraft/class_8105; + ARG 0 mapper METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; COMMENT {@return the item preceding {@code object} in {@code iterable}} COMMENT diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index c856551c0e..afbc48dcb7 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs FIELD field_41759 NON_EMPTY_STRING Lcom/mojang/serialization/Codec; FIELD field_42265 QUATERNIONF Lcom/mojang/serialization/Codec; FIELD field_42266 AXIS_ANGLE4F Lcom/mojang/serialization/Codec; + FIELD field_42267 ROTATION Lcom/mojang/serialization/Codec; FIELD field_42268 MATRIX4F Lcom/mojang/serialization/Codec; METHOD method_33817 xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; COMMENT Returns an exclusive-or codec for {@link Either} instances. @@ -212,13 +213,41 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs METHOD method_48112 validate (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 codec ARG 1 validator + METHOD method_48113 (Lnet/minecraft/class_6885;)Lcom/mojang/serialization/DataResult; + ARG 0 entryList METHOD method_48114 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 string + METHOD method_48115 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 list METHOD method_48766 rangedInt (II)Lcom/mojang/serialization/Codec; ARG 0 min ARG 1 max METHOD method_48767 (IILjava/lang/Integer;)Ljava/lang/String; ARG 2 value + METHOD method_48768 (Lorg/joml/AxisAngle4f;)Lorg/joml/Vector3f; + ARG 0 axisAngle + METHOD method_48769 (Lorg/joml/Matrix4f;)Ljava/util/List; + ARG 0 matrix4f + METHOD method_48770 (Lorg/joml/Quaternionf;)Lorg/joml/Quaternionf; + ARG 0 quaternion + METHOD method_48771 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 list + METHOD method_48772 (Lorg/joml/AxisAngle4f;)Ljava/lang/Float; + ARG 0 axisAngle + METHOD method_48773 (Lorg/joml/Quaternionf;)Lorg/joml/Quaternionf; + ARG 0 quaternion + METHOD method_48774 (Lcom/mojang/datafixers/util/Either;)Lorg/joml/Quaternionf; + ARG 0 either + METHOD method_48775 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_48776 (Ljava/util/List;)Lorg/joml/Matrix4f; + ARG 0 list + METHOD method_48777 (Lorg/joml/Quaternionf;)Ljava/util/List; + ARG 0 quaternion + METHOD method_48778 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 list + METHOD method_48779 (Ljava/util/List;)Lorg/joml/Quaternionf; + ARG 0 list CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops diff --git a/mappings/net/minecraft/util/math/AffineTransformation.mapping b/mappings/net/minecraft/util/math/AffineTransformation.mapping index 405066121c..e4fb622564 100644 --- a/mappings/net/minecraft/util/math/AffineTransformation.mapping +++ b/mappings/net/minecraft/util/math/AffineTransformation.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4590 net/minecraft/util/math/AffineTransformation COMMENT An affine transformation is a decomposition of a 4×4 real matrix into - COMMENT a {@linkplain #rotation1 rotation} quaternion, a {@linkplain #scale scale} - COMMENT 3-vector, a second {@linkplain #rotation2 rotation} quaternion, and a + COMMENT a {@linkplain #leftRotation left rotation} quaternion, a {@linkplain #scale scale} + COMMENT 3-vector, a second {@linkplain #rightRotation right rotation} quaternion, and a COMMENT {@linkplain #translation translation} 3-vector. It is also known as "TRSR" COMMENT transformation, meaning "translation rotation scale rotation". COMMENT @@ -13,7 +13,8 @@ CLASS net/minecraft/class_4590 net/minecraft/util/math/AffineTransformation FIELD field_20904 scale Lorg/joml/Vector3f; FIELD field_20905 rightRotation Lorg/joml/Quaternionf; FIELD field_20906 IDENTITY Lnet/minecraft/class_4590; - FIELD field_42533 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42532 CODEC Lcom/mojang/serialization/Codec; + FIELD field_42533 ANY_CODEC Lcom/mojang/serialization/Codec; METHOD (Lorg/joml/Matrix4f;)V ARG 1 matrix METHOD (Lorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Vector3f;Lorg/joml/Quaternionf;)V @@ -27,6 +28,10 @@ CLASS net/minecraft/class_4590 net/minecraft/util/math/AffineTransformation METHOD method_22933 multiply (Lnet/minecraft/class_4590;)Lnet/minecraft/class_4590; ARG 1 other METHOD method_22934 setup (Lorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Vector3f;Lorg/joml/Quaternionf;)Lorg/joml/Matrix4f; + ARG 0 translation + ARG 1 leftRotation + ARG 2 scale + ARG 3 rightRotation METHOD method_22935 invert ()Lnet/minecraft/class_4590; METHOD method_22936 getMatrix ()Lorg/joml/Matrix4f; METHOD method_22937 getLeftRotation ()Lorg/joml/Quaternionf; @@ -37,3 +42,17 @@ CLASS net/minecraft/class_4590 net/minecraft/util/math/AffineTransformation METHOD method_35865 getTranslation ()Lorg/joml/Vector3f; METHOD method_35866 getScale ()Lorg/joml/Vector3f; METHOD method_35867 getRightRotation ()Lorg/joml/Quaternionf; + METHOD method_49058 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_4590; + ARG 0 either + METHOD method_49059 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_49060 (Lnet/minecraft/class_4590;)Lnet/minecraft/class_4590; + ARG 0 affineTransformation + METHOD method_49061 (Lnet/minecraft/class_4590;)Lnet/minecraft/class_4590; + ARG 0 affineTransformation + METHOD method_49062 (Lnet/minecraft/class_4590;)Lorg/joml/Quaternionf; + ARG 0 affineTransformation + METHOD method_49063 (Lnet/minecraft/class_4590;)Lorg/joml/Vector3f; + ARG 0 affineTransformation + METHOD method_49064 (Lnet/minecraft/class_4590;)Lorg/joml/Quaternionf; + ARG 0 affineTransformation diff --git a/mappings/net/minecraft/util/math/AffineTransformations.mapping b/mappings/net/minecraft/util/math/AffineTransformations.mapping index ef07cd4295..795a017b31 100644 --- a/mappings/net/minecraft/util/math/AffineTransformations.mapping +++ b/mappings/net/minecraft/util/math/AffineTransformations.mapping @@ -4,3 +4,7 @@ CLASS net/minecraft/class_4609 net/minecraft/util/math/AffineTransformations FIELD field_21023 LOGGER Lorg/slf4j/Logger; METHOD method_23220 setupUvLock (Lnet/minecraft/class_4590;)Lnet/minecraft/class_4590; METHOD method_23221 uvLock (Lnet/minecraft/class_4590;Lnet/minecraft/class_2350;Ljava/util/function/Supplier;)Lnet/minecraft/class_4590; + METHOD method_23222 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD method_23223 (Ljava/util/EnumMap;)V + ARG 0 map diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 76d52de1a2..fe410345a4 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -230,10 +230,10 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 10 volume ARG 11 pitch ARG 12 seed - METHOD method_48963 getDamageSources ()Lnet/minecraft/class_8109; METHOD method_48760 sendEntityDamage (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;)V ARG 1 entity ARG 2 damageSource + METHOD method_48963 getDamageSources ()Lnet/minecraft/class_8109; METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState @@ -298,7 +298,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World COMMENT the entity that exploded (like TNT) or {@code null} to indicate no entity exploded ARG 2 damageSource COMMENT the custom damage source, or {@code null} to use the default - COMMENT ({@link DamageSource#explosion(Explosion)}) + COMMENT ({@link net.minecraft.entity.damage.DamageSources#explosion(Explosion)}) ARG 3 behavior COMMENT the explosion behavior, or {@code null} to use the default ARG 4 x