From 1adf25af2e4d88e10a005d036d96f872a729d6ec Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Tue, 17 May 2022 20:53:58 +0900 Subject: [PATCH] 22w19a misc (#3159) * 22w19a misc * Drop BufferBuilder mapping * Apply suggestions from code review Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> * Wait what, I haven't pushed Realms32BitWarningChecker!? * Fix javadoc * Update mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../net/minecraft/block/FrogspawnBlock.mapping | 4 ++++ .../minecraft/client/MinecraftClient.mapping | 2 ++ .../client/gui/screen/TitleScreen.mapping | 5 +++++ .../client/gui/screen/ingame/LoomScreen.mapping | 2 ++ .../gui/screen/RealmsSlotOptionsScreen.mapping | 10 ++++++++++ .../util/Realms32BitWarningChecker.mapping | 13 +++++++++++++ .../client/render/chunk/ChunkBuilder.mapping | 7 +++++++ .../entity/animation/AnimationHelper.mapping | 2 ++ .../entity/model/SinglePartEntityModel.mapping | 5 +++++ .../command/CommandRegistryAccess.mapping | 2 +- .../net/minecraft/entity/AnimationState.mapping | 4 ++++ .../net/minecraft/entity/EntityType.mapping | 7 +++++++ .../entity/ai/pathing/PathNode.mapping | 2 ++ .../entity/ai/pathing/PathNodeNavigator.mapping | 5 +++++ .../entity/passive/TadpoleEntity.mapping | 2 ++ .../minecraft/screen/LoomScreenHandler.mapping | 3 +++ .../structure/MineshaftGenerator.mapping | 17 +++++++++++++---- mappings/net/minecraft/world/World.mapping | 1 + .../world/gen/structure/JigsawStructure.mapping | 16 ++++++++++------ .../world/gen/structure/StructureType.mapping | 8 ++++++++ .../SerializingRegionBasedStorage.mapping | 5 +++++ 21 files changed, 111 insertions(+), 11 deletions(-) create mode 100644 mappings/net/minecraft/client/realms/util/Realms32BitWarningChecker.mapping diff --git a/mappings/net/minecraft/block/FrogspawnBlock.mapping b/mappings/net/minecraft/block/FrogspawnBlock.mapping index 03d96c45dd..fa36e05ad8 100644 --- a/mappings/net/minecraft/block/FrogspawnBlock.mapping +++ b/mappings/net/minecraft/block/FrogspawnBlock.mapping @@ -23,4 +23,8 @@ CLASS net/minecraft/class_7113 net/minecraft/block/FrogspawnBlock ARG 0 random METHOD method_41430 spawnTadpoles (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V ARG 1 world + ARG 2 pos + ARG 3 random METHOD method_41431 resetHatchTimeRange ()V + METHOD method_44015 getSpawnOffset (Lnet/minecraft/class_5819;)D + ARG 1 random diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index c9fc373dca..ede062b7cb 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -172,6 +172,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_37856 gpuUtilizationPercentage D FIELD field_37857 currentGlTimerQuery Lnet/minecraft/class_7168$class_7169; FIELD field_39068 profileKeys Lnet/minecraft/class_7434; + FIELD field_39317 realms32BitWarningChecker Lnet/minecraft/class_7478; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z @@ -482,6 +483,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 0 stacks METHOD method_43765 (Lnet/minecraft/class_2561;)Ljava/lang/String; ARG 0 text + METHOD method_44024 getRealms32BitWarningChecker ()Lnet/minecraft/class_7478; CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index 1aeed793f0..f79f0cc503 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -60,3 +60,8 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen CLASS 1 FIELD field_33829 MULTIPLAYER_DISABLED_TEXT Lnet/minecraft/class_2561; CLASS class_7063 DeprecationNotice + FIELD comp_829 textRenderer Lnet/minecraft/class_327; + METHOD comp_829 textRenderer ()Lnet/minecraft/class_327; + METHOD method_44065 render (Lnet/minecraft/class_4587;I)V + ARG 1 matrices + ARG 2 color diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping index e3c497ace6..c5e134d533 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LoomScreen.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen FIELD field_32351 SCROLLBAR_AREA_HEIGHT I FIELD field_32352 PATTERN_LIST_OFFSET_X I FIELD field_32353 PATTERN_LIST_OFFSET_Y I + FIELD field_39190 visibleTopRow I METHOD (Lnet/minecraft/class_1726;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V ARG 1 screenHandler ARG 2 inventory @@ -26,3 +27,4 @@ CLASS net/minecraft/class_494 net/minecraft/client/gui/screen/ingame/LoomScreen ARG 1 bannerPattern ARG 2 x ARG 3 y + METHOD method_43774 getRows ()I diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSlotOptionsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSlotOptionsScreen.mapping index ba800400ae..b6b52085f1 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSlotOptionsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSlotOptionsScreen.mapping @@ -20,6 +20,8 @@ CLASS net/minecraft/class_4423 net/minecraft/client/realms/gui/screen/RealmsSlot FIELD field_27942 SPAWN_PROTECTION Lnet/minecraft/class_2561; FIELD field_27943 difficulty Lnet/minecraft/class_1267; FIELD field_39186 SPAWN_TOGGLE_TITLE Lnet/minecraft/class_2561; + FIELD field_39187 defaultSlotName Ljava/lang/String; + FIELD field_39188 slotName Ljava/lang/String; METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_4883;Lnet/minecraft/class_4877$class_4321;I)V ARG 1 parent ARG 2 options @@ -59,8 +61,16 @@ CLASS net/minecraft/class_4423 net/minecraft/client/realms/gui/screen/RealmsSlot METHOD method_32505 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V ARG 1 button ARG 2 pvp + METHOD method_43754 (Ljava/util/function/Consumer;Lnet/minecraft/class_2561;Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V + ARG 3 button + ARG 4 value + METHOD method_43755 (Ljava/util/function/Consumer;Z)V + ARG 2 confirmed METHOD method_43756 getSpawnToggleButtonCallback (Lnet/minecraft/class_2561;Ljava/util/function/Consumer;)Lnet/minecraft/class_5676$class_5678; ARG 1 text + ARG 2 valueSetter + METHOD method_43757 setSlotName (Ljava/lang/String;)V + ARG 1 slotName CLASS class_4424 SettingsSlider FIELD field_22725 min D FIELD field_22726 max D diff --git a/mappings/net/minecraft/client/realms/util/Realms32BitWarningChecker.mapping b/mappings/net/minecraft/client/realms/util/Realms32BitWarningChecker.mapping new file mode 100644 index 0000000000..804eb4f3c2 --- /dev/null +++ b/mappings/net/minecraft/client/realms/util/Realms32BitWarningChecker.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_7478 net/minecraft/client/realms/util/Realms32BitWarningChecker + FIELD field_39322 LOGGER Lorg/slf4j/Logger; + FIELD field_39323 client Lnet/minecraft/class_310; + FIELD field_39324 subscriptionRetrievalFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_39325 skipDisplay Z + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client + METHOD method_44027 isSubscribed ()Ljava/lang/Boolean; + METHOD method_44028 (Lnet/minecraft/class_4877;)Z + ARG 1 server + METHOD method_44029 showWarningIfNeeded (Lnet/minecraft/class_437;)V + ARG 1 parent + METHOD method_44030 isSubscribedInternal ()Z diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index 4f35fa24a9..b496650c0f 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -142,9 +142,16 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 2 cameraY ARG 3 cameraZ METHOD method_23087 addBlockEntity (Lnet/minecraft/class_846$class_851$class_4578$class_7435;Lnet/minecraft/class_2586;)V + ARG 1 renderData + ARG 2 blockEntity METHOD method_23619 (Lnet/minecraft/class_846$class_849;Ljava/util/List;Ljava/lang/Throwable;)Lnet/minecraft/class_846$class_4690; ARG 2 results ARG 3 throwable + CLASS class_7435 RenderData + FIELD field_39079 noCullingBlockEntities Ljava/util/List; + FIELD field_39080 blockEntities Ljava/util/List; + FIELD field_39082 chunkOcclusionData Lnet/minecraft/class_854; + FIELD field_39083 translucencySortingData Lnet/minecraft/class_287$class_5594; CLASS class_4579 SortTask FIELD field_20841 data Lnet/minecraft/class_846$class_849; METHOD (Lnet/minecraft/class_846$class_851;DLnet/minecraft/class_846$class_849;)V diff --git a/mappings/net/minecraft/client/render/entity/animation/AnimationHelper.mapping b/mappings/net/minecraft/client/render/entity/animation/AnimationHelper.mapping index 066603ced7..c4f8a9e482 100644 --- a/mappings/net/minecraft/client/render/entity/animation/AnimationHelper.mapping +++ b/mappings/net/minecraft/client/render/entity/animation/AnimationHelper.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_7187 net/minecraft/client/render/entity/animation/AnimationHelper METHOD method_41824 (FLnet/minecraft/class_1160;FLnet/minecraft/class_630;Lnet/minecraft/class_7179;)V ARG 4 transformation + METHOD method_41825 (F[Lnet/minecraft/class_7186;I)Z + ARG 2 index METHOD method_41826 getRunningSeconds (Lnet/minecraft/class_7184;J)F ARG 0 animation ARG 1 runningTime diff --git a/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping index 10c9b9f437..54724f76df 100644 --- a/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SinglePartEntityModel.mapping @@ -9,6 +9,11 @@ CLASS net/minecraft/class_5597 net/minecraft/client/render/entity/model/SinglePa METHOD method_43781 updateAnimation (Lnet/minecraft/class_7094;Lnet/minecraft/class_7184;F)V ARG 1 animationState ARG 2 animation + ARG 3 animationProgress METHOD method_43782 updateAnimation (Lnet/minecraft/class_7094;Lnet/minecraft/class_7184;FF)V ARG 1 animationState ARG 2 animation + ARG 3 animationProgress + ARG 4 speedMultiplier + METHOD method_43783 (Lnet/minecraft/class_7184;Lnet/minecraft/class_7094;)V + ARG 2 state diff --git a/mappings/net/minecraft/command/CommandRegistryAccess.mapping b/mappings/net/minecraft/command/CommandRegistryAccess.mapping index 914116ec6f..63536639f2 100644 --- a/mappings/net/minecraft/command/CommandRegistryAccess.mapping +++ b/mappings/net/minecraft/command/CommandRegistryAccess.mapping @@ -27,4 +27,4 @@ CLASS net/minecraft/class_7157 net/minecraft/command/CommandRegistryAccess FIELD field_37825 Lnet/minecraft/class_7157$class_7158; COMMENT Returns a new, empty {@link net.minecraft.util.registry.RegistryEntryList} every time. FIELD field_37826 Lnet/minecraft/class_7157$class_7158; - COMMENT Returns {@link Optional#empty()}. + COMMENT Returns {@link java.util.Optional#empty()}. diff --git a/mappings/net/minecraft/entity/AnimationState.mapping b/mappings/net/minecraft/entity/AnimationState.mapping index f893e5077d..fb4ce8141d 100644 --- a/mappings/net/minecraft/entity/AnimationState.mapping +++ b/mappings/net/minecraft/entity/AnimationState.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_7094 net/minecraft/entity/AnimationState + FIELD field_37417 STOPPED J FIELD field_37418 updatedAt J FIELD field_39112 timeRunning J + FIELD field_39275 JUST_STARTED J METHOD method_41322 start ()V METHOD method_41323 run (Ljava/util/function/Consumer;)V ARG 1 consumer @@ -8,4 +10,6 @@ CLASS net/minecraft/class_7094 net/minecraft/entity/AnimationState METHOD method_41325 stop ()V METHOD method_41327 isRunning ()Z METHOD method_43686 update (FF)V + ARG 1 animationProgress + ARG 2 speedMultiplier METHOD method_43687 getTimeRunning ()J diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 0ca8dedc21..3d9e10ebcb 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -126,8 +126,12 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 7 alignPosition ARG 8 invertY CLASS 1 + METHOD method_31490 (Lnet/minecraft/class_1937;Ljava/util/function/Consumer;Lnet/minecraft/class_2520;)V + ARG 2 nbt METHOD method_31491 (Ljava/util/function/Consumer;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; ARG 1 entity + METHOD tryAdvance (Ljava/util/function/Consumer;)Z + ARG 1 action CLASS class_1300 Builder FIELD field_18071 dimensions Lnet/minecraft/class_4048; FIELD field_18982 fireImmune Z @@ -161,6 +165,9 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType COMMENT and wither skeletons can spawn in wither roses. If a block added is not in the default COMMENT blacklist, the addition has no effect. ARG 1 blocks + METHOD method_5900 (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; + ARG 0 type + ARG 1 world METHOD method_5901 disableSummon ()Lnet/minecraft/class_1299$class_1300; METHOD method_5902 create (Lnet/minecraft/class_1311;)Lnet/minecraft/class_1299$class_1300; ARG 0 spawnGroup diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping index b2bcbcc154..6dba2fd4a4 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping @@ -45,3 +45,5 @@ CLASS net/minecraft/class_9 net/minecraft/entity/ai/pathing/PathNode METHOD method_35496 getPos ()Lnet/minecraft/class_243; METHOD method_35497 getSquaredDistance (Lnet/minecraft/class_2338;)F ARG 1 pos + METHOD method_44022 getHorizontalDistance (Lnet/minecraft/class_9;)F + ARG 1 node diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping index 066c27ef67..fa6a066a5d 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping @@ -12,6 +12,11 @@ CLASS net/minecraft/class_13 net/minecraft/entity/ai/pathing/PathNodeNavigator ARG 2 targets METHOD method_21659 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_4459; ARG 1 pos + METHOD method_21661 (Ljava/util/Map;Lnet/minecraft/class_4459;)Lnet/minecraft/class_11; + ARG 2 node + METHOD method_44000 getDistance (Lnet/minecraft/class_9;Lnet/minecraft/class_9;)F + ARG 1 a + ARG 2 b METHOD method_52 findPathToAny (Lnet/minecraft/class_1950;Lnet/minecraft/class_1308;Ljava/util/Set;FIF)Lnet/minecraft/class_11; ARG 1 world ARG 2 mob diff --git a/mappings/net/minecraft/entity/passive/TadpoleEntity.mapping b/mappings/net/minecraft/entity/passive/TadpoleEntity.mapping index 63b40ced30..560c361f9a 100644 --- a/mappings/net/minecraft/entity/passive/TadpoleEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TadpoleEntity.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_7110 net/minecraft/entity/passive/TadpoleEntity FIELD field_37497 SENSORS Lcom/google/common/collect/ImmutableList; FIELD field_37498 MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD field_37499 tadpoleAge I + FIELD field_39302 WIDTH F + FIELD field_39303 HEIGHT F METHOD method_41391 eatSlimeBall (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/screen/LoomScreenHandler.mapping b/mappings/net/minecraft/screen/LoomScreenHandler.mapping index 3519f53b3a..fb4c173704 100644 --- a/mappings/net/minecraft/screen/LoomScreenHandler.mapping +++ b/mappings/net/minecraft/screen/LoomScreenHandler.mapping @@ -26,9 +26,12 @@ CLASS net/minecraft/class_1726 net/minecraft/screen/LoomScreenHandler METHOD method_17429 getDyeSlot ()Lnet/minecraft/class_1735; METHOD method_17430 getPatternSlot ()Lnet/minecraft/class_1735; METHOD method_17431 getOutputSlot ()Lnet/minecraft/class_1735; + METHOD method_43705 getPatternsFor (Lnet/minecraft/class_1799;)Ljava/util/List; + ARG 1 stack METHOD method_43706 getBannerPatterns ()Ljava/util/List; METHOD method_7647 getSelectedPattern ()I METHOD method_7648 updateOutputSlot (Lnet/minecraft/class_6880;)V + ARG 1 pattern CLASS 6 METHOD method_17433 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world diff --git a/mappings/net/minecraft/structure/MineshaftGenerator.mapping b/mappings/net/minecraft/structure/MineshaftGenerator.mapping index 4ed9ca49cb..1b9398bac6 100644 --- a/mappings/net/minecraft/structure/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/structure/MineshaftGenerator.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 3 boundingBox ARG 4 orientation ARG 5 type + METHOD (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_14713 generateSupports (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIILnet/minecraft/class_5819;)V ARG 1 world ARG 2 boundingBox @@ -58,7 +60,10 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 3 x ARG 4 y ARG 5 z - METHOD method_33777 isNotRailOrLava (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + METHOD method_33777 isUpsideSolidFullSquare (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + ARG 1 world + ARG 2 pos + ARG 3 state METHOD method_33877 sideCoversSmallSquare (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 pos @@ -69,7 +74,7 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 2 pos ARG 3 startY ARG 4 endY - METHOD method_33879 (Lnet/minecraft/class_5281;Lnet/minecraft/class_2680;IIILnet/minecraft/class_3341;)V + METHOD method_33879 fillSupportBeam (Lnet/minecraft/class_5281;Lnet/minecraft/class_2680;IIILnet/minecraft/class_3341;)V ARG 1 world ARG 2 state ARG 3 x @@ -109,6 +114,7 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 5 orientation CLASS class_3356 MineshaftPart FIELD field_14421 mineshaftType Lnet/minecraft/class_3098$class_3100; + FIELD field_39316 biomeTag Lnet/minecraft/class_6862; METHOD (Lnet/minecraft/class_3773;ILnet/minecraft/class_3098$class_3100;Lnet/minecraft/class_3341;)V ARG 1 structurePieceType ARG 2 chainLength @@ -121,14 +127,15 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 4 maxX ARG 5 y ARG 6 z - METHOD method_33880 (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_2680;III)V + METHOD method_33880 tryPlaceFloor (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_2680;III)V ARG 1 world ARG 2 box ARG 3 state ARG 4 x ARG 5 y ARG 6 z - METHOD method_33999 (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;)Z + METHOD method_33999 cannotGenerate (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;)Z + ARG 1 world ARG 2 box CLASS class_3357 MineshaftRoom FIELD field_14422 entrances Ljava/util/List; @@ -138,6 +145,8 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 3 x ARG 4 z ARG 5 type + METHOD (Lnet/minecraft/class_2487;)V + ARG 1 nbt CLASS class_3358 MineshaftStairs METHOD (ILnet/minecraft/class_3341;Lnet/minecraft/class_2350;Lnet/minecraft/class_3098$class_3100;)V ARG 1 chainLength diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 2eea70d7b0..5b881f3086 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -162,6 +162,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 4 category ARG 5 volume ARG 6 pitch + METHOD method_44013 getDimensionKey ()Lnet/minecraft/class_5321; METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState diff --git a/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping b/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping index 72c4b04a69..47d1a72a8c 100644 --- a/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping +++ b/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_5434 net/minecraft/world/gen/structure/JigsawStructure FIELD field_37799 projectStartToHeightmap Ljava/util/Optional; FIELD field_38268 maxDistanceFromCenter I FIELD field_38435 MAX_SIZE I + FIELD field_39059 startJigsawName Ljava/util/Optional; METHOD (Lnet/minecraft/class_3195$class_7302;Lnet/minecraft/class_6880;ILnet/minecraft/class_6122;Z)V ARG 1 config ARG 2 startPool @@ -23,6 +24,7 @@ CLASS net/minecraft/class_5434 net/minecraft/world/gen/structure/JigsawStructure METHOD (Lnet/minecraft/class_3195$class_7302;Lnet/minecraft/class_6880;Ljava/util/Optional;ILnet/minecraft/class_6122;ZLjava/util/Optional;I)V ARG 1 config ARG 2 startPool + ARG 3 startJigsawName ARG 4 size ARG 5 startHeight ARG 6 useExpansionHack @@ -33,15 +35,17 @@ CLASS net/minecraft/class_5434 net/minecraft/world/gen/structure/JigsawStructure METHOD method_42703 (Lnet/minecraft/class_5434;)Lcom/mojang/serialization/DataResult; ARG 0 feature METHOD method_42704 (Lnet/minecraft/class_5434;)Ljava/lang/Integer; - ARG 0 feature + ARG 0 structure METHOD method_42705 (Lnet/minecraft/class_5434;)Ljava/util/Optional; - ARG 0 feature + ARG 0 structure METHOD method_42706 (Lnet/minecraft/class_5434;)Ljava/lang/Boolean; - ARG 0 feature + ARG 0 structure METHOD method_42707 (Lnet/minecraft/class_5434;)Lnet/minecraft/class_6122; - ARG 0 feature + ARG 0 structure METHOD method_42708 createValidator ()Ljava/util/function/Function; METHOD method_42709 (Lnet/minecraft/class_5434;)Ljava/lang/Integer; - ARG 0 feature + ARG 0 structure METHOD method_42710 (Lnet/minecraft/class_5434;)Lnet/minecraft/class_6880; - ARG 0 feature + ARG 0 structure + METHOD method_43567 (Lnet/minecraft/class_5434;)Ljava/util/Optional; + ARG 0 structure diff --git a/mappings/net/minecraft/world/gen/structure/StructureType.mapping b/mappings/net/minecraft/world/gen/structure/StructureType.mapping index 16255d2fbf..e49178036c 100644 --- a/mappings/net/minecraft/world/gen/structure/StructureType.mapping +++ b/mappings/net/minecraft/world/gen/structure/StructureType.mapping @@ -93,6 +93,14 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/structure/StructureType ARG 0 seed ARG 2 chunkPos CLASS class_7150 StructurePosition + METHOD (Lnet/minecraft/class_2338;Ljava/util/function/Consumer;)V + ARG 1 pos + ARG 2 generator + METHOD method_44019 generate ()Lnet/minecraft/class_6626; + METHOD method_44020 (Lnet/minecraft/class_6626;)Lnet/minecraft/class_6626; + ARG 0 collector + METHOD method_44021 (Ljava/util/function/Consumer;)Lnet/minecraft/class_6626; + ARG 0 generator CLASS class_7302 Config FIELD field_38430 CODEC Lcom/mojang/serialization/MapCodec; METHOD method_42702 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping index c7deae1687..c5dc160e4f 100644 --- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase FIELD field_24750 codecFactory Ljava/util/function/Function; FIELD field_27240 world Lnet/minecraft/class_5539; FIELD field_31427 SECTIONS_KEY Ljava/lang/String; + FIELD field_39315 dynamicRegistryManager Lnet/minecraft/class_5455; METHOD (Ljava/nio/file/Path;Ljava/util/function/Function;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;ZLnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V ARG 1 path ARG 2 codecFactory @@ -16,9 +17,12 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase ARG 4 dataFixer ARG 5 dataFixTypes ARG 6 dsync + ARG 7 dynamicRegistryManager + ARG 8 world METHOD method_19288 onUpdate (J)V ARG 1 pos METHOD method_19289 loadDataAt (Lnet/minecraft/class_1923;)V + ARG 1 pos METHOD method_19290 tick (Ljava/util/function/BooleanSupplier;)V ARG 1 shouldKeepTicking METHOD method_19291 onLoad (J)V @@ -43,6 +47,7 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase METHOD method_20369 getDataVersion (Lcom/mojang/serialization/Dynamic;)I ARG 0 dynamic METHOD method_20370 save (Lnet/minecraft/class_1923;)V + ARG 1 pos METHOD method_20436 saveChunk (Lnet/minecraft/class_1923;)V ARG 1 pos METHOD method_20621 loadNbt (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture;