From 14e3a297d276f1e292451539d096920d436d487c Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:38:27 +0900 Subject: [PATCH] 22w11a javadoc fixes (#3055) * 22w11a javadoc fixes * Update mappings/net/minecraft/tag/TagPacketSerializer.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- mappings/net/minecraft/resource/ResourceReloader.mapping | 2 +- mappings/net/minecraft/server/world/ServerWorld.mapping | 3 ++- mappings/net/minecraft/tag/TagPacketSerializer.mapping | 8 +++----- .../minecraft/util/dynamic/RegistryElementCodec.mapping | 2 -- mappings/net/minecraft/util/math/Vec3i.mapping | 3 ++- .../util/registry/DynamicRegistryManager.mapping | 2 +- .../world/gen/placementmodifier/PlacementModifier.mapping | 2 +- mappings/net/minecraft/world/spawner/CatSpawner.mapping | 2 +- .../net/minecraft/world/spawner/PatrolSpawner.mapping | 2 +- mappings/net/minecraft/world/spawner/Spawner.mapping | 4 ++-- .../java/net/minecraft/resource/package-info.java | 4 ++-- 11 files changed, 16 insertions(+), 18 deletions(-) diff --git a/mappings/net/minecraft/resource/ResourceReloader.mapping b/mappings/net/minecraft/resource/ResourceReloader.mapping index 75d72e2d32..7c8a6c10d5 100644 --- a/mappings/net/minecraft/resource/ResourceReloader.mapping +++ b/mappings/net/minecraft/resource/ResourceReloader.mapping @@ -27,7 +27,7 @@ CLASS net/minecraft/class_3302 net/minecraft/resource/ResourceReloader COMMENT In the end, returns the result of {@code thenAcceptAsync}. COMMENT COMMENT @return a future for the reload - COMMENT @see ReloadableResourceManager#reload(Executor, Executor, + COMMENT @see ReloadableResourceManagerImpl#reload(Executor, Executor, COMMENT CompletableFuture, List) ARG 1 synchronizer COMMENT the synchronizer diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 88c6f3f2b8..7ecd249b08 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -267,7 +267,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld COMMENT {@return the world spawn point} COMMENT COMMENT @implNote If it is outside the world border, this returns the position of the - COMMENT highest {@linkplain Heightmap.Type#MOTION_BLOCKING motion-blocking} block at the center of the world border. + COMMENT highest {@linkplain net.minecraft.world.Heightmap.Type#MOTION_BLOCKING motion-blocking} + COMMENT block at the center of the world border. METHOD method_28125 isFlat ()Z METHOD method_29198 getEnderDragonFight ()Lnet/minecraft/class_2881; METHOD method_29199 setTimeOfDay (J)V diff --git a/mappings/net/minecraft/tag/TagPacketSerializer.mapping b/mappings/net/minecraft/tag/TagPacketSerializer.mapping index cd515594ad..50609f4ff3 100644 --- a/mappings/net/minecraft/tag/TagPacketSerializer.mapping +++ b/mappings/net/minecraft/tag/TagPacketSerializer.mapping @@ -15,13 +15,11 @@ CLASS net/minecraft/class_6864 net/minecraft/tag/TagPacketSerializer ARG 4 rawIds CLASS class_5748 Serialized COMMENT A serialization-friendly POJO representation of a {@linkplain - COMMENT TagGroup tag group}. This allows easy transport of tag groups - COMMENT over Minecraft network protocol. + COMMENT RegistryEntryList registry entry list} of tags. This allows easy transport + COMMENT of tags over Minecraft network protocol. COMMENT COMMENT

This stores tag entries with raw integer IDs and requires a registry - COMMENT for raw ID access to {@linkplain TagGroup#serialize(Registry) serialize} - COMMENT or {@linkplain TagGroup#deserialize(TagGroup.Serialized, Registry) - COMMENT deserialize} tag groups. + COMMENT for raw ID access to serialize or deserialize tags. FIELD field_28304 contents Ljava/util/Map; METHOD (Ljava/util/Map;)V ARG 1 contents diff --git a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping index 02db1febdd..aec50ced74 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec COMMENT loading from registry before a registry is fully loaded from a codec. COMMENT COMMENT @param the element type - COMMENT @see RegistryCodec - COMMENT @see RegistryReadingOps COMMENT @see RegistryOps FIELD field_25507 registryRef Lnet/minecraft/class_5321; FIELD field_25508 elementCodec Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index f554378e67..0f94756abc 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -39,7 +39,8 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i METHOD method_10262 getSquaredDistance (Lnet/minecraft/class_2382;)D COMMENT {@return the squared distance between here (center) and {@code vec}} COMMENT - COMMENT @see #getSquaredDistance(Vec3i, boolean) + COMMENT @see #getSquaredDistance(double, double, double) + COMMENT @see #getSquaredDistanceFromCenter(double, double, double) ARG 1 vec METHOD method_10263 getX ()I METHOD method_10264 getY ()I diff --git a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping index 9556638f0b..3ce86aab2e 100644 --- a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping +++ b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage COMMENT registries, while each client play network handler has a dynamic registry COMMENT manager for server-sent dynamic registries. COMMENT - COMMENT

The {@link DynamicRegistryManager.Impl} + COMMENT

The {@link DynamicRegistryManager.ImmutableImpl} COMMENT class serves as an immutable implementation of any particular collection COMMENT or configuration of dynamic registries. FIELD field_25918 LOGGER Lorg/slf4j/Logger; diff --git a/mappings/net/minecraft/world/gen/placementmodifier/PlacementModifier.mapping b/mappings/net/minecraft/world/gen/placementmodifier/PlacementModifier.mapping index a9f1b7594d..d2f01afeaa 100644 --- a/mappings/net/minecraft/world/gen/placementmodifier/PlacementModifier.mapping +++ b/mappings/net/minecraft/world/gen/placementmodifier/PlacementModifier.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_6797 net/minecraft/world/gen/placementmodifier/Placeme COMMENT takes a position with some context and returns zero or more positions. COMMENT It's used to determine where to generate configured features. COMMENT - COMMENT @see net.minecraft.world.gen.feature.ConfiguredFeature#withPlacement + COMMENT @see net.minecraft.world.gen.feature.ConfiguredFeature FIELD field_35736 CODEC Lcom/mojang/serialization/Codec; METHOD method_14452 getPositions (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; COMMENT Applies this placement modifier to the given position. diff --git a/mappings/net/minecraft/world/spawner/CatSpawner.mapping b/mappings/net/minecraft/world/spawner/CatSpawner.mapping index da81c5f9b0..0b86bba222 100644 --- a/mappings/net/minecraft/world/spawner/CatSpawner.mapping +++ b/mappings/net/minecraft/world/spawner/CatSpawner.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_4274 net/minecraft/world/spawner/CatSpawner COMMENT A spawner for cats in villages and swamp huts. COMMENT COMMENT @implNote Cats in swamp huts are also spawned in - COMMENT {@link net.minecraft.world.gen.chunk.ChunkGeneratorSettings#getEntitySpawnList}. + COMMENT {@link net.minecraft.world.gen.chunk.ChunkGenerator#getEntitySpawnList}. FIELD field_19171 cooldown I FIELD field_30601 SPAWN_INTERVAL I METHOD method_20260 spawnInSwampHut (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)I diff --git a/mappings/net/minecraft/world/spawner/PatrolSpawner.mapping b/mappings/net/minecraft/world/spawner/PatrolSpawner.mapping index 6243ac35b9..7da7508d19 100644 --- a/mappings/net/minecraft/world/spawner/PatrolSpawner.mapping +++ b/mappings/net/minecraft/world/spawner/PatrolSpawner.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3769 net/minecraft/world/spawner/PatrolSpawner COMMENT A spawner for pillager patrols. COMMENT COMMENT

Pillager spawns in pillager outposts are controlled at - COMMENT {@link net.minecraft.world.gen.chunk.ChunkGeneratorSettings#getEntitySpawnList}. + COMMENT {@link net.minecraft.world.gen.chunk.ChunkGenerator#getEntitySpawnList}. FIELD field_16652 cooldown I METHOD method_16575 spawnPillager (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;Z)Z ARG 1 world diff --git a/mappings/net/minecraft/world/spawner/Spawner.mapping b/mappings/net/minecraft/world/spawner/Spawner.mapping index c0524eacde..8a076a35ae 100644 --- a/mappings/net/minecraft/world/spawner/Spawner.mapping +++ b/mappings/net/minecraft/world/spawner/Spawner.mapping @@ -5,9 +5,9 @@ CLASS net/minecraft/class_5304 net/minecraft/world/spawner/Spawner COMMENT special context, such as cats in a village or wandering traders. COMMENT This is different from COMMENT {@link net.minecraft.world.MobSpawnerLogic the mob spawner logic} - COMMENT which is used for {@link net.minecraft.SpawnerBlock the spawner block}, + COMMENT which is used for {@link net.minecraft.block.SpawnerBlock the spawner block}, COMMENT or the structure spawn conditions (such as guardians) which is defined in - COMMENT {@link net.minecraft.world.gen.chunk.ChunkGeneratorSettings#getEntitySpawnList}. + COMMENT {@link net.minecraft.world.gen.chunk.ChunkGenerator#getEntitySpawnList}. COMMENT However, cats in swamp huts are spawned in both {@link CatSpawner} and COMMENT the normal structure spawning. METHOD method_6445 spawn (Lnet/minecraft/class_3218;ZZ)I diff --git a/src/packageDocs/java/net/minecraft/resource/package-info.java b/src/packageDocs/java/net/minecraft/resource/package-info.java index e2c1db4e5d..e07e9c829b 100644 --- a/src/packageDocs/java/net/minecraft/resource/package-info.java +++ b/src/packageDocs/java/net/minecraft/resource/package-info.java @@ -46,7 +46,7 @@ * {@link ResourcePack} * Provides binary data based on queries. *
They are usually single-use, created by {@link ResourcePackManager} and provided - * to {@link ReloadableResourceManager} in each reload. + * to the resource manager in each reload. * * * {@link ResourcePackProfile} @@ -61,7 +61,7 @@ * * {@link ResourcePackManager} * Keeps track of {@link ResourcePackProvider}s and uses the profiles from the providers - * to create {@link ResourcePack}s to send to {@link ReloadableResourceManager}s in each reload. + * to create {@link ResourcePack}s to send to resource managers in each reload. * * *