From f423e50b785fa0fc4a75e1c0eb6aa011b0e8d486 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 17 Jan 2025 13:22:30 +0900 Subject: [PATCH] 25w03a stuff (#4093) * 25w03a more stuff * 25w03a gametests --- .../entity/TestInstanceBlockEntity.mapping | 12 ++- .../data/BlockStateModelGenerator.mapping | 1 + .../minecraft/client/gl/ShaderLoader.mapping | 2 + .../ingame/TestInstanceBlockScreen.mapping | 27 ++++++ .../minecraft/client/model/ModelData.mapping | 2 + .../FailedRealmsUploadException.mapping | 2 + .../LivingHorseEntityRenderState.mapping | 1 + .../entity/state/PigEntityRenderState.mapping | 1 + .../state/StriderEntityRenderState.mapping | 1 + .../minecraft/client/util/GlException.mapping | 2 + .../minecraft/command/ArgumentGetter.mapping | 3 + .../RegistrySelectorArgumentType.mapping | 44 +++++++++ .../ComponentsAccess.mapping | 2 +- .../type/AttributeModifierSlot.mapping | 2 + .../type/PotionContentsComponent.mapping | 3 + mappings/net/minecraft/entity/Entity.mapping | 17 ++++ .../minecraft/entity/EntityStatuses.mapping | 1 + .../minecraft/entity/ai/brain/Brain.mapping | 5 + .../ai/brain/task/UpdateJobSiteTask.mapping | 4 + .../task/VillagerTaskListProvider.mapping | 2 + .../task/WorkStationCompetitionTask.mapping | 1 + .../entity/mob/CreakingBrain.mapping | 12 +++ .../entity/vehicle/TntMinecartEntity.mapping | 2 + mappings/net/minecraft/fluid/Fluid.mapping | 4 + .../net/minecraft/fluid/FluidState.mapping | 3 + mappings/net/minecraft/gametest/Main.mapping | 3 + mappings/net/minecraft/item/Items.mapping | 2 + .../net/minecraft/nbt/NbtException.mapping | 2 + mappings/net/minecraft/nbt/NbtHelper.mapping | 4 + .../registry/RegistryEntryLookup.mapping | 4 + .../VanillaResourcePackProvider.mapping | 1 + .../server/ServerConfigHandler.mapping | 2 + .../server/command/TestCommand.mapping | 92 +++++++++++++++++++ .../server/command/TestFinder.mapping | 28 +++++- .../filter/AbstractTextFilterer.mapping | 2 + .../server/world/ServerEntityManager.mapping | 2 + .../server/world/ServerWorld.mapping | 2 + mappings/net/minecraft/test/Batches.mapping | 25 +++++ .../test/BlockBasedTestInstance.mapping | 11 ++- ...s.mapping => BuiltinTestFunctions.mapping} | 3 +- .../minecraft/test/GameTestException.mapping | 6 ++ .../net/minecraft/test/GameTestState.mapping | 12 ++- .../test/PositionedException.mapping | 2 + .../test/RuntimeTestInstances.mapping | 6 ++ .../test/StructureTestListener.mapping | 8 ++ .../minecraft/test/StructureTestUtil.mapping | 56 ----------- .../net/minecraft/test/TestBootstrap.mapping | 24 +++++ .../net/minecraft/test/TestContext.mapping | 58 ++++++++++++ mappings/net/minecraft/test/TestEntry.mapping | 9 ++ .../test/TestEnvironmentDefinition.mapping | 2 + .../test/TestFunctionProvider.mapping | 11 +++ .../net/minecraft/test/TestInstance.mapping | 2 +- .../test/TestInstanceBlockFinder.mapping | 1 + .../minecraft/test/TestInstanceFinder.mapping | 1 + .../minecraft/test/TestInstanceUtil.mapping | 66 +++++++++++++ .../net/minecraft/test/TestRunContext.mapping | 2 + .../net/minecraft/test/TestServer.mapping | 18 ++++ .../test/TickLimitExceededException.mapping | 2 + .../minecraft/test/TimedTaskRunner.mapping | 4 + .../InvalidHierarchicalFileException.mapping | 2 + .../util/InvalidIdentifierException.mapping | 3 + .../collection/PackedIntegerArray.mapping | 2 + .../minecraft/util/collection/Pool.mapping | 2 + .../minecraft/util/path/PathResolving.mapping | 4 + .../util/{ => path}/PathUtil.mapping | 2 +- .../net/minecraft/village/TradeOffers.mapping | 4 + .../minecraft/village/VillagerData.mapping | 8 ++ .../gen/feature/EndPortalFeature.mapping | 4 + unpick-definitions/entity_status.unpick | 1 + 69 files changed, 589 insertions(+), 72 deletions(-) create mode 100644 mappings/net/minecraft/command/ArgumentGetter.mapping create mode 100644 mappings/net/minecraft/command/argument/RegistrySelectorArgumentType.mapping rename mappings/net/minecraft/{block/entity => component}/ComponentsAccess.mapping (80%) create mode 100644 mappings/net/minecraft/gametest/Main.mapping rename mappings/net/minecraft/test/{TestFunctions.mapping => BuiltinTestFunctions.mapping} (58%) create mode 100644 mappings/net/minecraft/test/RuntimeTestInstances.mapping delete mode 100644 mappings/net/minecraft/test/StructureTestUtil.mapping create mode 100644 mappings/net/minecraft/test/TestBootstrap.mapping create mode 100644 mappings/net/minecraft/test/TestEntry.mapping create mode 100644 mappings/net/minecraft/test/TestFunctionProvider.mapping create mode 100644 mappings/net/minecraft/test/TestInstanceBlockFinder.mapping create mode 100644 mappings/net/minecraft/test/TestInstanceFinder.mapping create mode 100644 mappings/net/minecraft/test/TestInstanceUtil.mapping create mode 100644 mappings/net/minecraft/util/path/PathResolving.mapping rename mappings/net/minecraft/util/{ => path}/PathUtil.mapping (98%) diff --git a/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping b/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping index 57df05bfa8..4fb0fbf975 100644 --- a/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping @@ -25,6 +25,12 @@ CLASS net/minecraft/class_10638 net/minecraft/block/entity/TestInstanceBlockEnti ARG 1 testInstance METHOD method_66741 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 structureId + METHOD method_66742 exportData (Lnet/minecraft/class_3218;Lnet/minecraft/class_2960;Ljava/util/function/Consumer;)Z + ARG 0 world + ARG 1 structureId + ARG 2 messageConsumer + METHOD method_66743 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;)V + ARG 1 pos METHOD method_66744 placeStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_3499;)V ARG 1 world ARG 2 template @@ -45,7 +51,7 @@ CLASS net/minecraft/class_10638 net/minecraft/block/entity/TestInstanceBlockEnti METHOD method_66752 getStructureTemplate (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;)Ljava/util/Optional; ARG 0 world ARG 1 testInstance - METHOD method_66753 (Ljava/util/function/Consumer;)Ljava/util/Optional; + METHOD method_66753 saveStructure (Ljava/util/function/Consumer;)Ljava/util/Optional; ARG 1 messageConsumer METHOD method_66754 (Lnet/minecraft/class_2338;)V ARG 1 pos @@ -53,11 +59,13 @@ CLASS net/minecraft/class_10638 net/minecraft/block/entity/TestInstanceBlockEnti ARG 0 entry METHOD method_66756 (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;)Ljava/util/Optional; ARG 1 template - METHOD method_66757 (Ljava/util/function/Consumer;)Z + METHOD method_66757 export (Ljava/util/function/Consumer;)Z ARG 1 messageConsumer METHOD method_66758 (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_66759 getBlockBox ()Lnet/minecraft/class_3341; + METHOD method_66760 start (Ljava/util/function/Consumer;)V + ARG 1 messageConsumer METHOD method_66761 forEachPos (Ljava/util/function/Consumer;)V ARG 1 posConsumer METHOD method_66762 getBox ()Lnet/minecraft/class_238; diff --git a/mappings/net/minecraft/client/data/BlockStateModelGenerator.mapping b/mappings/net/minecraft/client/data/BlockStateModelGenerator.mapping index 0ce541e2a3..dfb1a53c88 100644 --- a/mappings/net/minecraft/client/data/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/client/data/BlockStateModelGenerator.mapping @@ -694,6 +694,7 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato ARG 3 suffix METHOD method_66529 registerLeafLitter (Lnet/minecraft/class_2248;)V ARG 1 leafLitter + METHOD method_66791 registerTestBlock ()V CLASS class_4912 BlockTexturePool FIELD field_22837 textures Lnet/minecraft/class_4944; FIELD field_22838 baseModelId Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/gl/ShaderLoader.mapping b/mappings/net/minecraft/client/gl/ShaderLoader.mapping index 6a0efcd740..5df49fa65c 100644 --- a/mappings/net/minecraft/client/gl/ShaderLoader.mapping +++ b/mappings/net/minecraft/client/gl/ShaderLoader.mapping @@ -62,6 +62,8 @@ CLASS net/minecraft/class_10151 net/minecraft/client/gl/ShaderLoader METHOD method_62957 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 1 path CLASS class_10152 LoadException + METHOD (Ljava/lang/String;)V + ARG 1 message CLASS class_10153 Definitions FIELD field_53948 EMPTY Lnet/minecraft/class_10151$class_10153; CLASS class_10154 ShaderKey diff --git a/mappings/net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen.mapping index ed916e0004..a771253346 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_10643 net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen + FIELD field_56043 statusWidget Lnet/minecraft/class_8577; FIELD field_56044 saveButton Lnet/minecraft/class_4185; FIELD field_56045 exportButton Lnet/minecraft/class_4185; FIELD field_56046 entitiesButton Lnet/minecraft/class_5676; @@ -9,8 +10,18 @@ CLASS net/minecraft/class_10643 net/minecraft/client/gui/screen/ingame/TestInsta FIELD field_56051 ROTATION_TEXT Lnet/minecraft/class_2561; FIELD field_56054 testInstanceBlockEntity Lnet/minecraft/class_10638; FIELD field_56055 testIdTextField Lnet/minecraft/class_342; + FIELD field_56056 sizeXField Lnet/minecraft/class_342; + FIELD field_56057 sizeYField Lnet/minecraft/class_342; + FIELD field_56058 sizeZField Lnet/minecraft/class_342; METHOD (Lnet/minecraft/class_10638;)V ARG 1 testInstanceBlockEntity + METHOD method_66798 onDone ()V + METHOD method_66799 onCancel ()V + METHOD method_66800 getRoundedWidth (I)I + ARG 0 total + METHOD method_66801 getX (II)I + ARG 1 index + ARG 2 total METHOD method_66802 executeAction (Lnet/minecraft/class_10616$class_10617;)Z ARG 1 action METHOD method_66803 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; @@ -19,13 +30,29 @@ CLASS net/minecraft/class_10643 net/minecraft/client/gui/screen/ingame/TestInsta ARG 0 rotation METHOD method_66805 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_66807 parse (Ljava/lang/String;)I + ARG 0 value + METHOD method_66808 setSize (Lnet/minecraft/class_2382;)V + ARG 1 vec + METHOD method_66809 handleStatus (Lnet/minecraft/class_2561;Ljava/util/Optional;)V + ARG 1 status + ARG 2 size + METHOD method_66810 (Lnet/minecraft/class_5250;Lnet/minecraft/class_2561;)V + ARG 1 message + METHOD method_66811 getWidth (I)F + ARG 0 total METHOD method_66812 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_66813 (Ljava/lang/String;)V + ARG 1 value METHOD method_66814 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_66815 refresh (Z)V + ARG 1 initial METHOD method_66816 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_66817 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_66818 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_66819 refresh ()V diff --git a/mappings/net/minecraft/client/model/ModelData.mapping b/mappings/net/minecraft/client/model/ModelData.mapping index 4e72b701e6..bc4c791316 100644 --- a/mappings/net/minecraft/client/model/ModelData.mapping +++ b/mappings/net/minecraft/client/model/ModelData.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_5609 net/minecraft/client/model/ModelData METHOD method_32111 getRoot ()Lnet/minecraft/class_5610; METHOD method_62138 transform (Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_5609; ARG 1 transformer + METHOD method_66842 transform (Lnet/minecraft/class_9953;)Lnet/minecraft/class_5609; + ARG 1 transformer diff --git a/mappings/net/minecraft/client/realms/exception/upload/FailedRealmsUploadException.mapping b/mappings/net/minecraft/client/realms/exception/upload/FailedRealmsUploadException.mapping index e5a41318a3..3c4adb1c2e 100644 --- a/mappings/net/minecraft/client/realms/exception/upload/FailedRealmsUploadException.mapping +++ b/mappings/net/minecraft/client/realms/exception/upload/FailedRealmsUploadException.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_10234 net/minecraft/client/realms/exception/upload/FailedRealmsUploadException FIELD field_54366 errorMessage Lnet/minecraft/class_2561; + METHOD (Ljava/lang/String;)V + ARG 1 errorMessage METHOD (Lnet/minecraft/class_2561;)V ARG 1 errorMessage diff --git a/mappings/net/minecraft/client/render/entity/state/LivingHorseEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/LivingHorseEntityRenderState.mapping index 3b94b33365..7544df0ff5 100644 --- a/mappings/net/minecraft/client/render/entity/state/LivingHorseEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/LivingHorseEntityRenderState.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_10019 net/minecraft/client/render/entity/state/LivingH FIELD field_53349 eatingGrassAnimationProgress F FIELD field_53350 angryAnimationProgress F FIELD field_53351 eatingAnimationProgress F + FIELD field_56119 saddleStack Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/client/render/entity/state/PigEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/PigEntityRenderState.mapping index 22db9939f8..d80e0b9423 100644 --- a/mappings/net/minecraft/client/render/entity/state/PigEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/PigEntityRenderState.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_10053 net/minecraft/client/render/entity/state/PigEntityRenderState FIELD field_55877 variant Lnet/minecraft/class_10586; + FIELD field_56120 saddleStack Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/client/render/entity/state/StriderEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/StriderEntityRenderState.mapping index b9ab143124..bdf3a2e472 100644 --- a/mappings/net/minecraft/client/render/entity/state/StriderEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/StriderEntityRenderState.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_10070 net/minecraft/client/render/entity/state/StriderEntityRenderState FIELD field_53586 cold Z FIELD field_53587 hasPassengers Z + FIELD field_56121 saddleStack Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/client/util/GlException.mapping b/mappings/net/minecraft/client/util/GlException.mapping index 55c6d673b9..b093724840 100644 --- a/mappings/net/minecraft/client/util/GlException.mapping +++ b/mappings/net/minecraft/client/util/GlException.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_4718 net/minecraft/client/util/GlException + METHOD (Ljava/lang/String;)V + ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause diff --git a/mappings/net/minecraft/command/ArgumentGetter.mapping b/mappings/net/minecraft/command/ArgumentGetter.mapping new file mode 100644 index 0000000000..230d0bca8f --- /dev/null +++ b/mappings/net/minecraft/command/ArgumentGetter.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_10618 net/minecraft/command/ArgumentGetter + METHOD apply (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 context diff --git a/mappings/net/minecraft/command/argument/RegistrySelectorArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistrySelectorArgumentType.mapping new file mode 100644 index 0000000000..6ec77cb607 --- /dev/null +++ b/mappings/net/minecraft/command/argument/RegistrySelectorArgumentType.mapping @@ -0,0 +1,44 @@ +CLASS net/minecraft/class_10644 net/minecraft/command/argument/RegistrySelectorArgumentType + FIELD field_56060 NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD field_56061 EXAMPLES Ljava/util/Collection; + FIELD field_56062 registryRef Lnet/minecraft/class_5321; + FIELD field_56063 registry Lnet/minecraft/class_7225; + METHOD (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;)V + ARG 1 registries + ARG 2 registryRef + METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 builder + METHOD method_66820 isSelectorChar (C)Z + ARG 0 c + METHOD method_66822 select (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225;)Ljava/util/Collection; + ARG 0 reader + ARG 1 registry + METHOD method_66823 getEntries (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_5321;)Ljava/util/Collection; + ARG 0 context + ARG 1 name + ARG 2 registryRef + METHOD method_66824 selector (Lnet/minecraft/class_7157;Lnet/minecraft/class_5321;)Lnet/minecraft/class_10644; + ARG 0 registries + ARG 1 registryRef + METHOD method_66825 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 selector + ARG 1 registryRef + METHOD method_66826 addNamespace (Ljava/lang/String;)Ljava/lang/String; + ARG 0 path + METHOD method_66827 matches (Ljava/lang/String;Lnet/minecraft/class_2960;)Z + ARG 0 selector + ARG 1 id + METHOD method_66828 (Ljava/lang/String;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 entry + METHOD method_66829 read (Lcom/mojang/brigadier/StringReader;)Ljava/lang/String; + ARG 0 reader + METHOD method_66830 (Ljava/lang/String;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 entry + METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; + ARG 1 reader + CLASS class_10645 Serializer + CLASS class_10646 Properties + FIELD field_56065 registryRef Lnet/minecraft/class_5321; + METHOD (Lnet/minecraft/class_10644$class_10645;Lnet/minecraft/class_5321;)V + ARG 2 registryRef diff --git a/mappings/net/minecraft/block/entity/ComponentsAccess.mapping b/mappings/net/minecraft/component/ComponentsAccess.mapping similarity index 80% rename from mappings/net/minecraft/block/entity/ComponentsAccess.mapping rename to mappings/net/minecraft/component/ComponentsAccess.mapping index 4248e69d0b..fe47bc3ca1 100644 --- a/mappings/net/minecraft/block/entity/ComponentsAccess.mapping +++ b/mappings/net/minecraft/component/ComponentsAccess.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9473 net/minecraft/block/entity/ComponentsAccess +CLASS net/minecraft/class_9473 net/minecraft/component/ComponentsAccess METHOD method_58694 get (Lnet/minecraft/class_9331;)Ljava/lang/Object; ARG 1 type METHOD method_58695 getOrDefault (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/component/type/AttributeModifierSlot.mapping b/mappings/net/minecraft/component/type/AttributeModifierSlot.mapping index d9a1a77e5d..cd906fbbcc 100644 --- a/mappings/net/minecraft/component/type/AttributeModifierSlot.mapping +++ b/mappings/net/minecraft/component/type/AttributeModifierSlot.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_9274 net/minecraft/component/type/AttributeModifierSlo FIELD field_49228 id I FIELD field_49229 name Ljava/lang/String; FIELD field_49230 slotPredicate Ljava/util/function/Predicate; + FIELD field_55949 slots Ljava/util/List; METHOD (Ljava/lang/String;IILjava/lang/String;Ljava/util/function/Predicate;)V ARG 3 id ARG 4 name @@ -27,3 +28,4 @@ CLASS net/minecraft/class_9274 net/minecraft/component/type/AttributeModifierSlo ARG 0 slot METHOD method_59524 forEquipmentSlot (Lnet/minecraft/class_1304;)Lnet/minecraft/class_9274; ARG 0 slot + METHOD method_66665 getSlots ()Ljava/util/List; diff --git a/mappings/net/minecraft/component/type/PotionContentsComponent.mapping b/mappings/net/minecraft/component/type/PotionContentsComponent.mapping index 3d8a2e551a..5c0a9c928d 100644 --- a/mappings/net/minecraft/component/type/PotionContentsComponent.mapping +++ b/mappings/net/minecraft/component/type/PotionContentsComponent.mapping @@ -43,6 +43,9 @@ CLASS net/minecraft/class_1844 net/minecraft/component/type/PotionContentsCompon ARG 0 potionEntry METHOD method_65361 getColor (I)I ARG 1 defaultColor + METHOD method_66698 getEffectText (Lnet/minecraft/class_6880;I)Lnet/minecraft/class_5250; + ARG 0 effect + ARG 1 amplifier METHOD method_8064 getColor ()I METHOD method_8065 buildTooltip (Ljava/lang/Iterable;Ljava/util/function/Consumer;FF)V ARG 0 effects diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 6e479b2611..c37e943755 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -152,6 +152,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_54946 onFire Z FIELD field_54947 queuedCollisionChecks Ljava/util/List; FIELD field_54948 collidedBlockPositions Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_55940 fireState Lnet/minecraft/class_1297$class_10628; FIELD field_5951 ridingCooldown I FIELD field_5952 onGround Z FIELD field_5953 firstUpdate Z @@ -2257,6 +2258,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 reason METHOD method_65037 checkBlockCollision (Ljava/util/List;Lnet/minecraft/class_1297$class_10629;)V ARG 1 queuedCollisionChecks + ARG 2 state METHOD method_65038 isControlledByPlayer ()Z METHOD method_65341 calculateDefaultBoundingBox (Lnet/minecraft/class_243;)Lnet/minecraft/class_238; ARG 1 pos @@ -2279,6 +2281,11 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_66249 canMoveVoluntarily ()Z METHOD method_66250 spawnBubbleColumnParticles (Lnet/minecraft/class_2338;)V ARG 1 pos + METHOD method_66648 collidesWithFluid (Lnet/minecraft/class_3610;Lnet/minecraft/class_2338;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z + ARG 1 state + ARG 2 fluidPos + ARG 3 oldPos + ARG 4 newPos METHOD method_66649 copyComponentsFrom (Lnet/minecraft/class_9473;)V ARG 1 from METHOD method_66650 copyComponentFrom (Lnet/minecraft/class_9473;Lnet/minecraft/class_9331;)Z @@ -2301,6 +2308,16 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

This returns {@code false} unless the entity is a player in spectator game mode. METHOD method_7490 getGravity ()D CLASS class_10365 QueuedCollisionCheck + CLASS class_10628 FireState + FIELD field_55941 onFire Z + FIELD field_55942 inLava Z + METHOD method_66656 setOnFire (Z)V + ARG 1 onFIre + CLASS class_10629 CollisionState + METHOD method_66655 update (Lnet/minecraft/class_2680;ZZ)V + ARG 1 state + ARG 2 blockCollision + ARG 3 fluidCollision CLASS class_4738 PositionUpdater METHOD accept (Lnet/minecraft/class_1297;DDD)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/EntityStatuses.mapping b/mappings/net/minecraft/entity/EntityStatuses.mapping index 3729be2947..93fc7f8663 100644 --- a/mappings/net/minecraft/entity/EntityStatuses.mapping +++ b/mappings/net/minecraft/entity/EntityStatuses.mapping @@ -58,3 +58,4 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses FIELD field_49215 BREAK_BODY B FIELD field_54559 INVULNERABLE_CREAKING_HIT B FIELD field_55660 ADD_BUBBLE_PARTICLES B + FIELD field_55945 BREAK_SADDLE B diff --git a/mappings/net/minecraft/entity/ai/brain/Brain.mapping b/mappings/net/minecraft/entity/ai/brain/Brain.mapping index 03baa21236..9875e2bf47 100644 --- a/mappings/net/minecraft/entity/ai/brain/Brain.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Brain.mapping @@ -153,6 +153,11 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain METHOD method_49709 forgetAll ()V METHOD method_49710 (Lnet/minecraft/class_4140;)V ARG 1 type + METHOD method_66676 setTaskList (Lnet/minecraft/class_4168;ILcom/google/common/collect/ImmutableList;Ljava/util/Set;)V + ARG 1 activity + ARG 2 begin + ARG 3 tasks + ARG 4 requiredMemories CLASS 1 METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; ARG 1 ops diff --git a/mappings/net/minecraft/entity/ai/brain/task/UpdateJobSiteTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/UpdateJobSiteTask.mapping index 1a9e049a1e..e7eebab6b3 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/UpdateJobSiteTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/UpdateJobSiteTask.mapping @@ -9,7 +9,11 @@ CLASS net/minecraft/class_4114 net/minecraft/entity/ai/brain/task/UpdateJobSiteT ARG 3 world ARG 4 entity ARG 5 time + METHOD method_46891 (Lnet/minecraft/class_1646;Lnet/minecraft/class_3218;Lnet/minecraft/class_6880$class_6883;)V + ARG 2 profession METHOD method_46892 (Lnet/minecraft/class_4208;Lnet/minecraft/class_3218;)Ljava/util/Optional; ARG 1 jobSiteWorld METHOD method_46893 (Lnet/minecraft/class_6880;)Ljava/util/Optional; ARG 0 poiType + METHOD method_46894 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 profession diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping index 73ff7764e4..9da342e74b 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_4129 net/minecraft/entity/ai/brain/task/VillagerTaskListProvider FIELD field_30189 JOB_WALKING_SPEED F METHOD method_19020 createCoreTasks (Lnet/minecraft/class_6880;F)Lcom/google/common/collect/ImmutableList; + ARG 0 profession ARG 1 speed METHOD method_19021 createWorkTasks (Lnet/minecraft/class_6880;F)Lcom/google/common/collect/ImmutableList; + ARG 0 profession ARG 1 speed METHOD method_19022 createRestTasks (Lnet/minecraft/class_6880;F)Lcom/google/common/collect/ImmutableList; ARG 1 speed diff --git a/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping index 2aed1997ad..b7bc3fa9b6 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_5326 net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask METHOD method_29253 isCompletedWorkStation (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Z ARG 0 poiType + ARG 1 profession METHOD method_29255 keepJobSiteForMoreExperiencedVillager (Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;)Lnet/minecraft/class_1646; ARG 0 first ARG 1 second diff --git a/mappings/net/minecraft/entity/mob/CreakingBrain.mapping b/mappings/net/minecraft/entity/mob/CreakingBrain.mapping index 8b76344ad4..f16604059d 100644 --- a/mappings/net/minecraft/entity/mob/CreakingBrain.mapping +++ b/mappings/net/minecraft/entity/mob/CreakingBrain.mapping @@ -15,4 +15,16 @@ CLASS net/minecraft/class_10280 net/minecraft/entity/mob/CreakingBrain METHOD method_64637 addIdleTasks (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_64638 addFightTasks (Lnet/minecraft/class_10275;Lnet/minecraft/class_4095;)V + ARG 0 creaking + ARG 1 brain METHOD method_64639 create (Lnet/minecraft/class_10275;Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; + ARG 0 creaking + ARG 1 brain + METHOD method_66684 (Lnet/minecraft/class_1309;Ljava/util/List;)Ljava/lang/Boolean; + ARG 1 players + METHOD method_66685 (Lnet/minecraft/class_10275;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Z + ARG 1 world + ARG 2 target + METHOD method_66686 canTarget (Lnet/minecraft/class_10275;Lnet/minecraft/class_1309;)Z + ARG 0 creaking + ARG 1 target diff --git a/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping index b2ec5d8809..87d2688369 100644 --- a/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping @@ -7,12 +7,14 @@ CLASS net/minecraft/class_1701 net/minecraft/entity/vehicle/TntMinecartEntity FIELD field_55021 FUSE_NBT_KEY Ljava/lang/String; FIELD field_55022 DEFAULT_EXPLOSION_SPEED_FACTOR F FIELD field_55023 explosionSpeedFactor F + FIELD field_55977 damageSource Lnet/minecraft/class_1282; FIELD field_7751 fuseTicks I METHOD method_47305 explode (D)V ARG 1 power METHOD method_55057 shouldDetonate (Lnet/minecraft/class_1282;)Z ARG 0 source METHOD method_7575 prime (Lnet/minecraft/class_1282;)V + ARG 1 source METHOD method_7576 explode (Lnet/minecraft/class_1282;D)V ARG 1 damageSource ARG 2 power diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index e62f4810fb..1b037477c2 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -64,3 +64,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid METHOD method_32359 getBucketFillSound ()Ljava/util/Optional; COMMENT Returns the sound played when filling a bucket with this fluid. METHOD method_40178 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883; + METHOD method_66788 getCollisionBox (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_238; + ARG 1 state + ARG 2 world + ARG 3 pos diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 33c30ac3ea..11b305272c 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -52,3 +52,6 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState ARG 1 fluids METHOD method_40180 getRegistryEntry ()Lnet/minecraft/class_6880; METHOD method_40181 streamTags ()Ljava/util/stream/Stream; + METHOD method_66789 getCollisionBox (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_238; + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/gametest/Main.mapping b/mappings/net/minecraft/gametest/Main.mapping new file mode 100644 index 0000000000..c8f1eb1f7c --- /dev/null +++ b/mappings/net/minecraft/gametest/Main.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/gametest/Main + METHOD main ([Ljava/lang/String;)V + ARG 0 args diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index fc20417023..31bffe3e70 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -467,6 +467,8 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_55043 CHISELED_RESIN_BRICKS Lnet/minecraft/class_1792; FIELD field_55710 WILDFLOWERS Lnet/minecraft/class_1792; FIELD field_55711 LEAF_LITTER Lnet/minecraft/class_1792; + FIELD field_55979 TEST_BLOCK Lnet/minecraft/class_1792; + FIELD field_55980 TEST_INSTANCE_BLOCK Lnet/minecraft/class_1792; FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792; FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792; FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/nbt/NbtException.mapping b/mappings/net/minecraft/nbt/NbtException.mapping index d5f60b7edf..e4fed00c49 100644 --- a/mappings/net/minecraft/nbt/NbtException.mapping +++ b/mappings/net/minecraft/nbt/NbtException.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_8909 net/minecraft/nbt/NbtException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping index aca6f340ea..073bfada15 100644 --- a/mappings/net/minecraft/nbt/NbtHelper.mapping +++ b/mappings/net/minecraft/nbt/NbtHelper.mapping @@ -68,6 +68,7 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper METHOD method_10692 fromBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2520; COMMENT {@return the serialized block position} COMMENT + COMMENT @implNote This uses {@link #fromVec3i} internally. COMMENT @see #toBlockPos(NbtCompound, String) ARG 0 pos METHOD method_25929 fromUuid (Ljava/util/UUID;)Lnet/minecraft/class_2495; @@ -182,3 +183,6 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper ARG 1 fallback METHOD method_48310 putDataVersion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 0 nbt + METHOD method_67078 fromVec3i (Lnet/minecraft/class_2382;)Lnet/minecraft/class_2520; + COMMENT {@return the serialized vector} + ARG 0 vec diff --git a/mappings/net/minecraft/registry/RegistryEntryLookup.mapping b/mappings/net/minecraft/registry/RegistryEntryLookup.mapping index 1283e7f9e0..0b4ab868a6 100644 --- a/mappings/net/minecraft/registry/RegistryEntryLookup.mapping +++ b/mappings/net/minecraft/registry/RegistryEntryLookup.mapping @@ -16,3 +16,7 @@ CLASS net/minecraft/class_7871 net/minecraft/registry/RegistryEntryLookup ARG 1 registryRef METHOD method_58562 (Lnet/minecraft/class_5321;Lnet/minecraft/class_7871;)Ljava/util/Optional; ARG 1 registryEntryLookup + METHOD method_66873 (Lnet/minecraft/class_5321;Lnet/minecraft/class_7871;)Ljava/util/Optional; + ARG 1 registry + METHOD method_66874 getEntryOrThrow (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; + ARG 1 key diff --git a/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping b/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping index f6d52a0241..a888a6a84c 100644 --- a/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping +++ b/mappings/net/minecraft/resource/VanillaResourcePackProvider.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvide FIELD field_40043 id Lnet/minecraft/class_2960; FIELD field_45052 symlinkFinder Lnet/minecraft/class_8580; FIELD field_49033 VANILLA_ID Lnet/minecraft/class_9226; + FIELD field_55931 TESTS_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_3264;Lnet/minecraft/class_3268;Lnet/minecraft/class_2960;Lnet/minecraft/class_8580;)V ARG 1 type ARG 2 resourcePack diff --git a/mappings/net/minecraft/server/ServerConfigHandler.mapping b/mappings/net/minecraft/server/ServerConfigHandler.mapping index eeb14ce03a..cf77071298 100644 --- a/mappings/net/minecraft/server/ServerConfigHandler.mapping +++ b/mappings/net/minecraft/server/ServerConfigHandler.mapping @@ -69,6 +69,8 @@ CLASS net/minecraft/class_3321 net/minecraft/server/ServerConfigHandler METHOD onProfileLookupFailed (Ljava/lang/String;Ljava/lang/Exception;)V ARG 2 exception CLASS class_3322 ServerConfigException + METHOD (Ljava/lang/String;)V + ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 79e6a5ed6f..583c6c33ad 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 1 variableName METHOD method_22268 executeCreate (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;III)I ARG 0 source + ARG 1 id ARG 2 x ARG 3 y ARG 4 z @@ -28,12 +29,16 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 0 source ARG 1 templateId METHOD method_56254 stop ()I + METHOD method_56255 (ILnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_4517; + ARG 3 instance METHOD method_56256 (Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 extraConfigAdder METHOD method_56257 testAttemptConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_10618;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 builder + ARG 1 finderGetter METHOD method_56258 testAttemptConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_10618;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 builder + ARG 1 finderGetter ARG 2 extraConfigAdder METHOD method_56259 start (Lnet/minecraft/class_2168;Lnet/minecraft/class_4520;)I ARG 0 source @@ -58,12 +63,99 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 1 state METHOD method_56268 testAttemptAndPlacementConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_10618;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 builder + ARG 1 finderGetter METHOD method_56270 (Lnet/minecraft/class_4517;)V ARG 0 state METHOD method_56274 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_57105 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 1 pos + METHOD method_66999 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 1 builder2 + METHOD method_67000 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_67001 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67002 suggestTestFunctions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 builder + METHOD method_67003 (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 instance + METHOD method_67004 (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD method_67007 (Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 1 style + METHOD method_67009 reset (Lnet/minecraft/class_9123;)I + ARG 0 finder + METHOD method_67010 (Lnet/minecraft/class_9123;Lnet/minecraft/class_2338;Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_2338;)V + ARG 3 pos + METHOD method_67011 (Lnet/minecraft/class_9123;Lnet/minecraft/class_4517;)Ljava/lang/Integer; + ARG 1 state + METHOD method_67012 start (Lnet/minecraft/class_9123;Lnet/minecraft/class_9118;II)I + ARG 0 finder + ARG 1 config + ARG 2 rotationSteps + ARG 3 testsPerRow + METHOD method_67016 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_67017 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)I + ARG 1 pos + METHOD method_67018 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67019 (Lnet/minecraft/class_2168;)Z + ARG 0 source + METHOD method_67020 clear (Lnet/minecraft/class_9123;)I + ARG 0 finder + METHOD method_67021 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_67022 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67023 export (Lnet/minecraft/class_9123;)I + ARG 0 finder + METHOD method_67024 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_67025 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67026 start (Lnet/minecraft/class_9123;)I + ARG 0 finder + METHOD method_67027 (Lnet/minecraft/class_10618;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_67028 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67029 locate (Lnet/minecraft/class_9123;)I + ARG 0 finder + METHOD method_67030 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67031 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67032 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67033 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67034 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67035 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67036 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67037 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67038 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67039 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67040 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67041 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67042 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_67043 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_9123; + ARG 0 context + METHOD method_67044 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_9123; + ARG 0 context CLASS class_4528 Listener FIELD comp_2217 tests Lnet/minecraft/class_4524; METHOD (Lnet/minecraft/class_2168;Lnet/minecraft/class_4524;)V diff --git a/mappings/net/minecraft/server/command/TestFinder.mapping b/mappings/net/minecraft/server/command/TestFinder.mapping index 7eedf952c5..e6f9920221 100644 --- a/mappings/net/minecraft/server/command/TestFinder.mapping +++ b/mappings/net/minecraft/server/command/TestFinder.mapping @@ -1,14 +1,21 @@ CLASS net/minecraft/class_9123 net/minecraft/server/command/TestFinder FIELD field_48507 NOOP_TEST_FUNCTION_FINDER Lnet/minecraft/class_10674; - FIELD field_48508 NOOP_STRUCTURE_BLOCK_FINDER Lnet/minecraft/class_10675; + FIELD field_48508 NOOP_TEST_INSTANCE_BLOCK_FINDER Lnet/minecraft/class_10675; FIELD field_48511 commandSource Lnet/minecraft/class_2168; + FIELD field_56218 instanceFinder Lnet/minecraft/class_10674; + FIELD field_56219 blockFinder Lnet/minecraft/class_10675; METHOD (Lnet/minecraft/class_2168;Lnet/minecraft/class_10674;Lnet/minecraft/class_10675;)V ARG 1 commandSource + ARG 2 instanceFinder + ARG 3 blockFinder METHOD method_56305 getCommandSource ()Lnet/minecraft/class_2168; - CLASS class_9124 Runners - FIELD field_49664 structurePosSupplierMapper Ljava/util/function/UnaryOperator; + METHOD method_67070 builder ()Lnet/minecraft/class_9123$class_9124; + CLASS class_9124 Builder + FIELD field_49664 testInstanceBlockFinderMapper Ljava/util/function/UnaryOperator; + FIELD field_56220 testInstanceFinderMapper Ljava/util/function/UnaryOperator; METHOD (Ljava/util/function/UnaryOperator;Ljava/util/function/UnaryOperator;)V - ARG 2 testFunctionsSupplierMapper + ARG 1 testInstanceFinderMapper + ARG 2 testInstanceBlockFinderMapper METHOD method_56309 nearest (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_9123; ARG 1 context METHOD method_56310 surface (Lcom/mojang/brigadier/context/CommandContext;I)Lnet/minecraft/class_9123; @@ -27,7 +34,18 @@ CLASS net/minecraft/class_9123 net/minecraft/server/command/TestFinder ARG 1 count METHOD method_57966 (ILjava/util/function/Supplier;)Ljava/util/function/Supplier; ARG 1 supplier - METHOD method_57967 createRunner (Lnet/minecraft/class_2168;Lnet/minecraft/class_10674;Lnet/minecraft/class_10675;)Lnet/minecraft/class_9123; + METHOD method_57967 build (Lnet/minecraft/class_2168;Lnet/minecraft/class_10674;Lnet/minecraft/class_10675;)Lnet/minecraft/class_9123; ARG 1 source + ARG 2 instanceFinder + ARG 3 blockFinder METHOD method_57970 repeating (I)Ljava/util/function/UnaryOperator; ARG 0 count + METHOD method_67071 selector (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/Collection;)Lnet/minecraft/class_9123; + ARG 1 context + ARG 2 selected + METHOD method_67072 (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; + ARG 0 finder + METHOD method_67073 (ZLnet/minecraft/class_6880$class_6883;)Z + ARG 1 instance + METHOD method_67074 (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; + ARG 0 finder diff --git a/mappings/net/minecraft/server/filter/AbstractTextFilterer.mapping b/mappings/net/minecraft/server/filter/AbstractTextFilterer.mapping index 35e5787c70..09b1ee93e7 100644 --- a/mappings/net/minecraft/server/filter/AbstractTextFilterer.mapping +++ b/mappings/net/minecraft/server/filter/AbstractTextFilterer.mapping @@ -83,6 +83,8 @@ CLASS net/minecraft/class_9847 net/minecraft/server/filter/AbstractTextFilterer METHOD method_33809 (Ljava/lang/Throwable;)Ljava/util/List; ARG 0 throwable CLASS class_5517 FailedHttpRequestException + METHOD (Ljava/lang/String;)V + ARG 1 message CLASS class_7242 MessageEncoder METHOD encode (Lcom/mojang/authlib/GameProfile;Ljava/lang/String;)Lcom/google/gson/JsonObject; ARG 1 gameProfile diff --git a/mappings/net/minecraft/server/world/ServerEntityManager.mapping b/mappings/net/minecraft/server/world/ServerEntityManager.mapping index 2dd95a677e..8560fae4d1 100644 --- a/mappings/net/minecraft/server/world/ServerEntityManager.mapping +++ b/mappings/net/minecraft/server/world/ServerEntityManager.mapping @@ -141,6 +141,8 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager METHOD method_40022 shouldTick (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_54490 getIndexSize ()I + METHOD method_66786 shouldTickTest (Lnet/minecraft/class_1923;)Z + ARG 1 pos CLASS class_5580 Listener FIELD field_27271 manager Lnet/minecraft/class_5579; FIELD field_27272 entity Lnet/minecraft/class_5568; diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 4b9902a82f..fcd7fdb597 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -376,6 +376,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 2 newPoiType METHOD method_66019 (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V ARG 2 oldPoiType + METHOD method_66588 shouldTickTest (Lnet/minecraft/class_1923;)Z + ARG 1 pos METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_6862;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; COMMENT Tries to find the closest structure of a given type near a given block. diff --git a/mappings/net/minecraft/test/Batches.mapping b/mappings/net/minecraft/test/Batches.mapping index 6d23d43949..617baed379 100644 --- a/mappings/net/minecraft/test/Batches.mapping +++ b/mappings/net/minecraft/test/Batches.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_9113 net/minecraft/test/Batches FIELD field_48467 BATCH_SIZE I + FIELD field_56170 DEFAULT_DECORATOR Lnet/minecraft/class_9113$class_10658; METHOD method_56188 defaultBatcher ()Lnet/minecraft/class_4520$class_9116; METHOD method_56192 (Lnet/minecraft/class_6880;Ljava/util/List;J)Lnet/minecraft/class_4514; ARG 1 states @@ -8,7 +9,31 @@ CLASS net/minecraft/class_9113 net/minecraft/test/Batches ARG 1 states METHOD method_56195 create (Ljava/util/Collection;Lnet/minecraft/class_6880;I)Lnet/minecraft/class_4514; ARG 0 states + ARG 1 environment + ARG 2 index METHOD method_56196 (ILjava/util/Map$Entry;)Ljava/util/stream/Stream; ARG 1 entry METHOD method_61092 batcher (I)Lnet/minecraft/class_4520$class_9116; ARG 0 batchSize + METHOD method_66925 batch (Ljava/util/Collection;Lnet/minecraft/class_9113$class_10658;Lnet/minecraft/class_3218;)Ljava/util/List; + ARG 0 instances + ARG 1 decorator + ARG 2 world + METHOD method_66926 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream; + ARG 0 entry + METHOD method_66927 (Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_3218;)Ljava/util/stream/Stream; + ARG 0 instance + ARG 1 world + METHOD method_66928 (Lnet/minecraft/class_9113$class_10658;Lnet/minecraft/class_3218;Lnet/minecraft/class_6880$class_6883;)Ljava/util/stream/Stream; + ARG 2 instance + METHOD method_66929 (Lnet/minecraft/class_4517;)Lnet/minecraft/class_6880; + ARG 0 state + METHOD method_66930 (Lnet/minecraft/class_6880;Ljava/util/List;J)Lnet/minecraft/class_4514; + ARG 1 states + ARG 2 index + METHOD method_66931 (Lnet/minecraft/class_4517;)Lnet/minecraft/class_6880; + ARG 0 state + CLASS class_10658 Decorator + METHOD decorate (Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_3218;)Ljava/util/stream/Stream; + ARG 1 instance + ARG 2 world diff --git a/mappings/net/minecraft/test/BlockBasedTestInstance.mapping b/mappings/net/minecraft/test/BlockBasedTestInstance.mapping index 47e771aea8..025774bbbe 100644 --- a/mappings/net/minecraft/test/BlockBasedTestInstance.mapping +++ b/mappings/net/minecraft/test/BlockBasedTestInstance.mapping @@ -2,12 +2,17 @@ CLASS net/minecraft/class_10654 net/minecraft/test/BlockBasedTestInstance FIELD field_56162 CODEC Lcom/mojang/serialization/MapCodec; METHOD method_66906 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_66909 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;)Lnet/minecraft/class_2338; + METHOD method_66908 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10637;)V + ARG 1 testBlockEntity + METHOD method_66909 findTestBlock (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;)Lnet/minecraft/class_2338; ARG 1 context ARG 2 mode - METHOD method_66911 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;Ljava/util/function/Consumer;)V + METHOD method_66910 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;Ljava/util/List;Lnet/minecraft/class_2338;)V + ARG 3 pos + METHOD method_66911 handleTrigger (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;Ljava/util/function/Consumer;)V ARG 1 context ARG 2 mode - METHOD method_66914 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;)Ljava/util/List; + ARG 3 callback + METHOD method_66914 findTestBlocks (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;)Ljava/util/List; ARG 1 context ARG 2 mode diff --git a/mappings/net/minecraft/test/TestFunctions.mapping b/mappings/net/minecraft/test/BuiltinTestFunctions.mapping similarity index 58% rename from mappings/net/minecraft/test/TestFunctions.mapping rename to mappings/net/minecraft/test/BuiltinTestFunctions.mapping index 0f987d817c..df3db1d4bf 100644 --- a/mappings/net/minecraft/test/TestFunctions.mapping +++ b/mappings/net/minecraft/test/BuiltinTestFunctions.mapping @@ -1,4 +1,5 @@ -CLASS net/minecraft/class_10655 net/minecraft/test/TestFunctions +CLASS net/minecraft/class_10655 net/minecraft/test/BuiltinTestFunctions + FIELD field_56164 ALWAYS_PASS_FUNCTION Ljava/util/function/Consumer; METHOD method_66915 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id METHOD method_66917 registerAndGetDefault (Lnet/minecraft/class_2378;)Ljava/util/function/Consumer; diff --git a/mappings/net/minecraft/test/GameTestException.mapping b/mappings/net/minecraft/test/GameTestException.mapping index 33de015f60..63eb747825 100644 --- a/mappings/net/minecraft/test/GameTestException.mapping +++ b/mappings/net/minecraft/test/GameTestException.mapping @@ -1 +1,7 @@ CLASS net/minecraft/class_4512 net/minecraft/test/GameTestException + FIELD field_56168 message Lnet/minecraft/class_2561; + FIELD field_56169 tick I + METHOD (Lnet/minecraft/class_2561;I)V + ARG 1 message + ARG 2 tick + METHOD method_66924 getText ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/test/GameTestState.mapping b/mappings/net/minecraft/test/GameTestState.mapping index f98957c6dd..ba3c0a8f6a 100644 --- a/mappings/net/minecraft/test/GameTestState.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -12,12 +12,12 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState FIELD field_47173 initialized Z FIELD field_47174 tickedOnce Z FIELD field_48469 testAttemptConfig Lnet/minecraft/class_9118; - FIELD field_56173 testInstance Lnet/minecraft/class_6880$class_6883; + FIELD field_56173 instanceEntry Lnet/minecraft/class_6880$class_6883; FIELD field_56174 testBlockPos Lnet/minecraft/class_2338; FIELD field_56175 rotation Lnet/minecraft/class_2470; FIELD field_56176 blockEntity Lnet/minecraft/class_10638; METHOD (Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_9118;)V - ARG 1 testInstance + ARG 1 instanceEntry ARG 2 rotation ARG 3 world ARG 4 testAttemptConfig @@ -74,6 +74,14 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_64385 getOrigin ()Lnet/minecraft/class_2338; METHOD method_66949 setTestBlockPos (Lnet/minecraft/class_2338;)V ARG 1 testBlockPos + METHOD method_66950 placeTestInstance (Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_10638; + ARG 1 pos + ARG 2 rotation + ARG 3 world + METHOD method_66951 getId ()Lnet/minecraft/class_2960; METHOD method_66952 (Lnet/minecraft/class_4518;)V ARG 1 listener METHOD method_66953 getTestInstanceBlockEntity ()Lnet/minecraft/class_10638; + METHOD method_66954 getStructure ()Lnet/minecraft/class_2960; + METHOD method_66955 getInstance ()Lnet/minecraft/class_10660; + METHOD method_66956 getInstanceEntry ()Lnet/minecraft/class_6880$class_6883; diff --git a/mappings/net/minecraft/test/PositionedException.mapping b/mappings/net/minecraft/test/PositionedException.mapping index 72577cb4f4..8acac27ea6 100644 --- a/mappings/net/minecraft/test/PositionedException.mapping +++ b/mappings/net/minecraft/test/PositionedException.mapping @@ -2,8 +2,10 @@ CLASS net/minecraft/class_4513 net/minecraft/test/PositionedException FIELD field_20541 pos Lnet/minecraft/class_2338; FIELD field_20542 relativePos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;I)V + ARG 1 message ARG 2 pos ARG 3 relativePos + ARG 4 tick METHOD method_22150 getDebugMessage ()Ljava/lang/String; METHOD method_22151 getPos ()Lnet/minecraft/class_2338; METHOD method_35940 getRelativePos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/test/RuntimeTestInstances.mapping b/mappings/net/minecraft/test/RuntimeTestInstances.mapping new file mode 100644 index 0000000000..99fc3f2b26 --- /dev/null +++ b/mappings/net/minecraft/test/RuntimeTestInstances.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_10656 net/minecraft/test/RuntimeTestInstances + FIELD field_56165 INSTANCES Ljava/util/Set; + METHOD method_66918 stream ()Ljava/util/stream/Stream; + METHOD method_66919 add (Lnet/minecraft/class_6880$class_6883;)V + ARG 0 instance + METHOD method_66920 clear ()V diff --git a/mappings/net/minecraft/test/StructureTestListener.mapping b/mappings/net/minecraft/test/StructureTestListener.mapping index f44beab3dd..4a578846f8 100644 --- a/mappings/net/minecraft/test/StructureTestListener.mapping +++ b/mappings/net/minecraft/test/StructureTestListener.mapping @@ -29,3 +29,11 @@ CLASS net/minecraft/class_5624 net/minecraft/test/StructureTestListener ARG 1 state ARG 2 context ARG 3 lastPassed + METHOD method_66988 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional; + ARG 1 pos + METHOD method_66989 (Lnet/minecraft/class_10638;)V + ARG 0 testInstanceBlockEntity + METHOD method_66990 (Lnet/minecraft/class_2561;Lnet/minecraft/class_10638;)V + ARG 1 testInstanceBlockEntity + METHOD method_66991 getTestInstanceBlockEntity (Lnet/minecraft/class_4517;)Ljava/util/Optional; + ARG 0 state diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping deleted file mode 100644 index b11d4bf79f..0000000000 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ /dev/null @@ -1,56 +0,0 @@ -CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil - FIELD field_20579 testStructuresDirectoryName Ljava/nio/file/Path; - FIELD field_33173 TEST_STRUCTURES_DIRECTORY_NAME Ljava/lang/String; - METHOD method_22241 (Lnet/minecraft/class_1297;)Z - ARG 0 entity - METHOD method_22244 findContainingStructureBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/Optional; - ARG 0 pos - ARG 1 radius - ARG 2 world - METHOD method_22246 clearArea (Lnet/minecraft/class_3341;Lnet/minecraft/class_3218;)V - ARG 0 area - ARG 1 world - METHOD method_22247 isInStructureBounds (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)Z - ARG 0 structureBlockPos - ARG 1 pos - ARG 2 world - METHOD method_22254 (ILnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V - ARG 2 pos - METHOD method_22255 findNearestStructureBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/Optional; - ARG 0 pos - ARG 1 radius - ARG 2 world - METHOD method_22258 findStructureBlocks (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/stream/Stream; - ARG 0 pos - ARG 1 radius - ARG 2 world - METHOD method_22368 resetBlock (ILnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V - ARG 0 altitude - ARG 1 pos - ARG 2 world - METHOD method_29408 getRotation (I)Lnet/minecraft/class_2470; - ARG 0 steps - METHOD method_29409 getStructureBlockBox (Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;)Lnet/minecraft/class_3341; - ARG 0 pos - ARG 1 relativePos - ARG 2 rotation - METHOD method_36105 getRotationSteps (Lnet/minecraft/class_2470;)I - ARG 0 rotation - METHOD method_54847 getStructureBlockBoxCornerPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; - ARG 0 pos - ARG 1 size - ARG 2 rotation - METHOD method_56252 findTargetedStructureBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;)Ljava/util/stream/Stream; - ARG 0 pos - ARG 1 entity - ARG 2 world - METHOD method_59785 createBox (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Lnet/minecraft/class_3341; - ARG 0 pos - ARG 1 radius - ARG 2 world - METHOD method_66992 createTestInstanceBlockEntity (Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_10638; - ARG 0 testInstanceId - ARG 1 pos - ARG 2 size - ARG 3 rotation - ARG 4 world diff --git a/mappings/net/minecraft/test/TestBootstrap.mapping b/mappings/net/minecraft/test/TestBootstrap.mapping new file mode 100644 index 0000000000..01cbf15dd6 --- /dev/null +++ b/mappings/net/minecraft/test/TestBootstrap.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_10662 net/minecraft/test/TestBootstrap + FIELD field_56180 LOGGER Lorg/slf4j/Logger; + FIELD field_56181 DEFAULT_UNIVERSE Ljava/lang/String; + FIELD field_56182 DEFAULT_WORLD Ljava/lang/String; + FIELD field_56183 PARSER Ljoptsimple/OptionParser; + FIELD field_56184 UNIVERSE Ljoptsimple/OptionSpec; + FIELD field_56185 REPORT Ljoptsimple/OptionSpec; + FIELD field_56186 TESTS Ljoptsimple/OptionSpec; + FIELD field_56187 VERIFY Ljoptsimple/OptionSpec; + FIELD field_56188 PACKS Ljoptsimple/OptionSpec; + FIELD field_56189 HELP Ljoptsimple/OptionSpec; + METHOD method_66977 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Ljoptsimple/OptionSet;Ljava/lang/Thread;)Lnet/minecraft/class_6306; + ARG 3 thread + METHOD method_66978 empty (Ljava/lang/String;)V + ARG 0 path + METHOD method_66979 copyPacks (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 universe + ARG 1 packDir + METHOD method_66980 get (Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;)Ljava/util/Optional; + ARG 0 options + ARG 1 option + METHOD method_66981 run ([Ljava/lang/String;Ljava/util/function/Consumer;)V + ARG 0 args + ARG 1 universeCallback diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index dc444151e5..8d05de3090 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -41,12 +41,17 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_35954 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z ARG 1 e METHOD method_35955 expectEntityAt (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)V + ARG 1 entity + ARG 2 pos METHOD method_35957 testEntityProperty (Lnet/minecraft/class_1297;Ljava/util/function/Function;Ljava/lang/Object;Lnet/minecraft/class_2561;)V ARG 1 entity ARG 2 propertyGetter + ARG 3 value + ARG 4 message METHOD method_35958 testEntity (Lnet/minecraft/class_1297;Ljava/util/function/Predicate;Lnet/minecraft/class_2561;)V ARG 1 entity ARG 2 predicate + ARG 3 message METHOD method_35959 expectEntity (Lnet/minecraft/class_1299;)V ARG 1 type METHOD method_35960 expectEntityToTouch (Lnet/minecraft/class_1299;DDD)V @@ -135,10 +140,12 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_35987 expectBlockProperty (Lnet/minecraft/class_2338;Lnet/minecraft/class_2769;Ljava/lang/Comparable;)V ARG 1 pos ARG 2 property + ARG 3 value METHOD method_35988 checkBlockProperty (Lnet/minecraft/class_2338;Lnet/minecraft/class_2769;Ljava/util/function/Predicate;Lnet/minecraft/class_2561;)V ARG 1 pos ARG 2 property ARG 3 predicate + ARG 4 message METHOD method_35989 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V ARG 3 checkedPos METHOD method_35990 expectSameStates (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)V @@ -147,14 +154,19 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_35992 checkBlock (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Ljava/util/function/Function;)V ARG 1 pos ARG 2 predicate + ARG 3 messageGetter METHOD method_35993 addFinalTask (Ljava/lang/Runnable;)V ARG 1 runnable METHOD method_35994 (Ljava/lang/Runnable;J)V ARG 2 tick METHOD method_35995 throwGameTestException (Lnet/minecraft/class_2561;)V + ARG 1 message METHOD method_35996 throwPositionedException (Lnet/minecraft/class_2561;Lnet/minecraft/class_1297;)V + ARG 1 message ARG 2 entity METHOD method_35997 throwPositionedException (Lnet/minecraft/class_2561;Lnet/minecraft/class_2338;)V + ARG 1 message + ARG 2 pos METHOD method_35998 forEachRelativePos (Ljava/util/function/Consumer;)V ARG 1 posConsumer METHOD method_35999 (Ljava/util/function/Predicate;Lnet/minecraft/class_2680;)Z @@ -204,13 +216,16 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 entity METHOD method_36014 getBlockEntity (Lnet/minecraft/class_2338;Ljava/lang/Class;)Lnet/minecraft/class_2586; ARG 1 pos + ARG 2 clazz METHOD method_36015 expectEntityWithDataEnd (Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;Ljava/util/function/Function;Ljava/lang/Object;)V ARG 1 pos ARG 2 type ARG 3 entityDataGetter ARG 4 data METHOD method_36017 checkBlockState (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Ljava/util/function/Function;)V + ARG 1 pos ARG 2 predicate + ARG 3 messageGetter METHOD method_36018 addInstantFinalTask (Ljava/lang/Runnable;)V ARG 1 runnable METHOD method_36019 (Ljava/lang/Runnable;J)V @@ -305,12 +320,14 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 3 amount ARG 4 radius METHOD method_46224 expectEntityInside (Lnet/minecraft/class_1299;Lnet/minecraft/class_238;)V + ARG 1 type ARG 2 box METHOD method_46225 spawnItem (Lnet/minecraft/class_1792;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1542; ARG 1 item ARG 2 pos METHOD method_46226 assertTrue (ZLnet/minecraft/class_2561;)V ARG 1 condition + ARG 2 message METHOD method_46227 getRelative (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 pos METHOD method_46229 useBlock (Lnet/minecraft/class_2338;)V @@ -338,6 +355,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 3 item METHOD method_49994 assertFalse (ZLnet/minecraft/class_2561;)V ARG 1 condition + ARG 2 message METHOD method_51821 setHealthLow (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1309; ARG 1 entity METHOD method_51891 createMockCreativeServerPlayerInWorld ()Lnet/minecraft/class_3222; @@ -349,6 +367,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 pos ARG 2 direction ARG 3 powerPredicate + ARG 4 messageGetter METHOD method_52889 expectEntityHasEffect (Lnet/minecraft/class_1309;Lnet/minecraft/class_6880;I)V ARG 1 entity ARG 2 effect @@ -393,6 +412,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_56606 assertEquals (Ljava/lang/Object;Ljava/lang/Object;Lnet/minecraft/class_2561;)V ARG 1 value ARG 2 expected + ARG 3 message METHOD method_57099 setEntityPos (Lnet/minecraft/class_1308;FFF)V ARG 1 entity ARG 2 x @@ -405,10 +425,15 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 type ARG 2 box METHOD method_60651 checkBlockEntity (Lnet/minecraft/class_2338;Ljava/lang/Class;Ljava/util/function/Predicate;Ljava/util/function/Supplier;)V + ARG 1 pos + ARG 2 clazz + ARG 3 predicate + ARG 4 messageGetter METHOD method_61093 getRotation ()Lnet/minecraft/class_2470; METHOD method_61173 expectEntityIn (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Lnet/minecraft/class_2561;)V ARG 1 entity ARG 2 box + ARG 3 message METHOD method_62772 getAbsolute (Lnet/minecraft/class_238;)Lnet/minecraft/class_238; ARG 1 box METHOD method_62773 getRelative (Lnet/minecraft/class_238;)Lnet/minecraft/class_238; @@ -427,3 +452,36 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 entity METHOD method_66562 forceScheduledTick (Lnet/minecraft/class_2338;)V ARG 1 pos + METHOD method_66934 (Lnet/minecraft/class_6862;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2561; + ARG 1 state + METHOD method_66935 expectBlockIn (Lnet/minecraft/class_6862;Lnet/minecraft/class_2338;)V + ARG 1 tag + ARG 2 pos + METHOD method_66936 (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2561; + ARG 1 actualBlock + METHOD method_66937 createError (Ljava/lang/String;[Ljava/lang/Object;)Lnet/minecraft/class_4512; + ARG 1 translationKey + ARG 2 args + METHOD method_66938 (Ljava/util/function/Function;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2561; + ARG 1 state + METHOD method_66940 expectContainerWithSingle (Lnet/minecraft/class_2338;Lnet/minecraft/class_1792;)V + ARG 1 pos + ARG 2 item + METHOD method_66941 createError (Lnet/minecraft/class_2338;Ljava/lang/String;[Ljava/lang/Object;)Lnet/minecraft/class_4513; + ARG 1 pos + ARG 2 translationKey + ARG 3 args + METHOD method_66942 createError (Lnet/minecraft/class_2338;Lnet/minecraft/class_2561;)Lnet/minecraft/class_4513; + ARG 1 pos + ARG 2 message + METHOD method_66943 createError (Lnet/minecraft/class_2561;)Lnet/minecraft/class_4512; + ARG 1 message + METHOD method_66944 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2561; + ARG 1 state + METHOD method_66945 (Lnet/minecraft/class_6862;Lnet/minecraft/class_2680;)Z + ARG 1 state + METHOD method_66946 (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2561; + ARG 1 actualBlock + METHOD method_66947 expectBlockState (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state diff --git a/mappings/net/minecraft/test/TestEntry.mapping b/mappings/net/minecraft/test/TestEntry.mapping new file mode 100644 index 0000000000..6e720a57a6 --- /dev/null +++ b/mappings/net/minecraft/test/TestEntry.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_10663 net/minecraft/test/TestEntry + METHOD (Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/util/function/Consumer;)V + ARG 1 tests + ARG 2 functionId + ARG 3 function + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_10664;Ljava/util/function/Consumer;)V + ARG 1 id + ARG 2 data + ARG 3 function diff --git a/mappings/net/minecraft/test/TestEnvironmentDefinition.mapping b/mappings/net/minecraft/test/TestEnvironmentDefinition.mapping index 64fca04aeb..7608db735c 100644 --- a/mappings/net/minecraft/test/TestEnvironmentDefinition.mapping +++ b/mappings/net/minecraft/test/TestEnvironmentDefinition.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_10665 net/minecraft/test/TestEnvironmentDefinition METHOD method_67050 getCodec ()Lcom/mojang/serialization/MapCodec; METHOD method_67051 setup (Lnet/minecraft/class_3218;)V ARG 1 world + METHOD method_67052 (Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec; + ARG 0 codec METHOD method_67053 registerAndGetDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/MapCodec; ARG 0 registry METHOD method_67054 teardown (Lnet/minecraft/class_3218;)V diff --git a/mappings/net/minecraft/test/TestFunctionProvider.mapping b/mappings/net/minecraft/test/TestFunctionProvider.mapping new file mode 100644 index 0000000000..cfda6d79c7 --- /dev/null +++ b/mappings/net/minecraft/test/TestFunctionProvider.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_10673 net/minecraft/test/TestFunctionProvider + FIELD field_56221 PROVIDERS Ljava/util/List; + METHOD method_66916 register (Ljava/util/function/BiConsumer;)V + ARG 1 registry + METHOD method_67075 (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/util/function/Consumer;)V + ARG 1 key + ARG 2 value + METHOD method_67076 addProvider (Lnet/minecraft/class_10673;)V + ARG 0 provider + METHOD method_67077 registerAll (Lnet/minecraft/class_2378;)V + ARG 0 registry diff --git a/mappings/net/minecraft/test/TestInstance.mapping b/mappings/net/minecraft/test/TestInstance.mapping index 0677e9a2d1..20ae8b0225 100644 --- a/mappings/net/minecraft/test/TestInstance.mapping +++ b/mappings/net/minecraft/test/TestInstance.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_10660 net/minecraft/test/TestInstance METHOD (Lnet/minecraft/class_10664;)V ARG 1 data METHOD method_66905 getCodec ()Lcom/mojang/serialization/MapCodec; - METHOD method_66907 (Lnet/minecraft/class_4516;)V + METHOD method_66907 start (Lnet/minecraft/class_4516;)V ARG 1 context METHOD method_66912 getTypeDescription ()Lnet/minecraft/class_5250; METHOD method_66922 getDescription ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/test/TestInstanceBlockFinder.mapping b/mappings/net/minecraft/test/TestInstanceBlockFinder.mapping new file mode 100644 index 0000000000..cba0704486 --- /dev/null +++ b/mappings/net/minecraft/test/TestInstanceBlockFinder.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10675 net/minecraft/test/TestInstanceBlockFinder diff --git a/mappings/net/minecraft/test/TestInstanceFinder.mapping b/mappings/net/minecraft/test/TestInstanceFinder.mapping new file mode 100644 index 0000000000..dd93625a4f --- /dev/null +++ b/mappings/net/minecraft/test/TestInstanceFinder.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10674 net/minecraft/test/TestInstanceFinder diff --git a/mappings/net/minecraft/test/TestInstanceUtil.mapping b/mappings/net/minecraft/test/TestInstanceUtil.mapping new file mode 100644 index 0000000000..41fc10e613 --- /dev/null +++ b/mappings/net/minecraft/test/TestInstanceUtil.mapping @@ -0,0 +1,66 @@ +CLASS net/minecraft/class_4525 net/minecraft/test/TestInstanceUtil + FIELD field_20579 testStructuresDirectoryName Ljava/nio/file/Path; + FIELD field_33173 TEST_STRUCTURES_DIRECTORY_NAME Ljava/lang/String; + METHOD method_22241 (Lnet/minecraft/class_1297;)Z + ARG 0 entity + METHOD method_22244 findContainingTestInstanceBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/Optional; + ARG 0 pos + ARG 1 radius + ARG 2 world + METHOD method_22246 clearArea (Lnet/minecraft/class_3341;Lnet/minecraft/class_3218;)V + ARG 0 area + ARG 1 world + METHOD method_22247 isInBounds (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)Z + ARG 0 testInstanceBlockPos + ARG 1 pos + ARG 2 world + METHOD method_22254 (ILnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 2 pos + METHOD method_22255 findNearestTestInstanceBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/Optional; + ARG 0 pos + ARG 1 radius + ARG 2 world + METHOD method_22258 findTestInstanceBlocks (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Ljava/util/stream/Stream; + ARG 0 pos + ARG 1 radius + ARG 2 world + METHOD method_22368 resetBlock (ILnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V + ARG 0 altitude + ARG 1 pos + ARG 2 world + METHOD method_29408 getRotation (I)Lnet/minecraft/class_2470; + ARG 0 steps + METHOD method_29409 getTestInstanceBlockBox (Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;)Lnet/minecraft/class_3341; + ARG 0 pos + ARG 1 relativePos + ARG 2 rotation + METHOD method_36105 getRotationSteps (Lnet/minecraft/class_2470;)I + ARG 0 rotation + METHOD method_54847 getTestInstanceBlockBoxCornerPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; + ARG 0 pos + ARG 1 size + ARG 2 rotation + METHOD method_56252 findTargetedTestInstanceBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;)Ljava/util/stream/Stream; + ARG 0 pos + ARG 1 entity + ARG 2 world + METHOD method_59785 createBox (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Lnet/minecraft/class_3341; + ARG 0 pos + ARG 1 radius + ARG 2 world + METHOD method_66992 createTestInstanceBlockEntity (Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_10638; + ARG 0 testInstanceId + ARG 1 pos + ARG 2 size + ARG 3 rotation + ARG 4 world + METHOD method_66993 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional; + ARG 1 blockPos + METHOD method_66994 (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_10638;)Z + ARG 2 testInstanceBlockEntity + METHOD method_66995 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 2 blockPos + METHOD method_66996 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)I + ARG 1 blockPos + METHOD method_66997 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 1 blockPos diff --git a/mappings/net/minecraft/test/TestRunContext.mapping b/mappings/net/minecraft/test/TestRunContext.mapping index 5953ceb377..e982a4463a 100644 --- a/mappings/net/minecraft/test/TestRunContext.mapping +++ b/mappings/net/minecraft/test/TestRunContext.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestRunContext FIELD field_48480 reuseSpawner Lnet/minecraft/class_4520$class_9117; FIELD field_48481 initialSpawner Lnet/minecraft/class_4520$class_9117; FIELD field_52279 stopAfterFailure Z + FIELD field_56190 environment Lnet/minecraft/class_6880; METHOD (Lnet/minecraft/class_4520$class_9116;Ljava/util/Collection;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;Lnet/minecraft/class_4520$class_9117;Lnet/minecraft/class_4520$class_9117;Z)V ARG 1 batcher ARG 2 batches @@ -46,6 +47,7 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestRunContext METHOD method_56231 onFinish ()V METHOD method_57072 (Lnet/minecraft/class_4517;)Ljava/lang/String; ARG 0 state + METHOD method_66982 clearEnvironment ()V CLASS 1 METHOD method_56232 onFinished ()V METHOD method_56233 (J)V diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping index 4e525d9003..92aea4962f 100644 --- a/mappings/net/minecraft/test/TestServer.mapping +++ b/mappings/net/minecraft/test/TestServer.mapping @@ -9,11 +9,15 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer FIELD field_48494 stopwatch Lcom/google/common/base/Stopwatch; FIELD field_48984 debugSampleLog Lnet/minecraft/class_9191; FIELD field_53734 ENABLED_FEATURES Lnet/minecraft/class_7699; + FIELD field_56192 tests Ljava/util/Optional; + FIELD field_56193 verify Z METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/util/Optional;Z)V ARG 1 serverThread ARG 2 session ARG 3 dataPackManager ARG 4 saveLoader + ARG 5 tests + ARG 6 verify METHOD method_36095 (Lnet/minecraft/class_4517;)V ARG 0 test METHOD method_36096 runTestBatches (Lnet/minecraft/class_3218;)V @@ -27,5 +31,19 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer ARG 0 thread ARG 1 session ARG 2 resourcePackManager + ARG 3 tests + ARG 4 verify METHOD method_43615 (Lnet/minecraft/class_7237$class_6906;Lnet/minecraft/class_1940;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 2 executor + METHOD method_66983 (Lnet/minecraft/class_6880$class_6883;)Z + ARG 0 instance + METHOD method_66984 makeVerificationBatches (Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_3218;)Ljava/util/stream/Stream; + ARG 0 instance + ARG 1 world + METHOD method_66985 selectInstances (Lnet/minecraft/class_5455;Ljava/lang/String;)Ljava/util/stream/Stream; + ARG 0 registryManager + ARG 1 selector + METHOD method_66986 batch (Lnet/minecraft/class_3218;)Ljava/util/List; + ARG 1 world + METHOD method_66987 (Lnet/minecraft/class_6880$class_6883;)Z + ARG 0 instance diff --git a/mappings/net/minecraft/test/TickLimitExceededException.mapping b/mappings/net/minecraft/test/TickLimitExceededException.mapping index 183a174298..225451119d 100644 --- a/mappings/net/minecraft/test/TickLimitExceededException.mapping +++ b/mappings/net/minecraft/test/TickLimitExceededException.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_4522 net/minecraft/test/TickLimitExceededException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/test/TimedTaskRunner.mapping b/mappings/net/minecraft/test/TimedTaskRunner.mapping index 91177cb80a..ff908e60a1 100644 --- a/mappings/net/minecraft/test/TimedTaskRunner.mapping +++ b/mappings/net/minecraft/test/TimedTaskRunner.mapping @@ -5,8 +5,11 @@ CLASS net/minecraft/class_4693 net/minecraft/test/TimedTaskRunner METHOD (Lnet/minecraft/class_4517;)V ARG 1 gameTest METHOD method_23643 runSilently (I)V + ARG 1 tick METHOD method_23644 runReported (I)V + ARG 1 tick METHOD method_23645 runTasks (I)V + ARG 1 tick METHOD method_36075 completeIfSuccessful ()V METHOD method_36076 expectMinDuration (I)Lnet/minecraft/class_4693; ARG 1 minDuration @@ -33,3 +36,4 @@ CLASS net/minecraft/class_4693 net/minecraft/test/TimedTaskRunner FIELD field_33155 triggeredTick I METHOD method_36092 checkTrigger ()V METHOD method_36093 trigger (I)V + ARG 1 tick diff --git a/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping b/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping index fdcaa2b75d..787bae3bb7 100644 --- a/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping +++ b/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_2973 net/minecraft/util/InvalidHierarchicalFileExcepti COMMENT the invalid element in a hierarchical tree structure (such as JSON). FIELD field_13371 invalidFiles Ljava/util/List; FIELD field_13372 message Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 mesage METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause diff --git a/mappings/net/minecraft/util/InvalidIdentifierException.mapping b/mappings/net/minecraft/util/InvalidIdentifierException.mapping index 40ccbf5e94..40ad85e836 100644 --- a/mappings/net/minecraft/util/InvalidIdentifierException.mapping +++ b/mappings/net/minecraft/util/InvalidIdentifierException.mapping @@ -2,5 +2,8 @@ CLASS net/minecraft/class_151 net/minecraft/util/InvalidIdentifierException COMMENT An exception thrown when parsing or constructing an {@link Identifier} COMMENT that contains an invalid character. This should not be caught, instead COMMENT {@link Identifier#tryParse} or {@link Identifier#of} should be used. + METHOD (Ljava/lang/String;)V + ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message + ARG 2 throwable diff --git a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping index 205b25cb3b..cc9dfed465 100644 --- a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping +++ b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping @@ -32,3 +32,5 @@ CLASS net/minecraft/class_3508 net/minecraft/util/collection/PackedIntegerArray METHOD method_27284 getStorageIndex (I)I ARG 1 index CLASS class_6685 InvalidLengthException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/util/collection/Pool.mapping b/mappings/net/minecraft/util/collection/Pool.mapping index 8924487b88..38b7494ccc 100644 --- a/mappings/net/minecraft/util/collection/Pool.mapping +++ b/mappings/net/minecraft/util/collection/Pool.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_6012 net/minecraft/util/collection/Pool ARG 0 entryCodec METHOD method_66218 createNonEmptyCodec (Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/Codec; ARG 0 entryCodec + METHOD method_66647 contains (Ljava/lang/Object;)Z + ARG 1 value CLASS class_10579 WrappedContent FIELD field_55648 entries [Lnet/minecraft/class_6010; METHOD (Ljava/util/List;)V diff --git a/mappings/net/minecraft/util/path/PathResolving.mapping b/mappings/net/minecraft/util/path/PathResolving.mapping new file mode 100644 index 0000000000..ac7b730c95 --- /dev/null +++ b/mappings/net/minecraft/util/path/PathResolving.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_10619 net/minecraft/util/path/PathResolving + FIELD field_55933 LOGGER Lorg/slf4j/Logger; + METHOD method_66590 toPath (Ljava/net/URI;)Ljava/nio/file/Path; + ARG 0 uri diff --git a/mappings/net/minecraft/util/PathUtil.mapping b/mappings/net/minecraft/util/path/PathUtil.mapping similarity index 98% rename from mappings/net/minecraft/util/PathUtil.mapping rename to mappings/net/minecraft/util/path/PathUtil.mapping index 5a9401b091..40b0255c11 100644 --- a/mappings/net/minecraft/util/PathUtil.mapping +++ b/mappings/net/minecraft/util/path/PathUtil.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4239 net/minecraft/util/PathUtil +CLASS net/minecraft/class_4239 net/minecraft/util/path/PathUtil COMMENT A class holding path-related utility methods. FIELD field_18955 RESERVED_WINDOWS_NAMES Ljava/util/regex/Pattern; FIELD field_18956 FILE_NAME_WITH_COUNT Ljava/util/regex/Pattern; diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 751d4e692e..9ee98d658e 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -119,6 +119,10 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 2 maxUses ARG 3 experience ARG 4 map + METHOD method_19201 (Lnet/minecraft/class_5321;)V + ARG 0 typeKey + METHOD method_19202 (Ljava/util/Map;Lnet/minecraft/class_5321;)Z + ARG 1 typeKey CLASS class_4163 SellEnchantedToolFactory FIELD field_18558 tool Lnet/minecraft/class_1799; FIELD field_18559 basePrice I diff --git a/mappings/net/minecraft/village/VillagerData.mapping b/mappings/net/minecraft/village/VillagerData.mapping index 93bd5bd7bc..5d73d0b4c6 100644 --- a/mappings/net/minecraft/village/VillagerData.mapping +++ b/mappings/net/minecraft/village/VillagerData.mapping @@ -15,7 +15,9 @@ CLASS net/minecraft/class_3850 net/minecraft/village/VillagerData METHOD method_16920 withLevel (I)Lnet/minecraft/class_3850; ARG 1 level METHOD method_16921 withProfession (Lnet/minecraft/class_6880;)Lnet/minecraft/class_3850; + ARG 1 profession METHOD method_16922 withType (Lnet/minecraft/class_6880;)Lnet/minecraft/class_3850; + ARG 1 type METHOD method_19194 getLowerLevelExperience (I)I ARG 0 level METHOD method_19195 getUpperLevelExperience (I)I @@ -30,3 +32,9 @@ CLASS net/minecraft/class_3850 net/minecraft/village/VillagerData ARG 0 data METHOD method_28374 (Lnet/minecraft/class_3850;)Lnet/minecraft/class_6880; ARG 0 data + METHOD method_66687 withType (Lnet/minecraft/class_7871$class_7872;Lnet/minecraft/class_5321;)Lnet/minecraft/class_3850; + ARG 1 registries + ARG 2 typeKey + METHOD method_66688 withProfession (Lnet/minecraft/class_7871$class_7872;Lnet/minecraft/class_5321;)Lnet/minecraft/class_3850; + ARG 1 registries + ARG 2 professionKey diff --git a/mappings/net/minecraft/world/gen/feature/EndPortalFeature.mapping b/mappings/net/minecraft/world/gen/feature/EndPortalFeature.mapping index 118c03eea4..b6cee9deb3 100644 --- a/mappings/net/minecraft/world/gen/feature/EndPortalFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndPortalFeature.mapping @@ -5,3 +5,7 @@ CLASS net/minecraft/class_3033 net/minecraft/world/gen/feature/EndPortalFeature ARG 1 open METHOD method_51862 offsetOrigin (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 0 pos + METHOD method_66787 place (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V + ARG 1 world + ARG 2 pos + ARG 3 block diff --git a/unpick-definitions/entity_status.unpick b/unpick-definitions/entity_status.unpick index b44df12e35..74947856fc 100644 --- a/unpick-definitions/entity_status.unpick +++ b/unpick-definitions/entity_status.unpick @@ -59,6 +59,7 @@ constant entity_statuses net/minecraft/entity/EntityStatuses PEEKING constant entity_statuses net/minecraft/entity/EntityStatuses BREAK_BODY constant entity_statuses net/minecraft/entity/EntityStatuses INVULNERABLE_CREAKING_HIT constant entity_statuses net/minecraft/entity/EntityStatuses ADD_BUBBLE_PARTICLES +constant entity_statuses net/minecraft/entity/EntityStatuses BREAK_SADDLE target_method net/minecraft/entity/Entity handleStatus (B)V param 0 entity_statuses