diff --git a/build.gradle b/build.gradle index b5fd2b03ab..b2b2871ceb 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "22w15a" +def minecraft_version = "22w16a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping index d185e0cc90..a824be937c 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping @@ -161,7 +161,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem FIELD field_27335 id I FIELD field_27336 elementFormat Lnet/minecraft/class_293$class_5595; FIELD field_27337 size I - METHOD method_31919 getId ()I METHOD method_31920 grow (I)V ARG 1 newSize METHOD method_31922 getIndexConsumer (Ljava/nio/ByteBuffer;)Lit/unimi/dsi/fastutil/ints/IntConsumer; diff --git a/mappings/net/minecraft/class_7417.mapping b/mappings/net/minecraft/class_7417.mapping new file mode 100644 index 0000000000..b3b3cfe8a3 --- /dev/null +++ b/mappings/net/minecraft/class_7417.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7417 + METHOD method_10890 parse (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;I)Lnet/minecraft/class_5250; + METHOD method_27659 visitSelf (Lnet/minecraft/class_5348$class_5245;)Ljava/util/Optional; + METHOD method_27660 visitSelf (Lnet/minecraft/class_5348$class_5246;Lnet/minecraft/class_2583;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_7419.mapping b/mappings/net/minecraft/class_7419.mapping new file mode 100644 index 0000000000..8bda61e168 --- /dev/null +++ b/mappings/net/minecraft/class_7419.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_7419 + METHOD method_10916 toNbt (Lnet/minecraft/class_2168;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/client/gl/ShaderParseException.mapping b/mappings/net/minecraft/client/gl/ShaderParseException.mapping index 4cd3ea2178..f3627ae025 100644 --- a/mappings/net/minecraft/client/gl/ShaderParseException.mapping +++ b/mappings/net/minecraft/client/gl/ShaderParseException.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_2973 net/minecraft/client/gl/ShaderParseException FIELD field_13371 traces Ljava/util/List; FIELD field_13372 message Ljava/lang/String; - METHOD (Ljava/lang/String;)V - ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause diff --git a/mappings/net/minecraft/client/gl/VertexBuffer.mapping b/mappings/net/minecraft/client/gl/VertexBuffer.mapping index ce247c9aa2..6101b8733c 100644 --- a/mappings/net/minecraft/client/gl/VertexBuffer.mapping +++ b/mappings/net/minecraft/client/gl/VertexBuffer.mapping @@ -4,35 +4,24 @@ CLASS net/minecraft/class_291 net/minecraft/client/gl/VertexBuffer FIELD field_27366 indexBufferId I FIELD field_27367 elementFormat Lnet/minecraft/class_293$class_5595; FIELD field_27368 drawMode Lnet/minecraft/class_293$class_5596; - FIELD field_27369 hasNoIndexBuffer Z FIELD field_29338 vertexArrayId I FIELD field_29339 vertexFormat Lnet/minecraft/class_293; METHOD method_1352 upload (Lnet/minecraft/class_287;)V ARG 1 buffer METHOD method_1353 bind ()V METHOD method_1354 unbind ()V - METHOD method_22641 (Ljava/lang/Integer;)V - ARG 1 id METHOD method_22643 submitUpload (Lnet/minecraft/class_287;)Ljava/util/concurrent/CompletableFuture; ARG 1 buffer METHOD method_22644 uploadInternal (Lnet/minecraft/class_287;)V - ARG 1 buffer - METHOD method_31968 (Ljava/lang/Integer;)V - ARG 1 id METHOD method_34427 setShader (Lnet/minecraft/class_1159;Lnet/minecraft/class_1159;Lnet/minecraft/class_5944;)V ARG 1 viewMatrix ARG 2 projectionMatrix ARG 3 shader - METHOD method_34428 (Ljava/lang/Integer;)V - ARG 1 id METHOD method_34429 (Ljava/lang/Runnable;)V ARG 0 action - METHOD method_34430 unbindVertexArray ()V METHOD method_34431 innerSetShader (Lnet/minecraft/class_1159;Lnet/minecraft/class_1159;Lnet/minecraft/class_5944;)V ARG 1 viewMatrix ARG 2 projectionMatrix ARG 3 shader - METHOD method_34432 drawVertices ()V METHOD method_34435 getVertexFormat ()Lnet/minecraft/class_293; - METHOD method_34437 bindVertexArray ()V METHOD method_35665 drawElements ()V diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index adef0f739d..f884312e16 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud FIELD field_2084 chunk Lnet/minecraft/class_2818; FIELD field_2085 pos Lnet/minecraft/class_1923; FIELD field_32187 TEXT_COLOR I - METHOD (Lnet/minecraft/class_310;)V - ARG 1 client METHOD method_15870 drawMetricsData (Lnet/minecraft/class_4587;Lnet/minecraft/class_3517;IIZ)V ARG 1 matrices ARG 2 metricsData diff --git a/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping index 0a06784260..464d9a5b6e 100644 --- a/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_446 net/minecraft/client/gui/screen/option/VideoOption FIELD field_25684 GRAPHICS_WARNING_TITLE_TEXT Lnet/minecraft/class_2561; FIELD field_25685 GRAPHICS_WARNING_ACCEPT_TEXT Lnet/minecraft/class_2561; FIELD field_25686 GRAPHICS_WARNING_CANCEL_TEXT Lnet/minecraft/class_2561; - FIELD field_25687 NEWLINE_TEXT Lnet/minecraft/class_2561; FIELD field_25688 warningManager Lnet/minecraft/class_5407; FIELD field_2639 list Lnet/minecraft/class_353; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index b7357e4574..55fb3a5c53 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid FIELD field_26610 LOCKED_TEXT Lnet/minecraft/class_2561; FIELD field_3237 parent Lnet/minecraft/class_526; FIELD field_3238 LOGGER Lorg/slf4j/Logger; - FIELD field_3239 levels Ljava/util/List; FIELD field_34803 CONVERSION_TOOLTIP Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_526;Lnet/minecraft/class_310;IIIIILjava/util/function/Supplier;Lnet/minecraft/class_528;)V ARG 1 parent @@ -20,20 +19,15 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid ARG 6 bottom ARG 7 itemHeight ARG 8 searchFilter - ARG 9 list METHOD method_20159 getSelectedAsOptional ()Ljava/util/Optional; - METHOD method_2750 filter (Ljava/util/function/Supplier;Z)V - ARG 1 searchTextSupplier - ARG 2 load + METHOD method_2750 filter (Ljava/lang/String;)V METHOD method_2752 getParent ()Lnet/minecraft/class_526; - METHOD method_30017 (Lnet/minecraft/class_528$class_4272;)Z - ARG 0 entry CLASS class_4272 Entry FIELD field_19136 client Lnet/minecraft/class_310; FIELD field_19137 screen Lnet/minecraft/class_526; FIELD field_19138 level Lnet/minecraft/class_34; FIELD field_19139 iconLocation Lnet/minecraft/class_2960; - FIELD field_19140 iconFile Ljava/io/File; + FIELD field_19140 iconFile Ljava/nio/file/Path; FIELD field_19141 icon Lnet/minecraft/class_1043; FIELD field_19142 time J METHOD (Lnet/minecraft/class_528;Lnet/minecraft/class_528;Lnet/minecraft/class_34;)V diff --git a/mappings/net/minecraft/client/particle/GlowParticle.mapping b/mappings/net/minecraft/client/particle/GlowParticle.mapping index 9546149087..fa0a8ff2b1 100644 --- a/mappings/net/minecraft/client/particle/GlowParticle.mapping +++ b/mappings/net/minecraft/client/particle/GlowParticle.mapping @@ -30,7 +30,3 @@ CLASS net/minecraft/class_5786 net/minecraft/client/particle/GlowParticle FIELD field_29578 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider - CLASS class_7309 AllayDustFactory - FIELD field_38460 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/render/BufferRenderer.mapping b/mappings/net/minecraft/client/render/BufferRenderer.mapping index bac630f52e..1a52229242 100644 --- a/mappings/net/minecraft/client/render/BufferRenderer.mapping +++ b/mappings/net/minecraft/client/render/BufferRenderer.mapping @@ -1,22 +1,2 @@ CLASS net/minecraft/class_286 net/minecraft/client/render/BufferRenderer - FIELD field_29331 currentVertexArray I - FIELD field_29332 currentVertexBuffer I - FIELD field_29333 currentElementBuffer I - FIELD field_29334 vertexFormat Lnet/minecraft/class_293; - METHOD method_1309 draw (Lnet/minecraft/class_287;)V - ARG 0 bufferBuilder METHOD method_34420 unbindAll ()V - METHOD method_34421 bind (Lnet/minecraft/class_293;)V - ARG 0 vertexFormat - METHOD method_34422 draw (Ljava/nio/ByteBuffer;Lnet/minecraft/class_293$class_5596;Lnet/minecraft/class_293;ILnet/minecraft/class_293$class_5595;IZ)V - ARG 0 buffer - ARG 1 drawMode - ARG 2 vertexFormat - ARG 3 count - ARG 4 elementFormat - ARG 5 vertexCount - ARG 6 textured - METHOD method_34423 unbindElementBuffer ()V - METHOD method_34424 postDraw (Lnet/minecraft/class_287;)V - COMMENT Similar to a regular draw, however this method will skip rendering shaders. - ARG 0 builder diff --git a/mappings/net/minecraft/client/render/VertexFormat.mapping b/mappings/net/minecraft/client/render/VertexFormat.mapping index adb5a42d8f..ae4ed40ebc 100644 --- a/mappings/net/minecraft/client/render/VertexFormat.mapping +++ b/mappings/net/minecraft/client/render/VertexFormat.mapping @@ -3,9 +3,6 @@ CLASS net/minecraft/class_293 net/minecraft/client/render/VertexFormat FIELD field_1600 size I FIELD field_1602 elements Lcom/google/common/collect/ImmutableList; FIELD field_29340 elementMap Lcom/google/common/collect/ImmutableMap; - FIELD field_29341 vertexArray I - FIELD field_29342 vertexBuffer I - FIELD field_29343 elementBuffer I METHOD (Lcom/google/common/collect/ImmutableMap;)V ARG 1 elementMap METHOD equals (Ljava/lang/Object;)Z @@ -16,9 +13,6 @@ CLASS net/minecraft/class_293 net/minecraft/client/render/VertexFormat METHOD method_22649 startDrawing ()V METHOD method_22651 endDrawing ()V METHOD method_34445 getShaderAttributes ()Lcom/google/common/collect/ImmutableList; - METHOD method_34446 getVertexArray ()I - METHOD method_34447 getVertexBuffer ()I - METHOD method_34448 getElementBuffer ()I METHOD method_34449 innerStartDrawing ()V METHOD method_34450 innerEndDrawing ()V CLASS class_5595 IntType diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 8ceeb40ca5..0c1b6bec6e 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -350,11 +350,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 eventId ARG 2 pos ARG 3 data - METHOD method_8567 processWorldEvent (Lnet/minecraft/class_1657;ILnet/minecraft/class_2338;I)V - ARG 1 source - ARG 2 eventId - ARG 3 pos - ARG 4 data + METHOD method_8567 processWorldEvent (ILnet/minecraft/class_2338;I)V METHOD method_8568 addParticle (Lnet/minecraft/class_2394;ZDDDDDD)V ARG 1 parameters ARG 2 shouldAlwaysSpawn diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index f08ce0ee27..5f6419e215 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -57,9 +57,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder CLASS class_849 ChunkData FIELD field_4450 nonEmptyLayers Ljava/util/Set; FIELD field_4451 EMPTY Lnet/minecraft/class_846$class_849; - FIELD field_4452 initializedLayers Ljava/util/Set; FIELD field_4453 bufferState Lnet/minecraft/class_287$class_5594; - FIELD field_4454 empty Z FIELD field_4455 occlusionGraph Lnet/minecraft/class_854; FIELD field_4456 blockEntities Ljava/util/List; METHOD method_3641 isEmpty (Lnet/minecraft/class_1921;)Z @@ -147,7 +145,6 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 2 cameraY ARG 3 cameraZ ARG 4 data - ARG 5 buffers METHOD method_22788 (Ljava/util/List;Lnet/minecraft/class_750;Lnet/minecraft/class_1921;)V ARG 3 renderLayer METHOD method_23087 addBlockEntity (Lnet/minecraft/class_846$class_849;Ljava/util/Set;Lnet/minecraft/class_2586;)V diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index caa9f08e27..2f5a1087c9 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -82,8 +82,6 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader METHOD method_4739 (Lnet/minecraft/class_2248;Ljava/util/Map;Lnet/minecraft/class_2680;)Z ARG 2 state CLASS class_1089 ModelLoaderException - METHOD (Ljava/lang/String;)V - ARG 1 message CLASS class_4455 ModelDefinition FIELD field_20275 components Ljava/util/List; FIELD field_20276 values Ljava/util/List; diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index 25c2e51e25..872c209012 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -96,5 +96,3 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 0 value CLASS class_6246 UncheckedModelException COMMENT An unused unchecked exception. Probably related to unbaked models. - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/mappings/net/minecraft/client/util/GlException.mapping b/mappings/net/minecraft/client/util/GlException.mapping index b093724840..55c6d673b9 100644 --- a/mappings/net/minecraft/client/util/GlException.mapping +++ b/mappings/net/minecraft/client/util/GlException.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_4718 net/minecraft/client/util/GlException - METHOD (Ljava/lang/String;)V - ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 2f2281f9bf..68aaff48c7 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -20,7 +20,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT Intersection with {@link net.minecraft.entity.decoration.ArmorStandEntity} is checked if COMMENT it is not a {@link net.minecraft.entity.decoration.ArmorStandEntity#isMarker marker}. FIELD field_25599 submergedFluidTag Ljava/util/Set; - FIELD field_25750 trackedPosition Lnet/minecraft/class_243; FIELD field_26994 lastChimeAge I FIELD field_26995 removalReason Lnet/minecraft/class_1297$class_5529; FIELD field_26996 changeListener Lnet/minecraft/class_5569; @@ -145,10 +144,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_17835 adjustMovementForCollisions (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 movement METHOD method_18002 createSpawnPacket ()Lnet/minecraft/class_2596; - METHOD method_18003 updateTrackedPosition (DDD)V - ARG 1 x - ARG 3 y - ARG 5 z METHOD method_18276 isInSneakingPose ()Z COMMENT Returns whether the entity is in a crouching pose. COMMENT @@ -316,9 +311,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_30022 (Lnet/minecraft/class_238;Lnet/minecraft/class_2338;)Z ARG 2 pos METHOD method_30076 removeFromDimension ()V - METHOD method_30227 getTrackedPosition ()Lnet/minecraft/class_243; - METHOD method_30228 updateTrackedPosition (Lnet/minecraft/class_243;)V - ARG 1 pos METHOD method_30229 resetNetherPortalCooldown ()V METHOD method_30230 hasNetherPortalCooldown ()Z METHOD method_30329 getTeleportTarget (Lnet/minecraft/class_3218;)Lnet/minecraft/class_5454; diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLookTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLookTargetTask.mapping index e65fa06a6a..5ff6baea1c 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLookTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardsLookTargetTask.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_7297 net/minecraft/entity/ai/brain/task/WalkTowardsLoo FIELD field_38391 lookTargetFunction Ljava/util/function/Function; FIELD field_38392 range I FIELD field_38393 speed F - METHOD (Ljava/util/function/Function;IF)V + METHOD (Ljava/util/function/Function;IIF)V ARG 1 lookTargetFunction ARG 2 range - ARG 3 speed diff --git a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping index f5bcecdb6e..a89d5c82a2 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping @@ -22,9 +22,6 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation COMMENT or equal to this value, the entity is considered "reached" the node. FIELD field_6684 entity Lnet/minecraft/class_1308; FIELD field_6685 lastRecalculateTime J - METHOD (Lnet/minecraft/class_1308;Lnet/minecraft/class_1937;)V - ARG 1 mob - ARG 2 world METHOD method_18053 shouldRecalculatePath (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_18416 findPathToAny (Ljava/util/Set;IZIF)Lnet/minecraft/class_11; diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping index 19f2c55aa6..2aba568e70 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping @@ -1,11 +1,8 @@ CLASS net/minecraft/class_1534 net/minecraft/entity/decoration/painting/PaintingEntity - FIELD field_7134 motive Lnet/minecraft/class_1535; - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_6880;)V ARG 1 world ARG 2 pos ARG 3 direction - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_1535;)V - ARG 1 world - ARG 2 pos - ARG 3 direction - ARG 4 motive diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingMotive.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingMotive.mapping index 4727af060d..1ce6332774 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingMotive.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingMotive.mapping @@ -5,8 +5,4 @@ CLASS net/minecraft/class_1535 net/minecraft/entity/decoration/painting/Painting ARG 1 width ARG 2 height METHOD method_6943 getHeight ()I - METHOD method_6944 register (Ljava/lang/String;II)Lnet/minecraft/class_1535; - ARG 0 name - ARG 1 width - ARG 2 height METHOD method_6945 getWidth ()I diff --git a/mappings/net/minecraft/entity/mob/WardenBrain.mapping b/mappings/net/minecraft/entity/mob/WardenBrain.mapping index 3c971b40de..5fc3ad92fd 100644 --- a/mappings/net/minecraft/entity/mob/WardenBrain.mapping +++ b/mappings/net/minecraft/entity/mob/WardenBrain.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_7261 net/minecraft/entity/mob/WardenBrain FIELD field_38182 RESET_DIG_COOLDOWN_TASK Lnet/minecraft/class_4097; FIELD field_38416 SENSORS Ljava/util/List; FIELD field_38417 MEMORY_MODULES Ljava/util/List; - METHOD method_42224 getStrollOrWaitTask ()Lnet/minecraft/class_4118; METHOD method_42225 resetDigCooldown (Lnet/minecraft/class_1309;)V ARG 0 warden METHOD method_42227 addCoreActivities (Lnet/minecraft/class_4095;)V @@ -26,8 +25,6 @@ CLASS net/minecraft/class_7261 net/minecraft/entity/mob/WardenBrain ARG 1 entity METHOD method_42233 addEmergeActivities (Lnet/minecraft/class_4095;)V ARG 0 brain - METHOD method_42234 hasNoSuspectOrTarget (Lnet/minecraft/class_7260;)Z - ARG 0 warden METHOD method_42235 removeDeadSuspect (Lnet/minecraft/class_7260;Lnet/minecraft/class_1309;)V ARG 0 warden ARG 1 suspect diff --git a/mappings/net/minecraft/entity/mob/WardenEntity.mapping b/mappings/net/minecraft/entity/mob/WardenEntity.mapping index 650d580125..857607582c 100644 --- a/mappings/net/minecraft/entity/mob/WardenEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WardenEntity.mapping @@ -28,7 +28,6 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity METHOD method_42211 removeSuspect (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_42212 increaseAngerAt (Lnet/minecraft/class_1297;IZ)V - ARG 1 entity ARG 2 amount ARG 3 listening METHOD method_42213 increaseAngerAt (Lnet/minecraft/class_1297;)V diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index d4e9ff05b9..8a5dbd5b57 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -83,10 +83,6 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity FIELD field_28340 axolotl Lnet/minecraft/class_5762; METHOD (Lnet/minecraft/class_5762;)V ARG 1 axolotl - CLASS class_5766 AxolotlSwimNavigation - METHOD (Lnet/minecraft/class_5762;Lnet/minecraft/class_1937;)V - ARG 1 axolotl - ARG 2 world CLASS class_5767 Variant FIELD field_28346 VARIANTS [Lnet/minecraft/class_5762$class_5767; FIELD field_28347 id I diff --git a/mappings/net/minecraft/entity/passive/AxolotlSwimNavigation.mapping b/mappings/net/minecraft/entity/passive/AxolotlSwimNavigation.mapping new file mode 100644 index 0000000000..9f1e426964 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/AxolotlSwimNavigation.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5766 net/minecraft/entity/passive/AxolotlSwimNavigation + METHOD (Lnet/minecraft/class_1308;Lnet/minecraft/class_1937;)V + ARG 2 world diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 92b6a80aee..d4f28c97f7 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -71,8 +71,6 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11113 onPlayerList (Lnet/minecraft/class_2703;)V ARG 1 packet - METHOD method_11114 onPaintingSpawn (Lnet/minecraft/class_2612;)V - ARG 1 packet METHOD method_11115 onUnlockRecipes (Lnet/minecraft/class_2713;)V ARG 1 packet METHOD method_11116 onBlockBreakingProgress (Lnet/minecraft/class_2620;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping index 1435cd3207..92b212cbf5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityS2CPacket.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_2684 net/minecraft/network/packet/s2c/play/EntityS2CPa FIELD field_12311 pitch B FIELD field_12312 yaw B FIELD field_20849 positionChanged Z - FIELD field_33335 COORDINATE_SCALE D METHOD (ISSSBBZZZ)V ARG 1 entityId ARG 2 deltaX @@ -25,17 +24,7 @@ CLASS net/minecraft/class_2684 net/minecraft/network/packet/s2c/play/EntityS2CPa METHOD method_11650 getPitch ()B METHOD method_11652 hasRotation ()Z METHOD method_11653 isOnGround ()Z - METHOD method_18047 encodePacketCoordinate (D)J - ARG 0 coord - METHOD method_18695 decodePacketCoordinates (JJJ)Lnet/minecraft/class_243; - ARG 0 x - ARG 2 y - ARG 4 z METHOD method_22826 isPositionChanged ()Z - METHOD method_30301 decodePacketCoordinate (J)D - ARG 0 coord - METHOD method_30302 calculateDeltaPosition (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; - ARG 1 orig METHOD method_36150 getDeltaX ()S METHOD method_36151 getDeltaY ()S METHOD method_36152 getDeltaZ ()S diff --git a/mappings/net/minecraft/network/packet/s2c/play/PaintingSpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PaintingSpawnS2CPacket.mapping deleted file mode 100644 index 2bd407a94b..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/play/PaintingSpawnS2CPacket.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_2612 net/minecraft/network/packet/s2c/play/PaintingSpawnS2CPacket - FIELD field_12008 pos Lnet/minecraft/class_2338; - FIELD field_12009 uuid Ljava/util/UUID; - FIELD field_12010 motiveId Lnet/minecraft/class_1535; - FIELD field_12011 facing Lnet/minecraft/class_2350; - FIELD field_12012 id I - METHOD (Lnet/minecraft/class_1534;)V - ARG 1 entity - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_11221 getMotive ()Lnet/minecraft/class_1535; - METHOD method_11222 getPaintingUuid ()Ljava/util/UUID; - METHOD method_11223 getFacing ()Lnet/minecraft/class_2350; - METHOD method_11225 getId ()I - METHOD method_11226 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/server/ServerConfigHandler.mapping b/mappings/net/minecraft/server/ServerConfigHandler.mapping index 0ccebc969e..8bc6fa67d6 100644 --- a/mappings/net/minecraft/server/ServerConfigHandler.mapping +++ b/mappings/net/minecraft/server/ServerConfigHandler.mapping @@ -75,8 +75,6 @@ CLASS net/minecraft/class_3321 net/minecraft/server/ServerConfigHandler METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile CLASS class_3322 ServerConfigException - METHOD (Ljava/lang/String;)V - ARG 1 title METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 title ARG 2 other diff --git a/mappings/net/minecraft/server/filter/TextFilterer.mapping b/mappings/net/minecraft/server/filter/TextFilterer.mapping index 85b14502e2..f14e910b54 100644 --- a/mappings/net/minecraft/server/filter/TextFilterer.mapping +++ b/mappings/net/minecraft/server/filter/TextFilterer.mapping @@ -95,8 +95,6 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer METHOD method_33809 (Ljava/lang/Throwable;)Ljava/util/List; ARG 0 throwable CLASS class_5517 FailedHttpRequestException - METHOD (Ljava/lang/String;)V - ARG 1 message CLASS class_7241 ProfileEncoder METHOD encode (Lcom/mojang/authlib/GameProfile;)Lcom/google/gson/JsonObject; ARG 1 gameProfile diff --git a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping index 658ce0b20d..949f6d7c04 100644 --- a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping +++ b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3231 net/minecraft/server/network/EntityTrackerEntry - FIELD field_14035 lastY J FIELD field_14036 lastOnGround Z FIELD field_14037 tickInterval I FIELD field_14039 alwaysUpdateVelocity Z @@ -8,9 +7,7 @@ CLASS net/minecraft/class_3231 net/minecraft/server/network/EntityTrackerEntry FIELD field_14043 updatesWithoutVehicle I FIELD field_14045 lastPassengers Ljava/util/List; FIELD field_14047 lastPitch I - FIELD field_14048 lastZ J FIELD field_14049 entity Lnet/minecraft/class_1297; - FIELD field_14050 lastX J FIELD field_14051 hadVehicle Z FIELD field_14059 lastHeadPitch I FIELD field_14060 lastYaw I @@ -33,9 +30,5 @@ CLASS net/minecraft/class_3231 net/minecraft/server/network/EntityTrackerEntry METHOD method_18758 sendSyncPacket (Lnet/minecraft/class_2596;)V COMMENT Sends a packet for synchronization with watcher and tracked player (if applicable) ARG 1 packet - METHOD method_18759 getLastPos ()Lnet/minecraft/class_243; - COMMENT Decodes lastX/Y/Z into a position vector METHOD method_18760 startTracking (Lnet/minecraft/class_3222;)V ARG 1 player - METHOD method_18761 storeEncodedCoordinates ()V - COMMENT Stores the tracked entity's current coordinates encoded as lastX/Y/Z diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index b34f56df04..bf9cc49819 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -119,8 +119,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_17264 entryIterator ()Ljava/lang/Iterable; METHOD method_17604 getCompletedLevelSupplier (J)Ljava/util/function/IntSupplier; ARG 1 pos - METHOD method_17979 getUpdatedChunkNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; - ARG 1 pos METHOD method_18193 (Lnet/minecraft/class_1923;Lnet/minecraft/class_2818;)V ARG 2 chunk METHOD method_18194 (Lnet/minecraft/class_1923;Lcom/mojang/datafixers/util/Either;)V diff --git a/mappings/net/minecraft/test/GameTestException.mapping b/mappings/net/minecraft/test/GameTestException.mapping index 8b5ff6215a..33de015f60 100644 --- a/mappings/net/minecraft/test/GameTestException.mapping +++ b/mappings/net/minecraft/test/GameTestException.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_4512 net/minecraft/test/GameTestException - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/mappings/net/minecraft/test/TickLimitExceededException.mapping b/mappings/net/minecraft/test/TickLimitExceededException.mapping index 225451119d..183a174298 100644 --- a/mappings/net/minecraft/test/TickLimitExceededException.mapping +++ b/mappings/net/minecraft/test/TickLimitExceededException.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_4522 net/minecraft/test/TickLimitExceededException - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/mappings/net/minecraft/text/BaseText.mapping b/mappings/net/minecraft/text/BaseText.mapping deleted file mode 100644 index 93dddb5cd5..0000000000 --- a/mappings/net/minecraft/text/BaseText.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_2554 net/minecraft/text/BaseText - FIELD field_11729 siblings Ljava/util/List; - FIELD field_11730 style Lnet/minecraft/class_2583; - FIELD field_26623 orderedText Lnet/minecraft/class_5481; - FIELD field_26624 previousLanguage Lnet/minecraft/class_2477; - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o diff --git a/mappings/net/minecraft/text/BlockNbtText.mapping b/mappings/net/minecraft/text/BlockNbtText.mapping new file mode 100644 index 0000000000..4d782992ba --- /dev/null +++ b/mappings/net/minecraft/text/BlockNbtText.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_2575 net/minecraft/text/BlockNbtText + FIELD comp_733 rawPos Ljava/lang/String; + FIELD comp_734 pos Lnet/minecraft/class_2267; + METHOD (Ljava/lang/String;)V + ARG 1 rawPath + METHOD (Ljava/lang/String;Lnet/minecraft/class_2267;)V + ARG 1 rawPath + METHOD comp_733 rawPos ()Ljava/lang/String; + METHOD comp_734 pos ()Lnet/minecraft/class_2267; + METHOD method_16121 parsePos (Ljava/lang/String;)Lnet/minecraft/class_2267; diff --git a/mappings/net/minecraft/text/EntityNbtText.mapping b/mappings/net/minecraft/text/EntityNbtText.mapping new file mode 100644 index 0000000000..b0e1384bee --- /dev/null +++ b/mappings/net/minecraft/text/EntityNbtText.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_2576 net/minecraft/text/EntityNbtText + FIELD comp_735 rawSelector Ljava/lang/String; + FIELD comp_736 selector Lnet/minecraft/class_2300; + METHOD (Ljava/lang/String;)V + ARG 1 rawPath + METHOD (Ljava/lang/String;Lnet/minecraft/class_2300;)V + ARG 1 rawPath + METHOD comp_735 rawSelector ()Ljava/lang/String; + METHOD comp_736 selector ()Lnet/minecraft/class_2300; + METHOD method_10923 parseSelector (Ljava/lang/String;)Lnet/minecraft/class_2300; + ARG 0 rawSelector diff --git a/mappings/net/minecraft/text/KeybindText.mapping b/mappings/net/minecraft/text/KeybindText.mapping index c840e94cc5..6a20f3974a 100644 --- a/mappings/net/minecraft/text/KeybindText.mapping +++ b/mappings/net/minecraft/text/KeybindText.mapping @@ -1,12 +1,7 @@ CLASS net/minecraft/class_2572 net/minecraft/text/KeybindText - FIELD field_11766 translator Ljava/util/function/Function; FIELD field_11767 key Ljava/lang/String; FIELD field_11768 translated Ljava/util/function/Supplier; METHOD (Ljava/lang/String;)V ARG 1 key METHOD method_10901 getKey ()Ljava/lang/String; - METHOD method_10904 (Ljava/lang/String;)Ljava/util/function/Supplier; - ARG 0 key - METHOD method_27690 setTranslator (Ljava/util/function/Function;)V - ARG 0 translator METHOD method_27691 getTranslated ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/text/LiteralText.mapping b/mappings/net/minecraft/text/LiteralText.mapping index 73d45e9dd0..f234c0d89e 100644 --- a/mappings/net/minecraft/text/LiteralText.mapping +++ b/mappings/net/minecraft/text/LiteralText.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_2585 net/minecraft/text/LiteralText - FIELD field_11862 string Ljava/lang/String; - FIELD field_24366 EMPTY Lnet/minecraft/class_2561; + FIELD comp_737 string Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 1 string - METHOD method_10993 getRawString ()Ljava/lang/String; + METHOD comp_737 string ()Ljava/lang/String; diff --git a/mappings/net/minecraft/text/NbtText.mapping b/mappings/net/minecraft/text/NbtText.mapping index 5880ffbe14..3452a7eeaf 100644 --- a/mappings/net/minecraft/text/NbtText.mapping +++ b/mappings/net/minecraft/text/NbtText.mapping @@ -4,17 +4,15 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtText FIELD field_11778 interpret Z FIELD field_11779 path Lnet/minecraft/class_2203$class_2209; FIELD field_33539 separator Ljava/util/Optional; - METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLjava/util/Optional;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLjava/util/Optional;Lnet/minecraft/class_7419;)V ARG 1 rawPath ARG 2 path ARG 3 interpret ARG 4 separator - METHOD (Ljava/lang/String;ZLjava/util/Optional;)V + METHOD (Ljava/lang/String;ZLjava/util/Optional;Lnet/minecraft/class_7419;)V ARG 1 rawPath ARG 2 interpret ARG 3 separator - METHOD method_10916 toNbt (Lnet/minecraft/class_2168;)Ljava/util/stream/Stream; - ARG 1 source METHOD method_10917 (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILjava/lang/String;)Ljava/util/stream/Stream; ARG 3 text METHOD method_10918 (Lnet/minecraft/class_2487;)Ljava/util/stream/Stream; @@ -31,55 +29,3 @@ CLASS net/minecraft/class_2574 net/minecraft/text/NbtText METHOD method_36335 (Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; ARG 1 accumulator ARG 2 current - METHOD method_36336 (Ljava/lang/String;)Lnet/minecraft/class_5250; - ARG 0 string - CLASS class_2575 BlockNbtText - FIELD field_11780 rawPos Ljava/lang/String; - FIELD field_16408 pos Lnet/minecraft/class_2267; - METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLjava/lang/String;Lnet/minecraft/class_2267;Ljava/util/Optional;)V - ARG 1 rawPath - ARG 2 path - ARG 3 interpret - ARG 4 rawPos - ARG 5 pos - ARG 6 separator - METHOD (Ljava/lang/String;ZLjava/lang/String;Ljava/util/Optional;)V - ARG 1 rawPath - ARG 2 rawJson - ARG 3 rawPos - ARG 4 separator - METHOD method_10922 getPos ()Ljava/lang/String; - METHOD method_16121 parsePos (Ljava/lang/String;)Lnet/minecraft/class_2267; - ARG 1 rawPos - CLASS class_2576 EntityNbtText - FIELD field_11781 selector Lnet/minecraft/class_2300; - FIELD field_11782 rawSelector Ljava/lang/String; - METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLjava/lang/String;Lnet/minecraft/class_2300;Ljava/util/Optional;)V - ARG 1 rawPath - ARG 2 path - ARG 3 interpret - ARG 4 rawSelector - ARG 5 selector - ARG 6 separator - METHOD (Ljava/lang/String;ZLjava/lang/String;Ljava/util/Optional;)V - ARG 1 rawPath - ARG 2 interpret - ARG 3 rawSelector - ARG 4 separator - METHOD method_10923 parseSelector (Ljava/lang/String;)Lnet/minecraft/class_2300; - ARG 0 rawSelector - METHOD method_10924 getSelector ()Ljava/lang/String; - CLASS class_4616 StorageNbtText - FIELD field_21049 id Lnet/minecraft/class_2960; - METHOD (Ljava/lang/String;Lnet/minecraft/class_2203$class_2209;ZLnet/minecraft/class_2960;Ljava/util/Optional;)V - ARG 1 rawPath - ARG 2 path - ARG 3 interpret - ARG 4 id - ARG 5 separator - METHOD (Ljava/lang/String;ZLnet/minecraft/class_2960;Ljava/util/Optional;)V - ARG 1 rawPath - ARG 2 interpret - ARG 3 id - ARG 4 separator - METHOD method_23728 getId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/text/ParsableText.mapping b/mappings/net/minecraft/text/ParsableText.mapping deleted file mode 100644 index 21995c7491..0000000000 --- a/mappings/net/minecraft/text/ParsableText.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_2566 net/minecraft/text/ParsableText - COMMENT A {@link Text} that needs to be parsed when it is loaded into the game. - METHOD method_10890 parse (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;I)Lnet/minecraft/class_5250; - ARG 1 source - ARG 2 sender - ARG 3 depth diff --git a/mappings/net/minecraft/text/ScoreText.mapping b/mappings/net/minecraft/text/ScoreText.mapping index e6913d197c..1f262bf973 100644 --- a/mappings/net/minecraft/text/ScoreText.mapping +++ b/mappings/net/minecraft/text/ScoreText.mapping @@ -5,11 +5,6 @@ CLASS net/minecraft/class_2578 net/minecraft/text/ScoreText FIELD field_33290 SENDER_PLACEHOLDER Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;)V ARG 1 name - ARG 2 objective - METHOD (Ljava/lang/String;Lnet/minecraft/class_2300;Ljava/lang/String;)V - ARG 1 name - ARG 2 selector - ARG 3 objective METHOD method_10928 getObjective ()Ljava/lang/String; METHOD method_10930 getName ()Ljava/lang/String; METHOD method_27699 getPlayerName (Lnet/minecraft/class_2168;)Ljava/lang/String; diff --git a/mappings/net/minecraft/text/SelectorText.mapping b/mappings/net/minecraft/text/SelectorText.mapping index f8ddd0d72d..8b8c5059fe 100644 --- a/mappings/net/minecraft/text/SelectorText.mapping +++ b/mappings/net/minecraft/text/SelectorText.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_2579 net/minecraft/text/SelectorText FIELD field_11791 LOGGER Lorg/slf4j/Logger; FIELD field_33540 separator Ljava/util/Optional; METHOD (Ljava/lang/String;Ljava/util/Optional;)V - ARG 1 pattern ARG 2 separator METHOD method_10932 getPattern ()Ljava/lang/String; METHOD method_36138 getSelector ()Lnet/minecraft/class_2300; diff --git a/mappings/net/minecraft/text/StorageNbtText.mapping b/mappings/net/minecraft/text/StorageNbtText.mapping new file mode 100644 index 0000000000..ab01bf84b1 --- /dev/null +++ b/mappings/net/minecraft/text/StorageNbtText.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4616 net/minecraft/text/StorageNbtText + FIELD comp_738 id Lnet/minecraft/class_2960; + METHOD comp_738 id ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index e870820b94..2b20c013eb 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text COMMENT refer to {@link MutableText}. COMMENT COMMENT @see MutableText - METHOD method_10851 asString ()Ljava/lang/String; + METHOD method_10851 asString ()Lnet/minecraft/class_7417; COMMENT Returns the string representation of this text itself, excluding siblings. METHOD method_10855 getSiblings ()Ljava/util/List; COMMENT Returns the siblings of this text. @@ -22,22 +22,6 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text COMMENT Returns the style of this text. METHOD method_27655 (ILjava/lang/StringBuilder;Ljava/lang/String;)Ljava/util/Optional; ARG 2 string - METHOD method_27659 visitSelf (Lnet/minecraft/class_5348$class_5245;)Ljava/util/Optional; - COMMENT Visits the text itself. - COMMENT - COMMENT @see #visit(Visitor) - COMMENT @return the visitor's return value - ARG 1 visitor - COMMENT the visitor - METHOD method_27660 visitSelf (Lnet/minecraft/class_5348$class_5246;Lnet/minecraft/class_2583;)Ljava/util/Optional; - COMMENT Visits the text itself. - COMMENT - COMMENT @see #visit(StyledVisitor, Style) - COMMENT @return the visitor's return value - ARG 1 visitor - COMMENT the visitor - ARG 2 style - COMMENT the current style METHOD method_27661 shallowCopy ()Lnet/minecraft/class_5250; COMMENT Copies the text itself, the style, and the siblings. COMMENT diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7421.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7421.mapping new file mode 100644 index 0000000000..7a4452ebf3 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7421.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7421 net/minecraft/unused/packageinfo/PackageInfo7421 diff --git a/mappings/net/minecraft/util/InvalidIdentifierException.mapping b/mappings/net/minecraft/util/InvalidIdentifierException.mapping index 055e0566ad..0a66fcd060 100644 --- a/mappings/net/minecraft/util/InvalidIdentifierException.mapping +++ b/mappings/net/minecraft/util/InvalidIdentifierException.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_151 net/minecraft/util/InvalidIdentifierException - METHOD (Ljava/lang/String;)V - ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 throwable diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 2f06faa0e6..25a516ea71 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -23,11 +23,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_18839 debugRunnable (Ljava/lang/Runnable;Ljava/util/function/Supplier;)Ljava/lang/Runnable; ARG 0 runnable ARG 1 messageSupplier - METHOD method_18841 (Ljava/util/List;[Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V - ARG 3 future - METHOD method_18842 (Ljava/util/concurrent/CompletableFuture;Ljava/util/List;ILjava/lang/Object;Ljava/lang/Throwable;)V - ARG 3 object - ARG 4 throwable METHOD method_19483 completeExceptionally (Ljava/lang/Throwable;)Ljava/util/concurrent/CompletableFuture; ARG 0 throwable METHOD method_20793 getLast (Ljava/util/List;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping index 99c3a715dc..942ded32ea 100644 --- a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping +++ b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping @@ -28,5 +28,3 @@ CLASS net/minecraft/class_3508 net/minecraft/util/collection/PackedIntegerArray METHOD method_27284 getStorageIndex (I)I ARG 1 index CLASS class_6685 InvalidLengthException - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index a3665c1a24..e814d9ba2a 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -213,8 +213,6 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 0 registry METHOD method_10245 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1842; ARG 0 registry - METHOD method_10246 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1535; - ARG 0 registry METHOD method_10247 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2378$class_6889;)Lnet/minecraft/class_2378; ARG 0 key ARG 1 defaultEntryGetter diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping index d25e0ec61e..449e1c66b4 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature ARG 1 pos METHOD method_16428 (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_23380 placeLogsAndLeaves (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;Ljava/util/Set;Ljava/util/Set;)Lnet/minecraft/class_251; + METHOD method_23380 placeLogsAndLeaves (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)Lnet/minecraft/class_251; ARG 0 world ARG 1 box ARG 2 trunkPositions @@ -49,8 +49,6 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature ARG 2 height ARG 3 pos ARG 4 config - METHOD method_35363 (Lnet/minecraft/class_5281;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_3341;)Ljava/lang/Boolean; - ARG 3 box METHOD method_35364 (Ljava/util/Set;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 2 pos ARG 3 state diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index f2ed49581d..ad4b5d01a3 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage FIELD field_17668 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_200 TIME_FORMATTER Ljava/time/format/DateTimeFormatter; FIELD field_25020 GENERATOR_OPTION_KEYS Lcom/google/common/collect/ImmutableList; - FIELD field_31836 DEFAULT_ICON Ljava/lang/String; FIELD field_36348 DATA_KEY Ljava/lang/String; METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)V ARG 1 savesDirectory @@ -19,12 +18,11 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_19636 getSavesDirectory ()Ljava/nio/file/Path; METHOD method_230 levelExists (Ljava/lang/String;)Z ARG 1 name - METHOD method_235 getLevelList ()Ljava/util/List; + METHOD method_235 getLevelList ()Lnet/minecraft/class_32$class_7410; METHOD method_236 getBackupsDirectory ()Ljava/nio/file/Path; METHOD method_240 isLevelNameValid (Ljava/lang/String;)Z ARG 1 name - METHOD method_26998 readLevelProperties (Ljava/io/File;Ljava/util/function/BiFunction;)Ljava/lang/Object; - ARG 1 file + METHOD method_26998 readLevelProperties (Lnet/minecraft/class_32$class_7411;Ljava/util/function/BiFunction;)Ljava/lang/Object; ARG 2 levelDataParser METHOD method_26999 create (Ljava/nio/file/Path;)Lnet/minecraft/class_32; ARG 0 path @@ -34,29 +32,24 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 0 levelData ARG 1 dataFixer ARG 2 version - METHOD method_29014 createLevelDataParser (Ljava/io/File;Z)Ljava/util/function/BiFunction; - ARG 1 file + METHOD method_29014 createLevelDataParser (Lnet/minecraft/class_32$class_7411;Z)Ljava/util/function/BiFunction; ARG 2 locked - METHOD method_29015 (Ljava/io/File;ZLjava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_34; - ARG 3 file + METHOD method_29015 (Lnet/minecraft/class_32$class_7411;ZLjava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_34; ARG 4 dataFixer METHOD method_29580 parseDataPackSettings (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_5359; ARG 0 dynamic - METHOD method_29582 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Lcom/mojang/serialization/Lifecycle;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_31; - ARG 3 file + METHOD method_29582 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Lcom/mojang/serialization/Lifecycle;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_31; ARG 4 dataFixer - METHOD method_29583 readDataPackSettings (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_5359; - ARG 0 file + METHOD method_29583 readDataPackSettings (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_5359; ARG 1 dataFixer METHOD method_35504 getFormatName ()Ljava/lang/String; - METHOD method_40035 loadCompactLevelData (Ljava/io/File;)Lnet/minecraft/class_2520; + METHOD method_40035 loadCompactLevelData (Ljava/nio/file/Path;)Lnet/minecraft/class_2520; COMMENT {@return the compact version of the NBT for the level data {@code file}} COMMENT COMMENT

The returned NBT will not have {@code Player} and {@code WorldGenSettings} keys. - ARG 0 file CLASS class_5143 Session FIELD field_23767 lock Lnet/minecraft/class_5125; - FIELD field_23768 directory Ljava/nio/file/Path; + FIELD field_23768 directory Lnet/minecraft/class_32$class_7411; FIELD field_23769 directoryName Ljava/lang/String; FIELD field_24190 paths Ljava/util/Map; METHOD (Lnet/minecraft/class_32;Ljava/lang/String;)V @@ -84,8 +77,6 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 2 saveProperties ARG 3 nbt METHOD method_27427 createSaveHandler ()Lnet/minecraft/class_29; - METHOD method_27428 (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; - ARG 1 path METHOD method_29584 getLevelSummary ()Lnet/minecraft/class_34; METHOD method_29585 getDataPackSettings ()Lnet/minecraft/class_5359; CLASS 1 diff --git a/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping b/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping index 79a325ac2c..dfd391358b 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_33 net/minecraft/world/level/storage/LevelStorageException - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index 1483db0a68..d6adb6d818 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -2,17 +2,16 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary FIELD field_205 name Ljava/lang/String; FIELD field_209 requiresConversion Z FIELD field_23772 locked Z - FIELD field_23773 file Ljava/io/File; + FIELD field_23773 file Ljava/nio/file/Path; FIELD field_24191 details Lnet/minecraft/class_2561; FIELD field_25022 levelInfo Lnet/minecraft/class_1940; FIELD field_25023 versionInfo Lnet/minecraft/class_5315; - METHOD (Lnet/minecraft/class_1940;Lnet/minecraft/class_5315;Ljava/lang/String;ZZLjava/io/File;)V + METHOD (Lnet/minecraft/class_1940;Lnet/minecraft/class_5315;Ljava/lang/String;ZZLjava/nio/file/Path;)V ARG 1 levelInfo ARG 2 versionInfo ARG 3 name ARG 4 requiresConversion ARG 5 locked - ARG 6 file METHOD method_247 getGameMode ()Lnet/minecraft/class_1934; METHOD method_248 getName ()Ljava/lang/String; METHOD method_249 getLastPlayed ()J @@ -23,7 +22,7 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary METHOD method_258 getVersion ()Lnet/minecraft/class_5250; METHOD method_259 hasCheats ()Z METHOD method_260 isFutureLevel ()Z - METHOD method_27020 getFile ()Ljava/io/File; + METHOD method_27020 getFile ()Ljava/nio/file/Path; METHOD method_27021 isLocked ()Z METHOD method_27429 getDetails ()Lnet/minecraft/class_2561; METHOD method_27430 createDetails ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping index bb3f4c25f7..420e19502e 100644 --- a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping +++ b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping @@ -15,8 +15,6 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess ARG 5 executor METHOD method_31730 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Ljava/lang/Void; ARG 1 ex - METHOD method_31731 (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Lnet/minecraft/class_5566; - ARG 2 compound METHOD method_31732 getChunkDataVersion (Lnet/minecraft/class_2487;)I ARG 0 chunkNbt METHOD method_31733 putChunkPos (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)V diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping index 30423c935f..3114fbe15f 100644 --- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping @@ -45,7 +45,7 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase ARG 1 chunkPos METHOD method_20436 saveChunk (Lnet/minecraft/class_1923;)V ARG 1 pos - METHOD method_20621 loadNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; + METHOD method_20621 loadNbt (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; ARG 1 pos METHOD method_28511 (JLcom/mojang/serialization/Dynamic;)Ljava/util/Optional; ARG 3 dynamic diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping index 6a5cd56095..398694b8c8 100644 --- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping +++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker ARG 3 name METHOD method_23698 completeAll (Z)Ljava/util/concurrent/CompletableFuture; ARG 1 sync - METHOD method_23700 getNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; - ARG 1 pos METHOD method_23701 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_4698$class_4699;)V ARG 1 pos ARG 2 result diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index de2436a093..f59d043d34 100644 --- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage METHOD method_17910 setNbt (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)V ARG 1 chunkPos ARG 2 nbt - METHOD method_23696 getNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; + METHOD method_23696 getNbt (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; ARG 1 chunkPos METHOD method_23697 completeAll ()V METHOD method_39798 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5321;)V