From b198b9c6cac2da333f29692d6854815f60bca2eb Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 12 Sep 2019 14:28:23 +0100 Subject: [PATCH] Merge #822 # Conflicts: # mappings/net/minecraft/entity/LivingEntity.mapping # mappings/net/minecraft/entity/mob/MobEntity.mapping # mappings/net/minecraft/util/SystemUtil.mapping --- .../realmsclient/gui/RealmsConstants.mapping | 3 + .../screens/RealmsAcceptRejectButton.mapping | 37 ++++++ .../RealmsPendingInvitesScreen.mapping | 5 + mappings/net/minecraft/block/Block.mapping | 2 +- .../net/minecraft/block/BlockState.mapping | 2 +- .../minecraft/block/RedstoneWireBlock.mapping | 2 +- .../block/entity/BlockEntity.mapping | 10 +- .../block/entity/PistonBlockEntity.mapping | 42 ++++++- .../block/pattern/BlockPattern.mapping | 1 + .../client/render/GameRenderer.mapping | 4 +- .../client/render/RenderTickCounter.mapping | 2 +- .../client/render/WorldRenderer.mapping | 2 +- .../client/render/debug/DebugRenderer.mapping | 36 +++++- .../debug/SkyLightDebugRenderer.mapping | 2 + .../minecraft/command/EntitySelector.mapping | 10 +- .../command/EntitySelectorOptions.mapping | 14 ++- .../command/EntitySelectorReader.mapping | 115 +++++++++++++----- ...nge.mapping => FloatRangeArgument.mapping} | 2 +- .../arguments/ItemStackArgument.mapping | 1 + .../arguments/ItemStringReader.mapping | 2 + .../container/MerchantContainer.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 50 +++++--- .../net/minecraft/entity/LivingEntity.mapping | 4 +- .../entity/ai/PathfindingUtil.mapping | 7 -- .../minecraft/entity/ai/TargetFinder.mapping | 51 ++++++++ .../ai/brain/task/CompositeTask.mapping | 5 + .../task/GoToPointOfInterestTask.mapping | 6 + .../ai/pathing/BirdPathNodeMaker.mapping | 6 + .../ai/pathing/EntityNavigation.mapping | 16 ++- .../ai/pathing/LandPathNodeMaker.mapping | 35 +++++- .../minecraft/entity/ai/pathing/Path.mapping | 11 ++ .../entity/ai/pathing/PathMinHeap.mapping | 1 + .../entity/ai/pathing/PathNode.mapping | 19 ++- .../entity/ai/pathing/PathNodeMaker.mapping | 44 ++++--- .../ai/pathing/PathNodeNavigator.mapping | 25 +++- .../entity/ai/pathing/PathNodeType.mapping | 6 +- .../entity/ai/pathing/TargetPathNode.mapping | 18 +++ .../ai/pathing/WaterPathNodeMaker.mapping | 2 +- .../entity/damage/DamageSource.mapping | 7 +- .../entity/decoration/ItemFrameEntity.mapping | 3 + .../minecraft/entity/mob/MobEntity.mapping | 31 +++-- .../inventory/BasicInventory.mapping | 7 ++ .../minecraft/item/ItemUsageContext.mapping | 1 + .../listener/ClientPlayPacketListener.mapping | 6 +- .../minecraft/recipe/RecipeManager.mapping | 20 ++- .../resource/DefaultResourcePack.mapping | 6 + .../minecraft/server/MinecraftServer.mapping | 3 + .../server/command/DebugCommand.mapping | 2 + .../dedicated/ServerPropertiesHandler.mapping | 1 + .../server/function/CommandFunction.mapping | 1 + .../function/CommandFunctionManager.mapping | 3 +- .../server/world/ServerChunkManager.mapping | 2 + .../world/ServerLightingProvider.mapping | 6 + .../world/ThreadedAnvilChunkStorage.mapping | 2 + .../structure/StructureManager.mapping | 3 +- .../net/minecraft/tag/TagContainer.mapping | 4 +- ...> ChunkPosDistanceLevelPropagator.mapping} | 6 +- .../util/CuboidBlockIterator.mapping | 1 + .../net/minecraft/util/FileNameUtil.mapping | 4 + .../util/NonBlockingThreadExecutor.mapping | 2 + .../net/minecraft/util/NumberRange.mapping | 3 +- .../minecraft/util/PackedIntegerArray.mapping | 2 + .../SectionDistanceLevelPropagator.mapping | 11 ++ .../SectionRelativeLevelPropagator.mapping | 7 -- .../net/minecraft/util/SystemUtil.mapping | 3 + .../net/minecraft/util/ThreadExecutor.mapping | 27 ++-- .../minecraft/util/crash/CrashReport.mapping | 2 + .../util/crash/CrashReportSection.mapping | 5 +- .../minecraft/util/hit/BlockHitResult.mapping | 3 + .../net/minecraft/util/math/ChunkPos.mapping | 2 +- .../util/math/ChunkSectionPos.mapping | 32 ++--- .../minecraft/util/math/MathHelper.mapping | 7 +- .../util/math/MutableIntBoundingBox.mapping | 13 +- .../net/minecraft/util/math/Vec3d.mapping | 2 + .../util/shape/SliceVoxelShape.mapping | 4 +- .../minecraft/util/shape/VoxelShapes.mapping | 11 +- .../village/PointOfInterestStorage.mapping | 9 ++ .../net/minecraft/village/TradeOffer.mapping | 1 + mappings/net/minecraft/village/Trader.mapping | 1 + .../net/minecraft/world/EntityView.mapping | 41 ++++++- .../net/minecraft/world/ViewableWorld.mapping | 11 +- mappings/net/minecraft/world/World.mapping | 4 + .../world/chunk/ChunkManager.mapping | 6 + .../minecraft/world/chunk/ChunkStatus.mapping | 33 +++-- .../world/chunk/ChunkToNibbleArrayMap.mapping | 21 ++++ .../world/chunk/PalettedContainer.mapping | 6 + .../minecraft/world/chunk/WorldChunk.mapping | 9 +- .../world/chunk/WorldNibbleStorage.mapping | 21 ---- .../light/ChunkBlockLightProvider.mapping | 2 +- .../chunk/light/ChunkLightProvider.mapping | 43 ++++++- .../chunk/light/ChunkLightingView.mapping | 7 +- .../chunk/light/ChunkSkyLightProvider.mapping | 2 +- .../world/chunk/light/LevelPropagator.mapping | 92 +++++++------- .../world/chunk/light/LightStorage.mapping | 46 ++++--- .../chunk/light/LightingProvider.mapping | 18 ++- .../world/chunk/light/SkyLightStorage.mapping | 14 ++- .../chunk/FlatChunkGeneratorConfig.mapping | 7 ++ 97 files changed, 956 insertions(+), 294 deletions(-) create mode 100644 mappings/com/mojang/realmsclient/gui/RealmsConstants.mapping create mode 100644 mappings/com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton.mapping rename mappings/net/minecraft/command/{FloatRange.mapping => FloatRangeArgument.mapping} (91%) delete mode 100644 mappings/net/minecraft/entity/ai/PathfindingUtil.mapping create mode 100644 mappings/net/minecraft/entity/ai/TargetFinder.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping rename mappings/net/minecraft/util/{ChunkPosLevelPropagator.mapping => ChunkPosDistanceLevelPropagator.mapping} (56%) create mode 100644 mappings/net/minecraft/util/SectionDistanceLevelPropagator.mapping delete mode 100644 mappings/net/minecraft/util/SectionRelativeLevelPropagator.mapping create mode 100644 mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping delete mode 100644 mappings/net/minecraft/world/chunk/WorldNibbleStorage.mapping diff --git a/mappings/com/mojang/realmsclient/gui/RealmsConstants.mapping b/mappings/com/mojang/realmsclient/gui/RealmsConstants.mapping new file mode 100644 index 0000000000..6985a1f090 --- /dev/null +++ b/mappings/com/mojang/realmsclient/gui/RealmsConstants.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4359 com/mojang/realmsclient/gui/RealmsConstants + METHOD method_21072 row (I)I + ARG 0 i diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton.mapping new file mode 100644 index 0000000000..7e4265f4b4 --- /dev/null +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_4371 com/mojang/realmsclient/gui/screens/RealmsAcceptRejectButton + FIELD field_19690 width I + FIELD field_19691 height I + FIELD field_19692 x I + FIELD field_19693 y I + METHOD (IIII)V + ARG 1 width + ARG 2 height + ARG 3 x + ARG 4 y + METHOD method_21109 getRight ()I + METHOD method_21110 handleClick (I)V + ARG 1 index + METHOD method_21111 render (IIII)V + ARG 1 offsetX + ARG 2 offsetY + ARG 3 mouseX + ARG 4 mouseY + METHOD method_21112 render (IIZ)V + ARG 1 x + ARG 2 y + ARG 3 hovered + METHOD method_21113 render (Ljava/util/List;Lnet/minecraft/realms/RealmsObjectSelectionList;IIII)V + ARG 0 buttons + ARG 1 selectionList + ARG 2 offsetX + ARG 3 offsetY + ARG 4 mouseX + ARG 5 mouseY + METHOD method_21114 handleClick (Lnet/minecraft/realms/RealmsObjectSelectionList;Lnet/minecraft/realms/RealmListEntry;Ljava/util/List;IDD)V + ARG 0 selectionList + ARG 1 entry + ARG 2 buttons + ARG 3 button + ARG 4 mouseX + ARG 6 mouseY + METHOD method_21115 getBottom ()I diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.mapping index 2074f2481a..d786d94466 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.mapping @@ -7,7 +7,10 @@ CLASS net/minecraft/class_4401 com/mojang/realmsclient/gui/screens/RealmsPending METHOD selectItem (I)V ARG 1 item CLASS class_4403 PendingInvitationSelectionListEntry + CLASS class_4404 AcceptButton + CLASS class_4405 RejectButton FIELD field_19953 mPendingInvite Lcom/mojang/realmsclient/dto/PendingInvite; + FIELD field_19955 buttons Ljava/util/List; METHOD (Lnet/minecraft/class_4401;Lcom/mojang/realmsclient/dto/PendingInvite;)V ARG 2 pendingInvite METHOD method_21324 renderPendingInvitationItem (Lcom/mojang/realmsclient/dto/PendingInvite;IIII)V @@ -43,6 +46,8 @@ CLASS net/minecraft/class_4401 com/mojang/realmsclient/gui/screens/RealmsPending ARG 3 mods METHOD method_21300 updateList (I)V ARG 1 slot + METHOD method_21301 getAgePresentation (Lcom/mojang/realmsclient/dto/PendingInvite;)Ljava/lang/String; + ARG 0 invite METHOD method_21306 renderMousehoverTooltip (Ljava/lang/String;II)V ARG 1 msg ARG 2 x diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index d553ec6729..53cb8b2519 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -127,7 +127,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block METHOD method_9504 onRainTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos - METHOD method_9505 getLightSubtracted (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I + METHOD method_9505 getOpacity (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I ARG 1 state ARG 2 view ARG 3 pos diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 2e28317dd5..1814649063 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -34,7 +34,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState ARG 2 pos ARG 3 oldState ARG 4 moved - METHOD method_11581 getLightSubtracted (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I + METHOD method_11581 getOpacity (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I ARG 1 view ARG 2 pos METHOD method_11582 canSuffocate (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/block/RedstoneWireBlock.mapping b/mappings/net/minecraft/block/RedstoneWireBlock.mapping index 0bb9bd9ac0..a784d596ba 100644 --- a/mappings/net/minecraft/block/RedstoneWireBlock.mapping +++ b/mappings/net/minecraft/block/RedstoneWireBlock.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock ARG 1 view ARG 2 pos ARG 3 dir - METHOD method_10478 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + METHOD method_10478 couldConnectTo (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 view ARG 2 pos ARG 3 dir diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index c60252ca9c..ac8557c4f3 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -1,13 +1,14 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity FIELD field_11863 world Lnet/minecraft/class_1937; FIELD field_11864 type Lnet/minecraft/class_2591; - FIELD field_11865 invalid Z + FIELD field_11865 removed Z FIELD field_11866 cachedState Lnet/minecraft/class_2680; FIELD field_11867 pos Lnet/minecraft/class_2338; FIELD field_11868 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_19314 invalid Z METHOD (Lnet/minecraft/class_2591;)V ARG 1 type - METHOD method_10996 validate ()V + METHOD method_10996 cancelRemoval ()V METHOD method_10997 getWorld ()Lnet/minecraft/class_1937; METHOD method_10998 setPos (Lnet/minecraft/class_2338;)V METHOD method_10999 writeIdentifyingData (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; @@ -26,12 +27,13 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_11009 setWorld (Lnet/minecraft/class_1937;)V METHOD method_11010 getCachedState ()Lnet/minecraft/class_2680; METHOD method_11011 shouldNotCopyTagFromItem ()Z - METHOD method_11012 invalidate ()V + METHOD method_11012 markRemoved ()V METHOD method_11013 applyRotation (Lnet/minecraft/class_2470;)V METHOD method_11014 fromTag (Lnet/minecraft/class_2487;)V - METHOD method_11015 isInvalid ()Z + METHOD method_11015 isRemoved ()Z METHOD method_11016 getPos ()Lnet/minecraft/class_2338; METHOD method_11017 getType ()Lnet/minecraft/class_2591; METHOD method_16886 toUpdatePacket ()Lnet/minecraft/class_2622; METHOD method_16887 toInitialChunkDataTag ()Lnet/minecraft/class_2487; + METHOD method_20525 markInvalid ()V METHOD method_5431 markDirty ()V diff --git a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping index 1acae6170d..f39ad50024 100644 --- a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping @@ -3,22 +3,60 @@ CLASS net/minecraft/class_2669 net/minecraft/block/entity/PistonBlockEntity FIELD field_12202 source Z FIELD field_12203 extending Z FIELD field_12204 pushedBlock Lnet/minecraft/class_2680; - FIELD field_12206 progress F - FIELD field_12207 nextProgress F + FIELD field_12206 lastProgress F + FIELD field_12207 progress F FIELD field_12208 savedWorldTime J METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;ZZ)V ARG 1 pushedBlock ARG 2 facing ARG 3 extending ARG 4 source + METHOD method_11493 getXIntersectionSize (Lnet/minecraft/class_238;Lnet/minecraft/class_2350;Lnet/minecraft/class_238;)D + ARG 0 box1 + ARG 1 direction + ARG 2 box2 METHOD method_11494 getRenderOffsetX (F)F + ARG 1 tickDelta METHOD method_11495 getPushedBlock ()Lnet/minecraft/class_2680; + METHOD method_11496 getHeadBlockState ()Lnet/minecraft/class_2680; + METHOD method_11497 getIntersectionSize (Lnet/minecraft/class_238;Lnet/minecraft/class_2350;Lnet/minecraft/class_238;)D + ARG 1 box1 + ARG 2 direction + ARG 3 box2 METHOD method_11498 getFacing ()Lnet/minecraft/class_2350; METHOD method_11499 getProgress (F)F + ARG 1 tickDelta + METHOD method_11500 offsetHeadBox (Lnet/minecraft/class_238;)Lnet/minecraft/class_238; + ARG 1 box METHOD method_11501 isExtending ()Z + METHOD method_11502 extendBox (Lnet/minecraft/class_238;Lnet/minecraft/class_2350;D)Lnet/minecraft/class_238; + ARG 1 box + ARG 2 direction + ARG 3 amount + METHOD method_11503 pushEntities (F)V + ARG 1 nextProgress + METHOD method_11504 getAmountExtended (F)F + ARG 1 progress + METHOD method_11505 getZIntersectionSize (Lnet/minecraft/class_238;Lnet/minecraft/class_2350;Lnet/minecraft/class_238;)D + ARG 0 box1 + ARG 1 direction + ARG 2 box2 + METHOD method_11506 getMovementDirection ()Lnet/minecraft/class_2350; METHOD method_11507 getRenderOffsetZ (F)F + ARG 1 tickDelta METHOD method_11508 getSavedWorldTime ()J + METHOD method_11509 getApproximateHeadBox (Ljava/util/List;)Lnet/minecraft/class_238; + ARG 1 boxes + METHOD method_11510 getYIntersectionSize (Lnet/minecraft/class_238;Lnet/minecraft/class_2350;Lnet/minecraft/class_238;)D + ARG 0 box1 + ARG 1 direction + ARG 2 box2 METHOD method_11511 getRenderOffsetY (F)F + ARG 1 tickDelta METHOD method_11512 getCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; METHOD method_11513 finish ()V + METHOD method_11514 push (Lnet/minecraft/class_1297;Lnet/minecraft/class_2350;D)V + ARG 1 entity + ARG 2 direction + ARG 3 amount METHOD method_11515 isSource ()Z diff --git a/mappings/net/minecraft/block/pattern/BlockPattern.mapping b/mappings/net/minecraft/block/pattern/BlockPattern.mapping index deaae7f34d..0fa3184c57 100644 --- a/mappings/net/minecraft/block/pattern/BlockPattern.mapping +++ b/mappings/net/minecraft/block/pattern/BlockPattern.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_2700 net/minecraft/block/pattern/BlockPattern METHOD method_11718 getWidth ()I METHOD method_11719 getForwards ()Lnet/minecraft/class_2350; METHOD method_11720 getHeight ()I + METHOD method_18478 getTeleportTarget (Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;DLnet/minecraft/class_243;D)Lnet/minecraft/class_2700$class_4297; CLASS class_4297 TeleportTarget FIELD field_19281 pos Lnet/minecraft/class_243; FIELD field_19282 velocity Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 248b888dc7..9a5cde1ed0 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -51,7 +51,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3177 renderRain ()V METHOD method_3178 renderCenter (FJ)V ARG 1 tickDelta - ARG 2 endTime + ARG 2 limitTime METHOD method_3179 renderFloatingText (Lnet/minecraft/class_327;Ljava/lang/String;FFFIFFZ)V ARG 0 textRenderer ARG 1 text @@ -73,7 +73,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3187 disableLightmap ()V METHOD method_3188 renderWorld (FJ)V ARG 1 tickDelta - ARG 2 endTime + ARG 2 limitTime METHOD method_3189 showFloatingItem (Lnet/minecraft/class_1799;)V ARG 1 floatingItem METHOD method_3190 updateTargetedEntity (F)V diff --git a/mappings/net/minecraft/client/render/RenderTickCounter.mapping b/mappings/net/minecraft/client/render/RenderTickCounter.mapping index 285fdaf7f7..6772f62db5 100644 --- a/mappings/net/minecraft/client/render/RenderTickCounter.mapping +++ b/mappings/net/minecraft/client/render/RenderTickCounter.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_317 net/minecraft/client/render/RenderTickCounter - FIELD field_1968 timeScale F + FIELD field_1968 tickTime F FIELD field_1969 lastFrameDuration F FIELD field_1970 tickDelta F FIELD field_1971 prevTimeMillis J diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 0381696d56..bb36043bd3 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -155,7 +155,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066; ARG 1 canSpawnOnMinimal METHOD method_3269 updateChunks (J)V - ARG 1 endTime + ARG 1 limitTime METHOD method_3270 canDrawEntityOutlines ()Z METHOD method_3271 renderEntities (Lnet/minecraft/class_4184;Lnet/minecraft/class_856;F)V ARG 3 tickDelta diff --git a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping index c172452899..2344b0fce4 100644 --- a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer CLASS class_864 Renderer METHOD method_20414 clear ()V METHOD method_3715 render (J)V + ARG 1 limitTime FIELD field_18777 pointsOfInterestDebugRenderer Lnet/minecraft/class_4207; FIELD field_18778 goalSelectorDebugRenderer Lnet/minecraft/class_4205; FIELD field_19325 raidCenterDebugRenderer Lnet/minecraft/class_4304; @@ -19,5 +20,38 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer FIELD field_4537 worldGenAttemptDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4538 heightmapDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4539 structureDebugRenderer Lnet/minecraft/class_870; - METHOD method_3709 renderDebuggers (J)V + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client + METHOD method_19429 drawFloatingText (Ljava/lang/String;DDDIF)V + ARG 0 string + ARG 1 x + ARG 3 y + ARG 5 z + ARG 7 color + ARG 8 size + METHOD method_20413 reset ()V + METHOD method_3709 render (J)V + ARG 1 limitTime + METHOD method_3711 drawBlockFloatingText (Ljava/lang/String;IIII)V + ARG 0 string + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 color + METHOD method_3712 drawFloatingText (Ljava/lang/String;DDDIFZFZ)V + ARG 0 string + ARG 1 x + ARG 3 y + ARG 5 z + ARG 7 color + ARG 8 size + ARG 9 centered + ARG 10 boldness + ARG 11 noDepthTest METHOD method_3713 toggleShowChunkBorder ()Z + METHOD method_3714 drawFloatingText (Ljava/lang/String;DDDI)V + ARG 0 string + ARG 1 x + ARG 3 y + ARG 5 z + ARG 7 color diff --git a/mappings/net/minecraft/client/render/debug/SkyLightDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/SkyLightDebugRenderer.mapping index 303ec9c03e..36c1eaf729 100644 --- a/mappings/net/minecraft/client/render/debug/SkyLightDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/SkyLightDebugRenderer.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_866 net/minecraft/client/render/debug/SkyLightDebugRenderer FIELD field_4612 client Lnet/minecraft/class_310; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client diff --git a/mappings/net/minecraft/command/EntitySelector.mapping b/mappings/net/minecraft/command/EntitySelector.mapping index 2f128dced3..51e9210695 100644 --- a/mappings/net/minecraft/command/EntitySelector.mapping +++ b/mappings/net/minecraft/command/EntitySelector.mapping @@ -6,15 +6,15 @@ CLASS net/minecraft/class_2300 net/minecraft/command/EntitySelector FIELD field_10824 box Lnet/minecraft/class_238; FIELD field_10825 distance Lnet/minecraft/class_2096$class_2099; FIELD field_10826 sorter Ljava/util/function/BiConsumer; - FIELD field_10827 checkPermissions Z + FIELD field_10827 usesAt Z FIELD field_10828 senderOnly Z FIELD field_10829 localWorldOnly Z - FIELD field_10830 includeNonPlayers Z + FIELD field_10830 includesNonPlayers Z FIELD field_10831 playerName Ljava/lang/String; FIELD field_10832 type Lnet/minecraft/class_1299; METHOD (IZZLjava/util/function/Predicate;Lnet/minecraft/class_2096$class_2099;Ljava/util/function/Function;Lnet/minecraft/class_238;Ljava/util/function/BiConsumer;ZLjava/lang/String;Ljava/util/UUID;Lnet/minecraft/class_1299;Z)V ARG 1 count - ARG 2 includeNonPlayers + ARG 2 includesNonPlayers ARG 3 localWorldOnly ARG 4 basePredicate ARG 5 distance @@ -25,7 +25,7 @@ CLASS net/minecraft/class_2300 net/minecraft/command/EntitySelector ARG 10 playerName ARG 11 uuid ARG 12 type - ARG 13 checkPermissions + ARG 13 usesAt METHOD method_9809 getEntity (Lnet/minecraft/class_2168;)Lnet/minecraft/class_1297; METHOD method_9811 getPlayer (Lnet/minecraft/class_2168;)Lnet/minecraft/class_3222; METHOD method_9813 getPlayers (Lnet/minecraft/class_2168;)Ljava/util/List; @@ -33,7 +33,7 @@ CLASS net/minecraft/class_2300 net/minecraft/command/EntitySelector METHOD method_9815 getLimit ()I METHOD method_9816 getEntities (Lnet/minecraft/class_2168;)Ljava/util/List; METHOD method_9817 getPositionPredicate (Lnet/minecraft/class_243;)Ljava/util/function/Predicate; - METHOD method_9818 check (Lnet/minecraft/class_2168;)V + METHOD method_9818 checkSourcePermission (Lnet/minecraft/class_2168;)V METHOD method_9819 includesNonPlayers ()Z METHOD method_9820 isSenderOnly ()Z METHOD method_9821 isLocalWorldOnly ()Z diff --git a/mappings/net/minecraft/command/EntitySelectorOptions.mapping b/mappings/net/minecraft/command/EntitySelectorOptions.mapping index c2e58e381d..b7f844b7ef 100644 --- a/mappings/net/minecraft/command/EntitySelectorOptions.mapping +++ b/mappings/net/minecraft/command/EntitySelectorOptions.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/class_2306 net/minecraft/command/EntitySelectorOptions CLASS class_2307 SelectorHandler + METHOD handle (Lnet/minecraft/class_2303;)V + ARG 1 reader CLASS class_2308 SelectorOption FIELD field_10894 description Lnet/minecraft/class_2561; FIELD field_10895 handler Lnet/minecraft/class_2306$class_2307; - FIELD field_10896 applicable Ljava/util/function/Predicate; + FIELD field_10896 condition Ljava/util/function/Predicate; + METHOD (Lnet/minecraft/class_2306$class_2307;Ljava/util/function/Predicate;Lnet/minecraft/class_2561;)V + ARG 1 handler + ARG 2 condition + ARG 3 description FIELD field_10885 UNKNOWN_OPTION_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_10886 TOO_SMALL_LEVEL_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_10887 INAPPLICABLE_OPTION_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; @@ -14,11 +20,13 @@ CLASS net/minecraft/class_2306 net/minecraft/command/EntitySelectorOptions FIELD field_10892 INVALID_TYPE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_10893 NEGATIVE_LEVEL_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD method_9930 suggestOptions (Lnet/minecraft/class_2303;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V + ARG 0 reader + ARG 1 suggestionBuilder METHOD method_9960 register ()V METHOD method_9961 putOption (Ljava/lang/String;Lnet/minecraft/class_2306$class_2307;Ljava/util/function/Predicate;Lnet/minecraft/class_2561;)V - ARG 0 name + ARG 0 id ARG 1 handler - ARG 2 predicate + ARG 2 condition ARG 3 description METHOD method_9976 getHandler (Lnet/minecraft/class_2303;Ljava/lang/String;I)Lnet/minecraft/class_2306$class_2307; ARG 0 reader diff --git a/mappings/net/minecraft/command/EntitySelectorReader.mapping b/mappings/net/minecraft/command/EntitySelectorReader.mapping index 7961e6ffab..ae7a182b1f 100644 --- a/mappings/net/minecraft/command/EntitySelectorReader.mapping +++ b/mappings/net/minecraft/command/EntitySelectorReader.mapping @@ -1,100 +1,155 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader FIELD field_10837 UNTERMINATED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_10838 distance Lnet/minecraft/class_2096$class_2099; - FIELD field_10839 offsetZ Ljava/lang/Double; - FIELD field_10840 checkPermissions Z + FIELD field_10839 z Ljava/lang/Double; + FIELD field_10840 usesAt Z + FIELD field_10841 selectsScores Z FIELD field_10842 levelRange Lnet/minecraft/class_2096$class_2100; - FIELD field_10843 includingNonPlayer Z + FIELD field_10843 includesNonPlayers Z FIELD field_10844 MISSING_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_10845 selectsTeam Z + FIELD field_10846 atAllowed Z FIELD field_10847 sorter Ljava/util/function/BiConsumer; FIELD field_10848 suggestionProvider Ljava/util/function/BiFunction; + FIELD field_10849 selectsGameMode Z FIELD field_10850 RANDOM Ljava/util/function/BiConsumer; - FIELD field_10852 boxY Ljava/lang/Double; + FIELD field_10851 hasLimit Z + FIELD field_10852 dy Ljava/lang/Double; FIELD field_10853 UNKNOWN_SELECTOR_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_10854 selectsName Z FIELD field_10855 VALUELESS_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_10856 ARBITRARY Ljava/util/function/BiConsumer; - FIELD field_10857 offsetX Ljava/lang/Double; + FIELD field_10857 x Ljava/lang/Double; FIELD field_10858 limit I FIELD field_10859 yawRange Lnet/minecraft/class_2152; FIELD field_10860 reader Lcom/mojang/brigadier/StringReader; FIELD field_10861 startCursor I - FIELD field_10862 boxX Ljava/lang/Double; + FIELD field_10862 dx Ljava/lang/Double; FIELD field_10863 entityType Lnet/minecraft/class_1299; + FIELD field_10864 selectsAdvancements Z + FIELD field_10865 excludesEntityType Z FIELD field_10866 localWorldOnly Z FIELD field_10867 DEFAULT_SUGGESTION_PROVIDER Ljava/util/function/BiFunction; + FIELD field_10868 excludesTeam Z FIELD field_10869 NEAREST Ljava/util/function/BiConsumer; FIELD field_10870 predicate Ljava/util/function/Predicate; - FIELD field_10872 offsetY Ljava/lang/Double; + FIELD field_10871 excludesGameMode Z + FIELD field_10872 y Ljava/lang/Double; + FIELD field_10873 hasSorter Z + FIELD field_10874 excludesName Z FIELD field_10875 INVALID_ENTITY_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_10876 playerName Ljava/lang/String; FIELD field_10877 pitchRange Lnet/minecraft/class_2152; FIELD field_10878 uuid Ljava/util/UUID; FIELD field_10879 senderOnly Z FIELD field_10880 NOT_ALLOWED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_10881 boxZ Ljava/lang/Double; + FIELD field_10881 dz Ljava/lang/Double; FIELD field_10882 FURTHEST Ljava/util/function/BiConsumer; + METHOD (Lcom/mojang/brigadier/StringReader;)V + ARG 1 reader + METHOD (Lcom/mojang/brigadier/StringReader;Z)V + ARG 1 reader + ARG 2 atAllowed + METHOD method_9833 setExcludesTeam (Z)V + ARG 1 excludesTeam METHOD method_9834 suggestSelectorRest (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder METHOD method_9835 getReader ()Lcom/mojang/brigadier/StringReader; - METHOD method_9840 getBoxY ()Ljava/lang/Double; - METHOD method_9841 setIncludingNonPlayer (Z)V - ARG 1 includingNonPlayer + METHOD method_9837 excludesGameMode ()Z + METHOD method_9839 selectsGameMode ()Z + METHOD method_9840 getDy ()Ljava/lang/Double; + METHOD method_9841 setIncludesNonPlayers (Z)V + ARG 1 includesNonPlayers METHOD method_9842 setEntityType (Lnet/minecraft/class_1299;)V ARG 1 entityType + METHOD method_9843 selectsScores ()Z + METHOD method_9844 excludesName ()Z METHOD method_9845 setSorter (Ljava/util/function/BiConsumer;)V ARG 1 sorter METHOD method_9846 setLevelRange (Lnet/minecraft/class_2096$class_2100;)V ARG 1 experienceRange METHOD method_9847 suggestEndNext (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + METHOD method_9848 setSelectsScores (Z)V + ARG 1 selectsScores METHOD method_9849 readRegular ()V - METHOD method_9850 setOffsetX (D)V - ARG 1 offsetX - METHOD method_9851 getBoxX ()Ljava/lang/Double; + METHOD method_9850 setX (D)V + ARG 1 x + METHOD method_9851 getDx ()Ljava/lang/Double; METHOD method_9852 setLocalWorldOnly ()V METHOD method_9853 getYawRange ()Lnet/minecraft/class_2152; METHOD method_9855 setYawRange (Lnet/minecraft/class_2152;)V + METHOD method_9857 setHasNegatedGameMode (Z)V + ARG 1 hasNegatedGameMode METHOD method_9858 suggestNormal (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder METHOD method_9859 rotationPredicate (Lnet/minecraft/class_2152;Ljava/util/function/ToDoubleFunction;)Ljava/util/function/Predicate; - METHOD method_9864 setOffsetY (D)V - ARG 1 offsetY - METHOD method_9868 getOffsetZ ()Ljava/lang/Double; + METHOD method_9860 setExcludesEntityType ()V + METHOD method_9861 selectsAdvancements ()Z + METHOD method_9864 setY (D)V + ARG 1 y + METHOD method_9865 setSelectsTeam (Z)V + ARG 1 selectsTeam + METHOD method_9866 hasLimit ()Z + METHOD method_9868 getZ ()Ljava/lang/Double; METHOD method_9870 setDistance (Lnet/minecraft/class_2096$class_2099;)V ARG 1 distance METHOD method_9871 build ()Lnet/minecraft/class_2300; METHOD method_9873 getDistance ()Lnet/minecraft/class_2096$class_2099; METHOD method_9874 readArguments ()V METHOD method_9875 setSuggestionProvider (Ljava/util/function/BiFunction;)V + METHOD method_9877 setHasLimit (Z)V + ARG 1 hasLimit METHOD method_9878 buildPredicate ()V - METHOD method_9879 setOffsetZ (D)V - ARG 1 offsetZ + METHOD method_9879 setZ (D)V + ARG 1 z METHOD method_9880 suggestSelector (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; - ARG 1 suggestionsBuilder + ARG 1 builder METHOD method_9882 read ()Lnet/minecraft/class_2300; METHOD method_9883 getPitchRange ()Lnet/minecraft/class_2152; - METHOD method_9884 getOffsetY ()Ljava/lang/Double; + METHOD method_9884 getY ()Ljava/lang/Double; METHOD method_9885 isSenderOnly ()Z - METHOD method_9886 hasEntityType ()Z - METHOD method_9891 setBoxX (D)V - ARG 1 boxX + METHOD method_9886 selectsEntityType ()Z + METHOD method_9887 setHasSorter (Z)V + ARG 1 hasSorter + METHOD method_9889 hasSorter ()Z + METHOD method_9890 setSelectsGameMode (Z)V + ARG 1 selectsGameMode + METHOD method_9891 setDx (D)V + ARG 1 dx METHOD method_9892 readNegationCharacter ()Z METHOD method_9893 suggestOpen (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder METHOD method_9894 createBox (DDD)Lnet/minecraft/class_238; ARG 1 x ARG 3 y ARG 5 z METHOD method_9895 getLevelRange ()Lnet/minecraft/class_2096$class_2100; METHOD method_9896 suggestSelector (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V + ARG 0 builder METHOD method_9898 setPitchRange (Lnet/minecraft/class_2152;)V + METHOD method_9899 setSelectsName (Z)V + ARG 1 selectsName METHOD method_9900 setLimit (I)V ARG 1 limit - METHOD method_9902 getOffsetX ()Ljava/lang/Double; - METHOD method_9905 setBoxY (D)V - ARG 1 boxY - METHOD method_9907 getBoxZ ()Ljava/lang/Double; + METHOD method_9902 getX ()Ljava/lang/Double; + METHOD method_9904 selectsTeam ()Z + METHOD method_9905 setDy (D)V + ARG 1 dy + METHOD method_9906 setSelectsAdvancements (Z)V + ARG 1 selectsAdvancements + METHOD method_9907 getDz ()Ljava/lang/Double; METHOD method_9908 listSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder METHOD method_9909 suggestOption (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + METHOD method_9910 excludesEntityType ()Z METHOD method_9911 suggestOptionOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder + METHOD method_9912 selectsName ()Z + METHOD method_9913 setExcludesName (Z)V METHOD method_9915 readTagCharacter ()Z METHOD method_9916 setPredicate (Ljava/util/function/Predicate;)V METHOD method_9917 readAtVariable ()V - METHOD method_9918 setBoxZ (D)V - ARG 1 boxZ + METHOD method_9918 setDz (D)V + ARG 1 dz diff --git a/mappings/net/minecraft/command/FloatRange.mapping b/mappings/net/minecraft/command/FloatRangeArgument.mapping similarity index 91% rename from mappings/net/minecraft/command/FloatRange.mapping rename to mappings/net/minecraft/command/FloatRangeArgument.mapping index 2d9583ee96..48e263f208 100644 --- a/mappings/net/minecraft/command/FloatRange.mapping +++ b/mappings/net/minecraft/command/FloatRangeArgument.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2152 net/minecraft/command/FloatRange +CLASS net/minecraft/class_2152 net/minecraft/command/FloatRangeArgument FIELD field_9778 min Ljava/lang/Float; FIELD field_9779 max Ljava/lang/Float; FIELD field_9780 ANY Lnet/minecraft/class_2152; diff --git a/mappings/net/minecraft/command/arguments/ItemStackArgument.mapping b/mappings/net/minecraft/command/arguments/ItemStackArgument.mapping index 2d043a3d5b..a2ae388c42 100644 --- a/mappings/net/minecraft/command/arguments/ItemStackArgument.mapping +++ b/mappings/net/minecraft/command/arguments/ItemStackArgument.mapping @@ -7,4 +7,5 @@ CLASS net/minecraft/class_2290 net/minecraft/command/arguments/ItemStackArgument METHOD method_9781 createStack (IZ)Lnet/minecraft/class_1799; ARG 1 amount ARG 2 checkOverstack + METHOD method_9782 asString ()Ljava/lang/String; METHOD method_9785 getItem ()Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/command/arguments/ItemStringReader.mapping b/mappings/net/minecraft/command/arguments/ItemStringReader.mapping index e73a225e29..d828dd4a85 100644 --- a/mappings/net/minecraft/command/arguments/ItemStringReader.mapping +++ b/mappings/net/minecraft/command/arguments/ItemStringReader.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_2291 net/minecraft/command/arguments/ItemStringReader METHOD method_9789 consume ()Lnet/minecraft/class_2291; METHOD method_9790 getId ()Lnet/minecraft/class_2960; METHOD method_9791 suggestAny (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9793 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 builder METHOD method_9794 suggestItem (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; METHOD method_9795 readItem ()V METHOD method_9796 suggestTag (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/container/MerchantContainer.mapping b/mappings/net/minecraft/container/MerchantContainer.mapping index 4db5e2bb32..e12a7b7238 100644 --- a/mappings/net/minecraft/container/MerchantContainer.mapping +++ b/mappings/net/minecraft/container/MerchantContainer.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_1728 net/minecraft/container/MerchantContainer ARG 2 stack METHOD method_20215 switchTo (I)V ARG 1 recipeIndex + METHOD method_20595 playYesSound ()V METHOD method_20700 setRefreshTrades (Z)V ARG 1 refreshable METHOD method_20701 canRefreshTrades ()Z diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index d68a65a31e..808ad7e157 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -44,14 +44,14 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_5991 lastPortalPosition Lnet/minecraft/class_2338; FIELD field_5992 verticalCollision Z FIELD field_5993 pistonMovementDelta [D - FIELD field_5994 distanceWalked F + FIELD field_5994 distanceTraveled F FIELD field_5995 NO_GRAVITY Lnet/minecraft/class_2940; FIELD field_5996 pistonMovementTick J FIELD field_5999 renderDistanceMultiplier D FIELD field_6000 inWater Z FIELD field_6001 trackedX J FIELD field_6002 world Lnet/minecraft/class_1937; - FIELD field_6003 nextStepDistance F + FIELD field_6003 nextStepSoundDistance F FIELD field_6004 prevPitch F FIELD field_6005 entityBounds Lnet/minecraft/class_238; FIELD field_6007 velocityDirty Z @@ -68,7 +68,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6018 portalCooldown I FIELD field_6020 lastPortalDirectionVector Lnet/minecraft/class_243; FIELD field_6021 uuid Ljava/util/UUID; - FIELD field_6022 aerialStepDelta F + FIELD field_6022 nextFlySoundDistance F FIELD field_6023 trackedY J FIELD field_6024 chunkX I FIELD field_6025 NULL_BOX Lnet/minecraft/class_238; @@ -93,13 +93,14 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 o METHOD method_17681 getWidth ()F METHOD method_17682 getHeight ()F - METHOD method_17833 calculateTangentialMotionVector (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;Lnet/minecraft/class_3726;Lnet/minecraft/class_3538;)Lnet/minecraft/class_243; - ARG 0 collisionVector - ARG 1 observerBounds + METHOD method_17833 adjustSingleAxisMovementForCollisions (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;Lnet/minecraft/class_3726;Lnet/minecraft/class_3538;)Lnet/minecraft/class_243; + ARG 0 movement + ARG 1 entityBoundingBox + ARG 2 world ARG 3 context ARG 4 collisions - METHOD method_17835 handleCollisions (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; - ARG 1 motionOffset + METHOD method_17835 adjustMovementForCollisions (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 movement METHOD method_17996 squaredHorizontalLength (Lnet/minecraft/class_243;)D ARG 0 vector METHOD method_18002 createSpawnPacket ()Lnet/minecraft/class_2596; @@ -121,16 +122,17 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_18381 getEyeHeight (Lnet/minecraft/class_4050;)F ARG 1 pose METHOD method_18382 calculateDimensions ()V - METHOD method_18794 applyPistonMovement (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; - ARG 1 offset + METHOD method_18794 adjustMovementForPiston (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 movement METHOD method_18795 movementInputToVelocity (Lnet/minecraft/class_243;FF)Lnet/minecraft/class_243; ARG 0 movementInput ARG 1 speed ARG 2 yaw - METHOD method_18796 clipSneakingMovement (Lnet/minecraft/class_243;Lnet/minecraft/class_1313;)Lnet/minecraft/class_243; - ARG 1 offset + METHOD method_18796 adjustMovementForSneaking (Lnet/minecraft/class_243;Lnet/minecraft/class_1313;)Lnet/minecraft/class_243; + ARG 1 movement ARG 2 type METHOD method_18797 calculatePistonMovementFactor (Lnet/minecraft/class_2350$class_2351;D)D + ARG 1 axis ARG 2 offsetFactor METHOD method_18798 getVelocity ()Lnet/minecraft/class_243; METHOD method_18799 setVelocity (Lnet/minecraft/class_243;)V @@ -156,13 +158,20 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 destX ARG 3 destY ARG 5 destZ - METHOD method_20736 calculateMotionVector (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1937;Lnet/minecraft/class_3726;Lnet/minecraft/class_3538;)Lnet/minecraft/class_243; - ARG 0 subject - ARG 1 collisionVector - ARG 2 observerBounds + METHOD method_20736 adjustMovementForCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1937;Lnet/minecraft/class_3726;Lnet/minecraft/class_3538;)Lnet/minecraft/class_243; + ARG 0 entity + ARG 1 movement + ARG 2 entityBoundingBox ARG 3 world ARG 4 context ARG 5 collisions + METHOD method_20737 adjustMovementForCollisions (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_3538;)Lnet/minecraft/class_243; + ARG 0 movement + ARG 1 entityBoundingBox + ARG 2 collisions + METHOD method_20802 getFireTime ()I + METHOD method_20803 setFireTime (I)V + ARG 1 fireTime METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V ARG 1 state @@ -442,6 +451,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 6 max METHOD method_5775 dropStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1542; ARG 1 stack + METHOD method_5776 hasWings ()Z METHOD method_5777 isInFluid (Lnet/minecraft/class_3494;)Z ARG 1 fluidTag METHOD method_5778 isBeingRainedOn ()Z @@ -457,7 +467,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 pitch METHOD method_5784 move (Lnet/minecraft/class_1313;Lnet/minecraft/class_243;)V ARG 1 type - ARG 2 offset + ARG 2 movement METHOD method_5785 scheduleVelocityUpdate ()V METHOD method_5786 saveSelfToTag (Lnet/minecraft/class_2487;)Z ARG 1 tag @@ -478,7 +488,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5799 isInsideWater ()Z METHOD method_5800 onStruckByLightning (Lnet/minecraft/class_1538;)V ARG 1 lightning - METHOD method_5801 calculateAerialStepDelta (F)F + METHOD method_5801 playFlySound (F)F ARG 1 distance METHOD method_5802 getRotationClient ()Lnet/minecraft/class_241; METHOD method_5803 setSilent (Z)V @@ -540,7 +550,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5843 getLastPortalDirection ()Lnet/minecraft/class_2350; METHOD method_5844 slowMovement (Lnet/minecraft/class_2680;Lnet/minecraft/class_243;)V ARG 1 state - ARG 2 multipliers + ARG 2 multiplier METHOD method_5845 getUuidAsString ()Ljava/lang/String; METHOD method_5846 toListTag ([D)Lnet/minecraft/class_2499; ARG 1 values @@ -579,7 +589,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 passenger METHOD method_5866 setWorld (Lnet/minecraft/class_1937;)V ARG 1 world - METHOD method_5867 calculateStepDelta ()F + METHOD method_5867 calculateNextStepSoundDistance ()F METHOD method_5868 collectPassengers (ZLjava/util/Set;)V ARG 1 playersOnly ARG 2 output diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 3cf68480ee..f616eef8b0 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -132,7 +132,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 world ARG 2 stack METHOD method_18867 deserializeBrain (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4095; - ARG 1 memory + ARG 1 dynamic METHOD method_18868 getBrain ()Lnet/minecraft/class_4095; METHOD method_18869 getEatSound (Lnet/minecraft/class_1799;)Lnet/minecraft/class_3414; ARG 1 stack @@ -215,9 +215,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6037 spawnItemParticles (Lnet/minecraft/class_1799;I)V ARG 1 stack ARG 2 count + METHOD method_6039 isBlocking ()Z METHOD method_6038 onDismounted (Lnet/minecraft/class_1297;)V ARG 1 vehicle - METHOD method_6039 isBlocking ()Z METHOD method_6040 consumeItem ()V METHOD method_6041 getFallSound (I)Lnet/minecraft/class_3414; ARG 1 distance diff --git a/mappings/net/minecraft/entity/ai/PathfindingUtil.mapping b/mappings/net/minecraft/entity/ai/PathfindingUtil.mapping deleted file mode 100644 index a0a84d249b..0000000000 --- a/mappings/net/minecraft/entity/ai/PathfindingUtil.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_1414 net/minecraft/entity/ai/PathfindingUtil - METHOD method_19108 findTargetStraight (Lnet/minecraft/class_1314;IILjava/util/function/ToDoubleFunction;)Lnet/minecraft/class_243; - METHOD method_6371 findTarget (Lnet/minecraft/class_1314;IIILnet/minecraft/class_243;ZDLjava/util/function/ToDoubleFunction;ZLjava/util/function/Predicate;IIZ)Lnet/minecraft/class_243; - METHOD method_6375 findTarget (Lnet/minecraft/class_1314;II)Lnet/minecraft/class_243; - METHOD method_6376 findTarget (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;)Lnet/minecraft/class_243; - METHOD method_6378 findTargetStraight (Lnet/minecraft/class_1314;II)Lnet/minecraft/class_243; - METHOD method_6380 isWater (Lnet/minecraft/class_2338;Lnet/minecraft/class_1314;)Z diff --git a/mappings/net/minecraft/entity/ai/TargetFinder.mapping b/mappings/net/minecraft/entity/ai/TargetFinder.mapping new file mode 100644 index 0000000000..6a045ea354 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/TargetFinder.mapping @@ -0,0 +1,51 @@ +CLASS net/minecraft/class_1414 net/minecraft/entity/ai/TargetFinder + METHOD method_19108 findGroundTarget (Lnet/minecraft/class_1314;IILjava/util/function/ToDoubleFunction;)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 pathfindingFavor + METHOD method_20658 findGroundTargetAwayFrom (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 pos + METHOD method_6371 findTarget (Lnet/minecraft/class_1314;IIILnet/minecraft/class_243;ZDLjava/util/function/ToDoubleFunction;ZLjava/util/function/Predicate;IIZ)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 4 direction + ARG 5 anywhere + ARG 6 maxAngleDifference + ARG 8 favorProvider + METHOD method_6373 findTargetTowards (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 pos + METHOD method_6375 findTarget (Lnet/minecraft/class_1314;II)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + METHOD method_6376 findTarget (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 direction + METHOD method_6377 findTargetTowards (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;D)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 pos + ARG 4 maxAngleDifference + METHOD method_6378 findGroundTarget (Lnet/minecraft/class_1314;II)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + METHOD method_6379 findTargetAwayFrom (Lnet/minecraft/class_1314;IILnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 0 mob + ARG 1 maxHorizontalDistance + ARG 2 maxVerticalDistance + ARG 3 pos + METHOD method_6380 isWater (Lnet/minecraft/class_2338;Lnet/minecraft/class_1314;)Z + ARG 0 pos + ARG 1 mob diff --git a/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping index 267e582c65..e7898d269d 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping @@ -4,6 +4,11 @@ CLASS net/minecraft/class_4103 net/minecraft/entity/ai/brain/task/CompositeTask METHOD method_18939 apply (Lnet/minecraft/class_4131;)V ARG 1 list CLASS class_4216 RunMode + METHOD method_19559 run (Lnet/minecraft/class_4131;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;J)V + ARG 1 tasks + ARG 2 world + ARG 3 entity + ARG 4 time FIELD field_18344 memoriesToForgetWhenStopped Ljava/util/Set; FIELD field_18345 order Lnet/minecraft/class_4103$class_4104; FIELD field_18346 runMode Lnet/minecraft/class_4103$class_4216; diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.mapping new file mode 100644 index 0000000000..98a34a8d5e --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_4458 net/minecraft/entity/ai/brain/task/GoToPointOfInterestTask + FIELD field_20288 speed F + FIELD field_20289 completionRange I + METHOD (FI)V + ARG 1 speed + ARG 2 completionRange diff --git a/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping index 890fbb5956..1621032669 100644 --- a/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/BirdPathNodeMaker.mapping @@ -1 +1,7 @@ CLASS net/minecraft/class_6 net/minecraft/entity/ai/pathing/BirdPathNodeMaker + METHOD getPathNodeType (Lnet/minecraft/class_1922;IIILnet/minecraft/class_1308;IIIZZ)Lnet/minecraft/class_7; + ARG 6 sizeX + ARG 7 sizeY + ARG 8 sizeZ + ARG 9 canOpenDoors + ARG 10 canEnterOpenDoors diff --git a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping index e2f4b73bcc..c0453f0908 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation + FIELD field_20293 currentTarget Lnet/minecraft/class_2338; FIELD field_6668 speed D FIELD field_6671 followRange Lnet/minecraft/class_1324; FIELD field_6673 pathNodeNavigator Lnet/minecraft/class_13; @@ -9,12 +10,20 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation FIELD field_6681 currentPath Lnet/minecraft/class_11; FIELD field_6684 entity Lnet/minecraft/class_1308; FIELD field_6685 lastRecalculateTime J - METHOD method_18416 findPathTo (Ljava/util/Set;IZI)Lnet/minecraft/class_11; + METHOD method_18416 findPathToAny (Ljava/util/Set;IZI)Lnet/minecraft/class_11; + ARG 1 positions + ARG 2 range + ARG 4 distance + METHOD method_21643 findPathToAny (Ljava/util/stream/Stream;I)Lnet/minecraft/class_11; + ARG 1 positions + ARG 2 distance METHOD method_6333 isValidPosition (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_6334 startMovingAlong (Lnet/minecraft/class_11;D)Z + ARG 1 path ARG 2 speed METHOD method_6335 startMovingTo (Lnet/minecraft/class_1297;D)Z + ARG 1 entity ARG 2 speed METHOD method_6336 createPathNodeNavigator (I)Lnet/minecraft/class_13; METHOD method_6337 startMovingTo (DDDD)Z @@ -37,13 +46,18 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation METHOD method_6345 getCurrentPath ()Lnet/minecraft/class_11; METHOD method_6347 getPos ()Lnet/minecraft/class_243; METHOD method_6348 findPathTo (Lnet/minecraft/class_2338;I)Lnet/minecraft/class_11; + ARG 1 target + ARG 2 distance METHOD method_6349 findPathTo (Lnet/minecraft/class_1297;I)Lnet/minecraft/class_11; + ARG 1 entity + ARG 2 distance METHOD method_6350 canSwim ()Z METHOD method_6351 isInLiquid ()Z METHOD method_6352 findPathTo (DDDI)Lnet/minecraft/class_11; ARG 1 x ARG 3 y ARG 5 z + ARG 7 distance METHOD method_6354 setCanSwim (Z)V ARG 1 canSwim METHOD method_6355 getTargetPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping index 92bae583a4..7b9a2b453d 100644 --- a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker FIELD field_63 waterPathNodeTypeWeight F - METHOD method_57 getPathNodeType (Lnet/minecraft/class_1308;III)Lnet/minecraft/class_7; + METHOD getNodeType (Lnet/minecraft/class_1922;IIILnet/minecraft/class_1308;IIIZZ)Lnet/minecraft/class_7; + ARG 1 world + METHOD method_20536 isValidDiagonalSuccessor (Lnet/minecraft/class_9;Lnet/minecraft/class_9;Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Z + ARG 1 node + ARG 2 successor1 + ARG 3 successor2 + ARG 4 diagonalSuccessor + METHOD method_57 getNodeType (Lnet/minecraft/class_1308;III)Lnet/minecraft/class_7; ARG 1 entity ARG 2 x ARG 3 y @@ -8,10 +15,34 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker ARG 1 blockView ARG 2 x ARG 3 y + METHOD method_60 getHeight (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)D + ARG 0 world + ARG 1 pos + METHOD method_61 adjustNodeType (Lnet/minecraft/class_1922;ZZLnet/minecraft/class_2338;Lnet/minecraft/class_7;)Lnet/minecraft/class_7; + ARG 1 world + ARG 2 canOpenDoors + ARG 3 canEnterOpenDoors + ARG 4 pos + ARG 5 type METHOD method_62 getPathNode (IIIIDLnet/minecraft/class_2350;)Lnet/minecraft/class_9; ARG 1 x ARG 2 y ARG 3 z ARG 4 maxYStep - METHOD method_63 getPathNodeType (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; + ARG 5 height + ARG 7 direction + METHOD method_63 getNodeType (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; ARG 1 entity + METHOD method_64 getNodeType (Lnet/minecraft/class_1922;IIIIIIZZLjava/util/EnumSet;Lnet/minecraft/class_7;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; + ARG 1 world + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 sizeX + ARG 6 sizeY + ARG 7 sizeZ + ARG 8 canOpenDoors + ARG 9 canEnterOpenDoors + ARG 10 nearbyTypes + ARG 11 type + ARG 12 pos diff --git a/mappings/net/minecraft/entity/ai/pathing/Path.mapping b/mappings/net/minecraft/entity/ai/pathing/Path.mapping index e7592c2952..d334897a22 100644 --- a/mappings/net/minecraft/entity/ai/pathing/Path.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/Path.mapping @@ -1,7 +1,16 @@ CLASS net/minecraft/class_11 net/minecraft/entity/ai/pathing/Path + FIELD field_20301 target Lnet/minecraft/class_2338; + FIELD field_20302 manhattanDistanceFromTarget F + FIELD field_20303 reachesTarget Z FIELD field_52 nodes Ljava/util/List; FIELD field_54 currentNodeIndex I + METHOD (Ljava/util/List;Lnet/minecraft/class_2338;Z)V + ARG 1 nodes + ARG 2 target + ARG 3 reachesTarget METHOD method_19314 getNodes ()Ljava/util/List; + METHOD method_21655 reachesTarget ()Z + METHOD method_21656 getManhattanDistanceFromTarget ()F METHOD method_33 setNode (ILnet/minecraft/class_9;)V ARG 1 index ARG 2 node @@ -9,6 +18,7 @@ CLASS net/minecraft/class_11 net/minecraft/entity/ai/pathing/Path ARG 0 buffer METHOD method_35 getCurrentPosition ()Lnet/minecraft/class_243; METHOD method_36 setLength (I)V + ARG 1 length METHOD method_38 getLength ()I METHOD method_39 getCurrentNodeIndex ()I METHOD method_40 getNode (I)Lnet/minecraft/class_9; @@ -22,4 +32,5 @@ CLASS net/minecraft/class_11 net/minecraft/entity/ai/pathing/Path METHOD method_47 getNodePosition (Lnet/minecraft/class_1297;I)Lnet/minecraft/class_243; ARG 1 entity ARG 2 index + METHOD method_48 getTarget ()Lnet/minecraft/class_2338; METHOD method_49 getNodePosition (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/entity/ai/pathing/PathMinHeap.mapping b/mappings/net/minecraft/entity/ai/pathing/PathMinHeap.mapping index d6a2e5c3e6..760613d229 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathMinHeap.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathMinHeap.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5 net/minecraft/entity/ai/pathing/PathMinHeap FIELD field_1 pathNodes [Lnet/minecraft/class_9; FIELD field_2 count I METHOD method_2 push (Lnet/minecraft/class_9;)Lnet/minecraft/class_9; + ARG 1 node METHOD method_3 setNodeWeight (Lnet/minecraft/class_9;F)V ARG 1 node METHOD method_4 shiftUp (I)V diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping index 4efdff2c37..f252b25f82 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping @@ -1,10 +1,16 @@ CLASS net/minecraft/class_9 net/minecraft/entity/ai/pathing/PathNode + FIELD field_34 distanceToNearestTarget F + FIELD field_35 previous Lnet/minecraft/class_9; + FIELD field_36 penalizedPathLength F FIELD field_37 heapIndex I FIELD field_38 z I FIELD field_39 y I FIELD field_40 x I FIELD field_41 type Lnet/minecraft/class_7; + FIELD field_42 visited Z + FIELD field_43 penalty F FIELD field_44 hashCode I + FIELD field_46 pathLength F FIELD field_47 heapWeight F METHOD (III)V ARG 1 x @@ -12,6 +18,11 @@ CLASS net/minecraft/class_9 net/minecraft/entity/ai/pathing/PathNode ARG 3 z METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD method_21652 getPos ()Lnet/minecraft/class_2338; + METHOD method_21653 getManhattanDistance (Lnet/minecraft/class_9;)F + ARG 1 node + METHOD method_21654 getManhattanDistance (Lnet/minecraft/class_2338;)F + ARG 1 pos METHOD method_26 copyWithNewPosition (III)Lnet/minecraft/class_9; ARG 1 x ARG 2 y @@ -19,9 +30,11 @@ CLASS net/minecraft/class_9 net/minecraft/entity/ai/pathing/PathNode METHOD method_27 isInHeap ()Z METHOD method_28 fromBuffer (Lnet/minecraft/class_2540;)Lnet/minecraft/class_9; ARG 0 buffer - METHOD method_30 calculateHashCode (III)I + METHOD method_30 hash (III)I ARG 0 x ARG 1 y ARG 2 z - METHOD method_31 distance (Lnet/minecraft/class_9;)F - METHOD method_32 distanceSquared (Lnet/minecraft/class_9;)F + METHOD method_31 getDistance (Lnet/minecraft/class_9;)F + ARG 1 node + METHOD method_32 getSquaredDistance (Lnet/minecraft/class_9;)F + ARG 1 node diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping index 7cafb576fd..24cced2c82 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeMaker.mapping @@ -1,39 +1,45 @@ CLASS net/minecraft/class_8 net/minecraft/entity/ai/pathing/PathNodeMaker - FIELD field_25 swims Z - FIELD field_27 pathsThroughDoors Z - FIELD field_29 entersOpenDoors Z + FIELD field_25 canSwim Z + FIELD field_27 canOpenDoors Z + FIELD field_29 canEnterOpenDoors Z FIELD field_32 pathNodeCache Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_33 entity Lnet/minecraft/class_1308; METHOD method_12 init (Lnet/minecraft/class_1950;Lnet/minecraft/class_1308;)V - METHOD method_13 getPathNode (III)Lnet/minecraft/class_9; + METHOD method_13 getNode (III)Lnet/minecraft/class_9; ARG 1 x ARG 2 y + ARG 3 z METHOD method_14 setCanSwim (Z)V + ARG 1 canSwim METHOD method_15 setCanEnterOpenDoors (Z)V - METHOD method_16 getPathNode (DDD)Lnet/minecraft/class_4459; + ARG 1 canEnterOpenDoors + METHOD method_16 getNode (DDD)Lnet/minecraft/class_4459; ARG 1 x ARG 3 y ARG 5 z - METHOD method_17 getPathNodeType (Lnet/minecraft/class_1922;IIILnet/minecraft/class_1308;IIIZZ)Lnet/minecraft/class_7; - ARG 1 blockView + METHOD method_17 getNodeType (Lnet/minecraft/class_1922;IIILnet/minecraft/class_1308;IIIZZ)Lnet/minecraft/class_7; + ARG 1 world ARG 2 x ARG 3 y ARG 4 z - ARG 5 entity - ARG 6 xSize - ARG 7 ySize - ARG 8 zSize - ARG 9 canPathThroughDoors - METHOD method_18 getPathNodes ([Lnet/minecraft/class_9;Lnet/minecraft/class_9;)I - ARG 1 nodes - ARG 2 startNode + ARG 5 mob + ARG 6 sizeX + ARG 7 sizeY + ARG 8 sizeZ + ARG 9 canOpenDoors + ARG 10 canEnterOpenDoors + METHOD method_18 getSuccessors ([Lnet/minecraft/class_9;Lnet/minecraft/class_9;)I + ARG 1 successors + ARG 2 node METHOD method_19 clear ()V - METHOD method_20 setCanPathThroughDoors (Z)V + METHOD method_20 setCanOpenDoors (Z)V + ARG 1 canOpenDoors METHOD method_21 getStart ()Lnet/minecraft/class_9; METHOD method_22 canSwim ()Z METHOD method_23 canEnterOpenDoors ()Z - METHOD method_24 canPathThroughDoors ()Z - METHOD method_25 getPathNodeType (Lnet/minecraft/class_1922;III)Lnet/minecraft/class_7; - ARG 1 blockView + METHOD method_24 canOpenDoors ()Z + METHOD method_25 getNodeType (Lnet/minecraft/class_1922;III)Lnet/minecraft/class_7; + ARG 1 world ARG 2 x ARG 3 y + ARG 4 z diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping index acc133eb90..b425d4fcc5 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeNavigator.mapping @@ -1,5 +1,26 @@ CLASS net/minecraft/class_13 net/minecraft/entity/ai/pathing/PathNodeNavigator + FIELD field_18708 range I + FIELD field_60 successors [Lnet/minecraft/class_9; FIELD field_61 pathNodeMaker Lnet/minecraft/class_8; FIELD field_62 minHeap Lnet/minecraft/class_5; - METHOD method_52 pathfind (Lnet/minecraft/class_1950;Lnet/minecraft/class_1308;Ljava/util/Set;FI)Lnet/minecraft/class_11; - METHOD method_54 pathfind (Lnet/minecraft/class_9;Ljava/util/Map;FI)Lnet/minecraft/class_11; + METHOD (Lnet/minecraft/class_8;I)V + ARG 1 pathNodeMaker + ARG 2 range + METHOD method_21658 calculateDistances (Lnet/minecraft/class_9;Ljava/util/Set;)F + ARG 1 node + ARG 2 targets + METHOD method_52 findPathToAny (Lnet/minecraft/class_1950;Lnet/minecraft/class_1308;Ljava/util/Set;FI)Lnet/minecraft/class_11; + ARG 1 world + ARG 2 mob + ARG 3 positions + ARG 4 followRange + ARG 5 distance + METHOD method_54 findPathToAny (Lnet/minecraft/class_9;Ljava/util/Map;FI)Lnet/minecraft/class_11; + ARG 1 startNode + ARG 2 positions + ARG 3 followRange + ARG 4 distance + METHOD method_55 createPath (Lnet/minecraft/class_9;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_11; + ARG 1 endNode + ARG 2 target + ARG 3 reachesTarget diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeType.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeType.mapping index 720866555b..13e848ba23 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNodeType.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeType.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_7 net/minecraft/entity/ai/pathing/PathNodeType - FIELD field_13 weight F - METHOD method_11 getWeight ()F + FIELD field_13 defaultPenalty F + METHOD (F)V + ARG 1 defaultPenalty + METHOD method_11 getDefaultPenalty ()F diff --git a/mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping b/mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping new file mode 100644 index 0000000000..42f2d63e05 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/pathing/TargetPathNode.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_4459 net/minecraft/entity/ai/pathing/TargetPathNode + FIELD field_20304 nearestNodeDistance F + FIELD field_20305 nearestNode Lnet/minecraft/class_9; + FIELD field_20306 reached Z + METHOD (III)V + ARG 1 x + ARG 2 y + ARG 3 z + METHOD (Lnet/minecraft/class_9;)V + ARG 1 node + METHOD method_21662 updateNearestNode (FLnet/minecraft/class_9;)V + ARG 1 distance + ARG 2 node + METHOD method_21663 fromBuffer (Lnet/minecraft/class_2540;)Lnet/minecraft/class_4459; + ARG 0 buffer + METHOD method_21664 getNearestNode ()Lnet/minecraft/class_9; + METHOD method_21665 markReached ()V + METHOD method_21666 isReached ()Z diff --git a/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping index 6c648b96c8..67a355125f 100644 --- a/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/WaterPathNodeMaker.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_12 net/minecraft/entity/ai/pathing/WaterPathNodeMaker - METHOD method_50 getPathNodeType (III)Lnet/minecraft/class_7; + METHOD method_50 getNodeType (III)Lnet/minecraft/class_7; ARG 1 x ARG 2 y METHOD method_51 getPathNodeInWater (III)Lnet/minecraft/class_9; diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping index 36411708ee..3e5cf0c244 100644 --- a/mappings/net/minecraft/entity/damage/DamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource FIELD field_5854 ON_FIRE Lnet/minecraft/class_1282; FIELD field_5855 IN_WALL Lnet/minecraft/class_1282; FIELD field_5856 DRAGON_BREATH Lnet/minecraft/class_1282; - FIELD field_5857 damageToCreative Z + FIELD field_5857 outOfWorld Z FIELD field_5858 HOT_FLOOR Lnet/minecraft/class_1282; FIELD field_5859 DROWN Lnet/minecraft/class_1282; FIELD field_5860 FIREWORKS Lnet/minecraft/class_1282; @@ -36,11 +36,12 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource METHOD method_21748 sting (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; ARG 0 attacker METHOD method_5504 isUnblockable ()Z - METHOD method_5505 setDamageToCreative ()Lnet/minecraft/class_1282; + METHOD method_5505 setOutOfWorld ()Lnet/minecraft/class_1282; METHOD method_5506 getDeathMessage (Lnet/minecraft/class_1309;)Lnet/minecraft/class_2561; METHOD method_5507 setFire ()Lnet/minecraft/class_1282; METHOD method_5508 setBypassesArmor ()Lnet/minecraft/class_1282; METHOD method_5509 setUnblockable ()Lnet/minecraft/class_1282; + METHOD method_5510 getPosition ()Lnet/minecraft/class_243; METHOD method_5511 mob (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; ARG 0 attacker METHOD method_5512 explosion (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1282; @@ -83,4 +84,4 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource ARG 0 magic ARG 1 attacker METHOD method_5537 bypassesArmor ()Z - METHOD method_5538 doesDamageToCreative ()Z + METHOD method_5538 isOutOfWorld ()Z diff --git a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping index a7aa076024..dcc72ed472 100644 --- a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping @@ -6,6 +6,9 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity ARG 1 value METHOD method_6934 getRotation ()I METHOD method_6935 setHeldItemStack (Lnet/minecraft/class_1799;)V + METHOD method_6936 dropHeldStack (Lnet/minecraft/class_1297;Z)V + ARG 1 entity + ARG 2 alwaysDrop METHOD method_6937 removeFromFrame (Lnet/minecraft/class_1799;)V ARG 1 map METHOD method_6938 getComparatorPower ()I diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 324b4f241d..944850263a 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity - FIELD field_18074 walkTarget Lnet/minecraft/class_2338; - FIELD field_18075 walkTargetRange F + FIELD field_18074 positionTarget Lnet/minecraft/class_2338; + FIELD field_18075 positionTargetRange F FIELD field_18279 holdingEntityId I FIELD field_6184 lootTableSeed J FIELD field_6185 targetSelector Lnet/minecraft/class_1355; @@ -14,7 +14,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity FIELD field_6193 MOB_FLAGS Lnet/minecraft/class_2940; FIELD field_6194 experiencePoints I FIELD field_6195 handItems Lnet/minecraft/class_2371; - FIELD field_6196 pathNodeTypeWeights Ljava/util/Map; + FIELD field_6196 pathfindingPenalties Ljava/util/Map; FIELD field_6198 lootTable Lnet/minecraft/class_2960; FIELD field_6199 target Lnet/minecraft/class_1309; FIELD field_6200 persistent Z @@ -27,14 +27,21 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity FIELD field_6207 moveControl Lnet/minecraft/class_1335; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V ARG 1 type + METHOD e (FF)F + ARG 1 yaw + METHOD isWalkTargetCompleted (Lnet/minecraft/class_2338;)Z + ARG 1 pos METHOD method_17326 cannotDespawn ()Z METHOD method_18407 isInWalkTargetRange (Lnet/minecraft/class_2338;)Z - METHOD method_18408 setWalkTarget (Lnet/minecraft/class_2338;I)V + ARG 1 pos + METHOD method_18408 setPositionTarget (Lnet/minecraft/class_2338;I)V + ARG 1 target + ARG 2 range METHOD method_18409 sendAiDebugData ()V - METHOD method_18410 hasWalkTargetRange ()Z + METHOD method_18410 hasPositionTarget ()Z METHOD method_18411 isInWalkTargetRange ()Z - METHOD method_18412 getWalkTarget ()Lnet/minecraft/class_2338; - METHOD method_18413 getWalkTargetRange ()F + METHOD method_18412 getPositionTarget ()Lnet/minecraft/class_2338; + METHOD method_18413 getPositionTargetRange ()F METHOD method_18809 isHolding (Lnet/minecraft/class_1792;)Z METHOD method_18810 setHoldingEntityId (I)V ARG 1 id @@ -60,9 +67,9 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 1 sidewaysMovement METHOD method_5939 canPickupItem (Lnet/minecraft/class_1799;)Z METHOD method_5940 deserializeLeashTag ()V - METHOD method_5941 setPathNodeTypeWeight (Lnet/minecraft/class_7;F)V - ARG 1 type - ARG 2 weight + METHOD method_5941 setPathfindingPenalty (Lnet/minecraft/class_7;F)V + ARG 1 nodeType + ARG 2 penalty METHOD method_5942 getNavigation ()Lnet/minecraft/class_1408; METHOD method_5943 initialize (Lnet/minecraft/class_1936;Lnet/minecraft/class_1266;Lnet/minecraft/class_3730;Lnet/minecraft/class_1315;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1315; ARG 1 world @@ -70,8 +77,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 3 spawnType ARG 4 entityData ARG 5 entityTag - METHOD method_5944 getPathNodeTypeWeight (Lnet/minecraft/class_7;)F - ARG 1 type + METHOD method_5944 getPathfindingPenalty (Lnet/minecraft/class_7;)F + ARG 1 nodeType METHOD method_5945 getLimitPerChunk ()I METHOD method_5946 setEquipmentDropChance (Lnet/minecraft/class_1304;F)V ARG 1 slot diff --git a/mappings/net/minecraft/inventory/BasicInventory.mapping b/mappings/net/minecraft/inventory/BasicInventory.mapping index 196eb9926e..b0c007be11 100644 --- a/mappings/net/minecraft/inventory/BasicInventory.mapping +++ b/mappings/net/minecraft/inventory/BasicInventory.mapping @@ -9,6 +9,13 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/BasicInventory METHOD method_20631 poll (Lnet/minecraft/class_1792;I)Lnet/minecraft/class_1799; ARG 1 item ARG 2 count + METHOD method_20632 transfer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V + ARG 1 source + ARG 2 target + METHOD method_20633 addToNewSlot (Lnet/minecraft/class_1799;)V + ARG 1 stack + METHOD method_20634 addToExistingSlot (Lnet/minecraft/class_1799;)V + ARG 1 stack METHOD method_5488 removeListener (Lnet/minecraft/class_1265;)V METHOD method_5489 addListener (Lnet/minecraft/class_1265;)V METHOD method_5491 add (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/item/ItemUsageContext.mapping b/mappings/net/minecraft/item/ItemUsageContext.mapping index 8b2a1fd50a..a75b614a28 100644 --- a/mappings/net/minecraft/item/ItemUsageContext.mapping +++ b/mappings/net/minecraft/item/ItemUsageContext.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_1838 net/minecraft/item/ItemUsageContext ARG 4 stack ARG 5 hit METHOD method_17698 getHitPos ()Lnet/minecraft/class_243; + METHOD method_17699 hitsInsideBlock ()Z METHOD method_20287 getHand ()Lnet/minecraft/class_1268; METHOD method_8036 getPlayer ()Lnet/minecraft/class_1657; METHOD method_8037 getBlockPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 093486ad3c..a6bb4cbd08 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -173,7 +173,9 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_17587 onOpenContainer (Lnet/minecraft/class_3944;)V ARG 1 packet - METHOD method_20203 handleChunkLoadDistance (Lnet/minecraft/class_4273;)V + METHOD method_20203 onChunkLoadDistance (Lnet/minecraft/class_4273;)V ARG 1 packet - METHOD method_20320 handleChunkRenderDistanceCenter (Lnet/minecraft/class_4282;)V + METHOD method_20320 onChunkRenderDistanceCenter (Lnet/minecraft/class_4282;)V + ARG 1 packet + METHOD method_21707 onBlockAction (Lnet/minecraft/class_4463;)V ARG 1 packet diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index 954137560b..f4eeb24baa 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -1,15 +1,29 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager FIELD field_19359 GSON Lcom/google/gson/Gson; - FIELD field_9023 recipeMap Ljava/util/Map; - FIELD field_9024 hadErrors Z + FIELD field_9023 recipes Ljava/util/Map; + FIELD field_9024 errored Z FIELD field_9027 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_17717 getAllForType (Lnet/minecraft/class_3956;)Ljava/util/Map; + METHOD apply (Ljava/util/Map;Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)V + ARG 1 preparedObject + ARG 2 resourceManager + ARG 3 profiler + METHOD method_17717 getAllOfType (Lnet/minecraft/class_3956;)Ljava/util/Map; + ARG 1 type METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1860; ARG 0 id ARG 1 json METHOD method_17877 getAllMatches (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Ljava/util/List; + ARG 1 type + ARG 2 inventory + ARG 3 world + METHOD method_20702 setRecipes (Ljava/lang/Iterable;)V + ARG 1 recipes METHOD method_8126 values ()Ljava/util/Collection; METHOD method_8127 keys ()Ljava/util/stream/Stream; METHOD method_8128 getRemainingStacks (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Lnet/minecraft/class_2371; METHOD method_8130 get (Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 id METHOD method_8132 getFirstMatch (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Ljava/util/Optional; + ARG 1 type + ARG 2 inventory + ARG 3 world diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping index 315b2e0523..3cfa093c93 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -17,3 +17,9 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack ARG 3 path ARG 4 searchLocation ARG 5 pathFilter + METHOD method_20728 isValidUrl (Ljava/lang/String;Ljava/net/URL;)Z + ARG 0 fileName + ARG 1 url + METHOD method_20729 getPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String; + ARG 0 type + ARG 1 id diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 5c9e7bb03d..74a34a2858 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -61,6 +61,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4595 dataPackContainerManager Lnet/minecraft/class_3283; FIELD field_4596 playerIdleTimeout I FIELD field_4597 profilerStartQueued Z + FIELD field_4599 proxy Ljava/net/Proxy; FIELD field_4601 loadingStage Lnet/minecraft/class_2561; FIELD field_4602 random Ljava/util/Random; FIELD field_4603 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; @@ -95,11 +96,13 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_20383 setEraseCache (Z)V ARG 1 eraseCache METHOD method_21613 dump (Ljava/nio/file/Path;)V + ARG 1 path METHOD method_21614 dumpExampleCrash (Ljava/nio/file/Path;)V METHOD method_21615 dumpGamerules (Ljava/nio/file/Path;)V METHOD method_21616 dumpClasspath (Ljava/nio/file/Path;)V METHOD method_21692 dumpStats (Ljava/nio/file/Path;)V METHOD method_21713 dumpThreads (Ljava/nio/file/Path;)V + METHOD method_21714 getFunctionPermissionLevel ()I METHOD method_3716 getKeyPair ()Ljava/security/KeyPair; METHOD method_3717 start ()V METHOD method_3718 isFlightEnabled ()Z diff --git a/mappings/net/minecraft/server/command/DebugCommand.mapping b/mappings/net/minecraft/server/command/DebugCommand.mapping index 84f04c374a..028c281fdb 100644 --- a/mappings/net/minecraft/server/command/DebugCommand.mapping +++ b/mappings/net/minecraft/server/command/DebugCommand.mapping @@ -8,3 +8,5 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand ARG 0 source METHOD method_13159 executeStart (Lnet/minecraft/class_2168;)I ARG 0 source + METHOD method_21618 createDebugReport (Lnet/minecraft/class_2168;)I + ARG 0 source diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index 7fbb381e6e..e973129a5f 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -44,4 +44,5 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_16843 levelSeed Ljava/lang/String; FIELD field_16844 viewDistance I FIELD field_16845 opPermissionLevel I + FIELD field_20324 functionPermissionLevel I METHOD method_16714 load (Ljava/nio/file/Path;)Lnet/minecraft/class_3806; diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index 79ca6ad2c7..27ab3858ae 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -22,4 +22,5 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction METHOD method_9194 getId ()Lnet/minecraft/class_2960; METHOD method_9195 create (Lnet/minecraft/class_2960;Lnet/minecraft/class_2991;Ljava/util/List;)Lnet/minecraft/class_2158; ARG 0 id + ARG 1 commandFunctionManager ARG 2 fileLines diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index 080f550821..3590818520 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana FIELD field_19332 pending Ljava/util/List; METHOD (Lnet/minecraft/server/MinecraftServer;)V ARG 1 server - METHOD method_12899 getFunctionCommandSource ()Lnet/minecraft/class_2168; + METHOD method_12899 getTaggedFunctionSource ()Lnet/minecraft/class_2168; METHOD method_12900 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; METHOD method_12901 getTags ()Lnet/minecraft/class_3503; METHOD method_12902 getMaxCommandChainLength ()I @@ -38,3 +38,4 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana METHOD method_12907 getServer ()Lnet/minecraft/server/MinecraftServer; METHOD method_12912 getFunctions ()Ljava/util/Map; METHOD method_18699 tick ()V + METHOD method_20796 getCommandFunctionSource ()Lnet/minecraft/class_2168; diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 953551f968..371707a304 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -62,3 +62,5 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager METHOD method_20585 (JLjava/util/function/Function;)Z ARG 1 pos METHOD method_20587 initChunkCaches ()V + METHOD onLightUpdate (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;)V + ARG 2 pos diff --git a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping index ae36a8fceb..324d82631c 100644 --- a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping +++ b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3227 net/minecraft/server/world/ServerLightingProvider + CLASS class_3901 Stage FIELD field_14020 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_17255 processor Lnet/minecraft/class_3846; FIELD field_17256 pendingTasks Lit/unimi/dsi/fastutil/objects/ObjectList; @@ -11,6 +12,8 @@ CLASS net/minecraft/class_3227 net/minecraft/server/world/ServerLightingProvider ARG 5 actor METHOD a (Lnet/minecraft/class_2338;I)V ARG 1 pos + METHOD enableLight (Lnet/minecraft/class_1923;Z)V + ARG 1 pos METHOD method_14277 runTasks ()V METHOD method_17303 tick ()V METHOD method_17304 setTaskBatchSize (I)V @@ -27,3 +30,6 @@ CLASS net/minecraft/class_3227 net/minecraft/server/world/ServerLightingProvider ARG 3 stage ARG 4 task METHOD method_17310 light (Lnet/minecraft/class_2791;Z)Ljava/util/concurrent/CompletableFuture; + ARG 1 chunk + METHOD method_20386 updateChunkStatus (Lnet/minecraft/class_1923;)V + ARG 1 pos diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 932a2031f6..fc5c0af66e 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -131,5 +131,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_18724 isTooFarFromPlayersToSpawnMobs (Lnet/minecraft/class_1923;)Z METHOD method_18727 tickPlayerMovement ()V METHOD method_19488 getPointOfInterestStorage ()Lnet/minecraft/class_4153; + METHOD method_20441 releaseLightTicket (Lnet/minecraft/class_1923;)V + ARG 1 pos METHOD method_20580 createBorderFuture (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture; METHOD method_21619 exportChunks (Ljava/io/Writer;)V diff --git a/mappings/net/minecraft/structure/StructureManager.mapping b/mappings/net/minecraft/structure/StructureManager.mapping index 895ea3c94e..dadd5a0244 100644 --- a/mappings/net/minecraft/structure/StructureManager.mapping +++ b/mappings/net/minecraft/structure/StructureManager.mapping @@ -10,9 +10,10 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureManager ARG 3 dataFixer METHOD method_15085 getStructurePath (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 id - ARG 2 string + ARG 2 extension METHOD method_15086 getAndCheckStructurePath (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 id + ARG 2 extension METHOD method_15087 unloadStructure (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_15088 loadStructureFromResource (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3499; diff --git a/mappings/net/minecraft/tag/TagContainer.mapping b/mappings/net/minecraft/tag/TagContainer.mapping index d8eeb0a866..68ec3695e4 100644 --- a/mappings/net/minecraft/tag/TagContainer.mapping +++ b/mappings/net/minecraft/tag/TagContainer.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagContainer FIELD field_15601 ordered Z - FIELD field_15602 idMap Ljava/util/Map; + FIELD field_15602 entries Ljava/util/Map; FIELD field_15603 JSON_EXTENSION_LENGTH I FIELD field_15605 dataType Ljava/lang/String; FIELD field_15606 entryType Ljava/lang/String; @@ -25,3 +25,5 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagContainer METHOD method_15196 getEntries ()Ljava/util/Map; METHOD method_18242 applyReload (Ljava/util/Map;)V ARG 1 preparedBuilders + METHOD method_20735 setEntries (Ljava/util/Map;)V + ARG 1 entries diff --git a/mappings/net/minecraft/util/ChunkPosLevelPropagator.mapping b/mappings/net/minecraft/util/ChunkPosDistanceLevelPropagator.mapping similarity index 56% rename from mappings/net/minecraft/util/ChunkPosLevelPropagator.mapping rename to mappings/net/minecraft/util/ChunkPosDistanceLevelPropagator.mapping index d91f6c5832..8ebafa170a 100644 --- a/mappings/net/minecraft/util/ChunkPosLevelPropagator.mapping +++ b/mappings/net/minecraft/util/ChunkPosDistanceLevelPropagator.mapping @@ -1,11 +1,11 @@ -CLASS net/minecraft/class_3196 net/minecraft/util/ChunkPosLevelPropagator +CLASS net/minecraft/class_3196 net/minecraft/util/ChunkPosDistanceLevelPropagator METHOD (III)V ARG 1 levelCount ARG 2 initLevelCapacity ARG 3 initTotalCapacity - METHOD method_14027 update (JIZ)V + METHOD method_14027 updateLevel (JIZ)V ARG 1 chunkPos ARG 3 distance - ARG 4 playerPresent + ARG 4 decrease METHOD method_14028 getInitialLevel (J)I ARG 1 id diff --git a/mappings/net/minecraft/util/CuboidBlockIterator.mapping b/mappings/net/minecraft/util/CuboidBlockIterator.mapping index eef431e2b5..5b2e4e9e83 100644 --- a/mappings/net/minecraft/util/CuboidBlockIterator.mapping +++ b/mappings/net/minecraft/util/CuboidBlockIterator.mapping @@ -20,3 +20,4 @@ CLASS net/minecraft/class_3980 net/minecraft/util/CuboidBlockIterator METHOD method_18671 getX ()I METHOD method_18672 getY ()I METHOD method_18673 getZ ()I + METHOD method_20789 getEdgeCoordinatesCount ()I diff --git a/mappings/net/minecraft/util/FileNameUtil.mapping b/mappings/net/minecraft/util/FileNameUtil.mapping index fd542336db..acac05950f 100644 --- a/mappings/net/minecraft/util/FileNameUtil.mapping +++ b/mappings/net/minecraft/util/FileNameUtil.mapping @@ -7,3 +7,7 @@ CLASS net/minecraft/class_4239 net/minecraft/util/FileNameUtil METHOD method_20200 isNormal (Ljava/nio/file/Path;)Z ARG 0 path METHOD method_20201 isAllowedName (Ljava/nio/file/Path;)Z + METHOD method_20202 getResourcePath (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;)Ljava/nio/file/Path; + ARG 0 path + ARG 1 resourceName + ARG 2 extension diff --git a/mappings/net/minecraft/util/NonBlockingThreadExecutor.mapping b/mappings/net/minecraft/util/NonBlockingThreadExecutor.mapping index ae7495376d..97a6fcd554 100644 --- a/mappings/net/minecraft/util/NonBlockingThreadExecutor.mapping +++ b/mappings/net/minecraft/util/NonBlockingThreadExecutor.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_4093 net/minecraft/util/NonBlockingThreadExecutor FIELD field_18320 runningTasks I + METHOD (Ljava/lang/String;)V + ARG 1 name METHOD method_18860 hasRunningTasks ()Z diff --git a/mappings/net/minecraft/util/NumberRange.mapping b/mappings/net/minecraft/util/NumberRange.mapping index 5b8033e84f..f1d960cd5b 100644 --- a/mappings/net/minecraft/util/NumberRange.mapping +++ b/mappings/net/minecraft/util/NumberRange.mapping @@ -31,7 +31,8 @@ CLASS net/minecraft/class_2096 net/minecraft/util/NumberRange METHOD method_9053 atLeast (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value METHOD method_9054 test (I)Z - METHOD method_9055 (Lcom/mojang/brigadier/StringReader;Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/class_2096$class_2100; + METHOD method_9055 parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/class_2096$class_2100; + ARG 0 reader ARG 1 min ARG 2 max METHOD method_9056 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2096$class_2100; diff --git a/mappings/net/minecraft/util/PackedIntegerArray.mapping b/mappings/net/minecraft/util/PackedIntegerArray.mapping index d7b841eddf..a6fc156f28 100644 --- a/mappings/net/minecraft/util/PackedIntegerArray.mapping +++ b/mappings/net/minecraft/util/PackedIntegerArray.mapping @@ -21,3 +21,5 @@ CLASS net/minecraft/class_3508 net/minecraft/util/PackedIntegerArray ARG 1 index ARG 2 value METHOD method_15215 getSize ()I + METHOD method_21739 forEach (Ljava/util/function/IntConsumer;)V + ARG 1 consumer diff --git a/mappings/net/minecraft/util/SectionDistanceLevelPropagator.mapping b/mappings/net/minecraft/util/SectionDistanceLevelPropagator.mapping new file mode 100644 index 0000000000..f46051d97c --- /dev/null +++ b/mappings/net/minecraft/util/SectionDistanceLevelPropagator.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_4079 net/minecraft/util/SectionDistanceLevelPropagator + METHOD (III)V + ARG 1 levelCount + ARG 2 initialLevelCapacity + ARG 3 initialTotalCapacity + METHOD method_18749 getInitialLevel (J)I + ARG 1 id + METHOD method_18750 update (JIZ)V + ARG 1 id + ARG 3 level + ARG 4 decrease diff --git a/mappings/net/minecraft/util/SectionRelativeLevelPropagator.mapping b/mappings/net/minecraft/util/SectionRelativeLevelPropagator.mapping deleted file mode 100644 index b802220d4c..0000000000 --- a/mappings/net/minecraft/util/SectionRelativeLevelPropagator.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_4079 net/minecraft/util/SectionRelativeLevelPropagator - METHOD method_18749 getInitialLevel (J)I - ARG 1 id - METHOD method_18750 update (JIZ)V - ARG 1 id - ARG 3 limitLevel - ARG 4 mergeAsMin diff --git a/mappings/net/minecraft/util/SystemUtil.mapping b/mappings/net/minecraft/util/SystemUtil.mapping index 0312a39d66..8b4aabf2ab 100644 --- a/mappings/net/minecraft/util/SystemUtil.mapping +++ b/mappings/net/minecraft/util/SystemUtil.mapping @@ -2,12 +2,15 @@ CLASS net/minecraft/class_156 net/minecraft/util/SystemUtil CLASS class_157 IdentityHashStrategy CLASS class_158 OperatingSystem METHOD method_669 open (Ljava/net/URL;)V + ARG 1 url METHOD method_670 open (Ljava/lang/String;)V METHOD method_672 open (Ljava/io/File;)V METHOD method_673 open (Ljava/net/URI;)V METHOD method_674 getURLOpenCommand (Ljava/net/URL;)[Ljava/lang/String; + ARG 1 url FIELD field_1128 nanoTimeSupplier Ljava/util/function/LongSupplier; FIELD field_1129 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_18034 NEXT_SERVER_WORKER_ID Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_18035 SERVER_WORKER_EXECUTOR Ljava/util/concurrent/ExecutorService; METHOD method_17815 stream (Ljava/util/Optional;)Ljava/util/stream/Stream; METHOD method_17974 ifPresentOrElse (Ljava/util/Optional;Ljava/util/function/Consumer;Ljava/lang/Runnable;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/util/ThreadExecutor.mapping b/mappings/net/minecraft/util/ThreadExecutor.mapping index bbf5220092..0ee8ad2243 100644 --- a/mappings/net/minecraft/util/ThreadExecutor.mapping +++ b/mappings/net/minecraft/util/ThreadExecutor.mapping @@ -1,21 +1,28 @@ CLASS net/minecraft/class_1255 net/minecraft/util/ThreadExecutor FIELD field_18318 name Ljava/lang/String; - FIELD field_18319 waitCount I FIELD field_5750 taskQueue Ljava/util/Queue; FIELD field_5751 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Ljava/lang/String;)V + ARG 1 name METHOD method_16075 executeQueuedTask ()Z - METHOD method_16211 prepareRunnable (Ljava/lang/Runnable;)Ljava/lang/Runnable; + METHOD method_16211 createTask (Ljava/lang/Runnable;)Ljava/lang/Runnable; + ARG 1 runnable METHOD method_18854 isOnThread ()Z - METHOD method_18855 clear ()V - METHOD method_18856 canRun (Ljava/lang/Runnable;)Z + METHOD method_18855 clearTasks ()V + METHOD method_18856 canExecute (Ljava/lang/Runnable;)Z + ARG 1 task + METHOD method_18857 executeTasks (Ljava/util/function/BooleanSupplier;)V + ARG 1 stopCondition + METHOD method_18859 executeTask (Ljava/lang/Runnable;)V ARG 1 task - METHOD method_18857 waitFor (Ljava/util/function/BooleanSupplier;)V - METHOD method_18859 runSafely (Ljava/lang/Runnable;)V METHOD method_19537 executeSync (Ljava/lang/Runnable;)V ARG 1 runnable + METHOD method_20813 waitForTasks ()V + METHOD method_21684 getTaskQueueSize ()I METHOD method_3777 getThread ()Ljava/lang/Thread; - METHOD method_5382 executeFuture (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; + METHOD method_5382 createFuture (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; ARG 1 runnable - METHOD method_5383 executeTaskQueue ()V - METHOD method_5384 shouldRunAsync ()Z - METHOD method_5385 executeFuture (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; + METHOD method_5383 executeQueuedTasks ()V + METHOD method_5384 shouldExecuteAsync ()Z + METHOD method_5385 supply (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; + ARG 1 supplier diff --git a/mappings/net/minecraft/util/crash/CrashReport.mapping b/mappings/net/minecraft/util/crash/CrashReport.mapping index e204894d6d..2824a444d0 100644 --- a/mappings/net/minecraft/util/crash/CrashReport.mapping +++ b/mappings/net/minecraft/util/crash/CrashReport.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_128 net/minecraft/util/crash/CrashReport METHOD method_555 addStackTrace (Ljava/lang/StringBuilder;)V METHOD method_556 addElement (Ljava/lang/String;I)Lnet/minecraft/class_129; ARG 1 name + ARG 2 ignoredStackTraceCallCount METHOD method_557 getCauseAsString ()Ljava/lang/String; METHOD method_559 fillSystemDetails ()V METHOD method_560 create (Ljava/lang/Throwable;Ljava/lang/String;)Lnet/minecraft/class_128; @@ -19,6 +20,7 @@ CLASS net/minecraft/class_128 net/minecraft/util/crash/CrashReport ARG 1 title METHOD method_561 getMessage ()Ljava/lang/String; METHOD method_562 addElement (Ljava/lang/String;)Lnet/minecraft/class_129; + ARG 1 name METHOD method_564 getCause ()Ljava/lang/Throwable; METHOD method_567 getSystemDetailsSection ()Lnet/minecraft/class_129; METHOD method_568 asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/crash/CrashReportSection.mapping b/mappings/net/minecraft/util/crash/CrashReportSection.mapping index c8852d112b..0e7c57787a 100644 --- a/mappings/net/minecraft/util/crash/CrashReportSection.mapping +++ b/mappings/net/minecraft/util/crash/CrashReportSection.mapping @@ -15,7 +15,10 @@ CLASS net/minecraft/class_129 net/minecraft/util/crash/CrashReportSection METHOD method_577 add (Ljava/lang/String;Lnet/minecraft/class_133;)Lnet/minecraft/class_129; METHOD method_578 add (Ljava/lang/String;Ljava/lang/Object;)Lnet/minecraft/class_129; ARG 1 name - METHOD method_579 trimStackTrace (I)I + METHOD method_579 initStackTrace (I)I + ARG 1 ignoredCallCount + METHOD method_580 trimStackTraceEnd (I)V + ARG 1 callCount METHOD method_581 createPositionString (III)Ljava/lang/String; ARG 0 x ARG 1 y diff --git a/mappings/net/minecraft/util/hit/BlockHitResult.mapping b/mappings/net/minecraft/util/hit/BlockHitResult.mapping index 05875eb15c..696b13642f 100644 --- a/mappings/net/minecraft/util/hit/BlockHitResult.mapping +++ b/mappings/net/minecraft/util/hit/BlockHitResult.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_3965 net/minecraft/util/hit/BlockHitResult FIELD field_17588 side Lnet/minecraft/class_2350; FIELD field_17589 blockPos Lnet/minecraft/class_2338; FIELD field_17590 missed Z + FIELD field_17591 insideBlock Z METHOD (Lnet/minecraft/class_243;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Z)V ARG 1 pos ARG 2 side @@ -11,6 +12,7 @@ CLASS net/minecraft/class_3965 net/minecraft/util/hit/BlockHitResult ARG 2 pos ARG 3 side ARG 4 blockPos + ARG 5 insideBlock METHOD method_17777 getBlockPos ()Lnet/minecraft/class_2338; METHOD method_17778 createMissed (Lnet/minecraft/class_243;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3965; ARG 0 pos @@ -19,3 +21,4 @@ CLASS net/minecraft/class_3965 net/minecraft/util/hit/BlockHitResult METHOD method_17779 withSide (Lnet/minecraft/class_2350;)Lnet/minecraft/class_3965; ARG 1 side METHOD method_17780 getSide ()Lnet/minecraft/class_2350; + METHOD method_17781 isInsideBlock ()Z diff --git a/mappings/net/minecraft/util/math/ChunkPos.mapping b/mappings/net/minecraft/util/math/ChunkPos.mapping index 9a66e31bdf..3d409b2e63 100644 --- a/mappings/net/minecraft/util/math/ChunkPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkPos.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_1923 net/minecraft/util/math/ChunkPos FIELD field_18684 position Lnet/minecraft/class_1923; METHOD tryAdvance (Ljava/util/function/Consumer;)Z ARG 1 consumer - FIELD field_17348 INVALID J + FIELD field_17348 MARKER J FIELD field_9180 z I FIELD field_9181 x I METHOD (II)V diff --git a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping index 86adb94ad1..e9b9f6ee4f 100644 --- a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping @@ -7,8 +7,8 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos ARG 1 x ARG 2 y ARG 3 z - METHOD method_18674 getChunkX ()I - METHOD method_18675 toChunkCoord (I)I + METHOD method_18674 getSectionX ()I + METHOD method_18675 getSectionCoord (I)I ARG 0 coord METHOD method_18676 from (III)Lnet/minecraft/class_4076; ARG 0 x @@ -16,43 +16,45 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos ARG 2 z METHOD method_18677 from (J)Lnet/minecraft/class_4076; ARG 0 packed - METHOD method_18678 offsetPacked (JIII)J + METHOD method_18678 offset (JIII)J ARG 0 packed ARG 2 x ARG 3 y ARG 4 z - METHOD method_18679 offsetPacked (JLnet/minecraft/class_2350;)J + METHOD method_18679 offset (JLnet/minecraft/class_2350;)J ARG 0 packed ARG 2 direction METHOD method_18680 from (Lnet/minecraft/class_1297;)Lnet/minecraft/class_4076; + ARG 0 entity METHOD method_18681 from (Lnet/minecraft/class_1923;I)Lnet/minecraft/class_4076; ARG 0 chunkPos ARG 1 y METHOD method_18682 from (Lnet/minecraft/class_2338;)Lnet/minecraft/class_4076; ARG 0 pos - METHOD method_18683 getChunkY ()I - METHOD method_18684 toLocalCoord (I)I + METHOD method_18683 getSectionY ()I + METHOD method_18684 getLocalCoord (I)I ARG 0 coord METHOD method_18685 asLong (III)J ARG 0 x ARG 1 y ARG 2 z - METHOD method_18686 unpackLongX (J)I + METHOD method_18686 getX (J)I ARG 0 packed - METHOD method_18687 getChunkZ ()I - METHOD method_18688 fromChunkCoord (I)I - ARG 0 coord - METHOD method_18689 unpackLongY (J)I + METHOD method_18687 getSectionZ ()I + METHOD method_18688 getWorldCoord (I)I + ARG 0 chunkCoord + METHOD method_18689 getY (J)I ARG 0 packed - METHOD method_18690 unpackLongZ (J)I + METHOD method_18690 getZ (J)I ARG 0 packed - METHOD method_18691 toChunkLong (J)J + METHOD method_18691 fromGlobalPos (J)J ARG 0 globalLong METHOD method_18692 toChunkPos ()Lnet/minecraft/class_1923; - METHOD method_18693 toLightStorageIndex (J)J + METHOD method_18693 withZeroZ (J)J ARG 0 pos METHOD method_18694 asLong ()J - METHOD method_19454 packToShort (Lnet/minecraft/class_2338;)S + METHOD method_19454 getPackedLocalPos (Lnet/minecraft/class_2338;)S + ARG 0 pos METHOD method_19527 getMinX ()I METHOD method_19528 getMinY ()I METHOD method_19529 getMinZ ()I diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 6b5e6c0df4..08b60840fd 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -25,7 +25,9 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper METHOD method_15345 fastInverseSqrt (D)D ARG 0 value METHOD method_15346 floorDiv (II)I - METHOD method_15347 equalsApproximate (FF)Z + METHOD method_15347 approximatelyEquals (FF)Z + ARG 0 a + ARG 1 b METHOD method_15349 atan2 (DD)D METHOD method_15350 clamp (DDD)D ARG 0 value @@ -145,3 +147,6 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 start ARG 1 end ARG 2 speed + METHOD method_20390 approximatelyEquals (DD)Z + ARG 0 a + ARG 2 b diff --git a/mappings/net/minecraft/util/math/MutableIntBoundingBox.mapping b/mappings/net/minecraft/util/math/MutableIntBoundingBox.mapping index c72146abce..b59c47b1ab 100644 --- a/mappings/net/minecraft/util/math/MutableIntBoundingBox.mapping +++ b/mappings/net/minecraft/util/math/MutableIntBoundingBox.mapping @@ -29,10 +29,10 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/MutableIntBoundingBox METHOD method_14658 toNbt ()Lnet/minecraft/class_2495; METHOD method_14659 getSize ()Lnet/minecraft/class_2382; METHOD method_14660 getBlockCountX ()I - METHOD method_14661 translate (III)V - ARG 1 dx - ARG 2 dy - ARG 3 dz + METHOD method_14661 offset (III)V + ARG 1 x + ARG 2 y + ARG 3 z METHOD method_14662 contains (Lnet/minecraft/class_2382;)Z ARG 1 vec METHOD method_14663 getBlockCountY ()I @@ -57,3 +57,8 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/MutableIntBoundingBox ARG 2 minZ ARG 3 maxX ARG 4 maxZ + METHOD method_19311 withOffset (III)Lnet/minecraft/class_3341; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_19635 getCenter ()Lnet/minecraft/class_2382; diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index c870cd9d84..ccfa8fa42b 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d METHOD method_1022 distanceTo (Lnet/minecraft/class_243;)D METHOD method_1023 subtract (DDD)Lnet/minecraft/class_243; ARG 1 x + ARG 3 y + ARG 5 z METHOD method_1024 rotateY (F)Lnet/minecraft/class_243; METHOD method_1025 squaredDistanceTo (Lnet/minecraft/class_243;)D METHOD method_1026 dotProduct (Lnet/minecraft/class_243;)D diff --git a/mappings/net/minecraft/util/shape/SliceVoxelShape.mapping b/mappings/net/minecraft/util/shape/SliceVoxelShape.mapping index 531e97fcd6..56f64444ee 100644 --- a/mappings/net/minecraft/util/shape/SliceVoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/SliceVoxelShape.mapping @@ -5,5 +5,7 @@ CLASS net/minecraft/class_263 net/minecraft/util/shape/SliceVoxelShape METHOD (Lnet/minecraft/class_265;Lnet/minecraft/class_2350$class_2351;I)V ARG 1 shape ARG 2 axis + ARG 3 voxelIndex METHOD method_1088 createVoxelSet (Lnet/minecraft/class_251;Lnet/minecraft/class_2350$class_2351;I)Lnet/minecraft/class_251; - ARG 0 voxelSet + ARG 0 voxels + ARG 1 axis diff --git a/mappings/net/minecraft/util/shape/VoxelShapes.mapping b/mappings/net/minecraft/util/shape/VoxelShapes.mapping index a90a3e1271..183a464187 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapes.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShapes.mapping @@ -31,6 +31,10 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes METHOD method_1078 cuboid (Lnet/minecraft/class_238;)Lnet/minecraft/class_265; ARG 0 box METHOD method_1079 lcm (II)J + METHOD method_1080 adjacentSidesCoverSquare (Lnet/minecraft/class_265;Lnet/minecraft/class_265;Lnet/minecraft/class_2350;)Z + ARG 0 shape1 + ARG 1 shape2 + ARG 2 direction METHOD method_1081 cuboid (DDDDDD)Lnet/minecraft/class_265; ARG 0 xMin ARG 2 yMin @@ -39,6 +43,9 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes ARG 8 yMax ARG 10 zMax METHOD method_1082 combine (Lnet/minecraft/class_265;Lnet/minecraft/class_265;Lnet/minecraft/class_247;)Lnet/minecraft/class_265; + ARG 0 shape1 + ARG 1 shape2 + ARG 2 function METHOD method_1084 union (Lnet/minecraft/class_265;Lnet/minecraft/class_265;)Lnet/minecraft/class_265; ARG 0 first ARG 1 second @@ -52,4 +59,6 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes METHOD method_17786 union (Lnet/minecraft/class_265;[Lnet/minecraft/class_265;)Lnet/minecraft/class_265; ARG 0 first ARG 1 others - METHOD method_17945 calculateSoftOffset (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;DLnet/minecraft/class_3726;Ljava/util/stream/Stream;)D + METHOD method_20713 unionCoversFullCube (Lnet/minecraft/class_265;Lnet/minecraft/class_265;)Z + ARG 0 shape1 + ARG 1 shape2 diff --git a/mappings/net/minecraft/village/PointOfInterestStorage.mapping b/mappings/net/minecraft/village/PointOfInterestStorage.mapping index 0580a04a7a..6ed09d73a4 100644 --- a/mappings/net/minecraft/village/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/village/PointOfInterestStorage.mapping @@ -36,7 +36,10 @@ CLASS net/minecraft/class_4153 net/minecraft/village/PointOfInterestStorage ARG 4 radius METHOD method_19127 getPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/Optional; ARG 1 typePredicate + ARG 2 posPredicate + ARG 3 pos ARG 4 radius + ARG 5 occupationStatus METHOD method_19129 releaseTicket (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_19132 getType (Lnet/minecraft/class_2338;)Ljava/util/Optional; @@ -63,3 +66,9 @@ CLASS net/minecraft/class_4153 net/minecraft/village/PointOfInterestStorage ARG 4 occupationStatus METHOD method_20345 shouldScan (Lnet/minecraft/class_2826;)Z METHOD method_20348 scanAndPopulate (Lnet/minecraft/class_2826;Lnet/minecraft/class_4076;Ljava/util/function/BiConsumer;)V + METHOD method_21647 getPositions (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; + ARG 1 typePredicate + ARG 2 posPredicate + ARG 3 pos + ARG 4 radius + ARG 5 occupationStatus diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index de7fed962e..129386e8d5 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -46,6 +46,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer METHOD method_19277 getSpecialPrice ()I METHOD method_19278 getPriceMultiplier ()F METHOD method_19279 getTraderExperience ()I + METHOD method_21725 getDemandBonus ()I METHOD method_8244 use ()V METHOD method_8245 increaseSpecialPrice (I)V METHOD method_8246 getOriginalFirstBuyItem ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/village/Trader.mapping b/mappings/net/minecraft/village/Trader.mapping index 2320f17852..38f294e99d 100644 --- a/mappings/net/minecraft/village/Trader.mapping +++ b/mappings/net/minecraft/village/Trader.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1915 net/minecraft/village/Trader METHOD method_17449 sendOffers (Lnet/minecraft/class_1657;Lnet/minecraft/class_2561;I)V + METHOD method_18010 getYesSound ()Lnet/minecraft/class_3414; METHOD method_19269 getExperience ()I METHOD method_19270 isLevelledTrader ()Z METHOD method_19271 setExperienceFromServer (I)V diff --git a/mappings/net/minecraft/world/EntityView.mapping b/mappings/net/minecraft/world/EntityView.mapping index 896042e2f1..43985792bf 100644 --- a/mappings/net/minecraft/world/EntityView.mapping +++ b/mappings/net/minecraft/world/EntityView.mapping @@ -21,30 +21,67 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView ARG 1 entity ARG 2 maxDistance METHOD method_18461 getClosestPlayer (Lnet/minecraft/class_4051;DDD)Lnet/minecraft/class_1657; + ARG 1 targetPredicate ARG 2 x ARG 4 y ARG 6 z METHOD method_18462 getClosestPlayer (Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1657; + ARG 1 targetPredicate + ARG 2 entity METHOD method_18463 getClosestPlayer (Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;DDD)Lnet/minecraft/class_1657; + ARG 1 targetPredicate + ARG 2 entity ARG 3 x ARG 5 y ARG 7 z - METHOD method_18464 getPlayersInBox (Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;Lnet/minecraft/class_238;)Ljava/util/List; + METHOD method_18464 getPlayers (Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;Lnet/minecraft/class_238;)Ljava/util/List; + ARG 1 targetPredicate + ARG 2 entity + ARG 3 box METHOD method_18466 getTargets (Ljava/lang/Class;Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;Lnet/minecraft/class_238;)Ljava/util/List; ARG 1 entityClass ARG 2 targetPredicate ARG 3 targettingEntity ARG 4 box - METHOD method_18467 getEntities (Ljava/lang/Class;Lnet/minecraft/class_238;)Ljava/util/List; + METHOD method_18467 getNonSpectatingEntities (Ljava/lang/Class;Lnet/minecraft/class_238;)Ljava/util/List; ARG 1 entityClass ARG 2 box METHOD method_18468 getClosestEntity (Ljava/util/List;Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;DDD)Lnet/minecraft/class_1309; ARG 1 entityList + ARG 2 targetPredicate + ARG 3 entity ARG 4 x ARG 6 y ARG 8 z METHOD method_18470 getPlayerByUuid (Ljava/util/UUID;)Lnet/minecraft/class_1657; ARG 1 uuid + METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream; + ARG 1 entity + ARG 2 box + ARG 3 excluded + METHOD method_21726 getClosestEntity (Ljava/lang/Class;Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;DDDLnet/minecraft/class_238;)Lnet/minecraft/class_1309; + ARG 1 entityClass + ARG 2 targetPredicate + ARG 3 entity + ARG 4 x + ARG 6 y + ARG 8 z + ARG 10 box + METHOD method_21727 getClosestEntityIncludingUngeneratedChunks (Ljava/lang/Class;Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;DDDLnet/minecraft/class_238;)Lnet/minecraft/class_1309; + ARG 1 entityClass + ARG 2 targetPredicate + ARG 3 entity + ARG 4 x + ARG 6 y + ARG 8 z + ARG 10 box + METHOD method_21728 getEntitiesIncludingUngeneratedChunks (Ljava/lang/Class;Lnet/minecraft/class_238;)Ljava/util/List; + ARG 1 entityClass + ARG 2 box + METHOD method_21729 getEntitiesIncludingUngeneratedChunks (Ljava/lang/Class;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/List; + ARG 1 entityClass + ARG 2 box + ARG 3 predicate METHOD method_8333 getEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 except ARG 2 box diff --git a/mappings/net/minecraft/world/ViewableWorld.mapping b/mappings/net/minecraft/world/ViewableWorld.mapping index c091ae9a94..c294202e3b 100644 --- a/mappings/net/minecraft/world/ViewableWorld.mapping +++ b/mappings/net/minecraft/world/ViewableWorld.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_1941 net/minecraft/world/ViewableWorld METHOD method_17892 doesNotCollide (Lnet/minecraft/class_1297;)Z METHOD method_18026 doesNotCollide (Lnet/minecraft/class_238;)Z + METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream; + ARG 1 entity + ARG 2 box + ARG 3 excluded + METHOD method_20812 getBlockCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/stream/Stream; + ARG 1 entity + ARG 2 box METHOD method_8587 doesNotCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z ARG 1 entity ARG 2 entityBoundingBox @@ -8,7 +15,9 @@ CLASS net/minecraft/class_1941 net/minecraft/world/ViewableWorld ARG 1 entity ARG 2 entityBoundingBox ARG 3 otherEntities - METHOD method_8600 getCollisionShapes (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream; + METHOD method_8600 getCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream; + METHOD method_8603 (Lnet/minecraft/class_2338;I)I + ARG 2 darkness METHOD method_8606 intersectsEntities (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_8611 intersectsEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_265;)Z diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 33deff44b2..3aae2bb230 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -55,6 +55,10 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 1 pos ARG 2 oldBlock ARG 3 newBlock + METHOD method_21729 (Ljava/lang/Class;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/List; + ARG 1 entityClass + ARG 2 box + ARG 3 predicate METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V METHOD method_8419 isRaining ()Z METHOD method_8421 sendEntityStatus (Lnet/minecraft/class_1297;B)V diff --git a/mappings/net/minecraft/world/chunk/ChunkManager.mapping b/mappings/net/minecraft/world/chunk/ChunkManager.mapping index 1436699116..205f974089 100644 --- a/mappings/net/minecraft/world/chunk/ChunkManager.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkManager.mapping @@ -13,6 +13,9 @@ CLASS net/minecraft/class_2802 net/minecraft/world/chunk/ChunkManager ARG 2 forced METHOD method_12125 shouldTickEntity (Lnet/minecraft/class_1297;)Z METHOD method_12126 getWorldChunk (IIZ)Lnet/minecraft/class_2818; + ARG 1 chunkX + ARG 2 chunkZ + ARG 3 create METHOD method_12127 tick (Ljava/util/function/BooleanSupplier;)V METHOD method_12128 setMobSpawnOptions (ZZ)V ARG 1 spawnMonsters @@ -22,3 +25,6 @@ CLASS net/minecraft/class_2802 net/minecraft/world/chunk/ChunkManager ARG 1 pos METHOD method_20591 shouldTickChunk (Lnet/minecraft/class_1923;)Z ARG 1 pos + METHOD method_21730 getWorldChunk (II)Lnet/minecraft/class_2818; + ARG 1 chunkX + ARG 2 chunkZ diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index d8f1452d4c..b5780559cb 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -13,27 +13,27 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 4 chunk FIELD field_12787 chunkType Lnet/minecraft/class_2806$class_2808; FIELD field_12788 STATUS_TO_TARGET_GENERATION_RADIUS Lit/unimi/dsi/fastutil/ints/IntList; - FIELD field_12789 name Ljava/lang/String; + FIELD field_12789 id Ljava/lang/String; FIELD field_12791 DISTANCE_TO_TARGET_GENERATION_STATUS Ljava/util/List; FIELD field_12792 task Lnet/minecraft/class_2806$class_2807; - FIELD field_12793 surfaceGenerated Ljava/util/EnumSet; + FIELD field_12793 heightMapTypes Ljava/util/EnumSet; FIELD field_12802 taskMargin I FIELD field_16646 index I FIELD field_16647 previous Lnet/minecraft/class_2806; FIELD field_19159 PRE_CARVER_HEIGHTMAPS Ljava/util/EnumSet; FIELD field_19160 POST_CARVER_HEIGHTMAPS Ljava/util/EnumSet; METHOD (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)V - ARG 1 name + ARG 1 id ARG 2 previous ARG 3 taskMargin - ARG 4 surfaceGenerated - ARG 5 type + ARG 4 heightMapTypes + ARG 5 chunkType ARG 6 task METHOD method_12152 getTaskMargin ()I METHOD method_12154 runTask (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 2 chunkGenerator METHOD method_12155 getMaxTargetGenerationRadius ()I - METHOD method_12160 isSurfaceGenerated ()Ljava/util/EnumSet; + METHOD method_12160 getHeightmapTypes ()Ljava/util/EnumSet; METHOD method_12161 getTargetGenerationStatus (I)Lnet/minecraft/class_2806; ARG 0 distance METHOD method_12164 getChunkType ()Lnet/minecraft/class_2806$class_2808; @@ -41,11 +41,30 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 1 chunk METHOD method_12168 get (Ljava/lang/String;)Lnet/minecraft/class_2806; ARG 0 id - METHOD method_12172 getName ()Ljava/lang/String; + METHOD method_12172 getId ()Ljava/lang/String; METHOD method_12175 getTargetGenerationRadius (Lnet/minecraft/class_2806;)I ARG 0 status METHOD method_16555 register (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_3768;)Lnet/minecraft/class_2806; + ARG 0 id + ARG 1 previous + ARG 2 taskMargin + ARG 3 heightMapTypes + ARG 4 chunkType + ARG 5 task METHOD method_16557 register (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;)Lnet/minecraft/class_2806; + ARG 0 id + ARG 1 previous + ARG 2 taskMargin + ARG 3 heightMapTypes + ARG 4 chunkType + ARG 5 task METHOD method_16558 createOrderedList ()Ljava/util/List; METHOD method_16559 getIndex ()I METHOD method_16560 getPrevious ()Lnet/minecraft/class_2806; + METHOD method_20611 register (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)Lnet/minecraft/class_2806; + ARG 0 id + ARG 1 previous + ARG 2 taskMargin + ARG 3 heightMapTypes + ARG 4 chunkType + ARG 5 task diff --git a/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping b/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping new file mode 100644 index 0000000000..fff8aea535 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkToNibbleArrayMap.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_3556 net/minecraft/world/chunk/ChunkToNibbleArrayMap + FIELD field_15789 cachePositions [J + FIELD field_15790 cacheArrays [Lnet/minecraft/class_2804; + FIELD field_15791 arrays Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; + FIELD field_16447 cacheEnabled Z + METHOD (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;)V + ARG 1 arrays + METHOD method_15499 put (JLnet/minecraft/class_2804;)V + ARG 1 pos + ARG 3 data + METHOD method_15500 removeChunk (J)Lnet/minecraft/class_2804; + ARG 1 chunkPos + METHOD method_15501 get (J)Lnet/minecraft/class_2804; + ARG 1 chunkPos + METHOD method_15502 replaceWithCopy (J)V + ARG 1 pos + METHOD method_15503 containsKey (J)Z + ARG 1 chunkPos + METHOD method_15504 copy ()Lnet/minecraft/class_3556; + METHOD method_15505 clearCache ()V + METHOD method_16188 disableCache ()V diff --git a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping index 72cc282851..7843a96ab1 100644 --- a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping +++ b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer + CLASS class_4464 CountConsumer + METHOD accept (Ljava/lang/Object;I)V + ARG 1 object + ARG 2 count FIELD field_12934 paletteSize I FIELD field_12936 palette Lnet/minecraft/class_2837; FIELD field_12937 writeLock Ljava/util/concurrent/locks/ReentrantLock; @@ -51,6 +55,8 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer ARG 2 y ARG 3 z ARG 4 value + METHOD method_21732 count (Lnet/minecraft/class_2841$class_4464;)V + ARG 1 consumer METHOD onResize (ILjava/lang/Object;)I ARG 1 newSize ARG 2 objectAdded diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index d3e6c9bc6e..3689cf13e1 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -32,7 +32,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12203 remove (Lnet/minecraft/class_1297;)V METHOD method_12204 loadBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2586; ARG 1 pos - METHOD method_12205 appendEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V + METHOD method_12205 getEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V ARG 1 except ARG 2 box ARG 3 entityList @@ -40,10 +40,11 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12207 setLevelTypeProvider (Ljava/util/function/Supplier;)V ARG 1 levelTypeProvider METHOD method_12208 createBlockEntity (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2586; - METHOD method_12210 appendEntities (Ljava/lang/Class;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V + METHOD method_12210 getEntities (Ljava/lang/Class;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V ARG 1 entityClass ARG 2 box - ARG 3 entityList + ARG 3 result + ARG 4 predicate METHOD method_12214 getBlockEntities ()Ljava/util/Map; METHOD method_12215 getEntitySectionArray ()[Lnet/minecraft/class_3509; METHOD method_12216 addBlockEntity (Lnet/minecraft/class_2586;)V @@ -60,7 +61,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12234 getFluidState (III)Lnet/minecraft/class_3610; ARG 1 x ARG 2 y - METHOD method_18029 appendEntities (Lnet/minecraft/class_1299;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V + METHOD method_18029 getEntities (Lnet/minecraft/class_1299;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V ARG 1 type ARG 2 box ARG 3 list diff --git a/mappings/net/minecraft/world/chunk/WorldNibbleStorage.mapping b/mappings/net/minecraft/world/chunk/WorldNibbleStorage.mapping deleted file mode 100644 index b66158628f..0000000000 --- a/mappings/net/minecraft/world/chunk/WorldNibbleStorage.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS net/minecraft/class_3556 net/minecraft/world/chunk/WorldNibbleStorage - FIELD field_15789 cachedCoords [J - FIELD field_15790 cachedData [Lnet/minecraft/class_2804; - FIELD field_15791 arraysByChunk Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; - FIELD field_16447 hasCache Z - METHOD (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;)V - ARG 1 map - METHOD method_15499 addForChunk (JLnet/minecraft/class_2804;)V - ARG 1 chunkPos - ARG 3 data - METHOD method_15500 removeChunk (J)Lnet/minecraft/class_2804; - ARG 1 chunkPos - METHOD method_15501 getDataForChunk (J)Lnet/minecraft/class_2804; - ARG 1 chunkPos - METHOD method_15502 cloneChunkData (J)V - ARG 1 chunkPos - METHOD method_15503 hasChunk (J)Z - ARG 1 chunkPos - METHOD method_15504 copy ()Lnet/minecraft/class_3556; - METHOD method_15505 clearCache ()V - METHOD method_16188 disableCache ()V diff --git a/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping index 35df597377..3acc35ee5a 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkBlockLightProvider.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3552 net/minecraft/world/chunk/light/ChunkBlockLightProvider - FIELD field_15778 DIRECTIONS_BLOCKLIGHT [Lnet/minecraft/class_2350; + FIELD field_15778 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_16511 mutablePos Lnet/minecraft/class_2338$class_2339; METHOD (Lnet/minecraft/class_2823;)V ARG 1 chunkProvider diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping index 9fb515ea84..387a24ae55 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping @@ -3,18 +3,53 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide FIELD field_15793 lightStorage Lnet/minecraft/class_3560; FIELD field_15795 chunkProvider Lnet/minecraft/class_2823; FIELD field_16513 DIRECTIONS [Lnet/minecraft/class_2350; + FIELD field_17397 cachedChunkPositions [J + FIELD field_17398 cachedChunks [Lnet/minecraft/class_1922; + FIELD field_19284 reusableBlockPos Lnet/minecraft/class_2338$class_2339; METHOD (Lnet/minecraft/class_2823;Lnet/minecraft/class_1944;Lnet/minecraft/class_3560;)V ARG 1 chunkProvider ARG 2 type ARG 3 lightStorage - METHOD method_15513 queueLightCheck (Lnet/minecraft/class_2338;)V - METHOD method_15515 setSection (JLnet/minecraft/class_2804;)V + METHOD method_15512 setLightEnabled (Lnet/minecraft/class_1923;Z)V + ARG 1 pos + ARG 2 lightEnabled + METHOD method_15513 checkBlock (Lnet/minecraft/class_2338;)V + ARG 1 pos + METHOD method_15514 addLightSource (Lnet/minecraft/class_2338;I)V + ARG 1 pos + ARG 2 level + METHOD method_15515 setLightArray (JLnet/minecraft/class_2804;)V + ARG 1 pos + ARG 3 lightArray METHOD method_15516 doLightUpdates (IZZ)I - ARG 1 stepCount + ARG 1 maxSteps + ARG 2 doSkylight + ARG 3 skipEdgeLightPropagation METHOD method_15517 getCurrentLevelFromArray (Lnet/minecraft/class_2804;J)I ARG 1 array ARG 2 blockPos METHOD method_15518 hasUpdates ()Z - METHOD method_17529 (II)Lnet/minecraft/class_1922; + METHOD method_15520 getSectionDebugString (J)Ljava/lang/String; + ARG 1 pos + METHOD method_17529 getChunk (II)Lnet/minecraft/class_1922; ARG 1 chunkX ARG 2 chunkZ + METHOD method_17530 clearChunkCache ()V + METHOD method_20049 getRealisticOpacity (Lnet/minecraft/class_1922;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;I)I + ARG 0 world + ARG 1 state1 + ARG 2 pos1 + ARG 3 state2 + ARG 4 pos2 + ARG 5 direction + ARG 6 opacity2 + METHOD method_20479 getStateForLighting (JLjava/util/concurrent/atomic/AtomicInteger;)Lnet/minecraft/class_2680; + ARG 1 pos + ARG 3 opacity + METHOD method_20599 setRetainData (Lnet/minecraft/class_1923;Z)V + ARG 1 pos + ARG 2 retainData + METHOD method_20710 getOpaqueShape (Lnet/minecraft/class_2680;JLnet/minecraft/class_2350;)Lnet/minecraft/class_265; + ARG 1 world + ARG 2 pos + ARG 4 facing diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping index 7a7af12e39..1cc3376c7e 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_3562 net/minecraft/world/chunk/light/ChunkLightingView CLASS class_3563 Empty + METHOD getLightArray (Lnet/minecraft/class_4076;)Lnet/minecraft/class_2804; + ARG 1 pos + METHOD getLightArray (Lnet/minecraft/class_4076;)Lnet/minecraft/class_2804; + ARG 1 pos METHOD method_15543 getLightLevel (Lnet/minecraft/class_2338;)I - METHOD method_15544 getChunkLightArray (Lnet/minecraft/class_4076;)Lnet/minecraft/class_2804; + METHOD method_15544 getLightArray (Lnet/minecraft/class_4076;)Lnet/minecraft/class_2804; + ARG 1 pos diff --git a/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping index 0493208fa9..e617ca93c9 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkSkyLightProvider.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3572 net/minecraft/world/chunk/light/ChunkSkyLightProvider FIELD field_15825 HORIZONTAL_DIRECTIONS [Lnet/minecraft/class_2350; - FIELD field_15826 DIRECTIONS_SKYLIGHT [Lnet/minecraft/class_2350; + FIELD field_15826 DIRECTIONS [Lnet/minecraft/class_2350; METHOD (Lnet/minecraft/class_2823;)V ARG 1 chunkProvider diff --git a/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping b/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping index 319482e55c..dfbd85a4ce 100644 --- a/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping +++ b/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping @@ -5,69 +5,69 @@ CLASS net/minecraft/class_3554 net/minecraft/world/chunk/light/LevelPropagator CLASS 2 METHOD rehash (I)V ARG 1 newN - FIELD field_15781 minLevel I - FIELD field_15782 hasUpdates Z + FIELD field_15781 minPendingLevel I + FIELD field_15782 hasPendingUpdates Z FIELD field_15783 levelCount I - FIELD field_15784 idToLevel Lit/unimi/dsi/fastutil/longs/Long2ByteFunction; - FIELD field_15785 levelToIds [Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet; + FIELD field_15784 pendingUpdates Lit/unimi/dsi/fastutil/longs/Long2ByteFunction; + FIELD field_15785 pendingIdUpdatesByLevel [Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet; METHOD (III)V ARG 1 levelCount - ARG 2 initLevelCapacity - ARG 3 initTotalCapacity - METHOD method_15478 update (JJIZ)V - ARG 1 causingId + ARG 2 expectedLevelSize + ARG 3 expectedTotalSize + METHOD method_15478 updateLevel (JJIZ)V + ARG 1 sourceId ARG 3 id ARG 5 level - ARG 6 mergeAsMin - METHOD method_15479 add (JII)V + ARG 6 decrease + METHOD method_15479 addPendingUpdate (JII)V ARG 1 id ARG 3 level ARG 4 targetLevel METHOD method_15480 getLevel (J)I ARG 1 id - METHOD method_15481 updateMinLevel (I)V - ARG 1 limitLevel - METHOD method_15482 update (JJIIIZ)V - ARG 1 causingId - ARG 3 id - ARG 5 level - ARG 6 currentLevel - ARG 7 previousLevel - ARG 8 mergeAsMin - METHOD method_15483 remove (J)V - ARG 1 id - METHOD method_15484 updateRecursively (JJIZ)V + METHOD method_15481 increaseMinPendingLevel (I)V + ARG 1 maxLevel + METHOD method_15482 updateLevel (JJIIIZ)V ARG 1 sourceId ARG 3 id ARG 5 level - ARG 6 mergeAsMin + ARG 6 currentLevel + ARG 7 pendingLevel + ARG 8 decrease + METHOD method_15483 removePendingUpdate (J)V + ARG 1 id + METHOD method_15484 propagateLevel (JJIZ)V + ARG 1 sourceId + ARG 3 targetId + ARG 5 level + ARG 6 decrease METHOD method_15485 setLevel (JI)V ARG 1 id ARG 3 level - METHOD method_15486 getMergedLevel (JJI)I + METHOD method_15486 recalculateLevel (JJI)I ARG 1 id - ARG 3 sourceId - ARG 5 limitLevel - METHOD method_15487 updateNeighborsRecursively (JIZ)V - ARG 1 id - ARG 3 targetLevel - ARG 4 mergeAsMin - METHOD method_15488 getPropagatedLevel (JJI)I - ARG 1 fromId - ARG 3 toId - ARG 5 currentLevel - METHOD method_15489 hasLevelUpdates ()Z - METHOD method_15490 min (II)I - ARG 1 a - ARG 2 b - METHOD method_15491 fullyUpdate (J)V - ARG 1 id - METHOD method_15492 updateAllRecursively (I)I - ARG 1 maxSteps - METHOD method_15493 removeFromLevel (JIIZ)V + ARG 3 excludedId + ARG 5 maxLevel + METHOD method_15487 propagateLevel (JIZ)V ARG 1 id ARG 3 level - ARG 4 maxLevel - ARG 5 removeFromLevelMap - METHOD method_15494 isInvalid (J)Z + ARG 4 decrease + METHOD method_15488 getPropagatedLevel (JJI)I + ARG 1 sourceId + ARG 3 targetId + ARG 5 level + METHOD method_15489 hasPendingUpdates ()Z + METHOD method_15490 minLevel (II)I + ARG 1 a + ARG 2 b + METHOD method_15491 resetLevel (J)V + ARG 1 id + METHOD method_15492 applyPendingUpdates (I)I + ARG 1 maxSteps + METHOD method_15493 removePendingUpdate (JIIZ)V + ARG 1 id + ARG 3 level + ARG 4 levelCount + ARG 5 removeFully + METHOD method_15494 isMarker (J)Z ARG 1 id diff --git a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping index 01541962f5..7b9bb2b6b9 100644 --- a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping @@ -1,45 +1,48 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage - FIELD field_15796 dataStorage Lnet/minecraft/class_3556; - FIELD field_15798 toRemove Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_15796 lightArrays Lnet/minecraft/class_3556; + FIELD field_15798 lightArraysToRemove Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_15799 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_15800 hasLightUpdates Z FIELD field_15801 EMPTY Lnet/minecraft/class_2804; FIELD field_15803 chunkProvider Lnet/minecraft/class_2823; FIELD field_15805 lightType Lnet/minecraft/class_1944; - FIELD field_15806 dataStorageUncached Lnet/minecraft/class_3556; - FIELD field_15807 toUpdate Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; - FIELD field_16448 toNotify Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_15806 uncachedLightArrays Lnet/minecraft/class_3556; + FIELD field_15807 lightArraysToAdd Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD field_15808 nonEmptySections Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_16448 dirtySections Lit/unimi/dsi/fastutil/longs/LongSet; METHOD (Lnet/minecraft/class_1944;Lnet/minecraft/class_2823;Lnet/minecraft/class_3556;)V ARG 1 lightType ARG 2 chunkProvider ARG 3 lightData - METHOD method_15522 getDataForChunk (JZ)Lnet/minecraft/class_2804; - ARG 1 chunkPos + METHOD method_15522 getLightArray (JZ)Lnet/minecraft/class_2804; + ARG 1 sectionPos ARG 3 cached - METHOD method_15523 (J)V + METHOD method_15523 onLightArrayCreated (J)V ARG 1 blockPos - METHOD method_15524 hasChunk (J)Z - ARG 1 chunkPos + METHOD method_15524 hasLight (J)Z + ARG 1 sectionPos METHOD method_15525 set (JI)V ARG 1 blockPos ARG 3 value - METHOD method_15526 scheduleChunkLightUpdate (JZ)V - ARG 1 chunkBlockPos - ARG 3 isEmpty - METHOD method_15527 processUpdates (Lnet/minecraft/class_3558;ZZ)V + METHOD method_15526 updateSectionStatus (JZ)V + ARG 1 pos + ARG 3 empty + METHOD method_15527 updateLightArrays (Lnet/minecraft/class_3558;ZZ)V ARG 1 lightProvider ARG 2 doSkylight - ARG 3 doEdgeLightPropagation + ARG 3 skipEdgeLightPropagation METHOD method_15528 hasLightUpdates ()Z - METHOD method_15529 getDataForChunk (J)Lnet/minecraft/class_2804; + METHOD method_15529 createLightArray (J)Lnet/minecraft/class_2804; + ARG 1 pos METHOD method_15530 notifyChunkProvider ()V - METHOD method_15532 scheduleToUpdate (JLnet/minecraft/class_2804;)V - ARG 1 blockChunkPos + METHOD method_15532 setLightArray (JLnet/minecraft/class_2804;)V + ARG 1 pos ARG 3 array - METHOD method_15533 getDataForChunk (Lnet/minecraft/class_3556;J)Lnet/minecraft/class_2804; + METHOD method_15533 getLightArray (Lnet/minecraft/class_3556;J)Lnet/minecraft/class_2804; ARG 1 storage - ARG 2 chunkPos + ARG 2 sectionPos METHOD method_15534 onChunkRemoved (J)V + METHOD method_15535 setLightEnabled (JZ)V METHOD method_15536 removeChunkData (Lnet/minecraft/class_3558;J)V ARG 1 storage ARG 2 blockChunkPos @@ -48,3 +51,6 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage METHOD method_15538 getLight (J)I ARG 1 blockPos METHOD method_15539 updateAll ()V + METHOD method_20533 getLightArray (J)Lnet/minecraft/class_2804; + ARG 1 sectionPos + METHOD method_20600 setRetainData (JZ)V diff --git a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping index 95058252e9..0632795e14 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping @@ -5,14 +5,26 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider ARG 1 chunkProvider ARG 2 hasBlockLight ARG 3 hasSkyLight - METHOD method_15557 suppressLight (Lnet/minecraft/class_1923;Z)V + METHOD method_15557 setLightEnabled (Lnet/minecraft/class_1923;Z)V + ARG 1 pos + ARG 2 lightEnabled METHOD method_15558 queueData (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;Lnet/minecraft/class_2804;)V ARG 1 lightType - METHOD method_15559 enqueueLightUpdate (Lnet/minecraft/class_2338;)V + METHOD method_15559 checkBlock (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_15560 (Lnet/minecraft/class_2338;I)V + METHOD method_15560 addLightSource (Lnet/minecraft/class_2338;I)V ARG 1 pos + ARG 2 level METHOD method_15561 hasUpdates ()Z METHOD method_15562 get (Lnet/minecraft/class_1944;)Lnet/minecraft/class_3562; + ARG 1 lightType METHOD method_15563 doLightUpdates (IZZ)I ARG 1 maxUpdateCount + ARG 2 doSkylight + ARG 3 skipEdgeLightPropagation + METHOD method_15564 getSectionDebugString (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;)Ljava/lang/String; + ARG 1 lightType + ARG 2 pos + METHOD method_20601 setRetainData (Lnet/minecraft/class_1923;Z)V + ARG 1 pos + ARG 2 retainData diff --git a/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping b/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping index 1f69b120e5..9174e4974b 100644 --- a/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping @@ -1,13 +1,21 @@ CLASS net/minecraft/class_3569 net/minecraft/world/chunk/light/SkyLightStorage CLASS class_3570 Data - FIELD field_15821 heightMap Lit/unimi/dsi/fastutil/longs/Long2IntOpenHashMap; - FIELD field_15822 defaultHeight I - FIELD field_15818 DIRECTIONS_SKYLIGHT [Lnet/minecraft/class_2350; + FIELD field_15821 topArraySectionY Lit/unimi/dsi/fastutil/longs/Long2IntOpenHashMap; + FIELD field_15822 defaultTopArraySectionY I + FIELD field_15815 pendingSkylightUpdates Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_15817 lightEnabled Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_15818 LIGHT_REDUCTION_DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_15819 hasSkyLightUpdates Z METHOD (Lnet/minecraft/class_2823;)V ARG 1 chunkProvider + METHOD enableLight (JZ)V + ARG 3 enabled METHOD k (J)V ARG 1 blockPos + METHOD method_15566 isLightEnabled (J)Z + ARG 1 sectionPos METHOD method_15567 isAboveMinimumHeight (I)Z ARG 1 blockY + METHOD method_15568 isAboveTopmostLightArray (J)Z + ARG 1 pos METHOD method_15569 checkForUpdates ()V diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping index 67601745bd..b730363633 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC FIELD field_14083 groundHeight I FIELD field_14084 END_CITY Lnet/minecraft/class_2975; FIELD field_14085 OCEAN_RUIN Lnet/minecraft/class_2975; + FIELD field_19182 PILLAGER_OUTPOST Lnet/minecraft/class_2975; METHOD method_14309 getDefaultConfig ()Lnet/minecraft/class_3232; METHOD method_14312 getLayerBlocks ()[Lnet/minecraft/class_2680; METHOD method_14313 toDynamic (Lcom/mojang/datafixers/types/DynamicOps;)Lcom/mojang/datafixers/Dynamic; @@ -38,6 +39,10 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC METHOD method_14320 hasNoTerrain ()Z METHOD method_14323 fromDynamic (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_3232; ARG 0 dynamic + METHOD method_14324 setStructureOption (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 structure + ARG 2 key + ARG 3 value METHOD method_14325 setBiome (Lnet/minecraft/class_1959;)V METHOD method_14326 getBiome ()Lnet/minecraft/class_1959; METHOD method_14327 getLayers ()Ljava/util/List; @@ -46,3 +51,5 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC METHOD method_14330 updateLayerBlocks ()V METHOD method_14333 getStructures ()Ljava/util/Map; METHOD method_14334 parseBlock (Ljava/lang/String;)Lnet/minecraft/class_2248; + METHOD method_20314 removeLayerBlock (I)V + ARG 1 layer