From 2a055674e641f98049097f285c321fc22907540b Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 23 Jul 2022 23:18:50 +0900 Subject: [PATCH] 1.18.2 javadoc fixes (#3054) * 1.18.2 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/feature/ConfiguredStructureFeature.mapping | 1 - .../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 ++-- 12 files changed, 16 insertions(+), 19 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 7c9c4a44c5..fdcd9d1506 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -271,7 +271,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 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/feature/ConfiguredStructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping
index a8fb1cb915..67d90de48e 100644
--- a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping
+++ b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping
@@ -10,7 +10,6 @@ CLASS net/minecraft/class_5312 net/minecraft/world/gen/feature/ConfiguredStructu
ARG 2 config
ARG 3 biomes
METHOD method_28622 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449;
- COMMENT @see StructureFeature#tryPlaceStart
ARG 1 registryManager
ARG 2 chunkGenerator
ARG 3 biomeSource
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.
*
+ * to the resource manager in each reload.
*
*
They are usually single-use, created by {@link ResourcePackManager} and provided
- * to {@link ReloadableResourceManager} 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.
*