diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index 83b6b05f79..16ea9e7da2 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -61,6 +61,8 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock ARG 1 respawnDirection METHOD method_53978 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_55767 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1657$class_1658;)V + ARG 1 reason METHOD method_9484 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;F)Ljava/util/Optional; ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/block/CandleCakeBlock.mapping b/mappings/net/minecraft/block/CandleCakeBlock.mapping index 033f418616..1408673a9a 100644 --- a/mappings/net/minecraft/block/CandleCakeBlock.mapping +++ b/mappings/net/minecraft/block/CandleCakeBlock.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_5545 net/minecraft/block/CandleCakeBlock ARG 1 candle ARG 2 settings METHOD method_31632 getCandleCakeFromCandle (Lnet/minecraft/class_5544;)Lnet/minecraft/class_2680; + ARG 0 candle METHOD method_31633 (Lnet/minecraft/class_2680;Lnet/minecraft/class_4970$class_4971;)Z ARG 1 statex METHOD method_31634 isHittingCandle (Lnet/minecraft/class_3965;)Z diff --git a/mappings/net/minecraft/block/Fertilizable.mapping b/mappings/net/minecraft/block/Fertilizable.mapping index ba980fe9d4..0fc2cbdefd 100644 --- a/mappings/net/minecraft/block/Fertilizable.mapping +++ b/mappings/net/minecraft/block/Fertilizable.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_2256 net/minecraft/block/Fertilizable + METHOD method_55769 getBoneMealParticlePos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + ARG 1 pos + METHOD method_55770 getFertilizationType ()Lnet/minecraft/class_2256$class_9077; METHOD method_9650 canGrow (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 random @@ -13,3 +16,4 @@ CLASS net/minecraft/class_2256 net/minecraft/block/Fertilizable ARG 2 random ARG 3 pos ARG 4 state + CLASS class_9077 FertilizationType diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index 242a3e68aa..2722fdfba0 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -7,7 +7,7 @@ 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 1 stewEffect ARG 2 duration ARG 3 settings METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;I)Ljava/util/List; diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping index b69d5487d3..11ae5e679a 100644 --- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping +++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping @@ -73,8 +73,8 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior METHOD interact (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)Lnet/minecraft/class_9062; COMMENT Called when a player interacts with a cauldron. COMMENT - COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result if this behavior succeeds, - COMMENT {@link ActionResult#PASS} otherwise + COMMENT @return a {@linkplain ItemActionResult#isAccepted successful} action result if this behavior succeeds, + COMMENT {@link ItemActionResult#PASS_TO_DEFAULT_BLOCK_INTERACTION} otherwise ARG 1 state COMMENT the current cauldron block state ARG 2 world @@ -92,7 +92,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT corresponding cauldron behaviors. COMMENT COMMENT

The default return value in the map is a cauldron behavior - COMMENT that returns {@link ActionResult#PASS} for all items. + COMMENT that returns {@link ItemActionResult#PASS_TO_DEFAULT_BLOCK_INTERACTION} for all items. COMMENT COMMENT @return the created map ARG 0 name @@ -102,7 +102,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior COMMENT

The filled bucket stack will be replaced by an empty bucket in the player's COMMENT inventory. COMMENT - COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result + COMMENT @return a {@linkplain ItemActionResult#isAccepted successful} action result ARG 0 world COMMENT the world where the cauldron is located ARG 1 pos @@ -129,7 +129,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior METHOD method_32210 emptyCauldron (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_9062; COMMENT Empties a cauldron if it's full. COMMENT - COMMENT @return a {@linkplain ActionResult#isAccepted successful} action result if emptied, {@link ActionResult#PASS} otherwise + COMMENT @return a {@linkplain ItemActionResult#isAccepted successful} action result if emptied, {@link ItemActionResult#ASS_TO_DEFAULT_BLOCK_INTERACTION} otherwise ARG 0 state COMMENT the cauldron block state ARG 1 world diff --git a/mappings/net/minecraft/client/Mouse.mapping b/mappings/net/minecraft/client/Mouse.mapping index b1b6763225..5068a91464 100644 --- a/mappings/net/minecraft/client/Mouse.mapping +++ b/mappings/net/minecraft/client/Mouse.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse FIELD field_1795 x D FIELD field_45296 eventDeltaHorizontalWheel D FIELD field_45297 eventDeltaVerticalWheel D + FIELD field_47842 lastTickTime D METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1598 onMouseScroll (JDD)V @@ -39,6 +40,7 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse METHOD method_1603 getX ()D METHOD method_1604 getY ()D METHOD method_1606 updateMouse (D)V + ARG 1 timeDelta METHOD method_1607 setup (J)V ARG 1 window METHOD method_1608 wasLeftButtonClicked ()Z @@ -68,3 +70,4 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse ARG 3 paths METHOD method_30134 setResolutionChanged ()V METHOD method_35707 wasMiddleButtonClicked ()Z + METHOD method_55793 tick ()V diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 3723da8798..affd2441d5 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 2 currentTick ARG 3 mouseX ARG 4 mouseY + ARG 5 chatFocused METHOD method_1806 getWidth (D)I ARG 0 widthOption METHOD method_1808 clear (Z)V diff --git a/mappings/net/minecraft/client/gui/hud/Huds.mapping b/mappings/net/minecraft/client/gui/hud/Huds.mapping new file mode 100644 index 0000000000..ea9e39bc05 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/Huds.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_9080 net/minecraft/client/gui/hud/Huds + FIELD field_47849 renderers Ljava/util/List; + METHOD method_55809 render (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55810 add (Lnet/minecraft/class_9080$class_9081;)Lnet/minecraft/class_9080; + ARG 1 renderer + METHOD method_55811 add (Lnet/minecraft/class_9080;Ljava/util/function/BooleanSupplier;)Lnet/minecraft/class_9080; + ARG 1 huds + ARG 2 renderCondition + METHOD method_55812 (Ljava/util/function/BooleanSupplier;Lnet/minecraft/class_9080;Lnet/minecraft/class_332;F)V + ARG 2 context + ARG 3 tickDelta + METHOD method_55813 renderInternal (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + CLASS class_9081 HudRenderer + METHOD render (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 6230d4918e..515f9b157e 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -72,6 +72,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_45327 FOOD_EMPTY_TEXTURE Lnet/minecraft/class_2960; FIELD field_45328 FOOD_HALF_TEXTURE Lnet/minecraft/class_2960; FIELD field_47550 SCOREBOARD_ENTRY_COMPARATOR Ljava/util/Comparator; + FIELD field_47847 huds Lnet/minecraft/class_9080; METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V @@ -86,6 +87,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 2 entity METHOD method_1736 renderCrosshair (Lnet/minecraft/class_332;F)V ARG 1 context + ARG 2 tickDelta METHOD method_1737 getCameraPlayer ()Lnet/minecraft/class_1657; METHOD method_1738 getTicks ()I METHOD method_1739 getSpectatorHud ()Lnet/minecraft/class_365; @@ -127,6 +129,8 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 message ARG 2 tinted METHOD method_1759 renderHotbar (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta METHOD method_1760 renderStatusBars (Lnet/minecraft/class_332;)V COMMENT Renders the armor, health, air, and hunger bars. ARG 1 context @@ -140,8 +144,10 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 7 seed METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_332;F)V ARG 1 context + ARG 2 tickDelta METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_332;F)V ARG 1 context + ARG 2 tickDelta METHOD method_19346 drawTextBackground (Lnet/minecraft/class_332;Lnet/minecraft/class_327;III)V ARG 1 context ARG 2 textRenderer @@ -188,6 +194,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 paused METHOD method_39192 renderAutosaveIndicator (Lnet/minecraft/class_332;F)V ARG 1 context + ARG 2 tickDelta METHOD method_39193 tickAutosaveIndicator ()V METHOD method_44353 shouldShowChatDisabledScreen ()Z METHOD method_44354 setCanShowChatDisabledScreen (Z)V @@ -197,6 +204,30 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 3 scoreboardEntry METHOD method_55441 (I)[Lnet/minecraft/class_329$class_9016; ARG 0 size + METHOD method_55798 renderOverlays (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55799 renderSleepOverlay (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55800 renderOverlayMessage (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55801 renderTitleAndSubtitle (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55802 renderChat (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55803 renderScoreboardSidebar (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55804 renderPlayerList (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta + METHOD method_55805 renderHotbarArea (Lnet/minecraft/class_332;F)V + ARG 1 context + ARG 2 tickDelta CLASS class_6411 HeartType FIELD field_33946 POISONED Lnet/minecraft/class_329$class_6411; FIELD field_45329 fullTexture Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index b381a8bd18..415380a9be 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen FIELD field_32272 DEMO_WORLD_NAME Ljava/lang/String; FIELD field_37209 deprecationNotice Lnet/minecraft/class_442$class_7063; FIELD field_41847 logoDrawer Lnet/minecraft/class_8020; + FIELD field_47850 TITLE Lnet/minecraft/class_2561; METHOD (Z)V ARG 1 doBackgroundFade METHOD (ZLnet/minecraft/class_8020;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index 59a7f4e041..bd6b7c3f16 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -36,10 +36,13 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_6880;ZI)V ARG 2 x ARG 3 y + ARG 4 effect ARG 5 primary ARG 6 level METHOD method_37081 init (Lnet/minecraft/class_6880;)V + ARG 1 effect METHOD method_37082 getEffectName (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5250; + ARG 1 effect CLASS class_470 BaseButtonWidget FIELD field_2815 disabled Z METHOD (II)V @@ -68,3 +71,4 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_6880;)V ARG 2 x ARG 3 y + ARG 4 effect diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 447a8392f0..d4a4ba7eb7 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -70,6 +70,9 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi FIELD field_19123 icon Lnet/minecraft/class_8573; FIELD field_19124 time J FIELD field_42874 favicon [B + FIELD field_47855 playerListSummary Ljava/util/List; + FIELD field_47856 texture Lnet/minecraft/class_2960; + FIELD field_47857 tooltip Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4267;Lnet/minecraft/class_500;Lnet/minecraft/class_642;)V ARG 2 screen ARG 3 server @@ -86,3 +89,4 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD method_29978 saveFile ()V METHOD method_49300 uploadFavicon ([B)Z ARG 1 bytes + METHOD method_55815 update ()V diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 4fd20c9e97..10eea89241 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -32,6 +32,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_45947 displayedUnsecureChatWarning Z FIELD field_46187 worldCleared Z FIELD field_46578 worldLoadingState Lnet/minecraft/class_8819; + FIELD field_47878 scoreboard Lnet/minecraft/class_269; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V ARG 1 client METHOD method_16690 getSessionId ()Ljava/util/UUID; @@ -136,3 +137,4 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 1 player ARG 2 world METHOD method_54134 clearWorld ()V + METHOD method_55823 getScoreboard ()Lnet/minecraft/class_269; diff --git a/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping index 93e83cbb4d..12da7fc575 100644 --- a/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping +++ b/mappings/net/minecraft/client/network/MultiplayerServerListPinger.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_644 net/minecraft/client/network/MultiplayerServerList METHOD method_3003 add (Lnet/minecraft/class_642;Ljava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 entry ARG 2 saver + ARG 3 pingCallback METHOD method_3004 cancel ()V METHOD method_36897 showError (Lnet/minecraft/class_2561;Lnet/minecraft/class_642;)V ARG 1 error diff --git a/mappings/net/minecraft/client/network/ServerInfo.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping index 5e3a9361fa..c1ddda1229 100644 --- a/mappings/net/minecraft/client/network/ServerInfo.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -22,7 +22,9 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo FIELD field_42890 favicon [B FIELD field_45608 serverType Lnet/minecraft/class_642$class_8678; FIELD field_46206 MAX_FAVICON_SIZE I + FIELD field_47879 pingStatus Lnet/minecraft/class_642$class_9083; METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_642$class_8678;)V + ARG 1 name ARG 2 address ARG 3 serverType METHOD method_2990 getResourcePackPolicy ()Lnet/minecraft/class_642$class_643; @@ -51,6 +53,9 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo METHOD method_53885 validateFavicon ([B)[B ARG 0 favicon METHOD method_55616 getServerType ()Lnet/minecraft/class_642$class_8678; + METHOD method_55824 setPingStatus (Lnet/minecraft/class_642$class_9083;)V + ARG 1 pingStatus + METHOD method_55825 getPingStatus ()Lnet/minecraft/class_642$class_9083; CLASS class_643 ResourcePackPolicy COMMENT The policy of the client when this server sends a {@linkplain COMMENT net.minecraft.network.packet.s2c.common.ResourcePackSendS2CPacket server @@ -70,3 +75,4 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo ARG 3 name METHOD method_2997 getName ()Lnet/minecraft/class_2561; CLASS class_8678 ServerType + CLASS class_9083 PingStatus diff --git a/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping index 9c50b0a4a5..6a9b706436 100644 --- a/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/StriderEntityRenderer.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_4999 net/minecraft/client/render/entity/StriderEntityRenderer FIELD field_23372 TEXTURE Lnet/minecraft/class_2960; FIELD field_23937 COLD_TEXTURE Lnet/minecraft/class_2960; + FIELD field_47888 BABY_SHADOW_RADIUS_SCALE F diff --git a/mappings/net/minecraft/client/util/ParticleUtil.mapping b/mappings/net/minecraft/client/util/ParticleUtil.mapping index 9ed9bfda50..66ebaec358 100644 --- a/mappings/net/minecraft/client/util/ParticleUtil.mapping +++ b/mappings/net/minecraft/client/util/ParticleUtil.mapping @@ -33,3 +33,16 @@ CLASS net/minecraft/class_5945 net/minecraft/client/util/ParticleUtil ARG 1 pos ARG 2 random ARG 3 effect + METHOD method_55635 spawnParticle (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;IDDZLnet/minecraft/class_2394;)V + ARG 0 world + ARG 1 pos + ARG 2 count + ARG 3 maxXzOffset + ARG 5 maxYOffset + ARG 7 skipAirCheck + ARG 8 effect + METHOD method_55636 spawnParticle (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;ILnet/minecraft/class_2394;)V + ARG 0 world + ARG 1 pos + ARG 2 count + ARG 3 effect diff --git a/mappings/net/minecraft/datafixer/TypeReferences.mapping b/mappings/net/minecraft/datafixer/TypeReferences.mapping index 88d8c6c2a7..fe7a795a1d 100644 --- a/mappings/net/minecraft/datafixer/TypeReferences.mapping +++ b/mappings/net/minecraft/datafixer/TypeReferences.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_1208 net/minecraft/datafixer/TypeReferences FIELD field_45095 SAVED_DATA_RANDOM_SEQUENCES Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_45096 SAVED_DATA_STRUCTURE_FEATURE_INDICES Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_45097 SAVED_DATA_SCOREBOARD Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_47727 FLAT_BLOCK_STATE Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5710 LEVEL Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5711 RECIPE Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5712 ITEM_STACK Lcom/mojang/datafixers/DSL$TypeReference; diff --git a/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping index 5af3d8d350..249e53627b 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockNameFix.mapping @@ -3,9 +3,13 @@ CLASS net/minecraft/class_3579 net/minecraft/datafixer/fix/BlockNameFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V ARG 1 outputSchema ARG 2 name + METHOD method_15588 rename (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic METHOD method_15589 create (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/DataFix; ARG 0 outputSchema ARG 1 name ARG 2 rename METHOD method_15593 rename (Ljava/lang/String;)Ljava/lang/String; ARG 1 oldName + METHOD method_55639 renameFlatBlockState (Ljava/lang/String;)Ljava/lang/String; + ARG 1 blockState diff --git a/mappings/net/minecraft/datafixer/schema/Schema3799.mapping b/mappings/net/minecraft/datafixer/schema/Schema3799.mapping index fac1190549..c05ecd4c3b 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema3799.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema3799.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_9061 net/minecraft/datafixer/schema/Schema3799 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index d3153a3f80..d0f0c34a2e 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -683,7 +683,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

A common example is a game event called in {@link #interact}, where the player COMMENT interacting with the entity is the emitter of the event. COMMENT - COMMENT @see #emitGameEvent(GameEvent) + COMMENT @see #emitGameEvent(RegistryEntry) ARG 1 event ARG 2 entity COMMENT the entity that emitted the game event, or {@code null} if there is none @@ -993,6 +993,10 @@ 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_55665 getPassengerAttachmentPos (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;Lnet/minecraft/class_9066;)Lnet/minecraft/class_243; + ARG 0 vehicle + ARG 1 passenger + ARG 2 attachments METHOD method_55666 onDeflectProjectile (Lnet/minecraft/class_1676;)V ARG 1 projectile METHOD method_55667 getBlockStateAtPos ()Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/entity/EntityAttachments.mapping b/mappings/net/minecraft/entity/EntityAttachments.mapping index 11143e1979..65df05aa2b 100644 --- a/mappings/net/minecraft/entity/EntityAttachments.mapping +++ b/mappings/net/minecraft/entity/EntityAttachments.mapping @@ -1,9 +1,8 @@ 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_55673 builder ()Lnet/minecraft/class_9066$class_9067; METHOD method_55674 scale (FFF)Lnet/minecraft/class_9066; ARG 1 xScale ARG 2 yScale @@ -28,6 +27,9 @@ CLASS net/minecraft/class_9066 net/minecraft/entity/EntityAttachments ARG 1 type ARG 2 index ARG 3 yaw + METHOD method_55844 of (FF)Lnet/minecraft/class_9066; + ARG 0 width + ARG 1 height CLASS class_9067 Builder FIELD field_47753 points Ljava/util/Map; METHOD method_55680 build (FF)Lnet/minecraft/class_9066; diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 885792230b..b8b1d0fde2 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -171,6 +171,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_47755 attachments Lnet/minecraft/class_9066$class_9067; FIELD field_6148 factory Lnet/minecraft/class_1299$class_4049; FIELD field_6149 spawnGroup Lnet/minecraft/class_1311; FIELD field_6150 summonable Z @@ -178,7 +179,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD (Lnet/minecraft/class_1299$class_4049;Lnet/minecraft/class_1311;)V ARG 1 factory ARG 2 spawnGroup - METHOD method_17687 setDimensions (FF)Lnet/minecraft/class_1299$class_1300; + METHOD method_17687 dimensions (FF)Lnet/minecraft/class_1299$class_1300; ARG 1 width ARG 2 height METHOD method_19947 makeFireImmune ()Lnet/minecraft/class_1299$class_1300; @@ -199,6 +200,18 @@ 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_55687 eyeHeight (F)Lnet/minecraft/class_1299$class_1300; + ARG 1 eyeHeight + METHOD method_55688 vehicleAttachment (Lnet/minecraft/class_243;)Lnet/minecraft/class_1299$class_1300; + ARG 1 vehicleAttachment + METHOD method_55689 passengerAttachments ([F)Lnet/minecraft/class_1299$class_1300; + ARG 1 offsetYs + METHOD method_55690 passengerAttachments ([Lnet/minecraft/class_243;)Lnet/minecraft/class_1299$class_1300; + ARG 1 passengerAttachments + METHOD method_55691 vehicleAttachment (F)Lnet/minecraft/class_1299$class_1300; + ARG 1 offsetY + METHOD method_55692 nameTagAttachment (F)Lnet/minecraft/class_1299$class_1300; + ARG 1 offsetY 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 f2ab78e31d..f1ac8ab5d0 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -608,7 +608,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT Removes a status effect from this entity without calling any listener. COMMENT COMMENT

This method does not perform any cleanup or synchronization operation. - COMMENT Under most circumstances, calling {@link #removeStatusEffect(StatusEffect)} is highly preferable. + COMMENT Under most circumstances, calling {@link #removeStatusEffect(RegistryEntry)} is highly preferable. COMMENT COMMENT @return the status effect removed ARG 1 effect diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreezeUtil.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreezeUtil.mapping new file mode 100644 index 0000000000..d2ae218a4f --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/BreezeUtil.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_9075 net/minecraft/entity/ai/brain/task/BreezeUtil + FIELD field_47817 DETECTION_RANGE D + METHOD method_55751 calculateBehindTargetPos (Lnet/minecraft/class_1309;Lnet/minecraft/class_5819;)Lnet/minecraft/class_243; + ARG 0 target + ARG 1 random + METHOD method_55752 canSee (Lnet/minecraft/class_8949;Lnet/minecraft/class_243;)Z + ARG 0 breeze + ARG 1 pos diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index 737648267c..f9986fc238 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect FIELD field_18270 category Lnet/minecraft/class_4081; + FIELD field_47738 fadeTicks I FIELD field_5883 translationKey Ljava/lang/String; FIELD field_5885 attributeModifiers Ljava/util/Map; FIELD field_5886 color I @@ -28,11 +29,19 @@ 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 + METHOD method_55649 fadeTicks (I)Lnet/minecraft/class_1291; + COMMENT Sets the duration of effect fade-in and fade-out. + COMMENT + COMMENT @return this effect, for chaining + COMMENT @see StatusEffectInstance#getFadeFactor + ARG 1 fadeTicks + METHOD method_55650 forEachAttributeModifier (ILjava/util/function/BiConsumer;)V ARG 1 amplifier + ARG 2 consumer 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_55652 getFadeOutTicks ()I 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 diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index ead3af89e9..f2c3e7470b 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_45734 DURATION_NBT_KEY Ljava/lang/String; FIELD field_45735 SHOW_PARTICLES_NBT_KEY Ljava/lang/String; FIELD field_45736 SHOW_ICON_NBT_KEY Ljava/lang/String; + FIELD field_47739 fading Lnet/minecraft/class_1293$class_9063; FIELD field_5889 showIcon Z FIELD field_5890 showParticles Z FIELD field_5892 ambient Z @@ -76,10 +77,24 @@ 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_55653 getFadeFactor (Lnet/minecraft/class_1309;F)F + COMMENT {@return the factor (multiplier) for effect fade-in and fade-out} + COMMENT + COMMENT

The return value is between {@code 0.0f} and {@code 1.0f} (both inclusive). + COMMENT + COMMENT @see StatusEffect#fadeTicks(int) + ARG 1 entity + ARG 2 tickDelta 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_55656 copyFadingFrom (Lnet/minecraft/class_1293;)V + ARG 1 effect + METHOD method_55657 skipFading ()V + COMMENT Skips fade-in or fade-out currently in progress, instantly setting it + COMMENT to the final state (factor {@code 1.0f} or {@code 0.0f}, depending on the + COMMENT effect's duration). METHOD method_5578 getAmplifier ()I METHOD method_5579 getEffectType ()Lnet/minecraft/class_6880; METHOD method_5581 shouldShowParticles ()Z @@ -97,3 +112,28 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 1 that METHOD method_5591 isAmbient ()Z METHOD method_5592 shouldShowIcon ()Z + CLASS class_9063 Fading + COMMENT Computes the factor (multiplier) for effect fade-in and fade-out. + COMMENT + COMMENT

This is used by {@link StatusEffects#DARKNESS} in vanilla. + COMMENT + COMMENT @see StatusEffect#fadeTicks(int) + COMMENT @see StatusEffect#getFadeTicks + FIELD field_47740 factor F + FIELD field_47741 prevFactor F + METHOD method_55658 copyFrom (Lnet/minecraft/class_1293$class_9063;)V + ARG 1 fading + METHOD method_55659 skipFading (Lnet/minecraft/class_1293;)V + COMMENT Skips fade-in or fade-out currently in progress, instantly setting it + COMMENT to the final state (factor {@code 1.0f} or {@code 0.0f}, depending on the + COMMENT effect's duration). + ARG 1 effect + METHOD method_55660 calculate (Lnet/minecraft/class_1309;F)F + ARG 1 entity + ARG 2 tickDelta + METHOD method_55661 update (Lnet/minecraft/class_1293;)V + ARG 1 effect + METHOD method_55662 getTarget (Lnet/minecraft/class_1293;)F + ARG 0 effect + METHOD method_55663 getFadeTicks (Lnet/minecraft/class_1293;)I + ARG 0 effect diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index f5e14302ca..644ba1920e 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity FIELD field_22381 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList; FIELD field_23738 cannotHunt Z FIELD field_25164 DANCING Lnet/minecraft/class_2940; + FIELD field_47818 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; METHOD method_24695 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping b/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping index 3adc7ee789..0dada3d787 100644 --- a/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1506 net/minecraft/entity/mob/SkeletonHorseEntity FIELD field_30427 DESPAWN_AGE I + FIELD field_47809 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_7003 trapTriggerGoal Lnet/minecraft/class_1505; FIELD field_7004 trapTime I FIELD field_7005 trapped Z diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index a0803e6e15..99c794d968 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity FIELD field_19015 DOOR_BREAK_DIFFICULTY_CHECKER Ljava/util/function/Predicate; + FIELD field_47811 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_7424 ticksUntilWaterConversion I FIELD field_7425 CONVERTING_IN_WATER Lnet/minecraft/class_2940; FIELD field_7426 inWaterTime I diff --git a/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping index 4dd26e50f8..5c509dd673 100644 --- a/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1507 net/minecraft/entity/mob/ZombieHorseEntity + FIELD field_47810 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; METHOD method_26902 createZombieHorseAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_55002 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 type diff --git a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping index 4e87c42e61..f990cdf85e 100644 --- a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity FIELD field_25382 ANGRY_SOUND_DELAY_RANGE Lnet/minecraft/class_6019; FIELD field_25608 angerPassingCooldown I FIELD field_25609 ANGER_PASSING_COOLDOWN_RANGE Lnet/minecraft/class_6019; + FIELD field_47812 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_7307 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322; FIELD field_7308 angrySoundDelay I FIELD field_7311 ATTACKING_SPEED_BOOST_ID Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping index ad7dc2e50e..811ac73e27 100644 --- a/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1492 net/minecraft/entity/passive/AbstractDonkeyEntity + FIELD field_47806 babyBaseDimensions Lnet/minecraft/class_4048; FIELD field_6943 CHEST Lnet/minecraft/class_2940; METHOD method_26898 createAbstractDonkeyAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_45374 addChest (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping index ed8d555451..9ea5f26174 100644 --- a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1428 net/minecraft/entity/passive/ChickenEntity + FIELD field_47770 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_6736 prevFlapProgress F FIELD field_6737 flapSpeed F FIELD field_6738 prevMaxWingDeviation F diff --git a/mappings/net/minecraft/entity/passive/CowEntity.mapping b/mappings/net/minecraft/entity/passive/CowEntity.mapping index ac4d6368a3..78eb63f1a8 100644 --- a/mappings/net/minecraft/entity/passive/CowEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CowEntity.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_1430 net/minecraft/entity/passive/CowEntity + FIELD field_47771 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; METHOD method_26883 createCowAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 878e50ae2a..79088403c2 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity FIELD field_30333 WALKING_FLAG I FIELD field_30334 AGGRESSIVE_FLAG I FIELD field_30335 EATING_DURATION I + FIELD field_47772 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; METHOD method_18253 (Lnet/minecraft/class_1297;)Z ARG 0 entity METHOD method_18254 (Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping index f99a07250d..852e3c51cb 100644 --- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1498 net/minecraft/entity/passive/HorseEntity + FIELD field_47807 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_6985 HORSE_ARMOR_BONUS_ID Ljava/util/UUID; FIELD field_6990 VARIANT Lnet/minecraft/class_2940; METHOD method_18445 equipArmor (Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index 77c0105310..006daf1416 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity FIELD field_25375 TAMING_INGREDIENT Lnet/minecraft/class_1856; FIELD field_30425 MAX_STRENGTH I + FIELD field_47808 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_6995 CARPET_COLOR Lnet/minecraft/class_2940; FIELD field_6996 VARIANT Lnet/minecraft/class_2940; FIELD field_6997 follower Lnet/minecraft/class_1501; diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index e4e039dda8..7d2507eb91 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity FIELD field_30347 LYING_ON_BACK_FLAG I FIELD field_30348 EATING_ANIMATION_INTERVAL I FIELD field_30349 HIDDEN_GENE_MUTATION_CHANCE I + FIELD field_47773 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_6764 ASK_FOR_BAMBOO_TICKS Lnet/minecraft/class_2940; FIELD field_6765 IS_FOOD Ljava/util/function/Predicate; FIELD field_6766 MAIN_GENE Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping index d0596acf1c..b357a1299f 100644 --- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity FIELD field_28406 BREEDING_ITEM Lnet/minecraft/class_1856; + FIELD field_47774 BABY_SCALE F + FIELD field_47775 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_6918 sandDiggingCounter I FIELD field_6919 HAS_EGG Lnet/minecraft/class_2940; FIELD field_6920 HOME_POS Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index b29b057b7d..ef6376a9ac 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_39445 lastDeathPos Ljava/util/Optional; FIELD field_41765 damageTiltYaw F FIELD field_46174 DEFAULT_MAIN_ARM Lnet/minecraft/class_1306; + FIELD field_47821 VEHICLE_ATTACHMENT Lnet/minecraft/class_243; FIELD field_7483 strideDistance F FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796; FIELD field_7486 enderChestInventory Lnet/minecraft/class_1730; diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 969ff26635..2255d35437 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -37,6 +37,8 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory ARG 2 notifiesClient METHOD method_37417 dropSelectedItem (Z)Lnet/minecraft/class_1799; ARG 1 entireStack + METHOD method_55753 contains (Ljava/util/function/Predicate;)Z + ARG 1 predicate METHOD method_7364 getChangeCount ()I METHOD method_7365 swapSlotWithHotbar (I)V ARG 1 slot diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index 85145e5dcf..2bafa8cec3 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -117,6 +117,10 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_37343 iconCountNotLessThan (I)Z ARG 1 iconCount METHOD method_52611 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; + METHOD method_55784 getEqualPredicate (Lnet/minecraft/class_1799;)Ljava/util/function/Predicate; + ARG 0 stack + METHOD method_55785 (Lnet/minecraft/class_1799;Ljava/lang/Integer;Lnet/minecraft/class_1799;)Z + ARG 2 other CLASS class_23 PlayerUpdateTracker FIELD field_124 emptyPacketsRequested I FIELD field_125 player Lnet/minecraft/class_1657; diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index 9ebb62044f..a334154d78 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -6,9 +6,11 @@ CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaco ARG 1 buf METHOD method_43364 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6880;)V ARG 0 buf2 + ARG 1 secondary METHOD method_43365 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6880; ARG 0 buf2 METHOD method_43366 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6880;)V ARG 0 buf2 + ARG 1 primary METHOD method_43367 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_6880; ARG 0 buf2 diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index a8a7cf58a8..36d18e76cf 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -7,9 +7,11 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu FIELD field_33356 AMBIENT_MASK I FIELD field_33357 SHOW_PARTICLES_MASK I FIELD field_33358 SHOW_ICON_MASK I + FIELD field_47706 KEEP_FADING_MASK I METHOD (ILnet/minecraft/class_1293;Z)V ARG 1 entityId ARG 2 effect + ARG 3 keepFading METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11942 shouldShowIcon ()Z @@ -19,3 +21,4 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu METHOD method_11946 getEffectId ()Lnet/minecraft/class_6880; METHOD method_11949 shouldShowParticles ()Z METHOD method_11950 isAmbient ()Z + METHOD method_55629 keepFading ()Z diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index 3d0343b1f4..c4d148fcd1 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -9,6 +9,9 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil ARG 1 list ARG 2 durationMultiplier ARG 3 tickRate + METHOD method_55762 (Ljava/util/List;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V + ARG 1 attribute + ARG 2 modifier METHOD method_8055 getColor (Ljava/util/Collection;)I ARG 0 effects METHOD method_8056 setCustomPotionEffects (Lnet/minecraft/class_1799;Ljava/util/Collection;)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 7caaedad90..c1ca6f2d5e 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -226,3 +226,5 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 1 message METHOD method_52449 disconnectDuplicateLogins (Lcom/mojang/authlib/GameProfile;)Z ARG 1 profile + METHOD method_55634 (Lnet/minecraft/class_2487;)Ljava/util/Optional; + ARG 0 nbt diff --git a/mappings/net/minecraft/server/function/FunctionBuilder.mapping b/mappings/net/minecraft/server/function/FunctionBuilder.mapping index 29b81cb1bf..5d3e79e149 100644 --- a/mappings/net/minecraft/server/function/FunctionBuilder.mapping +++ b/mappings/net/minecraft/server/function/FunctionBuilder.mapping @@ -11,5 +11,6 @@ CLASS net/minecraft/class_8867 net/minecraft/server/function/FunctionBuilder METHOD method_54421 addMacroCommand (Ljava/lang/String;ILnet/minecraft/class_8839;)V ARG 1 command ARG 2 lineNum + ARG 3 source METHOD method_54422 indicesOfVariables (Ljava/util/List;)Lit/unimi/dsi/fastutil/ints/IntList; ARG 1 variables diff --git a/mappings/net/minecraft/server/function/Macro.mapping b/mappings/net/minecraft/server/function/Macro.mapping index cc1c3ce943..9176ce3e2f 100644 --- a/mappings/net/minecraft/server/function/Macro.mapping +++ b/mappings/net/minecraft/server/function/Macro.mapping @@ -30,12 +30,15 @@ CLASS net/minecraft/class_8641 net/minecraft/server/function/Macro METHOD method_54429 instantiate (Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2960;)Lnet/minecraft/class_8856; ARG 1 args ARG 2 dispatcher + ARG 3 id CLASS class_8870 VariableLine FIELD field_46760 invocation Lnet/minecraft/class_8873; FIELD field_46761 variableIndices Lit/unimi/dsi/fastutil/ints/IntList; + FIELD field_47891 source Lnet/minecraft/class_8839; METHOD (Lnet/minecraft/class_8873;Lit/unimi/dsi/fastutil/ints/IntList;Lnet/minecraft/class_8839;)V ARG 1 invocation ARG 2 variableIndices + ARG 3 source CLASS class_8871 FixedLine FIELD field_46762 action Lnet/minecraft/class_8856; METHOD (Lnet/minecraft/class_8856;)V diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index f0f37da5c0..6db668c667 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -376,6 +376,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 4 errorMessage METHOD method_52889 expectEntityHasEffect (Lnet/minecraft/class_1309;Lnet/minecraft/class_6880;I)V ARG 1 entity + ARG 2 effect ARG 3 amplifier METHOD method_54143 expectItem (Lnet/minecraft/class_1792;)V ARG 1 item diff --git a/mappings/net/minecraft/world/WorldAccess.mapping b/mappings/net/minecraft/world/WorldAccess.mapping index f7fd23c5b0..308043a0f8 100644 --- a/mappings/net/minecraft/world/WorldAccess.mapping +++ b/mappings/net/minecraft/world/WorldAccess.mapping @@ -60,6 +60,10 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 2 pos ARG 3 sound ARG 4 category + METHOD method_55764 emitGameEvent (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712$class_7397;)V + ARG 1 event + ARG 2 pos + ARG 3 emitter METHOD method_8396 playSound (Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V ARG 1 source ARG 2 pos diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index 9665238f15..0fffdbf305 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -348,3 +348,13 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT A trial spawner ejects loot. COMMENT
Plays the ejection sound and spawns ejection particles. COMMENT

Called by {@link net.minecraft.block.spawner.TrialSpawnerLogic#ejectLootTable}. + FIELD field_47837 BEE_POLLINATES I + COMMENT A bee pollinates a crop. + COMMENT
Spawns happy villager particles. + COMMENT

The extra data specifies the number of particles spawned. + COMMENT

Called by {@link net.minecraft.entity.passive.BeeEntity.GrowCropsGoal#tick}. + FIELD field_47838 TURTLE_EGG_PLACED_ON_SAND I + COMMENT A turtle egg is placed on sand. + COMMENT
Spawns happy villager particles. + COMMENT

The extra data specifies the number of particles spawned. + COMMENT

Called by {@link net.minecraft.block.TurtleEggBlock#onBlockAdded}. diff --git a/mappings/net/minecraft/world/WorldSaveHandler.mapping b/mappings/net/minecraft/world/WorldSaveHandler.mapping index a46ed33391..fd237e3c09 100644 --- a/mappings/net/minecraft/world/WorldSaveHandler.mapping +++ b/mappings/net/minecraft/world/WorldSaveHandler.mapping @@ -2,10 +2,19 @@ CLASS net/minecraft/class_29 net/minecraft/world/WorldSaveHandler FIELD field_144 playerDataDir Ljava/io/File; FIELD field_148 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_149 LOGGER Lorg/slf4j/Logger; + FIELD field_47840 DATE_TIME_FORMATTER Ljava/time/format/DateTimeFormatter; METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;)V ARG 1 session ARG 2 dataFixer METHOD method_261 loadPlayerData (Lnet/minecraft/class_1657;Ljava/lang/String;)Ljava/util/Optional; ARG 1 player + ARG 2 suffix METHOD method_262 savePlayerData (Lnet/minecraft/class_1657;)V ARG 1 player + METHOD method_55787 backupCorruptedPlayerData (Lnet/minecraft/class_1657;Ljava/lang/String;)V + ARG 1 player + ARG 2 suffix + METHOD method_55788 (Lnet/minecraft/class_1657;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 2 nbt + METHOD method_55789 loadPlayerData (Lnet/minecraft/class_1657;)Ljava/util/Optional; + ARG 1 player diff --git a/mappings/net/minecraft/world/event/Vibrations.mapping b/mappings/net/minecraft/world/event/Vibrations.mapping index 0a608ffd9a..c9a3542c22 100644 --- a/mappings/net/minecraft/world/event/Vibrations.mapping +++ b/mappings/net/minecraft/world/event/Vibrations.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations FIELD field_44638 RESONATIONS Ljava/util/List; FIELD field_44639 FREQUENCIES Ljava/util/function/ToIntFunction; + FIELD field_47839 DEFAULT_FREQUENCY I 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 @@ -12,7 +13,7 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations ARG 0 gameEvent METHOD method_51386 getResonation (I)Lnet/minecraft/class_5321; ARG 0 frequency - METHOD method_55783 getFrequencyOrZero (Lnet/minecraft/class_6880;)I + METHOD method_55783 getFrequency (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 diff --git a/unpick-definitions/world_events.unpick b/unpick-definitions/world_events.unpick index 3ac4d639ec..178ec6018e 100644 --- a/unpick-definitions/world_events.unpick +++ b/unpick-definitions/world_events.unpick @@ -50,7 +50,6 @@ constant world_events net/minecraft/world/WorldEvents BLOCK_BROKEN constant world_events net/minecraft/world/WorldEvents SPLASH_POTION_SPLASHED constant world_events net/minecraft/world/WorldEvents EYE_OF_ENDER_BREAKS constant world_events net/minecraft/world/WorldEvents SPAWNER_SPAWNS_MOB -constant world_events net/minecraft/world/WorldEvents PLANT_FERTILIZED constant world_events net/minecraft/world/WorldEvents DRAGON_BREATH_CLOUD_SPAWNS constant world_events net/minecraft/world/WorldEvents INSTANT_SPLASH_POTION_SPLASHED constant world_events net/minecraft/world/WorldEvents ENDER_DRAGON_BREAKS_BLOCK @@ -69,6 +68,8 @@ constant world_events net/minecraft/world/WorldEvents SNIFFER_EGG_CRACKS constant world_events net/minecraft/world/WorldEvents CRAFTER_CRAFTS constant world_events net/minecraft/world/WorldEvents CRAFTER_FAILS constant world_events net/minecraft/world/WorldEvents CRAFTER_SHOOTS +constant world_events net/minecraft/world/WorldEvents BEE_POLLINATES +constant world_events net/minecraft/world/WorldEvents TURTLE_EGG_PLACED_ON_SAND constant world_events net/minecraft/world/WorldEvents GUST_DUST constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_SPAWNS_MOB constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_SPAWNS_MOB_AT_SPAWN_POS