From 46503b68923383d2c46f387a04904809c3caf233 Mon Sep 17 00:00:00 2001 From: bluebear94 Date: Thu, 29 Jun 2023 06:48:21 -0400 Subject: [PATCH] 1.20 client mappings (#3582) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Map LogoDrawer constants * Map constants in PlayerSkinDrawer Since we can’t consult mojmap, the precise meanings of the various ‘8’ constants will remain elusive. The mappings in this commit are inferred from the position of the ‘40’ (FACE_OVERLAY_X). * Map more GUI constants * Add parameter mapping for SpectatorHud.cycleSlot * Map two Particle fields * Map the rest of the Frustum class * Map WorldRenderer * Add mappings for debug renderers and entity models * SinglePartEntityModel.ZERO → TEMP This is not always zero; rather, it is used for temporary storage. * Add more mappings for SplashTextRenderer * Fix javadocs for SplashText.render’s alpha parameter * Map screen handler constants * Map interactivity parameters for structure blocks * Add mappings for various fixes * Implement suggested changes --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Shnupbups --- .../minecraft/block/ComposterBlock.mapping | 4 +- .../entity/StructureBlockBlockEntity.mapping | 3 + .../minecraft/client/gui/LogoDrawer.mapping | 10 +++ .../client/gui/PlayerSkinDrawer.mapping | 8 +++ .../minecraft/client/gui/hud/ChatHud.mapping | 2 + .../client/gui/hud/ClientBossBar.mapping | 1 + .../minecraft/client/gui/hud/DebugHud.mapping | 3 + .../client/gui/hud/SpectatorHud.mapping | 1 + .../gui/hud/spectator/SpectatorMenu.mapping | 1 + .../gui/screen/SplashTextRenderer.mapping | 6 ++ .../client/particle/Particle.mapping | 2 + .../minecraft/client/render/Frustum.mapping | 10 +++ .../client/render/GameRenderer.mapping | 1 + .../client/render/WorldRenderer.mapping | 65 ++++++++++++++++++- .../client/render/chunk/ChunkBuilder.mapping | 12 ++++ .../render/debug/LightDebugRenderer.mapping | 1 + .../SupportingBlockDebugRenderer.mapping | 4 +- .../entity/animation/AnimationHelper.mapping | 11 ++++ .../entity/animation/Transformation.mapping | 7 ++ .../entity/model/CamelEntityModel.mapping | 2 + .../entity/model/FrogEntityModel.mapping | 3 + .../model/SinglePartEntityModel.mapping | 4 +- .../entity/model/SnifferEntityModel.mapping | 2 + .../fix/ChunkPalettedStorageFix.mapping | 23 +++++++ .../ChunkStructuresTemplateRenameFix.mapping | 1 + .../fix/ChunkToProtoChunkFix.mapping | 4 ++ .../fix/EntityItemFrameDirectionFix.mapping | 1 + .../fix/EntityRedundantChanceTagsFix.mapping | 5 ++ .../fix/EntityTheRenameningBlockFix.mapping | 1 + .../minecraft/datafixer/fix/LeavesFix.mapping | 24 +++++++ .../datafixer/fix/OptionsKeyLwjgl3Fix.mapping | 1 + .../fix/TicksInWrongChunkFix.mapping | 8 +++ .../datafixer/fix/UntaggedSpawnerFix.mapping | 3 + .../datafixer/schema/Schema99.mapping | 3 +- .../screen/AnvilScreenHandler.mapping | 8 +++ .../screen/BeaconScreenHandler.mapping | 7 ++ .../screen/BrewingStandScreenHandler.mapping | 8 +++ .../CartographyTableScreenHandler.mapping | 4 ++ .../screen/CraftingScreenHandler.mapping | 7 ++ .../Generic3x3ContainerScreenHandler.mapping | 5 ++ .../GenericContainerScreenHandler.mapping | 1 + .../screen/GrindstoneScreenHandler.mapping | 7 ++ .../screen/LoomScreenHandler.mapping | 5 ++ .../screen/MerchantScreenHandler.mapping | 11 ++++ .../screen/PlayerScreenHandler.mapping | 10 +++ .../screen/SmithingScreenHandler.mapping | 9 +++ .../screen/StonecutterScreenHandler.mapping | 6 ++ .../net/minecraft/screen/slot/Slot.mapping | 1 + .../minecraft/sound/BlockSoundGroup.mapping | 1 + .../minecraft/test/StructureTestUtil.mapping | 1 + 50 files changed, 323 insertions(+), 5 deletions(-) diff --git a/mappings/net/minecraft/block/ComposterBlock.mapping b/mappings/net/minecraft/block/ComposterBlock.mapping index efea8a6c26..91d454245e 100644 --- a/mappings/net/minecraft/block/ComposterBlock.mapping +++ b/mappings/net/minecraft/block/ComposterBlock.mapping @@ -3,7 +3,9 @@ CLASS net/minecraft/class_3962 net/minecraft/block/ComposterBlock FIELD field_17566 ITEM_TO_LEVEL_INCREASE_CHANCE Lit/unimi/dsi/fastutil/objects/Object2FloatMap; FIELD field_17567 RAYCAST_SHAPE Lnet/minecraft/class_265; FIELD field_17568 LEVEL_TO_COLLISION_SHAPE [Lnet/minecraft/class_265; - FIELD field_31071 MAX_LEVEL I + FIELD field_31071 NUM_LEVELS I + FIELD field_31072 MIN_LEVEL I + FIELD field_31073 MAX_LEVEL I METHOD method_17753 registerCompostableItem (FLnet/minecraft/class_1935;)V ARG 0 levelIncreaseChance ARG 1 item diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index 91600ab25d..36ca72d907 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -46,9 +46,11 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt ARG 1 metadata METHOD method_11365 saveStructure ()Z METHOD method_11366 saveStructure (Z)Z + ARG 1 interactive METHOD method_11367 shouldIgnoreEntities ()Z METHOD method_11368 loadStructure (Lnet/minecraft/class_3218;Z)Z ARG 1 world + ARG 2 interactive METHOD method_11370 setIntegrity (F)V ARG 1 integrity METHOD method_11371 getSeed ()J @@ -77,6 +79,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt ARG 0 seed METHOD method_21864 place (Lnet/minecraft/class_3218;ZLnet/minecraft/class_3499;)Z ARG 1 world + ARG 2 interactive ARG 3 template METHOD method_21865 getStructurePath ()Ljava/lang/String; METHOD method_34273 (Lnet/minecraft/class_2586;)Lnet/minecraft/class_2633; diff --git a/mappings/net/minecraft/client/gui/LogoDrawer.mapping b/mappings/net/minecraft/client/gui/LogoDrawer.mapping index 238a5ecc15..e6886f1bd9 100644 --- a/mappings/net/minecraft/client/gui/LogoDrawer.mapping +++ b/mappings/net/minecraft/client/gui/LogoDrawer.mapping @@ -1,9 +1,19 @@ CLASS net/minecraft/class_8020 net/minecraft/client/gui/LogoDrawer FIELD field_41805 LOGO_TEXTURE Lnet/minecraft/class_2960; FIELD field_41806 EDITION_TEXTURE Lnet/minecraft/class_2960; + FIELD field_41807 LOGO_REGION_WIDTH I + FIELD field_41808 LOGO_REGION_HEIGHT I + FIELD field_41809 LOGO_BASE_Y I FIELD field_41810 minceraft Z FIELD field_41811 ignoreAlpha Z FIELD field_44540 MINCERAFT_TEXTURE Lnet/minecraft/class_2960; + FIELD field_44541 LOGO_TEXTURE_WIDTH I + FIELD field_44542 LOGO_TEXTURE_HEIGHT I + FIELD field_44543 EDITION_REGION_WIDTH I + FIELD field_44544 EDITION_REGION_HEIGHT I + FIELD field_44545 EDITION_TEXTURE_WIDTH I + FIELD field_44546 EDITION_TEXTURE_HEIGHT I + FIELD field_44547 LOGO_AND_EDITION_OVERLAP I METHOD (Z)V ARG 1 ignoreAlpha METHOD method_48209 draw (Lnet/minecraft/class_332;IF)V diff --git a/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping b/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping index 1c40d52f0a..4fd35b331a 100644 --- a/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping +++ b/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping @@ -1,5 +1,13 @@ CLASS net/minecraft/class_7532 net/minecraft/client/gui/PlayerSkinDrawer COMMENT Helper class for drawing a player's head on GUI. + FIELD field_39525 FACE_WIDTH I + FIELD field_39526 FACE_HEIGHT I + FIELD field_39527 FACE_X I + FIELD field_39528 FACE_Y I + FIELD field_39529 FACE_OVERLAY_X I + FIELD field_39530 FACE_OVERLAY_Y I + FIELD field_39533 SKIN_TEXTURE_WIDTH I + FIELD field_39534 SKIN_TEXTURE_HEIGHT I METHOD method_44443 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;III)V COMMENT Draws the player's head (including the hat) on GUI. ARG 0 context diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 70e8ab8b1e..cfec9760a9 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud FIELD field_2067 hasUnreadNewMessages Z FIELD field_32180 MAX_MESSAGES I FIELD field_39771 MISSING_MESSAGE_INDEX I + FIELD field_40389 OFFSET_FROM_BOTTOM I + FIELD field_40390 REMOVAL_QUEUE_TICKS I FIELD field_40391 DELETED_MARKER_TEXT Lnet/minecraft/class_2561; FIELD field_40392 removalQueue Ljava/util/List; METHOD (Lnet/minecraft/class_310;)V diff --git a/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping b/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping index 379840fcfe..a09ea8068a 100644 --- a/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping +++ b/mappings/net/minecraft/client/gui/hud/ClientBossBar.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_345 net/minecraft/client/gui/hud/ClientBossBar FIELD field_2128 timeHealthSet J FIELD field_2129 healthLatest F + FIELD field_32204 HEALTH_CHANGE_ANIMATION_MS J METHOD (Ljava/util/UUID;Lnet/minecraft/class_2561;FLnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;ZZZ)V ARG 1 uuid ARG 2 name diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 502bc02b9d..62023244fd 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -8,6 +8,9 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud FIELD field_2084 chunk Lnet/minecraft/class_2818; FIELD field_2085 pos Lnet/minecraft/class_1923; FIELD field_32187 TEXT_COLOR I + FIELD field_32191 METRICS_RED I + FIELD field_32192 METRICS_YELLOW I + FIELD field_32193 METRICS_GREEN I FIELD field_38985 allocationRateCalculator Lnet/minecraft/class_340$class_7412; METHOD (Lnet/minecraft/class_310;)V ARG 1 client diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index 689601253e..77d2ebb344 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud ARG 4 y ARG 5 state METHOD method_1976 cycleSlot (I)V + ARG 1 offset METHOD method_1977 selectSlot (I)V ARG 1 slot METHOD method_1978 renderSpectatorMenu (Lnet/minecraft/class_332;)V diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping index 0811ef00ed..80b24a6f4e 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_531 net/minecraft/client/gui/hud/spectator/SpectatorMe FIELD field_26613 CLOSE_TEXT Lnet/minecraft/class_2561; FIELD field_26614 PREVIOUS_PAGE_TEXT Lnet/minecraft/class_2561; FIELD field_26615 NEXT_PAGE_TEXT Lnet/minecraft/class_2561; + FIELD field_32443 CLOSE_SLOT I FIELD field_3254 selectedSlot I FIELD field_3255 closeCallback Lnet/minecraft/class_536; FIELD field_3256 NEXT_PAGE_COMMAND Lnet/minecraft/class_537; diff --git a/mappings/net/minecraft/client/gui/screen/SplashTextRenderer.mapping b/mappings/net/minecraft/client/gui/screen/SplashTextRenderer.mapping index 053787630c..8c3be40ccd 100644 --- a/mappings/net/minecraft/client/gui/screen/SplashTextRenderer.mapping +++ b/mappings/net/minecraft/client/gui/screen/SplashTextRenderer.mapping @@ -1,6 +1,12 @@ CLASS net/minecraft/class_8519 net/minecraft/client/gui/screen/SplashTextRenderer + FIELD field_44664 TEXT_X I + FIELD field_44665 TEXT_Y I FIELD field_44666 text Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 1 text METHOD method_51453 render (Lnet/minecraft/class_332;ILnet/minecraft/class_327;I)V + ARG 1 context + ARG 2 screenWidth ARG 3 textRenderer + ARG 4 alpha + COMMENT a color with the appropriate alpha component bits set diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index 5af3b80225..9528f8575a 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -7,7 +7,9 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle COMMENT COMMENT

COMMENT If you would like a particle with no direct rendering effects, inherit from {@link NoRenderParticle}. + FIELD field_21507 stopped Z FIELD field_28786 velocityMultiplier F + FIELD field_28787 ascending Z FIELD field_36193 MAX_SQUARED_COLLISION_CHECK_DISTANCE D FIELD field_3838 prevPosY D FIELD field_3839 angle F diff --git a/mappings/net/minecraft/client/render/Frustum.mapping b/mappings/net/minecraft/client/render/Frustum.mapping index 77cccf7547..fd2586a2f2 100644 --- a/mappings/net/minecraft/client/render/Frustum.mapping +++ b/mappings/net/minecraft/client/render/Frustum.mapping @@ -2,7 +2,11 @@ CLASS net/minecraft/class_4604 net/minecraft/client/render/Frustum FIELD field_20995 x D FIELD field_20996 y D FIELD field_20997 z D + FIELD field_34820 RECESSION_SCALE I + FIELD field_34821 recession Lorg/joml/Vector4f; + COMMENT The vector corresponding to the direction toward the far plane of the frustum. FIELD field_40823 frustumIntersection Lorg/joml/FrustumIntersection; + FIELD field_40824 positionProjectionMatrix Lorg/joml/Matrix4f; METHOD (Lnet/minecraft/class_4604;)V ARG 1 frustum METHOD (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V @@ -20,7 +24,13 @@ CLASS net/minecraft/class_4604 net/minecraft/client/render/Frustum ARG 9 maxY ARG 11 maxZ METHOD method_23092 init (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V + COMMENT @implNote The upper-left 3x3 matrix of {@code positionMatrix * projectionMatrix} + COMMENT should be orthogonal for {@link Frustum#recession} to be set to a meaningful value. ARG 1 positionMatrix ARG 2 projectionMatrix METHOD method_23093 isVisible (Lnet/minecraft/class_238;)Z ARG 1 box + METHOD method_38557 coverBoxAroundSetPosition (I)Lnet/minecraft/class_4604; + COMMENT Moves the frustum backwards until it entirely covers the cell containing the + COMMENT current position in a cubic lattice with cell size {@code boxSize}. + ARG 1 boxSize diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index cb11f9fd25..0cc5c9f224 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -170,6 +170,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3202 shouldRenderBlockOutline ()Z METHOD method_3203 reset ()V METHOD method_3207 disablePostProcessor ()V + METHOD method_32796 getFarPlaneDistance ()F METHOD method_34495 getRenderTypeSolidProgram ()Lnet/minecraft/class_5944; METHOD method_34496 getRenderTypeCutoutMippedProgram ()Lnet/minecraft/class_5944; METHOD method_34497 getRenderTypeCutoutProgram ()Lnet/minecraft/class_5944; diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 5e2df49e40..e5f26e9ae7 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -1,5 +1,12 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_20793 rainSoundCounter I + FIELD field_20794 NORMAL_LINE_DX [F + COMMENT Given {@code -16 <= z < 16} and {@code -16 <= x < 16}, let {@code i = 32 * (z + 16) + (x + 16)}. + COMMENT Then {@code NORMAL_LINE_DX[i]} and {@code NORMAL_LINE_DZ[i]} describe the + COMMENT unit vector perpendicular to {@code (x, z)}. + COMMENT + COMMENT These lookup tables are used for rendering rain and snow. + FIELD field_20795 NORMAL_LINE_DZ [F FIELD field_20797 RAIN Lnet/minecraft/class_2960; FIELD field_20798 SNOW Lnet/minecraft/class_2960; FIELD field_20950 blockBreakingProgressions Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; @@ -100,7 +107,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 6 camera ARG 7 gameRenderer ARG 8 lightmapTextureManager - ARG 9 positionMatrix + ARG 9 projectionMatrix METHOD method_22712 drawBlockOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;DDDLnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 matrices ARG 2 vertexConsumer @@ -186,6 +193,19 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 10 green ARG 11 blue ARG 12 alpha + ARG 13 colorize + METHOD method_22984 renderCapturedFrustumVertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;I)V + ARG 1 vertexConsumer + ARG 3 planeNum + METHOD method_22985 renderCapturedFrustumFace (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;IIIIIII)V + ARG 1 vertexConsumer + ARG 3 plane0 + ARG 4 plane1 + ARG 5 plane2 + ARG 6 plane3 + ARG 7 r + ARG 8 g + ARG 9 b METHOD method_22986 (Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_4588;Lnet/minecraft/class_1921;)Lnet/minecraft/class_4588; ARG 2 renderLayer METHOD method_22987 removeBlockBreakingInfo (Lnet/minecraft/class_3191;)V @@ -256,10 +276,28 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 2 projectionMatrix ARG 3 tickDelta ARG 4 camera + ARG 5 thickFog + ARG 6 fogCallback + METHOD method_3258 renderFilledBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDDDDFFFF)V + ARG 0 matrices + ARG 1 vertexConsumer + ARG 2 minX + ARG 4 minY + ARG 6 minZ + ARG 8 maxX + ARG 10 maxY + ARG 12 maxZ + ARG 14 red + ARG 15 green + ARG 16 blue + ARG 17 alpha METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;Lorg/joml/Matrix4f;FDDD)V ARG 1 matrices ARG 2 projectionMatrix ARG 3 tickDelta + ARG 4 cameraX + ARG 6 cameraY + ARG 8 cameraZ METHOD method_3265 renderDarkSky ()V METHOD method_3267 cleanUp ()V METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066; @@ -275,6 +313,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 4 spectator METHOD method_3275 captureFrustum (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;DDDLnet/minecraft/class_4604;)V ARG 1 positionMatrix + ARG 2 projectionMatrix ARG 3 x ARG 5 y ARG 7 z @@ -381,6 +420,26 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 pos METHOD method_43788 hasBlindnessOrDarkness (Lnet/minecraft/class_4184;)Z ARG 1 camera + METHOD method_49041 renderFilledBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;FFFFFFFFFF)V + ARG 0 matrices + ARG 1 vertexConsumer + ARG 2 minX + ARG 3 minY + ARG 4 minZ + ARG 5 maxX + ARG 6 maxY + ARG 7 maxZ + ARG 8 red + ARG 9 green + ARG 10 blue + ARG 11 alpha + METHOD method_51778 getMaxIntensityColor (F)Lnet/minecraft/class_243; + ARG 0 hue + METHOD method_51779 shiftHue (FFFF)Lnet/minecraft/class_243; + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 hueOffset METHOD method_8562 playSong (Lnet/minecraft/class_3414;Lnet/minecraft/class_2338;)V ARG 1 song ARG 2 songPosition @@ -446,6 +505,10 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 ordinal METHOD method_34816 addDirection (Lnet/minecraft/class_2350;)V ARG 1 direction + METHOD method_49633 isOriginInSection (III)Z + ARG 1 sectionX + ARG 2 sectionY + ARG 3 sectionZ CLASS class_5347 ProgramInitException METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index cd31536d3e..6a33e933a6 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -46,6 +46,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_3632 reset ()V METHOD method_3633 clear ()V METHOD method_3635 scheduleUpload (Lnet/minecraft/class_287$class_7433;Lnet/minecraft/class_291;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builtBuffer ARG 2 glBuffer METHOD method_38555 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; ARG 0 future @@ -66,6 +67,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder CLASS class_851 BuiltChunk FIELD field_20834 rebuildTask Lnet/minecraft/class_846$class_851$class_4578; FIELD field_29641 index I + FIELD field_36374 numFailures Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_4457 blockEntities Ljava/util/Set; FIELD field_4458 boundingBox Lnet/minecraft/class_238; FIELD field_4459 data Ljava/util/concurrent/atomic/AtomicReference; @@ -87,6 +89,11 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 1 chunkRenderer ARG 2 builder METHOD method_22778 setNoCullingBlockEntities (Ljava/util/Collection;)V + ARG 1 blockEntities + METHOD method_22779 (Lnet/minecraft/class_1921;)Lnet/minecraft/class_291; + ARG 0 layer + METHOD method_22780 (Lnet/minecraft/class_1921;)Lnet/minecraft/class_1921; + ARG 0 layer METHOD method_22781 rebuild (Lnet/minecraft/class_6850;)V ARG 1 builder METHOD method_3651 isChunkNonEmpty (Lnet/minecraft/class_2338;)Z @@ -141,6 +148,10 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 1 cameraX ARG 2 cameraY ARG 3 cameraZ + ARG 4 storage + METHOD method_22788 (Ljava/util/List;Lnet/minecraft/class_846$class_849;Lnet/minecraft/class_1921;Lnet/minecraft/class_287$class_7433;)V + ARG 3 renderLayer + ARG 4 buffer METHOD method_23087 addBlockEntity (Lnet/minecraft/class_846$class_851$class_4578$class_7435;Lnet/minecraft/class_2586;)V ARG 1 renderData ARG 2 blockEntity @@ -150,6 +161,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder CLASS class_7435 RenderData FIELD field_39079 noCullingBlockEntities Ljava/util/List; FIELD field_39080 blockEntities Ljava/util/List; + FIELD field_39081 buffers Ljava/util/Map; FIELD field_39082 chunkOcclusionData Lnet/minecraft/class_854; FIELD field_39083 translucencySortingData Lnet/minecraft/class_287$class_5594; CLASS class_4579 SortTask diff --git a/mappings/net/minecraft/client/render/debug/LightDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/LightDebugRenderer.mapping index 8a6a5290fb..dc3f1b75d2 100644 --- a/mappings/net/minecraft/client/render/debug/LightDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/LightDebugRenderer.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_8520 net/minecraft/client/render/debug/LightDebugRenderer FIELD field_44675 UPDATE_INTERVAL Ljava/time/Duration; + FIELD field_44676 RADIUS I FIELD field_44677 READY_SHAPE_COLOR Lorg/joml/Vector4f; FIELD field_44678 DEFAULT_SHAPE_COLOR Lorg/joml/Vector4f; FIELD field_44679 client Lnet/minecraft/class_310; diff --git a/mappings/net/minecraft/client/render/debug/SupportingBlockDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/SupportingBlockDebugRenderer.mapping index efb809b7fc..c4cf4a209c 100644 --- a/mappings/net/minecraft/client/render/debug/SupportingBlockDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/SupportingBlockDebugRenderer.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_8560 net/minecraft/client/render/debug/SupportingBlock FIELD field_44830 entities Ljava/util/List; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_51789 (Lnet/minecraft/class_1297;)D + METHOD method_51789 getAdditionalDilation (Lnet/minecraft/class_1297;)D ARG 1 entity METHOD method_51790 renderBlockHighlights (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDDLnet/minecraft/class_1297;Ljava/util/function/DoubleSupplier;FFF)V ARG 1 matrices @@ -13,6 +13,7 @@ CLASS net/minecraft/class_8560 net/minecraft/client/render/debug/SupportingBlock ARG 5 cameraY ARG 7 cameraZ ARG 9 entity + ARG 10 extraDilation ARG 11 red ARG 12 green ARG 13 blue @@ -23,6 +24,7 @@ CLASS net/minecraft/class_8560 net/minecraft/client/render/debug/SupportingBlock ARG 5 cameraY ARG 7 cameraZ ARG 9 vertexConsumers + ARG 10 dilation ARG 12 red ARG 13 green ARG 14 blue diff --git a/mappings/net/minecraft/client/render/entity/animation/AnimationHelper.mapping b/mappings/net/minecraft/client/render/entity/animation/AnimationHelper.mapping index bcb4d978a4..f6095fdd1a 100644 --- a/mappings/net/minecraft/client/render/entity/animation/AnimationHelper.mapping +++ b/mappings/net/minecraft/client/render/entity/animation/AnimationHelper.mapping @@ -1,6 +1,12 @@ CLASS net/minecraft/class_7187 net/minecraft/client/render/entity/animation/AnimationHelper METHOD method_41822 createScalingVector (DDD)Lorg/joml/Vector3f; + ARG 0 x + ARG 2 y + ARG 4 z METHOD method_41823 createTranslationalVector (FFF)Lorg/joml/Vector3f; + ARG 0 x + ARG 1 y + ARG 2 z METHOD method_41824 (FLorg/joml/Vector3f;FLnet/minecraft/class_630;Lnet/minecraft/class_7179;)V ARG 4 transformation METHOD method_41825 (F[Lnet/minecraft/class_7186;I)Z @@ -12,6 +18,11 @@ CLASS net/minecraft/class_7187 net/minecraft/client/render/entity/animation/Anim ARG 0 model ARG 1 animation ARG 2 runningTime + ARG 4 scale + ARG 5 tempVec METHOD method_41828 (Ljava/util/List;FLorg/joml/Vector3f;FLnet/minecraft/class_630;)V ARG 4 part METHOD method_41829 createRotationalVector (FFF)Lorg/joml/Vector3f; + ARG 0 x + ARG 1 y + ARG 2 z diff --git a/mappings/net/minecraft/client/render/entity/animation/Transformation.mapping b/mappings/net/minecraft/client/render/entity/animation/Transformation.mapping index d02ddde753..95f2832f5b 100644 --- a/mappings/net/minecraft/client/render/entity/animation/Transformation.mapping +++ b/mappings/net/minecraft/client/render/entity/animation/Transformation.mapping @@ -1,26 +1,33 @@ CLASS net/minecraft/class_7179 net/minecraft/client/render/entity/animation/Transformation CLASS class_7180 Interpolation METHOD apply (Lorg/joml/Vector3f;F[Lnet/minecraft/class_7186;IIF)Lorg/joml/Vector3f; + ARG 1 dest ARG 2 delta ARG 3 keyframes ARG 4 start ARG 5 end + ARG 6 scale CLASS class_7181 Interpolations FIELD field_37884 LINEAR Lnet/minecraft/class_7179$class_7180; FIELD field_37885 CUBIC Lnet/minecraft/class_7179$class_7180; METHOD method_41815 (Lorg/joml/Vector3f;F[Lnet/minecraft/class_7186;IIF)Lorg/joml/Vector3f; + ARG 0 dest ARG 1 delta ARG 2 keyframes ARG 3 start ARG 4 end + ARG 5 scale METHOD method_41816 (Lorg/joml/Vector3f;F[Lnet/minecraft/class_7186;IIF)Lorg/joml/Vector3f; + ARG 0 dest ARG 1 delta ARG 2 keyframes ARG 3 start ARG 4 end + ARG 5 scale CLASS class_7182 Target METHOD apply (Lnet/minecraft/class_630;Lorg/joml/Vector3f;)V ARG 1 modelPart + ARG 2 vec CLASS class_7183 Targets FIELD field_37886 TRANSLATE Lnet/minecraft/class_7179$class_7182; FIELD field_37887 ROTATE Lnet/minecraft/class_7179$class_7182; diff --git a/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping index 6d4e326692..d4cdd9dfa7 100644 --- a/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_7751 net/minecraft/client/render/entity/model/CamelEntityModel + FIELD field_40459 LIMB_ANGLE_SCALE F FIELD field_40460 SADDLE Ljava/lang/String; FIELD field_40461 BRIDLE Ljava/lang/String; FIELD field_40462 REINS Ljava/lang/String; @@ -6,6 +7,7 @@ CLASS net/minecraft/class_7751 net/minecraft/client/render/entity/model/CamelEnt FIELD field_40464 head Lnet/minecraft/class_630; FIELD field_40465 saddleAndBridle [Lnet/minecraft/class_630; FIELD field_40466 reins [Lnet/minecraft/class_630; + FIELD field_42227 LIMB_DISTANCE_SCALE F METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_45704 updateVisibleParts (Lnet/minecraft/class_7689;)V diff --git a/mappings/net/minecraft/client/render/entity/model/FrogEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/FrogEntityModel.mapping index 60d2d85db1..ef417b191b 100644 --- a/mappings/net/minecraft/client/render/entity/model/FrogEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/FrogEntityModel.mapping @@ -9,6 +9,9 @@ CLASS net/minecraft/class_7198 net/minecraft/client/render/entity/model/FrogEnti FIELD field_37926 leftLeg Lnet/minecraft/class_630; FIELD field_37927 rightLeg Lnet/minecraft/class_630; FIELD field_38448 croakingBody Lnet/minecraft/class_630; + FIELD field_39193 WALKING_LIMB_ANGLE_SCALE F + FIELD field_42228 SWIMMING_LIMB_ANGLE_SCALE F + FIELD field_42229 LIMB_DISTANCE_SCALE F METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_41905 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping index 653f9352b8..cea3c76ce5 100644 --- a/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5597 net/minecraft/client/render/entity/model/SinglePartEntityModel - FIELD field_39195 ZERO Lorg/joml/Vector3f; + FIELD field_39195 TEMP Lorg/joml/Vector3f; METHOD method_32008 getPart ()Lnet/minecraft/class_630; METHOD method_41909 getChild (Ljava/lang/String;)Ljava/util/Optional; ARG 1 name @@ -22,5 +22,7 @@ CLASS net/minecraft/class_5597 net/minecraft/client/render/entity/model/SinglePa ARG 1 animation ARG 2 limbAngle ARG 3 limbDistance + ARG 4 limbAngleScale + ARG 5 limbDistanceScale METHOD method_52185 animate (Lnet/minecraft/class_7184;)V ARG 1 animation diff --git a/mappings/net/minecraft/client/render/entity/model/SnifferEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SnifferEntityModel.mapping index e0fac7dc05..1dab150e50 100644 --- a/mappings/net/minecraft/client/render/entity/model/SnifferEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SnifferEntityModel.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_8185 net/minecraft/client/render/entity/model/SnifferEntityModel FIELD field_42881 root Lnet/minecraft/class_630; FIELD field_43085 head Lnet/minecraft/class_630; + FIELD field_43364 LIMB_ANGLE_SCALE F + FIELD field_43407 LIMB_DISTANCE_SCALE F METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_49303 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping index 4188d155e3..a9824ae790 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkPalettedStorageFix.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF ARG 0 map METHOD method_15605 buildBanner (Ljava/util/Map;ILjava/lang/String;)V ARG 0 out + ARG 1 colorId ARG 2 color METHOD method_15607 (Ljava/util/HashMap;)V ARG 0 map @@ -34,11 +35,13 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF ARG 0 map METHOD method_15610 buildSkull (Ljava/util/Map;ILjava/lang/String;Ljava/lang/String;)V ARG 0 out + ARG 1 variant ARG 2 mob ARG 3 block METHOD method_15611 buildDoor (Ljava/util/Map;Ljava/lang/String;I)V ARG 0 out ARG 1 name + ARG 2 firstStateId METHOD method_15613 (Ljava/util/HashMap;)V ARG 0 map METHOD method_15615 getSideToUpgradeFlag (ZZZZ)I @@ -54,6 +57,7 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF METHOD method_15633 fixChunk (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_15636 buildBed (Ljava/util/Map;ILjava/lang/String;)V ARG 0 out + ARG 1 colorId ARG 2 color METHOD method_15637 getName (Lcom/mojang/serialization/Dynamic;)Ljava/lang/String; METHOD method_15638 getProperty (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Ljava/lang/String; @@ -61,9 +65,13 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF ARG 0 map CLASS class_3583 ChunkNibbleArray FIELD field_15855 contents [B + FIELD field_29879 CONTENTS_LENGTH I + METHOD ([B)V + ARG 1 contents METHOD method_15640 get (III)I ARG 1 x ARG 2 y + ARG 3 z METHOD method_15641 usesLowNibble (I)Z ARG 1 index METHOD method_15642 getRawIndex (I)I @@ -73,11 +81,14 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF FIELD field_15864 axis Lnet/minecraft/class_3582$class_3584$class_3585; METHOD (Ljava/lang/String;ILnet/minecraft/class_3582$class_3584$class_3586;Lnet/minecraft/class_3582$class_3584$class_3585;)V ARG 3 direction + ARG 4 axis METHOD method_15643 getDirection ()Lnet/minecraft/class_3582$class_3584$class_3586; METHOD method_15644 getAxis ()Lnet/minecraft/class_3582$class_3584$class_3585; CLASS class_3585 Axis CLASS class_3586 Direction FIELD field_15872 offset I + METHOD (Ljava/lang/String;II)V + ARG 3 offset METHOD method_15645 getOffset ()I CLASS class_3587 Section FIELD field_15874 innerPositions Lit/unimi/dsi/fastutil/ints/IntList; @@ -108,11 +119,23 @@ CLASS net/minecraft/class_3582 net/minecraft/datafixer/fix/ChunkPalettedStorageF FIELD field_15886 level Lcom/mojang/serialization/Dynamic; FIELD field_15887 blockEntities Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_15888 sections [Lnet/minecraft/class_3582$class_3587; + METHOD (Lcom/mojang/serialization/Dynamic;)V + ARG 1 chunkTag METHOD method_15655 getBlockEntity (I)Lcom/mojang/serialization/Dynamic; + ARG 1 packedLocalPos + METHOD method_15656 (Lcom/mojang/serialization/Dynamic;)V + ARG 1 sectionTag METHOD method_15657 setBlock (ILcom/mojang/serialization/Dynamic;)V + ARG 1 packedLocalPos METHOD method_15658 getSection (I)Lnet/minecraft/class_3582$class_3587; + ARG 1 packedLocalPos METHOD method_15660 removeBlockEntity (I)Lcom/mojang/serialization/Dynamic; + ARG 1 packedLocalPos METHOD method_15662 getBlock (I)Lcom/mojang/serialization/Dynamic; + ARG 1 packedLocalPos METHOD method_15663 adjacentTo (ILnet/minecraft/class_3582$class_3584;)I + ARG 0 packedLocalPos ARG 1 direction METHOD method_15664 transform ()Lcom/mojang/serialization/Dynamic; + METHOD method_15665 (Lcom/mojang/serialization/Dynamic;)V + ARG 1 blockEntityTag diff --git a/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping index 6b86337665..4aaa01ed83 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_3590 net/minecraft/datafixer/fix/ChunkStructuresTempla ARG 1 outputSchema ARG 2 changesType METHOD method_15671 fix (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_49459 fixChildren (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/ChunkToProtoChunkFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkToProtoChunkFix.mapping index 3d1eb72cab..f51d4dbe8c 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkToProtoChunkFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkToProtoChunkFix.mapping @@ -6,6 +6,10 @@ CLASS net/minecraft/class_3591 net/minecraft/datafixer/fix/ChunkToProtoChunkFix ARG 0 x ARG 1 y ARG 2 z + METHOD method_39941 (I)Lit/unimi/dsi/fastutil/shorts/ShortArrayList; + ARG 0 sectionY METHOD method_39943 fixLevel (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_39949 (Ljava/util/List;Lcom/mojang/serialization/Dynamic;)V + ARG 1 tickTag METHOD method_39951 fixBiomes (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_39952 fixTileTicks (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping index e2ad98cd6f..4275594b42 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_3604 net/minecraft/datafixer/fix/EntityItemFrameDirect ARG 2 changesType METHOD method_15711 fixDirection (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_15712 updateDirection (B)B + ARG 0 oldDirection diff --git a/mappings/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.mapping index cc57875454..c2061c82d1 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_1165 net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix + FIELD field_25695 FLOAT_LIST_CODEC Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType METHOD method_30073 hasZeroDropChance (Lcom/mojang/serialization/OptionalDynamic;I)Z + ARG 0 listTag + ARG 1 expectedLength + METHOD method_30074 (Ljava/lang/Float;)Z + ARG 0 chance diff --git a/mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlockFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlockFix.mapping index 3d0961b143..6043bb8e94 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlockFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityTheRenameningBlockFix.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1170 net/minecraft/datafixer/fix/EntityTheRenameningBlockFix + FIELD field_29882 BRED_PREFIX Ljava/lang/String; FIELD field_5671 ENTITIES Ljava/util/Map; FIELD field_5672 BLOCKS Ljava/util/Map; FIELD field_5673 ITEMS Ljava/util/Map; diff --git a/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping b/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping index 9e791becdc..bdaab28768 100644 --- a/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/LeavesFix.mapping @@ -1,11 +1,27 @@ CLASS net/minecraft/class_1191 net/minecraft/datafixer/fix/LeavesFix FIELD field_5686 LOGS_MAP Ljava/util/Set; + FIELD field_5687 AXIAL_OFFSETS [[I FIELD field_5688 LEAVES_MAP Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType + METHOD method_5050 getZ (I)I + ARG 1 packedLocalPos + METHOD method_5051 packLocalPos (III)I + ARG 0 localX + ARG 1 localY + ARG 2 localZ + METHOD method_5052 getX (I)I + ARG 1 packedLocalPos METHOD method_5055 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V ARG 0 map + METHOD method_5061 getBoundaryClassBit (ZZZZ)I + ARG 0 westernmost + ARG 1 easternmost + ARG 2 northernmost + ARG 3 southernmost + METHOD method_5062 getY (I)I + ARG 1 packedLocalPos CLASS class_1192 LeavesLogFixer FIELD field_29897 PERSISTENT Ljava/lang/String; FIELD field_29898 DECAYABLE Ljava/lang/String; @@ -16,14 +32,21 @@ CLASS net/minecraft/class_1191 net/minecraft/datafixer/fix/LeavesFix METHOD method_5065 getDistanceToLog (I)I METHOD method_5068 isLog (I)Z METHOD method_5070 computeLeafStates (III)V + ARG 3 distance METHOD method_5071 isLeaf (I)Z METHOD method_5072 createLeafProperties (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;ZI)Lcom/mojang/serialization/Dynamic; + ARG 1 tag + ARG 2 name + ARG 3 persistent + ARG 4 distance CLASS class_1193 ListFixer FIELD field_29900 BLOCK_STATES_KEY Ljava/lang/String; FIELD field_29901 NAME_KEY Ljava/lang/String; FIELD field_29902 PROPERTIES_KEY Ljava/lang/String; FIELD field_5692 properties Ljava/util/List; + FIELD field_5693 paletteFinder Lcom/mojang/datafixers/OpticFinder; FIELD field_5694 y I + FIELD field_5695 blockStateType Lcom/mojang/datafixers/types/Type; FIELD field_5696 blockStateMap Lnet/minecraft/class_5298; METHOD method_5074 computeFixableBlockStates (Lcom/mojang/serialization/Dynamic;)V METHOD method_5075 needsFix (I)I @@ -34,3 +57,4 @@ CLASS net/minecraft/class_1191 net/minecraft/datafixer/fix/LeavesFix METHOD method_5082 computeFlags (Ljava/lang/String;ZI)I ARG 1 leafBlockName ARG 2 persistent + ARG 3 distance diff --git a/mappings/net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix.mapping b/mappings/net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix.mapping index 21e956b679..257f0ce4d1 100644 --- a/mappings/net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix.mapping +++ b/mappings/net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1201 net/minecraft/datafixer/fix/OptionsKeyLwjgl3Fix + FIELD field_29906 KEY_UNKNOWN Ljava/lang/String; FIELD field_5706 NUMERICAL_KEY_IDS_TO_KEY_NAMES Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/TicksInWrongChunkFix.mapping b/mappings/net/minecraft/datafixer/fix/TicksInWrongChunkFix.mapping index c968607a27..d36172d991 100644 --- a/mappings/net/minecraft/datafixer/fix/TicksInWrongChunkFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/TicksInWrongChunkFix.mapping @@ -1,3 +1,11 @@ CLASS net/minecraft/class_6909 net/minecraft/datafixer/fix/TicksInWrongChunkFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema + METHOD method_40439 putNeighborTicks (Lcom/mojang/serialization/Dynamic;IILjava/util/Optional;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 chunkTag + ARG 1 chunkX + ARG 2 chunkZ + ARG 3 fluidTicks + ARG 4 upgradeDataKey + METHOD method_40440 (Ljava/util/Optional;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 chunkTag diff --git a/mappings/net/minecraft/datafixer/fix/UntaggedSpawnerFix.mapping b/mappings/net/minecraft/datafixer/fix/UntaggedSpawnerFix.mapping index 481af8c730..b911f37e83 100644 --- a/mappings/net/minecraft/datafixer/fix/UntaggedSpawnerFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/UntaggedSpawnerFix.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_6503 net/minecraft/datafixer/fix/UntaggedSpawnerFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema + METHOD method_37974 (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 spawnDataType METHOD method_37976 fixSpawner (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 spawnPotentialsType diff --git a/mappings/net/minecraft/datafixer/schema/Schema99.mapping b/mappings/net/minecraft/datafixer/schema/Schema99.mapping index fc4cd1de4d..63dfa1e3e7 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema99.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema99.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1254 net/minecraft/datafixer/schema/Schema99 + FIELD field_5748 BLOCKS_TO_BLOCK_ENTITIES Ljava/util/Map; FIELD field_5749 LOGGER Lorg/slf4j/Logger; METHOD (ILcom/mojang/datafixers/schemas/Schema;)V ARG 1 versionKey @@ -31,7 +32,7 @@ CLASS net/minecraft/class_1254 net/minecraft/datafixer/schema/Schema99 ARG 3 tag METHOD method_5358 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name - METHOD method_5359 (Lcom/mojang/serialization/Dynamic;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Object; + METHOD method_5359 updateBlockEntityTags (Lcom/mojang/serialization/Dynamic;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Object; ARG 0 stack ARG 1 renames ARG 2 newArmorStandId diff --git a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping index 1d119ab54e..afe3523b0f 100644 --- a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping @@ -1,4 +1,12 @@ CLASS net/minecraft/class_1706 net/minecraft/screen/AnvilScreenHandler + FIELD field_30751 MAX_NAME_LENGTH I + FIELD field_41894 INPUT_1_X I + FIELD field_41895 INPUT_2_X I + FIELD field_41896 OUTPUT_X I + FIELD field_41897 SLOT_Y I + FIELD field_41898 INPUT_1_ID I + FIELD field_41899 INPUT_2_ID I + FIELD field_41900 OUTPUT_ID I FIELD field_7770 levelCost Lnet/minecraft/class_3915; FIELD field_7771 LOGGER Lorg/slf4j/Logger; FIELD field_7774 newItemName Ljava/lang/String; diff --git a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping index 212165142c..78d13ba3fe 100644 --- a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping @@ -3,6 +3,13 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler FIELD field_17288 paymentSlot Lnet/minecraft/class_1704$class_1705; FIELD field_17289 context Lnet/minecraft/class_3914; FIELD field_17290 propertyDelegate Lnet/minecraft/class_3913; + FIELD field_30756 PAYMENT_SLOT_ID I + FIELD field_30757 BEACON_INVENTORY_SIZE I + FIELD field_30758 PROPERTY_COUNT I + FIELD field_30759 INVENTORY_START I + FIELD field_30760 INVENTORY_END I + FIELD field_30761 HOTBAR_START I + FIELD field_30762 HOTBAR_END I METHOD (ILnet/minecraft/class_1263;)V ARG 1 syncId ARG 2 inventory diff --git a/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping b/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping index ca727e8b88..772e288dcd 100644 --- a/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BrewingStandScreenHandler.mapping @@ -1,5 +1,13 @@ CLASS net/minecraft/class_1708 net/minecraft/screen/BrewingStandScreenHandler FIELD field_17292 propertyDelegate Lnet/minecraft/class_3913; + FIELD field_30765 INGREDIENT_SLOT_ID I + FIELD field_30766 FUEL_SLOT_ID I + FIELD field_30767 BREWING_STAND_INVENTORY_SIZE I + FIELD field_30768 PROPERTY_COUNT I + FIELD field_30769 INVENTORY_START I + FIELD field_30770 INVENTORY_END I + FIELD field_30771 HOTBAR_START I + FIELD field_30772 HOTBAR_END I FIELD field_7787 ingredientSlot Lnet/minecraft/class_1735; FIELD field_7788 inventory Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V diff --git a/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping b/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping index b3e99e96fc..8175fa127b 100644 --- a/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping +++ b/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping @@ -6,6 +6,10 @@ CLASS net/minecraft/class_3910 net/minecraft/screen/CartographyTableScreenHandle FIELD field_30773 MAP_SLOT_INDEX I FIELD field_30774 MATERIAL_SLOT_INDEX I FIELD field_30775 RESULT_SLOT_INDEX I + FIELD field_30776 INVENTORY_START I + FIELD field_30777 INVENTORY_END I + FIELD field_30778 HOTBAR_START I + FIELD field_30779 HOTBAR_END I METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId ARG 2 inventory diff --git a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping index 267919d731..234b428655 100644 --- a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_1714 net/minecraft/screen/CraftingScreenHandler + FIELD field_30781 RESULT_ID I + FIELD field_30782 INPUT_START I + FIELD field_30783 INPUT_END I + FIELD field_30784 INVENTORY_START I + FIELD field_30785 INVENTORY_END I + FIELD field_30786 HOTBAR_START I + FIELD field_30787 HOTBAR_END I FIELD field_7797 player Lnet/minecraft/class_1657; FIELD field_7799 context Lnet/minecraft/class_3914; FIELD field_7800 result Lnet/minecraft/class_1731; diff --git a/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping b/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping index 467016aaec..bb6bf3528f 100644 --- a/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/Generic3x3ContainerScreenHandler.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_1716 net/minecraft/screen/Generic3x3ContainerScreenHandler + FIELD field_30788 CONTAINER_SIZE I + FIELD field_30789 INVENTORY_START I + FIELD field_30790 INVENTORY_END I + FIELD field_30791 HOTBAR_START I + FIELD field_30792 HOTBAR_END I FIELD field_7806 inventory Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId diff --git a/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping b/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping index 6d0cb7485e..bd05e6e60f 100644 --- a/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/GenericContainerScreenHandler.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1707 net/minecraft/screen/GenericContainerScreenHandler FIELD field_17495 inventory Lnet/minecraft/class_1263; FIELD field_17496 rows I + FIELD field_30780 NUM_COLUMNS I METHOD (Lnet/minecraft/class_3917;ILnet/minecraft/class_1661;I)V ARG 1 type ARG 2 syncId diff --git a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping index 87f13343ac..01e39c06ae 100644 --- a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping +++ b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping @@ -2,6 +2,13 @@ CLASS net/minecraft/class_3803 net/minecraft/screen/GrindstoneScreenHandler FIELD field_16772 input Lnet/minecraft/class_1263; FIELD field_16773 result Lnet/minecraft/class_1263; FIELD field_16775 context Lnet/minecraft/class_3914; + FIELD field_30794 INPUT_1_ID I + FIELD field_30795 INPUT_2_ID I + FIELD field_30796 OUTPUT_ID I + FIELD field_30797 INVENTORY_START I + FIELD field_30798 INVENTORY_END I + FIELD field_30799 HOTBAR_START I + FIELD field_30800 HOTBAR_END I METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId ARG 2 playerInventory diff --git a/mappings/net/minecraft/screen/LoomScreenHandler.mapping b/mappings/net/minecraft/screen/LoomScreenHandler.mapping index 060e0ef202..d99e8aa508 100644 --- a/mappings/net/minecraft/screen/LoomScreenHandler.mapping +++ b/mappings/net/minecraft/screen/LoomScreenHandler.mapping @@ -8,6 +8,11 @@ CLASS net/minecraft/class_1726 net/minecraft/screen/LoomScreenHandler FIELD field_17322 outputSlot Lnet/minecraft/class_1735; FIELD field_17323 output Lnet/minecraft/class_1263; FIELD field_20383 lastTakeResultTime J + FIELD field_30826 INVENTORY_START I + FIELD field_30827 INVENTORY_END I + FIELD field_30828 HOTBAR_START I + FIELD field_30829 HOTBAR_END I + FIELD field_39120 NO_PATTERN I FIELD field_39121 bannerPatterns Ljava/util/List; FIELD field_7850 input Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V diff --git a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping index ca3c9fce52..046a251a02 100644 --- a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping +++ b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping @@ -2,6 +2,17 @@ CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler FIELD field_18669 levelProgress I FIELD field_18670 leveled Z FIELD field_19358 canRefreshTrades Z + FIELD field_30830 INPUT_1_ID I + FIELD field_30831 INPUT_2_ID I + FIELD field_30832 OUTPUT_ID I + FIELD field_30833 INVENTORY_START I + FIELD field_30834 INVENTORY_END I + FIELD field_30835 HOTBAR_START I + FIELD field_30836 HOTBAR_END I + FIELD field_30837 INPUT_1_X I + FIELD field_30838 INPUT_2_X I + FIELD field_30839 OUTPUT_X I + FIELD field_30840 SLOT_Y I FIELD field_7861 merchantInventory Lnet/minecraft/class_1725; FIELD field_7863 merchant Lnet/minecraft/class_1915; METHOD (ILnet/minecraft/class_1661;)V diff --git a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping index a7d095d421..7436c4b925 100644 --- a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping @@ -5,6 +5,16 @@ CLASS net/minecraft/class_1723 net/minecraft/screen/PlayerScreenHandler FIELD field_21671 EMPTY_LEGGINGS_SLOT_TEXTURE Lnet/minecraft/class_2960; FIELD field_21672 EMPTY_BOOTS_SLOT_TEXTURE Lnet/minecraft/class_2960; FIELD field_21673 EMPTY_OFFHAND_ARMOR_SLOT Lnet/minecraft/class_2960; + FIELD field_30803 CRAFTING_RESULT_ID I + FIELD field_30804 CRAFTING_INPUT_START I + FIELD field_30805 CRAFTING_INPUT_END I + FIELD field_30806 EQUIPMENT_START I + FIELD field_30807 EQUIPMENT_END I + FIELD field_30808 INVENTORY_START I + FIELD field_30809 INVENTORY_END I + FIELD field_30810 HOTBAR_START I + FIELD field_30811 HOTBAR_END I + FIELD field_30812 OFFHAND_ID I FIELD field_7827 onServer Z FIELD field_7828 owner Lnet/minecraft/class_1657; FIELD field_7829 EMPTY_ARMOR_SLOT_TEXTURES [Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping index 42f8175aa0..bf93e3c869 100644 --- a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping @@ -2,6 +2,15 @@ CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler FIELD field_25385 world Lnet/minecraft/class_1937; FIELD field_25386 currentRecipe Lnet/minecraft/class_8059; FIELD field_25668 recipes Ljava/util/List; + FIELD field_41924 TEMPLATE_ID I + FIELD field_41925 EQUIPMENT_ID I + FIELD field_41926 MATERIAL_ID I + FIELD field_41927 OUTPUT_ID I + FIELD field_41928 TEMPLATE_X I + FIELD field_41929 EQUIPMENT_X I + FIELD field_41930 MATERIAL_X I + FIELD field_41931 SLOT_Y I + FIELD field_41932 OUTPUT_X I METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId ARG 2 playerInventory diff --git a/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping b/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping index 24b1493aca..7e3e066b2f 100644 --- a/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping +++ b/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping @@ -10,6 +10,12 @@ CLASS net/minecraft/class_3971 net/minecraft/screen/StonecutterScreenHandler FIELD field_17635 lastTakeTime J FIELD field_17636 contentsChangedListener Ljava/lang/Runnable; FIELD field_19173 output Lnet/minecraft/class_1731; + FIELD field_30842 INPUT_ID I + FIELD field_30843 OUTPUT_ID I + FIELD field_30844 INVENTORY_START I + FIELD field_30845 INVENTORY_END I + FIELD field_30846 OUTPUT_START I + FIELD field_30847 OUTPUT_END I METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId ARG 2 playerInventory diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping index 14610b2d83..321df61e6e 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -37,6 +37,7 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot COMMENT Sets the slot's stack to {@code stack} and marks the slot as dirty. Subclasses COMMENT may override this method to perform additional operations. ARG 1 stack + METHOD method_51306 canBeHighlighted ()Z METHOD method_7667 onTakeItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/sound/BlockSoundGroup.mapping b/mappings/net/minecraft/sound/BlockSoundGroup.mapping index 9fbfc606bd..b58db4b796 100644 --- a/mappings/net/minecraft/sound/BlockSoundGroup.mapping +++ b/mappings/net/minecraft/sound/BlockSoundGroup.mapping @@ -108,6 +108,7 @@ CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup FIELD field_42772 PINK_PETALS Lnet/minecraft/class_2498; FIELD field_43255 SUSPICIOUS_GRAVEL Lnet/minecraft/class_2498; FIELD field_43256 DECORATED_POT_SHATTER Lnet/minecraft/class_2498; + FIELD field_44608 INTENTIONALLY_EMPTY Lnet/minecraft/class_2498; METHOD (FFLnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V ARG 1 volume ARG 2 pitch diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 7caeefa99c..af223cb248 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -32,6 +32,7 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 1 pos ARG 2 rotation ARG 4 world + ARG 5 interactive METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V ARG 0 testName ARG 1 pos