From 02908445ab87d8b7419630a7aaa2e52ce3d408c5 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Sat, 2 Nov 2019 16:51:27 -0500 Subject: [PATCH] Mapped all top-level classes (#934) * Mapped all top-level classes No more obfuscated top-level class Signed-off-by: liach * Mapping inner classes (Still some left) These to go: net/minecraft/datafixers/fixes/LeavesFix$class_1192 net/minecraft/structure/NetherFortressGenerator$class_3404 net/minecraft/structure/OceanMonumentGenerator$class_3367 net/minecraft/structure/OceanMonumentGenerator$class_3368 net/minecraft/structure/OceanMonumentGenerator$class_3369 net/minecraft/structure/OceanMonumentGenerator$class_3370 net/minecraft/structure/OceanMonumentGenerator$class_3371 net/minecraft/structure/OceanMonumentGenerator$class_3372 net/minecraft/structure/OceanMonumentGenerator$class_3373 net/minecraft/structure/OceanMonumentGenerator$class_3375 net/minecraft/structure/OceanMonumentGenerator$class_3388 net/minecraft/structure/StrongholdGenerator$class_3427 net/minecraft/structure/StrongholdGenerator$class_3466 net/minecraft/structure/Structure$class_3500 net/minecraft/structure/WoodlandMansionGenerator$class_3478 Signed-off-by: liach * Update StructurePoolBasedGenerator.mapping * Fixes as suggested by @Runemoro Signed-off-by: liach --- .../blaze3d/systems/RenderCallStorage.mapping | 2 + mappings/net/minecraft/class_4625.mapping | 1 - mappings/net/minecraft/class_4627.mapping | 1 - mappings/net/minecraft/class_4628.mapping | 1 - mappings/net/minecraft/class_4666.mapping | 1 - .../recipebook/RecipeAlternatesWidget.mapping | 2 +- .../client/options/GameOptions.mapping | 3 ++ .../minecraft/client/options/Option.mapping | 2 + .../client/options/StickyKeyBinding.mapping | 7 ++++ .../client/particle/BlockLeakParticle.mapping | 18 +++++++-- .../particle/FireworksSparkParticle.mapping | 4 +- .../client/particle/ParticleManager.mapping | 2 + .../client/render/chunk/ChunkBatcher.mapping | 12 ++++-- .../debug/ChunkLoadingDebugRenderer.mapping | 4 ++ .../client/render/debug/DebugRenderer.mapping | 8 ++++ .../debug/GoalSelectorDebugRenderer.mapping | 3 ++ .../PointOfInterestDebugRenderer.mapping | 14 ++++++- .../IronGolemCrackFeatureRenderer.mapping | 1 + .../client/render/model/ModelLoader.mapping | 6 +++ .../model/json/ItemModelGenerator.mapping | 37 +++++++++++++++++++ .../net/minecraft/client/util/Window.mapping | 2 + .../math/Vector3d.mapping} | 2 +- .../arguments/GameProfileArgumentType.mapping | 2 + .../TestFunctionArgumentType.mapping | 1 + .../net/minecraft/data/SnbtProvider.mapping | 17 +++++++++ .../StructureValidatorProvider.mapping | 4 ++ .../fixes/AddTrappedChestFix.mapping | 4 ++ .../datafixers/fixes/LeavesFix.mapping | 3 ++ mappings/net/minecraft/entity/Entity.mapping | 2 + .../entity/boss/WitherEntity.mapping | 3 +- .../entity/mob/DrownedEntity.mapping | 4 +- .../entity/mob/RavagerEntity.mapping | 3 +- .../minecraft/entity/mob/SlimeEntity.mapping | 11 ++++-- .../entity/passive/HorseEntity.mapping | 2 + .../entity/passive/IronGolemEntity.mapping | 7 ++++ .../entity/passive/LlamaEntity.mapping | 9 +++++ .../entity/passive/PassiveEntity.mapping | 12 ++++++ .../entity/passive/PufferfishEntity.mapping | 5 ++- .../minecraft/realms/RepeatedNarrator.mapping | 4 ++ .../minecraft/recipe/CuttingRecipe.mapping | 2 + .../server/command/TestCommand.mapping | 1 + .../server/rcon/QueryResponseHandler.mapping | 18 +++++++++ .../server/world/ChunkTicketManager.mapping | 3 ++ .../WoodlandMansionGenerator.mapping | 2 + mappings/net/minecraft/test/GameTest.mapping | 9 ++++- .../StartupParameter.mapping} | 2 +- .../net/minecraft/test/TestFunction.mapping | 4 ++ .../test/TimeMismatchException.mapping | 1 + mappings/net/minecraft/test/TimedTask.mapping | 3 ++ .../minecraft/test/TimedTaskRunner.mapping | 10 +++++ .../net/minecraft/util/math/Boxes.mapping | 5 +++ .../net/minecraft/util/shape/VoxelSet.mapping | 2 + .../minecraft/world/chunk/UpgradeData.mapping | 10 +++++ .../world/dimension/DimensionType.mapping | 3 +- .../gen/feature/AcaciaTreeFeature.mapping | 1 + .../gen/feature/BranchedTreeFeature.mapping | 1 + ...ping => BranchedTreeFeatureConfig.mapping} | 2 +- .../gen/feature/FlowerFeatureConfig.mapping | 1 + .../gen/feature/HugeMushroomFeature.mapping | 1 + .../gen/feature/MegaTreeFeatureConfig.mapping | 1 + .../gen/feature/RandomPatchFeature.mapping | 1 + ...nfig.mapping => TreeFeatureConfig.mapping} | 2 +- .../world/gen/foliage/FoliagePlacer.mapping | 8 ++++ .../world/gen/placer/BlockPlacer.mapping | 5 ++- .../world/storage/RegionBasedStorage.mapping | 1 + .../world/storage/RegionFile.mapping | 10 ++++- .../SerializingRegionBasedStorage.mapping | 3 ++ .../world/storage/StorageIoWorker.mapping | 32 ++++++++++++++++ .../VersionedChunkStorage.mapping | 5 ++- 69 files changed, 343 insertions(+), 32 deletions(-) create mode 100644 mappings/com/mojang/blaze3d/systems/RenderCallStorage.mapping delete mode 100644 mappings/net/minecraft/class_4625.mapping delete mode 100644 mappings/net/minecraft/class_4627.mapping delete mode 100644 mappings/net/minecraft/class_4628.mapping delete mode 100644 mappings/net/minecraft/class_4666.mapping create mode 100644 mappings/net/minecraft/client/options/StickyKeyBinding.mapping rename mappings/net/minecraft/client/{render/Vec3d.mapping => util/math/Vector3d.mapping} (62%) create mode 100644 mappings/net/minecraft/realms/RepeatedNarrator.mapping rename mappings/net/minecraft/{class_4516.mapping => test/StartupParameter.mapping} (61%) create mode 100644 mappings/net/minecraft/test/TimeMismatchException.mapping create mode 100644 mappings/net/minecraft/test/TimedTask.mapping create mode 100644 mappings/net/minecraft/test/TimedTaskRunner.mapping create mode 100644 mappings/net/minecraft/util/math/Boxes.mapping create mode 100644 mappings/net/minecraft/world/gen/feature/AcaciaTreeFeature.mapping create mode 100644 mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping rename mappings/net/minecraft/world/gen/feature/{NormalTreeFeatureConfig.mapping => BranchedTreeFeatureConfig.mapping} (89%) create mode 100644 mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping create mode 100644 mappings/net/minecraft/world/gen/feature/RandomPatchFeature.mapping rename mappings/net/minecraft/world/gen/feature/{AbstractTreeFeatureConfig.mapping => TreeFeatureConfig.mapping} (91%) create mode 100644 mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping create mode 100644 mappings/net/minecraft/world/storage/StorageIoWorker.mapping rename mappings/net/minecraft/world/{ => storage}/VersionedChunkStorage.mapping (66%) diff --git a/mappings/com/mojang/blaze3d/systems/RenderCallStorage.mapping b/mappings/com/mojang/blaze3d/systems/RenderCallStorage.mapping new file mode 100644 index 0000000000..7415c6f5a4 --- /dev/null +++ b/mappings/com/mojang/blaze3d/systems/RenderCallStorage.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_4491 com/mojang/blaze3d/systems/RenderCallStorage + FIELD field_20453 recordingQueues Ljava/util/List; diff --git a/mappings/net/minecraft/class_4625.mapping b/mappings/net/minecraft/class_4625.mapping deleted file mode 100644 index 91359a5eb8..0000000000 --- a/mappings/net/minecraft/class_4625.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4625 diff --git a/mappings/net/minecraft/class_4627.mapping b/mappings/net/minecraft/class_4627.mapping deleted file mode 100644 index 6e674b4cc8..0000000000 --- a/mappings/net/minecraft/class_4627.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4627 diff --git a/mappings/net/minecraft/class_4628.mapping b/mappings/net/minecraft/class_4628.mapping deleted file mode 100644 index 7c7ad491db..0000000000 --- a/mappings/net/minecraft/class_4628.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4628 diff --git a/mappings/net/minecraft/class_4666.mapping b/mappings/net/minecraft/class_4666.mapping deleted file mode 100644 index 1b3e9c183c..0000000000 --- a/mappings/net/minecraft/class_4666.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4666 diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget.mapping index 8bdeae4252..dc7083ca46 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA ARG 1 mouseX ARG 2 mouseY ARG 3 delta - CLASS class_511 + CLASS class_511 FurnaceAlternateButtonWidget METHOD (Lnet/minecraft/class_508;IILnet/minecraft/class_1860;Z)V ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/client/options/GameOptions.mapping b/mappings/net/minecraft/client/options/GameOptions.mapping index 06a6a8464e..86627837a2 100644 --- a/mappings/net/minecraft/client/options/GameOptions.mapping +++ b/mappings/net/minecraft/client/options/GameOptions.mapping @@ -95,6 +95,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions FIELD field_1915 chatWidth D FIELD field_1916 soundVolumeLevels Ljava/util/Map; FIELD field_19244 discreteMouseScroll Z + FIELD field_20308 rawMouseInput Z + FIELD field_21332 sneakToggled Z + FIELD field_21333 sprintToggled Z METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V ARG 1 client ARG 2 optionsFile diff --git a/mappings/net/minecraft/client/options/Option.mapping b/mappings/net/minecraft/client/options/Option.mapping index 3619fc09c8..d4c0975703 100644 --- a/mappings/net/minecraft/client/options/Option.mapping +++ b/mappings/net/minecraft/client/options/Option.mapping @@ -42,6 +42,8 @@ CLASS net/minecraft/class_316 net/minecraft/client/options/Option FIELD field_1964 FOV Lnet/minecraft/class_4067; FIELD field_1966 key Ljava/lang/String; FIELD field_20307 RAW_MOUSE_INPUT Lnet/minecraft/class_4062; + FIELD field_21330 SNEAK_TOGGLED Lnet/minecraft/class_4064; + FIELD field_21331 SPRINT_TOGGLED Lnet/minecraft/class_4064; METHOD (Ljava/lang/String;)V ARG 1 key METHOD method_18518 getDisplayPrefix ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/StickyKeyBinding.mapping b/mappings/net/minecraft/client/options/StickyKeyBinding.mapping new file mode 100644 index 0000000000..babc16caed --- /dev/null +++ b/mappings/net/minecraft/client/options/StickyKeyBinding.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_4666 net/minecraft/client/options/StickyKeyBinding + FIELD field_21334 toggleGetter Ljava/util/function/BooleanSupplier; + METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/BooleanSupplier;)V + ARG 1 id + ARG 2 code + ARG 3 category + ARG 4 toggleGetter diff --git a/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping b/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping index 0bcefae949..1dd692ed92 100644 --- a/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping +++ b/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle FIELD field_18297 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider - CLASS class_4082 DrippingLavaParticle + CLASS class_4082 DrippingLava METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_3611;Lnet/minecraft/class_2394;)V ARG 1 world ARG 2 x @@ -15,7 +15,7 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle ARG 6 z ARG 8 fluid ARG 9 nextParticle - CLASS class_4083 FallingParticle + CLASS class_4083 ContinuousFalling FIELD field_18292 nextParticle Lnet/minecraft/class_2394; METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_3611;Lnet/minecraft/class_2394;)V ARG 1 world @@ -24,7 +24,7 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle ARG 6 z ARG 8 fluid ARG 9 nextParticle - CLASS class_4084 DrippingParticle + CLASS class_4084 Dripping FIELD field_18293 nextParticle Lnet/minecraft/class_2394; METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_3611;Lnet/minecraft/class_2394;)V ARG 1 world @@ -33,7 +33,7 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle ARG 6 z ARG 8 fluid ARG 9 nextParticle - CLASS class_4085 LandingParticle + CLASS class_4085 Landing CLASS class_4086 FallingLavaFactory FIELD field_18294 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V @@ -42,6 +42,16 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle FIELD field_18296 spriteProvider Lnet/minecraft/class_4002; CLASS class_4088 DrippingWaterFactory FIELD field_18298 spriteProvider Lnet/minecraft/class_4002; + CLASS class_4497 Falling + CLASS class_4498 FallingHoney + CLASS class_4499 FallingHoneyFactory + FIELD field_20515 spriteProvider Lnet/minecraft/class_4002; + CLASS class_4500 DrippingHoneyFactory + FIELD field_20516 spriteProvider Lnet/minecraft/class_4002; + CLASS class_4501 LandingHoneyFactory + FIELD field_20517 spriteProvider Lnet/minecraft/class_4002; + CLASS class_4502 FallingNectarFactory + FIELD field_20518 spriteProvider Lnet/minecraft/class_4002; FIELD field_3789 fluid Lnet/minecraft/class_3611; METHOD (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_3611;)V ARG 1 world diff --git a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping index dff6ebf788..bcf7ccacf9 100644 --- a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping +++ b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkParticle - CLASS class_678 FlashParticle + CLASS class_678 Flash METHOD (Lnet/minecraft/class_1937;DDD)V ARG 1 x ARG 2 y @@ -7,7 +7,7 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic FIELD field_17811 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider - CLASS class_680 ExplosionParticle + CLASS class_680 Explosion FIELD field_3798 particleManager Lnet/minecraft/class_702; FIELD field_3803 flicker Z FIELD field_3804 trail Z diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index 5c64f07579..e7badfb7c1 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -3,7 +3,9 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager FIELD field_18303 sprites Ljava/util/List; METHOD method_18838 setSprites (Ljava/util/List;)V ARG 1 sprites + CLASS class_4091 SpriteAwareFactory FIELD field_17820 PARTICLE_TEXTURE_SHEETS Ljava/util/List; + FIELD field_18300 spriteAwareFactories Ljava/util/Map; FIELD field_18301 particleAtlasTexture Lnet/minecraft/class_1059; FIELD field_3830 particles Ljava/util/Map; FIELD field_3831 textureManager Lnet/minecraft/class_1060; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping index 5702ccdf46..7dfa8a88b1 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping @@ -13,16 +13,22 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBatcher METHOD method_3645 isEmpty ()Z METHOD method_3650 isVisibleThrough (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z CLASS class_851 ChunkRenderer - CLASS class_4577 + CLASS class_4577 Task + FIELD field_20835 priority D FIELD field_20836 cancelled Ljava/util/concurrent/atomic/AtomicBoolean; + METHOD (Lnet/minecraft/class_846$class_851;D)V + ARG 2 priority METHOD method_22782 cancel ()V METHOD method_22783 scheduleBatching (Lnet/minecraft/class_750;)Ljava/util/concurrent/CompletableFuture; - CLASS class_4579 + CLASS class_4578 UploadTask + FIELD field_20838 region Lnet/minecraft/class_853; + CLASS class_4579 BuildTask FIELD field_20841 data Lnet/minecraft/class_846$class_849; + FIELD field_20834 uploadTask Lnet/minecraft/class_846$class_851$class_4578; FIELD field_4457 blockEntities Ljava/util/Set; FIELD field_4458 boundingBox Lnet/minecraft/class_238; FIELD field_4459 data Ljava/util/concurrent/atomic/AtomicReference; - FIELD field_4461 task Lnet/minecraft/class_846$class_851$class_4579; + FIELD field_4461 buildTask Lnet/minecraft/class_846$class_851$class_4579; FIELD field_4462 buffers Ljava/util/Map; FIELD field_4463 rebuildOnClientThread Z FIELD field_4464 rebuildScheduled Z diff --git a/mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping index 9e9d4b407a..fa0f4fd7ba 100644 --- a/mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_860 net/minecraft/client/render/debug/ChunkLoadingDebugRenderer + CLASS class_4605 ChunkLoadingStatus + FIELD field_21000 clientStates Ljava/util/Map; + FIELD field_21001 serverStates Ljava/util/concurrent/CompletableFuture; + FIELD field_20998 loadingData Lnet/minecraft/class_860$class_4605; FIELD field_4509 client Lnet/minecraft/class_310; FIELD field_4510 lastUpdateTime D diff --git a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping index 68bbf12d3c..d8c5c23ee3 100644 --- a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer CLASS class_864 Renderer METHOD method_20414 clear ()V + METHOD method_23109 render (J)V + ARG 1 time FIELD field_18777 pointsOfInterestDebugRenderer Lnet/minecraft/class_4207; FIELD field_18778 goalSelectorDebugRenderer Lnet/minecraft/class_4205; FIELD field_19325 raidCenterDebugRenderer Lnet/minecraft/class_4304; @@ -21,4 +23,10 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_20413 reset ()V + METHOD method_23098 box (DDDDDDFFFF)V + METHOD method_23102 box (Lnet/minecraft/class_238;FFFF)V + METHOD method_23105 drawString (Ljava/lang/String;DDDI)V + METHOD method_23106 drawString (Ljava/lang/String;DDDIF)V + METHOD method_23107 drawString (Ljava/lang/String;DDDIFZFZ)V + METHOD method_23108 drawString (Ljava/lang/String;IIII)V METHOD method_3713 toggleShowChunkBorder ()Z diff --git a/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping index 29dcfd4f25..58c4d9e047 100644 --- a/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_4205 net/minecraft/client/render/debug/GoalSelectorDebugRenderer + CLASS class_4206 GoalSelector + FIELD field_18782 pos Lnet/minecraft/class_2338; + FIELD field_18784 name Ljava/lang/String; FIELD field_18780 client Lnet/minecraft/class_310; FIELD field_18781 goalSelectors Ljava/util/Map; METHOD method_19430 setGoalSelectorList (ILjava/util/List;)V diff --git a/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping index 1c1ad123fa..d595f10a04 100644 --- a/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping @@ -1,4 +1,16 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/PointOfInterestDebugRenderer + CLASS class_4232 Brain + CLASS class_4233 PointOfInterest + FIELD field_18931 pos Lnet/minecraft/class_2338; + FIELD field_18933 freeTicketCount I + FIELD field_18786 client Lnet/minecraft/class_310; FIELD field_18787 pointsOfInterest Ljava/util/Map; - METHOD method_19432 addPointOfInterest (Lnet/minecraft/class_4207$class_4232;)V + FIELD field_18788 chunkSections Ljava/util/Set; + FIELD field_18920 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_18921 brains Ljava/util/Map; + METHOD method_19432 addBrain (Lnet/minecraft/class_4207$class_4232;)V + METHOD method_19433 addChunkSection (Lnet/minecraft/class_4076;)V METHOD method_19434 removePointOfInterest (Lnet/minecraft/class_2338;)V + METHOD method_19435 removeChunkSection (Lnet/minecraft/class_4076;)V + METHOD method_19701 addPointOfInterest (Lnet/minecraft/class_4207$class_4233;)V + METHOD method_19702 setFreeTicketCount (Lnet/minecraft/class_2338;I)V diff --git a/mappings/net/minecraft/client/render/entity/feature/IronGolemCrackFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/IronGolemCrackFeatureRenderer.mapping index b14f5baac9..130a4f4b3f 100644 --- a/mappings/net/minecraft/client/render/entity/feature/IronGolemCrackFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/IronGolemCrackFeatureRenderer.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_4691 net/minecraft/client/render/entity/feature/IronGolemCrackFeatureRenderer + FIELD field_21443 DAMAGE_TO_TEXTURE Ljava/util/Map; diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index 42ac516a57..f542b54671 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -1,5 +1,11 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader CLASS class_1089 ModelLoaderException + CLASS class_4455 ModelValuePair + FIELD field_20275 model Ljava/util/List; + FIELD field_20276 propertyValues Ljava/util/List; + METHOD method_21607 create (Lnet/minecraft/class_2680;Lnet/minecraft/class_816;Ljava/util/Collection;)Lnet/minecraft/class_1088$class_4455; + METHOD method_21608 create (Lnet/minecraft/class_2680;Lnet/minecraft/class_1100;Ljava/util/Collection;)Lnet/minecraft/class_1088$class_4455; + METHOD method_21609 getValues (Lnet/minecraft/class_2680;Ljava/util/Collection;)Ljava/util/List; FIELD field_17907 spriteAtlasData Lnet/minecraft/class_1059$class_4007; FIELD field_21020 BLOCK_BREAKING_STAGES Ljava/util/List; FIELD field_5370 FIRE_1 Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping b/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping index c76d6fc1e6..23ba6f9e59 100644 --- a/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping @@ -1,5 +1,42 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/ItemModelGenerator + CLASS class_802 Frame + FIELD field_4271 side Lnet/minecraft/class_801$class_803; + FIELD field_4272 level I + FIELD field_4273 max I + FIELD field_4274 min I + METHOD method_3483 expand (I)V + METHOD method_3484 getSide ()Lnet/minecraft/class_801$class_803; + METHOD method_3485 getMax ()I + METHOD method_3486 getLevel ()I + METHOD method_3487 getMin ()I + CLASS class_803 Side + FIELD field_4276 direction Lnet/minecraft/class_2350; + FIELD field_4279 offsetY I + FIELD field_4280 offsetX I + METHOD method_3488 getDirection ()Lnet/minecraft/class_2350; + METHOD method_3489 getOffsetY ()I + METHOD method_3490 getOffsetX ()I + METHOD method_3491 isVertical ()Z FIELD field_4270 LAYERS Ljava/util/List; + METHOD method_3477 isPixelTransparent (Lnet/minecraft/class_1058;IIIII)Z + ARG 1 sprite + ARG 2 frame + ARG 3 x + ARG 4 y + ARG 5 sizeX + ARG 6 sizeY + METHOD method_3478 getFrames (Lnet/minecraft/class_1058;)Ljava/util/List; METHOD method_3479 create (Ljava/util/function/Function;Lnet/minecraft/class_793;)Lnet/minecraft/class_793; ARG 1 textureGetter ARG 2 blockModel + METHOD method_3480 addLayerElements (ILjava/lang/String;Lnet/minecraft/class_1058;)Ljava/util/List; + ARG 1 layer + ARG 2 key + ARG 3 sprite + METHOD method_3481 addSubComponents (Lnet/minecraft/class_1058;Ljava/lang/String;I)Ljava/util/List; + ARG 1 sprite + ARG 2 key + ARG 3 layer + METHOD method_3482 (Ljava/util/List;Lnet/minecraft/class_801$class_803;II)V + ARG 3 x + ARG 4 y diff --git a/mappings/net/minecraft/client/util/Window.mapping b/mappings/net/minecraft/client/util/Window.mapping index 6c5d0d311b..93261383c8 100644 --- a/mappings/net/minecraft/client/util/Window.mapping +++ b/mappings/net/minecraft/client/util/Window.mapping @@ -23,6 +23,8 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window METHOD method_15999 setFramerateLimit (I)V METHOD method_16000 getFramerateLimit ()I METHOD method_20831 getMonitor ()Lnet/minecraft/class_313; + METHOD method_21668 setRawMouseInput (Z)V + ARG 1 rawMouseInput METHOD method_22092 getRefreshRate ()I METHOD method_22093 shouldClose ()Z METHOD method_4474 setPhase (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/client/render/Vec3d.mapping b/mappings/net/minecraft/client/util/math/Vector3d.mapping similarity index 62% rename from mappings/net/minecraft/client/render/Vec3d.mapping rename to mappings/net/minecraft/client/util/math/Vector3d.mapping index c900c33aab..5fac209724 100644 --- a/mappings/net/minecraft/client/render/Vec3d.mapping +++ b/mappings/net/minecraft/client/util/math/Vector3d.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1161 net/minecraft/client/render/Vec3d +CLASS net/minecraft/class_1161 net/minecraft/client/util/math/Vector3d FIELD field_5659 z D FIELD field_5660 y D FIELD field_5661 x D diff --git a/mappings/net/minecraft/command/arguments/GameProfileArgumentType.mapping b/mappings/net/minecraft/command/arguments/GameProfileArgumentType.mapping index 9cc68bb3e8..f1226871cd 100644 --- a/mappings/net/minecraft/command/arguments/GameProfileArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/GameProfileArgumentType.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2191 net/minecraft/command/arguments/GameProfileArgumentType CLASS class_2192 GameProfileArgument + CLASS class_2193 SelectorBacked + FIELD field_9870 selector Lnet/minecraft/class_2300; FIELD field_9868 EXAMPLES Ljava/util/Collection; FIELD field_9869 UNKNOWN_PLAYER_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/command/arguments/TestFunctionArgumentType.mapping b/mappings/net/minecraft/command/arguments/TestFunctionArgumentType.mapping index e3cc16470c..d5f8b23403 100644 --- a/mappings/net/minecraft/command/arguments/TestFunctionArgumentType.mapping +++ b/mappings/net/minecraft/command/arguments/TestFunctionArgumentType.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_4530 net/minecraft/command/arguments/TestFunctionArgum METHOD method_22303 getFunction (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_4529; ARG 0 context ARG 1 name + METHOD method_22371 testFunction ()Lnet/minecraft/class_4530; diff --git a/mappings/net/minecraft/data/SnbtProvider.mapping b/mappings/net/minecraft/data/SnbtProvider.mapping index df2c7a12e0..4cf911504c 100644 --- a/mappings/net/minecraft/data/SnbtProvider.mapping +++ b/mappings/net/minecraft/data/SnbtProvider.mapping @@ -1,3 +1,20 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider + CLASS class_4460 Tweaker + METHOD method_21674 write (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 name + ARG 2 nbt + CLASS class_4511 CompressedData + FIELD field_20538 name Ljava/lang/String; + FIELD field_20539 bytes [B + FIELD field_20540 sha1 Ljava/lang/String; FIELD field_11453 root Lnet/minecraft/class_2403; FIELD field_11454 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_20309 write Ljava/util/List; + METHOD method_10497 write (Lnet/minecraft/class_2408;Lnet/minecraft/class_2463$class_4511;Ljava/nio/file/Path;)V + METHOD method_10500 getFileName (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/lang/String; + ARG 1 root + ARG 2 file + METHOD method_21672 addWriter (Lnet/minecraft/class_2463$class_4460;)Lnet/minecraft/class_2463; + METHOD method_21673 write (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + METHOD method_22144 toCompressedNbt (Ljava/nio/file/Path;Ljava/lang/String;)Lnet/minecraft/class_2463$class_4511; + ARG 2 name diff --git a/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping b/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping index 9292ab242c..b7c85dc0ab 100644 --- a/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping +++ b/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_3843 net/minecraft/data/validate/StructureValidatorProvider + METHOD method_16878 update (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 0 nbt + METHOD method_16880 addDataVersion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 0 nbt diff --git a/mappings/net/minecraft/datafixers/fixes/AddTrappedChestFix.mapping b/mappings/net/minecraft/datafixers/fixes/AddTrappedChestFix.mapping index dc092b5940..b876220c8d 100644 --- a/mappings/net/minecraft/datafixers/fixes/AddTrappedChestFix.mapping +++ b/mappings/net/minecraft/datafixers/fixes/AddTrappedChestFix.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_1215 net/minecraft/datafixers/fixes/AddTrappedChestFix + CLASS class_1216 ListFixer + FIELD field_5741 targets Lit/unimi/dsi/fastutil/ints/IntSet; + METHOD method_5180 isTarget (I)Z + ARG 1 index FIELD field_5740 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixers/fixes/LeavesFix.mapping b/mappings/net/minecraft/datafixers/fixes/LeavesFix.mapping index bf66289ae4..d953789fb8 100644 --- a/mappings/net/minecraft/datafixers/fixes/LeavesFix.mapping +++ b/mappings/net/minecraft/datafixers/fixes/LeavesFix.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_1191 net/minecraft/datafixers/fixes/LeavesFix + CLASS class_1193 ListFixer + FIELD field_5692 data Ljava/util/List; + METHOD method_5076 needsFix ()Z diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index fb3aea37b3..e2fbe6722e 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -176,6 +176,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_23317 getX ()D METHOD method_23318 getY ()D METHOD method_23321 getZ ()D + METHOD method_23323 getHeightAt (D)D + ARG 1 heightDelta METHOD method_23327 setPos (DDD)V ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/entity/boss/WitherEntity.mapping b/mappings/net/minecraft/entity/boss/WitherEntity.mapping index 4ebf5efe7b..5dfd386eb0 100644 --- a/mappings/net/minecraft/entity/boss/WitherEntity.mapping +++ b/mappings/net/minecraft/entity/boss/WitherEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1528 net/minecraft/entity/boss/WitherEntity + CLASS class_1529 DescendAtHalfHealthGoal FIELD field_18125 HEAD_TARGET_PREDICATE Lnet/minecraft/class_4051; FIELD field_7083 sideHeadYaws [F FIELD field_7084 sideHeadPitches [F @@ -30,7 +31,7 @@ CLASS net/minecraft/class_1528 net/minecraft/entity/boss/WitherEntity ARG 1 headIndex METHOD method_6883 canDestroy (Lnet/minecraft/class_2680;)Z ARG 0 block - METHOD method_6884 getInvulTimer ()I + METHOD method_6884 getInvulnerableTimer ()I METHOD method_6886 getNextAngle (FFF)F ARG 1 prevAngle ARG 2 desiredAngle diff --git a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping index bea8ea4136..af4d4d53a4 100644 --- a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping +++ b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping @@ -24,10 +24,11 @@ CLASS net/minecraft/class_1551 net/minecraft/entity/mob/DrownedEntity FIELD field_7244 drowned Lnet/minecraft/class_1551; METHOD (Lnet/minecraft/class_1551;)V ARG 1 drowned - CLASS class_1557 + CLASS class_1557 TargetAboveWaterGoal FIELD field_7245 speed D FIELD field_7246 drowned Lnet/minecraft/class_1551; FIELD field_7247 minY I + FIELD field_7248 foundTarget Z METHOD (Lnet/minecraft/class_1551;DI)V ARG 1 drowned ARG 2 speed @@ -48,4 +49,5 @@ CLASS net/minecraft/class_1551 net/minecraft/entity/mob/DrownedEntity ARG 4 random METHOD method_7013 setTargetingUnderwater (Z)V ARG 1 targetingUnderwater + METHOD method_7016 hasFinishedCurrentPath ()Z METHOD method_7018 isTargetingUnderwater ()Z diff --git a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping index ca4e03c971..c49ee9c6c4 100644 --- a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/class_1584 net/minecraft/entity/mob/RavagerEntity CLASS class_1585 AttackGoal - CLASS class_1586 + CLASS class_1586 Navigation METHOD (Lnet/minecraft/class_1308;Lnet/minecraft/class_1937;)V ARG 1 world + CLASS class_1587 PathNodeMaker FIELD field_7301 IS_NOT_RAVAGER Ljava/util/function/Predicate; FIELD field_7302 stunTick I FIELD field_7303 attackTick I diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping index 5d46695aa0..3fd96a59d3 100644 --- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping @@ -1,13 +1,14 @@ CLASS net/minecraft/class_1621 net/minecraft/entity/mob/SlimeEntity - CLASS class_1622 + CLASS class_1622 FaceTowardTargetGoal + FIELD field_7392 ticksLeft I FIELD field_7393 slime Lnet/minecraft/class_1621; METHOD (Lnet/minecraft/class_1621;)V ARG 1 slime - CLASS class_1623 + CLASS class_1623 SwimmingGoal FIELD field_7394 slime Lnet/minecraft/class_1621; METHOD (Lnet/minecraft/class_1621;)V ARG 1 slime - CLASS class_1624 + CLASS class_1624 MoveGoal FIELD field_7395 slime Lnet/minecraft/class_1621; METHOD (Lnet/minecraft/class_1621;)V ARG 1 slime @@ -23,7 +24,9 @@ CLASS net/minecraft/class_1621 net/minecraft/entity/mob/SlimeEntity METHOD method_7165 look (FZ)V ARG 1 targetYaw ARG 2 jumpOften - CLASS class_1626 + CLASS class_1626 RandomLookGoal + FIELD field_7400 targetYaw F + FIELD field_7401 timer I FIELD field_7402 slime Lnet/minecraft/class_1621; METHOD (Lnet/minecraft/class_1621;)V ARG 1 slime diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping index a0ccded64d..ad2ae4a2f2 100644 --- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1498 net/minecraft/entity/passive/HorseEntity + CLASS class_1499 EntityData + FIELD field_6994 variant I FIELD field_6985 HORSE_ARMOR_BONUS_UUID Ljava/util/UUID; FIELD field_6986 HORSE_MARKING_TEX [Ljava/lang/String; FIELD field_6987 textureLocation Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping index e61663cf44..fabab1663c 100644 --- a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_1439 net/minecraft/entity/passive/IronGolemEntity + CLASS class_4621 Crack + FIELD field_21491 VALUES Ljava/util/List; + FIELD field_21492 maxHealthFraction F + METHOD method_23693 from (F)Lnet/minecraft/class_1439$class_4621; + ARG 0 healthFraction FIELD field_6763 IRON_GOLEM_FLAGS Lnet/minecraft/class_2940; + METHOD method_22328 getAttackDamage ()F + METHOD method_23347 getCrack ()Lnet/minecraft/class_1439$class_4621; METHOD method_6496 isPlayerCreated ()Z METHOD method_6499 setPlayerCreated (Z)V diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index 51515511c2..a1634f6d73 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -2,12 +2,20 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity CLASS class_1502 ChaseWolvesGoal METHOD (Lnet/minecraft/class_1501;)V ARG 1 llama + CLASS class_1503 EntityData + FIELD field_7001 variant I + CLASS class_1504 SpitRevengeGoal FIELD field_6995 CARPET_COLOR Lnet/minecraft/class_2940; FIELD field_6996 ATTR_VARIANT Lnet/minecraft/class_2940; + FIELD field_6997 follower Lnet/minecraft/class_1501; FIELD field_6998 ATTR_STRENGTH Lnet/minecraft/class_2940; + FIELD field_6999 spit Z + FIELD field_7000 following Lnet/minecraft/class_1501; METHOD method_18004 createChild ()Lnet/minecraft/class_1501; + METHOD method_6791 follow (Lnet/minecraft/class_1501;)V METHOD method_6792 spitAt (Lnet/minecraft/class_1309;)V ARG 1 target + METHOD method_6793 hasFollower ()Z METHOD method_6794 getColorFromCarpet (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1767; ARG 0 color METHOD method_6796 initializeStrength ()V @@ -20,4 +28,5 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity METHOD method_6805 isFollowing ()Z METHOD method_6806 getFollowing ()Lnet/minecraft/class_1501; METHOD method_6807 isTrader ()Z + METHOD method_6808 setSpit (Z)V METHOD method_6809 getVariant ()I diff --git a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping index e447a40228..a6d0367f79 100644 --- a/mappings/net/minecraft/entity/passive/PassiveEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PassiveEntity.mapping @@ -1,4 +1,16 @@ CLASS net/minecraft/class_1296 net/minecraft/entity/passive/PassiveEntity + CLASS class_4697 EntityData + FIELD field_20684 spawnCount I + FIELD field_20685 babyAllowed Z + FIELD field_20686 babyChance F + METHOD method_22432 getSpawnedCount ()I + METHOD method_22433 setBabyChance (F)V + ARG 1 babyChance + METHOD method_22434 setBabyAllowed (Z)V + ARG 1 babyAllowed + METHOD method_22435 countSpawned ()V + METHOD method_22436 canSpawnBaby ()Z + METHOD method_22437 getBabyChance ()F FIELD field_5947 happyTicksRemaining I FIELD field_5948 forcedAge I FIELD field_5949 CHILD Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping index d5ca25fb27..5e2c0e8ca3 100644 --- a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/class_1454 net/minecraft/entity/passive/PufferfishEntity - CLASS class_1455 + CLASS class_1455 InflateGoal FIELD field_6836 pufferfish Lnet/minecraft/class_1454; METHOD (Lnet/minecraft/class_1454;)V ARG 1 pufferfish + FIELD field_6832 deflateTicks I + FIELD field_6833 inflateTicks I + FIELD field_6834 BLOW_UP_FILTER Ljava/util/function/Predicate; FIELD field_6835 PUFF_STATE Lnet/minecraft/class_2940; METHOD method_6592 getScaleForPuffState (I)F ARG 0 puffState diff --git a/mappings/net/minecraft/realms/RepeatedNarrator.mapping b/mappings/net/minecraft/realms/RepeatedNarrator.mapping new file mode 100644 index 0000000000..df1db13fc4 --- /dev/null +++ b/mappings/net/minecraft/realms/RepeatedNarrator.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/realms/RepeatedNarrator + CLASS class_4283 Parameters + FIELD field_19210 message Ljava/lang/String; + FIELD field_19211 rateLimiter Lcom/google/common/util/concurrent/RateLimiter; diff --git a/mappings/net/minecraft/recipe/CuttingRecipe.mapping b/mappings/net/minecraft/recipe/CuttingRecipe.mapping index 6b50af2f21..64f4bce646 100644 --- a/mappings/net/minecraft/recipe/CuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CuttingRecipe.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_3972 net/minecraft/recipe/CuttingRecipe CLASS class_3973 Serializer + CLASS class_3974 RecipeFactory + FIELD field_17648 recipeFactory Lnet/minecraft/class_3972$class_3973$class_3974; FIELD field_17642 input Lnet/minecraft/class_1856; FIELD field_17643 output Lnet/minecraft/class_1799; FIELD field_17644 id Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 0584ed03f1..25e4aaddf8 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -53,3 +53,4 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand METHOD method_22285 executeImport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 structure + METHOD method_23647 setWorld (Lnet/minecraft/class_4529;Lnet/minecraft/class_3218;)V diff --git a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping index 29324e05e0..9370d6f897 100644 --- a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping +++ b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping @@ -1,4 +1,15 @@ CLASS net/minecraft/class_3364 net/minecraft/server/rcon/QueryResponseHandler + CLASS class_3365 Query + FIELD field_14458 id I + FIELD field_14459 startTime J + FIELD field_14460 messageBytes [B + FIELD field_14461 replyBuf [B + FIELD field_14462 message Ljava/lang/String; + METHOD method_14755 startedBefore (J)Ljava/lang/Boolean; + ARG 1 lastQueryTime + METHOD method_14756 getId ()I + METHOD method_14757 getReplyBuf ()[B + METHOD method_14758 getMessageBytes ()[B FIELD field_14442 queryPort I FIELD field_14443 lastQueryTime J FIELD field_14444 ip Ljava/lang/String; @@ -6,19 +17,26 @@ CLASS net/minecraft/class_3364 net/minecraft/server/rcon/QueryResponseHandler FIELD field_14446 data Lnet/minecraft/class_3345; FIELD field_14447 levelName Ljava/lang/String; FIELD field_14449 socket Ljava/net/DatagramSocket; + FIELD field_14450 lastResponseTime J + FIELD field_14451 creationTime J FIELD field_14452 packetBuffer [B + FIELD field_14453 queries Ljava/util/Map; FIELD field_14454 hostname Ljava/lang/String; FIELD field_14455 currentPacket Ljava/net/DatagramPacket; FIELD field_14456 maxPlayerCount I FIELD field_14457 port I METHOD (Lnet/minecraft/class_2994;)V ARG 1 server + METHOD method_14746 cleanUp ()V METHOD method_14747 createRulesReply (Ljava/net/DatagramPacket;)[B ARG 1 packet + METHOD method_14748 getMessageBytes (Ljava/net/SocketAddress;)[B + METHOD method_14749 createQuery (Ljava/net/DatagramPacket;)V METHOD method_14750 handle (Ljava/net/DatagramPacket;)Z ARG 1 packet METHOD method_14751 reply ([BLjava/net/DatagramPacket;)V ARG 1 buf METHOD method_14752 handleIoException (Ljava/lang/Exception;)V ARG 1 e + METHOD method_14753 isValidQuery (Ljava/net/DatagramPacket;)Ljava/lang/Boolean; METHOD method_14754 initialize ()Z diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index 6058508b2b..e448a29655 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -26,6 +26,9 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager ARG 5 withinViewDistance METHOD method_17664 isWithinViewDistance (I)Z ARG 1 distance + CLASS class_4077 TicketDistanceLevelPropagator + METHOD method_18746 update (I)I + ARG 1 distance FIELD field_13894 location J FIELD field_13895 ticketsByPosition Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; FIELD field_16210 chunkHolders Ljava/util/Set; diff --git a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping index 9582c58315..e5f8d654b3 100644 --- a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping +++ b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping @@ -17,6 +17,8 @@ CLASS net/minecraft/class_3471 net/minecraft/structure/WoodlandMansionGenerator ARG 1 random METHOD method_15037 getSmallRoom (Ljava/util/Random;)Ljava/lang/String; ARG 1 random + CLASS class_3474 MansionParameters + FIELD field_15438 random Ljava/util/Random; CLASS class_3475 LayoutGenerator FIELD field_15444 manager Lnet/minecraft/class_3485; FIELD field_15447 random Ljava/util/Random; diff --git a/mappings/net/minecraft/test/GameTest.mapping b/mappings/net/minecraft/test/GameTest.mapping index efac8276b8..c5b5b9a170 100644 --- a/mappings/net/minecraft/test/GameTest.mapping +++ b/mappings/net/minecraft/test/GameTest.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTest FIELD field_20565 started Z FIELD field_20567 completed Z FIELD field_20569 throwable Ljava/lang/Throwable; + FIELD field_21454 expectedStopTime J + FIELD field_21456 stopwatch Lcom/google/common/base/Stopwatch; METHOD (Lnet/minecraft/class_4529;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V ARG 1 testFunction ARG 2 pos @@ -17,7 +19,7 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTest ARG 1 listener METHOD method_22168 fail (Ljava/lang/Throwable;)V ARG 1 throwable - METHOD method_22169 getStructureName ()Ljava/lang/String; + METHOD method_22169 getStructurePath ()Ljava/lang/String; METHOD method_22172 getPos ()Lnet/minecraft/class_2338; METHOD method_22174 getSize ()Lnet/minecraft/class_2338; METHOD method_22176 getWorld ()Lnet/minecraft/class_3218; @@ -29,3 +31,8 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTest METHOD method_22183 isRequired ()Z METHOD method_22184 isOptional ()Z METHOD method_22185 getBlockEntity ()Lnet/minecraft/class_2633; + METHOD method_23634 startCountdown ()V + METHOD method_23635 setPos (Lnet/minecraft/class_2338;)V + METHOD method_23638 getStructureName ()Ljava/lang/String; + METHOD method_23639 start ()V + METHOD method_23640 complete ()V diff --git a/mappings/net/minecraft/class_4516.mapping b/mappings/net/minecraft/test/StartupParameter.mapping similarity index 61% rename from mappings/net/minecraft/class_4516.mapping rename to mappings/net/minecraft/test/StartupParameter.mapping index e11b5b5378..e3c29ed89a 100644 --- a/mappings/net/minecraft/class_4516.mapping +++ b/mappings/net/minecraft/test/StartupParameter.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4516 +CLASS net/minecraft/class_4516 net/minecraft/test/StartupParameter FIELD field_20558 test Lnet/minecraft/class_4517; METHOD (Lnet/minecraft/class_4517;)V ARG 1 test diff --git a/mappings/net/minecraft/test/TestFunction.mapping b/mappings/net/minecraft/test/TestFunction.mapping index 84a230c8e9..91ca4c7a38 100644 --- a/mappings/net/minecraft/test/TestFunction.mapping +++ b/mappings/net/minecraft/test/TestFunction.mapping @@ -3,9 +3,13 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction FIELD field_20584 structurePath Ljava/lang/String; FIELD field_20585 structureName Ljava/lang/String; FIELD field_20586 required Z + FIELD field_20587 starter Ljava/util/function/Consumer; FIELD field_20588 tickLimit I + FIELD field_21460 duration J METHOD method_22296 getStructurePath ()Ljava/lang/String; + METHOD method_22297 start (Lnet/minecraft/class_4516;)V METHOD method_22298 getStructureName ()Ljava/lang/String; METHOD method_22299 getTickLimit ()I METHOD method_22300 isRequired ()Z METHOD method_22301 getBatchId ()Ljava/lang/String; + METHOD method_23649 getDuration ()J diff --git a/mappings/net/minecraft/test/TimeMismatchException.mapping b/mappings/net/minecraft/test/TimeMismatchException.mapping new file mode 100644 index 0000000000..4d0134bbd7 --- /dev/null +++ b/mappings/net/minecraft/test/TimeMismatchException.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4512 net/minecraft/test/TimeMismatchException diff --git a/mappings/net/minecraft/test/TimedTask.mapping b/mappings/net/minecraft/test/TimedTask.mapping new file mode 100644 index 0000000000..7990dd1f15 --- /dev/null +++ b/mappings/net/minecraft/test/TimedTask.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4692 net/minecraft/test/TimedTask + FIELD field_21450 duration Ljava/lang/Long; + FIELD field_21451 task Ljava/lang/Runnable; diff --git a/mappings/net/minecraft/test/TimedTaskRunner.mapping b/mappings/net/minecraft/test/TimedTaskRunner.mapping new file mode 100644 index 0000000000..fa65ef0902 --- /dev/null +++ b/mappings/net/minecraft/test/TimedTaskRunner.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_4693 net/minecraft/test/TimedTaskRunner + FIELD field_21457 test Lnet/minecraft/class_4517; + FIELD field_21458 tasks Ljava/util/List; + FIELD field_21459 tick J + METHOD method_23643 runSilently (J)V + ARG 1 tick + METHOD method_23644 runReported (J)V + ARG 1 tick + METHOD method_23645 runTasks (J)V + ARG 1 tick diff --git a/mappings/net/minecraft/util/math/Boxes.mapping b/mappings/net/minecraft/util/math/Boxes.mapping new file mode 100644 index 0000000000..388825119f --- /dev/null +++ b/mappings/net/minecraft/util/math/Boxes.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_4623 net/minecraft/util/math/Boxes + METHOD method_23362 stretch (Lnet/minecraft/class_238;Lnet/minecraft/class_2350;D)Lnet/minecraft/class_238; + ARG 0 box + ARG 1 direction + ARG 2 length diff --git a/mappings/net/minecraft/util/shape/VoxelSet.mapping b/mappings/net/minecraft/util/shape/VoxelSet.mapping index 4282d75042..621191c92c 100644 --- a/mappings/net/minecraft/util/shape/VoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/VoxelSet.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_251 net/minecraft/util/shape/VoxelSet + CLASS class_252 DirectionalPointConsumer + CLASS class_253 VolumeConsumer FIELD field_1372 zSize I FIELD field_1373 ySize I FIELD field_1374 xSize I diff --git a/mappings/net/minecraft/world/chunk/UpgradeData.mapping b/mappings/net/minecraft/world/chunk/UpgradeData.mapping index 73a5f92b99..b00f4bed44 100644 --- a/mappings/net/minecraft/world/chunk/UpgradeData.mapping +++ b/mappings/net/minecraft/world/chunk/UpgradeData.mapping @@ -1,6 +1,16 @@ CLASS net/minecraft/class_2843 net/minecraft/world/chunk/UpgradeData + CLASS class_2844 Logic + METHOD method_12357 postUpdate (Lnet/minecraft/class_1936;)V + METHOD method_12358 getUpdatedState (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + CLASS class_2845 BulitinLogic + CLASS 4 + FIELD field_12964 distanceToPositions Ljava/lang/ThreadLocal; + FIELD field_12959 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_12950 NO_UPGRADE_DATA Lnet/minecraft/class_2843; FIELD field_12951 sides Ljava/util/EnumSet; + FIELD field_12952 EIGHT_WAYS [Lnet/minecraft/class_2355; + FIELD field_12953 BLOCK_TO_LOGIC Ljava/util/Map; + FIELD field_12954 CALLBACK_LOGICS Ljava/util/Set; FIELD field_12955 indices [[I FIELD field_12956 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_2487;)V diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index c759d4b7a3..f5273134cb 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -19,7 +19,8 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType ARG 0 id ARG 1 dimension METHOD method_12487 create (Lnet/minecraft/class_1937;)Lnet/minecraft/class_2869; - METHOD method_12488 getFile (Ljava/io/File;)Ljava/io/File; + METHOD method_12488 getSaveDirectory (Ljava/io/File;)Ljava/io/File; + ARG 1 root METHOD method_12489 getSuffix ()Ljava/lang/String; METHOD method_12490 byRawId (I)Lnet/minecraft/class_2874; METHOD method_12491 hasSkyLight ()Z diff --git a/mappings/net/minecraft/world/gen/feature/AcaciaTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/AcaciaTreeFeature.mapping new file mode 100644 index 0000000000..077d4dce40 --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/AcaciaTreeFeature.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4627 net/minecraft/world/gen/feature/AcaciaTreeFeature diff --git a/mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping new file mode 100644 index 0000000000..a494d30124 --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/BranchedTreeFeature.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4626 net/minecraft/world/gen/feature/BranchedTreeFeature diff --git a/mappings/net/minecraft/world/gen/feature/NormalTreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/BranchedTreeFeatureConfig.mapping similarity index 89% rename from mappings/net/minecraft/world/gen/feature/NormalTreeFeatureConfig.mapping rename to mappings/net/minecraft/world/gen/feature/BranchedTreeFeatureConfig.mapping index c901ac215a..f824374cc4 100644 --- a/mappings/net/minecraft/world/gen/feature/NormalTreeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/BranchedTreeFeatureConfig.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4640 net/minecraft/world/gen/feature/NormalTreeFeatureConfig +CLASS net/minecraft/class_4640 net/minecraft/world/gen/feature/BranchedTreeFeatureConfig CLASS class_4641 Builder FIELD field_21271 treeDecorators Ljava/util/List; METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;)V diff --git a/mappings/net/minecraft/world/gen/feature/FlowerFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/FlowerFeatureConfig.mapping index b53fa84760..03413fe75d 100644 --- a/mappings/net/minecraft/world/gen/feature/FlowerFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/FlowerFeatureConfig.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_4638 net/minecraft/world/gen/feature/FlowerFeatureConfig + CLASS class_4639 Builder diff --git a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping new file mode 100644 index 0000000000..8006cd7383 --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4625 net/minecraft/world/gen/feature/HugeMushroomFeature diff --git a/mappings/net/minecraft/world/gen/feature/MegaTreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/MegaTreeFeatureConfig.mapping index 550c94e7e5..b2a758aa06 100644 --- a/mappings/net/minecraft/world/gen/feature/MegaTreeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/MegaTreeFeatureConfig.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_4636 net/minecraft/world/gen/feature/MegaTreeFeatureConfig + CLASS class_4637 Builder diff --git a/mappings/net/minecraft/world/gen/feature/RandomPatchFeature.mapping b/mappings/net/minecraft/world/gen/feature/RandomPatchFeature.mapping new file mode 100644 index 0000000000..10e259a57a --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/RandomPatchFeature.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4628 net/minecraft/world/gen/feature/RandomPatchFeature diff --git a/mappings/net/minecraft/world/gen/feature/AbstractTreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping similarity index 91% rename from mappings/net/minecraft/world/gen/feature/AbstractTreeFeatureConfig.mapping rename to mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping index 5f9fb53edb..e539ef1959 100644 --- a/mappings/net/minecraft/world/gen/feature/AbstractTreeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/AbstractTreeFeatureConfig +CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig CLASS class_4644 Builder FIELD field_21292 trunkProvider Lnet/minecraft/class_4651; FIELD field_21293 leavesProvider Lnet/minecraft/class_4651; diff --git a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping new file mode 100644 index 0000000000..59a8efc946 --- /dev/null +++ b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer + FIELD field_21296 radius I + FIELD field_21297 randomRadius I + FIELD field_21298 type Lnet/minecraft/class_4648; + METHOD (IILnet/minecraft/class_4648;)V + ARG 1 radius + ARG 2 randomRadius + ARG 3 type diff --git a/mappings/net/minecraft/world/gen/placer/BlockPlacer.mapping b/mappings/net/minecraft/world/gen/placer/BlockPlacer.mapping index d8c806cf84..b0c9e80c00 100644 --- a/mappings/net/minecraft/world/gen/placer/BlockPlacer.mapping +++ b/mappings/net/minecraft/world/gen/placer/BlockPlacer.mapping @@ -1 +1,4 @@ -CLASS net/minecraft/class_4647 net/minecraft/world/gen/placer/BlockPlacer +CLASS net/minecraft/class_4629 net/minecraft/world/gen/placer/BlockPlacer + FIELD field_21222 type Lnet/minecraft/class_4630; + METHOD (Lnet/minecraft/class_4630;)V + ARG 1 type diff --git a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping index 68edd4abb5..dc043fb489 100644 --- a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping @@ -7,3 +7,4 @@ CLASS net/minecraft/class_2867 net/minecraft/world/storage/RegionBasedStorage ARG 1 pos METHOD method_17911 getTagAt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; ARG 1 pos + METHOD method_23726 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)V diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping index 6227d0daf4..35f022ccf4 100644 --- a/mappings/net/minecraft/world/storage/RegionFile.mapping +++ b/mappings/net/minecraft/world/storage/RegionFile.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile CLASS class_2862 ChunkBuffer FIELD field_17656 pos Lnet/minecraft/class_1923; + CLASS class_4549 OutputAction FIELD field_20434 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_20435 ZERO Ljava/nio/ByteBuffer; FIELD field_20436 channel Ljava/nio/channels/FileChannel; @@ -9,10 +10,13 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile FIELD field_20439 sectorData Ljava/nio/IntBuffer; FIELD field_20440 saveTimes Ljava/nio/IntBuffer; FIELD field_20441 sectors Lnet/minecraft/class_4485; + FIELD field_20657 directory Ljava/nio/file/Path; METHOD (Ljava/io/File;Ljava/io/File;)V ARG 1 file + ARG 2 directory METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;)V - ARG 1 path + ARG 1 file + ARG 2 directory METHOD method_12419 getSectorData (Lnet/minecraft/class_1923;)I ARG 1 pos METHOD method_12423 hasChunk (Lnet/minecraft/class_1923;)Z @@ -41,3 +45,7 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile ARG 0 byteCount METHOD method_21881 getChunkOutputStream (Lnet/minecraft/class_1923;)Ljava/io/DataOutputStream; ARG 1 pos + METHOD method_22407 hasChunkStreamVersionId (B)Z + METHOD method_22410 writeSafely (Ljava/nio/file/Path;Ljava/nio/ByteBuffer;)Lnet/minecraft/class_2861$class_4549; + METHOD method_22412 getChunkStreamVersionId (B)B + METHOD method_22413 getExternalChunkPath (Lnet/minecraft/class_1923;)Ljava/nio/file/Path; diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping index d2122434a7..ab554ee1d3 100644 --- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase FIELD field_18695 factory Ljava/util/function/Function; FIELD field_19228 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_19229 dataFixType Lnet/minecraft/class_4284; + FIELD field_21505 worker Lnet/minecraft/class_4698; METHOD (Ljava/io/File;Ljava/util/function/BiFunction;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;)V ARG 1 directory ARG 2 deserializer @@ -26,3 +27,5 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase ARG 1 pos METHOD method_19295 getOrCreate (J)Lnet/minecraft/class_4213; ARG 1 pos + METHOD method_20369 getDataVersion (Lcom/mojang/datafixers/Dynamic;)I + METHOD method_20370 save (Lnet/minecraft/class_1923;)V diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping new file mode 100644 index 0000000000..38647d949c --- /dev/null +++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker + CLASS class_4699 Result + FIELD field_21503 nbt Lnet/minecraft/class_2487; + FIELD field_21504 future Ljava/util/concurrent/CompletableFuture; + FIELD field_21495 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_21496 thread Ljava/lang/Thread; + FIELD field_21497 closed Ljava/util/concurrent/atomic/AtomicBoolean; + FIELD field_21498 tasks Ljava/util/Queue; + FIELD field_21499 storage Lnet/minecraft/class_2867; + FIELD field_21500 results Ljava/util/Map; + FIELD field_21501 active Z + FIELD field_21502 future Ljava/util/concurrent/CompletableFuture; + METHOD (Lnet/minecraft/class_2867;Ljava/lang/String;)V + ARG 1 storage + ARG 2 name + METHOD method_23698 completeAll ()Ljava/util/concurrent/CompletableFuture; + 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 + METHOD method_23703 setResult (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/concurrent/CompletableFuture; + ARG 1 pos + ARG 2 nbt + METHOD method_23709 run (Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; + ARG 1 taskFactory + METHOD method_23710 shutdown ()Ljava/util/concurrent/CompletableFuture; + METHOD method_23715 park ()V + METHOD method_23717 work ()V + METHOD method_23719 writeResult ()Z + METHOD method_23720 writeAll ()V + METHOD method_23721 finish ()V + METHOD method_23722 runTask ()Z diff --git a/mappings/net/minecraft/world/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping similarity index 66% rename from mappings/net/minecraft/world/VersionedChunkStorage.mapping rename to mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index ed551a4f92..69b9f5e5d7 100644 --- a/mappings/net/minecraft/world/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -1,6 +1,7 @@ -CLASS net/minecraft/class_3977 net/minecraft/world/VersionedChunkStorage +CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage FIELD field_17654 featureUpdater Lnet/minecraft/class_3360; FIELD field_17655 dataFixer Lcom/mojang/datafixers/DataFixer; + FIELD field_21494 worker Lnet/minecraft/class_4698; METHOD method_17907 updateChunkTag (Lnet/minecraft/class_2874;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 dimensionType ARG 2 persistentStateManagerFactory @@ -8,3 +9,5 @@ CLASS net/minecraft/class_3977 net/minecraft/world/VersionedChunkStorage METHOD method_17908 getDataVersion (Lnet/minecraft/class_2487;)I ARG 0 tag METHOD method_17910 setTagAt (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)V + METHOD method_23696 getNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; + METHOD method_23697 completeAll ()V