From 2d29be4c89350b29c894775837ea27e351e05728 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Wed, 13 May 2026 21:10:07 -0400 Subject: [PATCH] 26.2-snapshot-7 part 2 --- .../block/BlockEntityProvider.mapping | 11 +++++++ .../entity/StructureBlockBlockEntity.mapping | 4 +++ .../minecraft/client/ClientWatchdog.mapping | 1 + .../data/BlockStateModelGenerator.mapping | 25 +++++++++++++- .../friend/gui/widget/FriendWidget.mapping | 6 ++-- .../gui/widget/AbstractTextWidget.mapping | 2 ++ .../NarratedMultilineTextWidget.mapping | 3 ++ .../gui/widget/ScrollableLayoutWidget.mapping | 1 + .../client/network/p2p/P2PHandshake.mapping | 7 +++- .../render/item/HeldItemRenderer.mapping | 9 +++-- .../client/render/model/Baker.mapping | 3 +- .../model/ErrorCollectingSpriteGetter.mapping | 3 -- .../render/model/GeometryBakedModel.mapping | 2 ++ .../model/MissingTextureReporter.mapping | 17 +++++++++- .../client/render/model/ModelBaker.mapping | 6 +++- .../model/json/GeneratedItemModel.mapping | 2 ++ .../client/texture/AbstractTexture.mapping | 1 + .../client/world/ClientWorld.mapping | 3 ++ .../command/EntitySelectorOptions.mapping | 11 +++++++ .../command/EntitySelectorReader.mapping | 1 + .../command/NonpolarFilterState.mapping | 2 ++ .../command/PolarFilterState.mapping | 23 +++++++++++++ .../minecraft/data/family/BlockFamily.mapping | 11 +++++++ .../data/recipe/RecipeGenerator.mapping | 25 ++++++++++++++ .../net/minecraft/datafixer/FixUtil.mapping | 5 +++ .../fix/EntityRidingToPassengerFix.mapping | 14 ++++++++ .../datafixer/fix/ItemSpawnEggFix.mapping | 5 +++ mappings/net/minecraft/nbt/NbtOps.mapping | 8 +++++ .../integrated/IntegratedServer.mapping | 1 + .../server/network/ServerPlayerEntity.mapping | 1 + .../RuinedPortalStructurePiece.mapping | 6 ++++ .../WoodlandMansionGenerator.mapping | 1 + mappings/net/minecraft/text/TextColor.mapping | 3 ++ .../net/minecraft/util/BlockMirror.mapping | 18 ---------- .../util/InterpolatedFlipFlop.mapping | 4 +-- .../minecraft/util/crash/CrashReport.mapping | 6 ++++ .../minecraft/util/math/BlockMirror.mapping | 33 +++++++++++++++++++ .../util/{ => math}/BlockRotation.mapping | 14 +++++++- 38 files changed, 264 insertions(+), 34 deletions(-) create mode 100644 mappings/net/minecraft/block/BlockEntityProvider.mapping delete mode 100644 mappings/net/minecraft/client/render/model/ErrorCollectingSpriteGetter.mapping delete mode 100644 mappings/net/minecraft/util/BlockMirror.mapping create mode 100644 mappings/net/minecraft/util/math/BlockMirror.mapping rename mappings/net/minecraft/util/{ => math}/BlockRotation.mapping (59%) diff --git a/mappings/net/minecraft/block/BlockEntityProvider.mapping b/mappings/net/minecraft/block/BlockEntityProvider.mapping new file mode 100644 index 0000000000..6892ef9e1d --- /dev/null +++ b/mappings/net/minecraft/block/BlockEntityProvider.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_9826 net/minecraft/block/BlockEntityProvider + METHOD method_1_5510 getEventListener (Lnet/minecraft/class_3218;Lnet/minecraft/class_2586;)Lnet/minecraft/class_5714; + ARG 1 world + ARG 2 blockEntity + METHOD method_10123 createBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2586; + ARG 1 pos + ARG 2 state + METHOD method_31645 getTicker (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2591;)Lnet/minecraft/class_5558; + ARG 1 world + ARG 2 state + ARG 3 type diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index d950c7c001..fe67313f95 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt FIELD field_12103 seed J FIELD field_12104 author Ljava/lang/String; FIELD field_12105 rotation Lnet/minecraft/class_2470; + FIELD field_31364 MAX_ABSOLUTE_POS I + FIELD field_31365 MAX_SIZE I FIELD field_31366 AUTHOR_KEY Ljava/lang/String; FIELD field_55823 strict Z FIELD field_57787 DEFAULT_AUTHOR Ljava/lang/String; @@ -119,6 +121,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt METHOD method_54879 getStructureTemplate (Lnet/minecraft/class_3218;)Lnet/minecraft/class_3499; ARG 1 world METHOD method_66476 setStrict (Z)V + ARG 1 strict METHOD method_66477 isStrict ()Z METHOD method_66717 saveStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;ZLjava/lang/String;ZLjava/util/List;)Z ARG 0 world @@ -128,4 +131,5 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt ARG 4 ignoreEntities ARG 5 author ARG 6 toDisk + ARG 7 ignoredBlocks CLASS class_2634 Action diff --git a/mappings/net/minecraft/client/ClientWatchdog.mapping b/mappings/net/minecraft/client/ClientWatchdog.mapping index 76d7a9d890..1b0d66b471 100644 --- a/mappings/net/minecraft/client/ClientWatchdog.mapping +++ b/mappings/net/minecraft/client/ClientWatchdog.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_9918 net/minecraft/client/ClientWatchdog FIELD field_52723 TIMEOUT Ljava/time/Duration; + METHOD method_1_5619 makeJvmCrash ()V METHOD method_61936 shutdownClient (Ljava/lang/String;Lnet/minecraft/class_310;Lnet/minecraft/class_542;J)V ARG 0 reason ARG 1 client diff --git a/mappings/net/minecraft/client/data/BlockStateModelGenerator.mapping b/mappings/net/minecraft/client/data/BlockStateModelGenerator.mapping index a3d6ea1e32..bc8fde9041 100644 --- a/mappings/net/minecraft/client/data/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/client/data/BlockStateModelGenerator.mapping @@ -72,6 +72,12 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato METHOD method_1_5023 (Lnet/minecraft/class_1767;Lnet/minecraft/class_2248;)V ARG 1 color ARG 2 shulkerBox + METHOD method_1_5681 createSignBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;)Lnet/minecraft/class_4917; + ARG 0 signBlock + ARG 1 model0 + ARG 2 model1 + ARG 3 model2 + ARG 4 model3 METHOD method_25508 registerChorusPlant ()V METHOD method_25509 registerComposter ()V METHOD method_25510 registerDaylightDetector ()V @@ -476,7 +482,16 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato ARG 3 eastSideModel ARG 4 southSideModel ARG 5 westSideModel - METHOD method_46190 registerHangingSign (Lnet/minecraft/class_2248;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;)Lnet/minecraft/class_4917; + METHOD method_46190 createHangingSignBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;Lnet/minecraft/class_807;)Lnet/minecraft/class_4917; + ARG 0 hangingSignBlock + ARG 1 unattached0 + ARG 2 unattached1 + ARG 3 unattached2 + ARG 4 unattached3 + ARG 5 attached0 + ARG 6 attached1 + ARG 7 attached2 + ARG 8 attached3 METHOD method_46193 registerChiseledBookshelf ()V METHOD method_47519 createUvLockedColumnBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_4917; ARG 0 block @@ -819,6 +834,14 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato ARG 2 textures METHOD method_1_1046 (Lnet/minecraft/class_2248;Lnet/minecraft/class_5794;)Z ARG 1 family + METHOD method_1_5682 customHangingSign (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 hangingSignBlock + METHOD method_1_5683 hangingSign (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; + ARG 1 hangingSignBlock + METHOD method_1_5684 hangingSign (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_5794$class_5796;)Lnet/minecraft/class_4910$class_4912; + ARG 1 hangingSignBlock + ARG 2 baseBlock + ARG 3 wallVariant METHOD method_25716 button (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; ARG 1 buttonBlock METHOD method_25717 sign (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912; diff --git a/mappings/net/minecraft/client/friend/gui/widget/FriendWidget.mapping b/mappings/net/minecraft/client/friend/gui/widget/FriendWidget.mapping index 570033d647..608724a53e 100644 --- a/mappings/net/minecraft/client/friend/gui/widget/FriendWidget.mapping +++ b/mappings/net/minecraft/client/friend/gui/widget/FriendWidget.mapping @@ -47,6 +47,8 @@ CLASS net/minecraft/class_1_929 net/minecraft/client/friend/gui/widget/FriendWid ARG 2 button METHOD method_1_5659 (Lnet/minecraft/class_8816;)V ARG 1 button + METHOD method_1_5661 (Ljava/lang/Throwable;)Ljava/lang/Void; + ARG 0 ex METHOD method_1_5662 (Ljava/util/UUID;Lnet/minecraft/class_4185;)V ARG 2 button METHOD method_1_5663 (Ljava/util/UUID;Lnet/minecraft/class_4185;)V @@ -81,6 +83,6 @@ CLASS net/minecraft/class_1_929 net/minecraft/client/friend/gui/widget/FriendWid METHOD method_1_5678 joinRequest (Ljava/util/UUID;Ljava/util/UUID;)V ARG 1 pmid ARG 2 profileId - METHOD method_1_5679 (Lorg/apache/commons/lang3/function/TriConsumer;Ljava/util/UUID;)V - ARG 1 callback + METHOD method_1_5679 showToast (Lorg/apache/commons/lang3/function/TriConsumer;Ljava/util/UUID;)V + ARG 1 toastCallback ARG 2 profileId diff --git a/mappings/net/minecraft/client/gui/widget/AbstractTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/AbstractTextWidget.mapping index 163ad082a4..16a47d3d57 100644 --- a/mappings/net/minecraft/client/gui/widget/AbstractTextWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/AbstractTextWidget.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_8130 net/minecraft/client/gui/widget/AbstractTextWidge ARG 4 height ARG 5 message ARG 6 textRenderer + METHOD method_1_5811 handleClickedStyle (Lnet/minecraft/class_2583;)Z + ARG 1 style METHOD method_48977 getTextRenderer ()Lnet/minecraft/class_327; METHOD method_75796 draw (Lnet/minecraft/class_12225;)V ARG 1 textConsumer diff --git a/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping index 64df7450ca..d5d7a418f4 100644 --- a/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping @@ -11,6 +11,9 @@ CLASS net/minecraft/class_8019 net/minecraft/client/gui/widget/NarratedMultiline ARG 4 customWidth ARG 5 backgroundRendering ARG 6 alwaysShowBorders + METHOD method_1_5770 (Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional; + ARG 0 style + ARG 1 string METHOD method_75352 builder (Lnet/minecraft/class_2561;Lnet/minecraft/class_327;)Lnet/minecraft/class_8019$class_12141; ARG 0 text ARG 1 textRenderer diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableLayoutWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableLayoutWidget.mapping index 002794e70d..1182e23945 100644 --- a/mappings/net/minecraft/client/gui/widget/ScrollableLayoutWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ScrollableLayoutWidget.mapping @@ -26,3 +26,4 @@ CLASS net/minecraft/class_11467 net/minecraft/client/gui/widget/ScrollableLayout ARG 4 height ARG 5 scrollbar METHOD method_1_605 getSideMargin ()I + METHOD method_1_5644 resetContents ()V diff --git a/mappings/net/minecraft/client/network/p2p/P2PHandshake.mapping b/mappings/net/minecraft/client/network/p2p/P2PHandshake.mapping index c4e300f91f..5b2e855e53 100644 --- a/mappings/net/minecraft/client/network/p2p/P2PHandshake.mapping +++ b/mappings/net/minecraft/client/network/p2p/P2PHandshake.mapping @@ -30,7 +30,8 @@ CLASS net/minecraft/class_1_912 net/minecraft/client/network/p2p/P2PHandshake METHOD method_1_5580 createAnswer ()Ljava/util/concurrent/CompletableFuture; METHOD method_1_5581 createOffer ()Ljava/util/concurrent/CompletableFuture; METHOD method_1_5582 doCreateOffer ()Ljava/util/concurrent/CompletableFuture; - METHOD method_1_5583 (Ldev/onvoid/webrtc/RTCStats;Ljava/util/Map;)Ljava/util/Optional; + METHOD method_1_5583 getIceInfo (Ldev/onvoid/webrtc/RTCStats;Ljava/util/Map;)Ljava/util/Optional; + ARG 1 rtcStats ARG 2 stats METHOD method_1_5584 abortHandshakeImpl (Ljava/lang/String;)V ARG 1 reason @@ -42,6 +43,10 @@ CLASS net/minecraft/class_1_912 net/minecraft/client/network/p2p/P2PHandshake METHOD method_1_5588 getSessionId ()Ljava/lang/String; METHOD method_1_5589 isJoin ()Z COMMENT {@return {@code true} if joining; {@code false} if hosting} + METHOD method_1_5591 (Ldev/onvoid/webrtc/RTCStatsReport;)V + ARG 1 statsReport + METHOD method_1_5592 (Ldev/onvoid/webrtc/RTCStats;)Z + ARG 0 stats METHOD method_1_5593 (Ljava/util/concurrent/CompletableFuture;Ljava/lang/Void;Ljava/lang/Throwable;)V ARG 3 ex METHOD method_1_5594 (Ljava/lang/String;Ljava/lang/Throwable;)V diff --git a/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping index 3537d8e98c..fd435c4d70 100644 --- a/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping @@ -14,9 +14,9 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer FIELD field_32700 ARM_HOLDING_ITEM_X_ANGLE_MULTIPLIER I FIELD field_32701 ARM_HOLDING_ITEM_THIRD_Y_ANGLE_MULTIPLIER I FIELD field_32702 ARM_HOLDING_ITEM_SECOND_Z_ANGLE_MULTIPLIER I - FIELD field_32712 ARM_X_ANGLE_MULTIPLIER F - FIELD field_32713 ARM_Y_ANGLE_MULTIPLIER F - FIELD field_32714 ARM_Z_ANGLE_MULTIPLIER F + FIELD field_32712 ARM_X_ANGLE F + FIELD field_32713 ARM_Y_ANGLE F + FIELD field_32714 ARM_Z_ANGLE F FIELD field_32715 ARM_TRANSLATE_X F FIELD field_32716 ARM_TRANSLATE_Y F FIELD field_32717 ARM_TRANSLATE_Z F @@ -38,6 +38,9 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer ARG 1 client ARG 2 entityRenderDispatcher ARG 3 itemModelManager + METHOD method_1_5131 setHeldItemsIfSkippingSwapAnimation (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V + ARG 1 mainHandStack + ARG 2 offHandStack METHOD method_3215 resetEquipProgress (Lnet/minecraft/class_1268;)V ARG 1 hand METHOD method_3216 renderArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_11659;ILnet/minecraft/class_1306;)V diff --git a/mappings/net/minecraft/client/render/model/Baker.mapping b/mappings/net/minecraft/client/render/model/Baker.mapping index 1dd2f4352a..ae0d88a923 100644 --- a/mappings/net/minecraft/client/render/model/Baker.mapping +++ b/mappings/net/minecraft/client/render/model/Baker.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_7775 net/minecraft/client/render/model/Baker METHOD method_45872 getModel (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10819; ARG 1 id - METHOD method_65732 getSpriteGetter ()Lnet/minecraft/class_1_734; + METHOD method_65732 getMissingTextureReporter ()Lnet/minecraft/class_1_734; METHOD method_68549 compute (Lnet/minecraft/class_7775$class_10897;)Ljava/lang/Object; ARG 1 key METHOD method_76673 getBlockPart ()Lnet/minecraft/class_10889; @@ -11,5 +11,6 @@ CLASS net/minecraft/class_7775 net/minecraft/client/render/model/Baker ARG 1 baker CLASS class_12356 Interner METHOD method_1_2261 intern (Lnet/minecraft/class_777$class_1_320;)Lnet/minecraft/class_777$class_1_320; + ARG 1 spriteInfo METHOD method_76676 intern (Lorg/joml/Vector3fc;)Lorg/joml/Vector3fc; ARG 1 vec diff --git a/mappings/net/minecraft/client/render/model/ErrorCollectingSpriteGetter.mapping b/mappings/net/minecraft/client/render/model/ErrorCollectingSpriteGetter.mapping deleted file mode 100644 index ec0b5d121c..0000000000 --- a/mappings/net/minecraft/client/render/model/ErrorCollectingSpriteGetter.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_9826 net/minecraft/client/render/model/ErrorCollectingSpriteGetter - METHOD method_10123 createBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2586; - METHOD method_31645 getTicker (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2591;)Lnet/minecraft/class_5558; diff --git a/mappings/net/minecraft/client/render/model/GeometryBakedModel.mapping b/mappings/net/minecraft/client/render/model/GeometryBakedModel.mapping index 5c7fdd99c9..ed23aa76f4 100644 --- a/mappings/net/minecraft/client/render/model/GeometryBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/GeometryBakedModel.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_10801 net/minecraft/client/render/model/GeometryBakedModel FIELD comp_3751 useAmbientOcclusion Z FIELD field_64586 LOGGER Lorg/slf4j/Logger; + METHOD method_1_5799 getSpritesOutsideBlockAtlas (Lnet/minecraft/class_10817;)Lcom/google/common/collect/Multimap; + ARG 0 bakedGeometry METHOD method_67931 create (Lnet/minecraft/class_7775;Lnet/minecraft/class_2960;Lnet/minecraft/class_3665;)Lnet/minecraft/class_10889; ARG 0 baker ARG 1 id diff --git a/mappings/net/minecraft/client/render/model/MissingTextureReporter.mapping b/mappings/net/minecraft/client/render/model/MissingTextureReporter.mapping index 0b1a338c7b..1d83a5b695 100644 --- a/mappings/net/minecraft/client/render/model/MissingTextureReporter.mapping +++ b/mappings/net/minecraft/client/render/model/MissingTextureReporter.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/class_1_734 net/minecraft/client/render/model/MissingTexture FIELD field_1_3723 missingTexture Lnet/minecraft/class_1_314$class_1_315; FIELD field_1_3725 missingTextureReferencesByModel Lcom/google/common/collect/Multimap; FIELD field_1_3726 missingTexturesByModel Lcom/google/common/collect/Multimap; + FIELD field_1_6749 LOGGER Lorg/slf4j/Logger; + FIELD field_1_6750 translucentMissingTexture Lnet/minecraft/class_1_314$class_1_315; + METHOD (Lnet/minecraft/class_1058;)V + ARG 1 missingSprite METHOD method_1_4433 bakeModelTexture (Lnet/minecraft/class_1_314;)Lnet/minecraft/class_1_314$class_1_315; ARG 1 texture METHOD method_1_4434 bakeModelTexture (Lnet/minecraft/class_1_314;Lnet/minecraft/class_7766$class_7767;)Lnet/minecraft/class_1_314$class_1_315; @@ -20,4 +24,15 @@ CLASS net/minecraft/class_1_734 net/minecraft/client/render/model/MissingTexture METHOD method_1_4438 (Ljava/lang/String;)Ljava/lang/String; ARG 0 texture METHOD method_1_4439 reportMissingTextures ()V - METHOD method_65740 getMissing (Ljava/lang/String;Lnet/minecraft/class_10813;)Lnet/minecraft/class_1_314$class_1_315; + METHOD method_1_5921 reportMissingTextureInModel (Lnet/minecraft/class_1_314;Lnet/minecraft/class_10813;)Lnet/minecraft/class_1_314$class_1_315; + ARG 1 texture + ARG 2 model + METHOD method_1_5922 getTextureFor (Lnet/minecraft/class_1_314;)Lnet/minecraft/class_1_314$class_1_315; + ARG 1 texture + METHOD method_1_5923 reportMissingTextureInModel (Lnet/minecraft/class_10419;Ljava/lang/String;Lnet/minecraft/class_10813;)Lnet/minecraft/class_1_314$class_1_315; + ARG 1 modelTextures + ARG 2 textureId + ARG 3 model + METHOD method_65740 reportMissingTextureReference (Ljava/lang/String;Lnet/minecraft/class_10813;)Lnet/minecraft/class_1_314$class_1_315; + ARG 1 textureId + ARG 2 model diff --git a/mappings/net/minecraft/client/render/model/ModelBaker.mapping b/mappings/net/minecraft/client/render/model/ModelBaker.mapping index a87aaec1d2..1474a1fb52 100644 --- a/mappings/net/minecraft/client/render/model/ModelBaker.mapping +++ b/mappings/net/minecraft/client/render/model/ModelBaker.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelBaker + FIELD field_1_2285 IDENTITY Lorg/joml/Matrix4fc; FIELD field_5370 FIRE_1 Lnet/minecraft/class_1_310; FIELD field_5380 LOGGER Lorg/slf4j/Logger; FIELD field_5397 FIRE_0 Lnet/minecraft/class_1_310; @@ -26,6 +27,7 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelBaker METHOD method_23216 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 0 id METHOD method_45876 bake (Lnet/minecraft/class_1_734;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 missingTextureReporter ARG 2 executor METHOD method_60912 (Ljava/lang/String;)Ljava/lang/String; ARG 0 path @@ -42,12 +44,13 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelBaker ARG 1 id ARG 2 asset CLASS class_7778 BakerImpl - FIELD field_56988 spriteGetter Lnet/minecraft/class_1_734; + FIELD field_56988 missingTextureReporter Lnet/minecraft/class_1_734; FIELD field_57959 cache Ljava/util/Map; FIELD field_57960 cacheValueFunction Ljava/util/function/Function; FIELD field_64597 interner Lnet/minecraft/class_7775$class_12356; FIELD field_64598 blockItemModels Lnet/minecraft/class_1088$class_10812; METHOD (Lnet/minecraft/class_1088;Lnet/minecraft/class_1_734;Lnet/minecraft/class_7775$class_12356;Lnet/minecraft/class_1088$class_10812;)V + ARG 2 missingTextureReporter ARG 3 interner ARG 4 blockItemModels METHOD method_68550 (Lnet/minecraft/class_7775$class_10897;)Ljava/lang/Object; @@ -58,6 +61,7 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelBaker CLASS class_10812 BlockItemModels METHOD method_68021 bake (Lnet/minecraft/class_10819;Lnet/minecraft/class_1_734;Lnet/minecraft/class_7775$class_12356;)Lnet/minecraft/class_1088$class_10812; ARG 0 model + ARG 1 reporter ARG 2 interner CLASS class_12357 Vec3fInternerImpl FIELD field_1_1850 SPRITE_INFO_INTERNER Lcom/google/common/collect/Interner; diff --git a/mappings/net/minecraft/client/render/model/json/GeneratedItemModel.mapping b/mappings/net/minecraft/client/render/model/json/GeneratedItemModel.mapping index 902d5a4951..251e745bb9 100644 --- a/mappings/net/minecraft/client/render/model/json/GeneratedItemModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/GeneratedItemModel.mapping @@ -10,10 +10,12 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/GeneratedIt ARG 0 builder ARG 1 interner ARG 2 settings + ARG 3 spriteInfo METHOD method_1_2414 addEdgeGeometry (Lnet/minecraft/class_10817$class_10818;Lnet/minecraft/class_7775$class_12356;Lnet/minecraft/class_3665;Lnet/minecraft/class_777$class_1_320;)V ARG 0 builder ARG 1 interner ARG 2 settings + ARG 3 spriteInfo METHOD method_3476 getEdgePixels (Lnet/minecraft/class_801$class_803;Ljava/util/Set;Lnet/minecraft/class_7764;IIIII)V ARG 0 side ARG 1 edgePixelsOut diff --git a/mappings/net/minecraft/client/texture/AbstractTexture.mapping b/mappings/net/minecraft/client/texture/AbstractTexture.mapping index 4682be8e53..19c4b98d59 100644 --- a/mappings/net/minecraft/client/texture/AbstractTexture.mapping +++ b/mappings/net/minecraft/client/texture/AbstractTexture.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1044 net/minecraft/client/texture/AbstractTexture FIELD field_56974 texture Lcom/mojang/blaze3d/textures/GpuTexture; FIELD field_60597 textureView Lcom/mojang/blaze3d/textures/GpuTextureView; FIELD field_63613 sampler Lnet/minecraft/class_12137; + METHOD method_1_5705 destroyTexture ()V METHOD method_68004 getTexture ()Lcom/mojang/blaze3d/textures/GpuTexture; METHOD method_71659 getTextureView ()Lcom/mojang/blaze3d/textures/GpuTextureView; METHOD method_75484 getSampler ()Lnet/minecraft/class_12137; diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 38210a3518..aae4371bc9 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_1_5681 blockBreakingInfoByEntity Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_1_5682 blockBreakingInfoByPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD field_1_5683 worldExtractor Lnet/minecraft/class_1_816; + FIELD field_1_5684 ticksSinceLastRainSound I FIELD field_3727 networkHandler Lnet/minecraft/class_634; FIELD field_3729 client Lnet/minecraft/class_310; FIELD field_17675 mapStates Ljava/util/Map; @@ -45,6 +47,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_1_4874 decayBlockBreakingInfo ()V METHOD method_1_4875 removeBlockBreakingInfo (Lnet/minecraft/class_3191;)V ARG 1 info + METHOD method_1_4876 addRainEffects ()V METHOD method_2932 addParticle (DDDDDLnet/minecraft/class_2394;)V ARG 1 minX ARG 3 maxX diff --git a/mappings/net/minecraft/command/EntitySelectorOptions.mapping b/mappings/net/minecraft/command/EntitySelectorOptions.mapping index 5fde47e65f..54bd553fc9 100644 --- a/mappings/net/minecraft/command/EntitySelectorOptions.mapping +++ b/mappings/net/minecraft/command/EntitySelectorOptions.mapping @@ -26,6 +26,17 @@ CLASS net/minecraft/class_2306 net/minecraft/command/EntitySelectorOptions ARG 0 reader METHOD method_1_5376 (Lnet/minecraft/class_2303;)Z ARG 0 reader + METHOD method_1_6114 (Lnet/minecraft/class_6885$class_6888;)Lnet/minecraft/class_2960; + ARG 0 tag + METHOD method_1_6115 exception (Lnet/minecraft/class_2303;ILcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;Ljava/lang/String;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; + ARG 0 reader + ARG 1 cursor + ARG 2 exceptionType + ARG 3 context + METHOD method_1_6116 exception (Lnet/minecraft/class_2303;ILcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; + ARG 0 reader + ARG 1 cursor + ARG 2 exceptionType METHOD method_9919 (Lnet/minecraft/class_1299;ZLnet/minecraft/class_1297;)Z ARG 2 entity METHOD method_9920 (Ljava/lang/String;ZLnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/command/EntitySelectorReader.mapping b/mappings/net/minecraft/command/EntitySelectorReader.mapping index 3fa4f62e5b..0a9193677b 100644 --- a/mappings/net/minecraft/command/EntitySelectorReader.mapping +++ b/mappings/net/minecraft/command/EntitySelectorReader.mapping @@ -55,6 +55,7 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader FIELD field_33080 ALL_ENTITIES C FIELD field_52174 NEAREST_ENTITY C METHOD (Lcom/mojang/brigadier/StringReader;Z)V + ARG 1 reader ARG 2 atAllowed METHOD method_1_5323 getAdvancementsFilterState ()Lnet/minecraft/class_1_888; METHOD method_1_5324 getGamemodeFilterState ()Lnet/minecraft/class_1_890; diff --git a/mappings/net/minecraft/command/NonpolarFilterState.mapping b/mappings/net/minecraft/command/NonpolarFilterState.mapping index 5b364c674a..4011d40f35 100644 --- a/mappings/net/minecraft/command/NonpolarFilterState.mapping +++ b/mappings/net/minecraft/command/NonpolarFilterState.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1_888 net/minecraft/command/NonpolarFilterState + COMMENT Tracks usage of entity selector arguments that can take only positive + COMMENT constraints. Such arguments include {@code limit} and {@code advancement}. FIELD field_1_6240 added Z METHOD method_1_5363 shouldSuggest ()Z METHOD method_1_5364 setAdded ()V diff --git a/mappings/net/minecraft/command/PolarFilterState.mapping b/mappings/net/minecraft/command/PolarFilterState.mapping index 1895e19818..7e2e8e4ae2 100644 --- a/mappings/net/minecraft/command/PolarFilterState.mapping +++ b/mappings/net/minecraft/command/PolarFilterState.mapping @@ -1,6 +1,29 @@ CLASS net/minecraft/class_1_890 net/minecraft/command/PolarFilterState + COMMENT Tracks usage of entity selector arguments that can take both positive and + COMMENT negative ({@code !<...>}) constraints, possibly as well as tags. Such + COMMENT arguments include {@code type} or {@code gamemode}. + FIELD field_1_6895 count Lnet/minecraft/class_1_890$class_1_1007; + FIELD field_1_6896 mentionedTags Ljava/util/Set; METHOD method_1_5383 isApplicable (Z)Z ARG 1 negated METHOD method_1_5384 shouldSuggest ()Z METHOD method_1_5387 setAdded (Z)V ARG 1 negated + METHOD method_1_6117 allowsAggregateFilters ()Z + COMMENT @implNote If selector arguments have narrowed things down to a single option, + COMMENT then there's no point narrowing it down further. + METHOD method_1_6118 allowsSingleFilters ()Z + METHOD method_1_6119 allowsTags ()Z + METHOD method_1_6120 allowsNegative ()Z + METHOD method_1_6121 allowsPositive ()Z + METHOD method_1_6122 allowsTag (Lnet/minecraft/class_2960;)Z + ARG 1 tagId + METHOD method_1_6123 addAggregateFilter ()V + METHOD method_1_6124 addNegative ()V + METHOD method_1_6125 addPositive ()V + METHOD method_1_6126 addSingleFilter ()V + METHOD method_1_6127 addTag (Lnet/minecraft/class_2960;)V + ARG 1 tag + CLASS class_1_1007 Count + FIELD field_1_6899 Lnet/minecraft/class_1_890$class_1_1007; + COMMENT Actually means "all options are eligible". diff --git a/mappings/net/minecraft/data/family/BlockFamily.mapping b/mappings/net/minecraft/data/family/BlockFamily.mapping index a13d3ec49f..a540b2d985 100644 --- a/mappings/net/minecraft/data/family/BlockFamily.mapping +++ b/mappings/net/minecraft/data/family/BlockFamily.mapping @@ -28,6 +28,16 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily METHOD method_1_1232 generateStonecuttingRecipes ()Lnet/minecraft/class_5794$class_5795; METHOD method_1_2455 cobbled (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; ARG 1 block + METHOD method_1_5473 customHangingSign (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; + ARG 1 block + ARG 2 wallBlock + METHOD method_1_5474 hangingSign (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; + ARG 1 block + ARG 2 wallBlock + METHOD method_1_5475 log (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; + ARG 1 block + METHOD method_1_5476 strippedLog (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 @@ -74,4 +84,5 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily FIELD field_28546 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name + METHOD method_1_5477 getVariantRecipeInput ()Lnet/minecraft/class_5794$class_5796; 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 6c4e59dd09..8fe646ee9d 100644 --- a/mappings/net/minecraft/data/recipe/RecipeGenerator.mapping +++ b/mappings/net/minecraft/data/recipe/RecipeGenerator.mapping @@ -84,6 +84,30 @@ CLASS net/minecraft/class_2446 net/minecraft/data/recipe/RecipeGenerator ARG 0 generator ARG 1 output ARG 2 input + METHOD method_1_2494 (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_2495 (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_5497 (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_5498 (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_5499 (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_5500 (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_10419 generate ()V METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_175; ARG 1 tag @@ -324,6 +348,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/recipe/RecipeGenerator ARG 1 enabledFeatures METHOD method_46208 offerHangingSignRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; ARG 1 output + ARG 2 input METHOD method_46209 offer2x2CompactingRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 1 category ARG 2 output diff --git a/mappings/net/minecraft/datafixer/FixUtil.mapping b/mappings/net/minecraft/datafixer/FixUtil.mapping index ce21cc7d32..9d7d4b1ef7 100644 --- a/mappings/net/minecraft/datafixer/FixUtil.mapping +++ b/mappings/net/minecraft/datafixer/FixUtil.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_9228 net/minecraft/datafixer/FixUtil ARG 0 oldType ARG 1 newType METHOD method_61350 withTypeChanged (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/types/Type; + ARG 0 type ARG 1 oldType ARG 2 newType METHOD method_61351 apply (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/util/function/UnaryOperator;)Lcom/mojang/serialization/Dynamic; @@ -46,3 +47,7 @@ CLASS net/minecraft/class_9228 net/minecraft/datafixer/FixUtil ARG 2 yKey ARG 3 zKey ARG 4 newPosKey + METHOD method_67590 setFrom (Lcom/mojang/datafixers/Typed;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/datafixers/Typed; + ARG 0 dest + ARG 1 opticFinder + ARG 2 src diff --git a/mappings/net/minecraft/datafixer/fix/EntityRidingToPassengerFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityRidingToPassengerFix.mapping index c26f922770..4751243cd0 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityRidingToPassengerFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityRidingToPassengerFix.mapping @@ -1,7 +1,21 @@ CLASS net/minecraft/class_1166 net/minecraft/datafixer/fix/EntityRidingToPassengerFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType + METHOD method_1_5990 (Lcom/mojang/datafixers/util/Pair;Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/OpticFinder;)Lcom/mojang/datafixers/util/Pair; + ARG 1 inputEntity + ARG 2 dynamicOps + ARG 3 outputEntityTreeType + ARG 4 passengersFinder + METHOD method_1_5991 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Ljava/util/Optional; + ARG 1 riding + METHOD method_4977 (Lcom/mojang/datafixers/types/Type;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; + ARG 6 oldTree METHOD method_4978 fixEntityTree (Lcom/mojang/datafixers/schemas/Schema;Lcom/mojang/datafixers/schemas/Schema;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule; ARG 1 inputSchema ARG 2 outputSchema ARG 3 inputEntityTreeType ARG 4 outputEntityTreeType ARG 5 inputEntityType + METHOD method_4980 (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/types/Type;Lcom/mojang/serialization/DynamicOps;)Ljava/util/function/Function; + ARG 5 dynamicOps diff --git a/mappings/net/minecraft/datafixer/fix/ItemSpawnEggFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemSpawnEggFix.mapping index 5c3af8d49f..4cb54008e0 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemSpawnEggFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemSpawnEggFix.mapping @@ -1,7 +1,12 @@ CLASS net/minecraft/class_1184 net/minecraft/datafixer/fix/ItemSpawnEggFix FIELD field_5679 DAMAGE_TO_ENTITY_IDS [Ljava/lang/String; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType METHOD method_5025 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Ljava/util/Optional; ARG 1 tagTyped + METHOD method_5027 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 5 typedInput METHOD method_5028 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Ljava/util/Optional; ARG 1 entityTyped METHOD method_5029 ([Ljava/lang/String;)V diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping index e69be427c5..17440fdb5a 100644 --- a/mappings/net/minecraft/nbt/NbtOps.mapping +++ b/mappings/net/minecraft/nbt/NbtOps.mapping @@ -89,11 +89,15 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps ARG 2 map METHOD method_1_5397 (Ljava/lang/Number;)Ljava/lang/Boolean; ARG 0 number + METHOD method_10638 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair; + ARG 1 entry METHOD method_29147 (Ljava/util/List;Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V ARG 0 entry ARG 2 pair METHOD method_29152 (Lnet/minecraft/class_2487;Lcom/mojang/datafixers/util/Pair;)V ARG 1 entry + METHOD method_29153 (Lnet/minecraft/class_2487;Ljava/util/function/BiConsumer;)V + ARG 2 callback METHOD method_46230 (Ljava/util/List;Lnet/minecraft/class_2509$class_7813;)Lcom/mojang/serialization/DataResult; ARG 1 merger METHOD method_46234 (Lnet/minecraft/class_2520;Lnet/minecraft/class_2509$class_7813;)Lcom/mojang/serialization/DataResult; @@ -108,6 +112,8 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps ARG 1 nbt METHOD get (Ljava/lang/String;)Ljava/lang/Object; ARG 1 key + METHOD method_29166 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair; + ARG 1 entry CLASS class_5320 MapBuilder METHOD append (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 key @@ -128,6 +134,8 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps ARG 1 list METHOD (Lit/unimi/dsi/fastutil/longs/LongArrayList;)V ARG 1 list + METHOD (Lnet/minecraft/class_2499;)V + ARG 1 list METHOD method_46241 (B)V ARG 1 value METHOD method_46242 (I)V diff --git a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping index cdecdd7e63..73dfbc028d 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_1132 net/minecraft/server/integrated/IntegratedServer ARG 1 gameMode METHOD method_1_5526 getShareSetting ()Lnet/minecraft/class_1132$class_1_908; METHOD method_1_5527 isOnline ()Z + METHOD method_1_5528 notifyWorldShareUpdateListeners ()V METHOD method_1_5529 setAllowCommands (Z)V ARG 1 allowCommands METHOD method_1_5530 setShareSetting (Lnet/minecraft/class_1132$class_1_908;)V diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index f36d78be7f..0632109cbf 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity + FIELD field_1_6398 lastExplosionImpactPos Lnet/minecraft/class_243; FIELD field_13963 lastHealthScore F FIELD field_13964 disconnected Z FIELD field_13965 lastLevelScore I diff --git a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping index 8b26380769..1c49e9195e 100644 --- a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping +++ b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping @@ -2,8 +2,10 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiec FIELD field_24021 verticalPlacement Lnet/minecraft/class_5189$class_5191; FIELD field_24022 properties Lnet/minecraft/class_5189$class_5190; METHOD (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;)V + ARG 1 context ARG 2 nbt METHOD (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_5189$class_5191;Lnet/minecraft/class_5189$class_5190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3499;Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_2338;)V + ARG 1 registries ARG 2 manager ARG 3 pos ARG 4 verticalPlacement @@ -11,6 +13,8 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiec ARG 6 id ARG 7 template ARG 8 rotation + ARG 9 mirror + ARG 10 placementPos METHOD method_27237 getBaseHeight (Lnet/minecraft/class_1936;IILnet/minecraft/class_5189$class_5191;)I ARG 0 world ARG 1 x @@ -56,10 +60,12 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiec METHOD method_27250 (Lnet/minecraft/class_5819;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;)V ARG 3 pos METHOD method_35449 createPlacementData (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3492; + ARG 0 registries ARG 1 manager ARG 2 nbt ARG 3 id METHOD method_35450 createPlacementData (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_5189$class_5191;Lnet/minecraft/class_2338;Lnet/minecraft/class_5189$class_5190;)Lnet/minecraft/class_3492; + ARG 0 registries ARG 1 mirror ARG 2 rotation ARG 3 verticalPlacement diff --git a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping index 6c1acb27d6..f500a67e76 100644 --- a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping +++ b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping @@ -117,6 +117,7 @@ CLASS net/minecraft/class_3471 net/minecraft/structure/WoodlandMansionGenerator ARG 1 i ARG 2 j METHOD method_15048 layoutThirdFloor ()V + CLASS class_1_767 CellPos CLASS class_3475 LayoutGenerator COMMENT Populates structure pieces based on the given {@link MansionParameters COMMENT parameters}. diff --git a/mappings/net/minecraft/text/TextColor.mapping b/mappings/net/minecraft/text/TextColor.mapping index 4b75354435..8081b59f0e 100644 --- a/mappings/net/minecraft/text/TextColor.mapping +++ b/mappings/net/minecraft/text/TextColor.mapping @@ -16,6 +16,9 @@ CLASS net/minecraft/class_5251 net/minecraft/text/TextColor ARG 2 name METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD method_1_5178 register (Ljava/lang/String;I)Lnet/minecraft/class_5251; + ARG 0 name + ARG 1 color METHOD method_27716 getRgb ()I COMMENT Gets the RGB value of this color. COMMENT diff --git a/mappings/net/minecraft/util/BlockMirror.mapping b/mappings/net/minecraft/util/BlockMirror.mapping deleted file mode 100644 index d49cbfc285..0000000000 --- a/mappings/net/minecraft/util/BlockMirror.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS net/minecraft/class_2415 net/minecraft/util/BlockMirror - FIELD field_23263 directionTransformation Lnet/minecraft/class_4990; - FIELD field_27883 name Lnet/minecraft/class_2561; - FIELD field_39311 CODEC Lcom/mojang/serialization/Codec; - FIELD field_39312 id Ljava/lang/String; - FIELD field_56669 ENUM_NAME_CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_4990;)V - ARG 3 id - ARG 4 directionTransformation - METHOD method_10343 apply (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; - ARG 1 direction - METHOD method_10344 mirror (II)I - ARG 1 rotation - ARG 2 fullTurn - METHOD method_10345 getRotation (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2470; - ARG 1 direction - METHOD method_26380 getDirectionTransformation ()Lnet/minecraft/class_4990; - METHOD method_32354 getName ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/util/InterpolatedFlipFlop.mapping b/mappings/net/minecraft/util/InterpolatedFlipFlop.mapping index 31e1732170..438d472ec4 100644 --- a/mappings/net/minecraft/util/InterpolatedFlipFlop.mapping +++ b/mappings/net/minecraft/util/InterpolatedFlipFlop.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_9849 net/minecraft/util/InterpolatedFlipFlop FIELD field_52389 frames I COMMENT How many frames it takes to switch from fully off to fully on. - FIELD field_52390 smoothingFunction Lnet/minecraft/class_12301; + FIELD field_52390 easing Lnet/minecraft/class_12301; FIELD field_52391 current I FIELD field_52392 previous I METHOD (I)V ARG 1 frames METHOD (ILnet/minecraft/class_12301;)V ARG 1 frames - ARG 2 smoothingFunction + ARG 2 easing METHOD method_61339 getValue (F)F ARG 1 tickProgress METHOD method_61340 tick (Z)V diff --git a/mappings/net/minecraft/util/crash/CrashReport.mapping b/mappings/net/minecraft/util/crash/CrashReport.mapping index 854da5b35b..99a62789eb 100644 --- a/mappings/net/minecraft/util/crash/CrashReport.mapping +++ b/mappings/net/minecraft/util/crash/CrashReport.mapping @@ -11,6 +11,12 @@ CLASS net/minecraft/class_128 net/minecraft/util/crash/CrashReport METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause + METHOD method_1_5459 copyExceptionDetails (Ljava/lang/Throwable;Ljava/lang/Throwable;)Ljava/lang/Throwable; + ARG 0 src + ARG 1 dest + METHOD method_1_5460 recreateCauseWithMessage (Ljava/lang/Throwable;Ljava/lang/String;)Ljava/lang/Throwable; + ARG 0 cause + ARG 1 message METHOD method_555 addDetails (Ljava/lang/StringBuilder;)V ARG 1 crashReportBuilder METHOD method_556 addElement (Ljava/lang/String;I)Lnet/minecraft/class_129; diff --git a/mappings/net/minecraft/util/math/BlockMirror.mapping b/mappings/net/minecraft/util/math/BlockMirror.mapping new file mode 100644 index 0000000000..b5e662a85e --- /dev/null +++ b/mappings/net/minecraft/util/math/BlockMirror.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_2415 net/minecraft/util/math/BlockMirror + COMMENT Represents how to mirror a structure piece. Used by structure blocks and + COMMENT other structure generation-related functionality. + COMMENT + COMMENT There is no value for both a left–right and front–back reflection (i.e. a + COMMENT 180° rotation) at the same time; instead, structure blocks hold both a + COMMENT {@link BlockMirror} value and a {@link BlockRotation} value. + FIELD field_23263 directionTransformation Lnet/minecraft/class_4990; + FIELD field_27883 name Lnet/minecraft/class_2561; + FIELD field_39311 CODEC Lcom/mojang/serialization/Codec; + FIELD field_39312 id Ljava/lang/String; + FIELD field_56669 ENUM_NAME_CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_4990;)V + ARG 3 id + ARG 4 directionTransformation + METHOD method_10343 apply (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; + COMMENT Applies this transformation to {@code direction}. + ARG 1 direction + METHOD method_10344 mirror (II)I + COMMENT Applies this transformation to a rotation value, such as one in the block + COMMENT state of certain blocks such as signs or banners. + ARG 1 rotation + COMMENT the rotation value to transform + ARG 2 fullTurn + COMMENT the total number of rotations possible + METHOD method_10345 getRotation (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2470; + COMMENT Returns the {@link BlockRotation} that would send {@code direction} to + COMMENT {@code this.apply(direction)}. + ARG 1 direction + METHOD method_26380 getDirectionTransformation ()Lnet/minecraft/class_4990; + COMMENT {@return the {@link DirectionTransformation} corresponding to this transformation} + METHOD method_32354 getName ()Lnet/minecraft/class_2561; + COMMENT {@return the {@link Text} describing this transformation} diff --git a/mappings/net/minecraft/util/BlockRotation.mapping b/mappings/net/minecraft/util/math/BlockRotation.mapping similarity index 59% rename from mappings/net/minecraft/util/BlockRotation.mapping rename to mappings/net/minecraft/util/math/BlockRotation.mapping index 831d10ba75..ff7ff768ae 100644 --- a/mappings/net/minecraft/util/BlockRotation.mapping +++ b/mappings/net/minecraft/util/math/BlockRotation.mapping @@ -1,4 +1,7 @@ -CLASS net/minecraft/class_2470 net/minecraft/util/BlockRotation +CLASS net/minecraft/class_2470 net/minecraft/util/math/BlockRotation + COMMENT Describes a purely horizontal block rotation. + COMMENT + COMMENT @see DirectionTransformation FIELD field_23264 directionTransformation Lnet/minecraft/class_4990; FIELD field_39313 CODEC Lcom/mojang/serialization/Codec; FIELD field_39314 id Ljava/lang/String; @@ -11,15 +14,24 @@ CLASS net/minecraft/class_2470 net/minecraft/util/BlockRotation ARG 4 id ARG 5 directionTransformation METHOD method_10501 rotate (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2470; + COMMENT Composes this rotation with {@code rotation}. ARG 1 rotation METHOD method_10502 rotate (II)I + COMMENT Applies this transformation to a rotation value, such as one in the block + COMMENT state of certain blocks such as signs or banners. ARG 1 rotation + COMMENT the rotation value to transform ARG 2 fullTurn + COMMENT the total number of rotations possible METHOD method_10503 rotate (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; + COMMENT Applies this rotation to {@code direction}. ARG 1 direction METHOD method_16547 randomRotationOrder (Lnet/minecraft/class_5819;)Ljava/util/List; + COMMENT Generates a randomly shuffled list of all {@linkplain BlockRotation}s. ARG 0 random METHOD method_16548 random (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2470; + COMMENT Samples a random {@linkplain BlockRotation}. ARG 0 random METHOD method_26383 getDirectionTransformation ()Lnet/minecraft/class_4990; + COMMENT {@return the {@link DirectionTransformation} corresponding to this rotation} METHOD method_66710 getIndex ()I