From 3a2c6242a29b26e3dd38f39356751eb731b2f1fd Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 19 Dec 2023 04:47:04 +1100 Subject: [PATCH] 23w51 stuff not entirely finished, but it's getting late... --- .../net/minecraft/block/AbstractBlock.mapping | 24 ++++++++++ .../net/minecraft/block/BeehiveBlock.mapping | 2 + .../net/minecraft/block/FlowerBlock.mapping | 2 + .../net/minecraft/block/PumpkinBlock.mapping | 2 + mappings/net/minecraft/block/TntBlock.mapping | 2 + .../block/entity/BeaconBlockEntity.mapping | 6 +++ .../client/gui/hud/BossBarHud.mapping | 1 + .../entity/ArmadilloEntityRenderer.mapping | 2 + .../entity/BreezeEntityRenderer.mapping | 3 ++ .../render/entity/EntityRenderer.mapping | 3 ++ .../animation/ArmadilloAnimations.mapping | 4 ++ .../feature/WolfArmorFeatureRenderer.mapping | 5 +++ .../entity/model/ArmadilloEntityModel.mapping | 14 ++++++ .../entity/model/BreezeEntityModel.mapping | 10 +++++ .../entity/model/WolfEntityModel.mapping | 1 + .../texture/StatusEffectSpriteManager.mapping | 1 + .../data/server/tag/TagProvider.mapping | 2 + .../datafixer/schema/Schema3799.mapping | 1 + .../entity/AreaEffectCloudEntity.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 15 +++++++ .../entity/EntityAttachmentType.mapping | 20 +++++++++ .../entity/EntityAttachments.mapping | 45 +++++++++++++++++++ .../minecraft/entity/EntityDimensions.mapping | 12 ++--- .../net/minecraft/entity/LivingEntity.mapping | 9 ++++ .../ArmadilloScareDetectedSensor.mapping | 19 ++++++++ .../ai/brain/task/StayAboveWaterTask.mapping | 2 + .../entity/ai/goal/GoalSelector.mapping | 1 + .../attribute/AttributeContainer.mapping | 8 ++++ .../DefaultAttributeContainer.mapping | 10 +++++ .../attribute/EntityAttributeInstance.mapping | 3 ++ .../entity/attribute/EntityAttributes.mapping | 3 +- .../entity/damage/DamageSources.mapping | 6 +++ .../entity/damage/DamageTypes.mapping | 2 + .../damage/OneTwentyOneDamageTypes.mapping | 3 ++ .../data/TrackedDataHandlerRegistry.mapping | 1 + .../decoration/ArmorStandEntity.mapping | 1 + .../entity/effect/StatusEffect.mapping | 8 ++++ .../effect/StatusEffectInstance.mapping | 12 +++++ .../entity/effect/StatusEffects.mapping | 2 + .../minecraft/entity/mob/BreezeBrain.mapping | 6 +++ .../minecraft/entity/mob/BreezeEntity.mapping | 1 + .../entity/mob/DrownedEntity.mapping | 1 + .../minecraft/entity/mob/MobEntity.mapping | 1 + .../passive/AbstractHorseEntity.mapping | 1 + .../entity/passive/ArmadilloBrain.mapping | 18 ++++++++ .../entity/passive/ArmadilloEntity.mapping | 32 +++++++++++++ .../entity/passive/SnifferEntity.mapping | 1 + .../entity/passive/WolfEntity.mapping | 7 +++ .../entity/player/PlayerEntity.mapping | 2 + .../PersistentProjectileEntity.mapping | 1 + .../projectile/thrown/PotionEntity.mapping | 1 + .../vehicle/AbstractMinecartEntity.mapping | 1 + .../minecraft/item/AnimalArmorItem.mapping | 20 +++++++++ .../net/minecraft/item/HorseArmorItem.mapping | 6 --- mappings/net/minecraft/item/ItemStack.mapping | 1 + .../function/SetPotionLootFunction.mapping | 1 + .../SetStewEffectLootFunction.mapping | 1 + .../c2s/play/UpdateBeaconC2SPacket.mapping | 4 -- .../play/EntityAttributesS2CPacket.mapping | 6 --- .../RemoveEntityStatusEffectS2CPacket.mapping | 4 -- mappings/net/minecraft/potion/Potion.mapping | 2 + .../net/minecraft/potion/PotionUtil.mapping | 3 ++ mappings/net/minecraft/potion/Potions.mapping | 2 + .../entity/EntityEffectPredicate.mapping | 2 + .../predicate/item/ItemPredicate.mapping | 1 + .../recipe/BrewingRecipeRegistry.mapping | 9 ++-- .../net/minecraft/registry/Registry.mapping | 2 + .../registry/entry/RegistryEntry.mapping | 5 +++ .../screen/BeaconScreenHandler.mapping | 1 + .../server/network/ServerPlayerEntity.mapping | 7 +++ .../net/minecraft/util/ActionResult.mapping | 10 ++--- .../minecraft/util/DateTimeFormatters.mapping | 2 + .../minecraft/util/ItemActionResult.mapping | 5 +++ .../net/minecraft/util/TimeHelper.mapping | 2 + .../net/minecraft/village/TradeOffers.mapping | 4 ++ .../minecraft/world/event/GameEvent.mapping | 4 +- .../minecraft/world/event/Vibrations.mapping | 5 +++ 77 files changed, 410 insertions(+), 40 deletions(-) create mode 100644 mappings/net/minecraft/client/render/entity/ArmadilloEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping create mode 100644 mappings/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/ArmadilloEntityModel.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema3799.mapping create mode 100644 mappings/net/minecraft/entity/EntityAttachmentType.mapping create mode 100644 mappings/net/minecraft/entity/EntityAttachments.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/sensor/ArmadilloScareDetectedSensor.mapping create mode 100644 mappings/net/minecraft/entity/damage/OneTwentyOneDamageTypes.mapping create mode 100644 mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping create mode 100644 mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping create mode 100644 mappings/net/minecraft/item/AnimalArmorItem.mapping delete mode 100644 mappings/net/minecraft/item/HorseArmorItem.mapping create mode 100644 mappings/net/minecraft/util/DateTimeFormatters.mapping create mode 100644 mappings/net/minecraft/util/ItemActionResult.mapping diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 8ff7a65557..51a10bf770 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -344,6 +344,20 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 5 stackMerger METHOD method_55224 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V ARG 2 stack + METHOD method_55765 onUseWithItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_9062; + ARG 1 stack + ARG 2 state + ARG 3 world + ARG 4 pos + ARG 5 player + ARG 6 hand + ARG 7 hit + METHOD method_55766 onUse (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; + ARG 1 state + ARG 2 world + ARG 3 pos + ARG 4 player + ARG 5 hit METHOD method_8389 asItem ()Lnet/minecraft/class_1792; COMMENT {@return the block's corresponding item} COMMENT @@ -1290,6 +1304,16 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 pos ARG 3 explosion ARG 4 stackMerger + METHOD method_55780 onUseWithItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_9062; + ARG 1 stack + ARG 2 world + ARG 3 player + ARG 4 hand + ARG 5 hit + METHOD method_55781 onUse (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; + ARG 1 world + ARG 2 player + ARG 3 hit CLASS class_3752 ShapeCache FIELD field_16555 lightSubtracted I FIELD field_16556 transparent Z diff --git a/mappings/net/minecraft/block/BeehiveBlock.mapping b/mappings/net/minecraft/block/BeehiveBlock.mapping index 079847d702..2f6c551b1a 100644 --- a/mappings/net/minecraft/block/BeehiveBlock.mapping +++ b/mappings/net/minecraft/block/BeehiveBlock.mapping @@ -39,3 +39,5 @@ CLASS net/minecraft/class_4481 net/minecraft/block/BeehiveBlock METHOD method_23894 hasBees (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos + METHOD method_55768 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V + ARG 1 playerx diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index 3c1a17f95a..242a3e68aa 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -7,9 +7,11 @@ CLASS net/minecraft/class_2356 net/minecraft/block/FlowerBlock ARG 1 stewEffects ARG 2 settings METHOD (Lnet/minecraft/class_6880;ILnet/minecraft/class_4970$class_2251;)V + ARG 1 effect ARG 2 duration ARG 3 settings METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;I)Ljava/util/List; + ARG 0 effect ARG 1 duration METHOD method_54016 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/block/PumpkinBlock.mapping b/mappings/net/minecraft/block/PumpkinBlock.mapping index 35e3e063f0..5bbd5f115d 100644 --- a/mappings/net/minecraft/block/PumpkinBlock.mapping +++ b/mappings/net/minecraft/block/PumpkinBlock.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_2445 net/minecraft/block/PumpkinBlock FIELD field_46419 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_55777 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V + ARG 1 playerx diff --git a/mappings/net/minecraft/block/TntBlock.mapping b/mappings/net/minecraft/block/TntBlock.mapping index ad7640a0b8..f855a5565f 100644 --- a/mappings/net/minecraft/block/TntBlock.mapping +++ b/mappings/net/minecraft/block/TntBlock.mapping @@ -8,3 +8,5 @@ CLASS net/minecraft/class_2530 net/minecraft/block/TntBlock METHOD method_10738 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 0 world ARG 1 pos + METHOD method_55778 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V + ARG 1 playerx diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index 1f1781fa95..977e25a50b 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -30,6 +30,8 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity ARG 0 world ARG 1 pos ARG 2 beaconLevel + ARG 3 primaryEffect + ARG 4 secondaryEffect METHOD method_16896 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2580;)V ARG 0 world ARG 1 pos @@ -41,12 +43,16 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity ARG 2 y ARG 3 z METHOD method_53251 getEffectOrNull (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; + ARG 0 effect METHOD method_53252 readStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 nbt ARG 1 key METHOD method_53253 writeStatusEffect (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_6880;)V ARG 0 nbt ARG 1 key + ARG 2 effect + METHOD method_55779 (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_5321;)V + ARG 2 entryKey CLASS class_2581 BeamSegment FIELD field_11804 height I FIELD field_11805 color [F diff --git a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping index 013b6b876a..12932a6c68 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_337 net/minecraft/client/gui/hud/BossBarHud METHOD method_1795 handlePacket (Lnet/minecraft/class_2629;)V ARG 1 packet METHOD method_1796 render (Lnet/minecraft/class_332;)V + ARG 1 context METHOD method_1797 shouldDarkenSky ()Z METHOD method_1798 shouldPlayDragonMusic ()Z METHOD method_1799 renderBossBar (Lnet/minecraft/class_332;IILnet/minecraft/class_1259;)V diff --git a/mappings/net/minecraft/client/render/entity/ArmadilloEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ArmadilloEntityRenderer.mapping new file mode 100644 index 0000000000..f8c7e1e21b --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/ArmadilloEntityRenderer.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9084 net/minecraft/client/render/entity/ArmadilloEntityRenderer + FIELD field_47887 TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping index bf6a5f25cf..5ee4da8c60 100644 --- a/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/BreezeEntityRenderer.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_8986 net/minecraft/client/render/entity/BreezeEntityRenderer FIELD field_47475 TEXTURE Lnet/minecraft/class_2960; + METHOD method_55830 updatePartVisibility (Lnet/minecraft/class_8973;[Lnet/minecraft/class_630;)Lnet/minecraft/class_8973; + ARG 0 model + ARG 1 modelParts diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index 3822579746..1cf758a0ff 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer ARG 3 matrices ARG 4 vertexConsumers ARG 5 light + ARG 6 tickDelta METHOD method_3931 getTexture (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2960; ARG 1 entity METHOD method_3932 getTextRenderer ()Lnet/minecraft/class_327; @@ -44,3 +45,5 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer ARG 4 matrices ARG 5 vertexConsumers ARG 6 light + METHOD method_55831 getShadowRadius (Lnet/minecraft/class_1297;)F + ARG 1 entity diff --git a/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping b/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping new file mode 100644 index 0000000000..c2f21afe0e --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/animation/ArmadilloAnimations.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_9079 net/minecraft/client/render/entity/animation/ArmadilloAnimations + FIELD field_47843 ROLLING Lnet/minecraft/class_7184; + FIELD field_47844 IDLE Lnet/minecraft/class_7184; + FIELD field_47845 SCARED Lnet/minecraft/class_7184; diff --git a/mappings/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.mapping new file mode 100644 index 0000000000..6915e7df96 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9085 net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer + FIELD field_47890 model Lnet/minecraft/class_624; + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;)V + ARG 1 context + ARG 2 loader diff --git a/mappings/net/minecraft/client/render/entity/model/ArmadilloEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ArmadilloEntityModel.mapping new file mode 100644 index 0000000000..775ed9aa80 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/ArmadilloEntityModel.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_9082 net/minecraft/client/render/entity/model/ArmadilloEntityModel + FIELD field_47864 HEAD_CUBE Ljava/lang/String; + FIELD field_47865 RIGHT_EAR_CUBE Ljava/lang/String; + FIELD field_47866 LEFT_EAR_CUBE Ljava/lang/String; + FIELD field_47867 root Lnet/minecraft/class_630; + FIELD field_47868 body Lnet/minecraft/class_630; + FIELD field_47869 rightHindLeg Lnet/minecraft/class_630; + FIELD field_47870 leftHindLeg Lnet/minecraft/class_630; + FIELD field_47871 cube Lnet/minecraft/class_630; + FIELD field_47872 head Lnet/minecraft/class_630; + FIELD field_47873 tail Lnet/minecraft/class_630; + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root + METHOD method_55818 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping index 6ddcb9d23c..8331ee16b1 100644 --- a/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BreezeEntityModel.mapping @@ -5,4 +5,14 @@ CLASS net/minecraft/class_8973 net/minecraft/client/render/entity/model/BreezeEn FIELD field_47438 windMid Lnet/minecraft/class_630; FIELD field_47439 windBottom Lnet/minecraft/class_630; FIELD field_47440 rods Lnet/minecraft/class_630; + FIELD field_47874 eyes Lnet/minecraft/class_630; + FIELD field_47875 windBody Lnet/minecraft/class_630; + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root METHOD method_55233 getTexturedModelData (II)Lnet/minecraft/class_5607; + ARG 0 textureWidth + ARG 1 textureHeight + METHOD method_55819 getHead ()Lnet/minecraft/class_630; + METHOD method_55820 getEyes ()Lnet/minecraft/class_630; + METHOD method_55821 getRods ()Lnet/minecraft/class_630; + METHOD method_55822 getWindBody ()Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping index f4ce02701f..3331667023 100644 --- a/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/WolfEntityModel.mapping @@ -20,3 +20,4 @@ CLASS net/minecraft/class_624 net/minecraft/client/render/entity/model/WolfEntit METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_32068 getTexturedModelData (Lnet/minecraft/class_5605;)Lnet/minecraft/class_5609; + ARG 0 dilation diff --git a/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping b/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping index 0eb80ead7b..05977a2a4f 100644 --- a/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping +++ b/mappings/net/minecraft/client/texture/StatusEffectSpriteManager.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_4074 net/minecraft/client/texture/StatusEffectSpriteMa METHOD (Lnet/minecraft/class_1060;)V ARG 1 textureManager METHOD method_18663 getSprite (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1058; + ARG 1 effect diff --git a/mappings/net/minecraft/data/server/tag/TagProvider.mapping b/mappings/net/minecraft/data/server/tag/TagProvider.mapping index 8443e5ceeb..daaf448999 100644 --- a/mappings/net/minecraft/data/server/tag/TagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/TagProvider.mapping @@ -60,6 +60,8 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/tag/TagProvider ARG 1 keys METHOD method_46835 add (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2474$class_5124; ARG 1 key + METHOD method_55842 add (Ljava/util/List;)Lnet/minecraft/class_2474$class_5124; + ARG 1 keys CLASS class_8210 RegistryInfo CLASS class_8211 TagLookup METHOD contains (Lnet/minecraft/class_6862;)Z diff --git a/mappings/net/minecraft/datafixer/schema/Schema3799.mapping b/mappings/net/minecraft/datafixer/schema/Schema3799.mapping new file mode 100644 index 0000000000..fac1190549 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema3799.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9061 net/minecraft/datafixer/schema/Schema3799 diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index d5c9cfaf51..8ca909b810 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -59,3 +59,4 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity ARG 1 effect METHOD method_5611 isWaiting ()Z METHOD method_5612 setPotion (Lnet/minecraft/class_6880;)V + ARG 1 potion diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index e97efdc5a5..d3153a3f80 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -148,6 +148,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_38931 trackedPosition Lnet/minecraft/class_7422; FIELD field_44784 supportingBlockPos Ljava/util/Optional; FIELD field_44873 forceUpdateSupportingBlockPos Z + FIELD field_47742 stateAtPos Lnet/minecraft/class_2680; FIELD field_5951 ridingCooldown I FIELD field_5952 onGround Z FIELD field_5953 firstUpdate Z @@ -992,6 +993,18 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_54756 (Lnet/minecraft/class_1297;)Z ARG 0 passenger METHOD method_54757 getPlayerPassengers ()I + METHOD method_55666 onDeflectProjectile (Lnet/minecraft/class_1676;)V + ARG 1 projectile + METHOD method_55667 getBlockStateAtPos ()Lnet/minecraft/class_2680; + COMMENT {@return the block state at the entity's position} + COMMENT + COMMENT

The result is cached. + COMMENT + COMMENT @see #getBlockPos + COMMENT @see #getLandingBlockState + COMMENT @see #getSteppingBlockState + METHOD method_55668 getVehicleAttachmentPos (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243; + ARG 1 vehicle METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V COMMENT Called when this entity's collision box intersects {@code state}. COMMENT @@ -2196,6 +2209,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT the player crosshair} METHOD method_5864 getType ()Lnet/minecraft/class_1299; METHOD method_5865 updatePassengerPosition (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297$class_4738;)V + ARG 1 passenger + ARG 2 positionUpdater METHOD method_5867 calculateNextStepSoundDistance ()F METHOD method_5869 isSubmergedInWater ()Z COMMENT {@return whether this entity's hitbox is fully submerged in water} diff --git a/mappings/net/minecraft/entity/EntityAttachmentType.mapping b/mappings/net/minecraft/entity/EntityAttachmentType.mapping new file mode 100644 index 0000000000..8647206a95 --- /dev/null +++ b/mappings/net/minecraft/entity/EntityAttachmentType.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_9064 net/minecraft/entity/EntityAttachmentType + FIELD field_47746 point Lnet/minecraft/class_9064$class_9065; + METHOD (Ljava/lang/String;ILnet/minecraft/class_9064$class_9065;)V + ARG 3 point + METHOD method_55670 createPoint (FF)Ljava/util/List; + ARG 1 width + ARG 2 height + CLASS class_9065 Point + FIELD field_47748 NONE Ljava/util/List; + FIELD field_47749 ZERO Lnet/minecraft/class_9064$class_9065; + FIELD field_47750 AT_HEIGHT Lnet/minecraft/class_9064$class_9065; + METHOD create (FF)Ljava/util/List; + ARG 1 width + ARG 2 height + METHOD method_55671 (FF)Ljava/util/List; + ARG 0 width + ARG 1 height + METHOD method_55672 (FF)Ljava/util/List; + ARG 0 width + ARG 1 height diff --git a/mappings/net/minecraft/entity/EntityAttachments.mapping b/mappings/net/minecraft/entity/EntityAttachments.mapping new file mode 100644 index 0000000000..11143e1979 --- /dev/null +++ b/mappings/net/minecraft/entity/EntityAttachments.mapping @@ -0,0 +1,45 @@ +CLASS net/minecraft/class_9066 net/minecraft/entity/EntityAttachments + FIELD field_47751 DEFAULT Lnet/minecraft/class_9066; + FIELD field_47752 points Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 points + METHOD method_55673 create ()Lnet/minecraft/class_9066$class_9067; + METHOD method_55674 scale (FFF)Lnet/minecraft/class_9066; + ARG 1 xScale + ARG 2 yScale + ARG 3 zScale + METHOD method_55675 getPointNullable (Lnet/minecraft/class_9064;IF)Lnet/minecraft/class_243; + ARG 1 type + ARG 2 index + ARG 3 yaw + METHOD method_55676 rotatePoint (Lnet/minecraft/class_243;F)Lnet/minecraft/class_243; + ARG 0 point + ARG 1 yaw + METHOD method_55677 scalePoints (Ljava/util/List;FFF)Ljava/util/List; + ARG 0 points + ARG 1 xScale + ARG 2 yScale + ARG 3 zScale + METHOD method_55678 getPoint (Lnet/minecraft/class_9064;IF)Lnet/minecraft/class_243; + ARG 1 type + ARG 2 index + ARG 3 yaw + METHOD method_55679 getPointOrDefault (Lnet/minecraft/class_9064;IF)Lnet/minecraft/class_243; + ARG 1 type + ARG 2 index + ARG 3 yaw + CLASS class_9067 Builder + FIELD field_47753 points Ljava/util/Map; + METHOD method_55680 build (FF)Lnet/minecraft/class_9066; + ARG 1 width + ARG 2 height + METHOD method_55681 (Lnet/minecraft/class_9064;)Ljava/util/List; + ARG 0 list + METHOD method_55682 add (Lnet/minecraft/class_9064;FFF)Lnet/minecraft/class_9066$class_9067; + ARG 1 type + ARG 2 x + ARG 3 y + ARG 4 z + METHOD method_55683 add (Lnet/minecraft/class_9064;Lnet/minecraft/class_243;)Lnet/minecraft/class_9066$class_9067; + ARG 1 type + ARG 2 point diff --git a/mappings/net/minecraft/entity/EntityDimensions.mapping b/mappings/net/minecraft/entity/EntityDimensions.mapping index 6a18c5c7e4..29b651b595 100644 --- a/mappings/net/minecraft/entity/EntityDimensions.mapping +++ b/mappings/net/minecraft/entity/EntityDimensions.mapping @@ -1,14 +1,8 @@ CLASS net/minecraft/class_4048 net/minecraft/entity/EntityDimensions - FIELD comp_2185 width F - FIELD comp_2186 height F - FIELD comp_2189 fixed Z METHOD (FFZ)V ARG 1 width ARG 2 height ARG 3 fixed - METHOD comp_2185 width ()F - METHOD comp_2186 height ()F - METHOD comp_2189 fixed ()Z METHOD method_18383 scaled (F)Lnet/minecraft/class_4048; ARG 1 ratio METHOD method_18384 changing (FF)Lnet/minecraft/class_4048; @@ -26,3 +20,9 @@ CLASS net/minecraft/class_4048 net/minecraft/entity/EntityDimensions ARG 5 z METHOD method_30757 getBoxAt (Lnet/minecraft/class_243;)Lnet/minecraft/class_238; ARG 1 pos + METHOD method_55684 withAttachments (Lnet/minecraft/class_9066$class_9067;)Lnet/minecraft/class_4048; + ARG 1 attachments + METHOD method_55685 withEyeHeight (F)Lnet/minecraft/class_4048; + ARG 1 eyeHeight + METHOD method_55686 getDefaultEyeHeight (F)F + ARG 0 height diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 5beff11a7f..f2ab78e31d 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -349,6 +349,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_52197 sendEffectToControllingPlayer (Lnet/minecraft/class_1293;)V ARG 1 effect METHOD method_52540 updateAttribute (Lnet/minecraft/class_6880;)V + ARG 1 attribute METHOD method_52541 getMaxAbsorption ()F METHOD method_52542 wouldNotSuffocateInPose (Lnet/minecraft/class_4050;)Z ARG 1 pose @@ -361,10 +362,14 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT @see net.minecraft.entity.mob.MobEntity#getAttackBox METHOD method_53964 getMaxRelativeHeadRotation ()F COMMENT {@return the maximum rotation of the head relative to the body in degrees} + METHOD method_55693 getScale ()F + METHOD method_55694 getBaseDimensions (Lnet/minecraft/class_4050;)Lnet/minecraft/class_4048; + ARG 1 pose METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; METHOD method_5996 getAttributeInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; + ARG 1 attribute METHOD method_5997 attackLivingEntity (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_5998 getStackInHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1799; @@ -404,6 +409,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT COMMENT @return whether the active status effects on this entity has been changed by COMMENT this call + ARG 1 effect METHOD method_6017 getSoundPitch ()F METHOD method_6019 setCurrentHand (Lnet/minecraft/class_1268;)V ARG 1 hand @@ -488,6 +494,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 entity METHOD method_6058 getActiveHand ()Lnet/minecraft/class_1268; METHOD method_6059 hasStatusEffect (Lnet/minecraft/class_6880;)Z + ARG 1 effect METHOD method_6060 knockback (Lnet/minecraft/class_1309;)V ARG 1 target METHOD method_6061 blockedByShield (Lnet/minecraft/class_1282;)Z @@ -604,7 +611,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT Under most circumstances, calling {@link #removeStatusEffect(StatusEffect)} is highly preferable. COMMENT COMMENT @return the status effect removed + ARG 1 effect METHOD method_6112 getStatusEffect (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1293; + ARG 1 effect METHOD method_6113 isSleeping ()Z METHOD method_6114 onAttacking (Lnet/minecraft/class_1297;)V ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/ArmadilloScareDetectedSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/ArmadilloScareDetectedSensor.mapping new file mode 100644 index 0000000000..ad75158d31 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/sensor/ArmadilloScareDetectedSensor.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_9068 net/minecraft/entity/ai/brain/sensor/ArmadilloScareDetectedSensor + FIELD field_47764 threateningEntityPredicate Ljava/util/function/BiPredicate; + FIELD field_47765 canRollUpPredicate Ljava/util/function/Predicate; + FIELD field_47766 memoryModuleType Lnet/minecraft/class_4140; + FIELD field_47767 expiry I + METHOD (ILjava/util/function/BiPredicate;Ljava/util/function/Predicate;Lnet/minecraft/class_4140;I)V + ARG 1 senseInterval + ARG 2 threateningEntityPredicate + ARG 3 canRollUpPredicate + ARG 4 memoryModuleType + ARG 5 expiry + METHOD method_55702 tryDetectThreat (Lnet/minecraft/class_1309;)V + ARG 1 entity + METHOD method_55703 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z + ARG 2 threat + METHOD method_55704 onDetected (Lnet/minecraft/class_1309;)V + ARG 1 entity + METHOD method_55705 clear (Lnet/minecraft/class_1309;)V + ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping index 61be4a0662..618714c791 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_4125 net/minecraft/entity/ai/brain/task/StayAboveWater FIELD field_18387 chance F METHOD (F)V ARG 1 chance + METHOD method_55700 isUnderwater (Lnet/minecraft/class_1308;)Z + ARG 0 entity diff --git a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping index 5fa269e39d..f5be407ece 100644 --- a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping +++ b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping @@ -44,3 +44,4 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector ARG 1 priority ARG 2 goal METHOD method_6280 remove (Lnet/minecraft/class_1352;)V + ARG 1 goal diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping index 3a6098a5c4..446e4e8fda 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping @@ -7,8 +7,10 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer ARG 1 defaultAttributes METHOD method_26841 getTracked ()Ljava/util/Set; METHOD method_26843 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V + ARG 1 attribute ARG 2 attributeModifier METHOD method_26844 (Lnet/minecraft/class_6880;Ljava/util/Collection;)V + ARG 1 attribute ARG 2 modifiers METHOD method_26845 updateTrackedStatus (Lnet/minecraft/class_1324;)V ARG 1 instance @@ -16,16 +18,20 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer ARG 1 other METHOD method_26847 removeModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers + METHOD method_26849 (Lnet/minecraft/class_2487;Lnet/minecraft/class_6880$class_6883;)V + ARG 2 attribute METHOD method_26850 readNbt (Lnet/minecraft/class_2499;)V ARG 1 nbt METHOD method_26851 getAttributesToSend ()Ljava/util/Collection; METHOD method_26852 getValue (Lnet/minecraft/class_6880;)D + ARG 1 attribute METHOD method_26853 (Lnet/minecraft/class_1324;)V ARG 1 attributeInstance METHOD method_26854 addTemporaryModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers METHOD method_26855 toNbt ()Lnet/minecraft/class_2499; METHOD method_26856 getBaseValue (Lnet/minecraft/class_6880;)D + ARG 1 attribute METHOD method_26857 (Lnet/minecraft/class_1324;)Z ARG 0 attribute METHOD method_45329 getCustomInstance (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; @@ -40,3 +46,5 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer ARG 2 uuid METHOD method_52547 (Lnet/minecraft/class_1324;Lnet/minecraft/class_1322;)V ARG 1 modifier + METHOD method_55698 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; + ARG 1 attribute diff --git a/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping index f58cfd4f48..7d72a06a51 100644 --- a/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping @@ -4,22 +4,32 @@ CLASS net/minecraft/class_5132 net/minecraft/entity/attribute/DefaultAttributeCo ARG 1 instances METHOD method_26861 builder ()Lnet/minecraft/class_5132$class_5133; METHOD method_26862 getValue (Lnet/minecraft/class_6880;)D + ARG 1 attribute METHOD method_26863 createOverride (Ljava/util/function/Consumer;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; ARG 1 updateCallback + ARG 2 attribute METHOD method_26864 getBaseValue (Lnet/minecraft/class_6880;)D + ARG 1 attribute METHOD method_26865 require (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; + ARG 1 attribute METHOD method_27308 getModifierValue (Lnet/minecraft/class_6880;Ljava/util/UUID;)D + ARG 1 attribute ARG 2 uuid METHOD method_27309 hasModifier (Lnet/minecraft/class_6880;Ljava/util/UUID;)Z + ARG 1 attribute ARG 2 uuid METHOD method_27310 has (Lnet/minecraft/class_6880;)Z + ARG 1 attribute CLASS class_5133 Builder FIELD field_23714 instances Lcom/google/common/collect/ImmutableMap$Builder; FIELD field_23715 unmodifiable Z METHOD method_26866 build ()Lnet/minecraft/class_5132; METHOD method_26867 add (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5132$class_5133; + ARG 1 attribute METHOD method_26868 add (Lnet/minecraft/class_6880;D)Lnet/minecraft/class_5132$class_5133; + ARG 1 attribute ARG 2 baseValue METHOD method_26869 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1324;)V ARG 2 attributex METHOD method_26870 checkedAdd (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1324; + ARG 1 attribute diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index debd4db198..1535d84e9a 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns FIELD field_23706 value D FIELD field_23707 updateCallback Ljava/util/function/Consumer; METHOD (Lnet/minecraft/class_6880;Ljava/util/function/Consumer;)V + ARG 1 type ARG 2 updateCallback METHOD method_26831 setFrom (Lnet/minecraft/class_1324;)V COMMENT Copies the values of an attribute to this attribute. @@ -42,6 +43,8 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns COMMENT METHOD method_27304 tryRemoveModifier (Ljava/util/UUID;)Z ARG 1 uuid + METHOD method_55696 updateModifier (Lnet/minecraft/class_1322;)V + ARG 1 modifier METHOD method_6192 setBaseValue (D)V ARG 1 baseValue METHOD method_6193 getModifiers (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Set; diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping index 165c190239..d3fc01d310 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributes.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_5134 net/minecraft/entity/attribute/EntityAttributes - FIELD field_45124 GENERIC_MAX_ABSORPTION Lnet/minecraft/class_6880; METHOD method_26871 register (Ljava/lang/String;Lnet/minecraft/class_1320;)Lnet/minecraft/class_6880; ARG 0 id ARG 1 attribute + METHOD method_55699 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + ARG 0 registry diff --git a/mappings/net/minecraft/entity/damage/DamageSources.mapping b/mappings/net/minecraft/entity/damage/DamageSources.mapping index 70a16d03dc..d9c7e7d495 100644 --- a/mappings/net/minecraft/entity/damage/DamageSources.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSources.mapping @@ -106,3 +106,9 @@ CLASS net/minecraft/class_8109 net/minecraft/entity/damage/DamageSources METHOD method_48837 stalagmite ()Lnet/minecraft/class_1282; METHOD method_51846 outsideBorder ()Lnet/minecraft/class_1282; METHOD method_51847 genericKill ()Lnet/minecraft/class_1282; + METHOD method_55647 spit (Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker + METHOD method_55648 windCharge (Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; + ARG 1 source + ARG 2 attacker diff --git a/mappings/net/minecraft/entity/damage/DamageTypes.mapping b/mappings/net/minecraft/entity/damage/DamageTypes.mapping index 8bed74a6a0..1aa5f727ee 100644 --- a/mappings/net/minecraft/entity/damage/DamageTypes.mapping +++ b/mappings/net/minecraft/entity/damage/DamageTypes.mapping @@ -43,5 +43,7 @@ CLASS net/minecraft/class_8111 net/minecraft/entity/damage/DamageTypes FIELD field_42360 MOB_ATTACK Lnet/minecraft/class_5321; FIELD field_44868 OUTSIDE_BORDER Lnet/minecraft/class_5321; FIELD field_44869 GENERIC_KILL Lnet/minecraft/class_5321; + FIELD field_47736 SPIT Lnet/minecraft/class_5321; + FIELD field_47737 WIND_CHARGE Lnet/minecraft/class_5321; METHOD method_48839 bootstrap (Lnet/minecraft/class_7891;)V ARG 0 damageTypeRegisterable diff --git a/mappings/net/minecraft/entity/damage/OneTwentyOneDamageTypes.mapping b/mappings/net/minecraft/entity/damage/OneTwentyOneDamageTypes.mapping new file mode 100644 index 0000000000..b129061944 --- /dev/null +++ b/mappings/net/minecraft/entity/damage/OneTwentyOneDamageTypes.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9086 net/minecraft/entity/damage/OneTwentyOneDamageTypes + METHOD method_55843 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 damageTypeRegisterable diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index 0159f58980..3968eaa137 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis FIELD field_42236 OPTIONAL_BLOCK_STATE Lnet/minecraft/class_2941; FIELD field_42237 VECTOR3F Lnet/minecraft/class_2941; FIELD field_42543 SNIFFER_STATE Lnet/minecraft/class_2941; + FIELD field_47707 ARMADILLO_STATE Lnet/minecraft/class_2941; METHOD method_12719 getId (Lnet/minecraft/class_2941;)I ARG 0 handler METHOD method_12720 register (Lnet/minecraft/class_2941;)V diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping index 97741d4fd7..3adf127ed1 100644 --- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping @@ -38,6 +38,7 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity METHOD method_18059 canClip ()Z METHOD method_31168 getDimensions (Z)Lnet/minecraft/class_4048; ARG 1 marker + METHOD method_55745 createArmorStandAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6898 spawnBreakParticles ()V METHOD method_6900 getRightLegRotation ()Lnet/minecraft/class_2379; METHOD method_6901 shouldHideBasePlate ()Z diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index 93eac25f51..737648267c 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -28,7 +28,13 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 3 target ARG 4 amplifier ARG 5 proximity + METHOD method_55650 (ILjava/util/function/BiConsumer;)V + ARG 1 amplifier + METHOD method_55651 (Ljava/util/function/BiConsumer;ILnet/minecraft/class_6880;Lnet/minecraft/class_1291$class_8634;)V + ARG 3 attribute + ARG 4 modifier METHOD method_5566 addAttributeModifier (Lnet/minecraft/class_6880;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)Lnet/minecraft/class_1291; + ARG 1 attribute ARG 2 uuid ARG 3 amount ARG 5 operation @@ -45,3 +51,5 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect METHOD comp_2183 baseValue ()D METHOD comp_2184 operation ()Lnet/minecraft/class_1322$class_1323; METHOD method_52522 createAttributeModifier (Ljava/lang/String;I)Lnet/minecraft/class_1322; + ARG 1 translationKey + ARG 2 amplifier diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index c630ddb5ec..ead3af89e9 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -22,23 +22,30 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_5897 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_1293;)V ARG 1 instance + METHOD (Lnet/minecraft/class_6880;)V + ARG 1 effect METHOD (Lnet/minecraft/class_6880;I)V + ARG 1 effect ARG 2 duration METHOD (Lnet/minecraft/class_6880;II)V + ARG 1 effect ARG 2 duration ARG 3 amplifier METHOD (Lnet/minecraft/class_6880;IIZZ)V + ARG 1 effect ARG 2 duration ARG 3 amplifier ARG 4 ambient ARG 5 visible METHOD (Lnet/minecraft/class_6880;IIZZZ)V + ARG 1 effect ARG 2 duration ARG 3 amplifier ARG 4 ambient ARG 5 showParticles ARG 6 showIcon METHOD (Lnet/minecraft/class_6880;IIZZZLnet/minecraft/class_1293;)V + ARG 1 effect ARG 2 duration ARG 3 amplifier ARG 4 ambient @@ -50,6 +57,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_24275 fromNbt (Lnet/minecraft/class_6880;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; + ARG 0 effect ARG 1 nbt METHOD method_24276 copyFrom (Lnet/minecraft/class_1293;)V ARG 1 that @@ -68,6 +76,10 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_48563 getDurationString ()Ljava/lang/String; METHOD method_52523 onApplied (Lnet/minecraft/class_1309;)V ARG 1 entity + METHOD method_55654 equals (Lnet/minecraft/class_6880;)Z + ARG 1 effect + METHOD method_55655 (Lnet/minecraft/class_2487;Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_1293; + ARG 1 effect METHOD method_5578 getAmplifier ()I METHOD method_5579 getEffectType ()Lnet/minecraft/class_6880; METHOD method_5581 shouldShowParticles ()Z diff --git a/mappings/net/minecraft/entity/effect/StatusEffects.mapping b/mappings/net/minecraft/entity/effect/StatusEffects.mapping index e920b53092..bc5343cd1d 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffects.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffects.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_1294 net/minecraft/entity/effect/StatusEffects FIELD field_38093 DARKNESS_PADDING_DURATION I + METHOD method_55664 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + ARG 0 registry METHOD method_5594 register (Ljava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_6880; ARG 0 id ARG 1 statusEffect diff --git a/mappings/net/minecraft/entity/mob/BreezeBrain.mapping b/mappings/net/minecraft/entity/mob/BreezeBrain.mapping index 1a2ae7b1da..8056be6161 100644 --- a/mappings/net/minecraft/entity/mob/BreezeBrain.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeBrain.mapping @@ -7,4 +7,10 @@ CLASS net/minecraft/class_8950 net/minecraft/entity/mob/BreezeBrain ARG 0 brain METHOD method_55019 addFightTasks (Lnet/minecraft/class_4095;)V ARG 0 brain + METHOD method_55748 updateActivities (Lnet/minecraft/class_8949;)V + ARG 0 breeze + METHOD method_55749 (Lnet/minecraft/class_8949;)Ljava/util/Optional; + ARG 0 breeze + METHOD method_55750 addIdleTasks (Lnet/minecraft/class_4095;)V + ARG 0 brain CLASS class_8951 SlideAroundTask diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping index 05004f229f..66035b4137 100644 --- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping @@ -13,3 +13,4 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity ARG 1 pos METHOD method_55014 createBreezeAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_55015 resetLongJumpingParticleAddCount ()Lnet/minecraft/class_8949; + METHOD method_55747 playWhirlSound ()V diff --git a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping index d35c5cea81..0ee47a342d 100644 --- a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping +++ b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_1551 net/minecraft/entity/mob/DrownedEntity ARG 2 spawnReason ARG 3 pos ARG 4 random + METHOD method_55746 createDrownedAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_7012 canDrownedAttackTarget (Lnet/minecraft/class_1309;)Z ARG 1 target METHOD method_7013 setTargetingUnderwater (Z)V diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index fef7d7c0eb..06b50dd3b8 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -152,6 +152,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity COMMENT Gets the area in which this mob can attack entities whose hitbox intersects it. COMMENT COMMENT @see LivingEntity#getHitbox + METHOD method_55695 stopMovement ()V METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F ARG 1 slot METHOD method_5930 setForwardSpeed (F)V diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index 2609eb7a2a..d5e3c0ac99 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -68,6 +68,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity METHOD method_49124 setChildAttribute (Lnet/minecraft/class_1296;Lnet/minecraft/class_1496;Lnet/minecraft/class_6880;DD)V ARG 1 other ARG 2 child + ARG 3 attribute ARG 4 min ARG 6 max METHOD method_49129 (I)I diff --git a/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping new file mode 100644 index 0000000000..20386e2644 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/ArmadilloBrain.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_9071 net/minecraft/entity/passive/ArmadilloBrain + FIELD field_47796 BREEDING_INGREDIENT Lnet/minecraft/class_1856; + FIELD field_47803 SENSOR_TYPES Lcom/google/common/collect/ImmutableList; + FIELD field_47804 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList; + METHOD method_55728 createBrainProfile ()Lnet/minecraft/class_4095$class_5303; + METHOD method_55729 (Lnet/minecraft/class_3218;Lnet/minecraft/class_9069;J)Z + ARG 1 armadillo + METHOD method_55731 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; + ARG 0 brain + METHOD method_55734 updateActivities (Lnet/minecraft/class_9069;)V + ARG 0 armadillo + METHOD method_55735 getBreedingIngredient ()Lnet/minecraft/class_1856; + METHOD method_55737 addCoreActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain + METHOD method_55738 addIdleActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain + METHOD method_55739 addPanicActivities (Lnet/minecraft/class_4095;)V + ARG 0 brain diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping new file mode 100644 index 0000000000..7ffbd491e8 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity + FIELD field_47780 scaredAnimationState Lnet/minecraft/class_7094; + FIELD field_47781 rollingAnimationState Lnet/minecraft/class_7094; + FIELD field_47785 STATE Lnet/minecraft/class_2940; + FIELD field_47786 currentStateTicks J + FIELD field_47787 nextScuteShedCooldown I + METHOD method_55711 isRolledUp ()Z + METHOD method_55712 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V + ARG 1 playerx + METHOD method_55713 setState (Lnet/minecraft/class_9069$class_9070;)V + ARG 1 state + METHOD method_55714 shouldSwitchToScaredState ()Z + METHOD method_55715 startRolling ()V + METHOD method_55716 brushScute ()V + METHOD method_55717 canRollUp ()Z + METHOD method_55718 getState ()Lnet/minecraft/class_9069$class_9070; + METHOD method_55719 getNextScuteShedCooldown ()I + METHOD method_55720 updateAnimationStates ()V + METHOD method_55721 isEntityThreatening (Lnet/minecraft/class_1309;)Z + ARG 1 entity + METHOD method_55722 createArmadilloAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_55723 isNotIdle ()Z + METHOD method_55724 unroll (Z)V + METHOD method_55725 setRolling (Z)V + ARG 1 rolling + CLASS class_9070 State + FIELD field_47793 name Ljava/lang/String; + FIELD field_47794 CODEC Lnet/minecraft/class_3542$class_7292; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_55727 fromName (Ljava/lang/String;)Lnet/minecraft/class_9069$class_9070; + ARG 0 name diff --git a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping index 7947c772cf..08206999af 100644 --- a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_8153 net/minecraft/entity/passive/SnifferEntity FIELD field_42655 risingAnimationState Lnet/minecraft/class_7094; FIELD field_42662 STATE Lnet/minecraft/class_2940; FIELD field_42663 FINISH_DIG_TIME Lnet/minecraft/class_2940; + FIELD field_44786 DIMENSIONS Lnet/minecraft/class_4048; METHOD method_49131 spawnDiggingParticles (Lnet/minecraft/class_7094;)Lnet/minecraft/class_8153; ARG 1 diggingAnimationState METHOD method_49132 startState (Lnet/minecraft/class_8153$class_8154;)Lnet/minecraft/class_8153; diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 974a67a616..54675ccb57 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity FIELD field_25373 ANGER_TIME Lnet/minecraft/class_2940; FIELD field_30386 WILD_MAX_HEALTH F FIELD field_30387 TAMED_MAX_HEALTH F + FIELD field_47776 WOLF_ARMOR_BONUS_MODIFIER_UUID Ljava/util/UUID; + FIELD field_47777 ARMORED Lnet/minecraft/class_2940; FIELD field_6944 furWet Z FIELD field_6945 lastShakeProgress F FIELD field_6946 BEGGING Lnet/minecraft/class_2940; @@ -23,6 +25,11 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity ARG 2 spawnReason ARG 3 pos ARG 4 random + METHOD method_55708 setArmored (Z)V + ARG 1 armored + METHOD method_55709 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V + ARG 1 playerx + METHOD method_55710 hasArmor ()Z METHOD method_6707 getFurWetBrightnessMultiplier (F)F COMMENT Returns this wolf's brightness multiplier based on the fur wetness. COMMENT

diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index ec44bdaa45..b29b057b7d 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -138,6 +138,8 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 0 c METHOD method_53968 isUsernameValid (Ljava/lang/String;)Z ARG 0 name + METHOD method_55754 getBlockInteractionRange ()D + METHOD method_55755 getEntityInteractionRange ()D METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7255 addExperience (I)V diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping index c4471b7982..e6aacfda8a 100644 --- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping @@ -45,6 +45,7 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject COMMENT returns a copy of that stack which can be safely changed. Additionally, COMMENT {@link #asItemStack} reflects changes to the entity data, such as custom potion ID. METHOD method_55052 deflect (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_7433 setNoClip (Z)V ARG 1 noClip METHOD method_7434 getEntityCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Lnet/minecraft/class_3966; diff --git a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping index e3518978a6..870d6612b6 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEnti ARG 0 entity METHOD method_7497 applyLingeringPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)V ARG 1 stack + ARG 2 potion METHOD method_7498 applySplashPotion (Ljava/util/List;Lnet/minecraft/class_1297;)V ARG 1 statusEffects ARG 2 entity diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index fe63b8ebeb..97f23d79cb 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti FIELD field_45139 clientYaw D FIELD field_45140 clientPitch D FIELD field_45141 clientVelocity Lnet/minecraft/class_243; + FIELD field_47822 VILLAGER_PASSENGER_ATTACHMENT_POS Lnet/minecraft/class_243; FIELD field_7660 yawFlipped Z FIELD field_7661 CUSTOM_BLOCK_OFFSET Lnet/minecraft/class_2940; FIELD field_7664 ADJACENT_RAIL_POSITIONS_BY_SHAPE Ljava/util/Map; diff --git a/mappings/net/minecraft/item/AnimalArmorItem.mapping b/mappings/net/minecraft/item/AnimalArmorItem.mapping new file mode 100644 index 0000000000..aa17f543c4 --- /dev/null +++ b/mappings/net/minecraft/item/AnimalArmorItem.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_4059 net/minecraft/item/AnimalArmorItem + FIELD field_18136 bonus I + FIELD field_47823 entityTexture Lnet/minecraft/class_2960; + FIELD field_47824 type Lnet/minecraft/class_4059$class_9076; + METHOD (ILnet/minecraft/class_4059$class_9076;Ljava/lang/String;Lnet/minecraft/class_1792$class_1793;)V + ARG 1 bonus + ARG 2 type + ARG 3 name + ARG 4 settings + METHOD method_18454 getEntityTexture ()Lnet/minecraft/class_2960; + METHOD method_18455 getBonus ()I + METHOD method_55756 getType ()Lnet/minecraft/class_4059$class_9076; + CLASS class_9076 Type + FIELD field_47827 textureIdFunction Ljava/util/function/Function; + METHOD (Ljava/lang/String;ILjava/util/function/Function;)V + ARG 3 textureIdFunction + METHOD method_55758 (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 0 name + METHOD method_55759 (Ljava/lang/String;)Lnet/minecraft/class_2960; + ARG 0 name diff --git a/mappings/net/minecraft/item/HorseArmorItem.mapping b/mappings/net/minecraft/item/HorseArmorItem.mapping deleted file mode 100644 index 56b8fd39ff..0000000000 --- a/mappings/net/minecraft/item/HorseArmorItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_4059 net/minecraft/item/HorseArmorItem - FIELD field_18136 bonus I - METHOD (ILnet/minecraft/class_4059$class_9076;Ljava/lang/String;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 bonus - METHOD method_18454 getEntityTexture ()Lnet/minecraft/class_2960; - METHOD method_18455 getBonus ()I diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 1f9f628a3a..92d1f94871 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -289,6 +289,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT Adds an attribute modifier to this stack. COMMENT COMMENT @see #getAttributeModifiers + ARG 1 attribute ARG 2 modifier ARG 3 slot METHOD method_7917 inventoryTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;IZ)V diff --git a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping index 17cc5c53f0..87cd1515b0 100644 --- a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_6662 net/minecraft/loot/function/SetPotionLootFunction ARG 1 conditions ARG 2 potion METHOD method_38927 builder (Lnet/minecraft/class_6880;)Lnet/minecraft/class_120$class_121; + ARG 0 potion METHOD method_38928 (Lnet/minecraft/class_6880;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_53393 (Lnet/minecraft/class_6662;)Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping index 0c2a6828c2..9167098501 100644 --- a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_152 net/minecraft/loot/function/SetStewEffectLootFunct CLASS class_153 Builder FIELD field_1123 map Lcom/google/common/collect/ImmutableList$Builder; METHOD method_640 withEffect (Lnet/minecraft/class_6880;Lnet/minecraft/class_5658;)Lnet/minecraft/class_152$class_153; + ARG 1 effect ARG 2 durationRange CLASS class_8754 StewEffect FIELD field_45854 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index 7a690bff13..9ebb62044f 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -1,13 +1,9 @@ CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket - FIELD comp_2180 primaryEffectId Ljava/util/Optional; - FIELD comp_2181 secondaryEffectId Ljava/util/Optional; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 primaryEffectId ARG 2 secondaryEffectId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD comp_2180 primaryEffectId ()Ljava/util/Optional; - METHOD comp_2181 secondaryEffectId ()Ljava/util/Optional; METHOD method_43364 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6880;)V ARG 0 buf2 METHOD method_43365 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping index 93a3a6d8c6..a13f587337 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping @@ -19,12 +19,6 @@ CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttri METHOD method_34202 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1322; ARG 0 modifiers CLASS class_2782 Entry - FIELD comp_2177 attribute Lnet/minecraft/class_6880; - FIELD comp_2178 baseValue D - FIELD comp_2179 modifiers Ljava/util/Collection; METHOD (Lnet/minecraft/class_6880;DLjava/util/Collection;)V ARG 2 baseValue ARG 4 modifiers - METHOD comp_2177 attribute ()Lnet/minecraft/class_6880; - METHOD comp_2178 baseValue ()D - METHOD comp_2179 modifiers ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping index 26aca9e7f4..88c9d03c92 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping @@ -1,11 +1,7 @@ CLASS net/minecraft/class_2718 net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket - FIELD comp_2175 entityId I - FIELD comp_2176 effectType Lnet/minecraft/class_6880; METHOD (ILnet/minecraft/class_6880;)V ARG 1 entityId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD comp_2175 entityId ()I - METHOD comp_2176 effectType ()Lnet/minecraft/class_6880; METHOD method_11767 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping index 252c176785..e23aa8ca58 100644 --- a/mappings/net/minecraft/potion/Potion.mapping +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion METHOD method_8049 getEffects ()Ljava/util/List; METHOD method_8050 hasInstantEffect ()Z METHOD method_8051 finishTranslationKey (Lnet/minecraft/class_6880;Ljava/lang/String;)Ljava/lang/String; + ARG 0 potion + ARG 1 prefix diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index 0747c29bef..3d0343b1f4 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -20,12 +20,15 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil ARG 0 nbt ARG 1 list METHOD method_8059 getPotionEffects (Lnet/minecraft/class_6880;Ljava/util/Collection;)Ljava/util/List; + ARG 0 potion ARG 1 custom METHOD method_8060 getCustomPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; ARG 0 nbt METHOD method_8061 setPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; ARG 0 stack + ARG 1 potion METHOD method_8062 getColor (Lnet/minecraft/class_6880;)I + ARG 0 potion METHOD method_8063 getPotion (Lnet/minecraft/class_1799;)Lnet/minecraft/class_6880; ARG 0 stack METHOD method_8064 getColor (Lnet/minecraft/class_1799;)I diff --git a/mappings/net/minecraft/potion/Potions.mapping b/mappings/net/minecraft/potion/Potions.mapping index 47270cc0b7..aa576b03ec 100644 --- a/mappings/net/minecraft/potion/Potions.mapping +++ b/mappings/net/minecraft/potion/Potions.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_1847 net/minecraft/potion/Potions METHOD method_48962 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1842;)Lnet/minecraft/class_6880; ARG 0 key ARG 1 potion + METHOD method_55763 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + ARG 0 registry METHOD method_8084 register (Ljava/lang/String;Lnet/minecraft/class_1842;)Lnet/minecraft/class_6880; ARG 0 name ARG 1 potion diff --git a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping index f627b6c58a..379336d05b 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_2102 net/minecraft/predicate/entity/EntityEffectPredic FIELD field_45765 EFFECTS Lcom/google/common/collect/ImmutableMap$Builder; METHOD method_53200 create ()Lnet/minecraft/class_2102$class_8748; METHOD method_53201 addEffect (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2102$class_8748; + ARG 1 effect METHOD method_53202 addEffect (Lnet/minecraft/class_6880;Lnet/minecraft/class_2102$class_2103;)Lnet/minecraft/class_2102$class_8748; + ARG 1 effect ARG 2 effectData METHOD method_53203 build ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index 3c1d81c4e5..dd123aefbe 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate METHOD method_20399 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2073$class_2074; ARG 1 nbt METHOD method_35232 potion (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2073$class_2074; + ARG 1 potion METHOD method_35233 count (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2073$class_2074; ARG 1 count METHOD method_35234 storedEnchantment (Lnet/minecraft/class_2035;)Lnet/minecraft/class_2073$class_2074; diff --git a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping index 6f8d05c1a3..9aaeed313d 100644 --- a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping +++ b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry FIELD field_8958 POTION_TYPE_PREDICATE Ljava/util/function/Predicate; FIELD field_8959 ITEM_RECIPES Ljava/util/List; METHOD method_20361 isBrewable (Lnet/minecraft/class_6880;)Z + ARG 0 potion METHOD method_8069 isPotionRecipeIngredient (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_8070 hasItemRecipe (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z @@ -19,7 +20,9 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry METHOD method_8073 (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_8074 registerPotionRecipe (Lnet/minecraft/class_6880;Lnet/minecraft/class_1792;Lnet/minecraft/class_6880;)V + ARG 0 input ARG 1 item + ARG 2 output METHOD method_8075 hasPotionRecipe (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 0 input ARG 1 ingredient @@ -34,11 +37,5 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry METHOD method_8080 registerPotionType (Lnet/minecraft/class_1792;)V ARG 0 item CLASS class_1846 Recipe - FIELD comp_2190 input Lnet/minecraft/class_6880; - FIELD comp_2191 ingredient Lnet/minecraft/class_1856; - FIELD comp_2192 output Lnet/minecraft/class_6880; METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_1856;Lnet/minecraft/class_6880;)V ARG 2 ingredient - METHOD comp_2190 input ()Lnet/minecraft/class_6880; - METHOD comp_2191 ingredient ()Lnet/minecraft/class_1856; - METHOD comp_2192 output ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping index dbb082f7d1..a9a0a64c77 100644 --- a/mappings/net/minecraft/registry/Registry.mapping +++ b/mappings/net/minecraft/registry/Registry.mapping @@ -282,6 +282,8 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry ARG 0 registry ARG 1 id ARG 2 entry + METHOD method_55841 getEntry (Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 id CLASS 1 METHOD method_46773 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880; ARG 0 entry diff --git a/mappings/net/minecraft/registry/entry/RegistryEntry.mapping b/mappings/net/minecraft/registry/entry/RegistryEntry.mapping index 4ed407dc7f..d3f5cbee50 100644 --- a/mappings/net/minecraft/registry/entry/RegistryEntry.mapping +++ b/mappings/net/minecraft/registry/entry/RegistryEntry.mapping @@ -59,6 +59,11 @@ CLASS net/minecraft/class_6880 net/minecraft/registry/entry/RegistryEntry COMMENT stand-alone or intrusive. METHOD method_46745 ownerEquals (Lnet/minecraft/class_7876;)Z ARG 1 owner + METHOD method_55838 matches (Lnet/minecraft/class_6880;)Z + ARG 1 entry + METHOD method_55839 (Lnet/minecraft/class_5321;)Ljava/lang/String; + ARG 0 key + METHOD method_55840 getIdAsString ()Ljava/lang/String; CLASS class_6881 Direct COMMENT A direct registry entry holds the value directly. The value does not have to be COMMENT registered in a registry. Therefore, they receive no ID or registry key, and they diff --git a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping index 3cf8608cfe..c4884bc1fb 100644 --- a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler METHOD method_17375 getSecondaryEffect ()Lnet/minecraft/class_6880; METHOD method_17376 hasPayment ()Z METHOD method_53173 getRawIdForStatusEffect (Lnet/minecraft/class_6880;)I + ARG 0 effect METHOD method_53174 getStatusEffectForRawId (I)Lnet/minecraft/class_6880; ARG 0 id CLASS class_1705 PaymentSlot diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index e6eb8dd069..27b063cd0c 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -52,6 +52,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_44990 viewDistance I FIELD field_44991 chunkFilter Lnet/minecraft/class_8603; FIELD field_46156 language Ljava/lang/String; + FIELD field_47709 CREATIVE_BLOCK_INTERACTION_RANGE_MODIFIER_UUID Lnet/minecraft/class_1322; + FIELD field_47710 CREATIVE_ENTITY_INTERACTION_RANGE_MODIFIER_UUID Lnet/minecraft/class_1322; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_8791;)V ARG 1 server ARG 2 world @@ -261,6 +263,11 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 4 deltaZ METHOD method_54934 (Lnet/minecraft/class_2960;)Ljava/util/stream/Stream; ARG 1 recipe + METHOD method_55631 isBoxInEntityInteractionRange (Lnet/minecraft/class_238;)Z + ARG 1 box + METHOD method_55632 isPosInBlockInteractionRange (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_55633 updateCreativeInteractionRangeModifiers ()V METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z ARG 1 gameMode CLASS 1 diff --git a/mappings/net/minecraft/util/ActionResult.mapping b/mappings/net/minecraft/util/ActionResult.mapping index cbabb2a9f7..459b95b792 100644 --- a/mappings/net/minecraft/util/ActionResult.mapping +++ b/mappings/net/minecraft/util/ActionResult.mapping @@ -3,19 +3,19 @@ CLASS net/minecraft/class_1269 net/minecraft/util/ActionResult COMMENT such as {@link net.minecraft.block.AbstractBlock#onUse}, return this. COMMENT COMMENT @see TypedActionResult - FIELD field_21466 CONSUME Lnet/minecraft/class_1269; + FIELD field_21466 Lnet/minecraft/class_1269; COMMENT Indicates an action is performed but no animation should accompany the COMMENT performance. - FIELD field_33562 CONSUME_PARTIAL Lnet/minecraft/class_1269; + FIELD field_33562 Lnet/minecraft/class_1269; COMMENT Indicates an action is performed but no animation should accompany the COMMENT performance and no statistic should be incremented. - FIELD field_5811 PASS Lnet/minecraft/class_1269; + FIELD field_5811 Lnet/minecraft/class_1269; COMMENT Indicates an action is not performed but allows other actions to COMMENT perform. - FIELD field_5812 SUCCESS Lnet/minecraft/class_1269; + FIELD field_5812 Lnet/minecraft/class_1269; COMMENT Indicates an action is performed and the actor's hand should swing to COMMENT indicate the performance. - FIELD field_5814 FAIL Lnet/minecraft/class_1269; + FIELD field_5814 Lnet/minecraft/class_1269; COMMENT Indicates that an action is not performed and prevents other actions COMMENT from performing. METHOD method_23665 isAccepted ()Z diff --git a/mappings/net/minecraft/util/DateTimeFormatters.mapping b/mappings/net/minecraft/util/DateTimeFormatters.mapping new file mode 100644 index 0000000000..ee4466c077 --- /dev/null +++ b/mappings/net/minecraft/util/DateTimeFormatters.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9078 net/minecraft/util/DateTimeFormatters + METHOD method_55786 create ()Ljava/time/format/DateTimeFormatter; diff --git a/mappings/net/minecraft/util/ItemActionResult.mapping b/mappings/net/minecraft/util/ItemActionResult.mapping new file mode 100644 index 0000000000..76f061f96e --- /dev/null +++ b/mappings/net/minecraft/util/ItemActionResult.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9062 net/minecraft/util/ItemActionResult + METHOD method_55643 isAccepted ()Z + METHOD method_55644 success (Z)Lnet/minecraft/class_9062; + ARG 0 swingHand + METHOD method_55645 toActionResult ()Lnet/minecraft/class_1269; diff --git a/mappings/net/minecraft/util/TimeHelper.mapping b/mappings/net/minecraft/util/TimeHelper.mapping index 14b9b6d781..f694b62fb8 100644 --- a/mappings/net/minecraft/util/TimeHelper.mapping +++ b/mappings/net/minecraft/util/TimeHelper.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_4802 net/minecraft/util/TimeHelper COMMENT The equivalent of 1 second, in milliseconds. Is {@code 1000}. FIELD field_46958 HOUR_IN_SECONDS J COMMENT The equivalent of 1 hour, in seconds. Is {@code 3600}. + FIELD field_47726 MINUTE_IN_SECONDS I + COMMENT The equivalent of 1 minute, in seconds. Is {@code 60}. METHOD method_24505 betweenSeconds (II)Lnet/minecraft/class_6019; COMMENT {@return an int provider that provides a time in ticks, between {@code min * 20} and COMMENT {@code max * 20} (both inclusive)} diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 6a0f51eb0e..c9fd8c500b 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -32,6 +32,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers METHOD method_52552 createLibrarianTradeFactory (I)Lnet/minecraft/class_3853$class_1652; ARG 0 experience METHOD method_52553 createPotionStack (Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799; + ARG 0 potion METHOD method_53832 enchant (Lnet/minecraft/class_1792;Lnet/minecraft/class_1887;I)Lnet/minecraft/class_1799; ARG 0 item ARG 1 enchantment @@ -218,6 +219,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 2 experience ARG 3 multiplier METHOD (Lnet/minecraft/class_6880;II)V + ARG 1 effect ARG 2 duration ARG 3 experience CLASS class_4167 SellPotionHoldingItemFactory @@ -237,6 +239,8 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 5 price ARG 6 maxUses ARG 7 experience + METHOD method_19203 (Lnet/minecraft/class_6880$class_6883;)Z + ARG 0 potion CLASS class_8640 TypedWrapperFactory FIELD comp_1962 typeToFactory Ljava/util/Map; METHOD comp_1962 typeToFactory ()Ljava/util/Map; diff --git a/mappings/net/minecraft/world/event/GameEvent.mapping b/mappings/net/minecraft/world/event/GameEvent.mapping index 59e32a24ff..3f3ded6c81 100644 --- a/mappings/net/minecraft/world/event/GameEvent.mapping +++ b/mappings/net/minecraft/world/event/GameEvent.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent - FIELD comp_2193 range I FIELD field_31449 DEFAULT_RANGE I METHOD (I)V ARG 1 range - METHOD comp_2193 range ()I METHOD method_32939 register (Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883; ARG 0 id METHOD method_32940 register (Ljava/lang/String;I)Lnet/minecraft/class_6880$class_6883; ARG 0 id ARG 1 range + METHOD method_55782 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; + ARG 0 registry CLASS class_7397 Emitter METHOD method_43285 of (Lnet/minecraft/class_1297;)Lnet/minecraft/class_5712$class_7397; ARG 0 sourceEntity diff --git a/mappings/net/minecraft/world/event/Vibrations.mapping b/mappings/net/minecraft/world/event/Vibrations.mapping index 0944f46130..0a608ffd9a 100644 --- a/mappings/net/minecraft/world/event/Vibrations.mapping +++ b/mappings/net/minecraft/world/event/Vibrations.mapping @@ -3,12 +3,17 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations FIELD field_44639 FREQUENCIES Ljava/util/function/ToIntFunction; METHOD method_51298 getVibrationListenerData ()Lnet/minecraft/class_8514$class_8515; METHOD method_51299 getVibrationCallback ()Lnet/minecraft/class_8514$class_5719; + METHOD method_51383 (Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;)V + ARG 0 frequencies METHOD method_51384 getSignalStrength (FI)I ARG 0 distance ARG 1 range METHOD method_51385 getFrequency (Lnet/minecraft/class_5321;)I + ARG 0 gameEvent METHOD method_51386 getResonation (I)Lnet/minecraft/class_5321; ARG 0 frequency + METHOD method_55783 getFrequencyOrZero (Lnet/minecraft/class_6880;)I + ARG 0 gameEvent CLASS class_5719 Callback METHOD method_32969 accept (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;F)V COMMENT Accepts a game event after delay.