From 63d4e33cc02f2d3f879b4abb8ff1f37f5a629e33 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 6 Aug 2023 00:56:05 +0900 Subject: [PATCH] 23w31a misc --- .../fix/DropInvalidSignDatafixDataFix.mapping | 7 +++ .../fix/RandomSequenceSettingsFix.mapping | 6 ++ .../datafixer/fix/StatsCounterFix.mapping | 12 +++- .../fix/UpdateSignTextFormatFix.mapping | 19 ++++++- .../datafixer/schema/Schema1451v6.mapping | 2 + .../minecraft/scoreboard/Scoreboard.mapping | 2 + .../scoreboard/ScoreboardState.mapping | 1 + .../scoreboard/ServerScoreboard.mapping | 1 + .../screen/EnchantmentScreenHandler.mapping | 1 + .../screen/SmithingScreenHandler.mapping | 4 ++ .../function/CommandFunctionManager.mapping | 8 +-- mappings/net/minecraft/util/Colors.mapping | 4 +- .../util/collection/ArrayListDeque.mapping | 55 +++++++++++++++++++ .../net/minecraft/util/dynamic/Codecs.mapping | 24 +++++++- .../net/minecraft/util/dynamic/Range.mapping | 2 + .../net/minecraft/util/math/ChunkPos.mapping | 7 +++ .../minecraft/util/math/MathHelper.mapping | 4 ++ .../util/math/random/RandomSequence.mapping | 4 ++ .../math/random/RandomSequencesState.mapping | 6 ++ .../minecraft/util/path/SymlinkFinder.mapping | 7 +++ .../util/profiling/jfr/FlightProfiler.mapping | 2 + .../profiling/jfr/event/PacketEvent.mapping | 1 + .../village/raid/RaidManager.mapping | 4 ++ .../minecraft/world/ChunkUpdateState.mapping | 1 + .../minecraft/world/ForcedChunkState.mapping | 1 + .../net/minecraft/world/IdCountsState.mapping | 1 + .../net/minecraft/world/WorldEvents.mapping | 2 +- .../world/level/storage/LevelStorage.mapping | 3 + 28 files changed, 182 insertions(+), 9 deletions(-) create mode 100644 mappings/net/minecraft/util/collection/ArrayListDeque.mapping diff --git a/mappings/net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix.mapping b/mappings/net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix.mapping index 84ba1a0705..faca953c0a 100644 --- a/mappings/net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/DropInvalidSignDatafixDataFix.mapping @@ -6,4 +6,11 @@ CLASS net/minecraft/class_8625 net/minecraft/datafixer/fix/DropInvalidSignDatafi ARG 2 name ARG 3 blockEntityId METHOD method_52475 dropInvalidDatafixData (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 blockEntityData + METHOD method_52476 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Z + ARG 1 message + METHOD method_52477 (Ljava/util/List;Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;J)Lcom/mojang/serialization/Dynamic; + ARG 2 message + ARG 3 index METHOD method_52478 dropInvalidDatafixDataOnSide (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 textData diff --git a/mappings/net/minecraft/datafixer/fix/RandomSequenceSettingsFix.mapping b/mappings/net/minecraft/datafixer/fix/RandomSequenceSettingsFix.mapping index b990516a39..a79fb2b797 100644 --- a/mappings/net/minecraft/datafixer/fix/RandomSequenceSettingsFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RandomSequenceSettingsFix.mapping @@ -1,3 +1,9 @@ CLASS net/minecraft/class_8626 net/minecraft/datafixer/fix/RandomSequenceSettingsFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema + METHOD method_52479 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 0 typed + METHOD method_52480 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 randomSequencesData + METHOD method_52481 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 data diff --git a/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping b/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping index ee1d816c2a..648cef17e7 100644 --- a/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping @@ -2,13 +2,23 @@ CLASS net/minecraft/class_1214 net/minecraft/datafixer/fix/StatsCounterFix FIELD field_29907 OLD_MINE_BLOCK_ID Ljava/lang/String; FIELD field_29908 NEW_MINE_BLOCK_ID Ljava/lang/String; FIELD field_29909 CUSTOM Ljava/lang/String; + FIELD field_45099 SKIPPED_STATS Ljava/util/Set; FIELD field_5735 RENAMED_ENTITIES Ljava/util/Map; FIELD field_5736 RENAMED_ENTITY_STATS Ljava/util/Map; FIELD field_5737 RENAMED_GENERAL_STATS Ljava/util/Map; FIELD field_5738 RENAMED_ITEM_STATS Ljava/util/Map; - FIELD field_5739 SKIP Ljava/util/Set; + FIELD field_5739 REMOVED_STATS Ljava/util/Set; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType METHOD method_5172 getItem (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id METHOD method_5173 getBlock (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id + METHOD method_52496 makeFirstRoundRule ()Lcom/mojang/datafixers/TypeRewriteRule; + METHOD method_52500 rename (Ljava/lang/String;)Lnet/minecraft/class_1214$class_8628; + ARG 0 old + METHOD method_52501 makeSecondRoundRule ()Lcom/mojang/datafixers/TypeRewriteRule; + METHOD method_52505 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 criteriaName + CLASS class_8628 Stat diff --git a/mappings/net/minecraft/datafixer/fix/UpdateSignTextFormatFix.mapping b/mappings/net/minecraft/datafixer/fix/UpdateSignTextFormatFix.mapping index dd96cf5bb9..fe9f22afa3 100644 --- a/mappings/net/minecraft/datafixer/fix/UpdateSignTextFormatFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/UpdateSignTextFormatFix.mapping @@ -1,7 +1,24 @@ CLASS net/minecraft/class_8221 net/minecraft/datafixer/fix/UpdateSignTextFormatFix + FIELD field_45085 FILTERED_CORRECT Ljava/lang/String; + FIELD field_45086 DEFAULT_COLOR Ljava/lang/String; + FIELD field_45087 EMPTY_TEXT_JSON Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;)V ARG 1 outputSchema ARG 2 name ARG 3 blockEntityId METHOD method_49760 updateSignTextFormat (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - ARG 0 dynamic + ARG 0 signData + METHOD method_52469 streamKeys (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Ljava/util/stream/Stream; + ARG 0 signData + ARG 1 prefix + METHOD method_52470 (Lcom/mojang/serialization/Dynamic;Ljava/util/Optional;)Lcom/mojang/serialization/Dynamic; + ARG 1 text + METHOD method_52471 (Ljava/util/List;Ljava/util/Optional;J)Lcom/mojang/serialization/Dynamic; + ARG 1 message + ARG 2 index + METHOD method_52472 updateFront (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 signData + METHOD method_52473 updateBack (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 signData + METHOD method_52474 emptySignData (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 signData diff --git a/mappings/net/minecraft/datafixer/schema/Schema1451v6.mapping b/mappings/net/minecraft/datafixer/schema/Schema1451v6.mapping index 2b8d6b2f9a..edb1ab1339 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema1451v6.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema1451v6.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_1236 net/minecraft/datafixer/schema/Schema1451v6 FIELD field_34013 SPECIAL_TYPE Ljava/lang/String; METHOD method_37389 (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; ARG 0 schema + METHOD method_52506 toDotSeparated (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V ARG 1 schema ARG 2 entityTypes diff --git a/mappings/net/minecraft/scoreboard/Scoreboard.mapping b/mappings/net/minecraft/scoreboard/Scoreboard.mapping index b058c4ded0..dbeee15c91 100644 --- a/mappings/net/minecraft/scoreboard/Scoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/Scoreboard.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 1 playerName ARG 2 team METHOD method_1158 setObjectiveSlot (Lnet/minecraft/class_8646;Lnet/minecraft/class_266;)V + ARG 1 slot ARG 2 objective METHOD method_1159 getTeams ()Ljava/util/Collection; METHOD method_1160 updateScoreboardTeamAndPlayers (Lnet/minecraft/class_268;)V @@ -80,6 +81,7 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard METHOD method_1188 readNbt (Lnet/minecraft/class_2499;)V ARG 1 list METHOD method_1189 getObjectiveForSlot (Lnet/minecraft/class_8646;)Lnet/minecraft/class_266; + ARG 1 slot METHOD method_1190 updatePlayerScore (Ljava/lang/String;Lnet/minecraft/class_266;)V ARG 1 playerName ARG 2 objective diff --git a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping index b30a458c61..7ef47d2b40 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_273 net/minecraft/scoreboard/ScoreboardState FIELD field_27936 scoreboard Lnet/minecraft/class_269; FIELD field_31893 SCOREBOARD_KEY Ljava/lang/String; + FIELD field_45181 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_269;)V ARG 1 scoreboard METHOD method_1215 readTeamPlayersNbt (Lnet/minecraft/class_268;Lnet/minecraft/class_2499;)V diff --git a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping index 36d74e972f..eebd98ab9a 100644 --- a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping @@ -20,4 +20,5 @@ CLASS net/minecraft/class_2995 net/minecraft/scoreboard/ServerScoreboard METHOD method_32704 stateFromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_273; ARG 1 nbt METHOD method_32705 createState ()Lnet/minecraft/class_273; + METHOD method_52297 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; CLASS class_2996 UpdateMode diff --git a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping index 80968f0b13..a9c2a5b073 100644 --- a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping +++ b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantmentScreenHandler + FIELD field_45143 EMPTY_LAPIS_SLOT_TEXTURE Lnet/minecraft/class_2960; FIELD field_7808 enchantmentPower [I FIELD field_7809 inventory Lnet/minecraft/class_1263; FIELD field_7810 enchantmentLevel [I diff --git a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping index 1a213e4514..f9cf19baf4 100644 --- a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping @@ -35,6 +35,10 @@ CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler METHOD method_48396 (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_51307 getInputStacks ()Ljava/util/List; + METHOD method_51713 (Lnet/minecraft/class_1799;Lnet/minecraft/class_8059;)Z + ARG 1 recipe + METHOD method_51714 (Lnet/minecraft/class_1799;Lnet/minecraft/class_8059;)Z + ARG 1 recipe METHOD method_52562 (Lnet/minecraft/class_1799;Lnet/minecraft/class_8059;)Ljava/util/stream/IntStream; ARG 1 recipe METHOD method_52563 getQuickMoveSlot (Lnet/minecraft/class_1799;)Ljava/util/OptionalInt; diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index a42ef9927b..7f8ea652e3 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -36,10 +36,10 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana COMMENT Executes a function. COMMENT COMMENT

This is same as calling {@link #execute(CommandFunction, ServerCommandSource, - COMMENT Tracer) execute(function, source, null)}. + COMMENT Tracer, NbtCompound) execute(function, source, null, null)}. COMMENT COMMENT @return the command output value - COMMENT @see #execute(CommandFunction, ServerCommandSource, Tracer) + COMMENT @see #execute(CommandFunction, ServerCommandSource, Tracer, NbtCompound) ARG 1 function COMMENT the function ARG 2 source @@ -110,7 +110,7 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana ARG 2 tracer METHOD method_36343 recursiveRun (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)V COMMENT Handles a recursive case in {@link CommandFunctionManager#execute(CommandFunction, - COMMENT ServerCommandSource, CommandFunctionManager.Tracer)}. + COMMENT ServerCommandSource, CommandFunctionManager.Tracer, NbtCompound)}. COMMENT COMMENT

This effectively swaps an entry with a command element with {@code /function} COMMENT command at the head of the deque with another entry with a function element @@ -123,7 +123,7 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana ARG 1 message METHOD method_36346 run (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)I COMMENT Handles a new case in {@link CommandFunctionManager#execute(CommandFunction, - COMMENT ServerCommandSource, CommandFunctionManager.Tracer)}. + COMMENT ServerCommandSource, CommandFunctionManager.Tracer, NbtCompound)}. COMMENT COMMENT @return a value for the command result ARG 1 function diff --git a/mappings/net/minecraft/util/Colors.mapping b/mappings/net/minecraft/util/Colors.mapping index 86d7dd5b1a..0bd2870428 100644 --- a/mappings/net/minecraft/util/Colors.mapping +++ b/mappings/net/minecraft/util/Colors.mapping @@ -7,4 +7,6 @@ CLASS net/minecraft/class_8012 net/minecraft/util/Colors FIELD field_42974 BLACK I COMMENT Represents the color black, {@code 0xFF000000}. FIELD field_44941 GRAY I - COMMENT Represents the color gray, {@code 0xFFA0A0A0}. + COMMENT Represents the color gray, {@code 0xFF808080}. + FIELD field_45073 LIGHT_GRAY I + COMMENT Represents the color light gray, {@code 0xFFA0A0A0}. diff --git a/mappings/net/minecraft/util/collection/ArrayListDeque.mapping b/mappings/net/minecraft/util/collection/ArrayListDeque.mapping new file mode 100644 index 0000000000..5509936bf6 --- /dev/null +++ b/mappings/net/minecraft/util/collection/ArrayListDeque.mapping @@ -0,0 +1,55 @@ +CLASS net/minecraft/class_8623 net/minecraft/util/collection/ArrayListDeque + FIELD field_45067 MISSING I + FIELD field_45068 array [Ljava/lang/Object; + FIELD field_45069 startIndex I + FIELD field_45070 size I + METHOD (I)V + ARG 1 size + METHOD add (ILjava/lang/Object;)V + ARG 1 index + ARG 2 value + METHOD addFirst (Ljava/lang/Object;)V + ARG 1 value + METHOD addLast (Ljava/lang/Object;)V + ARG 1 value + METHOD forEach (Ljava/util/function/Consumer;)V + ARG 1 consumer + METHOD get (I)Ljava/lang/Object; + ARG 1 index + METHOD method_52450 getArrayLength ()I + METHOD method_52451 wrap (I)I + ARG 1 index + METHOD method_52452 checkBounds (II)V + ARG 0 start + ARG 1 end + METHOD method_52453 copyTo ([Ljava/lang/Object;I)V + ARG 1 array + ARG 2 size + METHOD method_52454 enlarge ()V + METHOD method_52455 checkBounds (I)V + ARG 1 index + METHOD method_52456 getRaw (I)Ljava/lang/Object; + ARG 1 index + METHOD offer (Ljava/lang/Object;)Z + ARG 1 value + METHOD offerFirst (Ljava/lang/Object;)Z + ARG 1 value + METHOD offerLast (Ljava/lang/Object;)Z + ARG 1 value + METHOD push (Ljava/lang/Object;)V + ARG 1 value + METHOD remove (I)Ljava/lang/Object; + ARG 1 index + METHOD removeFirstOccurrence (Ljava/lang/Object;)Z + ARG 1 value + METHOD removeIf (Ljava/util/function/Predicate;)Z + ARG 1 predicate + METHOD removeLastOccurrence (Ljava/lang/Object;)Z + ARG 1 value + METHOD replaceAll (Ljava/util/function/UnaryOperator;)V + ARG 1 mapper + METHOD set (ILjava/lang/Object;)Ljava/lang/Object; + ARG 1 index + ARG 2 value + CLASS class_8624 IteratorImpl + FIELD field_45072 currentIndex I diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 3294c3e8f3..40a0e68892 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs FIELD field_40723 VECTOR_3F Lcom/mojang/serialization/Codec; FIELD field_40724 BIT_SET Lcom/mojang/serialization/Codec; FIELD field_40725 GAME_PROFILE_PROPERTY_MAP Lcom/mojang/serialization/Codec; - FIELD field_40726 GAME_PROFILE Lcom/mojang/serialization/Codec; + FIELD field_40726 GAME_PROFILE_WITH_PROPERTIES Lcom/mojang/serialization/Codec; FIELD field_40727 GAME_PROFILE_PROPERTY Lcom/mojang/serialization/Codec; FIELD field_41759 NON_EMPTY_STRING Lcom/mojang/serialization/Codec; FIELD field_42265 QUATERNIONF Lcom/mojang/serialization/Codec; @@ -28,6 +28,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs FIELD field_43173 STRINGIFIED_TEXT Lcom/mojang/serialization/Codec; FIELD field_44703 CODEPOINT Lcom/mojang/serialization/Codec; FIELD field_45075 IDENTIFIER_PATH Lcom/mojang/serialization/Codec; + FIELD field_45076 GAME_PROFILE Lcom/mojang/serialization/MapCodec; METHOD method_33817 xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; COMMENT Returns an exclusive-or codec for {@link Either} instances. COMMENT @@ -238,8 +239,29 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs METHOD method_51699 validate (Lcom/mojang/serialization/MapCodec;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec; ARG 0 codec ARG 1 validator + METHOD method_52457 (Lcom/mojang/datafixers/util/Either;)Ljava/lang/Object; + ARG 0 either + METHOD method_52458 either (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 serialized + ARG 1 alternative + ARG 2 alternativeMapper + METHOD method_52459 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_52460 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 path + METHOD method_52461 (Ljava/util/function/Function;Lcom/mojang/datafixers/util/Either;)Ljava/lang/Object; + ARG 1 either + METHOD method_52462 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_52463 (Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 o + METHOD method_52465 either (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 a + ARG 1 b + METHOD method_52466 (Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 o + METHOD method_52467 (Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 o CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops diff --git a/mappings/net/minecraft/util/dynamic/Range.mapping b/mappings/net/minecraft/util/dynamic/Range.mapping index 7a6d7e5159..7142aea2f1 100644 --- a/mappings/net/minecraft/util/dynamic/Range.mapping +++ b/mappings/net/minecraft/util/dynamic/Range.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_6497 net/minecraft/util/dynamic/Range FIELD comp_1 minInclusive Ljava/lang/Comparable; FIELD comp_2 maxInclusive Ljava/lang/Comparable; FIELD field_34390 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/lang/Comparable;)V + ARG 1 value METHOD (Ljava/lang/Comparable;Ljava/lang/Comparable;)V ARG 1 minInclusive ARG 2 maxInclusive diff --git a/mappings/net/minecraft/util/math/ChunkPos.mapping b/mappings/net/minecraft/util/math/ChunkPos.mapping index ba157d290b..d1445cb2b5 100644 --- a/mappings/net/minecraft/util/math/ChunkPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkPos.mapping @@ -56,6 +56,13 @@ CLASS net/minecraft/class_1923 net/minecraft/util/math/ChunkPos METHOD method_42307 hashCode (II)I ARG 0 x ARG 1 z + METHOD method_52566 getSquaredDistance (Lnet/minecraft/class_1923;)I + ARG 1 pos + METHOD method_52567 getSquaredDistance (J)I + ARG 1 pos + METHOD method_52568 getSquaredDistance (II)I + ARG 1 x + ARG 2 z METHOD method_8323 getStartPos ()Lnet/minecraft/class_2338; METHOD method_8324 toLong ()J COMMENT {@return the chunk position serialized as {@code long}} diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index bb87d34d9e..4e0c0c0aa1 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -495,3 +495,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 delta ARG 1 start ARG 2 end + METHOD method_52468 lerpAngleDegrees (DDD)D + ARG 0 delta + ARG 2 start + ARG 4 end diff --git a/mappings/net/minecraft/util/math/random/RandomSequence.mapping b/mappings/net/minecraft/util/math/random/RandomSequence.mapping index bdfc277329..b4f59b79ea 100644 --- a/mappings/net/minecraft/util/math/random/RandomSequence.mapping +++ b/mappings/net/minecraft/util/math/random/RandomSequence.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_8564 net/minecraft/util/math/random/RandomSequence FIELD field_44859 CODEC Lcom/mojang/serialization/Codec; FIELD field_44860 source Lnet/minecraft/class_6677; + METHOD (JLjava/util/Optional;)V + ARG 1 seed + ARG 3 id METHOD (JLnet/minecraft/class_2960;)V ARG 1 seed ARG 3 id @@ -15,3 +18,4 @@ CLASS net/minecraft/class_8564 net/minecraft/util/math/random/RandomSequence ARG 0 id METHOD method_52189 createSource (JLjava/util/Optional;)Lnet/minecraft/class_6677; ARG 0 seed + ARG 2 id diff --git a/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping b/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping index 5cfb11d3e4..16782e1faa 100644 --- a/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping +++ b/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping @@ -20,15 +20,21 @@ CLASS net/minecraft/class_8565 net/minecraft/util/math/random/RandomSequencesSta ARG 1 salt ARG 2 includeWorldSeed ARG 3 includeSequenceId + METHOD method_52511 getPersistentStateType (J)Lnet/minecraft/class_18$class_8645; + ARG 0 seed METHOD method_52512 reset (Lnet/minecraft/class_2960;IZZ)V ARG 1 id ARG 2 salt ARG 3 includeWorldSeed ARG 4 includeSequenceId + METHOD method_52513 forEachSequence (Ljava/util/function/BiConsumer;)V + ARG 1 consumer METHOD method_52514 getBooleanFromNbtOrFallback (Lnet/minecraft/class_2487;Ljava/lang/String;Z)Z ARG 0 nbt ARG 1 key ARG 2 fallback + METHOD method_52516 (JLnet/minecraft/class_2487;)Lnet/minecraft/class_8565; + ARG 2 nbt METHOD method_52517 reset (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_52518 createSequence (Lnet/minecraft/class_2960;IZZ)Lnet/minecraft/class_8564; diff --git a/mappings/net/minecraft/util/path/SymlinkFinder.mapping b/mappings/net/minecraft/util/path/SymlinkFinder.mapping index 02aaea9842..a7d2103b46 100644 --- a/mappings/net/minecraft/util/path/SymlinkFinder.mapping +++ b/mappings/net/minecraft/util/path/SymlinkFinder.mapping @@ -1,11 +1,18 @@ CLASS net/minecraft/class_8580 net/minecraft/util/path/SymlinkFinder FIELD field_44955 matcher Ljava/nio/file/PathMatcher; + METHOD (Ljava/nio/file/PathMatcher;)V + ARG 1 matcher METHOD method_52242 validate (Ljava/nio/file/Path;Ljava/util/List;)V ARG 1 path ARG 2 results METHOD method_52243 collect (Ljava/nio/file/Path;Z)Ljava/util/List; ARG 1 path ARG 2 resolveSymlink + METHOD method_52618 validate (Ljava/nio/file/Path;)Ljava/util/List; + ARG 1 path + METHOD method_52619 validateRecursively (Ljava/nio/file/Path;Ljava/util/List;)V + ARG 1 path + ARG 2 results CLASS 1 METHOD method_52246 validate (Ljava/nio/file/Path;Ljava/nio/file/attribute/BasicFileAttributes;)V ARG 1 path diff --git a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping index ae33b2049d..0965e9538a 100644 --- a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping @@ -11,10 +11,12 @@ CLASS net/minecraft/class_6611 net/minecraft/util/profiling/jfr/FlightProfiler ARG 2 world ARG 3 targetStatus METHOD method_38656 onPacketReceived (Lnet/minecraft/class_2539;ILjava/net/SocketAddress;I)V + ARG 1 state ARG 2 packetId ARG 3 remoteAddress ARG 4 bytes METHOD method_38657 onPacketSent (Lnet/minecraft/class_2539;ILjava/net/SocketAddress;I)V + ARG 1 state ARG 2 packetId ARG 3 remoteAddress ARG 4 bytes diff --git a/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping index 277ea5bddd..6cc1b19d78 100644 --- a/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_6509 net/minecraft/util/profiling/jfr/event/PacketEvent METHOD (Ljava/lang/String;ILjava/net/SocketAddress;I)V + ARG 1 protocolId ARG 2 packetId ARG 3 remoteAddress ARG 4 bytes diff --git a/mappings/net/minecraft/village/raid/RaidManager.mapping b/mappings/net/minecraft/village/raid/RaidManager.mapping index 06f194c6be..b95887d696 100644 --- a/mappings/net/minecraft/village/raid/RaidManager.mapping +++ b/mappings/net/minecraft/village/raid/RaidManager.mapping @@ -25,6 +25,10 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager ARG 2 searchDistance METHOD method_44012 (Lnet/minecraft/class_6880;)Z ARG 0 poiType + METHOD method_52559 getPersistentStateType (Lnet/minecraft/class_3218;)Lnet/minecraft/class_18$class_8645; + ARG 0 world + METHOD method_52561 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767; + ARG 1 nbt METHOD method_77 fromNbt (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767; ARG 0 world ARG 1 nbt diff --git a/mappings/net/minecraft/world/ChunkUpdateState.mapping b/mappings/net/minecraft/world/ChunkUpdateState.mapping index ec8dc01423..627ab0222c 100644 --- a/mappings/net/minecraft/world/ChunkUpdateState.mapping +++ b/mappings/net/minecraft/world/ChunkUpdateState.mapping @@ -17,3 +17,4 @@ CLASS net/minecraft/class_3440 net/minecraft/world/ChunkUpdateState METHOD method_14898 getAll ()Lit/unimi/dsi/fastutil/longs/LongSet; METHOD method_32358 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3440; ARG 0 nbt + METHOD method_52601 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; diff --git a/mappings/net/minecraft/world/ForcedChunkState.mapping b/mappings/net/minecraft/world/ForcedChunkState.mapping index a2cf68cb48..629d859b73 100644 --- a/mappings/net/minecraft/world/ForcedChunkState.mapping +++ b/mappings/net/minecraft/world/ForcedChunkState.mapping @@ -6,4 +6,5 @@ CLASS net/minecraft/class_1932 net/minecraft/world/ForcedChunkState ARG 1 chunks METHOD method_32350 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1932; ARG 0 nbt + METHOD method_52570 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; METHOD method_8375 getChunks ()Lit/unimi/dsi/fastutil/longs/LongSet; diff --git a/mappings/net/minecraft/world/IdCountsState.mapping b/mappings/net/minecraft/world/IdCountsState.mapping index a85691a6f4..37f06b5e4b 100644 --- a/mappings/net/minecraft/world/IdCountsState.mapping +++ b/mappings/net/minecraft/world/IdCountsState.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_3978 net/minecraft/world/IdCountsState METHOD method_17920 getNextMapId ()I METHOD method_32360 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3978; ARG 0 nbt + METHOD method_52610 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index 11a2f2d706..5d43b17af6 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -144,7 +144,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT {@link net.minecraft.block.CarvedPumpkinBlock#trySpawnEntity(net.minecraft.world.World, net.minecraft.util.math.BlockPos) CarvedPumpkinBlock#trySpawnEntity}, COMMENT {@link net.minecraft.entity.ai.goal.EatGrassGoal#tick() EatGrassGoal#tick}, COMMENT {@link net.minecraft.entity.passive.FoxEntity#tick() FoxEntity#tick}, - COMMENT {@link net.minecraft.block.PowderSnowBlock#tryDrainFluid(net.minecraft.world.WorldAccess, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) PowderSnowBlock#tryDrainFluid}, + COMMENT {@link net.minecraft.block.PowderSnowBlock#tryDrainFluid(net.minecraft.entity.player.PlayerEntity, net.minecraft.world.WorldAccess, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) PowderSnowBlock#tryDrainFluid}, COMMENT {@link net.minecraft.entity.passive.RabbitEntity.EatCarrotCropGoal#tick() RabbitEntity.EatCarrotCropGoal#tick}, COMMENT {@link net.minecraft.block.SpongeBlock#update(net.minecraft.world.World, net.minecraft.util.math.BlockPos) SpongeBlock#update}, COMMENT {@link net.minecraft.block.TurtleEggBlock#breakEgg(net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) TurtleEggBlock#breakEgg}, diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 5e18340d4f..72e614685d 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -79,6 +79,8 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_52237 getSymlinkFinder ()Lnet/minecraft/class_8580; METHOD method_52238 resolve (Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 name + METHOD method_52616 (Ljava/nio/file/Path;)Z + ARG 0 path CLASS class_5143 Session FIELD field_23767 lock Lnet/minecraft/class_5125; FIELD field_23768 directory Lnet/minecraft/class_32$class_7411; @@ -113,6 +115,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_27427 createSaveHandler ()Lnet/minecraft/class_29; METHOD method_29584 getLevelSummary ()Lnet/minecraft/class_34; METHOD method_29585 getDataPackSettings ()Lnet/minecraft/class_7712; + METHOD method_52617 getLevelStorage ()Lnet/minecraft/class_32; CLASS 1 METHOD postVisitDirectory (Ljava/lang/Object;Ljava/io/IOException;)Ljava/nio/file/FileVisitResult; ARG 1 path