From 6b0fbc14a53c3fdf7f134ad073b9d41f88d9616f Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Tue, 24 May 2022 16:56:17 +0900 Subject: [PATCH] 1.19-pre1 stuff (#3167) * 1.19-pre1 stuff * More 1.19-pre1 stuff * Revert StructureManager, doing in other PR * Finish 1.19-pre1 mapping Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../screen/world/LevelScreenProvider.mapping | 5 +++++ .../screen/world/MoreOptionsDialog.mapping | 1 + .../screen/RealmsClientOutdatedScreen.mapping | 2 ++ mappings/net/minecraft/data/DataCache.mapping | 2 ++ .../net/minecraft/data/DataProvider.mapping | 11 +++++++++- .../net/minecraft/data/DataWriter.mapping | 6 ++++++ .../net/minecraft/data/SnbtProvider.mapping | 4 ++++ .../minecraft/data/dev/NbtProvider.mapping | 9 ++++++++ .../datafixer/fix/ItemNbtFix.mapping | 5 +++++ .../datafixer/fix/PointOfInterestFix.mapping | 16 ++++++++++++++ .../fix/PointOfInterestRemoveFix.mapping | 1 + .../fix/RemoveFilteredSignTextFix.mapping | 2 ++ .../datafixer/fix/RenameVariantsFix.mapping | 4 ++++ .../minecraft/entity/AnimationState.mapping | 2 ++ .../entity/ai/WardenAngerManager.mapping | 12 +++++++++++ .../minecraft/entity/mob/WardenEntity.mapping | 4 ++++ .../entity/passive/GoatEntity.mapping | 2 ++ .../net/minecraft/screen/slot/Slot.mapping | 6 ++++++ .../server/command/PlaceCommand.mapping | 21 +++++++++++++++++++ mappings/net/minecraft/util/Util.mapping | 10 +++++++++ .../net/minecraft/util/dynamic/Codecs.mapping | 20 ++++++++++++++++++ .../util/dynamic/RegistryElementCodec.mapping | 2 ++ .../util/registry/RegistryFixedCodec.mapping | 4 ++++ mappings/net/minecraft/world/World.mapping | 1 + .../net/minecraft/world/biome/Biome.mapping | 3 +++ .../world/biome/source/BiomeSource.mapping | 1 + .../source/MultiNoiseBiomeSource.mapping | 19 +++++++++++++++++ .../biome/source/TheEndBiomeSource.mapping | 2 ++ .../net/minecraft/world/chunk/Chunk.mapping | 7 +++++++ .../world/dimension/DimensionType.mapping | 2 ++ .../event/listener/VibrationListener.mapping | 1 + .../gen/chunk/FlatChunkGenerator.mapping | 2 ++ .../chunk/FlatChunkGeneratorConfig.mapping | 2 ++ 33 files changed, 190 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/client/gui/screen/world/LevelScreenProvider.mapping b/mappings/net/minecraft/client/gui/screen/world/LevelScreenProvider.mapping index 38b0183216..2bfb037eea 100644 --- a/mappings/net/minecraft/client/gui/screen/world/LevelScreenProvider.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/LevelScreenProvider.mapping @@ -10,6 +10,11 @@ CLASS net/minecraft/class_5293 net/minecraft/client/gui/screen/world/LevelScreen ARG 2 generatorOptions METHOD method_41858 (Lnet/minecraft/class_525;Lnet/minecraft/class_3232;)V ARG 1 config + METHOD method_41859 (Lnet/minecraft/class_525;Lnet/minecraft/class_7193;)Lnet/minecraft/class_437; + ARG 0 parent + ARG 1 generatorOptionsHolder + METHOD method_41860 (Lnet/minecraft/class_525;Lnet/minecraft/class_6880;)V + ARG 1 biomeEntry METHOD method_41861 createModifier (Lnet/minecraft/class_6880;)Lnet/minecraft/class_7193$class_7195; ARG 0 biomeEntry METHOD method_41862 (Lnet/minecraft/class_6880;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_5285;)Lnet/minecraft/class_5285; diff --git a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping index 7c95367ddf..e8f400bac6 100644 --- a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping @@ -90,3 +90,4 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions ARG 0 presetEntry METHOD method_41883 (Lnet/minecraft/class_5321;)Z ARG 0 key + METHOD method_41884 getGeneratorOptionsHolder ()Lnet/minecraft/class_7193; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen.mapping index c0898bc476..b9beb51e71 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsClientOutdatedScreen.mapping @@ -2,7 +2,9 @@ CLASS net/minecraft/class_4387 net/minecraft/client/realms/gui/screen/RealmsClie FIELD field_19787 parent Lnet/minecraft/class_437; FIELD field_26477 INCOMPATIBLE_TITLE Lnet/minecraft/class_2561; FIELD field_26478 INCOMPATIBLE_LINES [Lnet/minecraft/class_2561; + FIELD field_39419 INCOMPATIBLE_LINES_UNSTABLE [Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent METHOD method_25132 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_44255 getLines ()[Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/data/DataCache.mapping b/mappings/net/minecraft/data/DataCache.mapping index 1d72889ef9..862f3d1403 100644 --- a/mappings/net/minecraft/data/DataCache.mapping +++ b/mappings/net/minecraft/data/DataCache.mapping @@ -40,6 +40,7 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache ARG 2 cachedData METHOD method_43355 isCacheInvalid (Ljava/nio/file/Path;Lcom/google/common/hash/HashCode;)Z ARG 1 path + ARG 2 hashCode CLASS class_7405 CachedData METHOD (Ljava/lang/String;)V ARG 1 version @@ -48,6 +49,7 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache ARG 1 path METHOD method_43358 put (Ljava/nio/file/Path;Lcom/google/common/hash/HashCode;)V ARG 1 path + ARG 2 hashCode METHOD method_43359 parseCache (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2408$class_7405; ARG 0 root ARG 1 dataProviderPath diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index a64331e805..09f571be57 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -1,5 +1,14 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider + FIELD field_39212 JSON_KEY_SORT_ORDER Ljava/util/function/ToIntFunction; + FIELD field_39213 JSON_KEY_SORTING_COMPARATOR Ljava/util/Comparator; METHOD method_10319 run (Lnet/minecraft/class_7403;)V - ARG 1 cache + ARG 1 writer METHOD method_10320 writeToPath (Lnet/minecraft/class_7403;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)V + ARG 0 writer + ARG 1 json + ARG 2 path METHOD method_10321 getName ()Ljava/lang/String; + METHOD method_43808 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V + ARG 0 map + METHOD method_43809 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 key diff --git a/mappings/net/minecraft/data/DataWriter.mapping b/mappings/net/minecraft/data/DataWriter.mapping index b27563a9a8..7fce34cb72 100644 --- a/mappings/net/minecraft/data/DataWriter.mapping +++ b/mappings/net/minecraft/data/DataWriter.mapping @@ -1,4 +1,10 @@ CLASS net/minecraft/class_7403 net/minecraft/data/DataWriter + FIELD field_39439 UNCACHED Lnet/minecraft/class_7403; METHOD method_43346 write (Ljava/nio/file/Path;[BLcom/google/common/hash/HashCode;)V ARG 1 path ARG 2 data + ARG 3 hashCode + METHOD method_44300 (Ljava/nio/file/Path;[BLcom/google/common/hash/HashCode;)V + ARG 0 path + ARG 1 data + ARG 2 hashCode diff --git a/mappings/net/minecraft/data/SnbtProvider.mapping b/mappings/net/minecraft/data/SnbtProvider.mapping index 0c6613770d..b5aaaa547e 100644 --- a/mappings/net/minecraft/data/SnbtProvider.mapping +++ b/mappings/net/minecraft/data/SnbtProvider.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider ARG 1 cache ARG 2 data ARG 3 root + METHOD method_10499 (Ljava/nio/file/Path;)Z + ARG 0 path METHOD method_10500 getFileName (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/lang/String; ARG 1 root ARG 2 file @@ -20,6 +22,8 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider METHOD method_22144 toCompressedNbt (Ljava/nio/file/Path;Ljava/lang/String;)Lnet/minecraft/class_2463$class_4511; ARG 1 path ARG 2 name + METHOD method_22145 (Ljava/util/List;Ljava/nio/file/Path;Ljava/nio/file/Path;)V + ARG 3 path CLASS class_4460 Tweaker METHOD method_21674 write (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 name diff --git a/mappings/net/minecraft/data/dev/NbtProvider.mapping b/mappings/net/minecraft/data/dev/NbtProvider.mapping index eba60e2dd1..6059c7abb2 100644 --- a/mappings/net/minecraft/data/dev/NbtProvider.mapping +++ b/mappings/net/minecraft/data/dev/NbtProvider.mapping @@ -4,9 +4,18 @@ CLASS net/minecraft/class_2461 net/minecraft/data/dev/NbtProvider METHOD (Lnet/minecraft/class_2403;)V ARG 1 root METHOD method_10493 convertNbtToSnbt (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Ljava/lang/String;Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 0 writer + ARG 1 inputPath + ARG 2 filename + ARG 3 outputPath + METHOD method_10494 (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/nio/file/Path;)V + ARG 4 path METHOD method_10495 (Ljava/nio/file/Path;)Z ARG 0 path METHOD method_10496 getLocation (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/lang/String; ARG 1 targetPath ARG 2 rootPath METHOD method_32234 writeTo (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 0 writer + ARG 1 path + ARG 2 content diff --git a/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping index 22c8fe686e..fe4f2b4ce1 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping @@ -6,3 +6,8 @@ CLASS net/minecraft/class_7505 net/minecraft/datafixer/fix/ItemNbtFix ARG 2 name ARG 3 itemIdPrecicate METHOD method_20445 fixNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic + METHOD method_44192 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 3 typed + METHOD method_44193 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 nbt diff --git a/mappings/net/minecraft/datafixer/fix/PointOfInterestFix.mapping b/mappings/net/minecraft/datafixer/fix/PointOfInterestFix.mapping index 33b6b9af02..d57b6fe576 100644 --- a/mappings/net/minecraft/datafixer/fix/PointOfInterestFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/PointOfInterestFix.mapping @@ -4,4 +4,20 @@ CLASS net/minecraft/class_4620 net/minecraft/datafixer/fix/PointOfInterestFix ARG 1 schema ARG 2 name METHOD method_23299 fixSections (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic + METHOD method_23302 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; + ARG 1 pair + METHOD method_23305 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; + ARG 1 pair + METHOD method_28243 (Lcom/mojang/serialization/DynamicOps;)Ljava/util/function/Function; + ARG 1 ops + METHOD method_28246 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 sections + METHOD method_44185 (Lcom/mojang/serialization/Dynamic;Ljava/util/stream/Stream;)Lcom/mojang/serialization/Dynamic; + ARG 2 dynamics + METHOD method_44186 update (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; + ARG 1 dynamics METHOD method_44187 fixRecords (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic + METHOD method_44188 fixRecord (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic diff --git a/mappings/net/minecraft/datafixer/fix/PointOfInterestRemoveFix.mapping b/mappings/net/minecraft/datafixer/fix/PointOfInterestRemoveFix.mapping index 476bd9546a..5f4a834a7d 100644 --- a/mappings/net/minecraft/datafixer/fix/PointOfInterestRemoveFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/PointOfInterestRemoveFix.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_7506 net/minecraft/datafixer/fix/PointOfInterestRemove ARG 2 name ARG 3 removePredicate METHOD method_44195 shouldKeepRecord (Lcom/mojang/serialization/Dynamic;)Z + ARG 1 dynamic diff --git a/mappings/net/minecraft/datafixer/fix/RemoveFilteredSignTextFix.mapping b/mappings/net/minecraft/datafixer/fix/RemoveFilteredSignTextFix.mapping index dd99207390..960d379a18 100644 --- a/mappings/net/minecraft/datafixer/fix/RemoveFilteredSignTextFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RemoveFilteredSignTextFix.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_7504 net/minecraft/datafixer/fix/RemoveFilteredSignTextFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 schema + METHOD method_44190 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 blockEntity diff --git a/mappings/net/minecraft/datafixer/fix/RenameVariantsFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameVariantsFix.mapping index 7fb98ccebb..3b7b36ea7f 100644 --- a/mappings/net/minecraft/datafixer/fix/RenameVariantsFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RenameVariantsFix.mapping @@ -6,5 +6,9 @@ CLASS net/minecraft/class_7508 net/minecraft/datafixer/fix/RenameVariantsFix ARG 3 type ARG 4 choiceName ARG 5 oldToNewNames + METHOD method_44198 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic METHOD method_44199 (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; ARG 2 variantName + METHOD method_44200 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 variant diff --git a/mappings/net/minecraft/entity/AnimationState.mapping b/mappings/net/minecraft/entity/AnimationState.mapping index 9360a43ace..a2d8b107b9 100644 --- a/mappings/net/minecraft/entity/AnimationState.mapping +++ b/mappings/net/minecraft/entity/AnimationState.mapping @@ -3,9 +3,11 @@ CLASS net/minecraft/class_7094 net/minecraft/entity/AnimationState FIELD field_37418 updatedAt J FIELD field_39112 timeRunning J METHOD method_41322 start (I)V + ARG 1 age METHOD method_41323 run (Ljava/util/function/Consumer;)V ARG 1 consumer METHOD method_41324 startIfNotRunning (I)V + ARG 1 age METHOD method_41325 stop ()V METHOD method_41327 isRunning ()Z METHOD method_43686 update (FF)V diff --git a/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping b/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping index ee1ad6368c..9f12466b71 100644 --- a/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping +++ b/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping @@ -33,9 +33,21 @@ CLASS net/minecraft/class_7254 net/minecraft/entity/ai/WardenAngerManager ARG 0 suspect METHOD method_43104 updateSuspectsMap (Lnet/minecraft/class_3218;)V ARG 1 world + METHOD method_43105 (Lcom/mojang/datafixers/util/Pair;)V + ARG 1 suspect + METHOD method_43106 (Lit/unimi/dsi/fastutil/objects/Object2IntMap$Entry;)Lcom/mojang/datafixers/util/Pair; + ARG 0 suspect + METHOD method_43107 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_43108 getSuspects ()Ljava/util/List; METHOD method_43109 (Lnet/minecraft/class_1297;)Lcom/mojang/datafixers/util/Pair; ARG 1 suspect + METHOD method_43692 createCodec (Ljava/util/function/Predicate;)Lcom/mojang/serialization/Codec; + ARG 0 suspectPredicate + METHOD method_43693 (Ljava/util/function/Predicate;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance + METHOD method_43694 (Ljava/util/function/Predicate;Ljava/util/List;)Lnet/minecraft/class_7254; + ARG 1 suspectUuidsToAngerLevel METHOD method_43998 updatePrimeAnger ()V CLASS class_7379 SuspectComparator METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I diff --git a/mappings/net/minecraft/entity/mob/WardenEntity.mapping b/mappings/net/minecraft/entity/mob/WardenEntity.mapping index c35ae89381..37910a4a0b 100644 --- a/mappings/net/minecraft/entity/mob/WardenEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WardenEntity.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity FIELD field_38137 attackingAnimationState Lnet/minecraft/class_7094; FIELD field_38141 angerManager Lnet/minecraft/class_7254; FIELD field_38148 ANGER Lnet/minecraft/class_2940; + FIELD field_38162 tendrilPitch I + FIELD field_38163 lastTendrilPitch I + FIELD field_38164 heartbeatCooldown I + FIELD field_38165 lastHeartbeatCooldown I FIELD field_38166 gameEventHandler Lnet/minecraft/class_5715; FIELD field_38168 roaringAnimationState Lnet/minecraft/class_7094; FIELD field_38169 sniffingAnimationState Lnet/minecraft/class_7094; diff --git a/mappings/net/minecraft/entity/passive/GoatEntity.mapping b/mappings/net/minecraft/entity/passive/GoatEntity.mapping index 5e19134541..a8bb02c0d0 100644 --- a/mappings/net/minecraft/entity/passive/GoatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/GoatEntity.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_6053 net/minecraft/entity/passive/GoatEntity FIELD field_30403 SCREAMING_CHANCE D FIELD field_33486 SCREAMING Lnet/minecraft/class_2940; FIELD field_33487 preparingRam Z + FIELD field_33488 headPitch I FIELD field_34022 DEFAULT_ATTACK_DAMAGE I FIELD field_34023 BABY_ATTACK_DAMAGE I FIELD field_39047 LEFT_HORN Lnet/minecraft/class_2940; @@ -27,3 +28,4 @@ CLASS net/minecraft/class_6053 net/minecraft/entity/passive/GoatEntity METHOD method_43540 dropHorn ()Z METHOD method_43541 addHorns ()V METHOD method_43542 removeHorns ()V + METHOD method_43690 getGoatHornStack ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping index 5b703cced5..5a8e9ba493 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -27,6 +27,10 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot METHOD method_34265 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 2 stack METHOD method_34266 getIndex ()I + METHOD method_44206 setStackNoCallbacks (Lnet/minecraft/class_1799;)V + COMMENT Sets the slot's stack to {@code stack} and marks the slot as dirty. Unlike + COMMENT {@link #setStack} subclasses may not override this method to perform additional operations. + ARG 1 stack METHOD method_7667 onTakeItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack @@ -41,6 +45,8 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot METHOD method_7672 onTake (I)V ARG 1 amount METHOD method_7673 setStack (Lnet/minecraft/class_1799;)V + COMMENT Sets the slot's stack to {@code stack} and marks the slot as dirty. Subclasses + COMMENT may override this method to perform additional operations. ARG 1 stack METHOD method_7674 canTakeItems (Lnet/minecraft/class_1657;)Z ARG 1 playerEntity diff --git a/mappings/net/minecraft/server/command/PlaceCommand.mapping b/mappings/net/minecraft/server/command/PlaceCommand.mapping index 115400356d..1686f4580f 100644 --- a/mappings/net/minecraft/server/command/PlaceCommand.mapping +++ b/mappings/net/minecraft/server/command/PlaceCommand.mapping @@ -25,19 +25,30 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceCommand ARG 0 world ARG 1 pos1 ARG 2 pos2 + METHOD method_43648 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context METHOD method_43649 (Lnet/minecraft/class_3449;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_1923;)V ARG 3 chunkPos METHOD method_43650 executePlaceJigsaw (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;Lnet/minecraft/class_2960;ILnet/minecraft/class_2338;)I ARG 0 source ARG 1 structurePool ARG 2 id + ARG 3 maxDepth ARG 4 pos METHOD method_43652 (Lnet/minecraft/class_5321;)Ljava/lang/String; ARG 0 key + METHOD method_43653 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context METHOD method_43654 executePlaceStructure (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;Lnet/minecraft/class_2338;)I ARG 0 source ARG 1 structureType ARG 2 pos + METHOD method_43655 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_43656 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_43918 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context METHOD method_43919 executePlaceTemplate (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;FI)I ARG 0 source ARG 1 id @@ -48,6 +59,16 @@ CLASS net/minecraft/class_6852 net/minecraft/server/command/PlaceCommand ARG 6 seed METHOD method_43920 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id + METHOD method_43921 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_43922 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_43923 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_43924 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_43925 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context METHOD method_44145 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 context ARG 1 builder diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index a0d135cbf8..872aa34e01 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -247,6 +247,16 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 0 value ARG 1 mapper ARG 2 other + METHOD method_44146 lastIndexGetter (Ljava/util/List;Ljava/util/function/IntFunction;)Ljava/util/function/ToIntFunction; + COMMENT {@return a function that, when given a value in {@code values}, returns the last + COMMENT index of the value in the list} + COMMENT + COMMENT @implNote Unlike {@link java.util.List#lastIndexOf}, the returned function will + COMMENT return {@code 0} when given values not in the passed list. + ARG 0 values + ARG 1 mapCreator + COMMENT a function that, when given the size of {@code values}, + COMMENT returns a map for storing the indices of the values METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 iterable ARG 1 object diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index c02d71ef33..18fb7b6a90 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs FIELD field_39042 INSTANT Lcom/mojang/serialization/Codec; FIELD field_39273 BASE_64 Lcom/mojang/serialization/Codec; FIELD field_39274 TAG_ENTRY_ID Lcom/mojang/serialization/Codec; + FIELD field_39395 OPTIONAL_OF_LONG_TO_OPTIONAL_LONG Ljava/util/function/Function; + FIELD field_39396 OPTIONAL_LONG_TO_OPTIONAL_OF_LONG Ljava/util/function/Function; 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 @@ -135,6 +137,24 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 codec METHOD method_43532 instant (Ljava/time/format/DateTimeFormatter;)Lcom/mojang/serialization/Codec; ARG 0 formatter + METHOD method_43533 (Ljava/time/format/DateTimeFormatter;Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 1 dateTimeString + METHOD method_43958 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5699$class_7476; + ARG 0 id + METHOD method_43959 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 tagEntry + METHOD method_43960 ([B)Ljava/lang/String; + ARG 0 data + METHOD method_43961 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5699$class_7476; + ARG 0 id + METHOD method_43962 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 encoded + METHOD method_44167 optionalLong (Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec; + ARG 0 codec + METHOD method_44168 (Ljava/util/Optional;)Ljava/util/OptionalLong; + ARG 0 optional + METHOD method_44169 (Ljava/util/OptionalLong;)Ljava/util/Optional; + ARG 0 optionalLong 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/RegistryElementCodec.mapping b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping index aec50ced74..b19d93b0d0 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping @@ -39,3 +39,5 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec ARG 2 key METHOD method_40394 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; ARG 0 pair + METHOD method_44140 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6880;)Lcom/mojang/datafixers/util/Pair; + ARG 1 entry diff --git a/mappings/net/minecraft/util/registry/RegistryFixedCodec.mapping b/mappings/net/minecraft/util/registry/RegistryFixedCodec.mapping index 79bd74ba74..446293665c 100644 --- a/mappings/net/minecraft/util/registry/RegistryFixedCodec.mapping +++ b/mappings/net/minecraft/util/registry/RegistryFixedCodec.mapping @@ -15,3 +15,7 @@ CLASS net/minecraft/class_6899 net/minecraft/util/registry/RegistryFixedCodec ARG 1 value METHOD method_40400 of (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6899; ARG 0 registry + METHOD method_44141 (Lcom/mojang/datafixers/util/Pair;Lnet/minecraft/class_6880;)Lcom/mojang/datafixers/util/Pair; + ARG 1 entry + METHOD method_44142 (Ljava/util/Optional;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; + ARG 2 pair diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 0870c12b4f..3e2147ce17 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -36,6 +36,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 properties ARG 2 registryRef ARG 3 dimension + ARG 4 profiler ARG 5 isClient ARG 6 debugWorld ARG 7 seed diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 48e120b954..a27a4b024e 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -80,6 +80,9 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_8713 getWaterFogColor ()I METHOD method_8715 getDownfall ()F METHOD method_8724 hasHighHumidity ()Z + CLASS 1 + METHOD rehash (I)V + ARG 1 n CLASS class_1960 Builder FIELD field_22042 specialEffects Lnet/minecraft/class_4763; FIELD field_26396 temperatureModifier Lnet/minecraft/class_1959$class_5484; diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index 83c1ea9354..c9cde62010 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -41,3 +41,4 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource ARG 2 y ARG 3 z ARG 4 radius + ARG 5 sampler diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping index 08ac89ba9a..ddc91836f5 100644 --- a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping @@ -9,11 +9,21 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS METHOD (Lnet/minecraft/class_6544$class_6547;Ljava/util/Optional;)V ARG 1 biomeEntries ARG 2 instance + METHOD method_28457 (Lnet/minecraft/class_4766;)Lcom/mojang/datafixers/util/Either; + ARG 0 biomeSource + METHOD method_28459 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_4766; + ARG 0 either METHOD method_31085 getInstance ()Ljava/util/Optional; METHOD method_38167 getBiomeAtPoint (Lnet/minecraft/class_6544$class_6553;)Lnet/minecraft/class_6880; ARG 1 point METHOD method_38168 matchesInstance (Lnet/minecraft/class_4766$class_5305;)Z ARG 1 instance + METHOD method_38170 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_38172 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance2 + METHOD method_38173 (Lnet/minecraft/class_4766;)Lnet/minecraft/class_6544$class_6547; + ARG 0 biomeSource CLASS class_5305 Preset FIELD field_24723 NETHER Lnet/minecraft/class_4766$class_5305; FIELD field_24724 BY_IDENTIFIER Ljava/util/Map; @@ -25,14 +35,23 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS ARG 2 biomeSourceFunction METHOD method_28469 getBiomeSource (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4766; ARG 1 biomeRegistry + METHOD method_31088 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6544$class_6547; + ARG 0 biomeRegistry + METHOD method_38175 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6544$class_6547; + ARG 0 biomeRegistry + METHOD method_38176 (Lcom/google/common/collect/ImmutableList$Builder;Lnet/minecraft/class_2378;Lcom/mojang/datafixers/util/Pair;)V + ARG 2 pair METHOD method_39531 getBiomeSource (Lnet/minecraft/class_4766$class_5502;Z)Lnet/minecraft/class_4766; ARG 1 instance ARG 2 useInstance METHOD method_39532 getBiomeSource (Lnet/minecraft/class_2378;Z)Lnet/minecraft/class_4766; ARG 1 biomeRegistry ARG 2 useInstance + METHOD method_41415 streamPresets ()Ljava/util/stream/Stream; METHOD method_41416 (Lnet/minecraft/class_6880;)Ljava/util/stream/Stream; ARG 0 entry + METHOD method_41417 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair; + ARG 0 entry METHOD method_41418 stream ()Ljava/util/stream/Stream; CLASS class_5502 Instance FIELD comp_274 preset Lnet/minecraft/class_4766$class_5305; diff --git a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping index 62a5755895..2531e97dcd 100644 --- a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping @@ -15,3 +15,5 @@ CLASS net/minecraft/class_2169 net/minecraft/world/biome/source/TheEndBiomeSourc ARG 5 barrensBiome METHOD method_31105 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_31106 (Lnet/minecraft/class_2169;)Lnet/minecraft/class_2378; + ARG 0 biomeSource diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 346cdcc669..f934736cc6 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -88,6 +88,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_32914 getGameEventDispatcher (I)Lnet/minecraft/class_5713; ARG 1 ySectionCoord METHOD method_38255 getOrCreateChunkNoiseSampler (Ljava/util/function/Function;)Lnet/minecraft/class_6568; + ARG 1 chunkNoiseSamplerGetter METHOD method_38256 fillSectionArray (Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;[Lnet/minecraft/class_2826;)V ARG 0 world ARG 1 biome @@ -97,6 +98,10 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 2 sampler METHOD method_38259 getSection (I)Lnet/minecraft/class_2826; ARG 1 yIndex + METHOD method_38260 (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2902; + ARG 1 type2 + METHOD method_38261 (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/LongSet; + ARG 0 type2 METHOD method_38870 increaseInhabitedTime (J)V ARG 1 delta METHOD method_38871 hasStructureReferences ()Z @@ -110,4 +115,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_39300 getBelowZeroRetrogen ()Lnet/minecraft/class_6746; METHOD method_39460 getHeightLimitView ()Lnet/minecraft/class_5539; METHOD method_39461 hasBelowZeroRetrogen ()Z + METHOD method_44214 getOrCreateGenerationSettings (Ljava/util/function/Supplier;)Lnet/minecraft/class_5485; + ARG 1 generationSettingsSupplier CLASS class_6745 TickSchedulers diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index d07770c5dc..66a9e7cbd4 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -41,3 +41,5 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType METHOD method_44223 monsterSpawnBlockLightLimit ()I CLASS class_7512 MonsterSettings FIELD field_39414 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_44224 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/world/event/listener/VibrationListener.mapping b/mappings/net/minecraft/world/event/listener/VibrationListener.mapping index e6686f2714..59a97050ae 100644 --- a/mappings/net/minecraft/world/event/listener/VibrationListener.mapping +++ b/mappings/net/minecraft/world/event/listener/VibrationListener.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/VibrationListe ARG 1 positionSource ARG 2 range ARG 3 vibration + ARG 4 distance ARG 5 delay METHOD method_42343 (Lnet/minecraft/class_5718;)Ljava/lang/Integer; ARG 0 listener diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping index aeeaa62fb2..0d6b819492 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping @@ -7,3 +7,5 @@ CLASS net/minecraft/class_2897 net/minecraft/world/gen/chunk/FlatChunkGenerator METHOD method_28002 (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 0 state METHOD method_28545 getConfig ()Lnet/minecraft/class_3232; + METHOD method_40158 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping index d27b3dcee6..567da1cce2 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping @@ -40,3 +40,5 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC METHOD method_34741 (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_41139 getStructureOverrides ()Ljava/util/Optional; + METHOD method_44225 createGenerationSettings (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5485; + ARG 1 biomeEntry