diff --git a/build.gradle b/build.gradle index 9fbe31f27a..de8249efad 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w51b" +def minecraft_version = "24w03a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index 822feb10d7..73b19fe9f4 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -14,16 +14,11 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 0 identifiedAdvancement METHOD method_53623 createNameFromDisplay (Lnet/minecraft/class_185;)Lnet/minecraft/class_2561; ARG 0 display - METHOD method_53627 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_53628 (Lnet/minecraft/class_2540;Lnet/minecraft/class_185;)V - ARG 0 buf - ARG 1 display + METHOD method_53627 write (Lnet/minecraft/class_9129;)V METHOD method_53629 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style METHOD method_53630 isRoot ()Z - METHOD method_53632 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_161; - ARG 0 buf + METHOD method_53632 read (Lnet/minecraft/class_9129;)Lnet/minecraft/class_161; METHOD method_54910 validate (Lnet/minecraft/class_161;)Lcom/mojang/serialization/DataResult; ARG 0 advancement METHOD method_54911 (Lnet/minecraft/class_161;Lnet/minecraft/class_8782;)Lnet/minecraft/class_161; diff --git a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping index f53a7e4709..c9a42bfa92 100644 --- a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping +++ b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping @@ -24,8 +24,7 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay METHOD method_808 shouldAnnounceToChat ()Z METHOD method_811 getTitle ()Lnet/minecraft/class_2561; METHOD method_812 getBackground ()Ljava/util/Optional; - METHOD method_813 toPacket (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_813 toPacket (Lnet/minecraft/class_9129;)V METHOD method_815 getFrame ()Lnet/minecraft/class_189; METHOD method_816 setPos (FF)V ARG 1 x @@ -33,8 +32,7 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay METHOD method_817 getDescription ()Lnet/minecraft/class_2561; METHOD method_818 getX ()F METHOD method_819 getY ()F - METHOD method_820 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_185; - ARG 0 buf + METHOD method_820 fromPacket (Lnet/minecraft/class_9129;)Lnet/minecraft/class_185; METHOD method_821 getIcon ()Lnet/minecraft/class_1799; METHOD method_823 shouldShowToast ()Z METHOD method_824 isHidden ()Z diff --git a/mappings/net/minecraft/advancement/AdvancementEntry.mapping b/mappings/net/minecraft/advancement/AdvancementEntry.mapping index e9d6089744..6da16f53cb 100644 --- a/mappings/net/minecraft/advancement/AdvancementEntry.mapping +++ b/mappings/net/minecraft/advancement/AdvancementEntry.mapping @@ -5,7 +5,3 @@ CLASS net/minecraft/class_8779 net/minecraft/advancement/AdvancementEntry METHOD comp_1920 value ()Lnet/minecraft/class_161; METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_53635 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_53636 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_8779; - ARG 0 buf diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 51a10bf770..21af4c6478 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -516,6 +516,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 3 pos ARG 4 newState ARG 5 moved + METHOD method_9542 hasRandomTicks (Lnet/minecraft/class_2680;)Z METHOD method_9545 getFluidState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3610; COMMENT {@return the state's associated fluid state} COMMENT @@ -695,11 +696,13 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 state ARG 2 world ARG 3 pos + METHOD method_9573 getSoundGroup (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2498; METHOD method_9575 getAmbientOcclusionLightLevel (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F COMMENT @deprecated Consider calling {@link AbstractBlockState#getAmbientOcclusionLightLevel} instead. See why these methods are deprecated. ARG 1 state ARG 2 world ARG 3 pos + METHOD method_9579 isTransparent (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z METHOD method_9584 getRaycastShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; COMMENT @deprecated Consider calling {@link AbstractBlockState#getRaycastShape} instead. See why these methods are deprecated. ARG 1 state diff --git a/mappings/net/minecraft/block/BeehiveBlock.mapping b/mappings/net/minecraft/block/BeehiveBlock.mapping index 2f6c551b1a..079847d702 100644 --- a/mappings/net/minecraft/block/BeehiveBlock.mapping +++ b/mappings/net/minecraft/block/BeehiveBlock.mapping @@ -39,5 +39,3 @@ 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/Block.mapping b/mappings/net/minecraft/block/Block.mapping index b0193bd7ea..c12a3f9dcb 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -203,8 +203,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 6 maxX ARG 8 maxY ARG 10 maxZ - METHOD method_9542 hasRandomTicks (Lnet/minecraft/class_2680;)Z - ARG 1 state METHOD method_9543 hasDynamicBounds ()Z METHOD method_9544 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V ARG 2 stack @@ -276,8 +274,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 world ARG 3 tooltip ARG 4 options - METHOD method_9573 getSoundGroup (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2498; - ARG 1 state METHOD method_9574 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; COMMENT {@return the new item stack when using pick block functionality} COMMENT @@ -314,10 +310,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 0 world ARG 1 pos ARG 2 stack - METHOD method_9579 isTransparent (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z - ARG 1 state - ARG 2 world - ARG 3 pos METHOD method_9581 cannotConnect (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_9582 pushEntitiesUpBeforeBlockChange (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/block/PumpkinBlock.mapping b/mappings/net/minecraft/block/PumpkinBlock.mapping index 5bbd5f115d..35e3e063f0 100644 --- a/mappings/net/minecraft/block/PumpkinBlock.mapping +++ b/mappings/net/minecraft/block/PumpkinBlock.mapping @@ -1,4 +1,2 @@ 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 f855a5565f..ad7640a0b8 100644 --- a/mappings/net/minecraft/block/TntBlock.mapping +++ b/mappings/net/minecraft/block/TntBlock.mapping @@ -8,5 +8,3 @@ 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/ViewerCountManager.mapping b/mappings/net/minecraft/block/entity/ViewerCountManager.mapping index f8ffb5cd14..50a15d966a 100644 --- a/mappings/net/minecraft/block/entity/ViewerCountManager.mapping +++ b/mappings/net/minecraft/block/entity/ViewerCountManager.mapping @@ -7,9 +7,6 @@ CLASS net/minecraft/class_5561 net/minecraft/block/entity/ViewerCountManager METHOD method_31679 isPlayerViewing (Lnet/minecraft/class_1657;)Z COMMENT Determines whether the given player is currently viewing this container. ARG 1 player - METHOD method_31680 getInRangeViewerCount (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)I - ARG 1 world - ARG 2 pos METHOD method_31681 onContainerOpen (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V COMMENT Run when this container is opened (when the viewer count becomes nonzero). ARG 1 world diff --git a/mappings/net/minecraft/class_9104.mapping b/mappings/net/minecraft/class_9104.mapping new file mode 100644 index 0000000000..fc87720c09 --- /dev/null +++ b/mappings/net/minecraft/class_9104.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9104 + CLASS class_9105 + FIELD comp_2029 player Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_9107.mapping b/mappings/net/minecraft/class_9107.mapping new file mode 100644 index 0000000000..476ce8c815 --- /dev/null +++ b/mappings/net/minecraft/class_9107.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9107 + CLASS class_9108 + FIELD comp_2029 player Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index cf0c8a3fde..c2fa31a291 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -311,7 +311,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_17533 (I)Lnet/minecraft/class_3949; ARG 1 spawnChunkRadius METHOD method_18095 getSplashTextLoader ()Lnet/minecraft/class_4008; - METHOD method_18096 disconnect (Lnet/minecraft/class_437;)V + METHOD method_18096 disconnect (Lnet/minecraft/class_437;Z)V ARG 1 disconnectionScreen METHOD method_18097 setWorld (Lnet/minecraft/class_638;)V ARG 1 world diff --git a/mappings/net/minecraft/client/font/RenderableGlyph.mapping b/mappings/net/minecraft/client/font/RenderableGlyph.mapping index aee6d12ee8..f6bf68dc03 100644 --- a/mappings/net/minecraft/client/font/RenderableGlyph.mapping +++ b/mappings/net/minecraft/client/font/RenderableGlyph.mapping @@ -10,5 +10,3 @@ CLASS net/minecraft/class_383 net/minecraft/client/font/RenderableGlyph METHOD method_2033 hasColor ()Z METHOD method_2034 getXMin ()F METHOD method_2035 getOversample ()F - METHOD method_41712 getBearingX ()F - METHOD method_41713 getAscent ()F diff --git a/mappings/net/minecraft/client/font/TrueTypeFont.mapping b/mappings/net/minecraft/client/font/TrueTypeFont.mapping index 788754b017..ab679007cc 100644 --- a/mappings/net/minecraft/client/font/TrueTypeFont.mapping +++ b/mappings/net/minecraft/client/font/TrueTypeFont.mapping @@ -1,23 +1,13 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont FIELD field_21839 buffer Ljava/nio/ByteBuffer; - FIELD field_2318 shiftY F FIELD field_2319 excludedCharacters Lit/unimi/dsi/fastutil/ints/IntSet; - FIELD field_2320 shiftX F FIELD field_2321 oversample F - FIELD field_2323 info Lorg/lwjgl/stb/STBTTFontinfo; - FIELD field_2324 ascent F - FIELD field_2325 scaleFactor F - METHOD (Ljava/nio/ByteBuffer;Lorg/lwjgl/stb/STBTTFontinfo;FFFFLjava/lang/String;)V + METHOD (Ljava/nio/ByteBuffer;Lorg/lwjgl/util/freetype/FT_Face;FFFFLjava/lang/String;)V ARG 1 buffer - ARG 2 info - ARG 3 size ARG 4 oversample - ARG 5 shiftX ARG 6 shiftY ARG 7 excludedCharacters - METHOD method_27443 (I)Z - ARG 1 codePoint - METHOD method_51884 getInfo ()Lorg/lwjgl/stb/STBTTFontinfo; + METHOD method_51884 getInfo ()Lorg/lwjgl/util/freetype/FT_Face; CLASS class_397 TtfGlyph FIELD field_2332 advance F FIELD field_2333 ascent F @@ -25,11 +15,7 @@ CLASS net/minecraft/class_395 net/minecraft/client/font/TrueTypeFont FIELD field_2335 glyphIndex I FIELD field_2337 height I FIELD field_2338 width I - METHOD (Lnet/minecraft/class_395;IIIIFFI)V - ARG 2 x1 - ARG 3 x2 + METHOD (Lnet/minecraft/class_395;FFIIFI)V ARG 4 y2 ARG 5 y1 ARG 6 advance - ARG 7 bearingX - ARG 8 glyphIndex diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping index f34c0647e3..70bd7615dc 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping @@ -18,9 +18,8 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc ARG 7 mouseX ARG 8 mouseY ARG 9 entity - METHOD method_48472 drawEntity (Lnet/minecraft/class_332;FFILorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Quaternionf;Lnet/minecraft/class_1309;)V + METHOD method_48472 drawEntity (Lnet/minecraft/class_332;FFFLorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Quaternionf;Lnet/minecraft/class_1309;)V ARG 0 context ARG 1 x ARG 2 y - ARG 3 size ARG 7 entity diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping index bdb3788f0b..b8b5c5a59b 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/ConnectScreen.mapping @@ -22,13 +22,13 @@ CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/multiplayer/Connec ARG 2 failureErrorMessage METHOD method_19800 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_2130 connect (Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;)V + METHOD method_2130 connect (Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;Lnet/minecraft/class_9112;)V ARG 1 client ARG 2 address ARG 3 info METHOD method_2131 setStatus (Lnet/minecraft/class_2561;)V ARG 1 status - METHOD method_36877 connect (Lnet/minecraft/class_437;Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;Z)V + METHOD method_36877 connect (Lnet/minecraft/class_437;Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;ZLnet/minecraft/class_9112;)V ARG 0 screen ARG 1 client ARG 2 address diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index 7bf52f790b..7090def805 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget FIELD field_19104 LOGGER Lorg/slf4j/Logger; FIELD field_19105 SERVER_PINGER_THREAD_POOL Ljava/util/concurrent/ThreadPoolExecutor; - FIELD field_19106 UNKNOWN_SERVER_TEXTURE Lnet/minecraft/class_2960; FIELD field_19108 screen Lnet/minecraft/class_500; FIELD field_19109 servers Ljava/util/List; FIELD field_19110 scanningEntry Lnet/minecraft/class_4267$class_504; diff --git a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping index b2039998ef..2a71d733a8 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping @@ -38,8 +38,6 @@ CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScr ARG 1 button METHOD method_54602 (Lnet/minecraft/class_4185;Ljava/lang/String;)V ARG 1 name - METHOD method_54603 (Lnet/minecraft/class_342;Lnet/minecraft/class_4185;)V - ARG 2 button METHOD method_54604 (Lnet/minecraft/class_524;Lnet/minecraft/class_364;)V ARG 1 child METHOD method_54606 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 5c8dd9e8c4..eb78aef336 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWidget FIELD field_19132 DATE_FORMAT Ljava/time/format/DateTimeFormatter; - FIELD field_19133 UNKNOWN_SERVER_LOCATION Lnet/minecraft/class_2960; FIELD field_26606 FROM_NEWER_VERSION_FIRST_LINE Lnet/minecraft/class_2561; FIELD field_26607 FROM_NEWER_VERSION_SECOND_LINE Lnet/minecraft/class_2561; FIELD field_26608 SNAPSHOT_FIRST_LINE Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping b/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping index c200a970a8..c88af69894 100644 --- a/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/Tooltip.mapping @@ -3,9 +3,6 @@ CLASS net/minecraft/class_7919 net/minecraft/client/gui/tooltip/Tooltip FIELD field_41102 content Lnet/minecraft/class_2561; FIELD field_41103 lines Ljava/util/List; FIELD field_41104 narration Lnet/minecraft/class_2561; - FIELD field_46719 delay I - FIELD field_46720 renderCheckTime J - FIELD field_46721 prevShouldRender Z METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 content ARG 2 narration @@ -19,13 +16,3 @@ CLASS net/minecraft/class_7919 net/minecraft/client/gui/tooltip/Tooltip METHOD method_47408 of (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7919; ARG 0 content ARG 1 narration - METHOD method_54383 setDelay (I)V - ARG 1 delay - METHOD method_54384 render (ZZLnet/minecraft/class_8030;)V - ARG 1 hovered - ARG 2 focused - ARG 3 focus - METHOD method_54385 createPositioner (ZZLnet/minecraft/class_8030;)Lnet/minecraft/class_8000; - ARG 1 hovered - ARG 2 focused - ARG 3 focus diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index 27132f22d0..2f5d9ad25e 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget FIELD field_22763 active Z FIELD field_22764 visible Z FIELD field_22765 alpha F - FIELD field_41095 tooltip Lnet/minecraft/class_7919; + FIELD field_41095 tooltip Lnet/minecraft/class_9110; FIELD field_42116 navigationOrder I METHOD (IIIILnet/minecraft/class_2561;)V ARG 1 x @@ -61,8 +61,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget ARG 1 builder METHOD method_47400 setTooltip (Lnet/minecraft/class_7919;)V ARG 1 tooltip - METHOD method_47402 setTooltipDelay (I)V - ARG 1 delay + METHOD method_47402 setTooltipDelay (Ljava/time/Duration;)V METHOD method_48579 renderWidget (Lnet/minecraft/class_332;IIF)V ARG 1 context ARG 2 mouseX diff --git a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping index 55bca67067..2d063bcc9a 100644 --- a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan FIELD field_41384 worldLoadTime Ljava/time/Duration; FIELD field_44809 minigameName Ljava/lang/String; FIELD field_46192 state Ljava/util/concurrent/atomic/AtomicReference; - METHOD (Lnet/minecraft/class_2535;Lnet/minecraft/class_310;Lnet/minecraft/class_642;Lnet/minecraft/class_437;ZLjava/time/Duration;Ljava/util/function/Consumer;)V + METHOD (Lnet/minecraft/class_2535;Lnet/minecraft/class_310;Lnet/minecraft/class_642;Lnet/minecraft/class_437;ZLjava/time/Duration;Ljava/util/function/Consumer;Lnet/minecraft/class_9112;)V ARG 1 connection ARG 2 client ARG 3 serverInfo diff --git a/mappings/net/minecraft/client/network/ServerInfo.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping index 92588349d9..5b00cf2538 100644 --- a/mappings/net/minecraft/client/network/ServerInfo.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo FIELD field_3760 version Lnet/minecraft/class_2561; FIELD field_3761 address Ljava/lang/String; FIELD field_3762 playerListSummary Ljava/util/List; - FIELD field_39918 secureChatEnforced Z FIELD field_41861 players Lnet/minecraft/class_2926$class_2927; FIELD field_42889 LOGGER Lorg/slf4j/Logger; FIELD field_42890 favicon [B @@ -43,9 +42,6 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo ARG 1 serverInfo METHOD method_44292 copyFrom (Lnet/minecraft/class_642;)V ARG 1 serverInfo - METHOD method_45055 setSecureChatEnforced (Z)V - ARG 1 secureChatEnforced - METHOD method_45056 isSecureChatEnforced ()Z METHOD method_49305 setFavicon ([B)V ARG 1 favicon METHOD method_49306 getFavicon ()[B diff --git a/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping b/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping index d3069122aa..e23a448f7c 100644 --- a/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping +++ b/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping @@ -11,7 +11,6 @@ CLASS net/minecraft/class_4367 net/minecraft/client/realms/gui/RealmsWorldSlotBu FIELD field_26470 TOOLTIP Lnet/minecraft/class_2561; FIELD field_39067 CHECKMARK Lnet/minecraft/class_2960; FIELD field_44894 MINIGAME_SLOT_NAME Lnet/minecraft/class_2561; - FIELD field_46846 worldTooltip Lnet/minecraft/class_7919; METHOD (IIIIILnet/minecraft/class_4185$class_4241;)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping index aa13ced95f..b1d978a17c 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping @@ -14,7 +14,6 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea FIELD field_22709 EXPERIENCE_TEXTURE Lnet/minecraft/class_2960; FIELD field_22710 INSPIRATION_TEXTURE Lnet/minecraft/class_2960; FIELD field_22711 callback Ljava/lang/Runnable; - FIELD field_22713 SLOT_FRAME_TEXTURE Lnet/minecraft/class_2960; FIELD field_22714 UPLOAD_TEXTURE Lnet/minecraft/class_2960; FIELD field_22715 ADVENTURE_TEXTURE Lnet/minecraft/class_2960; FIELD field_22716 SURVIVAL_SPAWN_TEXTURE Lnet/minecraft/class_2960; @@ -51,10 +50,6 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea ARG 7 taskTitle ARG 8 creationTask ARG 9 callback - METHOD method_21377 switchSlot (Ljava/lang/Runnable;)V - ARG 1 callback - METHOD method_21384 frame (I)I - ARG 1 i METHOD method_25211 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25212 (Lnet/minecraft/class_4185;)V @@ -93,9 +88,3 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea ARG 1 task CLASS class_4411 FrameButton FIELD field_20032 image Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_4410;IILnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V - ARG 2 x - ARG 3 y - ARG 4 message - ARG 5 image - ARG 6 onPress diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index ab8de9a24e..fe82d5a77f 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -184,7 +184,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain CLASS class_4329 RealmSelectionList CLASS class_4330 RealmSelectionListEntry FIELD field_19518 server Lnet/minecraft/class_4877; - FIELD field_46686 tooltip Lnet/minecraft/class_7919; + FIELD field_46686 tooltip Lnet/minecraft/class_9110; METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V ARG 2 server METHOD method_38506 getRealmsServer ()Lnet/minecraft/class_4877; @@ -291,15 +291,11 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain CLASS class_8802 EmptyEntry CLASS class_8840 SnapshotEntry FIELD field_46676 START_TEXT Lnet/minecraft/class_2561; - FIELD field_46678 tooltip Lnet/minecraft/class_7919; + FIELD field_46678 tooltip Lnet/minecraft/class_9110; FIELD field_46679 server Lnet/minecraft/class_4877; - METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V - ARG 2 server METHOD method_54343 (Lnet/minecraft/class_8816;)V ARG 1 screen METHOD method_54344 showPopup ()V CLASS class_8841 ParentRealmSelectionListEntry FIELD field_46684 server Lnet/minecraft/class_4877; - FIELD field_46685 tooltip Lnet/minecraft/class_7919; - METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V - ARG 2 server + FIELD field_46685 tooltip Lnet/minecraft/class_9110; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping index 1833703a44..556d2c4f72 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping @@ -13,18 +13,12 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele FIELD field_26508 CHEATS_TEXT Lnet/minecraft/class_2561; FIELD field_44909 LOADING_ERROR_TEXT Lnet/minecraft/class_2561; FIELD field_46131 TITLE Lnet/minecraft/class_2561; - METHOD (JILnet/minecraft/class_4410;)V - ARG 1 worldId - ARG 3 slotId - ARG 4 parent METHOD method_21396 loadLevelList ()V METHOD method_21400 getGameModeName (Lnet/minecraft/class_34;)Lnet/minecraft/class_2561; ARG 0 summary METHOD method_21401 upload ()V METHOD method_21404 getLastPlayed (Lnet/minecraft/class_34;)Ljava/lang/String; ARG 0 summary - METHOD method_25220 (Lnet/minecraft/class_34;)Z - ARG 0 a METHOD method_25221 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_38508 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping index d650694117..4e1521add5 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping @@ -22,11 +22,6 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo FIELD field_20196 UPLOAD_LOCK Ljava/util/concurrent/locks/ReentrantLock; FIELD field_20503 statusTexts [Lnet/minecraft/class_2561; FIELD field_26526 VERIFYING_TEXT Lnet/minecraft/class_2561; - METHOD (JILnet/minecraft/class_4410;Lnet/minecraft/class_34;)V - ARG 1 worldId - ARG 3 slotId - ARG 4 parent - ARG 5 selectedLevel METHOD method_21515 verify (Ljava/io/File;)Z ARG 1 archive METHOD method_21516 addFileToTarGz (Lorg/apache/commons/compress/archivers/tar/TarArchiveOutputStream;Ljava/lang/String;Ljava/lang/String;Z)V @@ -41,16 +36,12 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo ARG 1 context ARG 2 bytesPerSecond METHOD method_21528 onCancel ()V - METHOD method_21530 drawDots (Lnet/minecraft/class_332;)V - ARG 1 context METHOD method_21532 drawProgressBar (Lnet/minecraft/class_332;)V ARG 1 context METHOD method_21534 drawUploadSpeed (Lnet/minecraft/class_332;)V ARG 1 context METHOD method_21536 upload ()V METHOD method_21538 uploadCancelled ()V - METHOD method_22105 (JLnet/minecraft/class_4429;)V - ARG 3 result METHOD method_25276 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25277 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping index aee4a8eb24..a11b5963d2 100644 --- a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping @@ -45,7 +45,7 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRen ARG 1 feature METHOD method_4056 isVisible (Lnet/minecraft/class_1309;)Z ARG 1 entity - METHOD method_4058 setupTransforms (Lnet/minecraft/class_1309;Lnet/minecraft/class_4587;FFF)V + METHOD method_4058 setupTransforms (Lnet/minecraft/class_1309;Lnet/minecraft/class_4587;FFFF)V ARG 1 entity ARG 2 matrices ARG 3 animationProgress diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index badce1cb0f..63689738d1 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -131,17 +131,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage COMMENT @return the color, with red at smallest and alpha at biggest bits ARG 1 x ARG 2 y - METHOD method_4316 makeGlyphBitmapSubpixel (Lorg/lwjgl/stb/STBTTFontinfo;IIIFFFFII)V - ARG 1 fontInfo - ARG 2 glyphIndex - ARG 3 width - ARG 4 height - ARG 5 scaleX - ARG 6 scaleY - ARG 7 shiftX - ARG 8 shiftY - ARG 9 startX - ARG 10 startY + METHOD method_4316 makeGlyphBitmapSubpixel (Lorg/lwjgl/util/freetype/FT_Face;I)V METHOD method_4317 copyFrom (Lnet/minecraft/class_1011;)V ARG 1 image METHOD method_4318 getFormat ()Lnet/minecraft/class_1011$class_1012; diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 77607d08ad..be4984b921 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -163,9 +163,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld CLASS class_5271 Properties FIELD field_24433 hardcore Z FIELD field_24434 gameRules Lnet/minecraft/class_1928; - FIELD field_24435 spawnX I - FIELD field_24436 spawnY I - FIELD field_24437 spawnZ I FIELD field_24438 time J FIELD field_24439 timeOfDay J FIELD field_24440 raining Z diff --git a/mappings/net/minecraft/data/DataCache.mapping b/mappings/net/minecraft/data/DataCache.mapping index 4de1f0ab9a..c562181ce2 100644 --- a/mappings/net/minecraft/data/DataCache.mapping +++ b/mappings/net/minecraft/data/DataCache.mapping @@ -19,8 +19,6 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache METHOD method_43348 parseOrCreateCache (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2408$class_7405; ARG 0 root ARG 1 dataProviderPath - METHOD method_43351 (Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/Set;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/nio/file/Path;)V - ARG 4 path METHOD method_43353 getPath (Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 providerName METHOD method_46568 (Lnet/minecraft/class_2408$class_7404;Ljava/lang/Object;)Lnet/minecraft/class_2408$class_7860; diff --git a/mappings/net/minecraft/enchantment/DamageEnchantment.mapping b/mappings/net/minecraft/enchantment/DamageEnchantment.mapping index 763423b6ec..ddb79e9997 100644 --- a/mappings/net/minecraft/enchantment/DamageEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/DamageEnchantment.mapping @@ -1,13 +1,4 @@ CLASS net/minecraft/class_1882 net/minecraft/enchantment/DamageEnchantment - FIELD field_30947 ALL_INDEX I - FIELD field_30948 UNDEAD_INDEX I - FIELD field_30949 ARTHROPODS_INDEX I - FIELD field_9063 BASE_POWERS [I - FIELD field_9064 MIN_MAX_POWER_DIFFERENCES [I - FIELD field_9065 TYPE_NAMES [Ljava/lang/String; - FIELD field_9066 POWERS_PER_LEVEL [I - FIELD field_9067 typeIndex I - METHOD (Lnet/minecraft/class_1887$class_1888;I[Lnet/minecraft/class_1304;)V + METHOD (Lnet/minecraft/class_1887$class_1888;IIILjava/util/Optional;[Lnet/minecraft/class_1304;)V ARG 1 weight ARG 2 typeIndex - ARG 3 slots diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index b851bb208a..d2fdb673f7 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment FIELD field_45769 registryEntry Lnet/minecraft/class_6880$class_6883; - FIELD field_9083 target Lnet/minecraft/class_1886; FIELD field_9084 translationKey Ljava/lang/String; FIELD field_9085 rarity Lnet/minecraft/class_1887$class_1888; FIELD field_9086 slotTypes [Lnet/minecraft/class_1304; - METHOD (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_1886;[Lnet/minecraft/class_1304;)V + METHOD (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_6862;[Lnet/minecraft/class_1304;)V ARG 1 rarity - ARG 2 target ARG 3 slotTypes METHOD method_20742 getMaxPower (I)I ARG 1 level @@ -51,12 +49,10 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment METHOD method_8191 byRawId (I)Lnet/minecraft/class_1887; ARG 0 id METHOD method_8192 isAcceptableItem (Lnet/minecraft/class_1799;)Z - ARG 1 stack METHOD method_8193 isTreasure ()Z METHOD method_8195 isCursed ()Z - METHOD method_8196 getAttackDamage (ILnet/minecraft/class_1310;)F + METHOD method_8196 getAttackDamage (ILnet/minecraft/class_1299;)F ARG 1 level - ARG 2 group CLASS class_1888 Rarity COMMENT The rarity is an attribute of an enchantment. COMMENT diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 37c73e38be..a3163e6f9c 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -79,7 +79,7 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper METHOD method_8207 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;Lnet/minecraft/class_1887;I)V ARG 2 enchantment ARG 3 level - METHOD method_8208 (Lorg/apache/commons/lang3/mutable/MutableFloat;Lnet/minecraft/class_1310;Lnet/minecraft/class_1887;I)V + METHOD method_8208 (Lorg/apache/commons/lang3/mutable/MutableFloat;Lnet/minecraft/class_1299;Lnet/minecraft/class_1887;I)V ARG 2 enchantment ARG 3 level METHOD method_8209 forEachEnchantment (Lnet/minecraft/class_1890$class_1891;Ljava/lang/Iterable;)V @@ -112,9 +112,8 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 0 entity METHOD method_8217 getSweepingMultiplier (Lnet/minecraft/class_1309;)F ARG 0 entity - METHOD method_8218 getAttackDamage (Lnet/minecraft/class_1799;Lnet/minecraft/class_1310;)F + METHOD method_8218 getAttackDamage (Lnet/minecraft/class_1799;Lnet/minecraft/class_1299;)F ARG 0 stack - ARG 1 group METHOD method_8219 getProtectionAmount (Ljava/lang/Iterable;Lnet/minecraft/class_1282;)I ARG 0 equipment ARG 1 source diff --git a/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping b/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping deleted file mode 100644 index 5dd5995da4..0000000000 --- a/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_1886 net/minecraft/enchantment/EnchantmentTarget - METHOD method_8177 isAcceptableItem (Lnet/minecraft/class_1792;)Z - ARG 1 item diff --git a/mappings/net/minecraft/enchantment/ThornsEnchantment.mapping b/mappings/net/minecraft/enchantment/ThornsEnchantment.mapping index 8ed03c6eea..420eba919d 100644 --- a/mappings/net/minecraft/enchantment/ThornsEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/ThornsEnchantment.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_1906 net/minecraft/enchantment/ThornsEnchantment METHOD (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V ARG 1 weight ARG 2 slotTypes - METHOD method_30345 (Ljava/util/Map$Entry;Lnet/minecraft/class_1309;)V - ARG 1 entity METHOD method_8242 getDamageAmount (ILnet/minecraft/class_5819;)I ARG 0 level ARG 1 random diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index d0f0c34a2e..cf37d4cc2b 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -997,8 +997,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity 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; COMMENT {@return the block state at the entity's position} COMMENT diff --git a/mappings/net/minecraft/entity/EntityGroup.mapping b/mappings/net/minecraft/entity/EntityGroup.mapping deleted file mode 100644 index ec9e2bedc8..0000000000 --- a/mappings/net/minecraft/entity/EntityGroup.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_1310 net/minecraft/entity/EntityGroup - FIELD field_6289 UNDEAD Lnet/minecraft/class_1310; - FIELD field_6290 DEFAULT Lnet/minecraft/class_1310; - FIELD field_6291 ILLAGER Lnet/minecraft/class_1310; - FIELD field_6292 AQUATIC Lnet/minecraft/class_1310; - FIELD field_6293 ARTHROPOD Lnet/minecraft/class_1310; diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index f1ac8ab5d0..a057be02d2 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -151,12 +151,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 stack METHOD method_20235 sendEquipmentBreakStatus (Lnet/minecraft/class_1304;)V ARG 1 slot - METHOD method_20236 sendToolBreakStatus (Lnet/minecraft/class_1268;)V - ARG 1 hand METHOD method_20237 getEquipmentBreakStatus (Lnet/minecraft/class_1304;)B ARG 0 slot - METHOD method_20238 (Lnet/minecraft/class_1309;)V - ARG 0 player METHOD method_21753 getStingerCount ()I METHOD method_21754 isHoldingOntoLadder ()Z COMMENT @return {@code true} if this entity should not lose height while in a climbing state @@ -215,8 +211,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT the effect to set ARG 2 source COMMENT the source entity or {@code null} for non-entity sources - METHOD method_26084 (Lnet/minecraft/class_1309;)V - ARG 0 player METHOD method_26317 applyFluidMovingSpeed (DZLnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 gravity ARG 3 falling @@ -397,7 +391,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 source METHOD method_6012 clearStatusEffects ()Z METHOD method_6013 playHurtSound (Lnet/minecraft/class_1282;)V - ARG 1 source METHOD method_6014 getItemUseTimeLeft ()I METHOD method_6015 setAttacker (Lnet/minecraft/class_1309;)V ARG 1 attacker @@ -466,7 +459,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6044 endCombat ()V METHOD method_6045 playEquipmentBreakEffects (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_6046 getGroup ()Lnet/minecraft/class_1310; METHOD method_6047 getMainHandStack ()Lnet/minecraft/class_1799; METHOD method_6048 getItemUseTime ()I METHOD method_6049 canHaveStatusEffect (Lnet/minecraft/class_1293;)Z diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping index ff76bd1c3b..a8925a545f 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping @@ -5,9 +5,8 @@ CLASS net/minecraft/class_4806 net/minecraft/entity/ai/brain/task/BreedTask FIELD field_30104 MAX_RANGE I FIELD field_30105 MIN_BREED_TIME I FIELD field_30106 RUN_TIME I - METHOD (Lnet/minecraft/class_1299;F)V + METHOD (Lnet/minecraft/class_1299;)V ARG 1 targetType - ARG 2 speed METHOD method_24542 getBreedTarget (Lnet/minecraft/class_1429;)Lnet/minecraft/class_1429; ARG 1 animal METHOD method_24545 (Lnet/minecraft/class_1429;Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask.mapping index d75ef4b380..63e3ee1319 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_4126 net/minecraft/entity/ai/brain/task/GatherItemsVillagerTask FIELD field_18389 items Ljava/util/Set; - FIELD field_30182 MAX_RANGE I - FIELD field_30183 WALK_TOGETHER_SPEED F METHOD method_19013 giveHalfOfStack (Lnet/minecraft/class_1646;Ljava/util/Set;Lnet/minecraft/class_1309;)V ARG 0 villager ARG 1 validItems diff --git a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping index 01d89087b5..29ab58d7c2 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LookTargetUtil.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil METHOD method_19547 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1309;)Z ARG 1 entity - METHOD method_19548 lookAtAndWalkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;F)V + METHOD method_19548 lookAtAndWalkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;FI)V ARG 0 first ARG 1 second ARG 2 speed @@ -20,7 +20,7 @@ CLASS net/minecraft/class_4215 net/minecraft/entity/ai/brain/task/LookTargetUtil METHOD method_19554 lookAt (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V ARG 0 entity ARG 1 target - METHOD method_19555 walkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;F)V + METHOD method_19555 walkTowardsEachOther (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;FI)V ARG 0 first ARG 1 second ARG 2 speed diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping index 41545ecacf..5da8fea966 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_4111 net/minecraft/entity/ai/brain/task/VillagerBreedTask FIELD field_18368 breedEndTime J - FIELD field_30190 MAX_DISTANCE I - FIELD field_30191 APPROACH_SPEED F METHOD method_18970 createChild (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;)Ljava/util/Optional; ARG 1 world ARG 2 parent diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index 0671d02fad..108c9337b3 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -41,10 +41,6 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod COMMENT Multiplies the total value of the attribute. COMMENT COMMENT

The total value is equal to the sum of all additions and base multiplications applied by an attribute modifier. - FIELD field_6332 VALUES [Lnet/minecraft/class_1322$class_1323; METHOD (Ljava/lang/String;ILjava/lang/String;I)V ARG 3 name ARG 4 id - METHOD method_6190 fromId (I)Lnet/minecraft/class_1322$class_1323; - ARG 0 id - METHOD method_6191 getId ()I diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index f9ba664d43..a991ded472 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -62,12 +62,9 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker METHOD method_46360 of (Lnet/minecraft/class_2940;Ljava/lang/Object;)Lnet/minecraft/class_2945$class_7834; ARG 0 data ARG 1 value - METHOD method_46361 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_46362 fromBuf (Lnet/minecraft/class_2540;I)Lnet/minecraft/class_2945$class_7834; - ARG 0 buf + METHOD method_46361 write (Lnet/minecraft/class_9129;)V + METHOD method_46362 fromBuf (Lnet/minecraft/class_9129;I)Lnet/minecraft/class_2945$class_7834; ARG 1 id - METHOD method_46363 fromBuf (Lnet/minecraft/class_2540;ILnet/minecraft/class_2941;)Lnet/minecraft/class_2945$class_7834; - ARG 0 buf + METHOD method_46363 fromBuf (Lnet/minecraft/class_9129;ILnet/minecraft/class_2941;)Lnet/minecraft/class_2945$class_7834; ARG 1 id ARG 2 handler diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping index 376300a2a7..3f7375fa4c 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping @@ -1,28 +1,6 @@ CLASS net/minecraft/class_2941 net/minecraft/entity/data/TrackedDataHandler METHOD method_12714 copy (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 value - METHOD method_12715 write (Lnet/minecraft/class_2540;Ljava/lang/Object;)V - ARG 1 buf - ARG 2 value - METHOD method_12716 read (Lnet/minecraft/class_2540;)Ljava/lang/Object; - ARG 1 buf METHOD method_12717 create (I)Lnet/minecraft/class_2940; ARG 1 id - METHOD method_43237 of (Lnet/minecraft/class_2359;)Lnet/minecraft/class_2941; - ARG 0 registry - METHOD method_43238 (Lnet/minecraft/class_2359;Lnet/minecraft/class_2540;)Ljava/lang/Object; - ARG 1 buf - METHOD method_43239 (Lnet/minecraft/class_2359;Lnet/minecraft/class_2540;Ljava/lang/Object;)V - ARG 1 buf - ARG 2 value - METHOD method_43240 ofEnum (Ljava/lang/Class;)Lnet/minecraft/class_2941; - ARG 0 enum_ - METHOD method_43241 (Ljava/lang/Class;Lnet/minecraft/class_2540;)Ljava/lang/Enum; - ARG 1 buf - METHOD method_43242 of (Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7461;)Lnet/minecraft/class_2941; - ARG 0 writer - ARG 1 reader - METHOD method_43243 ofOptional (Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7461;)Lnet/minecraft/class_2941; - ARG 0 writer - ARG 1 reader CLASS class_7394 ImmutableHandler diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index 3968eaa137..f8e792668b 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -35,10 +35,4 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis ARG 0 handler METHOD method_12721 get (I)Lnet/minecraft/class_2941; ARG 0 id - METHOD method_43248 (Lnet/minecraft/class_2540;Ljava/lang/Byte;)V - ARG 0 buf - ARG 1 byte_ CLASS 3 - METHOD method_12744 read (Lnet/minecraft/class_2540;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394; - ARG 1 buf - ARG 2 type diff --git a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping index 91b4a3a1f6..6cea3cb6cb 100644 --- a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping +++ b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_1548 net/minecraft/entity/mob/CreeperEntity FIELD field_7229 lastFuseTime I FIELD field_7230 FUSE_SPEED Lnet/minecraft/class_2940; FIELD field_7231 IGNITED Lnet/minecraft/class_2940; - METHOD method_20256 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx METHOD method_26908 createCreeperAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_7000 isIgnited ()Z METHOD method_7001 spawnEffectsCloud ()V diff --git a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping index 74690dcd0e..9d85a4f930 100644 --- a/mappings/net/minecraft/entity/mob/HoglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HoglinEntity.mapping @@ -29,5 +29,3 @@ CLASS net/minecraft/class_4760 net/minecraft/entity/mob/HoglinEntity ARG 1 immuneToZombification METHOD method_26949 setCannotBeHunted (Z)V ARG 1 cannotBeHunted - METHOD method_30081 playSound (Lnet/minecraft/class_3414;)V - ARG 1 sound diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 06b50dd3b8..131a469d6e 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -91,10 +91,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_20820 canGather (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_23734 isDisallowedInPeaceful ()Z - METHOD method_24521 disablePlayerShield (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V - ARG 1 player - ARG 2 mobStack - ARG 3 playerStack METHOD method_24522 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1308;)V ARG 2 entity METHOD method_24523 tryEquip (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index 644ba1920e..3c7f81f1e8 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -46,5 +46,3 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity METHOD method_29272 isDancing ()Z METHOD method_29274 setDancing (Z)V ARG 1 dancing - METHOD method_30086 playSound (Lnet/minecraft/class_3414;)V - ARG 1 sound diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index 6e7587210f..6b45d92656 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -18,13 +18,8 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity METHOD method_31547 spawnNewShulker ()V METHOD method_33342 getExtraLength (F)F ARG 0 openProgress - METHOD method_33346 calculateBoundingBox (Lnet/minecraft/class_2350;F)Lnet/minecraft/class_238; - ARG 0 direction - ARG 1 extraLength - METHOD method_33347 calculateBoundingBox (Lnet/minecraft/class_2350;FF)Lnet/minecraft/class_238; - ARG 0 direction - ARG 1 prevExtraLength - ARG 2 extraLength + METHOD method_33346 calculateBoundingBox (FLnet/minecraft/class_2350;F)Lnet/minecraft/class_238; + METHOD method_33347 calculateBoundingBox (FLnet/minecraft/class_2350;FF)Lnet/minecraft/class_238; METHOD method_33348 tryAttachOrTeleport ()V METHOD method_33349 tickOpenProgress ()Z METHOD method_33350 moveEntities ()V diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping index 7ffbd491e8..1e529b1990 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity 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 @@ -20,13 +18,13 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity 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_55724 unroll ()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 + METHOD (Ljava/lang/String;ILjava/lang/String;I)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/CamelEntity.mapping b/mappings/net/minecraft/entity/passive/CamelEntity.mapping index 4ba3db3281..dbfad55957 100644 --- a/mappings/net/minecraft/entity/passive/CamelEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CamelEntity.mapping @@ -30,9 +30,6 @@ CLASS net/minecraft/class_7689 net/minecraft/entity/passive/CamelEntity METHOD method_45362 setDashing (Z)V ARG 1 dashing METHOD method_46398 shouldPlaySittingTransitionAnimation ()Z - METHOD method_48159 clampHeadYaw (Lnet/minecraft/class_1297;F)V - ARG 1 entity - ARG 2 range METHOD method_48160 initLastPoseTick (J)V ARG 1 time METHOD method_48573 shouldUpdateSittingAnimations ()Z diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index 063528f821..5bec5e1d43 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -43,8 +43,6 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity METHOD method_26881 createCatAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_43088 (Lnet/minecraft/class_6880;)V ARG 1 variant - METHOD method_43089 (Lnet/minecraft/class_5425;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 list CLASS class_3698 CatFleeGoal FIELD field_16293 cat Lnet/minecraft/class_1451; METHOD (Lnet/minecraft/class_1451;Ljava/lang/Class;FDD)V diff --git a/mappings/net/minecraft/entity/passive/GoatBrain.mapping b/mappings/net/minecraft/entity/passive/GoatBrain.mapping index bb418ea525..b3fedc1445 100644 --- a/mappings/net/minecraft/entity/passive/GoatBrain.mapping +++ b/mappings/net/minecraft/entity/passive/GoatBrain.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain - FIELD field_30405 BREEDING_WALK_SPEED F FIELD field_30406 FOLLOWING_TARGET_WALK_SPEED F FIELD field_30407 WALKING_SPEED Lnet/minecraft/class_6019; FIELD field_30408 TEMPTED_WALK_SPEED F diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index 10699b1b20..26f43815ac 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity ARG 1 mooshroom METHOD method_18436 getStewEffectFrom (Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 1 flower - METHOD method_20253 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx METHOD method_20665 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/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index 0caa5f9998..0b7f4dd266 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity METHOD method_17690 createDyeMixingCraftingInventory (Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)Lnet/minecraft/class_8566; ARG 0 firstColor ARG 1 secondColor - METHOD method_20254 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx METHOD method_26893 createSheepAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6628 getNeckAngle (F)F ARG 1 delta diff --git a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping index faa39214b0..a7b01a4a3a 100644 --- a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_1473 net/minecraft/entity/passive/SnowGolemEntity FIELD field_6873 SNOW_GOLEM_FLAGS Lnet/minecraft/class_2940; METHOD method_18443 (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_20255 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 playerx METHOD method_26894 createSnowGolemAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6642 setHasPumpkin (Z)V ARG 1 hasPumpkin diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 54675ccb57..83e9088941 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -27,8 +27,6 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity 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. diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 5daa8bdce2..4bb290c408 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -74,8 +74,6 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 0 entityType METHOD method_17853 (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD method_20266 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 player METHOD method_21701 isBlockBreakingRestricted (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1934;)Z ARG 1 world ARG 2 pos @@ -187,8 +185,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 1 stat METHOD method_7283 setMainArm (Lnet/minecraft/class_1306;)V ARG 1 arm - METHOD method_7284 disableShield (Z)V - ARG 1 sprinting + METHOD method_7284 disableShield ()V METHOD method_7285 addScore (I)V ARG 1 score METHOD method_7286 applyEnchantmentCosts (Lnet/minecraft/class_1799;I)V diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 2255d35437..e52f1be203 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -26,8 +26,6 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory FIELD field_7548 armor Lnet/minecraft/class_2371; METHOD (Lnet/minecraft/class_1657;)V ARG 1 player - METHOD method_20265 (ILnet/minecraft/class_1657;)V - ARG 1 player METHOD method_29280 remove (Ljava/util/function/Predicate;ILnet/minecraft/class_1263;)I ARG 1 shouldRemove ARG 2 maxCount diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping index e6aacfda8a..f7afb1c430 100644 --- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping @@ -44,8 +44,6 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject COMMENT

This is the original stack used to spawn the projectile. {@link #asItemStack} 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/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 2cacd1b28f..bf6730e0ce 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -64,4 +64,3 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity COMMENT mobs/tools have higher values; some mobs have difficulty-adjusted COMMENT values METHOD method_7488 onCollision (Lnet/minecraft/class_239;)V - ARG 1 hitResult diff --git a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping index 725afe354d..fea287fdd3 100644 --- a/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping +++ b/mappings/net/minecraft/entity/vehicle/VehicleInventory.mapping @@ -36,5 +36,5 @@ CLASS net/minecraft/class_7265 net/minecraft/entity/vehicle/VehicleInventory ARG 1 slot METHOD method_42293 clearInventory ()V METHOD method_42294 canPlayerAccess (Lnet/minecraft/class_1657;)Z - ARG 1 player METHOD method_42295 isInventoryEmpty ()Z + METHOD method_5829 getBoundingBox ()Lnet/minecraft/class_238; diff --git a/mappings/net/minecraft/inventory/Inventory.mapping b/mappings/net/minecraft/inventory/Inventory.mapping index 955e47f25d..5c7f6d8464 100644 --- a/mappings/net/minecraft/inventory/Inventory.mapping +++ b/mappings/net/minecraft/inventory/Inventory.mapping @@ -68,7 +68,7 @@ CLASS net/minecraft/class_1263 net/minecraft/inventory/Inventory COMMENT @see #canPlayerUse(BlockEntity, PlayerEntity, int) ARG 0 blockEntity ARG 1 player - METHOD method_49106 canPlayerUse (Lnet/minecraft/class_2586;Lnet/minecraft/class_1657;I)Z + METHOD method_49106 canPlayerUse (Lnet/minecraft/class_2586;Lnet/minecraft/class_1657;F)Z COMMENT {@return whether {@code player} can use this {@code blockEntity}} COMMENT COMMENT @apiNote This is used by block entities to implement {@link @@ -80,7 +80,6 @@ CLASS net/minecraft/class_1263 net/minecraft/inventory/Inventory COMMENT @see #canPlayerUse(BlockEntity, PlayerEntity) ARG 0 blockEntity ARG 1 player - ARG 2 range METHOD method_5431 markDirty ()V COMMENT Marks the inventory as modified. Implementations should call this method COMMENT every time the inventory is changed in any way. diff --git a/mappings/net/minecraft/item/AxeItem.mapping b/mappings/net/minecraft/item/AxeItem.mapping index 8c7f9a3a77..9d1dcd2860 100644 --- a/mappings/net/minecraft/item/AxeItem.mapping +++ b/mappings/net/minecraft/item/AxeItem.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_1743 net/minecraft/item/AxeItem ARG 2 attackDamage ARG 3 attackSpeed ARG 4 settings - METHOD method_20269 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 p METHOD method_34716 getStrippedState (Lnet/minecraft/class_2680;)Ljava/util/Optional; ARG 1 state METHOD method_34717 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/item/BoneMealItem.mapping b/mappings/net/minecraft/item/BoneMealItem.mapping index 5045613c67..e542a4c65a 100644 --- a/mappings/net/minecraft/item/BoneMealItem.mapping +++ b/mappings/net/minecraft/item/BoneMealItem.mapping @@ -1,12 +1,8 @@ CLASS net/minecraft/class_1752 net/minecraft/item/BoneMealItem METHOD method_40006 (Lnet/minecraft/class_4970$class_4971;)Z ARG 0 state - METHOD method_40127 (Lnet/minecraft/class_1937;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 blocks METHOD method_40128 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2680; ARG 0 blockEntry - METHOD method_40129 (Lnet/minecraft/class_1937;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 blocks METHOD method_40130 (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2680; ARG 0 blockEntry METHOD method_7719 useOnGround (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z diff --git a/mappings/net/minecraft/item/BowItem.mapping b/mappings/net/minecraft/item/BowItem.mapping index d1cbdb6777..b57056091d 100644 --- a/mappings/net/minecraft/item/BowItem.mapping +++ b/mappings/net/minecraft/item/BowItem.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_1753 net/minecraft/item/BowItem FIELD field_30855 TICKS_PER_SECOND I FIELD field_30856 RANGE I - METHOD method_20270 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1657;)V - ARG 1 p METHOD method_7722 getPullProgress (I)F ARG 0 useTicks diff --git a/mappings/net/minecraft/item/BrushItem.mapping b/mappings/net/minecraft/item/BrushItem.mapping index db93d2aeff..b20e975845 100644 --- a/mappings/net/minecraft/item/BrushItem.mapping +++ b/mappings/net/minecraft/item/BrushItem.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_8162 net/minecraft/item/BrushItem ARG 5 arm METHOD method_49999 getHitResult (Lnet/minecraft/class_1657;)Lnet/minecraft/class_239; ARG 1 user - METHOD method_51163 (Lnet/minecraft/class_1304;Lnet/minecraft/class_1309;)V - ARG 1 userx METHOD method_51309 (Lnet/minecraft/class_1297;)Z ARG 0 entity CLASS class_8163 DustParticlesOffset diff --git a/mappings/net/minecraft/item/CrossbowItem.mapping b/mappings/net/minecraft/item/CrossbowItem.mapping index f43d5ea0a6..cc7ff5a380 100644 --- a/mappings/net/minecraft/item/CrossbowItem.mapping +++ b/mappings/net/minecraft/item/CrossbowItem.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_1764 net/minecraft/item/CrossbowItem ARG 1 entity ARG 2 crossbow ARG 3 arrow - METHOD method_20272 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1309;)V - ARG 1 e METHOD method_20309 getSpeed (Lnet/minecraft/class_1799;)F ARG 0 stack METHOD method_7763 shoot (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;FZFFF)V diff --git a/mappings/net/minecraft/item/FishingRodItem.mapping b/mappings/net/minecraft/item/FishingRodItem.mapping index 1782654718..11370606da 100644 --- a/mappings/net/minecraft/item/FishingRodItem.mapping +++ b/mappings/net/minecraft/item/FishingRodItem.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_1787 net/minecraft/item/FishingRodItem - METHOD method_20275 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 p diff --git a/mappings/net/minecraft/item/FlintAndSteelItem.mapping b/mappings/net/minecraft/item/FlintAndSteelItem.mapping index 936ddb58f4..59be428126 100644 --- a/mappings/net/minecraft/item/FlintAndSteelItem.mapping +++ b/mappings/net/minecraft/item/FlintAndSteelItem.mapping @@ -1,5 +1 @@ CLASS net/minecraft/class_1786 net/minecraft/item/FlintAndSteelItem - METHOD method_20276 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 p - METHOD method_20277 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 p diff --git a/mappings/net/minecraft/item/GoatHornItem.mapping b/mappings/net/minecraft/item/GoatHornItem.mapping index 35abfac97a..d3994b6af1 100644 --- a/mappings/net/minecraft/item/GoatHornItem.mapping +++ b/mappings/net/minecraft/item/GoatHornItem.mapping @@ -18,8 +18,6 @@ CLASS net/minecraft/class_7430 net/minecraft/item/GoatHornItem ARG 0 world ARG 1 player ARG 2 instrument - METHOD method_43710 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 entryList METHOD method_43711 getInstrument (Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 1 stack METHOD method_45432 (Lnet/minecraft/class_6880;)Ljava/lang/Integer; diff --git a/mappings/net/minecraft/item/HoeItem.mapping b/mappings/net/minecraft/item/HoeItem.mapping index 5ee7f048d0..449cbf3d51 100644 --- a/mappings/net/minecraft/item/HoeItem.mapping +++ b/mappings/net/minecraft/item/HoeItem.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_1794 net/minecraft/item/HoeItem ARG 2 attackDamage ARG 3 attackSpeed ARG 4 settings - METHOD method_20279 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 p METHOD method_36984 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1838;)V ARG 1 context METHOD method_36985 createTillAndDropAction (Lnet/minecraft/class_2680;Lnet/minecraft/class_1935;)Ljava/util/function/Consumer; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 92d1f94871..1bfce019aa 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -450,7 +450,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7954 toHoverableText ()Lnet/minecraft/class_2561; COMMENT {@return a text consisting of the bracketed {@linkplain #getName stack name} that COMMENT can be hovered to show the item stack's tooltip} - METHOD method_7956 damage (ILnet/minecraft/class_1309;Ljava/util/function/Consumer;)V + METHOD method_7956 damage (ILnet/minecraft/class_5819;Lnet/minecraft/class_3222;Ljava/lang/Runnable;)V COMMENT Damages this item stack. This method should be used when an entity, including a player, COMMENT damages the stack. This does not damage {@linkplain #isDamageable non-damageable} COMMENT stacks, and the {@linkplain net.minecraft.enchantment.UnbreakingEnchantment @@ -466,11 +466,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT by a player. The callback should call {@link LivingEntity#sendEquipmentBreakStatus} COMMENT or {@link LivingEntity#sendToolBreakStatus}. ARG 1 amount - ARG 2 entity - COMMENT the entity that holds the stack to be damaged - ARG 3 breakCallback - COMMENT the callback that takes the entity holding the stack and is executed - COMMENT when the item breaks METHOD method_7958 hasGlint ()Z METHOD method_7959 setSubNbt (Ljava/lang/String;Lnet/minecraft/class_2520;)V COMMENT Sets the given NBT element in the item stack's custom NBT at the specified key. @@ -507,7 +502,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT {@return the custom NBT of this item stack, may be {@code null}} COMMENT COMMENT @see Item Stack NBT Operations - METHOD method_7970 damage (ILnet/minecraft/class_5819;Lnet/minecraft/class_3222;)Z + METHOD method_7970 damage (ILnet/minecraft/class_1309;Lnet/minecraft/class_1304;)V COMMENT Damages this item stack. This method should be used when a non-entity, such as a COMMENT dispenser, damages the stack. This does not damage {@linkplain #isDamageable non-damageable} COMMENT stacks, and the {@linkplain net.minecraft.enchantment.UnbreakingEnchantment @@ -522,9 +517,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @return whether the stack's damage is equal to or above {@linkplain Item#getMaxDamage COMMENT the maximum damage} (i.e. whether the item is "broken") ARG 1 amount - ARG 2 random - ARG 3 player - COMMENT the player that holds the stack to be damaged, or {@code null} if inapplicable METHOD method_7971 split (I)Lnet/minecraft/class_1799; COMMENT {@return the copy of the stack "split" from the current stack with item count COMMENT being at most {@code amount}} diff --git a/mappings/net/minecraft/item/MiningToolItem.mapping b/mappings/net/minecraft/item/MiningToolItem.mapping index a2ba3e4dc1..a30bc175fe 100644 --- a/mappings/net/minecraft/item/MiningToolItem.mapping +++ b/mappings/net/minecraft/item/MiningToolItem.mapping @@ -9,8 +9,4 @@ CLASS net/minecraft/class_1766 net/minecraft/item/MiningToolItem ARG 3 material ARG 4 effectiveBlocks ARG 5 settings - METHOD method_20273 (Lnet/minecraft/class_1309;)V - ARG 0 e - METHOD method_20274 (Lnet/minecraft/class_1309;)V - ARG 0 e METHOD method_26366 getAttackDamage ()F diff --git a/mappings/net/minecraft/item/OnAStickItem.mapping b/mappings/net/minecraft/item/OnAStickItem.mapping index b41fffcf96..4d01fe4d13 100644 --- a/mappings/net/minecraft/item/OnAStickItem.mapping +++ b/mappings/net/minecraft/item/OnAStickItem.mapping @@ -5,5 +5,3 @@ CLASS net/minecraft/class_1758 net/minecraft/item/OnAStickItem ARG 1 settings ARG 2 target ARG 3 damagePerUse - METHOD method_20271 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V - ARG 1 p diff --git a/mappings/net/minecraft/item/ShearsItem.mapping b/mappings/net/minecraft/item/ShearsItem.mapping index 6b8a0c0d74..ec63c66cc8 100644 --- a/mappings/net/minecraft/item/ShearsItem.mapping +++ b/mappings/net/minecraft/item/ShearsItem.mapping @@ -1,5 +1 @@ CLASS net/minecraft/class_1820 net/minecraft/item/ShearsItem - METHOD method_20280 (Lnet/minecraft/class_1309;)V - ARG 0 e - METHOD method_38078 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 player diff --git a/mappings/net/minecraft/item/ShovelItem.mapping b/mappings/net/minecraft/item/ShovelItem.mapping index 413992abf0..a5fc2f733a 100644 --- a/mappings/net/minecraft/item/ShovelItem.mapping +++ b/mappings/net/minecraft/item/ShovelItem.mapping @@ -5,5 +5,3 @@ CLASS net/minecraft/class_1821 net/minecraft/item/ShovelItem ARG 2 attackDamage ARG 3 attackSpeed ARG 4 settings - METHOD method_20281 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V - ARG 1 p diff --git a/mappings/net/minecraft/item/SwordItem.mapping b/mappings/net/minecraft/item/SwordItem.mapping index fc46bd46da..2326fe456f 100644 --- a/mappings/net/minecraft/item/SwordItem.mapping +++ b/mappings/net/minecraft/item/SwordItem.mapping @@ -6,8 +6,4 @@ CLASS net/minecraft/class_1829 net/minecraft/item/SwordItem ARG 2 attackDamage ARG 3 attackSpeed ARG 4 settings - METHOD method_20282 (Lnet/minecraft/class_1309;)V - ARG 0 e - METHOD method_20283 (Lnet/minecraft/class_1309;)V - ARG 0 e METHOD method_8020 getAttackDamage ()F diff --git a/mappings/net/minecraft/item/TridentItem.mapping b/mappings/net/minecraft/item/TridentItem.mapping index 29ca0398a6..dbf9c1055f 100644 --- a/mappings/net/minecraft/item/TridentItem.mapping +++ b/mappings/net/minecraft/item/TridentItem.mapping @@ -1,9 +1,3 @@ CLASS net/minecraft/class_1835 net/minecraft/item/TridentItem FIELD field_23746 attributeModifiers Lcom/google/common/collect/Multimap; FIELD field_30927 ATTACK_DAMAGE F - METHOD method_20284 (Lnet/minecraft/class_1309;)V - ARG 0 e - METHOD method_20285 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1657;)V - ARG 1 p - METHOD method_20286 (Lnet/minecraft/class_1309;)V - ARG 0 e diff --git a/mappings/net/minecraft/item/Vanishable.mapping b/mappings/net/minecraft/item/Vanishable.mapping deleted file mode 100644 index 5949614899..0000000000 --- a/mappings/net/minecraft/item/Vanishable.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_5150 net/minecraft/item/Vanishable - COMMENT Represents a type of item that can have the {@code minecraft:vanishing_curse} enchantment. diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index 5fdcfc7a2d..d5730aa2b5 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -31,8 +31,6 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection FIELD field_36379 PACKET_RECEIVED_MARKER Lorg/slf4j/Marker; FIELD field_36380 PACKET_SENT_MARKER Lorg/slf4j/Marker; FIELD field_44972 pendingDisconnectionReason Lnet/minecraft/class_2561; - FIELD field_45666 SERVERBOUND_PROTOCOL_KEY Lio/netty/util/AttributeKey; - FIELD field_45667 CLIENTBOUND_PROTOCOL_KEY Lio/netty/util/AttributeKey; FIELD field_45668 queuedTasks Ljava/util/Queue; FIELD field_45669 prePlayStateListener Lnet/minecraft/class_2547; FIELD field_45955 packetSizeLogger Lnet/minecraft/class_8762; @@ -88,13 +86,6 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 2 rejectsBadPackets COMMENT whether this connection may abort if a compressed packet with a bad size is received METHOD method_10762 getAveragePacketsReceived ()F - METHOD method_10763 setPacketListener (Lnet/minecraft/class_2547;)V - COMMENT Sets the packet listener that will handle oncoming packets, including - COMMENT ones that are not yet handled by the current packet listener. - COMMENT - COMMENT @apiNote This may be called from the {@linkplain #packetListener} stored - COMMENT in this connection. - ARG 1 packetListener METHOD method_10764 sendImmediately (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;Z)V ARG 1 packet ARG 2 callbacks @@ -131,13 +122,6 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 0 address ARG 1 useEpoll ARG 2 connection - METHOD method_52898 disableAutoRead ()V - METHOD method_52899 setS2CPacketHandler (Lnet/minecraft/class_8592;)V - ARG 1 intent - METHOD method_52900 (Lnet/minecraft/class_8592;Lnet/minecraft/class_2547;Ljava/lang/String;ILnet/minecraft/class_2535;)V - ARG 5 connection - METHOD method_52901 setHandlers (Lio/netty/channel/Channel;)V - ARG 0 channel METHOD method_52902 connect (Ljava/lang/String;ILnet/minecraft/class_2896;)V ARG 1 address ARG 2 port @@ -146,11 +130,9 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 1 address ARG 2 port ARG 3 listener - METHOD method_52904 connect (Ljava/lang/String;ILnet/minecraft/class_2547;Lnet/minecraft/class_8592;)V + METHOD method_52904 connect (Ljava/lang/String;ILnet/minecraft/class_9127;Lnet/minecraft/class_9127;Lnet/minecraft/class_8697;Lnet/minecraft/class_8592;)V ARG 1 address ARG 2 port - ARG 3 listener - ARG 4 intent METHOD method_52905 submit (Ljava/util/function/Consumer;)V ARG 1 task METHOD method_52906 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;Z)V @@ -159,11 +141,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 3 flush METHOD method_52907 (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;ZLnet/minecraft/class_2535;)V ARG 3 connection - METHOD method_52908 getProtocolAttributeKey (Lnet/minecraft/class_2598;)Lio/netty/util/AttributeKey; - ARG 0 side METHOD method_52909 getAddressAsString (Z)Ljava/lang/String; ARG 1 logIps - METHOD method_52910 enableAutoRead ()V METHOD method_52911 addValidator (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;)V ARG 0 pipeline ARG 1 side @@ -174,9 +153,6 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection COMMENT @see #setPacketListener ARG 1 packetListener METHOD method_52915 flush ()V - METHOD method_52916 addValidatorInternal (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;)V - ARG 0 pipeline - ARG 1 side METHOD method_52918 flushInternal ()V METHOD method_53505 resetPacketSizeLog (Lnet/minecraft/class_8743;)V ARG 1 log @@ -185,6 +161,3 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection CLASS 1 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel - CLASS 2 - METHOD initChannel (Lio/netty/channel/Channel;)V - ARG 1 channel diff --git a/mappings/net/minecraft/network/NetworkState.mapping b/mappings/net/minecraft/network/NetworkState.mapping index 0a18225109..0c433547fa 100644 --- a/mappings/net/minecraft/network/NetworkState.mapping +++ b/mappings/net/minecraft/network/NetworkState.mapping @@ -1,65 +1,5 @@ CLASS net/minecraft/class_2539 net/minecraft/network/NetworkState FIELD field_20594 stateId Ljava/lang/String; - FIELD field_20595 packetHandlers Ljava/util/Map; - FIELD field_41866 UNKNOWN_PACKET_ID I - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_2539$class_4533;)V + METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 stateId - ARG 4 initializer METHOD method_10785 getId ()Ljava/lang/String; - METHOD method_22308 createPacketHandlerInitializer ()Lnet/minecraft/class_2539$class_4533; - METHOD method_39498 getPacketIdToPacketMap (Lnet/minecraft/class_2598;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; - ARG 1 side - METHOD method_52921 getHandler (Lnet/minecraft/class_2598;)Lnet/minecraft/class_2539$class_8698; - ARG 1 side - CLASS class_4532 InternalPacketHandler - FIELD field_20596 packetIds Lit/unimi/dsi/fastutil/objects/Object2IntMap; - FIELD field_20597 packetFactories Ljava/util/List; - FIELD field_36381 LOGGER Lorg/slf4j/Logger; - FIELD field_41867 bundler Lnet/minecraft/class_8039; - FIELD field_41868 bundlePacketTypes Ljava/util/Set; - METHOD method_22310 createPacket (ILnet/minecraft/class_2540;)Lnet/minecraft/class_2596; - ARG 1 id - ARG 2 buf - METHOD method_22311 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V - ARG 0 map - METHOD method_22312 getId (Ljava/lang/Class;)I - ARG 1 packet - METHOD method_22313 register (Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/class_2539$class_4532; - ARG 1 type - ARG 2 packetFactory - METHOD method_48313 getBundler ()Lnet/minecraft/class_8039; - METHOD method_48315 (Lnet/minecraft/class_8037;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8037; - ARG 1 buf - METHOD method_48317 registerBundlePacket (Ljava/lang/Class;Ljava/util/function/Function;)Lnet/minecraft/class_2539$class_4532; - ARG 1 bundlePacketType - ARG 2 bundleFunction - METHOD method_52929 canHandle (Ljava/lang/Class;)Z - ARG 1 clazz - CLASS class_4533 PacketHandlerInitializer - FIELD field_20598 packetHandlers Ljava/util/Map; - METHOD method_22315 setup (Lnet/minecraft/class_2598;Lnet/minecraft/class_2539$class_4532;)Lnet/minecraft/class_2539$class_4533; - ARG 1 side - ARG 2 handler - METHOD method_52930 createSideToHandlerMap (Lnet/minecraft/class_2539;)Ljava/util/Map; - ARG 1 state - CLASS class_8698 PacketHandler - FIELD field_45672 state Lnet/minecraft/class_2539; - FIELD field_45673 side Lnet/minecraft/class_2598; - FIELD field_45674 backingHandler Lnet/minecraft/class_2539$class_4532; - METHOD (Lnet/minecraft/class_2539;Lnet/minecraft/class_2598;Lnet/minecraft/class_2539$class_4532;)V - ARG 1 state - ARG 2 side - ARG 3 backingHandler - METHOD method_52922 getState ()Lnet/minecraft/class_2539; - METHOD method_52923 createPacket (ILnet/minecraft/class_2540;)Lnet/minecraft/class_2596; - ARG 1 id - ARG 2 buf - METHOD method_52924 (Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;Ljava/lang/Class;Ljava/lang/Integer;)V - ARG 1 packet - ARG 2 id - METHOD method_52925 getId (Lnet/minecraft/class_2596;)I - ARG 1 packet - METHOD method_52926 getSide ()Lnet/minecraft/class_2598; - METHOD method_52927 canHandle (Lnet/minecraft/class_2596;)Z - ARG 1 packet - METHOD method_52928 getPacketIdToPacketMap ()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 594e8a8deb..04df11060d 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -332,16 +332,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return the value read COMMENT @see #writeVarLong(long) - METHOD method_10793 writeItemStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2540; - COMMENT Writes an item stack to this buf. An item stack is represented by a - COMMENT boolean indicating whether it exists; if it exists, it is followed by - COMMENT a var int for its raw id, a byte for its count, and an NBT compound for - COMMENT its tag. - COMMENT - COMMENT @return this buf, for chaining - COMMENT @see #readItemStack() - ARG 1 stack - COMMENT the stack to write METHOD method_10794 writeNbt (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2540; COMMENT Writes an NBT element to this buf. The binary representation of NBT is COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If {@code nbt} is {@code @@ -352,7 +342,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT written COMMENT @see #readNbt() COMMENT @see #readNbt(NbtSizeTracker) - ARG 1 nbt METHOD method_10795 readByteArray ()[B COMMENT Reads an array of primitive bytes from this buf. The array first has a COMMENT var int indicating its length, followed by the actual bytes. The array @@ -590,14 +579,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #writeEnumConstant(Enum) ARG 1 enumClass COMMENT the enum class, for constant lookup - METHOD method_10819 readItemStack ()Lnet/minecraft/class_1799; - COMMENT Reads an item stack from this buf. An item stack is represented by a - COMMENT boolean indicating whether it exists; if it exists, it is followed by - COMMENT a var int for its raw id, a byte for its count, and an NBT compound for - COMMENT its tag. - COMMENT - COMMENT @return the read item stack - COMMENT @see #writeItemStack(ItemStack) METHOD method_17813 writeBlockHitResult (Lnet/minecraft/class_3965;)V COMMENT Writes a block hit result to this buf. A block hit result is represented COMMENT by a block position, a direction enum constant, 3 floats for the hit @@ -707,7 +688,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT the list to write METHOD method_34061 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; ARG 1 error - METHOD method_34062 writeCollection (Ljava/util/Collection;Lnet/minecraft/class_2540$class_7462;)V + METHOD method_34062 writeCollection (Ljava/util/Collection;Lnet/minecraft/class_9142;)V COMMENT Writes a collection to this buf. The collection is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by the entries COMMENT sequentially. @@ -717,7 +698,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 collection COMMENT the collection to write ARG 2 writer - METHOD method_34063 writeMap (Ljava/util/Map;Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;)V + METHOD method_34063 writeMap (Ljava/util/Map;Lnet/minecraft/class_9142;Lnet/minecraft/class_9142;)V COMMENT Writes a map to this buf. The map is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by each key and value COMMENT pair. @@ -729,7 +710,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT the map to write ARG 2 keyWriter ARG 3 valueWriter - METHOD method_34064 (Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;Ljava/lang/Object;Ljava/lang/Object;)V + METHOD method_34064 (Lnet/minecraft/class_9142;Lnet/minecraft/class_9142;Ljava/lang/Object;Ljava/lang/Object;)V ARG 3 key ARG 4 value METHOD method_34065 forEachInCollection (Ljava/util/function/Consumer;)V @@ -740,14 +721,14 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readCollection(IntFunction, PacketByteBuf.PacketReader) ARG 1 consumer COMMENT the consumer to read entries - METHOD method_34066 readList (Lnet/minecraft/class_2540$class_7461;)Ljava/util/List; + METHOD method_34066 readList (Lnet/minecraft/class_9141;)Ljava/util/List; COMMENT Reads a collection from this buf as an array list. COMMENT COMMENT @param the list's entry type COMMENT @return the read list COMMENT @see #readCollection(IntFunction, PacketByteBuf.PacketReader) ARG 1 reader - METHOD method_34067 readMap (Lnet/minecraft/class_2540$class_7461;Lnet/minecraft/class_2540$class_7461;)Ljava/util/Map; + METHOD method_34067 readMap (Lnet/minecraft/class_9141;Lnet/minecraft/class_9141;)Ljava/util/Map; COMMENT Reads a map from this buf as a hash map. COMMENT COMMENT @param the key type @@ -756,7 +737,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readMap(IntFunction, PacketByteBuf.PacketReader, PacketByteBuf.PacketReader) ARG 1 keyReader ARG 2 valueReader - METHOD method_34068 readCollection (Ljava/util/function/IntFunction;Lnet/minecraft/class_2540$class_7461;)Ljava/util/Collection; + METHOD method_34068 readCollection (Ljava/util/function/IntFunction;Lnet/minecraft/class_9141;)Ljava/util/Collection; COMMENT Reads a collection from this buf. The collection is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by the entries COMMENT sequentially. @@ -769,7 +750,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 collectionFactory COMMENT a factory that creates a collection with a given size ARG 2 reader - METHOD method_34069 readMap (Ljava/util/function/IntFunction;Lnet/minecraft/class_2540$class_7461;Lnet/minecraft/class_2540$class_7461;)Ljava/util/Map; + METHOD method_34069 readMap (Ljava/util/function/IntFunction;Lnet/minecraft/class_9141;Lnet/minecraft/class_9141;)Ljava/util/Map; COMMENT Reads a map from this buf. The map is stored as a leading COMMENT {@linkplain #readVarInt() var int} size followed by each key and value COMMENT pair. @@ -782,8 +763,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readMap(PacketByteBuf.PacketReader, PacketByteBuf.PacketReader) ARG 1 mapFactory COMMENT a factory that creates a map with a given size - ARG 2 keyReader - ARG 3 valueReader METHOD method_34070 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; ARG 1 error METHOD method_36130 writeChunkPos (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2540; @@ -808,7 +787,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return the read chunk position COMMENT @see #writeChunkPos(ChunkPos) - METHOD method_37435 writeOptional (Ljava/util/Optional;Lnet/minecraft/class_2540$class_7462;)V + METHOD method_37435 writeOptional (Ljava/util/Optional;Lnet/minecraft/class_9142;)V COMMENT Writes an optional value to this buf. An optional value is represented by COMMENT a boolean indicating if the value is present, followed by the value only if COMMENT the value is present. @@ -816,7 +795,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readOptional(PacketByteBuf.PacketReader) ARG 1 value ARG 2 writer - METHOD method_37436 readOptional (Lnet/minecraft/class_2540$class_7461;)Ljava/util/Optional; + METHOD method_37436 readOptional (Lnet/minecraft/class_9141;)Ljava/util/Optional; COMMENT Reads an optional value from this buf. An optional value is represented by COMMENT a boolean indicating if the value is present, followed by the value only if COMMENT the value is present. @@ -829,30 +808,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf METHOD method_37453 getMaxValidator (Ljava/util/function/IntFunction;I)Ljava/util/function/IntFunction; ARG 0 applier ARG 1 max - METHOD method_42064 readRegistryValue (Lnet/minecraft/class_2359;)Ljava/lang/Object; - COMMENT Reads a value from a registry (or other {@link IndexedIterable}s). The value - COMMENT is stored using its raw ID as a {@linkplain #readVarInt() var int}. - COMMENT - COMMENT

Callers must ensure that the registry (or the indexed iterable) is - COMMENT properly synchronized between the client and the server. - COMMENT - COMMENT @return the value, or {@code null} if it is missing from {@code registry} - COMMENT @see #writeRegistryValue(IndexedIterable, Object) - ARG 1 registry - COMMENT the registry (or an indexed iterable) that contains the value - METHOD method_42065 writeRegistryValue (Lnet/minecraft/class_2359;Ljava/lang/Object;)V - COMMENT Writes a value from a registry (or other {@link IndexedIterable}s). The value - COMMENT is stored using its raw ID as a {@linkplain #readVarInt() var int}. - COMMENT - COMMENT

Callers must ensure that the registry (or the indexed iterable) is - COMMENT properly synchronized between the client and the server. - COMMENT - COMMENT @throws IllegalArgumentException if {@code value} is not in {@code registry} - COMMENT @see #readRegistryValue(IndexedIterable) - ARG 1 registry - COMMENT the registry (or an indexed iterable) that contains the value - ARG 2 value - COMMENT a value to write, must be in {@code registry} METHOD method_43616 writeGameProfile (Lcom/mojang/authlib/GameProfile;)V COMMENT Writes a game profile to this buf. A game profile is represented by a COMMENT {@linkplain #writeUuid(UUID) uuid}, a username string, and a collection of @@ -867,7 +822,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT exists if signed). COMMENT COMMENT @see #readProperty() - METHOD method_43619 writeEither (Lcom/mojang/datafixers/util/Either;Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;)V + METHOD method_43619 writeEither (Lcom/mojang/datafixers/util/Either;Lnet/minecraft/class_9142;Lnet/minecraft/class_9142;)V COMMENT Writes an {@code Either} to this buf. An either is represented by COMMENT a boolean indicating if the left side or the right side of the either, COMMENT followed by the value. @@ -876,11 +831,11 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 either ARG 2 leftWriter ARG 3 rightWriter - METHOD method_43620 (Lnet/minecraft/class_2540$class_7462;Ljava/lang/Object;)V + METHOD method_43620 (Lnet/minecraft/class_9142;Ljava/lang/Object;)V ARG 2 object - METHOD method_43621 (Lnet/minecraft/class_2540$class_7462;Ljava/lang/Object;)V + METHOD method_43621 (Lnet/minecraft/class_9142;Ljava/lang/Object;)V ARG 2 object - METHOD method_43622 readEither (Lnet/minecraft/class_2540$class_7461;Lnet/minecraft/class_2540$class_7461;)Lcom/mojang/datafixers/util/Either; + METHOD method_43622 readEither (Lnet/minecraft/class_9141;Lnet/minecraft/class_9141;)Lcom/mojang/datafixers/util/Either; COMMENT Reads an {@code Either} from this buf. An either is represented by COMMENT a boolean indicating if the left side or the right side of the either, COMMENT followed by the value. @@ -904,7 +859,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return the property COMMENT @see #writeProperty(Property) - METHOD method_43826 writeNullable (Ljava/lang/Object;Lnet/minecraft/class_2540$class_7462;)V + METHOD method_43826 writeNullable (Ljava/lang/Object;Lnet/minecraft/class_9142;)V COMMENT Writes a nullable value to this buf. A nullable value is represented by COMMENT a boolean indicating if the value is not null, followed by the value only if COMMENT the value is not null. @@ -912,7 +867,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readNullable(PacketByteBuf.PacketReader) ARG 1 value ARG 2 writer - METHOD method_43827 readNullable (Lnet/minecraft/class_2540$class_7461;)Ljava/lang/Object; + METHOD method_43827 readNullable (Lnet/minecraft/class_9141;)Ljava/lang/Object; COMMENT Reads a nullable value from this buf. A nullable value is represented by COMMENT a boolean indicating if the value is not null, followed by the value only if COMMENT the value is not null. @@ -1019,13 +974,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT collection of properties. COMMENT COMMENT @see #writePropertyMap - METHOD method_47989 writeRegistryEntry (Lnet/minecraft/class_2359;Lnet/minecraft/class_6880;Lnet/minecraft/class_2540$class_7462;)V - ARG 1 registryEntries - ARG 2 entry - ARG 3 writer - METHOD method_47990 readRegistryEntry (Lnet/minecraft/class_2359;Lnet/minecraft/class_2540$class_7461;)Lnet/minecraft/class_6880; - ARG 1 registryEntries - ARG 2 reader METHOD method_49067 writeQuaternionf (Lorg/joml/Quaternionf;)V COMMENT Writes a {@link Quaternionf} to this buf. A {@link Quaternionf} is represented COMMENT by four {@code float}s. @@ -1337,12 +1285,3 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 length METHOD writerIndex (I)Lio/netty/buffer/ByteBuf; ARG 1 index - CLASS class_7461 PacketReader - COMMENT A functional interface to read a value from {@link PacketByteBuf}. - METHOD method_43828 (Lnet/minecraft/class_2540;)Ljava/util/Optional; - ARG 1 buf - CLASS class_7462 PacketWriter - COMMENT A functional interface to write a value to {@link PacketByteBuf}. - METHOD method_43829 (Lnet/minecraft/class_2540;Ljava/util/Optional;)V - ARG 1 buf - ARG 2 value diff --git a/mappings/net/minecraft/network/handler/DecoderHandler.mapping b/mappings/net/minecraft/network/handler/DecoderHandler.mapping index 6cabf884f7..5c18a48788 100644 --- a/mappings/net/minecraft/network/handler/DecoderHandler.mapping +++ b/mappings/net/minecraft/network/handler/DecoderHandler.mapping @@ -1,9 +1,5 @@ CLASS net/minecraft/class_2543 net/minecraft/network/handler/DecoderHandler FIELD field_11715 LOGGER Lorg/slf4j/Logger; - FIELD field_45677 protocolKey Lio/netty/util/AttributeKey; - METHOD (Lio/netty/util/AttributeKey;)V - ARG 1 protocolKey METHOD decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V - ARG 1 ctx ARG 2 buf ARG 3 objects diff --git a/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping b/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping index b641e1c39f..152218ad2d 100644 --- a/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping +++ b/mappings/net/minecraft/network/handler/NetworkStateTransitionHandler.mapping @@ -1,4 +1 @@ CLASS net/minecraft/class_8700 net/minecraft/network/handler/NetworkStateTransitionHandler - METHOD method_53011 handle (Lio/netty/util/Attribute;Lnet/minecraft/class_2596;)V - ARG 0 protocolAttribute - ARG 1 packet diff --git a/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping b/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping index 71eebde4fd..228002cafa 100644 --- a/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping +++ b/mappings/net/minecraft/network/handler/PacketBundleHandler.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_8039 net/minecraft/network/handler/PacketBundleHandler FIELD field_41878 MAX_PACKETS I - FIELD field_41879 NOOP Lnet/minecraft/class_8039; - METHOD method_48325 create (Ljava/lang/Class;Ljava/util/function/Function;Lnet/minecraft/class_8037;)Lnet/minecraft/class_8039; - ARG 0 bundlePacketType + METHOD method_48325 create (Lnet/minecraft/class_9145;Ljava/util/function/Function;Lnet/minecraft/class_8037;)Lnet/minecraft/class_8039; ARG 1 bundleFunction ARG 2 splitter METHOD method_48326 createBundler (Lnet/minecraft/class_2596;)Lnet/minecraft/class_8039$class_8040; @@ -10,11 +8,9 @@ CLASS net/minecraft/class_8039 net/minecraft/network/handler/PacketBundleHandler METHOD method_48327 forEachPacket (Lnet/minecraft/class_2596;Ljava/util/function/Consumer;)V ARG 1 packet ARG 2 consumer - CLASS 2 + CLASS 1 CLASS 1 FIELD field_41884 packets Ljava/util/List; CLASS class_8040 Bundler METHOD method_48328 add (Lnet/minecraft/class_2596;)Lnet/minecraft/class_2596; ARG 1 packet - CLASS class_8041 BundlerGetter - METHOD method_48312 getBundler ()Lnet/minecraft/class_8039; diff --git a/mappings/net/minecraft/network/handler/PacketBundler.mapping b/mappings/net/minecraft/network/handler/PacketBundler.mapping index 4a54df5844..dd41eeab68 100644 --- a/mappings/net/minecraft/network/handler/PacketBundler.mapping +++ b/mappings/net/minecraft/network/handler/PacketBundler.mapping @@ -1,9 +1,5 @@ CLASS net/minecraft/class_8035 net/minecraft/network/handler/PacketBundler FIELD field_41869 currentBundler Lnet/minecraft/class_8039$class_8040; - FIELD field_41870 bundleHandler Lnet/minecraft/class_8039; - FIELD field_45675 protocolKey Lio/netty/util/AttributeKey; - METHOD (Lio/netty/util/AttributeKey;)V - ARG 1 protocolKey METHOD decode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V ARG 1 context ARG 2 packet diff --git a/mappings/net/minecraft/network/handler/PacketEncoder.mapping b/mappings/net/minecraft/network/handler/PacketEncoder.mapping index 9c85828551..76b6c2ecfa 100644 --- a/mappings/net/minecraft/network/handler/PacketEncoder.mapping +++ b/mappings/net/minecraft/network/handler/PacketEncoder.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_2545 net/minecraft/network/handler/PacketEncoder FIELD field_11721 LOGGER Lorg/slf4j/Logger; - FIELD field_45678 protocolKey Lio/netty/util/AttributeKey; - METHOD (Lio/netty/util/AttributeKey;)V - ARG 1 protocolKey METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/buffer/ByteBuf;)V ARG 1 ctx ARG 2 packet diff --git a/mappings/net/minecraft/network/handler/PacketUnbundler.mapping b/mappings/net/minecraft/network/handler/PacketUnbundler.mapping index c751c302eb..7f6c9e8090 100644 --- a/mappings/net/minecraft/network/handler/PacketUnbundler.mapping +++ b/mappings/net/minecraft/network/handler/PacketUnbundler.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_8036 net/minecraft/network/handler/PacketUnbundler - FIELD field_45676 protocolKey Lio/netty/util/AttributeKey; - METHOD (Lio/netty/util/AttributeKey;)V - ARG 1 protocolKey METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V ARG 1 context ARG 2 packet diff --git a/mappings/net/minecraft/network/handler/PacketValidator.mapping b/mappings/net/minecraft/network/handler/PacketValidator.mapping deleted file mode 100644 index adfeeec61b..0000000000 --- a/mappings/net/minecraft/network/handler/PacketValidator.mapping +++ /dev/null @@ -1,20 +0,0 @@ -CLASS net/minecraft/class_8699 net/minecraft/network/handler/PacketValidator - FIELD field_45679 LOGGER Lorg/slf4j/Logger; - FIELD field_45680 receivingSideKey Lio/netty/util/AttributeKey; - FIELD field_45681 sendingSideKey Lio/netty/util/AttributeKey; - METHOD (Lio/netty/util/AttributeKey;Lio/netty/util/AttributeKey;)V - ARG 1 receivingSideKey - ARG 2 sendingSideKey - METHOD decode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V - ARG 1 context - ARG 2 packet - ARG 3 packets - METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V - ARG 1 context - ARG 2 packet - ARG 3 packets - METHOD method_53009 handle (Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/class_2596;Ljava/util/List;Lio/netty/util/AttributeKey;)V - ARG 0 context - ARG 1 packet - ARG 2 packets - ARG 3 key diff --git a/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping b/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping index aa686fa783..7c170d3cf8 100644 --- a/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/BrandCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8709 net/minecraft/network/packet/BrandCustomPayload - FIELD field_45697 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/CustomPayload.mapping b/mappings/net/minecraft/network/packet/CustomPayload.mapping index 180f7749a7..8b43d0b10d 100644 --- a/mappings/net/minecraft/network/packet/CustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/CustomPayload.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8710 net/minecraft/network/packet/CustomPayload - METHOD method_53028 write (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/Packet.mapping b/mappings/net/minecraft/network/packet/Packet.mapping index b8e76d2dea..0c054d74c3 100644 --- a/mappings/net/minecraft/network/packet/Packet.mapping +++ b/mappings/net/minecraft/network/packet/Packet.mapping @@ -2,14 +2,5 @@ CLASS net/minecraft/class_2596 net/minecraft/network/packet/Packet METHOD method_11051 isWritingErrorSkippable ()Z COMMENT {@return whether a throwable in writing of this packet allows the COMMENT connection to simply skip the packet's sending than disconnecting} - METHOD method_11052 write (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11054 apply (Lnet/minecraft/class_2547;)V ARG 1 listener - METHOD method_52273 getNewNetworkState ()Lnet/minecraft/class_2539; - COMMENT {@return a new network state to transition to, or {@code null} - COMMENT to indicate no state change} - COMMENT

- COMMENT The state transition is done on both the sender and receiver sides, but it - COMMENT is only in one direction (out of C2S and S2C). Another packet must be processed - COMMENT in the reverse direction to ensure the state in both directions are updated. diff --git a/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping index 96c09a5e93..ab11e9e7ce 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping @@ -1,11 +1,2 @@ CLASS net/minecraft/class_2817 net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket FIELD field_33361 MAX_PAYLOAD_SIZE I - FIELD field_45694 ID_TO_READER Ljava/util/Map; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_53026 readPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8710; - ARG 0 id - ARG 1 buf - METHOD method_53027 readUnknownPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8711; - ARG 0 id - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping index a64cacd9ad..863949c8a8 100644 --- a/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/config/ReadyC2SPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8736 net/minecraft/network/packet/c2s/config/ReadyC2SPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping b/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping index fd40468685..c52d039dbc 100644 --- a/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping +++ b/mappings/net/minecraft/network/packet/c2s/handshake/ConnectionIntent.mapping @@ -4,4 +4,3 @@ CLASS net/minecraft/class_8592 net/minecraft/network/packet/c2s/handshake/Connec METHOD method_52283 getId ()I METHOD method_52284 byId (I)Lnet/minecraft/class_8592; ARG 0 id - METHOD method_52285 getState ()Lnet/minecraft/class_2539; diff --git a/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping index 5e609a8d40..118e2084f3 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8593 net/minecraft/network/packet/c2s/login/EnterConfigurationC2SPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping index ffe36093de..1c271fa8d4 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2913 net/minecraft/network/packet/c2s/login/LoginQuery FIELD field_33374 MAX_PAYLOAD_SIZE I METHOD comp_1569 queryId ()I METHOD comp_1570 response ()Lnet/minecraft/class_8594; + METHOD method_11052 write (Lnet/minecraft/class_2540;)V METHOD method_52290 readPayload (ILnet/minecraft/class_2540;)Lnet/minecraft/class_8594; COMMENT {@return the response payload read from {@code buf}} COMMENT diff --git a/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping index 2eb305fe0e..2c6b9e5872 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8591 net/minecraft/network/packet/c2s/play/AcknowledgeReconfigurationC2SPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping index bf4c7e781f..e033eeacda 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping @@ -15,14 +15,10 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2 ARG 5 actionType ARG 6 stack ARG 7 modifiedStacks - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_12190 getStack ()Lnet/minecraft/class_1799; METHOD method_12192 getSlot ()I METHOD method_12193 getButton ()I METHOD method_12194 getSyncId ()I METHOD method_12195 getActionType ()Lnet/minecraft/class_1713; - METHOD method_34677 (Lnet/minecraft/class_2540;)Ljava/lang/Integer; - ARG 0 bufx METHOD method_34678 getModifiedStacks ()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD method_37440 getRevision ()I diff --git a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping index 41d8119f38..99694f9d92 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.mapping @@ -4,7 +4,5 @@ CLASS net/minecraft/class_2873 net/minecraft/network/packet/c2s/play/CreativeInv METHOD (ILnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_12479 getStack ()Lnet/minecraft/class_1799; METHOD method_12481 getSlot ()I diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index a334154d78..582ce9c11e 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -2,15 +2,3 @@ CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaco METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 primaryEffectId ARG 2 secondaryEffectId - METHOD (Lnet/minecraft/class_2540;)V - 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/c2s/query/QueryRequestC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping index 92f66aa283..ee31f471bb 100644 --- a/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_2937 net/minecraft/network/packet/c2s/query/QueryRequestC2SPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping index d60c11ff52..900ec290dd 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping @@ -1,11 +1,2 @@ CLASS net/minecraft/class_2658 net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket FIELD field_33326 MAX_PAYLOAD_SIZE I - FIELD field_45693 ID_TO_READER Ljava/util/Map; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_53023 readPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8710; - ARG 0 id - ARG 1 buf - METHOD method_53025 readUnknownPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8711; - ARG 0 id - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping index 427059ef96..c56ed193a5 100644 --- a/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/config/ReadyS2CPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8733 net/minecraft/network/packet/s2c/config/ReadyS2CPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping index d9f36b5667..4283b0e56e 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_8707 net/minecraft/network/packet/s2c/custom/DebugBeeCustomPayload - FIELD field_45695 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_53028 write (Lnet/minecraft/class_2540;)V CLASS class_5243 Bee FIELD comp_1650 entityId I FIELD comp_1657 disallowedHives Ljava/util/List; diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping index ea3a089a6a..223b5c46e7 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_8708 net/minecraft/network/packet/s2c/custom/DebugBrainCustomPayload - FIELD field_45696 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf CLASS class_4232 Brain diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping index 798c0efbec..8bce6ead90 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_9004 net/minecraft/network/packet/s2c/custom/DebugBreezeCustomPayload - FIELD field_47514 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf CLASS class_9005 BreezeInfo diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping index ed249a6dd9..8e613d3820 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8712 net/minecraft/network/packet/s2c/custom/DebugGameEventCustomPayload - FIELD field_45698 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping index 951ab3ecaf..8919d0f1f6 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload.mapping @@ -1,4 +1 @@ CLASS net/minecraft/class_8713 net/minecraft/network/packet/s2c/custom/DebugGameEventListenersCustomPayload - FIELD field_45699 ID Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping index ff17c9e971..0978ef3fe1 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8714 net/minecraft/network/packet/s2c/custom/DebugGameTestAddMarkerCustomPayload - FIELD field_45700 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping index 7e54a9b8b4..a2eb999a8a 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8715 net/minecraft/network/packet/s2c/custom/DebugGameTestClearCustomPayload - FIELD field_45701 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping index 4835d2152d..5be2675c3c 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_8716 net/minecraft/network/packet/s2c/custom/DebugGoalSelectorCustomPayload - FIELD field_45702 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_53034 (Lnet/minecraft/class_2540;Lnet/minecraft/class_8716$class_8717;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping index c71b4933b8..0c9f4d297d 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_8718 net/minecraft/network/packet/s2c/custom/DebugHiveCustomPayload - FIELD field_45703 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf CLASS class_8719 HiveInfo diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping index 1641bb46b7..88314b76ae 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8720 net/minecraft/network/packet/s2c/custom/DebugNeighborsUpdateCustomPayload - FIELD field_45704 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping index 3d7b6b8e1c..394bf144ac 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8721 net/minecraft/network/packet/s2c/custom/DebugPathCustomPayload - FIELD field_45705 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping index 4c865a0c6b..efe2d63ced 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8722 net/minecraft/network/packet/s2c/custom/DebugPoiAddedCustomPayload - FIELD field_45706 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping index 97c4133e8e..15d691f858 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8723 net/minecraft/network/packet/s2c/custom/DebugPoiRemovedCustomPayload - FIELD field_45707 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping index 702bb93bca..470cb709c2 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8724 net/minecraft/network/packet/s2c/custom/DebugPoiTicketCountCustomPayload - FIELD field_45708 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping index cb1283553d..bd6ef26e3b 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8725 net/minecraft/network/packet/s2c/custom/DebugRaidsCustomPayload - FIELD field_45709 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping index c60d1854a5..48f773cf29 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_8726 net/minecraft/network/packet/s2c/custom/DebugStructuresCustomPayload - FIELD field_45710 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_53037 writeBox (Lnet/minecraft/class_2540;Lnet/minecraft/class_3341;)V diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping index b99f1e3317..ad2f530bce 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8728 net/minecraft/network/packet/s2c/custom/DebugVillageSectionsCustomPayload - FIELD field_45711 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping b/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping index 5d9ea278d7..45a443bbb6 100644 --- a/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping +++ b/mappings/net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_8729 net/minecraft/network/packet/s2c/custom/DebugWorldgenAttemptCustomPayload - FIELD field_45712 ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping index 9759f59fcb..abe296fda5 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_2905 net/minecraft/network/packet/s2c/login/LoginHello FIELD field_13209 serverId Ljava/lang/String; FIELD field_13210 nonce [B FIELD field_13211 publicKey [B - METHOD (Ljava/lang/String;[B[B)V + METHOD (Ljava/lang/String;[B[BZ)V ARG 1 serverId ARG 2 publicKey ARG 3 nonce diff --git a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping index 33d505a7b9..d816b39a48 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/Advancement FIELD field_12716 toSetProgress Ljava/util/Map; FIELD field_12717 toEarn Ljava/util/List; FIELD field_12718 clearCurrent Z - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD (ZLjava/util/Collection;Ljava/util/Set;Ljava/util/Map;)V ARG 1 clearCurrent ARG 2 toEarn @@ -17,6 +15,3 @@ CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/Advancement METHOD method_34197 (Lnet/minecraft/class_2540;Lnet/minecraft/class_167;)V ARG 0 buf2 ARG 1 progress - METHOD method_34198 (Lnet/minecraft/class_2540;Lnet/minecraft/class_8779;)V - ARG 0 buf2 - ARG 1 task diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping index 8aab0f9759..4c4bd01e07 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping @@ -2,12 +2,6 @@ CLASS net/minecraft/class_2622 net/minecraft/network/packet/s2c/play/BlockEntity FIELD field_12038 blockEntityType Lnet/minecraft/class_2591; FIELD field_12039 nbt Lnet/minecraft/class_2487; FIELD field_12040 pos Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V - ARG 1 pos - ARG 2 blockEntityType - ARG 3 nbt - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11290 getNbt ()Lnet/minecraft/class_2487; METHOD method_11291 getBlockEntityType ()Lnet/minecraft/class_2591; METHOD method_11293 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping index 89413a0e0f..17ccc42074 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEventS2CPacket.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_2623 net/minecraft/network/packet/s2c/play/BlockEventS ARG 2 block ARG 3 type ARG 4 data - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11294 getType ()I METHOD method_11295 getBlock ()Lnet/minecraft/class_2248; METHOD method_11296 getData ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping index e1f15ef2e1..a7325aa8cd 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockUpdateS2CPacket.mapping @@ -7,7 +7,5 @@ CLASS net/minecraft/class_2626 net/minecraft/network/packet/s2c/play/BlockUpdate METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11308 getState ()Lnet/minecraft/class_2680; METHOD method_11309 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping index bbddda2b45..365be63358 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping @@ -3,12 +3,11 @@ CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData FIELD field_34863 heightmap Lnet/minecraft/class_2487; FIELD field_34864 sectionsData [B FIELD field_34865 blockEntities Ljava/util/List; - METHOD (Lnet/minecraft/class_2540;II)V - ARG 1 buf - ARG 2 x - ARG 3 z METHOD (Lnet/minecraft/class_2818;)V ARG 1 chunk + METHOD (Lnet/minecraft/class_9129;II)V + ARG 2 x + ARG 3 z METHOD method_38586 getSectionsDataBuf ()Lnet/minecraft/class_2540; METHOD method_38587 getBlockEntities (II)Ljava/util/function/Consumer; ARG 1 x @@ -17,14 +16,10 @@ CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData ARG 3 visitor METHOD method_38589 getSectionsPacketSize (Lnet/minecraft/class_2818;)I ARG 0 chunk - METHOD method_38590 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_38590 write (Lnet/minecraft/class_9129;)V METHOD method_38591 writeSections (Lnet/minecraft/class_2540;Lnet/minecraft/class_2818;)V ARG 0 buf ARG 1 chunk - METHOD method_38592 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6603$class_6604;)V - ARG 0 buf2 - ARG 1 entry METHOD method_38593 iterateBlockEntities (Lnet/minecraft/class_6603$class_6605;II)V ARG 1 consumer ARG 2 x @@ -41,12 +36,9 @@ CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData ARG 2 y ARG 3 type ARG 4 nbt - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_38596 of (Lnet/minecraft/class_2586;)Lnet/minecraft/class_6603$class_6604; ARG 0 blockEntity - METHOD method_38597 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_38597 write (Lnet/minecraft/class_9129;)V CLASS class_6605 BlockEntityVisitor METHOD accept (Lnet/minecraft/class_2338;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V ARG 1 pos diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping index 700d76b509..308ab37355 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDataS2CPacket.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/class_2672 net/minecraft/network/packet/s2c/play/ChunkDataS2 FIELD field_12236 chunkX I FIELD field_34870 chunkData Lnet/minecraft/class_6603; FIELD field_34871 lightData Lnet/minecraft/class_6606; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD (Lnet/minecraft/class_2818;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;)V ARG 1 chunk ARG 2 lightProvider diff --git a/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping index c47bb325f7..5471049c94 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket.mapping @@ -1,10 +1,5 @@ CLASS net/minecraft/class_2656 net/minecraft/network/packet/s2c/play/CooldownUpdateS2CPacket - FIELD field_12154 item Lnet/minecraft/class_1792; - FIELD field_12155 cooldown I - METHOD (Lnet/minecraft/class_1792;I)V - ARG 1 item - ARG 2 cooldown - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_11453 getItem ()Lnet/minecraft/class_1792; - METHOD method_11454 getCooldown ()I + FIELD comp_2198 item Lnet/minecraft/class_1792; + FIELD comp_2199 cooldown I + METHOD comp_2198 item ()Lnet/minecraft/class_1792; + METHOD comp_2199 cooldown ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket.mapping index 5fc836a1c2..adcb9c355e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_5891 net/minecraft/network/packet/s2c/play/EnterCombatS2CPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping index c5b6e8f947..bca7bf51cd 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8588 net/minecraft/network/packet/s2c/play/EnterReconfigurationS2CPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping index a13f587337..9725c0c92c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping @@ -4,20 +4,8 @@ CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttri METHOD (ILjava/util/Collection;)V ARG 1 entityId ARG 2 attributes - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11937 getEntityId ()I METHOD method_11938 getEntries ()Ljava/util/List; - METHOD method_34199 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1322;)V - ARG 0 buf3 - ARG 1 modifier - METHOD method_34200 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2781$class_2782;)V - ARG 0 buf2 - ARG 1 attribute - METHOD method_34201 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2781$class_2782; - ARG 0 buf2 - METHOD method_34202 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1322; - ARG 0 modifiers CLASS class_2782 Entry METHOD (Lnet/minecraft/class_6880;DLjava/util/Collection;)V ARG 2 baseValue diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping index bb34150be7..d634907a5d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityEquipmentUpdateS2CPacket.mapping @@ -4,7 +4,5 @@ CLASS net/minecraft/class_2744 net/minecraft/network/packet/s2c/play/EntityEquip METHOD (ILjava/util/List;)V ARG 1 id ARG 2 equipmentList - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11820 getId ()I METHOD method_30145 getEquipmentList ()Ljava/util/List; diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping index bb9c550e0b..dfb7e36ea7 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping @@ -37,8 +37,6 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn ARG 1 entity ARG 2 entityData ARG 3 pos - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11164 getUuid ()Ljava/util/UUID; METHOD method_11166 getEntityData ()I METHOD method_11167 getId ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping index 36d18e76cf..db0da1f6f6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu ARG 1 entityId ARG 2 effect ARG 3 keepFading - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11942 shouldShowIcon ()Z METHOD method_11943 getEntityId ()I METHOD method_11944 getDuration ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping index 054f41216a..a85b53fe46 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping @@ -4,12 +4,8 @@ CLASS net/minecraft/class_2739 net/minecraft/network/packet/s2c/play/EntityTrack FIELD field_40850 MARKER_ID I METHOD (ILjava/util/List;)V ARG 1 id - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD comp_1127 id ()I METHOD comp_1128 trackedValues ()Ljava/util/List; - METHOD method_46615 write (Ljava/util/List;Lnet/minecraft/class_2540;)V + METHOD method_46615 write (Ljava/util/List;Lnet/minecraft/class_9129;)V ARG 0 trackedValues - ARG 1 buf - METHOD method_46616 read (Lnet/minecraft/class_2540;)Ljava/util/List; - ARG 0 buf + METHOD method_46616 read (Lnet/minecraft/class_9129;)Ljava/util/List; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping index 7fb4415672..07d6d7a382 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping @@ -17,8 +17,8 @@ CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2 FIELD field_47515 particle Lnet/minecraft/class_2394; FIELD field_47516 emitterParticle Lnet/minecraft/class_2394; FIELD field_47517 destructionType Lnet/minecraft/class_1927$class_4179; - FIELD field_47518 soundEvent Lnet/minecraft/class_3414; - METHOD (DDDFLjava/util/List;Lnet/minecraft/class_243;Lnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)V + FIELD field_47518 soundEvent Lnet/minecraft/class_6880; + METHOD (DDDFLjava/util/List;Lnet/minecraft/class_243;Lnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_6880;)V ARG 1 x ARG 3 y ARG 5 z @@ -28,9 +28,6 @@ CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2 ARG 10 destructionType ARG 11 particle ARG 12 emitterParticle - ARG 13 soundEvent - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11472 getPlayerVelocityX ()F METHOD method_11473 getPlayerVelocityY ()F METHOD method_11474 getPlayerVelocityZ ()F @@ -44,13 +41,7 @@ CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2 METHOD method_34122 (IIILnet/minecraft/class_2540;Lnet/minecraft/class_2338;)V ARG 3 buf2 ARG 4 pos - METHOD method_55327 readParticleEffect (Lnet/minecraft/class_2540;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394; - ARG 1 buf - ARG 2 particleType METHOD method_55328 getDestructionType ()Lnet/minecraft/class_1927$class_4179; METHOD method_55329 getParticle ()Lnet/minecraft/class_2394; METHOD method_55330 getEmitterParticle ()Lnet/minecraft/class_2394; - METHOD method_55331 getSoundEvent ()Lnet/minecraft/class_3414; - METHOD method_55628 writeParticleEffect (Lnet/minecraft/class_2540;Lnet/minecraft/class_2394;)V - ARG 1 buf - ARG 2 particleEffect + METHOD method_55331 getSoundEvent ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index d699054a5c..42e0917862 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD comp_97 maxPlayers I FIELD comp_98 viewDistance I FIELD comp_99 reducedDebugInfo Z - METHOD (IZLjava/util/Set;IIIZZZLnet/minecraft/class_8589;)V + METHOD (IZLjava/util/Set;IIIZZZLnet/minecraft/class_8589;Z)V ARG 1 playerEntityId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping index ab7e65a7bb..e071e87b58 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/InventoryS2CPacket.mapping @@ -11,8 +11,6 @@ CLASS net/minecraft/class_2649 net/minecraft/network/packet/s2c/play/InventoryS2 ARG 2 revision ARG 3 contents ARG 4 cursorStack - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11440 getSyncId ()I METHOD method_11441 getContents ()Ljava/util/List; METHOD method_37437 getCursorStack ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping index ed901a76ff..235963dcb2 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OpenScreenS2CPacket.mapping @@ -2,12 +2,6 @@ CLASS net/minecraft/class_3944 net/minecraft/network/packet/s2c/play/OpenScreenS FIELD field_17436 syncId I FIELD field_17437 screenHandlerId Lnet/minecraft/class_3917; FIELD field_17438 name Lnet/minecraft/class_2561; - METHOD (ILnet/minecraft/class_3917;Lnet/minecraft/class_2561;)V - ARG 1 syncId - ARG 2 type - ARG 3 name - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_17592 getSyncId ()I METHOD method_17593 getScreenHandlerType ()Lnet/minecraft/class_3917; METHOD method_17594 getName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping index 4fc3791e68..aca2f9f619 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ParticleS2CPacket.mapping @@ -20,11 +20,6 @@ CLASS net/minecraft/class_2675 net/minecraft/network/packet/s2c/play/ParticleS2C ARG 11 offsetZ ARG 12 speed ARG 13 count - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_11542 readParticleParameters (Lnet/minecraft/class_2540;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394; - ARG 1 buf - ARG 2 type METHOD method_11543 getSpeed ()F METHOD method_11544 getX ()D METHOD method_11545 getCount ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping index 5bcd5d75d2..16b5c5c1c7 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr FIELD field_12641 category Lnet/minecraft/class_3419; FIELD field_12642 sound Lnet/minecraft/class_6880; FIELD field_38819 seed J - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;FFJ)V ARG 1 sound ARG 2 category diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping index 91fe732cd8..ca0001be23 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 FIELD field_12662 pitch F FIELD field_33353 COORDINATE_SCALE F FIELD field_38820 seed J - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;DDDFFJ)V ARG 1 sound ARG 2 category diff --git a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping index 88c9d03c92..1daf4d7ed8 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_2718 net/minecraft/network/packet/s2c/play/RemoveEntityStatusEffectS2CPacket METHOD (ILnet/minecraft/class_6880;)V ARG 1 entityId - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11767 getEntity (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping index c99a2b9c06..85f95e6f1b 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardObjectiveUpdateS2CPacket.mapping @@ -6,9 +6,7 @@ CLASS net/minecraft/class_2751 net/minecraft/network/packet/s2c/play/ScoreboardO FIELD field_33343 ADD_MODE I FIELD field_33344 REMOVE_MODE I FIELD field_33345 UPDATE_MODE I - FIELD field_47519 numberFormat Lnet/minecraft/class_9022; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf + FIELD field_47519 numberFormat Ljava/util/Optional; METHOD (Lnet/minecraft/class_266;I)V ARG 1 objective ARG 2 mode @@ -16,4 +14,4 @@ CLASS net/minecraft/class_2751 net/minecraft/network/packet/s2c/play/ScoreboardO METHOD method_11836 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_11837 getMode ()I METHOD method_11839 getType ()Lnet/minecraft/class_274$class_275; - METHOD method_55336 getNumberFormat ()Lnet/minecraft/class_9022; + METHOD method_55336 getNumberFormat ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping index ce7b854e7f..c0f532bc40 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_2757 net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket FIELD comp_2122 scoreHolderName Ljava/lang/String; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD comp_2122 scoreHolderName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping index ce33b3408e..609cc5b734 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScreenHandlerSlotUpdateS2CPacket.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ScreenHandl ARG 2 revision ARG 3 slot ARG 4 stack - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11449 getStack ()Lnet/minecraft/class_1799; METHOD method_11450 getSlot ()I METHOD method_11452 getSyncId ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping index 1a93ab06cc..01f4eca067 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping @@ -1,13 +1,10 @@ CLASS net/minecraft/class_7495 net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket FIELD field_39387 description Lnet/minecraft/class_2561; - FIELD field_39920 secureChatEnforced Z FIELD field_42967 favicon Ljava/util/Optional; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_2561;Ljava/util/Optional;Z)V + METHOD (Lnet/minecraft/class_2561;Ljava/util/Optional;)V ARG 1 description ARG 2 favicon - ARG 3 previewsChat METHOD method_44132 getDescription ()Lnet/minecraft/class_2561; - METHOD method_45058 isSecureChatEnforced ()Z METHOD method_49398 getFavicon ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping index 4bb3a8d1ab..6bf7e72e2f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SetTradeOffersS2CPacket.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_3943 net/minecraft/network/packet/s2c/play/SetTradeOff ARG 4 experience ARG 5 leveled ARG 6 refreshable - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_17589 getSyncId ()I METHOD method_17590 getOffers ()Lnet/minecraft/class_1916; METHOD method_19458 getLevelProgress ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping index c0db450c0e..ca4cde21a3 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_8739 net/minecraft/network/packet/s2c/play/StartChunkSendS2CPacket - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping index 929cdb6cc5..1b14c63248 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/StatisticsS2CPacket.mapping @@ -1,15 +1,3 @@ CLASS net/minecraft/class_2617 net/minecraft/network/packet/s2c/play/StatisticsS2CPacket - FIELD field_12030 stats Lit/unimi/dsi/fastutil/objects/Object2IntMap; - METHOD (Lit/unimi/dsi/fastutil/objects/Object2IntMap;)V - ARG 1 stats - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_11273 getStats ()Ljava/util/Map; - METHOD method_34087 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_3445;)V - ARG 0 buf - ARG 1 stat - METHOD method_34088 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2540;)Lnet/minecraft/class_3445; - ARG 1 bufx - METHOD method_42066 getOrCreateStat (Lnet/minecraft/class_2540;Lnet/minecraft/class_3448;)Lnet/minecraft/class_3445; - ARG 0 buf - ARG 1 statType + FIELD comp_2197 stats Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD comp_2197 stats ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping index ddacd7b1bb..f5c832575b 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket.mapping @@ -1,12 +1,3 @@ CLASS net/minecraft/class_2788 net/minecraft/network/packet/s2c/play/SynchronizeRecipesS2CPacket FIELD field_12751 recipes Ljava/util/List; - METHOD (Ljava/util/Collection;)V - ARG 1 recipes - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_11998 getRecipes ()Ljava/util/List; - METHOD method_17816 writeRecipe (Lnet/minecraft/class_2540;Lnet/minecraft/class_8786;)V - ARG 0 buf - ARG 1 recipe - METHOD method_17817 readRecipe (Lnet/minecraft/class_2540;)Lnet/minecraft/class_8786; - ARG 0 buf diff --git a/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping index 8087393363..b8d849401f 100644 --- a/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/query/PingResultS2CPacket.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2923 net/minecraft/network/packet/s2c/query/PingResultS2CPacket - FIELD field_13280 startTime J + FIELD comp_2201 startTime J METHOD (J)V ARG 1 startTime METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_36180 getStartTime ()J + METHOD comp_2201 startTime ()J diff --git a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping b/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping index 0753bd7f8f..9d452f8472 100644 --- a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping @@ -10,5 +10,3 @@ CLASS net/minecraft/class_5744 net/minecraft/particle/AbstractDustParticleEffect ARG 0 reader METHOD method_33119 getColor ()Lorg/joml/Vector3f; METHOD method_33120 getScale ()F - METHOD method_33466 readColor (Lnet/minecraft/class_2540;)Lorg/joml/Vector3f; - ARG 0 buf diff --git a/mappings/net/minecraft/particle/ParticleEffect.mapping b/mappings/net/minecraft/particle/ParticleEffect.mapping index d2d7245b25..d467f12ca1 100644 --- a/mappings/net/minecraft/particle/ParticleEffect.mapping +++ b/mappings/net/minecraft/particle/ParticleEffect.mapping @@ -1,12 +1,7 @@ CLASS net/minecraft/class_2394 net/minecraft/particle/ParticleEffect METHOD method_10293 asString ()Ljava/lang/String; - METHOD method_10294 write (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_10295 getType ()Lnet/minecraft/class_2396; CLASS class_2395 Factory METHOD method_10296 read (Lnet/minecraft/class_2396;Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2394; ARG 1 type ARG 2 reader - METHOD method_10297 read (Lnet/minecraft/class_2396;Lnet/minecraft/class_2540;)Lnet/minecraft/class_2394; - ARG 1 type - ARG 2 buf diff --git a/mappings/net/minecraft/particle/ParticleTypes.mapping b/mappings/net/minecraft/particle/ParticleTypes.mapping index fd2696e299..31606fdb44 100644 --- a/mappings/net/minecraft/particle/ParticleTypes.mapping +++ b/mappings/net/minecraft/particle/ParticleTypes.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2398 net/minecraft/particle/ParticleTypes METHOD method_10303 register (Ljava/lang/String;Z)Lnet/minecraft/class_2400; ARG 0 name ARG 1 alwaysShow - METHOD method_42022 register (Ljava/lang/String;ZLnet/minecraft/class_2394$class_2395;Ljava/util/function/Function;)Lnet/minecraft/class_2396; + METHOD method_42022 register (Ljava/lang/String;ZLnet/minecraft/class_2394$class_2395;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_2396; ARG 0 name ARG 1 alwaysShow ARG 2 factory diff --git a/mappings/net/minecraft/particle/VibrationParticleEffect.mapping b/mappings/net/minecraft/particle/VibrationParticleEffect.mapping index eeb7e42d69..b3bd87b8c7 100644 --- a/mappings/net/minecraft/particle/VibrationParticleEffect.mapping +++ b/mappings/net/minecraft/particle/VibrationParticleEffect.mapping @@ -6,11 +6,7 @@ CLASS net/minecraft/class_5745 net/minecraft/particle/VibrationParticleEffect METHOD (Lnet/minecraft/class_5716;I)V ARG 1 destination ARG 2 arrivalInTicks - METHOD method_33124 (Lnet/minecraft/class_5745;)Lnet/minecraft/class_5716; - ARG 0 effect METHOD method_33125 getVibration ()Lnet/minecraft/class_5716; METHOD method_42622 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_42623 (Lnet/minecraft/class_5745;)Ljava/lang/Integer; - ARG 0 effect METHOD method_42624 getArrivalInTicks ()I diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index d8e0f34b27..7fbda05c4a 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -28,10 +28,6 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient ARG 1 entries METHOD method_53725 createCodec (Z)Lcom/mojang/serialization/Codec; ARG 0 allowEmpty - METHOD method_8086 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1856; - ARG 0 buf - METHOD method_8088 write (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_8091 ofItems ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_1856; ARG 0 items METHOD method_8092 ofEntries (Ljava/util/stream/Stream;)Lnet/minecraft/class_1856; diff --git a/mappings/net/minecraft/recipe/RawShapedRecipe.mapping b/mappings/net/minecraft/recipe/RawShapedRecipe.mapping index 407a280beb..deec5ba431 100644 --- a/mappings/net/minecraft/recipe/RawShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/RawShapedRecipe.mapping @@ -41,14 +41,12 @@ CLASS net/minecraft/class_8957 net/minecraft/recipe/RawShapedRecipe METHOD method_55086 create (Ljava/util/Map;[Ljava/lang/String;)Lnet/minecraft/class_8957; ARG 0 key ARG 1 pattern - METHOD method_55087 writeToBuf (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_55088 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1856;)Lnet/minecraft/class_1856; + METHOD method_55087 writeToBuf (Lnet/minecraft/class_9129;)V + METHOD method_55088 (Lnet/minecraft/class_9129;Lnet/minecraft/class_1856;)Lnet/minecraft/class_1856; ARG 1 ingredient METHOD method_55089 findLastSymbol (Ljava/lang/String;)I ARG 0 line - METHOD method_55090 readFromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_8957; - ARG 0 buf + METHOD method_55090 readFromBuf (Lnet/minecraft/class_9129;)Lnet/minecraft/class_8957; CLASS class_8958 Data FIELD field_47323 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_47324 PATTERN_CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/recipe/RecipeSerializer.mapping b/mappings/net/minecraft/recipe/RecipeSerializer.mapping index 5b39a28161..5b9a1229aa 100644 --- a/mappings/net/minecraft/recipe/RecipeSerializer.mapping +++ b/mappings/net/minecraft/recipe/RecipeSerializer.mapping @@ -33,22 +33,3 @@ CLASS net/minecraft/class_1865 net/minecraft/recipe/RecipeSerializer ARG 0 id ARG 1 serializer METHOD method_53736 codec ()Lcom/mojang/serialization/Codec; - METHOD method_8122 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1860; - COMMENT Reads a recipe from a packet byte buf, usually on the client. - COMMENT - COMMENT

This can throw whatever exception the packet byte buf throws. This may be - COMMENT called in the netty event loop than the client game engine thread. - COMMENT - COMMENT @return the read recipe - ARG 1 buf - METHOD method_8124 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_1860;)V - COMMENT Writes a recipe to a packet byte buf, usually on the server. - COMMENT - COMMENT

The recipe's ID is already written into the buf when this is called. - COMMENT - COMMENT

This can throw whatever exception the packet byte buf throws. This may be - COMMENT called in the netty event loop than the server game engine thread. - ARG 1 buf - COMMENT the recipe buf - ARG 2 recipe - COMMENT the recipe diff --git a/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping b/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping index 79a9ab251e..3bb034d0b7 100644 --- a/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping +++ b/mappings/net/minecraft/recipe/book/CraftingRecipeCategory.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_7710 net/minecraft/recipe/book/CraftingRecipeCategory FIELD field_40252 CODEC Lcom/mojang/serialization/Codec; FIELD field_40253 id Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V + METHOD (Ljava/lang/String;ILjava/lang/String;I)V ARG 3 id diff --git a/mappings/net/minecraft/scoreboard/number/NumberFormatType.mapping b/mappings/net/minecraft/scoreboard/number/NumberFormatType.mapping index 4602494a45..c953ac255e 100644 --- a/mappings/net/minecraft/scoreboard/number/NumberFormatType.mapping +++ b/mappings/net/minecraft/scoreboard/number/NumberFormatType.mapping @@ -1,7 +1,2 @@ CLASS net/minecraft/class_9023 net/minecraft/scoreboard/number/NumberFormatType METHOD method_55458 getCodec ()Lcom/mojang/serialization/MapCodec; - METHOD method_55461 toBuf (Lnet/minecraft/class_2540;Lnet/minecraft/class_9022;)V - ARG 1 buf - ARG 2 format - METHOD method_55462 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_9022; - ARG 1 buf diff --git a/mappings/net/minecraft/scoreboard/number/NumberFormatTypes.mapping b/mappings/net/minecraft/scoreboard/number/NumberFormatTypes.mapping index 5a4e0b8eb6..75e037de53 100644 --- a/mappings/net/minecraft/scoreboard/number/NumberFormatTypes.mapping +++ b/mappings/net/minecraft/scoreboard/number/NumberFormatTypes.mapping @@ -3,10 +3,5 @@ CLASS net/minecraft/class_9024 net/minecraft/scoreboard/number/NumberFormatTypes FIELD field_47564 CODEC Lcom/mojang/serialization/Codec; METHOD method_55466 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_9023; ARG 0 registry - METHOD method_55467 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_9022; - ARG 0 buf - METHOD method_55468 toBuf (Lnet/minecraft/class_2540;Lnet/minecraft/class_9022;)V - ARG 0 buf - ARG 1 format METHOD method_55469 (Lnet/minecraft/class_9023;)Lcom/mojang/serialization/Codec; ARG 0 formatType diff --git a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping index 046a251a02..68a4d65e1a 100644 --- a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping +++ b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler ARG 1 levelProgress METHOD method_19258 getLevelProgress ()I METHOD method_19259 isLeveled ()Z - METHOD method_20214 autofill (ILnet/minecraft/class_1799;)V + METHOD method_20214 autofill (ILnet/minecraft/class_1799;Z)V ARG 1 slot ARG 2 stack METHOD method_20215 switchTo (I)V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 3b8afd79a3..ea6998daa7 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -30,9 +30,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_24372 saveProperties Lnet/minecraft/class_5219; FIELD field_25132 combinedDynamicRegistries Lnet/minecraft/class_7780; FIELD field_25318 resourceManagerHolder Lnet/minecraft/server/MinecraftServer$class_6897; - FIELD field_33210 START_TICKET_CHUNK_RADIUS I FIELD field_33211 MAX_WORLD_BORDER_RADIUS I - FIELD field_33219 START_TICKET_CHUNKS I FIELD field_33975 recorderResultConsumer Ljava/util/function/Consumer; FIELD field_33976 recorderDumpConsumer Ljava/util/function/Consumer; FIELD field_33977 needsRecorderSetup Z diff --git a/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping b/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping index cde1fd2928..f89c404349 100644 --- a/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping +++ b/mappings/net/minecraft/server/WorldGenerationProgressTracker.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_3953 net/minecraft/server/WorldGenerationProgressTrack FIELD field_17478 radius I FIELD field_17479 size I FIELD field_17480 running Z - METHOD (I)V - ARG 1 radius METHOD method_17676 getChunkStatus (II)Lnet/minecraft/class_2806; ARG 1 x ARG 2 z diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 5dcf81c6bb..eb5b78498c 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -5,69 +5,28 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand METHOD method_22264 executePos (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 variableName - METHOD method_22265 executeClearAll (Lnet/minecraft/class_2168;I)I - ARG 0 source - ARG 1 radius - METHOD method_22266 executeRun (Lnet/minecraft/class_2168;Lnet/minecraft/class_4529;I)I - ARG 0 source - ARG 1 testFunction - ARG 2 rotationSteps - METHOD method_22267 executeRunAll (Lnet/minecraft/class_2168;Ljava/lang/String;II)I - ARG 0 source - ARG 1 testClass - ARG 2 rotationSteps - ARG 3 testsPerRow METHOD method_22268 executeCreate (Lnet/minecraft/class_2168;Ljava/lang/String;III)I ARG 0 source ARG 1 testName ARG 2 x ARG 3 y ARG 4 z - METHOD method_22269 run (Lnet/minecraft/class_2168;Ljava/util/Collection;II)V - ARG 0 source - ARG 1 testFunctions - ARG 2 rotationSteps - ARG 3 testsPerRow METHOD method_22270 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher - METHOD method_22271 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22272 run (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_4524;Z)V - ARG 0 world - ARG 1 pos - ARG 2 tests - ARG 3 rerunUntilFailed - METHOD method_22274 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4524;ZLnet/minecraft/class_2338;)V - ARG 3 pos METHOD method_22275 sendMessage (Lnet/minecraft/class_3218;Ljava/lang/String;Lnet/minecraft/class_124;)V ARG 0 world ARG 1 message ARG 2 formatting METHOD method_22276 (Lnet/minecraft/class_3222;)Z ARG 0 player - METHOD method_22277 executeRunThis (Lnet/minecraft/class_2168;Z)I - ARG 0 source - ARG 1 rerunUntilFailed METHOD method_22278 sendMessage (Lnet/minecraft/class_2168;Ljava/lang/String;)V ARG 0 source ARG 1 message - METHOD method_22279 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22280 onCompletion (Lnet/minecraft/class_3218;Lnet/minecraft/class_4524;)V - ARG 0 world - ARG 1 tests - METHOD method_22281 executeRunThese (Lnet/minecraft/class_2168;Z)I - ARG 0 source - ARG 1 rerunUntilFailed METHOD method_22282 executeExport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 testName METHOD method_22283 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_22284 executeRunAll (Lnet/minecraft/class_2168;II)I - ARG 0 source - ARG 1 rotationSteps - ARG 2 testsPerRow METHOD method_22285 executeImport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 testName @@ -81,71 +40,20 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 0 context METHOD method_22290 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_22291 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22292 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22293 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22294 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_22295 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_23647 beforeBatch (Lnet/minecraft/class_4529;Lnet/minecraft/class_3218;)V - ARG 0 testFunction - ARG 1 world METHOD method_23648 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_29411 executeRerunFailed (Lnet/minecraft/class_2168;ZII)I - ARG 0 source - ARG 1 requiredOnly - ARG 2 rotationSteps - ARG 3 testsPerRow - METHOD method_29412 (Lnet/minecraft/class_4517;)V - ARG 0 test - METHOD method_29413 executeExport (Lnet/minecraft/class_2168;)I - ARG 0 source - METHOD method_29414 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29415 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29416 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29417 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29418 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29419 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29420 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29421 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29422 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_29423 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_52890 executeExportThese (Lnet/minecraft/class_2168;)I - ARG 0 source - METHOD method_52891 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD method_54147 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context METHOD method_54850 getStructurePos (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2338; ARG 0 source - METHOD method_54904 checkStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_4517;)Z + METHOD method_54904 checkStructure (Lnet/minecraft/class_3218;Ljava/lang/String;)Z ARG 0 world - ARG 1 state METHOD method_54905 export (Lnet/minecraft/class_2168;Lnet/minecraft/class_2633;)I ARG 0 source ARG 1 blockEntity - METHOD method_55454 executeResetThis (Lnet/minecraft/class_2168;)I - ARG 0 source - METHOD method_55455 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context CLASS class_4528 Listener - FIELD field_20581 world Lnet/minecraft/class_3218; - FIELD field_20582 tests Lnet/minecraft/class_4524; + FIELD comp_2216 world Lnet/minecraft/class_3218; + FIELD comp_2217 tests Lnet/minecraft/class_4524; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_4524;)V ARG 1 world ARG 2 tests + METHOD comp_2216 world ()Lnet/minecraft/class_3218; + METHOD comp_2217 tests ()Lnet/minecraft/class_4524; diff --git a/mappings/net/minecraft/server/network/ConnectedClientData.mapping b/mappings/net/minecraft/server/network/ConnectedClientData.mapping index f022516c89..2b1f165fba 100644 --- a/mappings/net/minecraft/server/network/ConnectedClientData.mapping +++ b/mappings/net/minecraft/server/network/ConnectedClientData.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_8792 net/minecraft/server/network/ConnectedClientData FIELD comp_1961 syncedOptions Lnet/minecraft/class_8791; METHOD comp_1961 syncedOptions ()Lnet/minecraft/class_8791; - METHOD method_53824 createDefault (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_8792; + METHOD method_53824 createDefault (Lcom/mojang/authlib/GameProfile;Z)Lnet/minecraft/class_8792; ARG 0 profile diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 1cda7558b2..9995d97309 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -21,10 +21,9 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa FIELD field_14166 LOGGER Lorg/slf4j/Logger; FIELD field_14167 nonce [B FIELD field_29779 TIMEOUT_TICKS I - FIELD field_45027 UNEXPECTED_QUERY_RESPONSE_TEXT Lnet/minecraft/class_2561; FIELD field_45028 profileName Ljava/lang/String; FIELD field_45029 profile Lcom/mojang/authlib/GameProfile; - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Z)V ARG 1 server ARG 2 connection METHOD method_14380 disconnect (Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 27b063cd0c..ceb21d69d7 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -263,10 +263,6 @@ 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 diff --git a/mappings/net/minecraft/sound/SoundEvent.mapping b/mappings/net/minecraft/sound/SoundEvent.mapping index 386a488b0c..b22fc9916b 100644 --- a/mappings/net/minecraft/sound/SoundEvent.mapping +++ b/mappings/net/minecraft/sound/SoundEvent.mapping @@ -20,8 +20,4 @@ CLASS net/minecraft/class_3414 net/minecraft/sound/SoundEvent METHOD method_47956 of (Lnet/minecraft/class_2960;Ljava/util/Optional;)Lnet/minecraft/class_3414; ARG 0 id ARG 1 distanceToTravel - METHOD method_47958 writeBuf (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_47959 getStaticDistanceToTravel ()Ljava/util/Optional; - METHOD method_47961 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_3414; - ARG 0 buf diff --git a/mappings/net/minecraft/test/GameTestBatch.mapping b/mappings/net/minecraft/test/GameTestBatch.mapping index 1631c8ba6b..2744ea1442 100644 --- a/mappings/net/minecraft/test/GameTestBatch.mapping +++ b/mappings/net/minecraft/test/GameTestBatch.mapping @@ -1,17 +1,13 @@ CLASS net/minecraft/class_4514 net/minecraft/test/GameTestBatch - FIELD field_20543 id Ljava/lang/String; - FIELD field_20544 testFunctions Ljava/util/Collection; - FIELD field_20545 beforeBatchConsumer Ljava/util/function/Consumer; - FIELD field_27801 afterBatchConsumer Ljava/util/function/Consumer; + FIELD comp_2209 id Ljava/lang/String; + FIELD comp_2211 beforeBatchConsumer Ljava/util/function/Consumer; + FIELD comp_2212 afterBatchConsumer Ljava/util/function/Consumer; FIELD field_33145 DEFAULT_BATCH Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/util/Collection;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V ARG 1 id ARG 2 testFunctions ARG 3 beforeBatchConsumer ARG 4 afterBatchConsumer - METHOD method_22152 getId ()Ljava/lang/String; - METHOD method_22153 startBatch (Lnet/minecraft/class_3218;)V - ARG 1 world - METHOD method_22154 getTestFunctions ()Ljava/util/Collection; - METHOD method_32237 finishBatch (Lnet/minecraft/class_3218;)V - ARG 1 world + METHOD comp_2209 id ()Ljava/lang/String; + METHOD comp_2211 beforeBatchConsumer ()Ljava/util/function/Consumer; + METHOD comp_2212 afterBatchConsumer ()Ljava/util/function/Consumer; diff --git a/mappings/net/minecraft/test/GameTestState.mapping b/mappings/net/minecraft/test/GameTestState.mapping index 240b1cd69b..9f8ec4da92 100644 --- a/mappings/net/minecraft/test/GameTestState.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -14,24 +14,19 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState FIELD field_21456 stopwatch Lcom/google/common/base/Stopwatch; FIELD field_25301 rotation Lnet/minecraft/class_2470; FIELD field_27805 structureBlockEntity Lnet/minecraft/class_2633; - FIELD field_46593 rerunUntilFailed Z FIELD field_47172 initialDelay I FIELD field_47173 initialized Z FIELD field_47174 tickedOnce Z - METHOD (Lnet/minecraft/class_4529;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V - ARG 1 testFunction + METHOD (Lnet/minecraft/class_4529;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_9118;)V ARG 2 rotation ARG 3 world - METHOD method_22165 tick ()V - METHOD method_22166 init (Lnet/minecraft/class_2338;)V - ARG 1 pos + METHOD method_22165 tick (Lnet/minecraft/class_4520;)V + METHOD method_22166 init ()Lnet/minecraft/class_4517; METHOD method_22167 addListener (Lnet/minecraft/class_4518;)V ARG 1 listener METHOD method_22168 fail (Ljava/lang/Throwable;)V ARG 1 throwable METHOD method_22169 getTemplatePath ()Ljava/lang/String; - METHOD method_22171 (Lnet/minecraft/class_4518;)V - ARG 1 listener METHOD method_22172 getPos ()Lnet/minecraft/class_2338; METHOD method_22175 (Lnet/minecraft/class_4518;)V ARG 1 listener @@ -43,7 +38,7 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_22182 getThrowable ()Ljava/lang/Throwable; METHOD method_22183 isRequired ()Z METHOD method_22184 isOptional ()Z - METHOD method_23634 startCountdown ()V + METHOD method_23634 startCountdown (I)Lnet/minecraft/class_4517; METHOD method_23635 setPos (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_23636 (Lnet/minecraft/class_4693;)V @@ -55,31 +50,23 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_23640 complete ()V METHOD method_29402 getRotation ()Lnet/minecraft/class_2470; METHOD method_29403 getTestFunction ()Lnet/minecraft/class_4529; - METHOD method_32240 clearArea ()V METHOD method_32241 isFlaky ()Z METHOD method_32242 getMaxAttempts ()I METHOD method_32243 getRequiredSuccesses ()I METHOD method_33315 tickTests ()V - METHOD method_33316 (Lnet/minecraft/class_4518;)V - ARG 1 listener METHOD method_36059 getStructureBlockBlockEntity ()Lnet/minecraft/class_2633; METHOD method_36060 runAtTick (JLjava/lang/Runnable;)V ARG 1 tick ARG 3 runnable - METHOD method_36061 getSize ()Lnet/minecraft/class_2382; METHOD method_36062 getBoundingBox ()Lnet/minecraft/class_238; METHOD method_36063 getElapsedMilliseconds ()J METHOD method_36064 completeIfSuccessful ()V METHOD method_36065 getTick ()J METHOD method_36066 createTimedTaskRunner ()Lnet/minecraft/class_4693; METHOD method_36067 getTicksLeft ()I - METHOD method_54145 shouldRerunUntilFailed ()Z - METHOD method_54146 setRerunUntilFailed (Z)V - ARG 1 rerunUntilFailed METHOD method_54434 (Lnet/minecraft/class_1297;)V ARG 0 entity METHOD method_54435 (Lnet/minecraft/class_1297;)Z ARG 0 entity - METHOD method_54843 getStructureBlockPos ()Lnet/minecraft/class_2338; METHOD method_54900 (Lnet/minecraft/class_1923;)Z ARG 1 chunkPos diff --git a/mappings/net/minecraft/test/StructureTestListener.mapping b/mappings/net/minecraft/test/StructureTestListener.mapping index 38b5ba25e5..ef509440c8 100644 --- a/mappings/net/minecraft/test/StructureTestListener.mapping +++ b/mappings/net/minecraft/test/StructureTestListener.mapping @@ -1,14 +1,6 @@ CLASS net/minecraft/class_5624 net/minecraft/test/StructureTestListener FIELD field_27808 attempt I FIELD field_27809 successes I - FIELD field_27810 test Lnet/minecraft/class_4517; - FIELD field_27811 testManager Lnet/minecraft/class_4521; - FIELD field_27812 pos Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_4517;Lnet/minecraft/class_4521;Lnet/minecraft/class_2338;)V - ARG 1 test - ARG 2 testManager - ARG 3 pos - METHOD method_32246 init ()V METHOD method_32247 addGameTestMarker (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/lang/String;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 4e7e939fe8..289d99e87a 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -39,14 +39,14 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 3 world METHOD method_22254 (ILnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 2 pos - METHOD method_22255 findNearestStructureBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Lnet/minecraft/class_2338; + METHOD method_22255 findNearestStructureBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/Optional; ARG 0 pos ARG 1 radius ARG 2 world METHOD method_22256 forceLoadNearbyChunks (Lnet/minecraft/class_3341;Lnet/minecraft/class_3218;)V ARG 0 box ARG 1 world - METHOD method_22258 findStructureBlocks (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/Collection; + METHOD method_22258 findStructureBlocks (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/stream/Stream; ARG 0 pos ARG 1 radius ARG 2 world @@ -64,8 +64,6 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 structureBlockEntity METHOD method_36105 getRotationSteps (Lnet/minecraft/class_2470;)I ARG 0 rotation - METHOD method_54845 (Lnet/minecraft/class_3218;Ljava/util/Collection;Lnet/minecraft/class_2338;)V - ARG 2 blockPos METHOD method_54847 getStructureBlockBoxCornerPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; ARG 0 pos ARG 1 size diff --git a/mappings/net/minecraft/test/TestFunction.mapping b/mappings/net/minecraft/test/TestFunction.mapping index c6e37b12c0..d9e2e887a3 100644 --- a/mappings/net/minecraft/test/TestFunction.mapping +++ b/mappings/net/minecraft/test/TestFunction.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction - FIELD field_20583 batchId Ljava/lang/String; - FIELD field_20584 templatePath Ljava/lang/String; - FIELD field_20585 templateName Ljava/lang/String; - FIELD field_20586 required Z - FIELD field_20587 starter Ljava/util/function/Consumer; - FIELD field_20588 tickLimit I - FIELD field_21460 duration J - FIELD field_25306 rotation Lnet/minecraft/class_2470; - FIELD field_27814 maxAttempts I - FIELD field_27815 requiredSuccesses I + FIELD comp_2218 batchId Ljava/lang/String; + FIELD comp_2219 templatePath Ljava/lang/String; + FIELD comp_2220 templateName Ljava/lang/String; + FIELD comp_2221 rotation Lnet/minecraft/class_2470; + FIELD comp_2222 tickLimit I + FIELD comp_2223 duration J + FIELD comp_2224 required Z + FIELD comp_2225 maxAttempts I + FIELD comp_2226 requiredSuccesses I + FIELD comp_2227 starter Ljava/util/function/Consumer; METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IJZLjava/util/function/Consumer;)V ARG 1 batchId ARG 2 templatePath @@ -37,15 +37,16 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction ARG 6 duration ARG 8 required ARG 9 starter - METHOD method_22296 getTemplatePath ()Ljava/lang/String; + METHOD comp_2218 batchId ()Ljava/lang/String; + METHOD comp_2219 templatePath ()Ljava/lang/String; + METHOD comp_2220 templateName ()Ljava/lang/String; + METHOD comp_2221 rotation ()Lnet/minecraft/class_2470; + METHOD comp_2222 tickLimit ()I + METHOD comp_2223 duration ()J + METHOD comp_2224 required ()Z + METHOD comp_2225 maxAttempts ()I + METHOD comp_2226 requiredSuccesses ()I + METHOD comp_2227 starter ()Ljava/util/function/Consumer; METHOD method_22297 start (Lnet/minecraft/class_4516;)V ARG 1 context - METHOD method_22298 getTemplateName ()Ljava/lang/String; - METHOD method_22299 getTickLimit ()I - METHOD method_22300 isRequired ()Z - METHOD method_22301 getBatchId ()Ljava/lang/String; - METHOD method_23649 getDuration ()J - METHOD method_29424 getRotation ()Lnet/minecraft/class_2470; METHOD method_32257 isFlaky ()Z - METHOD method_32258 getMaxAttempts ()I - METHOD method_32259 getRequiredSuccesses ()I diff --git a/mappings/net/minecraft/test/TestFunctions.mapping b/mappings/net/minecraft/test/TestFunctions.mapping index 4978ddd47c..c7587d7f25 100644 --- a/mappings/net/minecraft/test/TestFunctions.mapping +++ b/mappings/net/minecraft/test/TestFunctions.mapping @@ -2,13 +2,13 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions FIELD field_20570 TEST_FUNCTIONS Ljava/util/Collection; FIELD field_20571 TEST_CLASSES Ljava/util/Set; FIELD field_20572 BEFORE_BATCH_CONSUMERS Ljava/util/Map; - FIELD field_25302 FAILED_TEST_FUNCTIONS Ljava/util/Collection; + FIELD field_25302 FAILED_TEST_FUNCTIONS Ljava/util/Set; FIELD field_27806 AFTER_BATCH_CONSUMERS Ljava/util/Map; METHOD method_22191 getTestFunctions ()Ljava/util/Collection; METHOD method_22192 isInClass (Lnet/minecraft/class_4529;Ljava/lang/String;)Z ARG 0 testFunction ARG 1 testClass - METHOD method_22193 getTestFunctions (Ljava/lang/String;)Ljava/util/Collection; + METHOD method_22193 getTestFunctions (Ljava/lang/String;)Ljava/util/stream/Stream; ARG 0 testClass METHOD method_22194 (Ljava/lang/String;Lnet/minecraft/class_4529;)Z ARG 1 testFunction @@ -25,7 +25,7 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions ARG 0 structurePath METHOD method_29404 addFailedTestFunction (Lnet/minecraft/class_4529;)V ARG 0 testFunction - METHOD method_29405 getFailedTestFunctions ()Ljava/util/Collection; + METHOD method_29405 getFailedTestFunctions ()Ljava/util/stream/Stream; METHOD method_29406 clearFailedTestFunctions ()V METHOD method_32244 getAfterBatchConsumer (Ljava/lang/String;)Ljava/util/function/Consumer; ARG 0 batchId diff --git a/mappings/net/minecraft/test/TestListener.mapping b/mappings/net/minecraft/test/TestListener.mapping index a6a4261207..91e9096eb3 100644 --- a/mappings/net/minecraft/test/TestListener.mapping +++ b/mappings/net/minecraft/test/TestListener.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4518 net/minecraft/test/TestListener METHOD method_22188 onStarted (Lnet/minecraft/class_4517;)V ARG 1 test - METHOD method_22190 onFailed (Lnet/minecraft/class_4517;)V + METHOD method_22190 onFailed (Lnet/minecraft/class_4517;Lnet/minecraft/class_4520;)V ARG 1 test - METHOD method_33317 onPassed (Lnet/minecraft/class_4517;)V + METHOD method_33317 onPassed (Lnet/minecraft/class_4517;Lnet/minecraft/class_4520;)V ARG 1 test diff --git a/mappings/net/minecraft/test/TestRunner.mapping b/mappings/net/minecraft/test/TestRunner.mapping deleted file mode 100644 index 14f33e883d..0000000000 --- a/mappings/net/minecraft/test/TestRunner.mapping +++ /dev/null @@ -1,36 +0,0 @@ -CLASS net/minecraft/class_4515 net/minecraft/test/TestRunner - FIELD field_20546 LOGGER Lorg/slf4j/Logger; - FIELD field_20547 batches Ljava/util/List; - FIELD field_20548 pos Lnet/minecraft/class_2338; - FIELD field_20549 world Lnet/minecraft/class_3218; - FIELD field_20550 testManager Lnet/minecraft/class_4521; - FIELD field_20551 tests Ljava/util/List; - FIELD field_20555 reusablePos Lnet/minecraft/class_2338$class_2339; - FIELD field_20556 sizeZ I - FIELD field_46071 testCount I - FIELD field_46072 rowBoundingBox Lnet/minecraft/class_238; - METHOD (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)V - ARG 1 batches - ARG 2 pos - ARG 3 rotation - ARG 4 world - ARG 5 testManager - ARG 6 sizeZ - METHOD method_22155 getTests ()Ljava/util/List; - METHOD method_22156 runBatch (I)V - ARG 1 index - METHOD method_22160 run ()V - METHOD method_22164 (Ljava/util/Map;Lnet/minecraft/class_4517;)V - ARG 2 gameTest - METHOD method_29401 alignTestStructures (Ljava/util/Collection;)Ljava/util/Map; - ARG 1 gameTests - METHOD method_33312 (Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4514;)Lcom/mojang/datafixers/util/Pair; - ARG 2 batch - METHOD method_33313 (Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4529;)Lnet/minecraft/class_4517; - ARG 2 testFunction - METHOD method_33314 (Lcom/mojang/datafixers/util/Pair;)Ljava/util/stream/Stream; - ARG 0 batch - CLASS 1 - METHOD method_32239 onFinished ()V - METHOD method_54842 (J)V - ARG 1 chunkPos diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping index 87e945655d..0fe44922b3 100644 --- a/mappings/net/minecraft/test/TestServer.mapping +++ b/mappings/net/minecraft/test/TestServer.mapping @@ -13,7 +13,6 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer ARG 2 session ARG 3 dataPackManager ARG 4 saveLoader - ARG 5 batches ARG 6 pos METHOD method_36094 (Lnet/minecraft/class_1928;)V ARG 0 gameRules diff --git a/mappings/net/minecraft/test/TestUtil.mapping b/mappings/net/minecraft/test/TestUtil.mapping index 8fd101049c..e1c74f0755 100644 --- a/mappings/net/minecraft/test/TestUtil.mapping +++ b/mappings/net/minecraft/test/TestUtil.mapping @@ -1,37 +1,3 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil - FIELD field_33152 MAX_BATCH_SIZE I - METHOD method_22203 startTest (Lnet/minecraft/class_4517;Lnet/minecraft/class_2338;Lnet/minecraft/class_4521;)V - ARG 0 test - ARG 1 pos - ARG 2 testManager - METHOD method_22209 createBatches (Ljava/util/Collection;)Ljava/util/Collection; - ARG 0 testFunctions - METHOD method_22210 runTestBatches (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)Ljava/util/Collection; - ARG 0 batches - ARG 1 pos - ARG 2 rotation - ARG 3 world - ARG 4 testManager - ARG 5 sizeZ METHOD method_22213 clearDebugMarkers (Lnet/minecraft/class_3218;)V ARG 0 world - METHOD method_22215 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V - ARG 1 posx - METHOD method_22216 clearTests (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_4521;I)V - ARG 0 world - ARG 1 pos - ARG 2 testManager - ARG 3 radius - METHOD method_22222 runTestFunctions (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)Ljava/util/Collection; - ARG 0 testFunctions - ARG 1 pos - ARG 2 rotation - ARG 3 world - ARG 4 testManager - ARG 5 sizeZ - METHOD method_22223 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z - ARG 1 posx - METHOD method_23641 (Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/function/Consumer;Ljava/util/function/Consumer;Ljava/util/List;)Lnet/minecraft/class_4514; - ARG 4 testFunctionsx - METHOD method_33318 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream; - ARG 0 entry diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9092.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9092.mapping new file mode 100644 index 0000000000..f85126a159 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9092.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9092 net/minecraft/unused/packageinfo/PackageInfo9092 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9101.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9101.mapping new file mode 100644 index 0000000000..c28e03e576 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9101.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9101 net/minecraft/unused/packageinfo/PackageInfo9101 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9144.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9144.mapping new file mode 100644 index 0000000000..ed14e47f78 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9144.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9144 net/minecraft/unused/packageinfo/PackageInfo9144 diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index d2c4359401..f129d4f5e3 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -214,40 +214,11 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos ARG 2 queuedPos METHOD method_51686 streamSouthEastSquare (Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; ARG 0 pos - CLASS 1 - FIELD field_23945 pos Lnet/minecraft/class_2338$class_2339; - FIELD field_23946 remaining I CLASS 2 - FIELD field_23094 maxDistance I - FIELD field_23095 rangeX I - FIELD field_23096 rangeY I - FIELD field_23097 rangeZ I - FIELD field_23099 manhattanDistance I - FIELD field_23100 limitX I - FIELD field_23101 limitY I - FIELD field_23102 dx I - FIELD field_23103 dy I - FIELD field_23378 pos Lnet/minecraft/class_2338$class_2339; - FIELD field_23379 swapZ Z CLASS 3 - FIELD field_23105 size I - FIELD field_23106 sizeX I - FIELD field_23107 sizeY I - FIELD field_23108 startX I - FIELD field_23109 startY I - FIELD field_23110 startZ I - FIELD field_23111 index I FIELD field_23380 pos Lnet/minecraft/class_2338$class_2339; CLASS 4 - FIELD field_25903 directions [Lnet/minecraft/class_2350; - FIELD field_25904 pos Lnet/minecraft/class_2338$class_2339; - FIELD field_25905 maxDirectionChanges I - FIELD field_25906 directionChangeCount I - FIELD field_25907 maxSteps I - FIELD field_25908 steps I - FIELD field_25909 currentX I - FIELD field_25910 currentY I - FIELD field_25911 currentZ I + CLASS 5 CLASS class_2339 Mutable METHOD (DDD)V ARG 1 x diff --git a/mappings/net/minecraft/util/math/GlobalPos.mapping b/mappings/net/minecraft/util/math/GlobalPos.mapping index 39cddf41a8..c0787de44c 100644 --- a/mappings/net/minecraft/util/math/GlobalPos.mapping +++ b/mappings/net/minecraft/util/math/GlobalPos.mapping @@ -1,16 +1,16 @@ CLASS net/minecraft/class_4208 net/minecraft/util/math/GlobalPos - FIELD field_18790 dimension Lnet/minecraft/class_5321; - FIELD field_18791 pos Lnet/minecraft/class_2338; + FIELD comp_2207 dimension Lnet/minecraft/class_5321; + FIELD comp_2208 pos Lnet/minecraft/class_2338; FIELD field_25066 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;)V ARG 1 dimension ARG 2 pos + METHOD comp_2207 dimension ()Lnet/minecraft/class_5321; + METHOD comp_2208 pos ()Lnet/minecraft/class_2338; METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_19442 getDimension ()Lnet/minecraft/class_5321; METHOD method_19443 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;)Lnet/minecraft/class_4208; ARG 0 dimension ARG 1 pos - METHOD method_19446 getPos ()Lnet/minecraft/class_2338; METHOD method_29096 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping index 0965e9538a..9c6de23f78 100644 --- a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping @@ -10,14 +10,12 @@ CLASS net/minecraft/class_6611 net/minecraft/util/profiling/jfr/FlightProfiler ARG 1 chunkPos ARG 2 world ARG 3 targetStatus - METHOD method_38656 onPacketReceived (Lnet/minecraft/class_2539;ILjava/net/SocketAddress;I)V + METHOD method_38656 onPacketReceived (Lnet/minecraft/class_2539;Lnet/minecraft/class_9145;Ljava/net/SocketAddress;I)V ARG 1 state - ARG 2 packetId ARG 3 remoteAddress ARG 4 bytes - METHOD method_38657 onPacketSent (Lnet/minecraft/class_2539;ILjava/net/SocketAddress;I)V + METHOD method_38657 onPacketSent (Lnet/minecraft/class_2539;Lnet/minecraft/class_9145;Ljava/net/SocketAddress;I)V ARG 1 state - ARG 2 packetId ARG 3 remoteAddress ARG 4 bytes METHOD method_38658 isAvailable ()Z diff --git a/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping index 6cc1b19d78..c53652d4f2 100644 --- a/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_6509 net/minecraft/util/profiling/jfr/event/PacketEvent - METHOD (Ljava/lang/String;ILjava/net/SocketAddress;I)V + METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/net/SocketAddress;I)V ARG 1 protocolId - ARG 2 packetId - ARG 3 remoteAddress - ARG 4 bytes CLASS class_6510 Names FIELD field_34419 REMOTE_ADDRESS Ljava/lang/String; FIELD field_34421 BYTES Ljava/lang/String; diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping index cfea703f36..03575183b4 100644 --- a/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping @@ -15,12 +15,7 @@ CLASS net/minecraft/class_6767 net/minecraft/util/profiling/jfr/sample/NetworkIo METHOD method_39444 add (Lnet/minecraft/class_6767$class_6768;)Lnet/minecraft/class_6767$class_6768; ARG 1 statistics CLASS class_6769 Packet - FIELD comp_259 side Lnet/minecraft/class_2598; - FIELD field_35587 PACKET_TO_NAME Ljava/util/Map; - METHOD comp_259 side ()Lnet/minecraft/class_2598; - METHOD method_39445 getName ()Ljava/lang/String; - METHOD method_39446 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2598;Lnet/minecraft/class_2539;Ljava/lang/Integer;Ljava/lang/Class;)V - ARG 3 packetId - ARG 4 clazz + FIELD comp_259 side Ljava/lang/String; + METHOD comp_259 side ()Ljava/lang/String; METHOD method_39447 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6767$class_6769; ARG 0 event diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index c2339c45ed..c75634601a 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 4 maxUses ARG 5 merchantExperience ARG 6 priceMultiplier - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIF)V + METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFI)V ARG 1 firstBuyItem ARG 2 secondBuyItem ARG 3 sellItem @@ -30,7 +30,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 5 maxUses ARG 6 merchantExperience ARG 7 priceMultiplier - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFI)V + METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFIZ)V ARG 1 firstBuyItem ARG 2 secondBuyItem ARG 3 sellItem @@ -44,14 +44,10 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - ARG 1 first - ARG 2 second METHOD method_16953 depleteBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 firstBuyStack ARG 2 secondBuyStack - METHOD method_16954 acceptsBuy (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - ARG 1 given - ARG 2 sample + METHOD method_16954 acceptsBuy (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Z)Z METHOD method_18019 copySellItem ()Lnet/minecraft/class_1799; COMMENT Returns a copy of the sell item of this trade offer. METHOD method_19272 getAdjustedFirstBuyItem ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/village/TradeOfferList.mapping b/mappings/net/minecraft/village/TradeOfferList.mapping index be7b00dc52..31577edd2b 100644 --- a/mappings/net/minecraft/village/TradeOfferList.mapping +++ b/mappings/net/minecraft/village/TradeOfferList.mapping @@ -3,18 +3,9 @@ CLASS net/minecraft/class_1916 net/minecraft/village/TradeOfferList ARG 1 size METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt - METHOD method_43715 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1914;)V - ARG 0 buf2 - ARG 1 offer - METHOD method_43716 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1914; - ARG 0 buf2 METHOD method_53882 copy ()Lnet/minecraft/class_1916; - METHOD method_8265 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1916; - ARG 0 buf METHOD method_8267 getValidOffer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1914; ARG 1 firstBuyItem ARG 2 secondBuyItem ARG 3 index METHOD method_8268 toNbt ()Lnet/minecraft/class_2487; - METHOD method_8270 toPacket (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index c9fd8c500b..c3dd169d28 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -149,7 +149,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers FIELD field_18568 maxUses I FIELD field_18569 experience I FIELD field_18570 multiplier F - METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1792;IIIF)V + METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1792;IIIFZ)V ARG 1 item ARG 2 count ARG 3 price @@ -158,7 +158,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 6 maxUses ARG 7 experience ARG 8 multiplier - METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1799;IIIF)V + METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1799;IIIFZ)V ARG 1 item ARG 2 count ARG 3 price diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index 2f23cbbfa3..f301d8645e 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -158,7 +158,6 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules COMMENT Validates that an input is valid for this rule, and sets the rule's value if successful. COMMENT COMMENT @return whether the input is valid - ARG 1 input METHOD method_35236 set (ILnet/minecraft/server/MinecraftServer;)V ARG 1 value ARG 2 server diff --git a/mappings/net/minecraft/world/MutableWorldProperties.mapping b/mappings/net/minecraft/world/MutableWorldProperties.mapping index 64f546e52a..50939d0acf 100644 --- a/mappings/net/minecraft/world/MutableWorldProperties.mapping +++ b/mappings/net/minecraft/world/MutableWorldProperties.mapping @@ -2,11 +2,3 @@ CLASS net/minecraft/class_5269 net/minecraft/world/MutableWorldProperties METHOD method_187 setSpawnPos (Lnet/minecraft/class_2338;F)V ARG 1 pos ARG 2 angle - METHOD method_27416 setSpawnX (I)V - ARG 1 spawnX - METHOD method_27417 setSpawnY (I)V - ARG 1 spawnY - METHOD method_27419 setSpawnZ (I)V - ARG 1 spawnZ - METHOD method_30657 setSpawnAngle (F)V - ARG 1 spawnAngle diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 69a2e2d638..4bdb74f060 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -193,7 +193,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 5 power ARG 6 createFire ARG 7 explosionSourceType - METHOD method_46668 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;ZLnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1927; + METHOD method_46668 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;ZLnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1927; ARG 1 entity ARG 2 damageSource ARG 3 behavior @@ -206,7 +206,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 13 particles ARG 14 particle ARG 15 emitterParticle - ARG 16 soundEvent METHOD method_46669 getDestructionType (Lnet/minecraft/class_1928$class_4313;)Lnet/minecraft/class_1927$class_4179; ARG 1 gameRuleKey METHOD method_47574 collectEntitiesByType (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Predicate;Ljava/util/List;)V @@ -325,7 +324,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World COMMENT @see #updateNeighborsExcept(BlockPos, Block, Direction) ARG 1 pos ARG 2 sourceBlock - METHOD method_8454 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)Lnet/minecraft/class_1927; + METHOD method_8454 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1937$class_7867;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1927; COMMENT Creates an explosion. ARG 1 entity COMMENT the entity that exploded (like TNT) or {@code null} to indicate no entity exploded @@ -343,7 +342,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 12 explosionSourceType ARG 13 particle ARG 14 emitterParticle - ARG 15 soundEvent METHOD method_8455 updateComparators (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 1 pos ARG 2 block diff --git a/mappings/net/minecraft/world/WorldProperties.mapping b/mappings/net/minecraft/world/WorldProperties.mapping index e9e0e97c6c..d17d8120df 100644 --- a/mappings/net/minecraft/world/WorldProperties.mapping +++ b/mappings/net/minecraft/world/WorldProperties.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_5217 net/minecraft/world/WorldProperties - METHOD method_144 getSpawnY ()I METHOD method_146 getGameRules ()Lnet/minecraft/class_1928; METHOD method_151 populateCrashReport (Lnet/minecraft/class_129;Lnet/minecraft/class_5539;)V ARG 1 reportSection @@ -8,11 +7,9 @@ CLASS net/minecraft/class_5217 net/minecraft/world/WorldProperties METHOD method_156 isRaining ()Z METHOD method_157 setRaining (Z)V ARG 1 raining - METHOD method_166 getSpawnZ ()I METHOD method_188 getTime ()J METHOD method_197 isDifficultyLocked ()Z METHOD method_203 isThundering ()Z METHOD method_207 getDifficulty ()Lnet/minecraft/class_1267; - METHOD method_215 getSpawnX ()I METHOD method_217 getTimeOfDay ()J METHOD method_30656 getSpawnAngle ()F diff --git a/mappings/net/minecraft/world/event/PositionSourceType.mapping b/mappings/net/minecraft/world/event/PositionSourceType.mapping index a6b98f46eb..93b58968d2 100644 --- a/mappings/net/minecraft/world/event/PositionSourceType.mapping +++ b/mappings/net/minecraft/world/event/PositionSourceType.mapping @@ -1,15 +1,5 @@ CLASS net/minecraft/class_5717 net/minecraft/world/event/PositionSourceType METHOD method_32957 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_32958 write (Lnet/minecraft/class_5716;Lnet/minecraft/class_2540;)V - ARG 0 positionSource - ARG 1 buf METHOD method_32959 register (Ljava/lang/String;Lnet/minecraft/class_5717;)Lnet/minecraft/class_5717; ARG 0 id ARG 1 positionSourceType - METHOD method_32960 writeToBuf (Lnet/minecraft/class_2540;Lnet/minecraft/class_5716;)V - ARG 1 buf - ARG 2 positionSource - METHOD method_32962 readFromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5716; - ARG 1 buf - METHOD method_32963 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5716; - ARG 0 buf diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index b848d0d99e..ac8ebba8ac 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion FIELD field_25818 DEFAULT_BEHAVIOR Lnet/minecraft/class_5362; FIELD field_47328 particle Lnet/minecraft/class_2394; FIELD field_47329 emitterParticle Lnet/minecraft/class_2394; - FIELD field_47330 soundEvent Lnet/minecraft/class_3414; + FIELD field_47330 soundEvent Lnet/minecraft/class_6880; FIELD field_9184 destructionType Lnet/minecraft/class_1927$class_4179; FIELD field_9185 entity Lnet/minecraft/class_1297; FIELD field_9186 createFire Z @@ -16,7 +16,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion FIELD field_9193 damageSource Lnet/minecraft/class_1282; FIELD field_9194 affectedPlayers Ljava/util/Map; FIELD field_9195 x D - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDFLjava/util/List;Lnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDFLjava/util/List;Lnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_6880;)V ARG 1 world ARG 2 entity ARG 3 x @@ -27,7 +27,6 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion ARG 11 destructionType ARG 12 particle ARG 13 emitterParticle - ARG 14 soundEvent METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;DDDFZLnet/minecraft/class_1927$class_4179;)V ARG 1 world ARG 2 entity @@ -47,7 +46,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion ARG 10 createFire ARG 11 destructionType ARG 12 affectedBlocks - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_3414;)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1927$class_4179;Lnet/minecraft/class_2394;Lnet/minecraft/class_2394;Lnet/minecraft/class_6880;)V ARG 1 world ARG 2 entity ARG 3 damageSource @@ -60,7 +59,6 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion ARG 13 destructionType ARG 14 particle ARG 15 emitterParticle - ARG 16 soundEvent METHOD method_17752 getExposure (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)F ARG 0 source ARG 1 entity @@ -85,7 +83,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion METHOD method_55111 getDestructionType ()Lnet/minecraft/class_1927$class_4179; METHOD method_55112 getParticle ()Lnet/minecraft/class_2394; METHOD method_55113 getEmitterParticle ()Lnet/minecraft/class_2394; - METHOD method_55114 getSoundEvent ()Lnet/minecraft/class_3414; + METHOD method_55114 getSoundEvent ()Lnet/minecraft/class_6880; METHOD method_8346 getAffectedBlocks ()Ljava/util/List; METHOD method_8347 getCausingEntity ()Lnet/minecraft/class_1309; METHOD method_8348 collectBlocksAndDamageEntities ()V diff --git a/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping b/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping index fc96ae350a..312700ea71 100644 --- a/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping @@ -13,9 +13,3 @@ CLASS net/minecraft/class_2978 net/minecraft/world/gen/feature/CoralFeature ARG 2 block METHOD method_40030 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 3 block - METHOD method_40160 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 blocks - METHOD method_40161 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 blocks - METHOD method_40162 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; - ARG 1 blocks diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index 7ec28818a1..6c01d82745 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties - FIELD field_151 spawnX I FIELD field_156 customBossEvents Lnet/minecraft/class_2487; FIELD field_157 difficultyLocked Z FIELD field_158 version I - FIELD field_167 spawnY I FIELD field_168 thundering Z FIELD field_170 playerData Lnet/minecraft/class_2487; FIELD field_173 thunderTime I @@ -11,7 +9,6 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties FIELD field_17736 wanderingTraderSpawnDelay I FIELD field_17737 wanderingTraderSpawnChance I FIELD field_17738 wanderingTraderId Ljava/util/UUID; - FIELD field_182 spawnZ I FIELD field_185 initialized Z FIELD field_189 time J FIELD field_190 raining Z @@ -37,36 +34,9 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties ARG 2 generatorOptions ARG 3 specialProperty ARG 4 lifecycle - METHOD (Lnet/minecraft/class_2487;ZIIIFJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2881$class_8576;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V + METHOD (Lnet/minecraft/class_2487;ZLnet/minecraft/class_2338;FJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2881$class_8576;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V ARG 1 playerData ARG 2 modded - ARG 3 spawnX - ARG 4 spawnY - ARG 5 spawnZ - ARG 6 spawnAngle - ARG 7 time - ARG 9 timeOfDay - ARG 11 version - ARG 12 clearWeatherTime - ARG 13 rainTime - ARG 14 raining - ARG 15 thunderTime - ARG 16 thundering - ARG 17 initialized - ARG 18 difficultyLocked - ARG 19 worldBorder - ARG 20 wanderingTraderSpawnDelay - ARG 21 wanderingTraderSpawnChance - ARG 22 wanderingTraderId - ARG 23 serverBrands - ARG 24 removedFeatures - ARG 25 scheduledEvents - ARG 26 customBossEvents - ARG 27 dragonFight - ARG 28 levelInfo - ARG 29 generatorOptions - ARG 30 specialProperty - ARG 31 lifecycle METHOD method_158 updateProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V ARG 1 registryManager ARG 2 levelNbt