From 92cfc950474146b158faf99828b990c37fb04225 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Tue, 26 May 2026 22:26:05 -0400 Subject: [PATCH] Map 26.2-pre-1 --- .../minecraft/block/PotentSulfurBlock.mapping | 2 ++ .../block/entity/BeaconBlockEntity.mapping | 10 ++++++- .../minecraft/client/MinecraftClient.mapping | 8 +++++ .../friend/gui/screen/FriendsScreen.mapping | 6 ++++ .../client/gl/AbstractGlGpuBuffer.mapping | 12 -------- .../client/gl/GlCommandEncoderBackend.mapping | 8 +++++ .../minecraft/client/gl/GlGpuBuffer.mapping | 26 ++++++++++++++++ .../client/gl/GlGpuBufferAllocator.mapping | 2 ++ .../client/gui/PlayerSkinDrawer.mapping | 6 ++++ .../client/gui/hud/PlayerListHud.mapping | 1 + .../gui/screen/ingame/BeaconScreen.mapping | 1 + .../client/gui/tab/TabManager.mapping | 2 +- .../network/ClientLoginNetworkHandler.mapping | 3 ++ .../network/ClientPlayNetworkHandler.mapping | 2 ++ .../render/block/model/FluidModels.mapping | 1 + .../entity/model/EntityModelLayers.mapping | 1 + .../render/entity/model/EntityModels.mapping | 6 ++++ .../entity/model/SmallSulfurCubeModel.mapping | 3 ++ .../render/model/BakedModelManager.mapping | 10 +++++++ .../client/toast/FriendsToast.mapping | 18 +++++++++++ .../client/util/ScreenshotRecorder.mapping | 5 ++++ .../vulkan/VulkanPhysicalDevice.mapping | 2 ++ .../client/window/VulkanWindowBackend.mapping | 7 +++++ .../minecraft/data/family/BlockFamily.mapping | 7 +++++ .../data/recipe/RecipeGenerator.mapping | 30 +++++++++++++++++++ .../entity/damage/DamageTypes.mapping | 1 + .../passive/SulfurCubeArchetype.mapping | 4 +++ .../passive/SulfurCubeArchetypes.mapping | 6 ++++ .../entity/passive/SulfurCubeEntity.mapping | 3 ++ .../screen/BeaconScreenHandler.mapping | 3 +- .../minecraft/screen/ScreenHandler.mapping | 1 + .../net/minecraft/screen/slot/Slot.mapping | 2 ++ .../minecraft/server/MinecraftServer.mapping | 3 ++ .../server/ServerConfigHandler.mapping | 21 +++++++++++++ .../MinecraftDedicatedServer.mapping | 2 ++ .../dedicated/ServerPropertiesHandler.mapping | 2 ++ .../network/ServerPlayNetworkHandler.mapping | 16 ++++++---- .../server/world/ChunkLevelManager.mapping | 4 +++ .../world/ServerChunkLoadingManager.mapping | 7 +++++ .../server/world/ServerChunkManager.mapping | 4 +++ .../server/world/ServerWorld.mapping | 5 ++++ .../net/minecraft/world/SpawnHelper.mapping | 4 +++ mappings/net/minecraft/world/World.mapping | 1 + .../minecraft/world/gen/WorldPresets.mapping | 10 +++++++ 44 files changed, 258 insertions(+), 20 deletions(-) delete mode 100644 mappings/net/minecraft/client/gl/AbstractGlGpuBuffer.mapping create mode 100644 mappings/net/minecraft/client/gl/GlGpuBuffer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/SmallSulfurCubeModel.mapping diff --git a/mappings/net/minecraft/block/PotentSulfurBlock.mapping b/mappings/net/minecraft/block/PotentSulfurBlock.mapping index fba539e213..fef4771467 100644 --- a/mappings/net/minecraft/block/PotentSulfurBlock.mapping +++ b/mappings/net/minecraft/block/PotentSulfurBlock.mapping @@ -11,3 +11,5 @@ CLASS net/minecraft/class_1_735 net/minecraft/block/PotentSulfurBlock ARG 0 state ARG 1 world ARG 2 pos + METHOD method_1_6303 isDryOrStillFluid (Lnet/minecraft/class_2680;)Z + ARG 0 state diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index 0721304578..65ad42e5f4 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -7,19 +7,27 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity FIELD field_11803 level I FIELD field_17377 lock Lnet/minecraft/class_1273; FIELD field_17378 propertyDelegate Lnet/minecraft/class_3913; - FIELD field_19177 beamSegments Ljava/util/List; + FIELD field_19177 displayedBeamSegments Ljava/util/List; + FIELD field_19178 calculatedBeamSegments Ljava/util/List; FIELD field_19179 minY I FIELD field_31300 LEVEL_PROPERTY_INDEX I FIELD field_31301 PRIMARY_PROPERTY_INDEX I FIELD field_31302 SECONDARY_PROPERTY_INDEX I FIELD field_31303 PROPERTY_COUNT I FIELD field_31304 MAX_LEVEL I + FIELD field_31305 BLOCKS_SCANNED_PER_TICK I FIELD field_40328 CONTAINER_NAME_TEXT Lnet/minecraft/class_2561; FIELD field_45784 PRIMARY_EFFECT_NBT_KEY Ljava/lang/String; FIELD field_45785 SECONDARY_EFFECT_NBT_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state + METHOD method_1_6317 getRequiredBeaconLevel (Lnet/minecraft/class_6880;)I + ARG 0 effect + METHOD method_1_6318 canSetEffectsTo (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;I)Z + ARG 0 primary + ARG 1 secondary + ARG 2 level METHOD method_10936 setCustomName (Lnet/minecraft/class_2561;)V ARG 1 customName METHOD method_10938 playSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;)V diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 46ff048534..2b1f929f1c 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -199,6 +199,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient COMMENT the client only accepting messages from friends. ARG 1 sender METHOD method_1_5471 preloadDefaultShaders ()V + METHOD method_1_6137 addSystemMessage (Lnet/minecraft/class_2561;)V + ARG 1 message METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300; METHOD method_1479 getResourcePackDir ()Ljava/nio/file/Path; METHOD method_1481 joinWorld (Lnet/minecraft/class_638;)V @@ -217,6 +219,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 error ARG 2 description METHOD method_1508 handleInputEvents ()V + METHOD method_1510 (Lnet/minecraft/class_2561;)V + ARG 0 status METHOD method_1511 doItemPick ()V METHOD method_1513 reloadResourcesConcurrently ()Ljava/util/concurrent/CompletableFuture; METHOD method_1514 run ()V @@ -354,6 +358,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient COMMENT COMMENT @return a user-oriented piece of text for screenshot result ARG 1 directory + METHOD method_35701 (Lnet/minecraft/class_2561;)V + ARG 0 message METHOD method_35704 (Ljava/io/File;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style METHOD method_35706 isRealmsEnabled ()Z @@ -442,6 +448,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_55505 onDisconnected ()V METHOD method_55607 getUserProperties ()Lcom/mojang/authlib/minecraft/UserApiService$UserProperties; METHOD method_57017 onFontOptionsChanged ()V + METHOD method_60320 (Lnet/minecraft/class_1078;)V + ARG 1 translationStorage METHOD method_60647 shouldTick ()Z METHOD method_61962 printCrashReport (Ljava/io/File;Lnet/minecraft/class_128;I)I ARG 0 runDir diff --git a/mappings/net/minecraft/client/friend/gui/screen/FriendsScreen.mapping b/mappings/net/minecraft/client/friend/gui/screen/FriendsScreen.mapping index 0ff627d9fc..322c74a51a 100644 --- a/mappings/net/minecraft/client/friend/gui/screen/FriendsScreen.mapping +++ b/mappings/net/minecraft/client/friend/gui/screen/FriendsScreen.mapping @@ -12,11 +12,14 @@ CLASS net/minecraft/class_1_986 net/minecraft/client/friend/gui/screen/FriendsSc FIELD field_1_6805 FRIENDS_OPEN_TEXT Lnet/minecraft/class_2561; FIELD field_1_6806 parent Lnet/minecraft/class_437; FIELD field_1_6807 tabs Lnet/minecraft/class_8667; + FIELD field_1_6808 updateStatusIfCurrentScreenRunnable Ljava/lang/Runnable; FIELD field_1_6809 friendsTab Lnet/minecraft/class_1_926; + FIELD field_1_6810 tabLayoutWidget Lnet/minecraft/class_8667; FIELD field_1_6813 pendingFriendRemovals Ljava/util/Set; FIELD field_1_6814 pendingFriendRequestsTabButton Lnet/minecraft/class_1_992; FIELD field_1_6815 pendingFriendRequestsTab Lnet/minecraft/class_1_927; FIELD field_1_6816 tabManager Lnet/minecraft/class_8088; + FIELD field_1_6817 tabNavigation Lnet/minecraft/class_8089; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent METHOD method_1_5994 unloadTab (Lnet/minecraft/class_8087;)V @@ -35,6 +38,9 @@ CLASS net/minecraft/class_1_986 net/minecraft/client/friend/gui/screen/FriendsSc ARG 1 resultCode METHOD method_1_6004 (Lcom/mojang/authlib/yggdrasil/FriendsService$ResultCode;)V ARG 1 resultCode + METHOD method_1_6007 showFriendActionError (Ljava/lang/Throwable;)Ljava/lang/Void; + ARG 1 ex + METHOD method_1_6008 updateStatusIfCurrentScreen ()V METHOD method_1_6010 onSuccess (Lnet/minecraft/class_5520;)V ARG 1 socialInteractionsManager METHOD method_1_6011 updateStatus ()V diff --git a/mappings/net/minecraft/client/gl/AbstractGlGpuBuffer.mapping b/mappings/net/minecraft/client/gl/AbstractGlGpuBuffer.mapping deleted file mode 100644 index 596cdca98c..0000000000 --- a/mappings/net/minecraft/client/gl/AbstractGlGpuBuffer.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_1_1010 net/minecraft/client/gl/AbstractGlGpuBuffer - FIELD field_1_6916 MEMORY_POOL Lcom/mojang/jtracy/MemoryPool; - FIELD field_1_6917 supportsPersistentMapping Z - FIELD field_1_6918 glId I - FIELD field_1_6919 mapCount I - METHOD (IJIZ)V - ARG 1 usage - ARG 2 size - ARG 4 glId - ARG 5 supportsPersistentMapping - METHOD method_1_6142 assertUsable ()V - METHOD method_1_6143 getGlId ()I diff --git a/mappings/net/minecraft/client/gl/GlCommandEncoderBackend.mapping b/mappings/net/minecraft/client/gl/GlCommandEncoderBackend.mapping index 3db7316d7c..be286f9213 100644 --- a/mappings/net/minecraft/client/gl/GlCommandEncoderBackend.mapping +++ b/mappings/net/minecraft/client/gl/GlCommandEncoderBackend.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_10860 net/minecraft/client/gl/GlCommandEncoderBackend FIELD field_1_6298 vertexBuffer Lnet/minecraft/class_10869$class_10872; FIELD field_1_6299 colorAttachmentTextures Ljava/util/List; FIELD field_1_6939 gpuBufferAllocator Lnet/minecraft/class_1_1014; + FIELD field_1_7067 NUM_SYNC_OBJECTS I + FIELD field_1_7069 submitIndex J + FIELD field_1_7070 sync [J FIELD field_57843 LOGGER Lorg/slf4j/Logger; FIELD field_57844 backend Lnet/minecraft/class_10865; FIELD field_57845 temporaryFb1 I @@ -28,6 +31,11 @@ CLASS net/minecraft/class_10860 net/minecraft/client/gl/GlCommandEncoderBackend ARG 4 count ARG 5 first ARG 6 drawCount + METHOD method_1_6294 wait (JJ)Z + ARG 1 index + ARG 3 timeoutNanos + METHOD method_1_6295 getSubmitIndex ()J + METHOD method_1_6296 getCurrentSyncIndex ()I METHOD method_68351 setupRenderPass (Lnet/minecraft/class_10866;Ljava/util/Collection;)Z ARG 1 pass ARG 2 validationSkippedUniforms diff --git a/mappings/net/minecraft/client/gl/GlGpuBuffer.mapping b/mappings/net/minecraft/client/gl/GlGpuBuffer.mapping new file mode 100644 index 0000000000..a06919b41f --- /dev/null +++ b/mappings/net/minecraft/client/gl/GlGpuBuffer.mapping @@ -0,0 +1,26 @@ +CLASS net/minecraft/class_1_1010 net/minecraft/client/gl/GlGpuBuffer + FIELD field_1_6916 MEMORY_POOL Lcom/mojang/jtracy/MemoryPool; + FIELD field_1_6917 supportsPersistentMapping Z + FIELD field_1_6918 glId I + FIELD field_1_6919 mapCount I + METHOD (IJIZ)V + ARG 1 usage + ARG 2 size + ARG 4 glId + ARG 5 supportsPersistentMapping + METHOD method_1_6142 assertUsable ()V + METHOD method_1_6143 getGlId ()I + CLASS class_10859 Impl + FIELD field_1_6262 access I + FIELD field_57839 closed Z + FIELD field_60010 mappedBuffer Ljava/nio/ByteBuffer; + FIELD field_60011 bufferManager Lnet/minecraft/class_10874; + METHOD (Lnet/minecraft/class_10874;IJIZ)V + ARG 1 bufferManager + ARG 2 usage + ARG 3 size + ARG 5 glId + ARG 6 supportsPersistentMapping + METHOD method_1_5401 decrementMapCount ()V + CLASS 1 1 + FIELD field_1_6264 hasRun Z diff --git a/mappings/net/minecraft/client/gl/GlGpuBufferAllocator.mapping b/mappings/net/minecraft/client/gl/GlGpuBufferAllocator.mapping index 89af2f1d37..4a427ef2fe 100644 --- a/mappings/net/minecraft/client/gl/GlGpuBufferAllocator.mapping +++ b/mappings/net/minecraft/client/gl/GlGpuBufferAllocator.mapping @@ -6,8 +6,10 @@ CLASS net/minecraft/class_1_1014 net/minecraft/client/gl/GlGpuBufferAllocator FIELD field_1_6945 memoryArena Lnet/minecraft/class_1_1022; FIELD field_1_6946 debugLabelManager Lnet/minecraft/class_10861; FIELD field_1_6947 bufferManager Lnet/minecraft/class_10874; + FIELD field_1_7072 commandEncoder Lnet/minecraft/class_10860; METHOD (Lnet/minecraft/class_10865;Lnet/minecraft/class_10860;)V ARG 1 device + ARG 2 commandEncoder METHOD method_1_6167 start ()V CLASS class_1_1015 Fallback FIELD field_1_6949 arena Lnet/minecraft/class_1_1022; diff --git a/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping b/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping index 80c1dc6ab7..4db0f7ec71 100644 --- a/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping +++ b/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping @@ -8,6 +8,12 @@ CLASS net/minecraft/class_7532 net/minecraft/client/gui/PlayerSkinDrawer FIELD field_39530 FACE_OVERLAY_Y I FIELD field_39533 SKIN_TEXTURE_WIDTH I FIELD field_39534 SKIN_TEXTURE_HEIGHT I + METHOD method_1_6310 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_9296;III)V + ARG 0 context + ARG 1 profile + ARG 2 x + ARG 3 y + ARG 4 size METHOD method_44443 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_8685;IIII)V COMMENT Draws the player's head (including the hat) on GUI. ARG 0 context diff --git a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping index cea7379df2..55f4bd4636 100644 --- a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud FIELD field_45378 HALF_HEART_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_329;)V ARG 1 client + ARG 2 inGameHud METHOD method_1918 getPlayerName (Lnet/minecraft/class_640;)Lnet/minecraft/class_2561; COMMENT {@return the player name rendered by this HUD} ARG 1 entry diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index c1d58b0451..53cf717323 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -62,6 +62,7 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD (IILnet/minecraft/class_2960;Lnet/minecraft/class_2561;)V ARG 1 x ARG 2 y + ARG 3 texture ARG 4 message CLASS class_6392 BeaconButtonWidget METHOD method_37080 tick (I)V diff --git a/mappings/net/minecraft/client/gui/tab/TabManager.mapping b/mappings/net/minecraft/client/gui/tab/TabManager.mapping index fce31d2884..8e9feebce6 100644 --- a/mappings/net/minecraft/client/gui/tab/TabManager.mapping +++ b/mappings/net/minecraft/client/gui/tab/TabManager.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_8088 net/minecraft/client/gui/tab/TabManager ARG 2 tabUnloadWidgetConsumer ARG 3 tabLoadTabConsumer ARG 4 tabUnloadTabConsumer - METHOD method_1_5627 setCurrentTAb (Lnet/minecraft/class_8087;Z)V + METHOD method_1_5627 setCurrentTab (Lnet/minecraft/class_8087;Z)V ARG 1 tab ARG 2 clickSound METHOD method_48614 getCurrentTab ()Lnet/minecraft/class_8087; diff --git a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping index 7567ff6a78..5ae28cbea8 100644 --- a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping @@ -38,6 +38,9 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan METHOD method_53873 (Lnet/minecraft/class_635$class_8798;Lnet/minecraft/class_635$class_8798;)Lnet/minecraft/class_635$class_8798; ARG 1 currentState METHOD method_56151 setupEncryption (Lnet/minecraft/class_2917;Ljavax/crypto/Cipher;Ljavax/crypto/Cipher;)V + ARG 1 packet + ARG 2 decryptionCipher + ARG 3 encryptionCipher CLASS class_8798 State FIELD field_46197 name Lnet/minecraft/class_2561; FIELD field_46198 prevStates Ljava/util/Set; diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 0957e8d1a3..ca7d7d86c1 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHandler FIELD field_1_1040 clocks Lnet/minecraft/class_1_100; + FIELD field_1_6575 onlineMode Z FIELD field_3687 random Lnet/minecraft/class_5819; FIELD field_3691 commandSource Lnet/minecraft/class_637; FIELD field_3692 dataQueryHandler Lnet/minecraft/class_300; @@ -64,6 +65,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_1_1525 showDemoStartDialog (Lnet/minecraft/class_315;)V ARG 1 options METHOD method_1_5028 getSectionReadyCallback ()Ljava/lang/Runnable; + METHOD method_1_5685 isOnlineMode ()Z METHOD method_2869 getAdvancementHandler ()Lnet/minecraft/class_632; METHOD method_2870 updateLighting (IILnet/minecraft/class_3568;Lnet/minecraft/class_1944;Ljava/util/BitSet;Ljava/util/BitSet;Ljava/util/Iterator;Z)V ARG 1 chunkX diff --git a/mappings/net/minecraft/client/render/block/model/FluidModels.mapping b/mappings/net/minecraft/client/render/block/model/FluidModels.mapping index 78e73ac90b..24ddc4d87c 100644 --- a/mappings/net/minecraft/client/render/block/model/FluidModels.mapping +++ b/mappings/net/minecraft/client/render/block/model/FluidModels.mapping @@ -7,5 +7,6 @@ CLASS net/minecraft/class_1_478 net/minecraft/client/render/block/model/FluidMod ARG 1 modelsByFluid ARG 2 missingModel METHOD method_1_3034 bake (Lnet/minecraft/class_1_734;)Ljava/util/Map; + ARG 0 reporter METHOD method_1_3035 get (Lnet/minecraft/class_3610;)Lnet/minecraft/class_1_467; ARG 1 fluidState diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping index 5d1d7a431b..415d80c624 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_5602 net/minecraft/client/render/entity/model/EntityModelLayers FIELD field_1_3643 SULFUR_CUBE_INNER Lnet/minecraft/class_5601; + FIELD field_1_7074 SULFUR_CUBE_SMALL_INNER Lnet/minecraft/class_5601; FIELD field_27557 DROWNED_OUTER Lnet/minecraft/class_5601; FIELD field_27575 PIG_SADDLE Lnet/minecraft/class_5601; FIELD field_27594 SHEEP_WOOL Lnet/minecraft/class_5601; diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModels.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModels.mapping index fa813e0aa2..5a8c86be2d 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModels.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModels.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/class_5600 net/minecraft/client/render/entity/model/EntityMo METHOD method_32073 getModels ()Ljava/util/Map; METHOD method_32075 (Lcom/google/common/collect/ImmutableMap;Lnet/minecraft/class_5601;)Z ARG 1 layer + METHOD method_72885 (Lnet/minecraft/class_5609;)Lnet/minecraft/class_5607; + ARG 0 data METHOD method_72886 (Lnet/minecraft/class_5609;)Lnet/minecraft/class_5607; ARG 0 data METHOD method_72888 (Lnet/minecraft/class_5607;)Lnet/minecraft/class_5607; @@ -18,8 +20,12 @@ CLASS net/minecraft/class_5600 net/minecraft/client/render/entity/model/EntityMo ARG 0 data METHOD method_72890 (Lnet/minecraft/class_9953;Lnet/minecraft/class_5607;)Lnet/minecraft/class_5607; ARG 1 modelData + METHOD method_72891 (Lnet/minecraft/class_5609;)Lnet/minecraft/class_5607; + ARG 0 data METHOD method_72892 (Lnet/minecraft/class_5609;)Lnet/minecraft/class_5607; ARG 0 data + METHOD method_72893 (Lnet/minecraft/class_5609;)Lnet/minecraft/class_5607; + ARG 0 data METHOD method_74247 (Lnet/minecraft/class_9953;Lnet/minecraft/class_5607;)Lnet/minecraft/class_5607; ARG 1 modelData METHOD method_74248 (Lnet/minecraft/class_9953;Lnet/minecraft/class_5607;)Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/SmallSulfurCubeModel.mapping b/mappings/net/minecraft/client/render/entity/model/SmallSulfurCubeModel.mapping new file mode 100644 index 0000000000..ed822a6d74 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/SmallSulfurCubeModel.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_1_1032 net/minecraft/client/render/entity/model/SmallSulfurCubeModel + METHOD method_1_6326 getInnerTexturedModelData ()Lnet/minecraft/class_5607; + METHOD method_1_6327 getOuterTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping index 19bd1b7fc6..090fce38f1 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping @@ -67,5 +67,15 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag METHOD method_68047 (Lnet/minecraft/class_1_734;Lnet/minecraft/class_1_734;Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_5599;Lnet/minecraft/class_1088$class_10524;Ljava/util/Map;)Lnet/minecraft/class_1092$class_7779; ARG 4 bakedModels ARG 5 blockModels + CLASS class_1_920 FluidModelReporter + FIELD field_1_6491 blocksResult Lnet/minecraft/class_7766$class_7767; + METHOD (Lnet/minecraft/class_7766$class_7767;)V + ARG 1 blocksResult + CLASS class_1_921 ModelReporter + FIELD field_1_6492 blocksResult Lnet/minecraft/class_7766$class_7767; + FIELD field_1_6493 itemsResult Lnet/minecraft/class_7766$class_7767; + METHOD (Lnet/minecraft/class_7766$class_7767;Lnet/minecraft/class_7766$class_7767;)V + ARG 1 blocksResult + ARG 2 itemsResult CLASS class_7779 BakingResult CLASS class_10816 Models diff --git a/mappings/net/minecraft/client/toast/FriendsToast.mapping b/mappings/net/minecraft/client/toast/FriendsToast.mapping index f0779badcc..20445cffcf 100644 --- a/mappings/net/minecraft/client/toast/FriendsToast.mapping +++ b/mappings/net/minecraft/client/toast/FriendsToast.mapping @@ -10,30 +10,48 @@ CLASS net/minecraft/class_1_945 net/minecraft/client/toast/FriendsToast FIELD field_1_6599 duration J FIELD field_1_6600 lines Ljava/util/List; FIELD field_1_6602 visibility Lnet/minecraft/class_368$class_369; + FIELD field_1_7084 profile Lnet/minecraft/class_9296; METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_9296;Lnet/minecraft/class_2561;)V ARG 1 textRenderer + ARG 2 profile ARG 3 text METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_9296;Lnet/minecraft/class_2561;J)V ARG 1 textRenderer + ARG 2 profile ARG 3 text ARG 4 duration METHOD method_1_5708 addToast (Lnet/minecraft/class_374;Lnet/minecraft/class_327;Lnet/minecraft/class_9296;Lnet/minecraft/class_2561;)V ARG 0 toastManager ARG 1 textRenderer + ARG 2 profile ARG 3 text METHOD method_1_5709 getTextHeight ()I METHOD method_1_5710 hide ()V METHOD method_1_5711 onFriendAdded (Lnet/minecraft/class_310;Ljava/lang/String;Ljava/util/UUID;)V ARG 0 client ARG 1 name + ARG 2 id METHOD method_1_5714 onRequestAccepted (Lnet/minecraft/class_310;Ljava/lang/String;Ljava/util/UUID;)V ARG 0 client ARG 1 name + ARG 2 id METHOD method_1_5715 onRequestReceived (Lnet/minecraft/class_310;Ljava/lang/String;Ljava/util/UUID;)V ARG 0 client ARG 1 name + ARG 2 id METHOD method_1_5716 onRequestSent (Lnet/minecraft/class_310;Ljava/lang/String;)V ARG 0 client ARG 1 name + METHOD method_1_6308 addToast (Lnet/minecraft/class_310;Lnet/minecraft/class_9296;Lnet/minecraft/class_2561;)V + ARG 0 client + ARG 1 profile + ARG 2 text + METHOD method_1_6309 addToast (Lnet/minecraft/class_310;Ljava/util/UUID;Lnet/minecraft/class_2561;)V + ARG 0 client + ARG 1 id + ARG 2 text CLASS class_1_1005 FriendStatusChangeNotifier METHOD method_1_6112 run (Lnet/minecraft/class_310;Ljava/lang/String;Ljava/util/UUID;)V + ARG 1 client + ARG 2 name + ARG 3 id diff --git a/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping b/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping index fed0c15dcf..52e749a69a 100644 --- a/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping +++ b/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping @@ -3,6 +3,11 @@ CLASS net/minecraft/class_318 net/minecraft/client/util/ScreenshotRecorder COMMENT holds a few utility methods for other types of screenshots. FIELD field_1974 LOGGER Lorg/slf4j/Logger; FIELD field_41337 SCREENSHOTS_DIRECTORY Ljava/lang/String; + METHOD method_1_6138 saveScreenshot (Lnet/minecraft/class_310;Z)V + ARG 0 client + ARG 1 hasCtrlOrCmd + METHOD method_1_6139 (Lnet/minecraft/class_310;Lnet/minecraft/class_2561;)V + ARG 1 message METHOD method_1659 saveScreenshot (Ljava/io/File;Lnet/minecraft/class_276;Ljava/util/function/Consumer;)V ARG 0 gameDirectory ARG 1 framebuffer diff --git a/mappings/net/minecraft/client/vulkan/VulkanPhysicalDevice.mapping b/mappings/net/minecraft/client/vulkan/VulkanPhysicalDevice.mapping index a8d64d61a6..80e3da9b9c 100644 --- a/mappings/net/minecraft/client/vulkan/VulkanPhysicalDevice.mapping +++ b/mappings/net/minecraft/client/vulkan/VulkanPhysicalDevice.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1_717 net/minecraft/client/vulkan/VulkanPhysicalDevice FIELD field_1_3684 physicalDevice Lorg/lwjgl/vulkan/VkPhysicalDevice; FIELD field_1_3685 physicalDeviceProperties Lorg/lwjgl/vulkan/VkPhysicalDeviceProperties2; FIELD field_1_6426 physicalDevicePropertiesVk11 Lorg/lwjgl/vulkan/VkPhysicalDeviceVulkan11Properties; + FIELD field_1_6962 multiDrawProperties Lorg/lwjgl/vulkan/VkPhysicalDeviceMultiDrawPropertiesEXT; METHOD (Lorg/lwjgl/vulkan/VkPhysicalDevice;)V ARG 1 physicalDevice METHOD method_1_4280 getComputeQueueFamily ()Lit/unimi/dsi/fastutil/ints/IntIntPair; @@ -31,3 +32,4 @@ CLASS net/minecraft/class_1_717 net/minecraft/client/vulkan/VulkanPhysicalDevice METHOD method_1_4293 getDeviceProperties ()Lorg/lwjgl/vulkan/VkPhysicalDeviceProperties; METHOD method_1_4893 getType ()Lnet/minecraft/class_1_785; METHOD method_1_5537 getVk11DeviceProperties ()Lorg/lwjgl/vulkan/VkPhysicalDeviceVulkan11Properties; + METHOD method_1_6195 getMultiDrawProperties ()Lorg/lwjgl/vulkan/VkPhysicalDeviceMultiDrawPropertiesEXT; diff --git a/mappings/net/minecraft/client/window/VulkanWindowBackend.mapping b/mappings/net/minecraft/client/window/VulkanWindowBackend.mapping index 1e34442ef6..36a55e1d8f 100644 --- a/mappings/net/minecraft/client/window/VulkanWindowBackend.mapping +++ b/mappings/net/minecraft/client/window/VulkanWindowBackend.mapping @@ -8,9 +8,12 @@ CLASS net/minecraft/class_1_689 net/minecraft/client/window/VulkanWindowBackend FIELD field_1_3539 PHYSICAL_DEVICE_VULKAN_1_2_FEATURES Lnet/minecraft/class_1_730; FIELD field_1_6285 PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES Lnet/minecraft/class_1_730; FIELD field_1_6396 PHYSICAL_DEVICE_VULKAN_1_1_FEATURES Lnet/minecraft/class_1_730; + FIELD field_1_6920 MULTI_DRAW Lnet/minecraft/class_1_714; + FIELD field_1_6921 PHYSICAL_DEVICE_MULTI_DRAW_FEATURES Lnet/minecraft/class_1_730; METHOD method_1_4154 createDevice (Ljava/util/Collection;Lnet/minecraft/class_1_717;Ljava/util/Set;)Lorg/lwjgl/vulkan/VkDevice; ARG 0 enabledExtensions ARG 1 physicalDevice + ARG 2 enabledFeatures METHOD method_1_4155 createVmaAllocator (Lorg/lwjgl/vulkan/VkDevice;)J ARG 0 device METHOD method_1_4156 getSuitablePhysicalDevice (Lnet/minecraft/class_1_691;)Lnet/minecraft/class_1_717; @@ -25,3 +28,7 @@ CLASS net/minecraft/class_1_689 net/minecraft/client/window/VulkanWindowBackend ARG 0 physicalDevice METHOD method_1_5119 isApiVersionSufficient (Lorg/lwjgl/vulkan/VkPhysicalDevice;)Z ARG 0 physicalDevice + METHOD method_1_6145 deviceSupportsFeature (Lorg/lwjgl/vulkan/VkPhysicalDevice;Lnet/minecraft/class_1_714;)Z + ARG 0 physicalDevice + ARG 1 feature + METHOD method_1_6284 getPilotWindowException ()Lnet/minecraft/class_1_739; diff --git a/mappings/net/minecraft/data/family/BlockFamily.mapping b/mappings/net/minecraft/data/family/BlockFamily.mapping index a540b2d985..7b6147ec4b 100644 --- a/mappings/net/minecraft/data/family/BlockFamily.mapping +++ b/mappings/net/minecraft/data/family/BlockFamily.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily FIELD field_1_1137 generateStonecuttingRecipes Z + FIELD field_1_7032 generateCrackingRecipes Z FIELD field_28526 baseBlock Lnet/minecraft/class_2248; FIELD field_28527 variants Ljava/util/Map; FIELD field_28528 generateModels Z @@ -9,6 +10,7 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily METHOD (Lnet/minecraft/class_2248;)V ARG 1 baseBlock METHOD method_1_1231 shouldGenerateStonecuttingRecipes ()Z + METHOD method_1_6272 shouldGenerateCrackingRecipes ()Z METHOD method_33469 getBaseBlock ()Lnet/minecraft/class_2248; METHOD method_33470 getVariant (Lnet/minecraft/class_5794$class_5796;)Lnet/minecraft/class_2248; ARG 1 variant @@ -38,6 +40,9 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily ARG 1 block METHOD method_1_5476 strippedLog (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; ARG 1 block + METHOD method_1_6273 noGenerateCrackingRecipes ()Lnet/minecraft/class_5794$class_5795; + METHOD method_1_6274 pillar (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; + ARG 1 block METHOD method_33481 build ()Lnet/minecraft/class_5794; METHOD method_33482 button (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; ARG 1 block @@ -85,4 +90,6 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD method_1_5477 getVariantRecipeInput ()Lnet/minecraft/class_5794$class_5796; + METHOD method_1_6275 getPrefixedName (Ljava/lang/String;)Ljava/lang/String; + ARG 1 group METHOD method_33498 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/data/recipe/RecipeGenerator.mapping b/mappings/net/minecraft/data/recipe/RecipeGenerator.mapping index 929c36107e..55c913308a 100644 --- a/mappings/net/minecraft/data/recipe/RecipeGenerator.mapping +++ b/mappings/net/minecraft/data/recipe/RecipeGenerator.mapping @@ -100,6 +100,36 @@ CLASS net/minecraft/class_2446 net/minecraft/data/recipe/RecipeGenerator ARG 0 generator ARG 1 output ARG 2 input + METHOD method_1_6285 generateFamilyCrackingRecipe (Lnet/minecraft/class_5794$class_5796;Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)V + ARG 1 variant + ARG 2 output + ARG 3 input + METHOD method_1_6286 getCriterionName (Lnet/minecraft/class_5794;Lnet/minecraft/class_5794$class_5796;Lnet/minecraft/class_1935;)Ljava/lang/String; + ARG 1 family + ARG 2 variant + ARG 3 input + METHOD method_1_6287 (Lnet/minecraft/class_5797;Lnet/minecraft/class_5794$class_5796;Ljava/lang/String;)V + ARG 2 group + METHOD method_1_6289 (Lnet/minecraft/class_2446;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Lnet/minecraft/class_5797; + ARG 0 generator + ARG 1 output + ARG 2 input + METHOD method_1_6290 (Lnet/minecraft/class_2446;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 0 generator + ARG 1 output + ARG 2 input + METHOD method_1_6291 (Lnet/minecraft/class_2446;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 0 generator + ARG 1 output + ARG 2 input + METHOD method_1_6292 (Lnet/minecraft/class_2446;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V + ARG 0 generator + ARG 1 output + ARG 2 input + METHOD method_1_6293 getPillarRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; + ARG 1 category + ARG 2 output + ARG 3 input METHOD method_10419 generate ()V METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_175; ARG 1 tag diff --git a/mappings/net/minecraft/entity/damage/DamageTypes.mapping b/mappings/net/minecraft/entity/damage/DamageTypes.mapping index 311d86604f..3def046d5e 100644 --- a/mappings/net/minecraft/entity/damage/DamageTypes.mapping +++ b/mappings/net/minecraft/entity/damage/DamageTypes.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_8111 net/minecraft/entity/damage/DamageTypes + FIELD field_1_6960 SULFUR_CUBE_HOT Lnet/minecraft/class_5321; FIELD field_42319 MOB_ATTACK_NO_AGGRO Lnet/minecraft/class_5321; FIELD field_42320 PLAYER_ATTACK Lnet/minecraft/class_5321; FIELD field_42321 ARROW Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/entity/passive/SulfurCubeArchetype.mapping b/mappings/net/minecraft/entity/passive/SulfurCubeArchetype.mapping index e8ba9e7f66..6734687d67 100644 --- a/mappings/net/minecraft/entity/passive/SulfurCubeArchetype.mapping +++ b/mappings/net/minecraft/entity/passive/SulfurCubeArchetype.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1_719 net/minecraft/entity/passive/SulfurCubeArchetype FIELD field_1_6320 defaultKnockbackModifiers Lnet/minecraft/class_1_719$class_1_898; + FIELD field_1_7075 defaultSoundSettings Lnet/minecraft/class_1_719$class_1_1031; METHOD method_1_4341 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance CLASS class_1_720 AttributeEntry @@ -22,3 +23,6 @@ CLASS net/minecraft/class_1_719 net/minecraft/entity/passive/SulfurCubeArchetype CLASS class_1_898 KnockbackModifiers METHOD method_1_5420 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + CLASS class_1_1031 SoundSettings + METHOD method_1_6300 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/entity/passive/SulfurCubeArchetypes.mapping b/mappings/net/minecraft/entity/passive/SulfurCubeArchetypes.mapping index 1c5217c6cb..9bfb7380e6 100644 --- a/mappings/net/minecraft/entity/passive/SulfurCubeArchetypes.mapping +++ b/mappings/net/minecraft/entity/passive/SulfurCubeArchetypes.mapping @@ -41,6 +41,7 @@ CLASS net/minecraft/class_1_726 net/minecraft/entity/passive/SulfurCubeArchetype ARG 5 explosion ARG 6 contactDamage ARG 7 knockbackModifiers + ARG 8 soundSettings METHOD method_1_5435 contactDamage (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Lnet/minecraft/class_5863;Z)Lnet/minecraft/class_1_719$class_1_896; ARG 0 registry ARG 1 damageType @@ -49,3 +50,8 @@ CLASS net/minecraft/class_1_726 net/minecraft/entity/passive/SulfurCubeArchetype METHOD method_1_5436 knockback (FF)Lnet/minecraft/class_1_719$class_1_898; ARG 0 horizontalPower ARG 1 verticalPower + METHOD method_1_6301 soundSettings (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;FF)Lnet/minecraft/class_1_719$class_1_1031; + ARG 0 hitSound + ARG 1 pushSound + ARG 2 pushSoundImpulseThreshold + ARG 3 pushSoundCooldown diff --git a/mappings/net/minecraft/entity/passive/SulfurCubeEntity.mapping b/mappings/net/minecraft/entity/passive/SulfurCubeEntity.mapping index 6f19237f6b..4103d31d3b 100644 --- a/mappings/net/minecraft/entity/passive/SulfurCubeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SulfurCubeEntity.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_1_748 net/minecraft/entity/passive/SulfurCubeEntity FIELD field_1_6346 contactDamage Ljava/util/List; FIELD field_1_6347 explosion Ljava/util/Optional; FIELD field_1_6348 knockbackModifiers Lnet/minecraft/class_1_719$class_1_898; + FIELD field_1_7082 pushSoundCooldown I + FIELD field_1_7083 soundSettings Lnet/minecraft/class_1_719$class_1_1031; METHOD method_1_4505 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 @@ -73,6 +75,7 @@ CLASS net/minecraft/class_1_748 net/minecraft/entity/passive/SulfurCubeEntity ARG 3 verticalPower ARG 4 attackerPos ARG 5 selfPos + METHOD method_1_6307 playEatSound ()V CLASS class_1_749 SulfurCubeLookControl CLASS class_1_750 SulfurCubeMoveControl METHOD (Lnet/minecraft/class_1_748;)V diff --git a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping index 32ea3e1824..6ec8c92c7f 100644 --- a/mappings/net/minecraft/screen/BeaconScreenHandler.mapping +++ b/mappings/net/minecraft/screen/BeaconScreenHandler.mapping @@ -20,7 +20,8 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler ARG 4 context METHOD method_17372 setEffects (Ljava/util/Optional;Ljava/util/Optional;)Z ARG 1 primary - METHOD method_17373 getProperties ()I + ARG 2 secondary + METHOD method_17373 getLevel ()I METHOD method_17374 getPrimaryEffect ()Lnet/minecraft/class_6880; METHOD method_17375 getSecondaryEffect ()Lnet/minecraft/class_6880; METHOD method_17376 hasPayment ()Z diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index 0ffd8eb339..7d6a2f3bb5 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -355,6 +355,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler COMMENT exceptions from this method into a crash report. ARG 1 slotIndex ARG 2 button + ARG 3 actionType ARG 4 player METHOD method_34245 setReceivedStack (ILnet/minecraft/class_1799;)V ARG 1 slot diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping index ac50db273f..666ba63c0b 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot ARG 2 index ARG 3 x ARG 4 y + METHOD method_1_6277 cloneStackCreative (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; + ARG 1 player 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/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 0417dc0cab..7a271e5aaf 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -66,6 +66,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_25132 combinedDynamicRegistries Lnet/minecraft/class_7780; FIELD field_25318 resourceManagerHolder Lnet/minecraft/server/MinecraftServer$class_6897; FIELD field_33211 MAX_WORLD_BORDER_RADIUS I + FIELD field_33220 INITIAL_TICKS_UNTIL_AUTOSAVE I FIELD field_33975 recorderResultConsumer Ljava/util/function/Consumer; FIELD field_33976 recorderDumpConsumer Ljava/util/function/Consumer; FIELD field_33977 needsRecorderSetup Z @@ -137,6 +138,8 @@ CLASS net/minecraft/server/MinecraftServer ARG 3 raining ARG 4 thundering METHOD method_1_5531 unpublish ()Z + METHOD method_1_6279 getChatSpamThreshold ()I + METHOD method_1_6280 getCommandSpamThreshold ()I METHOD method_3716 getKeyPair ()Ljava/security/KeyPair; METHOD method_3718 isFlightEnabled ()Z METHOD method_3723 save (ZZZ)Z diff --git a/mappings/net/minecraft/server/ServerConfigHandler.mapping b/mappings/net/minecraft/server/ServerConfigHandler.mapping index e1b434acb2..e1f51b47ba 100644 --- a/mappings/net/minecraft/server/ServerConfigHandler.mapping +++ b/mappings/net/minecraft/server/ServerConfigHandler.mapping @@ -36,24 +36,45 @@ CLASS net/minecraft/class_3321 net/minecraft/server/ServerConfigHandler ARG 0 playerName CLASS 1 1 METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V + ARG 1 name ARG 2 exception + METHOD onProfileLookupSucceeded (Ljava/lang/String;Ljava/util/UUID;)V + ARG 1 name + ARG 2 id CLASS 2 2 METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V + ARG 1 name ARG 2 exception + METHOD onProfileLookupSucceeded (Ljava/lang/String;Ljava/util/UUID;)V + ARG 1 name + ARG 2 id CLASS 3 3 METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V + ARG 1 name ARG 2 exception + METHOD onProfileLookupSucceeded (Ljava/lang/String;Ljava/util/UUID;)V + ARG 1 name + ARG 2 id CLASS 4 4 METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V + ARG 1 name ARG 2 exception + METHOD onProfileLookupSucceeded (Ljava/lang/String;Ljava/util/UUID;)V + ARG 1 name + ARG 2 id CLASS 5 5 METHOD method_14553 convertPlayerFile (Ljava/io/File;Ljava/lang/String;Ljava/lang/String;)V ARG 1 playerDataFolder ARG 2 fileName ARG 3 uuid METHOD method_14554 getPlayerFileName (Ljava/lang/String;)Ljava/lang/String; + ARG 1 name METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V + ARG 1 name ARG 2 exception + METHOD onProfileLookupSucceeded (Ljava/lang/String;Ljava/util/UUID;)V + ARG 1 name + ARG 2 id CLASS class_3322 ServerConfigException METHOD (Ljava/lang/String;)V ARG 1 message diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping index 98b51cf1c3..76cd44eee4 100644 --- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicated FIELD field_13819 rconServer Lnet/minecraft/class_3408; FIELD field_16799 propertiesLoader Lnet/minecraft/class_3807; FIELD field_16800 gui Lnet/minecraft/class_3182; + FIELD field_29662 CONVERSION_RETRY_INTERVAL I + FIELD field_29663 CONVERSION_TRY_COUNT I FIELD field_48788 debugSampleLog Lnet/minecraft/class_9193; FIELD field_52215 serverLinks Lnet/minecraft/class_9782; FIELD field_52350 filterer Lnet/minecraft/class_9847; diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index a1c2c5c13d..af71d25a21 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHandler + FIELD field_1_7091 chatSpamThresholdSeconds I + FIELD field_1_7092 commandSpamThresholdSeconds I FIELD field_16802 broadcastConsoleToOps Z FIELD field_16804 whiteList Lnet/minecraft/class_3808$class_3809; FIELD field_16805 enforceWhitelist Lnet/minecraft/class_3808$class_3809; diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 13fda408ca..36ad1dc9aa 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHandler + FIELD field_1_7094 commandCooldown Lnet/minecraft/class_10222; FIELD field_14117 movePacketsCount I FIELD field_14118 ticks I FIELD field_14119 requestedTeleportPos Lnet/minecraft/class_243; @@ -38,7 +39,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_49778 MAX_SUGGESTIONS I FIELD field_50089 INVALID_COMMAND_SIGNATURE_TEXT Lnet/minecraft/class_2561; FIELD field_52364 movedThisTick Z - FIELD field_54291 messageCooldown Lnet/minecraft/class_10222; + FIELD field_54291 chatMessageCooldown Lnet/minecraft/class_10222; FIELD field_54292 creativeItemDropCooldown Lnet/minecraft/class_10222; FIELD field_58079 globalChatMessageIndex I FIELD field_64601 dead Z @@ -70,6 +71,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 1 gameRules ARG 2 gameRule ARG 3 value + METHOD method_1_6319 checkForChatSpam ()V + METHOD method_1_6320 checkForCommandSpam ()V METHOD method_14360 requestTeleport (Lnet/minecraft/class_10182;Ljava/util/Set;)V ARG 1 pos ARG 2 flags @@ -148,15 +151,18 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan COMMENT @see net.minecraft.util.StringHelper#isValidChar(char) ARG 0 message METHOD method_43669 checkForSpam (Lnet/minecraft/class_10222;)V + ARG 1 cooldown METHOD method_44155 handleDecoratedMessage (Lnet/minecraft/class_7471;)V ARG 1 message METHOD method_44337 validateMessage (Ljava/lang/String;ZLjava/lang/Runnable;)V - COMMENT {@return the validated acknowledgment if the message is valid, or an empty optional - COMMENT if it is not} + COMMENT Validates the {@code message}, running {@code sendAction} if the message + COMMENT is valid. COMMENT - COMMENT

This disconnects the player if the message arrives in - COMMENT improper order or if chat is disabled. + COMMENT This disconnects the player if the message has invalid characters, and sends + COMMENT a game message if the player tries to send a chat message with chat disabled. ARG 1 message + ARG 2 command + ARG 3 sendAction METHOD method_45002 (Lnet/minecraft/class_7448;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2168; ARG 2 source METHOD method_45003 parse (Ljava/lang/String;)Lcom/mojang/brigadier/ParseResults; diff --git a/mappings/net/minecraft/server/world/ChunkLevelManager.mapping b/mappings/net/minecraft/server/world/ChunkLevelManager.mapping index 64f08b0ddd..a7c16753fb 100644 --- a/mappings/net/minecraft/server/world/ChunkLevelManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkLevelManager.mapping @@ -35,6 +35,7 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkLevelManager ARG 1 pos ARG 3 level ARG 4 holder + ARG 5 prevLevel METHOD method_15892 update (Lnet/minecraft/class_3898;)Z COMMENT Update the states related to chunk tickets and chunk loading levels, which mainly involves three kind of updates: COMMENT

    @@ -48,6 +49,9 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkLevelManager METHOD method_17655 (J)Lit/unimi/dsi/fastutil/objects/ObjectSet; ARG 0 sectionPos METHOD method_20800 shouldTick (J)Lnet/minecraft/class_9851; + COMMENT {@return {@link TriState#TRUE} or {@link TriState#FALSE}, to indicate that + COMMENT the chunk should or should not be ticked, or {@link TriState#DEFAULT} to + COMMENT tick only if a player is nearby to tick the chunk} ARG 1 chunkPos METHOD method_21683 toDumpString ()Ljava/lang/String; METHOD method_38629 setSimulationDistance (I)V diff --git a/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping b/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping index 136a7a676e..c01daeee82 100644 --- a/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping @@ -48,6 +48,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingMana ARG 11 ticketManager ARG 12 viewDistance ARG 13 dsync + METHOD method_1_6278 isTrackingEntity (I)Z + ARG 1 entityId METHOD method_17212 getLightingProvider ()Lnet/minecraft/class_3227; METHOD method_17214 setViewDistance (I)V ARG 1 watchDistance @@ -59,6 +61,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingMana ARG 1 pos ARG 3 level ARG 4 holder + ARG 5 prevLevel METHOD method_17220 getRegion (Lnet/minecraft/class_3193;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture; ARG 1 centerChunk ARG 2 margin @@ -203,6 +206,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingMana ARG 2 chunkPos METHOD method_43377 (Ljava/util/Optional;)Ljava/util/Optional; ARG 1 nbt + METHOD method_43378 (Lnet/minecraft/class_1923;Ljava/util/Optional;)Ljava/util/Optional; + ARG 2 updatedChunkOpt METHOD method_43381 updateChunkNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt METHOD method_43382 getProtoChunk (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2791; @@ -265,6 +270,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingMana ARG 1 chunks METHOD method_61257 (Lnet/minecraft/class_3193;Ljava/util/List;)Lnet/minecraft/class_2818; ARG 2 chunks + METHOD method_61258 (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2852; + ARG 2 updatedChunk METHOD method_61261 isAnyPlayerTicking (Lnet/minecraft/class_1923;)Z ARG 1 pos METHOD method_63545 updateLevel (Lnet/minecraft/class_1923;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index fb24ebd362..64bb2d928f 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -27,6 +27,10 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager ARG 7 viewDistance ARG 8 simulationDistance ARG 9 dsync + ARG 10 chunkStatusChangeListener + ARG 11 persistentStateManagerFactory + METHOD method_1_6297 isTrackingEntity (I)Z + ARG 1 entityId METHOD method_12129 getChunkGenerator ()Lnet/minecraft/class_2794; METHOD method_14096 updatePosition (Lnet/minecraft/class_3222;)V COMMENT Updates the chunk section position of the {@code player}. This can either be a diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index afe0fa3d90..387ff55f5e 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld + FIELD field_1_7066 lastEntityId Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_13948 idleTimeout I FIELD field_13949 blockTickScheduler Lnet/minecraft/class_6757; FIELD field_13950 syncedBlockEventQueue Lit/unimi/dsi/fastutil/objects/ObjectLinkedOpenHashSet; @@ -49,6 +50,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 8 seed ARG 10 spawners ARG 11 shouldTickTime + METHOD method_1_413 (Lnet/minecraft/class_1297;)Ljava/lang/String; + ARG 0 entity METHOD method_1_1681 getWeatherState ()Lnet/minecraft/class_1_216; METHOD method_1_1683 setWeatherGradients (Lnet/minecraft/class_1_216;)V ARG 1 weatherState @@ -272,6 +275,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld COMMENT @see net.minecraft.world.ServerWorldAccess#spawnEntityAndPassengers ARG 1 entity METHOD method_31268 getDebugString ()Ljava/lang/String; + METHOD method_31269 (Lit/unimi/dsi/fastutil/objects/Object2IntMap$Entry;)Ljava/lang/String; + ARG 0 entry METHOD method_31270 getTopFive (Ljava/lang/Iterable;Ljava/util/function/Function;)Ljava/lang/String; COMMENT Categories {@code items} with the {@code classifier} and reports a message COMMENT indicating the top five biggest categories. diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index a3c5e71b16..c3c9e52060 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -2,7 +2,9 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper FIELD field_9292 LOGGER Lorg/slf4j/Logger; FIELD field_24392 CHUNK_AREA I FIELD field_24393 SPAWNABLE_GROUPS [Lnet/minecraft/class_1311; + FIELD field_30972 TICK_WITH_PLAYERS_CHUNK_DISTANCE_THRESHOLD I FIELD field_30974 MIN_SPAWN_DISTANCE I + FIELD field_56560 ALWAYS_TICK_CHUNK_DISTANCE_THRESHOLD I METHOD method_8657 getRandomPosInChunkSection (Lnet/minecraft/class_1937;Lnet/minecraft/class_2818;)Lnet/minecraft/class_2338; ARG 0 world ARG 1 chunk @@ -111,6 +113,8 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 3 structureAccessor METHOD method_61729 collectSpawnableGroups (Lnet/minecraft/class_1948$class_5262;ZZ)Ljava/util/List; ARG 0 info + ARG 1 spawnMonsters + ARG 2 rareTick CLASS class_5259 Runner METHOD method_1_77 run (Lnet/minecraft/class_1308;Lnet/minecraft/class_2791;)V ARG 1 entity diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index dcab46cab8..129006ddeb 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -51,6 +51,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_1_1159 getDimensionTime ()J METHOD method_1_1160 (Lnet/minecraft/class_6880;)Ljava/lang/Long; ARG 1 clock + METHOD method_1_6276 getNextEntityId ()I METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState diff --git a/mappings/net/minecraft/world/gen/WorldPresets.mapping b/mappings/net/minecraft/world/gen/WorldPresets.mapping index 74d4459277..af55f5880f 100644 --- a/mappings/net/minecraft/world/gen/WorldPresets.mapping +++ b/mappings/net/minecraft/world/gen/WorldPresets.mapping @@ -20,6 +20,8 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets METHOD method_64225 createTestOptions (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_7723; ARG 0 registries CLASS class_7146 Registrar + FIELD field_1_7089 endDimensionType Lnet/minecraft/class_6880; + FIELD field_1_7090 netherDimensionType Lnet/minecraft/class_6880; FIELD field_37730 biomeLookup Lnet/minecraft/class_7871; FIELD field_37731 structureSetLookup Lnet/minecraft/class_7871; FIELD field_37732 chunkGeneratorSettingsLookup Lnet/minecraft/class_7871; @@ -31,6 +33,14 @@ CLASS net/minecraft/class_5317 net/minecraft/world/gen/WorldPresets FIELD field_42993 multiNoisePresetLookup Lnet/minecraft/class_7871; METHOD (Lnet/minecraft/class_7891;)V ARG 1 presetRegisterable + METHOD method_1_6312 createFlatAllDimensionsPreset ()Lnet/minecraft/class_7145; + METHOD method_1_6313 createFlatDimensionPreset (Lnet/minecraft/class_5321;Ljava/util/List;)Lnet/minecraft/class_3232; + ARG 1 biome + ARG 2 layers + METHOD method_1_6314 createEndOptions (Lnet/minecraft/class_2794;)Lnet/minecraft/class_5363; + ARG 1 chunkGenerator + METHOD method_1_6315 createNetherOptions (Lnet/minecraft/class_2794;)Lnet/minecraft/class_5363; + ARG 1 chunkGenerator METHOD method_41600 bootstrap ()V METHOD method_41601 createOverworldOptions (Lnet/minecraft/class_1966;Lnet/minecraft/class_6880;)Lnet/minecraft/class_5363; ARG 1 biomeSource