From 433a1c4a6b2988610f0124a4b831a95ac150fc09 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 22 Apr 2023 15:39:21 +0900 Subject: [PATCH] More 23w16a stuff (#3551) * More 23w16a stuff * Drop invalid mappings * Update javadoc --- .../net/minecraft/block/AbstractBlock.mapping | 8 +- .../minecraft/block/SculkSensorBlock.mapping | 2 + .../entity/SculkCatalystBlockEntity.mapping | 20 +++++ .../entity/SculkSensorBlockEntity.mapping | 2 +- .../entity/SculkShriekerBlockEntity.mapping | 1 - .../spectator/SpectatorMenuCommand.mapping | 1 + .../client/gui/screen/Screen.mapping | 2 +- .../tooltip/HoveredTooltipPositioner.mapping | 5 ++ .../gui/tooltip/TooltipPositioner.mapping | 10 ++- .../gui/widget/ScrollableWidget.mapping | 2 +- .../client/realms/util/RealmsUtil.mapping | 1 + .../client/render/RenderLayer.mapping | 1 + .../client/render/debug/DebugRenderer.mapping | 1 + .../render/debug/LightDebugRenderer.mapping | 74 +++++++++++++++++++ .../loottable/BlockLootTableGenerator.mapping | 4 + .../fix/RenameChunkStatusFix.mapping | 4 + .../encryption/PublicPlayerSession.mapping | 1 + .../world/ServerLightingProvider.mapping | 6 ++ .../world/ThreadedAnvilChunkStorage.mapping | 4 + mappings/net/minecraft/util/Language.mapping | 3 + .../net/minecraft/world/chunk/Chunk.mapping | 5 ++ .../world/chunk/ChunkNibbleArray.mapping | 10 ++- .../world/chunk/ChunkSection.mapping | 5 ++ .../minecraft/world/chunk/ChunkStatus.mapping | 35 +++++++++ .../minecraft/world/chunk/WorldChunk.mapping | 4 + .../chunk/light/ChunkLightProvider.mapping | 2 + .../chunk/light/ChunkSkyLightProvider.mapping | 3 + .../world/chunk/light/LightStorage.mapping | 2 + .../chunk/light/LightingProvider.mapping | 3 + .../minecraft/world/event/Vibrations.mapping | 4 + .../SimpleGameEventDispatcher.mapping | 7 ++ .../world/poi/PointOfInterestStorage.mapping | 2 + 32 files changed, 221 insertions(+), 13 deletions(-) create mode 100644 mappings/net/minecraft/client/render/debug/LightDebugRenderer.mapping diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 2badb32590..9cbb5c39b4 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -288,7 +288,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_22358 canBucketPlace (Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)Z COMMENT {@return whether a bucket can replace the block with the fluid} COMMENT - COMMENT

By default, this checks if the block's material allows replacing or is not solid. + COMMENT

By default, this checks if the block allows replacing or is not solid. COMMENT Blocks intended to be unbreakable should override this to implement additional checks. COMMENT COMMENT

This method is called on both the logical client and logical server, so take caution @@ -298,7 +298,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT @deprecated Consider calling {@link AbstractBlockState#canBucketPlace} instead. See why these methods are deprecated. COMMENT COMMENT @see #canReplace - COMMENT @see Material#isReplaceable + COMMENT @see AbstractBlockState#isReplaceable ARG 1 state ARG 2 fluid METHOD method_25959 getSidesShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; @@ -831,7 +831,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_9616 canReplace (Lnet/minecraft/class_2680;Lnet/minecraft/class_1750;)Z COMMENT {@return whether the item can replace the block} COMMENT - COMMENT

By default, this checks if the block's material allows replacing and whether the + COMMENT

By default, this checks if the block allows replacing and whether the COMMENT item differs from the block's item. Items composed of multiple blocks, such as candles, COMMENT vines, or snow layers, should override this to implement additional checks. COMMENT @@ -842,7 +842,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT @deprecated Consider calling {@link AbstractBlockState#canReplace} instead. See why these methods are deprecated. COMMENT COMMENT @see #canBucketPlace - COMMENT @see Material#isReplaceable + COMMENT @see AbstractBlockState#isReplaceable ARG 1 state ARG 2 context CLASS class_2250 OffsetType diff --git a/mappings/net/minecraft/block/SculkSensorBlock.mapping b/mappings/net/minecraft/block/SculkSensorBlock.mapping index 95a9766db0..da188b7b55 100644 --- a/mappings/net/minecraft/block/SculkSensorBlock.mapping +++ b/mappings/net/minecraft/block/SculkSensorBlock.mapping @@ -22,8 +22,10 @@ CLASS net/minecraft/class_5703 net/minecraft/block/SculkSensorBlock ARG 5 power ARG 6 frequency METHOD method_32905 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5704;)V + ARG 0 world ARG 1 pos ARG 2 state + ARG 3 blockEntity METHOD method_32908 getPhase (Lnet/minecraft/class_2680;)Lnet/minecraft/class_5705; ARG 0 state METHOD method_32909 isInactive (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping index b1ca59e807..2322a0d9bd 100644 --- a/mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SculkCatalystBlockEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_7132 net/minecraft/block/entity/SculkCatalystBlockEntity + FIELD field_44610 eventListener Lnet/minecraft/class_7132$class_8510; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -7,3 +8,22 @@ CLASS net/minecraft/class_7132 net/minecraft/block/entity/SculkCatalystBlockEnti ARG 1 pos ARG 2 state ARG 3 blockEntity + CLASS class_8510 Listener + FIELD field_44611 RANGE I + FIELD field_44612 spreadManager Lnet/minecraft/class_7128; + FIELD field_44613 state Lnet/minecraft/class_2680; + FIELD field_44614 positionSource Lnet/minecraft/class_5716; + METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_5716;)V + ARG 1 state + ARG 2 positionSource + METHOD method_51359 (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)V + ARG 2 pos + METHOD method_51360 bloom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)V + ARG 1 world + ARG 2 pos + ARG 3 state + ARG 4 random + METHOD method_51361 triggerCriteria (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)V + ARG 1 world + ARG 2 deadEntity + METHOD method_51362 getSpreadManager ()Lnet/minecraft/class_7128; diff --git a/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping index fac69c9951..3b55651278 100644 --- a/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping @@ -3,10 +3,10 @@ CLASS net/minecraft/class_5704 net/minecraft/block/entity/SculkSensorBlockEntity FIELD field_28119 lastVibrationFrequency I FIELD field_38236 LOGGER Lorg/slf4j/Logger; FIELD field_43291 callback Lnet/minecraft/class_8514$class_5719; + FIELD field_44615 listenerData Lnet/minecraft/class_8514$class_8515; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_32911 getEventListener ()Lnet/minecraft/class_8514$class_8516; METHOD method_32912 getLastVibrationFrequency ()I METHOD method_42320 (Lnet/minecraft/class_8514$class_8515;)V ARG 1 listener diff --git a/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping index 451c3819ad..33184e4302 100644 --- a/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/class_7133 net/minecraft/block/entity/SculkShriekerBlockEnti ARG 2 state METHOD method_42322 (Lnet/minecraft/class_8514$class_8515;)V ARG 1 vibrationListener - METHOD method_42325 getVibrationListener ()Lnet/minecraft/class_8514$class_8516; METHOD method_43141 shriek (Lnet/minecraft/class_3218;Lnet/minecraft/class_3222;)V ARG 1 world ARG 2 player diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping index ca1afafbc7..08ff2e492c 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand.mapping @@ -4,5 +4,6 @@ CLASS net/minecraft/class_537 net/minecraft/client/gui/hud/spectator/SpectatorMe METHOD method_2783 use (Lnet/minecraft/class_531;)V ARG 1 menu METHOD method_2784 renderIcon (Lnet/minecraft/class_332;FI)V + ARG 1 context ARG 2 brightness ARG 3 alpha diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index 8b30756100..19655c6e2f 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -74,7 +74,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 style METHOD method_25432 removed ()V METHOD method_25434 renderBackgroundTexture (Lnet/minecraft/class_332;)V - COMMENT Renders the fullscreen {@linkplain net.minecraft.client.gui.DrawableHelper#OPTIONS_BACKGROUND_TEXTURE background texture} of this screen. + COMMENT Renders the fullscreen {@linkplain #OPTIONS_BACKGROUND_TEXTURE background texture} of this screen. ARG 1 context METHOD method_25435 getNarratedTitle ()Lnet/minecraft/class_2561; METHOD method_25436 isCut (I)Z diff --git a/mappings/net/minecraft/client/gui/tooltip/HoveredTooltipPositioner.mapping b/mappings/net/minecraft/client/gui/tooltip/HoveredTooltipPositioner.mapping index 1c3486c88a..9b82cb5d5b 100644 --- a/mappings/net/minecraft/client/gui/tooltip/HoveredTooltipPositioner.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/HoveredTooltipPositioner.mapping @@ -1,3 +1,8 @@ CLASS net/minecraft/class_8001 net/minecraft/client/gui/tooltip/HoveredTooltipPositioner FIELD field_41687 INSTANCE Lnet/minecraft/class_8000; METHOD method_47945 preventOverflow (IILorg/joml/Vector2i;II)V + ARG 1 screenWidth + ARG 2 screenHeight + ARG 3 pos + ARG 4 width + ARG 5 height diff --git a/mappings/net/minecraft/client/gui/tooltip/TooltipPositioner.mapping b/mappings/net/minecraft/client/gui/tooltip/TooltipPositioner.mapping index 2756fd0f95..6216f72488 100644 --- a/mappings/net/minecraft/client/gui/tooltip/TooltipPositioner.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/TooltipPositioner.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_8000 net/minecraft/client/gui/tooltip/TooltipPositioner METHOD method_47944 getPosition (IIIIII)Lorg/joml/Vector2ic; - ARG 2 x - ARG 3 y - ARG 4 width - ARG 5 height + ARG 1 screenWidth + ARG 2 screenHeight + ARG 3 x + ARG 4 y + ARG 5 width + ARG 6 height diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping index 41bfe9a766..cfdf8273af 100644 --- a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget METHOD method_44389 renderContents (Lnet/minecraft/class_332;IIF)V COMMENT Renders the scrolled contents. Subclasses must override this. The rendered contents COMMENT may overflow; the caller should trim those using {@link - COMMENT net.minecraft.client.gui.DrawableHelper#enableScissor}. + COMMENT net.minecraft.client.gui.DrawContext#enableScissor}. ARG 1 context ARG 2 mouseX ARG 3 mouseY diff --git a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping index 332f1797f7..f2a14a00f4 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_4448 net/minecraft/client/realms/util/RealmsUtil METHOD method_25282 convertToAgePresentation (Ljava/util/Date;)Ljava/lang/String; ARG 0 date METHOD method_48972 drawPlayerHead (Lnet/minecraft/class_332;IIILjava/lang/String;)V + ARG 0 context ARG 1 x ARG 2 y ARG 3 size diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index 3ee6c34092..10083b5ddf 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -232,6 +232,7 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer METHOD method_49045 getTextBackground ()Lnet/minecraft/class_1921; METHOD method_49046 getTextBackgroundSeeThrough ()Lnet/minecraft/class_1921; METHOD method_49047 getDebugFilledBox ()Lnet/minecraft/class_1921; + METHOD method_51456 getDebugSectionQuads ()Lnet/minecraft/class_1921; CLASS class_4687 MultiPhase FIELD field_21403 phases Lnet/minecraft/class_1921$class_4688; FIELD field_21697 affectedOutline Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping index 5d65507d92..15e783b066 100644 --- a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer FIELD field_21547 beeDebugRenderer Lnet/minecraft/class_4703; FIELD field_22408 villageSectionsDebugRenderer Lnet/minecraft/class_4841; FIELD field_28254 gameEventDebugRenderer Lnet/minecraft/class_5739; + FIELD field_44674 lightDebugRenderer Lnet/minecraft/class_8520; FIELD field_4517 blockOutlineDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4523 pathfindingDebugRenderer Lnet/minecraft/class_868; FIELD field_4528 waterDebugRenderer Lnet/minecraft/class_863$class_864; diff --git a/mappings/net/minecraft/client/render/debug/LightDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/LightDebugRenderer.mapping new file mode 100644 index 0000000000..8a6a5290fb --- /dev/null +++ b/mappings/net/minecraft/client/render/debug/LightDebugRenderer.mapping @@ -0,0 +1,74 @@ +CLASS net/minecraft/class_8520 net/minecraft/client/render/debug/LightDebugRenderer + FIELD field_44675 UPDATE_INTERVAL Ljava/time/Duration; + FIELD field_44677 READY_SHAPE_COLOR Lorg/joml/Vector4f; + FIELD field_44678 DEFAULT_SHAPE_COLOR Lorg/joml/Vector4f; + FIELD field_44679 client Lnet/minecraft/class_310; + FIELD field_44680 lightType Lnet/minecraft/class_1944; + FIELD field_44681 prevUpdateTime Ljava/time/Instant; + FIELD field_44682 data Lnet/minecraft/class_8520$class_8521; + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_1944;)V + ARG 1 client + ARG 2 lightType + METHOD method_51457 drawFaces (Lnet/minecraft/class_4587;Lnet/minecraft/class_251;Lnet/minecraft/class_4076;Lnet/minecraft/class_4588;DDDLorg/joml/Vector4f;)V + ARG 0 matrices + ARG 1 shape + ARG 2 sectionPos + ARG 3 vertexConsumer + ARG 4 cameraX + ARG 6 cameraY + ARG 8 cameraZ + ARG 10 color + METHOD method_51458 drawEdges (Lnet/minecraft/class_4587;Lnet/minecraft/class_251;Lnet/minecraft/class_4076;Lnet/minecraft/class_4597;DDDLorg/joml/Vector4f;)V + ARG 0 matrices + ARG 1 shape + ARG 2 sectionPos + ARG 3 vertexConsumers + ARG 4 cameraX + ARG 6 cameraY + ARG 8 cameraZ + ARG 10 color + METHOD method_51459 drawEdge (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDIIIIIILorg/joml/Vector4f;)V + ARG 0 matrices + ARG 1 vertexConsumer + ARG 2 cameraX + ARG 4 cameraY + ARG 6 cameraZ + ARG 8 x1 + ARG 9 y1 + ARG 10 z1 + ARG 11 x2 + ARG 12 y2 + ARG 13 z + ARG 14 color + METHOD method_51460 drawFace (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_2350;DDDIIILorg/joml/Vector4f;)V + ARG 0 matrices + ARG 1 vertexConsumer + ARG 2 direction + ARG 3 cameraX + ARG 5 cameraY + ARG 7 cameraZ + ARG 9 x + ARG 10 y + ARG 11 z + ARG 12 color + METHOD method_51461 (Lnet/minecraft/class_4076;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDLorg/joml/Vector4f;Lnet/minecraft/class_2350;III)V + ARG 10 direction + ARG 11 offsetX + ARG 12 offsetY + ARG 13 offsetZ + METHOD method_51462 (Lnet/minecraft/class_4076;Lnet/minecraft/class_4597;Lnet/minecraft/class_4587;DDDLorg/joml/Vector4f;IIIIII)V + ARG 10 x1 + ARG 11 y1 + ARG 12 z1 + ARG 13 x2 + ARG 14 y2 + ARG 15 z2 + CLASS class_8521 Data + FIELD field_44684 readyShape Lnet/minecraft/class_251; + FIELD field_44685 shape Lnet/minecraft/class_251; + FIELD field_44686 minSectionPos Lnet/minecraft/class_4076; + METHOD (Lnet/minecraft/class_3568;Lnet/minecraft/class_4076;ILnet/minecraft/class_1944;)V + ARG 1 lightingProvider + ARG 2 sectionPos + ARG 3 radius + ARG 4 lightType diff --git a/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping index b52ea08ade..4acce20bca 100644 --- a/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping @@ -12,6 +12,10 @@ CLASS net/minecraft/class_7788 net/minecraft/data/server/loottable/BlockLootTabl METHOD (Ljava/util/Set;Lnet/minecraft/class_7699;)V ARG 1 explosionImmuneItems ARG 2 requiredFeatures + METHOD (Ljava/util/Set;Lnet/minecraft/class_7699;Ljava/util/Map;)V + ARG 1 explosionImmuneItems + ARG 2 requiredFeatures + ARG 3 lootTables METHOD method_10379 generate ()V METHOD method_45975 dropsNothing ()Lnet/minecraft/class_52$class_53; METHOD method_45976 drops (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/datafixer/fix/RenameChunkStatusFix.mapping b/mappings/net/minecraft/datafixer/fix/RenameChunkStatusFix.mapping index 0c05a185f1..ed53915856 100644 --- a/mappings/net/minecraft/datafixer/fix/RenameChunkStatusFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RenameChunkStatusFix.mapping @@ -5,5 +5,9 @@ CLASS net/minecraft/class_8505 net/minecraft/datafixer/fix/RenameChunkStatusFix ARG 1 schema ARG 2 name ARG 3 mapper + METHOD method_51290 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 typed METHOD method_51291 updateStatus (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 status + METHOD method_51292 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 chunk diff --git a/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping b/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping index fa9830e662..4a71fbeb37 100644 --- a/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping +++ b/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_7822 net/minecraft/network/encryption/PublicPlayerSess METHOD method_46297 createUnpacker (Ljava/util/UUID;)Lnet/minecraft/class_7610$class_7611; ARG 1 sender METHOD method_46298 toSerialized ()Lnet/minecraft/class_7822$class_7823; + METHOD method_51466 isKeyExpired ()Z CLASS class_7823 Serialized FIELD comp_1088 publicKeyData Lnet/minecraft/class_7428$class_7443; METHOD comp_1088 publicKeyData ()Lnet/minecraft/class_7428$class_7443; diff --git a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping index 89c5630d67..ccf53a1592 100644 --- a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping +++ b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_3227 net/minecraft/server/world/ServerLightingProvider METHOD method_17303 tick ()V METHOD method_17304 setTaskBatchSize (I)V ARG 1 taskBatchSize + METHOD method_17306 (Lnet/minecraft/class_1923;Ljava/lang/Runnable;)V + ARG 2 task METHOD method_17307 enqueue (IILjava/util/function/IntSupplier;Lnet/minecraft/class_3227$class_3901;Ljava/lang/Runnable;)V ARG 1 x ARG 2 z @@ -34,4 +36,8 @@ CLASS net/minecraft/class_3227 net/minecraft/server/world/ServerLightingProvider ARG 2 excludeBlocks METHOD method_20386 updateChunkStatus (Lnet/minecraft/class_1923;)V ARG 1 pos + METHOD method_51285 initializeLight (Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 1 chunk + METHOD method_51287 (Lnet/minecraft/class_1923;Ljava/lang/Runnable;)V + ARG 2 task CLASS class_3901 Stage diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 651b8d00fd..9b090ec6ed 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -62,6 +62,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_17219 (Lnet/minecraft/class_1923;ILorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_3222;)V ARG 4 player METHOD method_17220 getRegion (Lnet/minecraft/class_3193;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture; + ARG 1 centerChunk ARG 2 margin ARG 3 distanceToStatus METHOD method_17222 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; @@ -101,6 +102,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 3 player METHOD method_17244 updateHolderMap ()Z METHOD method_17247 makeChunkEntitiesTickable (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture; + ARG 1 chunk METHOD method_17248 (Lnet/minecraft/class_2806;I)Lnet/minecraft/class_2806; ARG 2 distance METHOD method_17252 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V @@ -312,6 +314,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 1 chunks METHOD method_49422 (Lnet/minecraft/class_3222;)Ljava/util/List; ARG 0 player + METHOD method_51282 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; + ARG 0 chunk CLASS class_3208 EntityTracker COMMENT An entity tracker governs which players' clients can see an entity. Each COMMENT tracker corresponds to one entity in a server world and is mapped from the diff --git a/mappings/net/minecraft/util/Language.mapping b/mappings/net/minecraft/util/Language.mapping index db6f38d472..d724957c06 100644 --- a/mappings/net/minecraft/util/Language.mapping +++ b/mappings/net/minecraft/util/Language.mapping @@ -23,6 +23,9 @@ CLASS net/minecraft/class_2477 net/minecraft/util/Language ARG 2 fallback METHOD method_48307 get (Ljava/lang/String;)Ljava/lang/String; ARG 1 key + METHOD method_51465 load (Ljava/util/function/BiConsumer;Ljava/lang/String;)V + ARG 0 entryConsumer + ARG 1 path CLASS 1 METHOD method_30935 (Lnet/minecraft/class_5224;Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional; ARG 1 style diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 3353acb58e..e4e6737951 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -18,9 +18,12 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk FIELD field_35468 blendingData Lnet/minecraft/class_6749; FIELD field_37052 EMPTY_STRUCTURE_REFERENCES Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_39411 generationSettings Lnet/minecraft/class_5485; + FIELD field_44632 MISSING_SECTION I METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;J[Lnet/minecraft/class_2826;Lnet/minecraft/class_6749;)V ARG 1 pos ARG 2 upgradeData + ARG 3 heightLimitView + ARG 4 biomeRegistry ARG 5 inhabitedTime ARG 7 sectionArrayInitializer ARG 8 blendingData @@ -89,6 +92,8 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_38255 getOrCreateChunkNoiseSampler (Ljava/util/function/Function;)Lnet/minecraft/class_6568; ARG 1 chunkNoiseSamplerCreator METHOD method_38256 fillSectionArray (Lnet/minecraft/class_2378;[Lnet/minecraft/class_2826;)V + ARG 0 biomeRegistry + ARG 1 sectionArray METHOD method_38257 populateBiomes (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;)V ARG 1 biomeSupplier ARG 2 sampler diff --git a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping index 4f8972f647..a764172070 100644 --- a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping @@ -12,8 +12,11 @@ CLASS net/minecraft/class_2804 net/minecraft/world/chunk/ChunkNibbleArray FIELD field_31404 COPY_BLOCK_SIZE I FIELD field_31405 NIBBLE_BITS I FIELD field_34052 COPY_TIMES I + FIELD field_44635 defaultValue I METHOD (I)V - ARG 1 size + ARG 1 defaultValue + METHOD ([B)V + ARG 1 bytes METHOD method_12137 asByteArray ()[B METHOD method_12138 getArrayIndex (I)I ARG 0 i @@ -53,3 +56,8 @@ CLASS net/minecraft/class_2804 net/minecraft/world/chunk/ChunkNibbleArray COMMENT {@return if the nibble at {@code n} is stored in the less COMMENT significant (smaller) 4 bits of the byte in the backing array} ARG 0 i + METHOD method_51379 isUninitialized (I)Z + ARG 1 expectedDefaultValue + METHOD method_51380 isArrayUninitialized ()Z + METHOD method_51381 pack (I)B + ARG 0 value diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping index a9dcbf2f23..f24c5f4454 100644 --- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -4,6 +4,11 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection FIELD field_12881 nonEmptyFluidCount S FIELD field_12882 randomTickableBlockCount S FIELD field_34556 biomeContainer Lnet/minecraft/class_7522; + METHOD (Lnet/minecraft/class_2378;)V + ARG 1 biomeRegistry + METHOD (Lnet/minecraft/class_2841;Lnet/minecraft/class_7522;)V + ARG 1 blockStateContainer + ARG 2 biomeContainer METHOD method_12253 calculateCounts ()V METHOD method_12254 getBlockState (III)Lnet/minecraft/class_2680; ARG 1 x diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index 75f9856ebf..14a0e4560e 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -13,10 +13,16 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus FIELD field_19345 STATUS_BUMP_LOAD_TASK Lnet/minecraft/class_2806$class_4305; COMMENT A load task which only bumps the chunk status of the chunk. FIELD field_19346 loadTask Lnet/minecraft/class_2806$class_4305; + FIELD field_44634 shouldAlwaysUpgrade Z METHOD (Ljava/lang/String;Lnet/minecraft/class_2806;IZLjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)V ARG 1 id ARG 2 previous ARG 3 taskMargin + ARG 4 shouldAlwaysUpgrade + ARG 5 heightMapTypes + ARG 6 chunkType + ARG 7 generationTask + ARG 8 loadTask METHOD method_12152 getTaskMargin ()I METHOD method_12154 runGenerationTask (Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 1 executor @@ -103,6 +109,11 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 0 id ARG 1 previous ARG 2 taskMargin + ARG 3 shouldAlwaysUpgrade + ARG 4 heightMapTypes + ARG 5 chunkType + ARG 6 generationTask + ARG 7 loadTask METHOD method_20612 runLoadTask (Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 1 world ARG 2 structureTemplateManager @@ -139,6 +150,8 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 2 generator ARG 3 chunks ARG 4 chunk + METHOD method_38283 (Lnet/minecraft/class_2791;)Lcom/mojang/datafixers/util/Either; + ARG 0 populatedChunk METHOD method_38284 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 executor @@ -159,6 +172,8 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 fullChunkConverter ARG 7 chunks ARG 8 chunk + METHOD method_39463 (Lnet/minecraft/class_2791;)Lcom/mojang/datafixers/util/Either; + ARG 0 populatedChunk METHOD method_39464 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus ARG 1 executor @@ -183,6 +198,26 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 3 lightingProvider ARG 4 fullChunkConverter ARG 5 chunk + METHOD method_51373 getInitializeLightingFuture (Lnet/minecraft/class_3227;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 lightingProvider + ARG 1 chunk + METHOD method_51375 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 targetStatus + ARG 1 world + ARG 2 generator + ARG 3 chunks + ARG 4 chunk + METHOD method_51376 (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 targetStatus + ARG 1 executor + ARG 2 world + ARG 3 generator + ARG 4 structureTemplateManager + ARG 5 lightingProvider + ARG 6 fullChunkConverter + ARG 7 chunks + ARG 8 chunk + METHOD method_51378 shouldAlwaysUpgrade ()Z CLASS class_2807 GenerationTask COMMENT A task called when a chunk needs to be generated. METHOD doWork (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index ad04d5f1e8..c9dfc93b46 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -74,6 +74,8 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 1 pos METHOD method_31725 removeBlockEntityTicker (Lnet/minecraft/class_2338;)V ARG 1 pos + METHOD method_32917 (Lnet/minecraft/class_3218;II)Lnet/minecraft/class_5713; + ARG 3 sectionCoord METHOD method_32918 removeGameEventListener (Lnet/minecraft/class_2586;Lnet/minecraft/class_3218;)V ARG 1 blockEntity ARG 2 world @@ -94,6 +96,8 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 1 shouldRenderOnUpdate METHOD method_49525 loadBiomeFromPacket (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD method_51382 removeGameEventDispatcher (I)V + ARG 1 ySectionCoord CLASS class_2819 CreationType CLASS class_5563 DirectBlockEntityTickInvoker FIELD field_27223 worldChunk Lnet/minecraft/class_2818; diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping index d05d9f4d00..4c93048cec 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping @@ -50,3 +50,5 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide ARG 2 pos METHOD method_50018 getStateForLighting (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 1 pos + METHOD method_51414 getDebugLevel (J)I + ARG 1 id diff --git a/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping index e617ca93c9..11ea30d17d 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping @@ -3,3 +3,6 @@ CLASS net/minecraft/class_3572 net/minecraft/world/chunk/light/ChunkSkyLightProv FIELD field_15826 DIRECTIONS [Lnet/minecraft/class_2350; METHOD (Lnet/minecraft/class_2823;)V ARG 1 chunkProvider + METHOD (Lnet/minecraft/class_2823;Lnet/minecraft/class_3569;)V + ARG 1 chunkProvider + ARG 2 lightStorage diff --git a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping index 0ffd746a1d..0986b2fb1a 100644 --- a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping @@ -78,3 +78,5 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage METHOD method_29967 updateSection (Lnet/minecraft/class_3558;J)V ARG 1 lightProvider ARG 2 sectionPos + METHOD method_51415 addNotifySections (J)V + ARG 1 id diff --git a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping index 985ec15213..45ec364abc 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping @@ -25,3 +25,6 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider METHOD method_31928 getHeight ()I METHOD method_31929 getBottomY ()I METHOD method_31930 getTopY ()I + METHOD method_51416 getDebugLevel (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;)I + ARG 1 lightType + ARG 2 pos diff --git a/mappings/net/minecraft/world/event/Vibrations.mapping b/mappings/net/minecraft/world/event/Vibrations.mapping index b4b7fed5da..1d59e4dcf0 100644 --- a/mappings/net/minecraft/world/event/Vibrations.mapping +++ b/mappings/net/minecraft/world/event/Vibrations.mapping @@ -53,8 +53,12 @@ CLASS net/minecraft/class_8514 net/minecraft/world/event/Vibrations METHOD method_51387 getSelector ()Lnet/minecraft/class_7722; METHOD method_51388 setDelay (I)V ARG 1 delay + METHOD method_51389 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_51390 setVibration (Lnet/minecraft/class_7269;)V ARG 1 vibration + METHOD method_51391 (Lnet/minecraft/class_8514$class_8515;)Ljava/util/Optional; + ARG 0 listenerData METHOD method_51392 (Ljava/util/Optional;Lnet/minecraft/class_7722;Ljava/lang/Integer;)Lnet/minecraft/class_8514$class_8515; ARG 0 vibration ARG 1 selector diff --git a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping index b390d5c6d6..3798141254 100644 --- a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping @@ -8,9 +8,16 @@ CLASS net/minecraft/class_5711 net/minecraft/world/event/listener/SimpleGameEven FIELD field_37673 toRemove Ljava/util/Set; FIELD field_37674 toAdd Ljava/util/List; FIELD field_37675 dispatching Z + FIELD field_44636 ySectionCoord I + FIELD field_44637 disposalCallback Lnet/minecraft/class_5711$class_8512; METHOD (Lnet/minecraft/class_3218;ILnet/minecraft/class_5711$class_8512;)V ARG 1 world + ARG 2 ySectionCoord + ARG 3 disposalCallback METHOD method_32936 dispatchTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_5714;)Ljava/util/Optional; ARG 0 world ARG 1 listenerPos ARG 2 listener + CLASS class_8512 DisposalCallback + METHOD apply (I)V + ARG 1 ySectionCoord diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index d0ab475a46..2d27abc887 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -53,6 +53,8 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage METHOD method_19133 isOccupied (J)Z ARG 1 pos METHOD method_19510 initForPalette (Lnet/minecraft/class_4076;Lnet/minecraft/class_2826;)V + ARG 1 sectionPos + ARG 2 chunkSection METHOD method_19511 (Lnet/minecraft/class_2826;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V ARG 2 pos METHOD method_19512 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V