From fd21c81c4ca0964220d9073018432f2ba642bfc9 Mon Sep 17 00:00:00 2001 From: LambdAurora Date: Thu, 17 Jun 2021 09:59:49 +0200 Subject: [PATCH] Backport 21w20a mappings to 1.16.5 (#2427) * Backport mappings from 21w20a to 1.16.5. * Include missing parts. * Fix bad BlockBox backport. * Revert backport errors and backport GuardianEntityModel mappings. * WIP fixing javadocs. * Backport ResourceReloader manually. * Backport missing parts and fix broken javadocs. * revert a couple of names (#1) * Update mappings/net/minecraft/util/math/BlockBox.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: YanisBft Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../blaze3d/systems/RenderCallStorage.mapping | 5 + mappings/net/minecraft/Bootstrap.mapping | 1 + .../advancement/AdvancementDisplay.mapping | 10 +- .../advancement/AdvancementPositioner.mapping | 2 + .../criterion/BredAnimalsCriterion.mapping | 4 + .../advancement/criterion/Criterion.mapping | 2 + .../ItemDurabilityChangedCriterion.mapping | 2 +- .../net/minecraft/block/AbstractBlock.mapping | 19 +- .../block/AbstractPlantPartBlock.mapping | 1 + .../block/AbstractRedstoneGateBlock.mapping | 1 + mappings/net/minecraft/block/BedBlock.mapping | 1 + .../net/minecraft/block/BeehiveBlock.mapping | 2 + .../net/minecraft/block/BellBlock.mapping | 2 + mappings/net/minecraft/block/Block.mapping | 12 +- mappings/net/minecraft/block/Blocks.mapping | 8 +- .../block/CarvedPumpkinBlock.mapping | 1 + .../net/minecraft/block/CauldronBlock.mapping | 2 +- .../minecraft/block/ComposterBlock.mapping | 2 +- .../minecraft/block/DispenserBlock.mapping | 1 + .../net/minecraft/block/FireBlock.mapping | 1 + .../net/minecraft/block/FungusBlock.mapping | 1 + .../net/minecraft/block/HopperBlock.mapping | 10 +- .../net/minecraft/block/InfestedBlock.mapping | 1 + .../net/minecraft/block/JigsawBlock.mapping | 2 + mappings/net/minecraft/block/MapColor.mapping | 64 +++ mappings/net/minecraft/block/Material.mapping | 9 +- .../net/minecraft/block/MaterialColor.mapping | 61 --- .../block/MushroomPlantBlock.mapping | 1 + .../net/minecraft/block/PaneBlock.mapping | 1 + .../minecraft/block/PistonHeadBlock.mapping | 2 + .../minecraft/block/PoweredRailBlock.mapping | 1 - .../minecraft/block/RedstoneWireBlock.mapping | 13 +- .../block/RespawnAnchorBlock.mapping | 2 + .../net/minecraft/block/SaplingBlock.mapping | 4 + .../minecraft/block/SeaPickleBlock.mapping | 1 + .../net/minecraft/block/ShapeContext.mapping | 2 +- .../minecraft/block/SpreadableBlock.mapping | 2 + .../net/minecraft/block/StairsBlock.mapping | 2 +- .../minecraft/block/StructureBlock.mapping | 2 + .../net/minecraft/block/TargetBlock.mapping | 3 + .../minecraft/block/TurtleEggBlock.mapping | 6 +- .../minecraft/block/WallMountedBlock.mapping | 1 + .../entity/AbstractFurnaceBlockEntity.mapping | 3 + .../block/entity/BannerPattern.mapping | 2 + .../block/entity/BarrelBlockEntity.mapping | 2 + .../block/entity/BeaconBlockEntity.mapping | 1 + .../block/entity/BeehiveBlockEntity.mapping | 2 + .../block/entity/BellBlockEntity.mapping | 3 + .../block/entity/BlockEntity.mapping | 9 +- .../block/entity/BlockEntityType.mapping | 3 + .../block/entity/CampfireBlockEntity.mapping | 2 +- .../entity/EndGatewayBlockEntity.mapping | 1 + .../entity/EnderChestBlockEntity.mapping | 1 + .../block/entity/HopperBlockEntity.mapping | 5 +- .../LootableContainerBlockEntity.mapping | 2 + .../entity/ShulkerBoxBlockEntity.mapping | 9 +- .../block/entity/SignBlockEntity.mapping | 5 +- .../block/entity/SkullBlockEntity.mapping | 3 +- .../entity/StructureBlockBlockEntity.mapping | 4 + .../block/piston/PistonHandler.mapping | 2 +- .../sapling/LargeTreeSaplingGenerator.mapping | 8 + .../block/sapling/SaplingGenerator.mapping | 7 + .../net/minecraft/client/Keyboard.mapping | 12 +- .../minecraft/client/MinecraftClient.mapping | 70 ++- mappings/net/minecraft/client/Mouse.mapping | 1 + .../client/font/GlyphRenderer.mapping | 32 +- .../minecraft/client/font/TextHandler.mapping | 3 + .../client/font/TextRenderer.mapping | 33 +- .../client/font/TextVisitFactory.mapping | 10 +- .../minecraft/client/gl/Framebuffer.mapping | 1 + .../net/minecraft/client/gl/GlDebug.mapping | 2 + .../net/minecraft/client/gl/GlProgram.mapping | 5 - .../net/minecraft/client/gl/GlShader.mapping | 32 +- .../net/minecraft/client/gl/GlUniform.mapping | 9 +- ...ram.mapping => JsonEffectGlShader.mapping} | 8 +- .../client/gl/PostProcessShader.mapping | 1 + .../net/minecraft/client/gl/Program.mapping | 33 ++ .../minecraft/client/gl/ShaderEffect.mapping | 3 + .../net/minecraft/client/gl/Uniform.mapping | 2 +- .../minecraft/client/gl/VertexBuffer.mapping | 2 +- .../client/gui/ClientChatListener.mapping | 2 +- .../client/gui/DrawableHelper.mapping | 18 +- .../net/minecraft/client/gui/Element.mapping | 4 +- .../client/gui/hud/InGameHud.mapping | 2 +- .../gui/hud/InGameOverlayRenderer.mapping | 7 + .../client/gui/hud/SpectatorHud.mapping | 4 + .../client/gui/screen/AddServerScreen.mapping | 2 +- .../gui/screen/CommandSuggestor.mapping | 2 +- .../client/gui/screen/ConfirmScreen.mapping | 3 + .../client/gui/screen/ConnectScreen.mapping | 6 + .../client/gui/screen/DemoScreen.mapping | 4 +- .../gui/screen/FatalErrorScreen.mapping | 1 + .../gui/screen/LevelLoadingScreen.mapping | 1 + .../client/gui/screen/NoticeScreen.mapping | 3 +- .../client/gui/screen/Screen.mapping | 8 +- .../client/gui/screen/ScreenTexts.mapping | 1 + .../client/gui/screen/SplashScreen.mapping | 8 +- .../screen/advancement/AdvancementTab.mapping | 3 + .../advancement/AdvancementTabType.mapping | 1 + .../advancement/AdvancementWidget.mapping | 7 +- .../advancement/AdvancementsScreen.mapping | 3 + .../ingame/AbstractFurnaceScreen.mapping | 2 +- .../ingame/AbstractInventoryScreen.mapping | 4 + .../gui/screen/ingame/BookScreen.mapping | 2 +- .../ingame/CreativeInventoryScreen.mapping | 4 + .../gui/screen/ingame/FurnaceScreen.mapping | 2 +- .../gui/screen/ingame/HandledScreen.mapping | 16 +- .../gui/screen/ingame/HandledScreens.mapping | 2 +- .../gui/screen/ingame/LecternScreen.mapping | 4 +- .../gui/screen/ingame/MerchantScreen.mapping | 2 +- .../gui/screen/ingame/SmokerScreen.mapping | 2 +- .../screen/ingame/StonecutterScreen.mapping | 1 + .../ingame/StructureBlockScreen.mapping | 1 + .../multiplayer/MultiplayerScreen.mapping | 1 + .../SocialInteractionsPlayerListEntry.mapping | 1 + .../AccessibilityOptionsScreen.mapping | 2 +- .../ChatOptionsScreen.mapping | 2 +- .../ControlsListWidget.mapping | 2 +- .../ControlsOptionsScreen.mapping | 2 +- .../GameOptionsScreen.mapping | 2 +- .../LanguageOptionsScreen.mapping | 4 +- .../MouseOptionsScreen.mapping | 2 +- .../NarratorOptionsScreen.mapping | 2 +- .../{options => option}/OptionsScreen.mapping | 2 +- .../SkinOptionsScreen.mapping | 2 +- .../SoundOptionsScreen.mapping | 2 +- .../{ => option}/VideoOptionsScreen.mapping | 2 +- .../screen/pack/ResourcePackOrganizer.mapping | 1 + .../RecipeAlternativesWidget.mapping | 1 + .../recipebook/RecipeBookGhostSlots.mapping | 2 + .../recipebook/RecipeBookResults.mapping | 4 + .../screen/world/MoreOptionsDialog.mapping | 4 +- .../screen/world/SelectWorldScreen.mapping | 1 + .../AbstractPressableButtonWidget.mapping | 2 - .../gui/widget/ButtonListWidget.mapping | 1 + ...Widget.mapping => ClickableWidget.mapping} | 10 +- .../client/gui/widget/PressableWidget.mapping | 4 + .../client/gui/widget/SliderWidget.mapping | 1 + .../gui/widget/TexturedButtonWidget.mapping | 1 + .../minecraft/client/model/ModelPart.mapping | 5 +- .../network/ClientLoginNetworkHandler.mapping | 2 +- .../client/network/ClientPlayerEntity.mapping | 1 + .../ClientPlayerInteractionManager.mapping | 2 + .../client/network/DataQueryHandler.mapping | 2 +- .../client/network/PlayerListEntry.mapping | 1 + .../network/ServerAddress.mapping | 5 +- .../client/network/ServerInfo.mapping | 23 +- .../client/{options => option}/AoMode.mapping | 2 +- .../AttackIndicator.mapping | 2 +- .../{options => option}/BooleanOption.mapping | 7 +- .../ChatVisibility.mapping | 2 +- .../CloudRenderMode.mapping | 2 +- .../{options => option}/CyclingOption.mapping | 2 +- .../{options => option}/DoubleOption.mapping | 2 +- .../client/option/FullscreenOption.mapping | 16 + .../{options => option}/GameOptions.mapping | 11 +- .../{options => option}/GraphicsMode.mapping | 2 +- .../{options => option}/HotbarStorage.mapping | 2 +- .../client/option/HotbarStorageEntry.mapping | 5 + .../{options => option}/KeyBinding.mapping | 26 +- .../client/option/LogarithmicOption.mapping | 1 + .../{options => option}/NarratorMode.mapping | 2 +- .../client/{options => option}/Option.mapping | 2 +- .../{options => option}/ParticlesMode.mapping | 2 +- .../{options => option}/Perspective.mapping | 2 +- .../{options => option}/ServerList.mapping | 7 +- .../StickyKeyBinding.mapping | 2 +- .../client/options/FullScreenOption.mapping | 1 - .../client/options/HotbarStorageEntry.mapping | 4 - .../client/options/LogarithmicOption.mapping | 1 - .../client/particle/BlockDustParticle.mapping | 2 +- .../particle/ItemPickupParticle.mapping | 1 + .../client/particle/Particle.mapping | 3 +- .../client/particle/ParticleManager.mapping | 7 + .../client/realms/FileUpload.mapping | 2 + .../client/realms/RealmsLabel.mapping | 1 + .../client/realms/dto/PlayerInfo.mapping | 4 +- .../client/realms/dto/RealmsServer.mapping | 2 +- .../realms/gui/RealmsWorldSlotButton.mapping | 10 +- .../screen/DisconnectedRealmsScreen.mapping | 1 + .../screen/RealmsAcceptRejectButton.mapping | 4 +- .../gui/screen/RealmsBackupScreen.mapping | 1 + .../screen/RealmsBrokenWorldScreen.mapping | 1 + .../screen/RealmsConfigureWorldScreen.mapping | 6 + .../RealmsDownloadLatestWorldScreen.mapping | 6 +- .../gui/screen/RealmsInviteScreen.mapping | 3 +- .../RealmsLongConfirmationScreen.mapping | 2 + .../RealmsLongRunningMcoTaskScreen.mapping | 1 + .../gui/screen/RealmsMainScreen.mapping | 4 +- .../screen/RealmsPendingInvitesScreen.mapping | 1 + .../gui/screen/RealmsPlayerScreen.mapping | 3 + .../gui/screen/RealmsResetWorldScreen.mapping | 8 + .../RealmsSelectWorldTemplateScreen.mapping | 2 + .../gui/screen/RealmsUploadScreen.mapping | 6 +- .../realms/task/LongRunningTask.mapping | 1 + .../realms/task/RealmsConnectTask.mapping | 4 +- .../client/realms/util/Errable.mapping | 2 + .../client/realms/util/RealmsUtil.mapping | 1 + .../recipebook/ClientRecipeBook.mapping | 1 + .../client/render/DiffuseLighting.mapping | 2 +- .../client/render/GameRenderer.mapping | 11 +- .../{gui => render}/MapRenderer.mapping | 2 +- .../client/render/RenderLayers.mapping | 1 + .../client/render/SkyProperties.mapping | 1 + .../render/TexturedRenderLayers.mapping | 2 +- .../client/render/VertexConsumers.mapping | 3 +- .../client/render/VertexFormatElement.mapping | 26 +- .../client/render/VertexFormats.mapping | 2 +- .../client/render/WorldRenderer.mapping | 5 +- .../client/render/block/BlockModels.mapping | 5 + .../render/block/BlockRenderManager.mapping | 2 + .../entity/BannerBlockEntityRenderer.mapping | 1 + .../entity/BeaconBlockEntityRenderer.mapping | 22 +- .../BlockEntityRenderDispatcher.mapping | 3 + .../render/chunk/ChunkRendererRegion.mapping | 7 +- .../debug/GoalSelectorDebugRenderer.mapping | 1 + .../render/debug/VillageDebugRenderer.mapping | 2 + .../render/entity/EntityRenderer.mapping | 5 +- .../entity/PlayerEntityRenderer.mapping | 3 + .../feature/ArmorFeatureRenderer.mapping | 18 + .../entity/model/AbstractZombieModel.mapping | 1 + .../render/entity/model/AnimalModel.mapping | 1 + .../model/ArmorStandEntityModel.mapping | 4 +- .../entity/model/BeeEntityModel.mapping | 2 +- .../entity/model/BipedEntityModel.mapping | 8 +- .../entity/model/BoatEntityModel.mapping | 2 +- .../render/entity/model/BookModel.mapping | 10 +- .../entity/model/ChickenEntityModel.mapping | 2 +- .../entity/model/CodEntityModel.mapping | 2 +- .../entity/model/DolphinEntityModel.mapping | 2 +- .../entity/model/FoxEntityModel.mapping | 2 +- .../entity/model/GuardianEntityModel.mapping | 13 +- .../entity/model/HoglinEntityModel.mapping | 2 +- .../entity/model/HorseEntityModel.mapping | 2 +- .../entity/model/IllagerEntityModel.mapping | 8 +- .../entity/model/LeashKnotEntityModel.mapping | 2 +- .../render/entity/model/ModelWithHat.mapping | 3 + .../render/entity/model/ModelWithHead.mapping | 4 + .../entity/model/OcelotEntityModel.mapping | 2 +- .../entity/model/ParrotEntityModel.mapping | 4 +- .../entity/model/PhantomEntityModel.mapping | 8 +- .../entity/model/PlayerEntityModel.mapping | 8 +- .../entity/model/QuadrupedEntityModel.mapping | 2 +- .../entity/model/RabbitEntityModel.mapping | 2 +- .../entity/model/ShulkerEntityModel.mapping | 4 +- .../entity/model/SkullEntityModel.mapping | 2 +- .../entity/model/SnowGolemEntityModel.mapping | 2 +- .../entity/model/WitchEntityModel.mapping | 1 + .../model/ZombieVillagerEntityModel.mapping | 2 +- .../client/render/item/ItemModels.mapping | 3 + .../render/model/BakedModelManager.mapping | 5 +- .../render/model/BasicBakedModel.mapping | 3 + .../render/model/ModelBakeSettings.mapping | 2 +- .../client/render/model/ModelLoader.mapping | 4 +- .../model/json/ItemModelGenerator.mapping | 2 + .../model/json/ModelOverrideList.mapping | 2 +- .../render/model/json/ModelVariant.mapping | 1 + .../render/model/json/ModelVariantMap.mapping | 2 +- .../ClientBuiltinResourcePackProvider.mapping | 1 + .../resource/Format3ResourcePack.mapping | 2 + .../client/resource/ResourceIndex.mapping | 2 +- .../language/LanguageDefinition.mapping | 8 +- .../resource/language/LanguageManager.mapping | 1 + .../AnimationResourceMetadata.mapping | 2 + .../metadata/TextureResourceMetadata.mapping | 1 + .../client/sound/AmbientSoundPlayer.mapping | 1 + .../sound/EntityTrackingSoundInstance.mapping | 2 + .../sound/PositionedSoundInstance.mapping | 16 + .../client/sound/SoundManager.mapping | 11 + .../client/sound/SoundSystem.mapping | 16 + .../client/texture/NativeImage.mapping | 4 +- .../client/texture/PlayerSkinProvider.mapping | 1 + .../minecraft/client/texture/Sprite.mapping | 1 + .../client/texture/SpriteAtlasTexture.mapping | 1 + .../client/texture/TextureManager.mapping | 2 + .../client/tutorial/TutorialManager.mapping | 6 +- .../tutorial/TutorialStepHandler.mapping | 3 +- .../client/util/NetworkUtils.mapping | 9 +- .../client/util/ScreenshotUtils.mapping | 1 + .../client/util/SelectionManager.mapping | 2 +- .../client/util/TextCollector.mapping | 1 + .../client/util/{ => math}/Rect2i.mapping | 2 +- .../client/world/ClientChunkManager.mapping | 2 +- .../client/world/ClientWorld.mapping | 7 +- .../command/DataCommandObject.mapping | 9 +- .../command/DataCommandStorage.mapping | 2 +- .../command/EntitySelectorReader.mapping | 7 + .../command/FloatRangeArgument.mapping | 2 + .../command/argument/ArgumentTypes.mapping | 1 + .../argument/BlockStateArgument.mapping | 3 + ...ng => CommandFunctionArgumentType.mapping} | 4 +- ...apping => EnchantmentArgumentType.mapping} | 4 +- .../argument/IdentifierArgumentType.mapping | 4 + .../argument/ItemStackArgument.mapping | 5 +- .../command/argument/ItemStringReader.mapping | 4 +- ...apping => NbtCompoundArgumentType.mapping} | 4 +- .../argument/NbtElementArgumentType.mapping | 6 + .../argument/NbtTagArgumentType.mapping | 6 - .../argument/NumberRangeArgumentType.mapping | 2 +- .../ObjectiveCriteriaArgumentType.mapping | 11 - ...ing => ParticleEffectArgumentType.mapping} | 4 +- .../ScoreboardCriterionArgumentType.mapping | 11 + ...> ScoreboardObjectiveArgumentType.mapping} | 4 +- ...pping => StatusEffectArgumentType.mapping} | 6 +- mappings/net/minecraft/data/DataCache.mapping | 5 + .../net/minecraft/data/DataGenerator.mapping | 2 + .../net/minecraft/data/DataProvider.mapping | 1 + .../net/minecraft/data/SnbtProvider.mapping | 7 + .../client/model/BlockStateVariantMap.mapping | 15 + .../model/MultipartBlockStateSupplier.mapping | 8 + .../data/client/model/PropertiesMap.mapping | 5 +- .../data/client/model/TexturedModel.mapping | 2 +- .../model/VariantsBlockStateSupplier.mapping | 2 + .../data/report/BiomeListProvider.mapping | 6 +- .../data/report/BlockListProvider.mapping | 2 +- .../data/report/CommandSyntaxProvider.mapping | 2 +- .../data/report/ItemListProvider.mapping | 4 - .../data/report/RegistryDumpProvider.mapping | 4 + .../data/server/AbstractTagProvider.mapping | 3 + .../AdventureTabAdvancementGenerator.mapping | 3 + .../server/BlockLootTableGenerator.mapping | 8 + .../server/EntityLootTableGenerator.mapping | 5 + .../HusbandryTabAdvancementGenerator.mapping | 5 + .../data/server/ItemTagsProvider.mapping | 2 + .../data/server/RecipesProvider.mapping | 15 + .../recipe/CookingRecipeJsonFactory.mapping | 8 +- .../recipe/ShapelessRecipeJsonFactory.mapping | 2 +- .../SingleItemRecipeJsonFactory.mapping | 4 +- .../StructureValidatorProvider.mapping | 4 +- .../datafixer/fix/ItemLoreToTextFix.mapping | 4 +- .../datafixer/schema/Schema2501.mapping | 2 +- .../datafixer/schema/Schema2502.mapping | 2 +- .../datafixer/schema/Schema2505.mapping | 5 +- .../datafixer/schema/Schema2509.mapping | 5 +- .../datafixer/schema/Schema2519.mapping | 2 +- .../datafixer/schema/Schema2522.mapping | 2 +- .../enchantment/EnchantmentHelper.mapping | 12 +- .../enchantment/ProtectionEnchantment.mapping | 2 + .../enchantment/SweepingEnchantment.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 64 ++- .../net/minecraft/entity/EntityType.mapping | 30 +- .../minecraft/entity/EyeOfEnderEntity.mapping | 3 +- .../net/minecraft/entity/ItemEntity.mapping | 45 +- .../net/minecraft/entity/LivingEntity.mapping | 45 +- .../minecraft/entity/SaddledComponent.mapping | 9 +- .../net/minecraft/entity/SpawnGroup.mapping | 52 +- .../minecraft/entity/SpawnRestriction.mapping | 1 + .../minecraft/entity/ai/brain/Brain.mapping | 3 +- .../entity/ai/brain/EntityLookTarget.mapping | 1 + .../brain/sensor/GolemLastSeenSensor.mapping | 1 + .../brain/sensor/PiglinSpecificSensor.mapping | 2 +- .../entity/ai/brain/sensor/Sensor.mapping | 1 + .../entity/ai/brain/sensor/SensorType.mapping | 1 + .../sensor/VillagerHostilesSensor.mapping | 4 +- .../entity/ai/brain/task/BreedTask.mapping | 1 + .../ai/brain/task/DefeatTargetTask.mapping | 1 + .../task/FindPointOfInterestTask.mapping | 4 + .../ai/brain/task/FollowMobTask.mapping | 2 +- .../ai/brain/task/GoToCelebrateTask.mapping | 1 + .../ai/brain/task/GoToIfNearbyTask.mapping | 2 + .../brain/task/GoToNearbyPositionTask.mapping | 3 + .../task/GoToRememberedPositionTask.mapping | 1 + .../ai/brain/task/StayAboveWaterTask.mapping | 2 +- .../entity/ai/brain/task/Task.mapping | 1 + .../ai/brain/task/VillagerBreedTask.mapping | 3 + .../task/VillagerTaskListProvider.mapping | 13 + .../task/VillagerWalkTowardsTask.mapping | 2 + ...WalkToNearestVisibleWantedItemTask.mapping | 2 + .../ai/brain/task/WanderAroundTask.mapping | 1 + ...rol.mapping => AquaticLookControl.mapping} | 2 +- .../entity/ai/control/MoveControl.mapping | 2 +- .../entity/ai/goal/DolphinJumpGoal.mapping | 8 +- .../entity/ai/goal/DoorInteractGoal.mapping | 4 +- .../entity/ai/goal/GoalSelector.mapping | 4 +- .../ai/goal/MoveThroughVillageGoal.mapping | 1 + .../entity/ai/goal/TemptGoal.mapping | 2 +- .../ai/pathing/LandPathNodeMaker.mapping | 10 +- .../entity/ai/pathing/MobNavigation.mapping | 12 +- .../minecraft/entity/ai/pathing/Path.mapping | 2 + .../entity/ai/pathing/PathNode.mapping | 6 +- .../attribute/AttributeContainer.mapping | 6 +- .../attribute/EntityAttributeInstance.mapping | 6 +- .../attribute/EntityAttributeModifier.mapping | 6 +- .../net/minecraft/entity/boss/BossBar.mapping | 8 +- .../entity/boss/BossBarManager.mapping | 6 +- .../entity/boss/CommandBossBar.mapping | 6 +- .../entity/boss/WitherEntity.mapping | 6 +- .../boss/dragon/EnderDragonEntity.mapping | 23 +- .../boss/dragon/EnderDragonFight.mapping | 6 +- .../boss/dragon/EnderDragonSpawnState.mapping | 1 + .../dragon/phase/ChargingPlayerPhase.mapping | 6 +- .../dragon/phase/HoldingPatternPhase.mapping | 2 +- .../dragon/phase/LandingApproachPhase.mapping | 2 +- .../entity/boss/dragon/phase/Phase.mapping | 4 +- .../dragon/phase/StrafePlayerPhase.mapping | 2 +- .../boss/dragon/phase/TakeoffPhase.mapping | 2 +- .../entity/damage/DamageSource.mapping | 2 +- .../entity/damage/DamageTracker.mapping | 2 + .../minecraft/entity/data/DataTracker.mapping | 6 + .../minecraft/entity/data/TrackedData.mapping | 1 + .../entity/data/TrackedDataHandler.mapping | 5 +- .../decoration/ArmorStandEntity.mapping | 12 +- .../decoration/EndCrystalEntity.mapping | 2 +- .../entity/decoration/ItemFrameEntity.mapping | 3 +- .../effect/StatusEffectInstance.mapping | 16 +- .../minecraft/entity/mob/Angerable.mapping | 4 +- .../minecraft/entity/mob/BlazeEntity.mapping | 2 + .../entity/mob/CreeperEntity.mapping | 2 +- .../entity/mob/GuardianEntity.mapping | 12 +- .../entity/mob/HostileEntity.mapping | 2 + .../minecraft/entity/mob/HuskEntity.mapping | 1 + .../minecraft/entity/mob/MobEntity.mapping | 6 +- .../minecraft/entity/mob/PiglinBrain.mapping | 7 +- .../entity/mob/PiglinBruteBrain.mapping | 2 + .../minecraft/entity/mob/PiglinEntity.mapping | 3 +- .../entity/mob/ShulkerEntity.mapping | 2 +- .../minecraft/entity/mob/SpiderEntity.mapping | 2 + .../entity/passive/AnimalEntity.mapping | 1 + .../entity/passive/BatEntity.mapping | 3 +- .../entity/passive/BeeEntity.mapping | 2 +- .../entity/passive/HorseBaseEntity.mapping | 4 +- .../entity/passive/IronGolemEntity.mapping | 2 + .../entity/passive/ParrotEntity.mapping | 3 +- .../entity/passive/SheepEntity.mapping | 1 + .../entity/passive/TameableEntity.mapping | 3 + .../entity/passive/VillagerEntity.mapping | 20 +- .../entity/passive/WolfEntity.mapping | 2 +- .../entity/player/HungerManager.mapping | 13 +- .../entity/player/PlayerAbilities.mapping | 6 +- .../entity/player/PlayerEntity.mapping | 43 +- .../entity/player/PlayerInventory.mapping | 10 +- .../entity/projectile/ArrowEntity.mapping | 1 + .../ExplosiveProjectileEntity.mapping | 6 +- .../projectile/FishingBobberEntity.mapping | 1 + .../projectile/ProjectileEntity.mapping | 2 + .../entity/projectile/ProjectileUtil.mapping | 4 + .../projectile/ShulkerBulletEntity.mapping | 2 + .../vehicle/AbstractMinecartEntity.mapping | 1 + .../net/minecraft/fluid/FlowableFluid.mapping | 4 +- mappings/net/minecraft/fluid/Fluid.mapping | 2 + .../net/minecraft/fluid/FluidState.mapping | 1 + .../minecraft/inventory/ContainerLock.mapping | 12 +- .../minecraft/inventory/Inventories.mapping | 12 +- .../inventory/SimpleInventory.mapping | 6 +- .../net/minecraft/item/CompassItem.mapping | 2 +- .../minecraft/item/EnchantedBookItem.mapping | 2 +- .../minecraft/item/EntityBucketItem.mapping | 10 + .../net/minecraft/item/FilledMapItem.mapping | 1 + .../minecraft/item/FireworkChargeItem.mapping | 2 +- .../net/minecraft/item/FishBucketItem.mapping | 9 - .../minecraft/item/GlassBottleItem.mapping | 3 + mappings/net/minecraft/item/Item.mapping | 16 +- mappings/net/minecraft/item/ItemStack.mapping | 28 +- mappings/net/minecraft/item/ItemUsage.mapping | 3 + mappings/net/minecraft/item/LeadItem.mapping | 3 + .../net/minecraft/item/SpawnEggItem.mapping | 9 +- mappings/net/minecraft/item/SwordItem.mapping | 1 + mappings/net/minecraft/item/Wearable.mapping | 2 +- .../minecraft/item/WritableBookItem.mapping | 2 +- .../minecraft/item/WrittenBookItem.mapping | 2 +- .../item/map/MapBannerMarker.mapping | 5 +- .../minecraft/item/map/MapFrameMarker.mapping | 6 +- .../net/minecraft/item/map/MapState.mapping | 15 +- mappings/net/minecraft/loot/LootPool.mapping | 1 + .../loot/entry/CombinedEntry.mapping | 1 + .../loot/entry/LootPoolEntryTypes.mapping | 1 + .../net/minecraft/loot/entry/TagEntry.mapping | 2 +- .../loot/function/CopyStateFunction.mapping | 1 + .../loot/function/LootFunctionTypes.mapping | 1 + .../loot/function/SetNbtLootFunction.mapping | 4 +- .../net/minecraft/nbt/AbstractListTag.mapping | 16 - .../net/minecraft/nbt/AbstractNbtList.mapping | 20 + .../minecraft/nbt/AbstractNbtNumber.mapping | 33 ++ .../minecraft/nbt/AbstractNumberTag.mapping | 8 - mappings/net/minecraft/nbt/EndTag.mapping | 3 - .../nbt/{ByteTag.mapping => NbtByte.mapping} | 5 +- ...eArrayTag.mapping => NbtByteArray.mapping} | 5 +- ...ompoundTag.mapping => NbtCompound.mapping} | 31 +- .../{DoubleTag.mapping => NbtDouble.mapping} | 5 +- .../nbt/{Tag.mapping => NbtElement.mapping} | 14 +- .../{FloatTag.mapping => NbtFloat.mapping} | 5 +- mappings/net/minecraft/nbt/NbtHelper.mapping | 40 +- .../nbt/{IntTag.mapping => NbtInt.mapping} | 5 +- ...ntArrayTag.mapping => NbtIntArray.mapping} | 5 +- mappings/net/minecraft/nbt/NbtIo.mapping | 10 +- .../nbt/{ListTag.mapping => NbtList.mapping} | 12 +- .../nbt/{LongTag.mapping => NbtLong.mapping} | 5 +- ...gArrayTag.mapping => NbtLongArray.mapping} | 5 +- mappings/net/minecraft/nbt/NbtNull.mapping | 7 + mappings/net/minecraft/nbt/NbtOps.mapping | 4 +- .../{ShortTag.mapping => NbtShort.mapping} | 5 +- .../{StringTag.mapping => NbtString.mapping} | 5 +- .../minecraft/nbt/NbtTagSizeTracker.mapping | 8 + .../{TagReader.mapping => NbtType.mapping} | 9 +- mappings/net/minecraft/nbt/NbtTypes.mapping | 9 + .../net/minecraft/nbt/PositionTracker.mapping | 8 - .../net/minecraft/nbt/StringNbtReader.mapping | 14 +- mappings/net/minecraft/nbt/TagReaders.mapping | 4 - .../network/ClientConnection.mapping | 26 +- .../network/OffThreadException.mapping | 9 + .../minecraft/network/PacketByteBuf.mapping | 450 +++++++++++++++++- .../network/RateLimitedConnection.mapping | 2 + .../NetworkEncryptionUtils.mapping | 2 +- .../PacketEncryptionManager.mapping | 5 +- .../network/listener/PacketListener.mapping | 14 + .../c2s/play/ClickSlotC2SPacket.mapping | 4 +- .../UpdateStructureBlockC2SPacket.mapping | 2 +- .../s2c/login/LoginHelloS2CPacket.mapping | 1 + .../play/BlockEntityUpdateS2CPacket.mapping | 6 +- .../play/ChunkDeltaUpdateS2CPacket.mapping | 6 +- .../s2c/play/CommandTreeS2CPacket.mapping | 5 + .../s2c/play/GameMessageS2CPacket.mapping | 6 +- .../packet/s2c/play/LookAtS2CPacket.mapping | 1 + .../s2c/play/MapUpdateS2CPacket.mapping | 1 + ...ping => NbtQueryResponseS2CPacket.mapping} | 8 +- .../s2c/play/PlayerRespawnS2CPacket.mapping | 6 + .../s2c/play/UnlockRecipesS2CPacket.mapping | 3 + ...ng => UpdateSelectedSlotS2CPacket.mapping} | 4 +- .../particle/DustParticleEffect.mapping | 2 +- .../minecraft/particle/ParticleType.mapping | 2 +- .../net/minecraft/potion/PotionUtil.mapping | 6 +- .../minecraft/predicate/NbtPredicate.mapping | 8 +- .../predicate/PlayerPredicate.mapping | 4 +- .../predicate/StatePredicate.mapping | 2 +- .../predicate/entity/EntityPredicates.mapping | 1 + .../entity/LocationPredicate.mapping | 2 + .../item/EnchantmentPredicate.mapping | 1 + .../recipe/BrewingRecipeRegistry.mapping | 1 + .../net/minecraft/recipe/Ingredient.mapping | 2 +- .../minecraft/recipe/InputSlotFiller.mapping | 7 +- mappings/net/minecraft/recipe/Recipe.mapping | 32 +- .../net/minecraft/recipe/RecipeFinder.mapping | 37 -- .../minecraft/recipe/RecipeManager.mapping | 4 + .../minecraft/recipe/RecipeMatcher.mapping | 77 +++ .../net/minecraft/recipe/RecipeType.mapping | 1 + .../minecraft/recipe/RecipeUnlocker.mapping | 2 + .../net/minecraft/recipe/ShapedRecipe.mapping | 47 +- .../recipe/book/RecipeBookOptions.mapping | 8 +- .../resource/DefaultResourcePack.mapping | 5 +- .../resource/FileResourcePackProvider.mapping | 1 + .../minecraft/resource/JsonDataLoader.mapping | 2 + ...mapping => ProfiledResourceReload.mapping} | 14 +- .../ReloadableResourceManager.mapping | 41 +- .../ReloadableResourceManagerImpl.mapping | 3 +- .../net/minecraft/resource/Resource.mapping | 18 + .../resource/ResourceManager.mapping | 41 +- .../minecraft/resource/ResourcePack.mapping | 4 + .../resource/ResourcePackManager.mapping | 3 + .../resource/ResourcePackProfile.mapping | 22 +- .../resource/ResourcePackProvider.mapping | 9 + .../minecraft/resource/ResourceReload.mapping | 17 + .../resource/ResourceReloadListener.mapping | 12 - .../resource/ResourceReloadMonitor.mapping | 6 - .../resource/ResourceReloader.mapping | 95 ++-- .../resource/SimpleResourceReload.mapping | 34 ++ ...ePreparationResourceReloadListener.mapping | 8 - .../SinglePreparationResourceReloader.mapping | 27 ++ .../SynchronousResourceReloadListener.mapping | 3 - .../SynchronousResourceReloader.mapping | 13 + .../minecraft/scoreboard/AbstractTeam.mapping | 5 +- .../minecraft/scoreboard/Scoreboard.mapping | 17 +- .../scoreboard/ScoreboardCriterion.mapping | 13 +- .../scoreboard/ScoreboardObjective.mapping | 1 + .../scoreboard/ScoreboardPlayerScore.mapping | 1 + .../scoreboard/ScoreboardState.mapping | 19 +- .../net/minecraft/scoreboard/Team.mapping | 15 +- .../screen/AnvilScreenHandler.mapping | 1 + .../CartographyTableScreenHandler.mapping | 2 +- .../minecraft/screen/ScreenHandler.mapping | 6 +- .../screen/ScreenHandlerContext.mapping | 23 +- .../net/minecraft/screen/slot/Slot.mapping | 5 +- .../screen/slot/SlotActionType.mapping | 8 +- .../net/minecraft/server/BannedIpList.mapping | 2 + .../minecraft/server/BannedPlayerList.mapping | 1 + .../minecraft/server/LanServerPinger.mapping | 12 +- .../minecraft/server/PlayerManager.mapping | 2 +- .../server/command/CommandOutput.mapping | 2 +- .../server/command/DataCommand.mapping | 10 +- .../server/command/ExecuteCommand.mapping | 4 +- .../server/command/GameModeCommand.mapping | 2 +- .../server/command/LocateBiomeCommand.mapping | 1 + .../server/command/LocateCommand.mapping | 1 + .../server/command/ScheduleCommand.mapping | 3 + .../command/ServerCommandSource.mapping | 5 + .../command/SpreadPlayersCommand.mapping | 8 + .../server/command/TestCommand.mapping | 6 + .../AbstractPropertiesHandler.mapping | 2 + .../MinecraftDedicatedServer.mapping | 1 + .../server/dedicated/ServerMBean.mapping | 2 +- .../dedicated/ServerPropertiesHandler.mapping | 1 + .../server/function/CommandFunction.mapping | 7 + .../integrated/IntegratedServer.mapping | 7 + .../server/network/DebugInfoSender.mapping | 1 + ...ratedServerHandshakeNetworkHandler.mapping | 6 - ...LocalServerHandshakeNetworkHandler.mapping | 13 + .../network/ServerLoginNetworkHandler.mapping | 34 +- .../network/ServerPlayNetworkHandler.mapping | 7 +- .../server/network/ServerPlayerEntity.mapping | 34 +- .../server/network/ServerRecipeBook.mapping | 8 +- .../server/world/ChunkHolder.mapping | 8 +- .../server/world/ChunkTicket.mapping | 2 +- .../world/PlayerChunkWatchingManager.mapping | 6 + .../server/world/ServerChunkManager.mapping | 12 +- .../server/world/ServerTickScheduler.mapping | 5 +- .../server/world/ServerWorld.mapping | 9 + .../world/ThreadedAnvilChunkStorage.mapping | 18 +- .../minecraft/stat/ServerStatHandler.mapping | 3 + mappings/net/minecraft/stat/Stats.mapping | 4 + mappings/net/minecraft/state/State.mapping | 2 +- .../state/property/BooleanProperty.mapping | 7 + .../state/property/DirectionProperty.mapping | 27 +- .../state/property/EnumProperty.mapping | 69 ++- .../state/property/IntProperty.mapping | 16 +- .../minecraft/state/property/Property.mapping | 13 +- .../structure/PoolStructurePiece.mapping | 8 +- .../structure/SimpleStructurePiece.mapping | 1 + .../net/minecraft/structure/Structure.mapping | 37 +- .../structure/StructureManager.mapping | 4 +- .../structure/StructurePiece.mapping | 38 +- .../structure/StructureStart.mapping | 2 +- .../structure/pool/FeaturePoolElement.mapping | 4 +- .../structure/pool/SinglePoolElement.mapping | 5 + .../structure/pool/StructurePool.mapping | 1 + .../pool/StructurePoolElement.mapping | 7 + .../BlockAgeStructureProcessor.mapping | 8 + .../processor/StructureProcessor.mapping | 1 + .../processor/StructureProcessorRule.mapping | 4 +- .../structure/rule/PosRuleTest.mapping | 1 + .../net/minecraft/tag/RequiredTagList.mapping | 4 +- .../net/minecraft/tag/TagGroupLoader.mapping | 2 +- .../net/minecraft/test/GameTestBatch.mapping | 4 +- .../minecraft/test/GameTestException.mapping | 1 + ...GameTest.mapping => GameTestState.mapping} | 3 +- .../minecraft/test/StructureTestUtil.mapping | 9 +- .../test/TestCompletionListener.mapping | 1 + ...pParameter.mapping => TestContext.mapping} | 2 +- .../net/minecraft/test/TestFunction.mapping | 1 + .../net/minecraft/test/TestFunctions.mapping | 4 +- .../net/minecraft/test/TestRunner.mapping | 5 + mappings/net/minecraft/test/TestUtil.mapping | 11 + .../test/TimeMismatchException.mapping | 1 - mappings/net/minecraft/text/BaseText.mapping | 2 +- .../minecraft/text/CharacterVisitor.mapping | 2 +- .../net/minecraft/text/ClickEvent.mapping | 2 +- .../net/minecraft/text/HoverEvent.mapping | 2 +- .../net/minecraft/text/OrderedText.mapping | 4 +- .../minecraft/text/StringVisitable.mapping | 4 +- mappings/net/minecraft/text/Style.mapping | 8 +- mappings/net/minecraft/text/Text.mapping | 6 +- mappings/net/minecraft/text/TextColor.mapping | 4 +- mappings/net/minecraft/util/ChatUtil.mapping | 1 + mappings/net/minecraft/util/DyeColor.mapping | 9 +- .../net/minecraft/util/FileNameUtil.mapping | 1 + .../net/minecraft/util/Identifier.mapping | 10 +- .../net/minecraft/util/ItemScatterer.mapping | 11 +- .../minecraft/util/ProgressListener.mapping | 1 + mappings/net/minecraft/util/UserCache.mapping | 4 + mappings/net/minecraft/util/Util.mapping | 28 +- .../collection/TypeFilterableList.mapping | 22 + .../minecraft/util/crash/CrashReport.mapping | 2 + .../util/crash/CrashReportSection.mapping | 4 + .../util/dynamic/RegistryCodec.mapping | 2 +- .../util/dynamic/RegistryElementCodec.mapping | 6 +- .../RegistryLookupCodec.mapping | 2 +- .../util/dynamic/RegistryOps.mapping | 13 +- .../util/dynamic/RegistryReadingOps.mapping | 4 +- .../util/math/AffineTransformation.mapping | 9 +- .../util/math/AffineTransformations.mapping | 2 +- .../net/minecraft/util/math/BlockBox.mapping | 14 + .../util/math/BlockPointerImpl.mapping | 1 + .../net/minecraft/util/math/BlockPos.mapping | 6 +- mappings/net/minecraft/util/math/Box.mapping | 54 ++- .../util/math/ChunkSectionPos.mapping | 2 + .../minecraft/util/math/EulerAngle.mapping | 2 +- .../minecraft/util/math/MathHelper.mapping | 100 ++-- .../net/minecraft/util/math/Matrix3f.mapping | 5 +- .../net/minecraft/util/math/Matrix4f.mapping | 6 +- .../net/minecraft/util/math/Position.mapping | 3 + .../net/minecraft/util/math/Vec2f.mapping | 1 + .../net/minecraft/util/math/Vec3d.mapping | 135 +++++- .../math/Vec3f.mapping} | 4 +- .../net/minecraft/util/math/Vec3i.mapping | 2 + .../{client => }/util/math/Vector4f.mapping | 4 +- .../util/math/noise/NoiseSampler.mapping | 2 + .../noise/OctavePerlinNoiseSampler.mapping | 4 + .../noise/OctaveSimplexNoiseSampler.mapping | 1 + .../math/noise/PerlinNoiseSampler.mapping | 2 + .../math/noise/SimplexNoiseSampler.mapping | 3 +- .../util/registry/BuiltinRegistries.mapping | 3 + .../util/registry/DefaultedRegistry.mapping | 2 + .../registry/DynamicRegistryManager.mapping | 6 +- .../util/registry/MutableRegistry.mapping | 4 +- .../minecraft/util/registry/Registry.mapping | 28 +- .../util/registry/RegistryKey.mapping | 4 +- .../util/registry/SimpleRegistry.mapping | 6 + .../util/shape/BitSetVoxelSet.mapping | 12 +- .../util/shape/CroppedVoxelSet.mapping | 24 +- .../util/shape/SlicedVoxelShape.mapping | 1 + .../net/minecraft/util/shape/VoxelSet.mapping | 13 +- .../minecraft/util/shape/VoxelShape.mapping | 4 +- .../minecraft/util/shape/VoxelShapes.mapping | 13 +- .../util/thread/MessageListener.mapping | 5 + .../net/minecraft/village/Merchant.mapping | 3 + .../village/MerchantInventory.mapping | 8 +- .../minecraft/village/SimpleMerchant.mapping | 2 +- .../net/minecraft/village/TradeOffer.mapping | 66 ++- .../minecraft/village/TradeOfferList.mapping | 6 +- .../minecraft/village/VillagerData.mapping | 2 + .../minecraft/village/VillagerGossips.mapping | 2 + .../minecraft/village/VillagerType.mapping | 1 + .../net/minecraft/village/raid/Raid.mapping | 6 +- .../village/raid/RaidManager.mapping | 2 + .../world/BlockCollisionSpliterator.mapping | 3 + .../minecraft/world/ChunkSerializer.mapping | 6 +- .../net/minecraft/world/CollisionView.mapping | 14 +- .../world/CommandBlockExecutor.mapping | 16 +- .../net/minecraft/world/EntityView.mapping | 8 +- .../minecraft/world/FeatureUpdater.mapping | 6 +- .../net/minecraft/world/Heightmap.mapping | 4 +- .../minecraft/world/MobSpawnerEntry.mapping | 10 +- .../minecraft/world/ModifiableWorld.mapping | 19 +- .../minecraft/world/PersistentState.mapping | 4 +- .../world/PersistentStateManager.mapping | 2 +- .../minecraft/world/SaveProperties.mapping | 8 +- .../net/minecraft/world/SpawnHelper.mapping | 9 +- .../minecraft/world/TeleportTarget.mapping | 2 + .../world/WanderingTraderManager.mapping | 8 + mappings/net/minecraft/world/World.mapping | 16 +- .../minecraft/world/WorldSaveHandler.mapping | 2 + .../net/minecraft/world/biome/Biome.mapping | 2 +- .../world/biome/DefaultBiomeCreator.mapping | 30 ++ ...yer.mapping => AddBaseBiomesLayer.mapping} | 2 +- ...sLayer.mapping => ApplyRiverLayer.mapping} | 2 +- .../world/biome/layer/ScaleLayer.mapping | 4 + .../layer/util/LayerSampleContext.mapping | 2 + .../world/biome/source/BiomeAccess.mapping | 4 +- .../biome/source/BiomeLayerSampler.mapping | 3 + .../world/biome/source/BiomeSource.mapping | 2 + .../world/border/WorldBorder.mapping | 52 +- .../world/chunk/ArrayPalette.mapping | 1 + .../world/chunk/BiMapPalette.mapping | 4 +- .../net/minecraft/world/chunk/Chunk.mapping | 10 +- .../world/chunk/ChunkNibbleArray.mapping | 3 +- .../world/chunk/ChunkSection.mapping | 3 + .../net/minecraft/world/chunk/Palette.mapping | 4 +- .../world/chunk/PalettedContainer.mapping | 6 +- .../minecraft/world/chunk/ProtoChunk.mapping | 2 +- .../minecraft/world/chunk/UpgradeData.mapping | 2 +- .../minecraft/world/chunk/WorldChunk.mapping | 4 +- .../chunk/light/ChunkLightingView.mapping | 1 + .../chunk/light/LightingProvider.mapping | 1 + .../world/dimension/AreaHelper.mapping | 3 + .../world/dimension/DimensionOptions.mapping | 4 +- .../world/explosion/Explosion.mapping | 10 + .../minecraft/world/gen/ChunkRandom.mapping | 20 +- .../world/gen/GeneratorOptions.mapping | 4 + .../minecraft/world/gen/carver/Carver.mapping | 2 + .../world/gen/chunk/ChunkGenerator.mapping | 14 +- ...=> SpreadDoubleHeightmapDecorator.mapping} | 2 +- ...ature.mapping => BlockPileFeature.mapping} | 4 +- .../gen/feature/ConfiguredFeature.mapping | 2 +- .../world/gen/feature/CoralFeature.mapping | 4 +- .../gen/feature/DefaultBiomeFeatures.mapping | 83 +++- .../world/gen/feature/FlowerFeature.mapping | 2 + .../gen/feature/HugeFungusFeature.mapping | 2 + .../gen/feature/HugeMushroomFeature.mapping | 1 + .../world/gen/feature/IcebergFeature.mapping | 1 + .../NetherrackReplaceBlobsFeature.mapping | 1 - .../world/gen/feature/OreFeature.mapping | 3 +- .../gen/feature/OreFeatureConfig.mapping | 2 +- .../gen/feature/ReplaceBlobsFeature.mapping | 1 + ...ping => ReplaceBlobsFeatureConfig.mapping} | 2 +- .../gen/feature/RuinedPortalFeature.mapping | 1 + .../gen/feature/StructureFeature.mapping | 10 +- .../StructurePoolFeatureConfig.mapping | 5 +- .../world/gen/feature/TreeFeature.mapping | 2 +- .../gen/feature/TwistingVinesFeature.mapping | 8 + .../gen/feature/size/FeatureSize.mapping | 3 +- .../world/gen/foliage/FoliagePlacer.mapping | 8 +- .../gen/surfacebuilder/SurfaceBuilder.mapping | 2 + .../AlterGroundTreeDecorator.mapping | 2 +- .../BeehiveTreeDecorator.mapping | 2 +- .../CocoaBeansTreeDecorator.mapping | 2 +- .../LeavesVineTreeDecorator.mapping} | 2 +- .../TreeDecorator.mapping | 2 +- .../TreeDecoratorType.mapping | 2 +- .../TrunkVineTreeDecorator.mapping | 2 +- .../world/gen/trunk/TrunkPlacer.mapping | 2 +- .../world/gen/trunk/TrunkPlacerType.mapping | 1 + .../minecraft/world/level/LevelInfo.mapping | 1 + .../world/level/LevelProperties.mapping | 3 + .../level/UnmodifiableLevelProperties.mapping | 2 +- .../world/level/storage/AlphaChunkIo.mapping | 5 +- .../level/storage/AnvilLevelStorage.mapping | 15 + .../world/level/storage/LevelStorage.mapping | 4 + .../world/poi/PointOfInterest.mapping | 2 +- .../world/poi/PointOfInterestSet.mapping | 2 + .../world/poi/PointOfInterestStorage.mapping | 7 +- .../world/poi/PointOfInterestType.mapping | 1 + .../world/storage/RegionBasedStorage.mapping | 2 +- .../world/storage/RegionFile.mapping | 1 + .../minecraft/world/storage/SectorMap.mapping | 5 + .../SerializingRegionBasedStorage.mapping | 3 +- .../world/storage/StorageIoWorker.mapping | 2 + .../storage/VersionedChunkStorage.mapping | 12 +- .../net/minecraft/world/timer/Timer.mapping | 4 +- .../timer/TimerCallbackSerializer.mapping | 2 +- .../world/updater/WorldUpdater.mapping | 2 + 810 files changed, 4559 insertions(+), 1408 deletions(-) create mode 100644 mappings/net/minecraft/block/MapColor.mapping delete mode 100644 mappings/net/minecraft/block/MaterialColor.mapping delete mode 100644 mappings/net/minecraft/client/gl/GlProgram.mapping rename mappings/net/minecraft/client/gl/{JsonGlProgram.mapping => JsonEffectGlShader.mapping} (88%) create mode 100644 mappings/net/minecraft/client/gl/Program.mapping rename mappings/net/minecraft/client/gui/screen/{options => option}/AccessibilityOptionsScreen.mapping (92%) rename mappings/net/minecraft/client/gui/screen/{options => option}/ChatOptionsScreen.mapping (90%) rename mappings/net/minecraft/client/gui/screen/{options => option}/ControlsListWidget.mapping (97%) rename mappings/net/minecraft/client/gui/screen/{options => option}/ControlsOptionsScreen.mapping (95%) rename mappings/net/minecraft/client/gui/screen/{options => option}/GameOptionsScreen.mapping (94%) rename mappings/net/minecraft/client/gui/screen/{options => option}/LanguageOptionsScreen.mapping (91%) rename mappings/net/minecraft/client/gui/screen/{options => option}/MouseOptionsScreen.mapping (92%) rename mappings/net/minecraft/client/gui/screen/{options => option}/NarratorOptionsScreen.mapping (95%) rename mappings/net/minecraft/client/gui/screen/{options => option}/OptionsScreen.mapping (98%) rename mappings/net/minecraft/client/gui/screen/{options => option}/SkinOptionsScreen.mapping (95%) rename mappings/net/minecraft/client/gui/screen/{options => option}/SoundOptionsScreen.mapping (92%) rename mappings/net/minecraft/client/gui/screen/{ => option}/VideoOptionsScreen.mapping (91%) delete mode 100644 mappings/net/minecraft/client/gui/widget/AbstractPressableButtonWidget.mapping rename mappings/net/minecraft/client/gui/widget/{AbstractButtonWidget.mapping => ClickableWidget.mapping} (79%) create mode 100644 mappings/net/minecraft/client/gui/widget/PressableWidget.mapping rename mappings/net/minecraft/{ => client}/network/ServerAddress.mapping (82%) rename mappings/net/minecraft/client/{options => option}/AoMode.mapping (85%) rename mappings/net/minecraft/client/{options => option}/AttackIndicator.mapping (83%) rename mappings/net/minecraft/client/{options => option}/BooleanOption.mapping (75%) rename mappings/net/minecraft/client/{options => option}/ChatVisibility.mapping (83%) rename mappings/net/minecraft/client/{options => option}/CloudRenderMode.mapping (83%) rename mappings/net/minecraft/client/{options => option}/CyclingOption.mapping (88%) rename mappings/net/minecraft/client/{options => option}/DoubleOption.mapping (93%) create mode 100644 mappings/net/minecraft/client/option/FullscreenOption.mapping rename mappings/net/minecraft/client/{options => option}/GameOptions.mapping (94%) rename mappings/net/minecraft/client/{options => option}/GraphicsMode.mapping (85%) rename mappings/net/minecraft/client/{options => option}/HotbarStorage.mapping (83%) create mode 100644 mappings/net/minecraft/client/option/HotbarStorageEntry.mapping rename mappings/net/minecraft/client/{options => option}/KeyBinding.mapping (67%) create mode 100644 mappings/net/minecraft/client/option/LogarithmicOption.mapping rename mappings/net/minecraft/client/{options => option}/NarratorMode.mapping (83%) rename mappings/net/minecraft/client/{options => option}/Option.mapping (99%) rename mappings/net/minecraft/client/{options => option}/ParticlesMode.mapping (83%) rename mappings/net/minecraft/client/{options => option}/Perspective.mapping (81%) rename mappings/net/minecraft/client/{options => option}/ServerList.mapping (81%) rename mappings/net/minecraft/client/{options => option}/StickyKeyBinding.mapping (74%) delete mode 100644 mappings/net/minecraft/client/options/FullScreenOption.mapping delete mode 100644 mappings/net/minecraft/client/options/HotbarStorageEntry.mapping delete mode 100644 mappings/net/minecraft/client/options/LogarithmicOption.mapping rename mappings/net/minecraft/client/{gui => render}/MapRenderer.mapping (95%) rename mappings/net/minecraft/client/util/{ => math}/Rect2i.mapping (83%) rename mappings/net/minecraft/command/argument/{FunctionArgumentType.mapping => CommandFunctionArgumentType.mapping} (87%) rename mappings/net/minecraft/command/argument/{ItemEnchantmentArgumentType.mapping => EnchantmentArgumentType.mapping} (76%) rename mappings/net/minecraft/command/argument/{NbtCompoundTagArgumentType.mapping => NbtCompoundArgumentType.mapping} (75%) create mode 100644 mappings/net/minecraft/command/argument/NbtElementArgumentType.mapping delete mode 100644 mappings/net/minecraft/command/argument/NbtTagArgumentType.mapping delete mode 100644 mappings/net/minecraft/command/argument/ObjectiveCriteriaArgumentType.mapping rename mappings/net/minecraft/command/argument/{ParticleArgumentType.mapping => ParticleEffectArgumentType.mapping} (90%) create mode 100644 mappings/net/minecraft/command/argument/ScoreboardCriterionArgumentType.mapping rename mappings/net/minecraft/command/argument/{ObjectiveArgumentType.mapping => ScoreboardObjectiveArgumentType.mapping} (84%) rename mappings/net/minecraft/command/argument/{MobEffectArgumentType.mapping => StatusEffectArgumentType.mapping} (55%) delete mode 100644 mappings/net/minecraft/data/report/ItemListProvider.mapping create mode 100644 mappings/net/minecraft/data/report/RegistryDumpProvider.mapping rename mappings/net/minecraft/entity/ai/control/{DolphinLookControl.mapping => AquaticLookControl.mapping} (60%) create mode 100644 mappings/net/minecraft/item/EntityBucketItem.mapping delete mode 100644 mappings/net/minecraft/item/FishBucketItem.mapping delete mode 100644 mappings/net/minecraft/nbt/AbstractListTag.mapping create mode 100644 mappings/net/minecraft/nbt/AbstractNbtList.mapping create mode 100644 mappings/net/minecraft/nbt/AbstractNbtNumber.mapping delete mode 100644 mappings/net/minecraft/nbt/AbstractNumberTag.mapping delete mode 100644 mappings/net/minecraft/nbt/EndTag.mapping rename mappings/net/minecraft/nbt/{ByteTag.mapping => NbtByte.mapping} (75%) rename mappings/net/minecraft/nbt/{ByteArrayTag.mapping => NbtByteArray.mapping} (63%) rename mappings/net/minecraft/nbt/{CompoundTag.mapping => NbtCompound.mapping} (79%) rename mappings/net/minecraft/nbt/{DoubleTag.mapping => NbtDouble.mapping} (57%) rename mappings/net/minecraft/nbt/{Tag.mapping => NbtElement.mapping} (56%) rename mappings/net/minecraft/nbt/{FloatTag.mapping => NbtFloat.mapping} (57%) rename mappings/net/minecraft/nbt/{IntTag.mapping => NbtInt.mapping} (62%) rename mappings/net/minecraft/nbt/{IntArrayTag.mapping => NbtIntArray.mapping} (61%) rename mappings/net/minecraft/nbt/{ListTag.mapping => NbtList.mapping} (61%) rename mappings/net/minecraft/nbt/{LongTag.mapping => NbtLong.mapping} (62%) rename mappings/net/minecraft/nbt/{LongArrayTag.mapping => NbtLongArray.mapping} (67%) create mode 100644 mappings/net/minecraft/nbt/NbtNull.mapping rename mappings/net/minecraft/nbt/{ShortTag.mapping => NbtShort.mapping} (62%) rename mappings/net/minecraft/nbt/{StringTag.mapping => NbtString.mapping} (71%) create mode 100644 mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping rename mappings/net/minecraft/nbt/{TagReader.mapping => NbtType.mapping} (50%) create mode 100644 mappings/net/minecraft/nbt/NbtTypes.mapping delete mode 100644 mappings/net/minecraft/nbt/PositionTracker.mapping delete mode 100644 mappings/net/minecraft/nbt/TagReaders.mapping rename mappings/net/minecraft/network/{ => encryption}/NetworkEncryptionUtils.mapping (92%) rename mappings/net/minecraft/network/packet/s2c/play/{TagQueryResponseS2CPacket.mapping => NbtQueryResponseS2CPacket.mapping} (58%) rename mappings/net/minecraft/network/packet/s2c/play/{HeldItemChangeS2CPacket.mapping => UpdateSelectedSlotS2CPacket.mapping} (65%) delete mode 100644 mappings/net/minecraft/recipe/RecipeFinder.mapping create mode 100644 mappings/net/minecraft/recipe/RecipeMatcher.mapping rename mappings/net/minecraft/resource/{ProfilingResourceReloader.mapping => ProfiledResourceReload.mapping} (79%) create mode 100644 mappings/net/minecraft/resource/ResourceReload.mapping delete mode 100644 mappings/net/minecraft/resource/ResourceReloadListener.mapping delete mode 100644 mappings/net/minecraft/resource/ResourceReloadMonitor.mapping create mode 100644 mappings/net/minecraft/resource/SimpleResourceReload.mapping delete mode 100644 mappings/net/minecraft/resource/SinglePreparationResourceReloadListener.mapping create mode 100644 mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping delete mode 100644 mappings/net/minecraft/resource/SynchronousResourceReloadListener.mapping create mode 100644 mappings/net/minecraft/resource/SynchronousResourceReloader.mapping delete mode 100644 mappings/net/minecraft/server/network/IntegratedServerHandshakeNetworkHandler.mapping create mode 100644 mappings/net/minecraft/server/network/LocalServerHandshakeNetworkHandler.mapping create mode 100644 mappings/net/minecraft/test/GameTestException.mapping rename mappings/net/minecraft/test/{GameTest.mapping => GameTestState.mapping} (94%) rename mappings/net/minecraft/test/{StartupParameter.mapping => TestContext.mapping} (61%) delete mode 100644 mappings/net/minecraft/test/TimeMismatchException.mapping rename mappings/net/minecraft/util/{registry => dynamic}/RegistryLookupCodec.mapping (73%) rename mappings/net/minecraft/{client => }/util/math/AffineTransformation.mapping (70%) rename mappings/net/minecraft/{client => }/util/math/AffineTransformations.mapping (83%) rename mappings/net/minecraft/{client/util/math/Vector3f.mapping => util/math/Vec3f.mapping} (93%) rename mappings/net/minecraft/{client => }/util/math/Vector4f.mapping (78%) rename mappings/net/minecraft/world/biome/layer/{SetBaseBiomesLayer.mapping => AddBaseBiomesLayer.mapping} (74%) rename mappings/net/minecraft/world/biome/layer/{AddRiversLayer.mapping => ApplyRiverLayer.mapping} (81%) rename mappings/net/minecraft/world/gen/decorator/{HeightmapSpreadDoubleDecorator.mapping => SpreadDoubleHeightmapDecorator.mapping} (66%) rename mappings/net/minecraft/world/gen/feature/{AbstractPileFeature.mapping => BlockPileFeature.mapping} (54%) delete mode 100644 mappings/net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeature.mapping create mode 100644 mappings/net/minecraft/world/gen/feature/ReplaceBlobsFeature.mapping rename mappings/net/minecraft/world/gen/feature/{NetherrackReplaceBlobsFeatureConfig.mapping => ReplaceBlobsFeatureConfig.mapping} (80%) rename mappings/net/minecraft/world/gen/{tree => treedecorator}/AlterGroundTreeDecorator.mapping (65%) rename mappings/net/minecraft/world/gen/{tree => treedecorator}/BeehiveTreeDecorator.mapping (75%) rename mappings/net/minecraft/world/gen/{tree => treedecorator}/CocoaBeansTreeDecorator.mapping (78%) rename mappings/net/minecraft/world/gen/{tree/LeaveVineTreeDecorator.mapping => treedecorator/LeavesVineTreeDecorator.mapping} (86%) rename mappings/net/minecraft/world/gen/{tree => treedecorator}/TreeDecorator.mapping (92%) rename mappings/net/minecraft/world/gen/{tree => treedecorator}/TreeDecoratorType.mapping (78%) rename mappings/net/minecraft/world/gen/{tree => treedecorator}/TrunkVineTreeDecorator.mapping (73%) diff --git a/gradle.properties b/gradle.properties index 19e04e33fb..78f4826fa6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -enigma_version=0.26.1 -stitch_version=0.5.1+build.77 +enigma_version=1.0.0 +stitch_version=0.6.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index be52383ef4..0f80bbf516 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mappings/com/mojang/blaze3d/systems/RenderCallStorage.mapping b/mappings/com/mojang/blaze3d/systems/RenderCallStorage.mapping index 7415c6f5a4..499dd9f42d 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderCallStorage.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderCallStorage.mapping @@ -1,2 +1,7 @@ CLASS net/minecraft/class_4491 com/mojang/blaze3d/systems/RenderCallStorage + COMMENT A storage of render calls with recording. It exposes + COMMENT one queue: the recording queue. + COMMENT + COMMENT

This storage appears to be a work in progress, + COMMENT as more queues are exposed in future versions. FIELD field_20453 recordingQueues Ljava/util/List; diff --git a/mappings/net/minecraft/Bootstrap.mapping b/mappings/net/minecraft/Bootstrap.mapping index cfcfda59e8..8e733ef142 100644 --- a/mappings/net/minecraft/Bootstrap.mapping +++ b/mappings/net/minecraft/Bootstrap.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2966 net/minecraft/Bootstrap METHOD method_12847 println (Ljava/lang/String;)V ARG 0 str METHOD method_12848 collectMissingTranslations (Ljava/lang/Iterable;Ljava/util/function/Function;Ljava/util/Set;)V + ARG 0 registry ARG 1 keyExtractor ARG 2 translationKeys METHOD method_12851 initialize ()V diff --git a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping index bf968badce..7123cbab94 100644 --- a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping +++ b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping @@ -7,8 +7,8 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay FIELD field_1241 icon Lnet/minecraft/class_1799; FIELD field_1242 description Lnet/minecraft/class_2561; FIELD field_1243 background Lnet/minecraft/class_2960; - FIELD field_1244 yPos F - FIELD field_1245 xPos F + FIELD field_1244 y F + FIELD field_1245 x F METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_189;ZZZ)V ARG 1 icon ARG 2 title @@ -28,9 +28,9 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay ARG 1 buf METHOD method_814 toJson ()Lcom/google/gson/JsonElement; METHOD method_815 getFrame ()Lnet/minecraft/class_189; - METHOD method_816 setPosition (FF)V - ARG 1 xPos - ARG 2 yPos + METHOD method_816 setPos (FF)V + ARG 1 x + ARG 2 y METHOD method_817 getDescription ()Lnet/minecraft/class_2561; METHOD method_818 getX ()F METHOD method_819 getY ()F diff --git a/mappings/net/minecraft/advancement/AdvancementPositioner.mapping b/mappings/net/minecraft/advancement/AdvancementPositioner.mapping index 94414b74c8..46bbaa5575 100644 --- a/mappings/net/minecraft/advancement/AdvancementPositioner.mapping +++ b/mappings/net/minecraft/advancement/AdvancementPositioner.mapping @@ -26,9 +26,11 @@ CLASS net/minecraft/class_194 net/minecraft/advancement/AdvancementPositioner METHOD method_844 getLastChild ()Lnet/minecraft/class_194; METHOD method_845 getLast (Lnet/minecraft/class_194;Lnet/minecraft/class_194;)Lnet/minecraft/class_194; METHOD method_846 findChildrenRecursively (Lnet/minecraft/class_161;Lnet/minecraft/class_194;)Lnet/minecraft/class_194; + ARG 1 advancement ARG 2 lastChild METHOD method_847 calculateRecursively ()V METHOD method_848 pushDown (Lnet/minecraft/class_194;F)V + ARG 1 positioner ARG 2 extraRowDistance METHOD method_849 getFirstChild ()Lnet/minecraft/class_194; METHOD method_850 onFinishChildrenCalculation ()V diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping index dd84c28dcc..a0a2c9f283 100644 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCriterion FIELD field_1271 ID Lnet/minecraft/class_2960; METHOD method_855 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1429;Lnet/minecraft/class_1429;Lnet/minecraft/class_1296;)V + ARG 1 player + ARG 2 parent + ARG 3 partner + ARG 4 child CLASS class_198 Conditions FIELD field_1275 child Lnet/minecraft/class_2048$class_5258; FIELD field_1276 parent Lnet/minecraft/class_2048$class_5258; diff --git a/mappings/net/minecraft/advancement/criterion/Criterion.mapping b/mappings/net/minecraft/advancement/criterion/Criterion.mapping index d6ab49c421..f9655a027b 100644 --- a/mappings/net/minecraft/advancement/criterion/Criterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criterion.mapping @@ -3,8 +3,10 @@ CLASS net/minecraft/class_179 net/minecraft/advancement/criterion/Criterion ARG 1 tracker METHOD method_792 beginTrackingCondition (Lnet/minecraft/class_2985;Lnet/minecraft/class_179$class_180;)V ARG 1 manager + ARG 2 conditions METHOD method_793 endTrackingCondition (Lnet/minecraft/class_2985;Lnet/minecraft/class_179$class_180;)V ARG 1 manager + ARG 2 conditions METHOD method_794 getId ()Lnet/minecraft/class_2960; METHOD method_795 conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Lnet/minecraft/class_184; ARG 1 obj diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index 4f7060bb0c..060ff5352e 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit METHOD method_8960 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;I)V ARG 1 player ARG 2 stack - ARG 3 damage + ARG 3 durability CLASS class_2071 Conditions FIELD field_9637 item Lnet/minecraft/class_2073; FIELD field_9638 durability Lnet/minecraft/class_2096$class_2100; diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index f45c337b9a..1a8232bdf6 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23154 dynamicBounds Z FIELD field_23155 settings Lnet/minecraft/class_4970$class_2251; FIELD field_23156 lootTableId Lnet/minecraft/class_2960; - FIELD field_23157 FACINGS [Lnet/minecraft/class_2350; + FIELD field_23157 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_23158 material Lnet/minecraft/class_3614; FIELD field_23159 collidable Z FIELD field_23160 resistance F @@ -30,7 +30,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 state ARG 2 world ARG 3 pos - METHOD method_26159 getVisualShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; + METHOD method_26159 getCameraCollisionShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; ARG 1 state ARG 2 world ARG 3 pos @@ -38,7 +38,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_26160 asBlock ()Lnet/minecraft/class_2248; METHOD method_26161 hasBlockEntity ()Z METHOD method_26162 getLootTableId ()Lnet/minecraft/class_2960; - METHOD method_26403 getDefaultMaterialColor ()Lnet/minecraft/class_3620; + METHOD method_26403 getDefaultMapColor ()Lnet/minecraft/class_3620; METHOD method_8389 asItem ()Lnet/minecraft/class_1792; METHOD method_9498 hasComparatorOutput (Lnet/minecraft/class_2680;)Z ARG 1 state @@ -125,12 +125,21 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 world ARG 3 pos METHOD method_9559 getStateForNeighborUpdate (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; + COMMENT Gets the possibly updated block state of this block when a neighboring block is updated. + COMMENT + COMMENT @return the new state of this block ARG 1 state + COMMENT the state of this block ARG 2 direction - ARG 3 newState + COMMENT the direction from this block to the neighbor + ARG 3 neighborState + COMMENT the state of the updated neighbor block ARG 4 world + COMMENT the world ARG 5 pos - ARG 6 posFrom + COMMENT the position of this block + ARG 6 neighborPos + COMMENT the position of the neighbor block METHOD method_9560 getDroppedStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_47$class_48;)Ljava/util/List; ARG 1 state ARG 2 builder diff --git a/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping b/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping index 2d6f873a8e..a19a74b00a 100644 --- a/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping +++ b/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping @@ -12,3 +12,4 @@ CLASS net/minecraft/class_4863 net/minecraft/block/AbstractPlantPartBlock METHOD method_24947 canAttachTo (Lnet/minecraft/class_2248;)Z ARG 1 block METHOD method_24948 getRandomGrowthState (Lnet/minecraft/class_1936;)Lnet/minecraft/class_2680; + ARG 1 world diff --git a/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping b/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping index 2fcc91c05c..5b16c61a2c 100644 --- a/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping +++ b/mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_2312 net/minecraft/block/AbstractRedstoneGateBlock ARG 2 pos ARG 3 dir METHOD method_9996 isLocked (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + ARG 1 world ARG 2 pos ARG 3 state METHOD method_9997 updateTarget (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index fc58b37ba7..eeba2087e0 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock ARG 0 world METHOD method_9484 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;F)Ljava/util/Optional; ARG 0 type + ARG 1 world ARG 2 pos METHOD method_9487 getColor ()Lnet/minecraft/class_1767; METHOD method_9488 getDirectionTowardsOtherPart (Lnet/minecraft/class_2742;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; diff --git a/mappings/net/minecraft/block/BeehiveBlock.mapping b/mappings/net/minecraft/block/BeehiveBlock.mapping index c87c3380f9..8d25ad8121 100644 --- a/mappings/net/minecraft/block/BeehiveBlock.mapping +++ b/mappings/net/minecraft/block/BeehiveBlock.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_4481 net/minecraft/block/BeehiveBlock ARG 2 state ARG 3 pos ARG 4 player + ARG 5 beeState METHOD method_21842 dropHoneycomb (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 0 world ARG 1 pos @@ -39,3 +40,4 @@ CLASS net/minecraft/class_4481 net/minecraft/block/BeehiveBlock ARG 1 world ARG 2 pos METHOD method_26978 getRandomGenerationDirection (Ljava/util/Random;)Lnet/minecraft/class_2350; + ARG 0 random diff --git a/mappings/net/minecraft/block/BellBlock.mapping b/mappings/net/minecraft/block/BellBlock.mapping index 6f0f189453..7b69b1e6c9 100644 --- a/mappings/net/minecraft/block/BellBlock.mapping +++ b/mappings/net/minecraft/block/BellBlock.mapping @@ -28,3 +28,5 @@ CLASS net/minecraft/class_3709 net/minecraft/block/BellBlock METHOD method_19285 ring (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_3965;Lnet/minecraft/class_1657;Z)Z ARG 1 world ARG 2 state + ARG 3 hitResult + ARG 4 player diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 06cd4b1bfc..d1442829e2 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -82,12 +82,12 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block METHOD method_9538 canMobSpawnInside ()Z METHOD method_9539 getTranslationKey ()Ljava/lang/String; METHOD method_9541 createCuboidShape (DDDDDD)Lnet/minecraft/class_265; - ARG 0 xMin - ARG 2 yMin - ARG 4 zMin - ARG 6 xMax - ARG 8 yMax - ARG 10 zMax + ARG 0 minX + ARG 2 minY + ARG 4 minZ + ARG 6 maxX + ARG 8 maxY + ARG 10 maxZ METHOD method_9542 hasRandomTicks (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_9543 hasDynamicBounds ()Z diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index a0dbd5564f..a78c970057 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks METHOD method_26105 (Lnet/minecraft/class_2680;)I ARG 0 state METHOD method_26106 createLeavesBlock ()Lnet/minecraft/class_2397; - METHOD method_26107 createLightLevelFromBlockState (I)Ljava/util/function/ToIntFunction; + METHOD method_26107 createLightLevelFromLitBlockState (I)Ljava/util/function/ToIntFunction; ARG 0 litLevel METHOD method_26109 createBedBlock (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2244; ARG 0 color @@ -27,10 +27,10 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 2 pos ARG 3 type METHOD method_26115 createNetherStemBlock (Lnet/minecraft/class_3620;)Lnet/minecraft/class_2248; - ARG 0 materialColor + ARG 0 mapColor METHOD method_26117 createLogBlock (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;)Lnet/minecraft/class_2465; - ARG 0 topMaterialColor - ARG 1 sideMaterialColor + ARG 0 topMapColor + ARG 1 sideMapColor METHOD method_26119 createPistonBlock (Z)Lnet/minecraft/class_2665; ARG 0 sticky METHOD method_26120 createStainedGlassBlock (Lnet/minecraft/class_1767;)Lnet/minecraft/class_2506; diff --git a/mappings/net/minecraft/block/CarvedPumpkinBlock.mapping b/mappings/net/minecraft/block/CarvedPumpkinBlock.mapping index f669d2a1af..ad43b98d14 100644 --- a/mappings/net/minecraft/block/CarvedPumpkinBlock.mapping +++ b/mappings/net/minecraft/block/CarvedPumpkinBlock.mapping @@ -15,4 +15,5 @@ CLASS net/minecraft/class_2276 net/minecraft/block/CarvedPumpkinBlock ARG 2 pos METHOD method_9732 getSnowGolemDispenserPattern ()Lnet/minecraft/class_2700; METHOD method_9733 canDispense (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z + ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/CauldronBlock.mapping b/mappings/net/minecraft/block/CauldronBlock.mapping index e5a48ec5cb..86972dfcec 100644 --- a/mappings/net/minecraft/block/CauldronBlock.mapping +++ b/mappings/net/minecraft/block/CauldronBlock.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2275 net/minecraft/block/CauldronBlock FIELD field_10745 LEVEL Lnet/minecraft/class_2758; FIELD field_10746 OUTLINE_SHAPE Lnet/minecraft/class_265; - FIELD field_10747 RAY_TRACE_SHAPE Lnet/minecraft/class_265; + FIELD field_10747 RAYCAST_SHAPE Lnet/minecraft/class_265; METHOD method_9726 setLevel (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/ComposterBlock.mapping b/mappings/net/minecraft/block/ComposterBlock.mapping index 4e11ca8eb9..c0f7a49d26 100644 --- a/mappings/net/minecraft/block/ComposterBlock.mapping +++ b/mappings/net/minecraft/block/ComposterBlock.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3962 net/minecraft/block/ComposterBlock FIELD field_17565 LEVEL Lnet/minecraft/class_2758; FIELD field_17566 ITEM_TO_LEVEL_INCREASE_CHANCE Lit/unimi/dsi/fastutil/objects/Object2FloatMap; - FIELD field_17567 RAY_TRACE_SHAPE Lnet/minecraft/class_265; + FIELD field_17567 RAYCAST_SHAPE Lnet/minecraft/class_265; FIELD field_17568 LEVEL_TO_COLLISION_SHAPE [Lnet/minecraft/class_265; METHOD method_17753 registerCompostableItem (FLnet/minecraft/class_1935;)V ARG 0 levelIncreaseChance diff --git a/mappings/net/minecraft/block/DispenserBlock.mapping b/mappings/net/minecraft/block/DispenserBlock.mapping index 6f691d2729..050ec7f361 100644 --- a/mappings/net/minecraft/block/DispenserBlock.mapping +++ b/mappings/net/minecraft/block/DispenserBlock.mapping @@ -10,4 +10,5 @@ CLASS net/minecraft/class_2315 net/minecraft/block/DispenserBlock METHOD method_10011 getBehaviorForItem (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2357; ARG 1 stack METHOD method_10012 dispense (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/FireBlock.mapping b/mappings/net/minecraft/block/FireBlock.mapping index efa6c22962..f447bebaae 100644 --- a/mappings/net/minecraft/block/FireBlock.mapping +++ b/mappings/net/minecraft/block/FireBlock.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_2358 net/minecraft/block/FireBlock ARG 1 world ARG 2 pos METHOD method_10194 getBurnChance (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)I + ARG 1 world ARG 2 pos METHOD method_10196 trySpreadingFire (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ILjava/util/Random;I)V ARG 1 world diff --git a/mappings/net/minecraft/block/FungusBlock.mapping b/mappings/net/minecraft/block/FungusBlock.mapping index 23079faf89..c1dd4f78d8 100644 --- a/mappings/net/minecraft/block/FungusBlock.mapping +++ b/mappings/net/minecraft/block/FungusBlock.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_4771 net/minecraft/block/FungusBlock FIELD field_22134 SHAPE Lnet/minecraft/class_265; METHOD (Lnet/minecraft/class_4970$class_2251;Ljava/util/function/Supplier;)V ARG 1 settings + ARG 2 feature diff --git a/mappings/net/minecraft/block/HopperBlock.mapping b/mappings/net/minecraft/block/HopperBlock.mapping index c056205a55..fd0f57c0ec 100644 --- a/mappings/net/minecraft/block/HopperBlock.mapping +++ b/mappings/net/minecraft/block/HopperBlock.mapping @@ -2,19 +2,19 @@ CLASS net/minecraft/class_2377 net/minecraft/block/HopperBlock FIELD field_11120 DOWN_SHAPE Lnet/minecraft/class_265; FIELD field_11121 OUTSIDE_SHAPE Lnet/minecraft/class_265; FIELD field_11122 SOUTH_SHAPE Lnet/minecraft/class_265; - FIELD field_11123 NORTH_RAY_TRACE_SHAPE Lnet/minecraft/class_265; + FIELD field_11123 NORTH_RAYCAST_SHAPE Lnet/minecraft/class_265; FIELD field_11124 NORTH_SHAPE Lnet/minecraft/class_265; - FIELD field_11125 DOWN_RAY_TRACE_SHAPE Lnet/minecraft/class_265; + FIELD field_11125 DOWN_RAYCAST_SHAPE Lnet/minecraft/class_265; FIELD field_11126 ENABLED Lnet/minecraft/class_2746; FIELD field_11127 MIDDLE_SHAPE Lnet/minecraft/class_265; - FIELD field_11128 SOUTH_RAY_TRACE_SHAPE Lnet/minecraft/class_265; + FIELD field_11128 SOUTH_RAYCAST_SHAPE Lnet/minecraft/class_265; FIELD field_11129 FACING Lnet/minecraft/class_2753; FIELD field_11130 WEST_SHAPE Lnet/minecraft/class_265; FIELD field_11131 TOP_SHAPE Lnet/minecraft/class_265; FIELD field_11132 DEFAULT_SHAPE Lnet/minecraft/class_265; - FIELD field_11133 EAST_RAY_TRACE_SHAPE Lnet/minecraft/class_265; + FIELD field_11133 EAST_RAYCAST_SHAPE Lnet/minecraft/class_265; FIELD field_11134 EAST_SHAPE Lnet/minecraft/class_265; - FIELD field_11135 WEST_RAY_TRACE_SHAPE Lnet/minecraft/class_265; + FIELD field_11135 WEST_RAYCAST_SHAPE Lnet/minecraft/class_265; METHOD method_10217 updateEnabled (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/InfestedBlock.mapping b/mappings/net/minecraft/block/InfestedBlock.mapping index c10542695e..9aae3e4c52 100644 --- a/mappings/net/minecraft/block/InfestedBlock.mapping +++ b/mappings/net/minecraft/block/InfestedBlock.mapping @@ -13,4 +13,5 @@ CLASS net/minecraft/class_2384 net/minecraft/block/InfestedBlock ARG 0 regularBlock METHOD method_10271 getRegularBlock ()Lnet/minecraft/class_2248; METHOD method_24797 spawnSilverfish (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/JigsawBlock.mapping b/mappings/net/minecraft/block/JigsawBlock.mapping index 40d2f965d0..8e17f5ff93 100644 --- a/mappings/net/minecraft/block/JigsawBlock.mapping +++ b/mappings/net/minecraft/block/JigsawBlock.mapping @@ -4,4 +4,6 @@ CLASS net/minecraft/class_3748 net/minecraft/block/JigsawBlock ARG 0 info1 ARG 1 info2 METHOD method_26378 getFacing (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2350; + ARG 0 state METHOD method_26379 getRotation (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2350; + ARG 0 state diff --git a/mappings/net/minecraft/block/MapColor.mapping b/mappings/net/minecraft/block/MapColor.mapping new file mode 100644 index 0000000000..4194fd90c2 --- /dev/null +++ b/mappings/net/minecraft/block/MapColor.mapping @@ -0,0 +1,64 @@ +CLASS net/minecraft/class_3620 net/minecraft/block/MapColor + COMMENT Represents the surface color of a block when rendered from the {@link net.minecraft.client.render.MapRenderer}. + COMMENT Color names refer to a material or an object which refers to their vanilla Minecraft textures, not their real-world counterparts, eg. "emerald green". + COMMENT Names are in the form of either blockReference_baseColor or color. + FIELD field_15976 LIGHT_BLUE_GRAY Lnet/minecraft/class_3620; + FIELD field_15977 BROWN Lnet/minecraft/class_3620; + FIELD field_15978 GRAY Lnet/minecraft/class_3620; + FIELD field_15979 WHITE_GRAY Lnet/minecraft/class_3620; + FIELD field_15980 LAPIS_BLUE Lnet/minecraft/class_3620; + FIELD field_15981 TERRACOTTA_ORANGE Lnet/minecraft/class_3620; + FIELD field_15982 TERRACOTTA_RED Lnet/minecraft/class_3620; + FIELD field_15983 DIAMOND_BLUE Lnet/minecraft/class_3620; + FIELD field_15984 BLUE Lnet/minecraft/class_3620; + FIELD field_15985 TERRACOTTA_MAGENTA Lnet/minecraft/class_3620; + FIELD field_15986 PALE_YELLOW Lnet/minecraft/class_3620; + FIELD field_15987 ORANGE Lnet/minecraft/class_3620; + FIELD field_15988 TERRACOTTA_LIGHT_GRAY Lnet/minecraft/class_3620; + FIELD field_15989 TERRACOTTA_PINK Lnet/minecraft/class_3620; + FIELD field_15990 TERRACOTTA_CYAN Lnet/minecraft/class_3620; + FIELD field_15991 TERRACOTTA_LIGHT_BLUE Lnet/minecraft/class_3620; + FIELD field_15992 TERRACOTTA_BROWN Lnet/minecraft/class_3620; + FIELD field_15993 LIGHT_GRAY Lnet/minecraft/class_3620; + FIELD field_15994 GOLD Lnet/minecraft/class_3620; + FIELD field_15995 GREEN Lnet/minecraft/class_3620; + FIELD field_15996 OAK_TAN Lnet/minecraft/class_3620; + FIELD field_15997 LIME Lnet/minecraft/class_3620; + FIELD field_15998 MAGENTA Lnet/minecraft/class_3620; + FIELD field_15999 PALE_GREEN Lnet/minecraft/class_3620; + FIELD field_16000 DIRT_BROWN Lnet/minecraft/class_3620; + FIELD field_16001 EMERALD_GREEN Lnet/minecraft/class_3620; + FIELD field_16002 BRIGHT_RED Lnet/minecraft/class_3620; + FIELD field_16003 TERRACOTTA_WHITE Lnet/minecraft/class_3620; + FIELD field_16004 DARK_GREEN Lnet/minecraft/class_3620; + FIELD field_16005 IRON_GRAY Lnet/minecraft/class_3620; + FIELD field_16006 COLORS [Lnet/minecraft/class_3620; + FIELD field_16007 TERRACOTTA_BLACK Lnet/minecraft/class_3620; + FIELD field_16008 CLEAR Lnet/minecraft/class_3620; + FIELD field_16009 BLACK Lnet/minecraft/class_3620; + FIELD field_16010 YELLOW Lnet/minecraft/class_3620; + FIELD field_16011 color I + FIELD field_16012 DARK_RED Lnet/minecraft/class_3620; + FIELD field_16013 TERRACOTTA_YELLOW Lnet/minecraft/class_3620; + FIELD field_16014 PURPLE Lnet/minecraft/class_3620; + FIELD field_16015 TERRACOTTA_BLUE Lnet/minecraft/class_3620; + FIELD field_16016 PALE_PURPLE Lnet/minecraft/class_3620; + FIELD field_16017 SPRUCE_BROWN Lnet/minecraft/class_3620; + FIELD field_16018 TERRACOTTA_LIME Lnet/minecraft/class_3620; + FIELD field_16019 WATER_BLUE Lnet/minecraft/class_3620; + FIELD field_16020 RED Lnet/minecraft/class_3620; + FIELD field_16021 id I + FIELD field_16022 WHITE Lnet/minecraft/class_3620; + FIELD field_16023 STONE_GRAY Lnet/minecraft/class_3620; + FIELD field_16024 LIGHT_BLUE Lnet/minecraft/class_3620; + FIELD field_16025 OFF_WHITE Lnet/minecraft/class_3620; + FIELD field_16026 CYAN Lnet/minecraft/class_3620; + FIELD field_16027 TERRACOTTA_GRAY Lnet/minecraft/class_3620; + FIELD field_16028 TERRACOTTA_GREEN Lnet/minecraft/class_3620; + FIELD field_16029 TERRACOTTA_PURPLE Lnet/minecraft/class_3620; + FIELD field_16030 PINK Lnet/minecraft/class_3620; + METHOD (II)V + ARG 1 id + ARG 2 color + METHOD method_15820 getRenderColor (I)I + ARG 1 shade diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping index 848df425c7..fdbb4da8ab 100644 --- a/mappings/net/minecraft/block/Material.mapping +++ b/mappings/net/minecraft/block/Material.mapping @@ -11,12 +11,12 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material FIELD field_15919 PORTAL Lnet/minecraft/class_3614; COMMENT Material for the various portal blocks. FIELD field_15920 WATER Lnet/minecraft/class_3614; - FIELD field_15921 UNUSED_PLANT Lnet/minecraft/class_3614; - COMMENT Not in use, but has foliage color. + FIELD field_15921 MOSS_BLOCK Lnet/minecraft/class_3614; + COMMENT Material for full sized moss blocks. Unused in this version. FIELD field_15922 LAVA Lnet/minecraft/class_3614; FIELD field_15923 LEAVES Lnet/minecraft/class_3614; - FIELD field_15924 SUPPORTED Lnet/minecraft/class_3614; - COMMENT Material for blocks that require a supporting block such as redstone components, torches, flower pots, and skulls. + FIELD field_15924 DECORATION Lnet/minecraft/class_3614; + COMMENT Material for decoration blocks such as redstone components, torches, flower pots, rails, buttons, and skulls. FIELD field_15925 CACTUS Lnet/minecraft/class_3614; FIELD field_15926 REPLACEABLE_UNDERWATER_PLANT Lnet/minecraft/class_3614; FIELD field_15927 STRUCTURE_VOID Lnet/minecraft/class_3614; @@ -83,6 +83,7 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material ARG 5 blocksLight ARG 6 breakByHand ARG 7 burnable + ARG 8 pistonBehavior METHOD method_15797 isLiquid ()Z METHOD method_15798 getPistonBehavior ()Lnet/minecraft/class_3619; METHOD method_15799 isSolid ()Z diff --git a/mappings/net/minecraft/block/MaterialColor.mapping b/mappings/net/minecraft/block/MaterialColor.mapping deleted file mode 100644 index fcf8e2ce9f..0000000000 --- a/mappings/net/minecraft/block/MaterialColor.mapping +++ /dev/null @@ -1,61 +0,0 @@ -CLASS net/minecraft/class_3620 net/minecraft/block/MaterialColor - FIELD field_15976 CLAY Lnet/minecraft/class_3620; - FIELD field_15977 BROWN Lnet/minecraft/class_3620; - FIELD field_15978 GRAY Lnet/minecraft/class_3620; - FIELD field_15979 WEB Lnet/minecraft/class_3620; - FIELD field_15980 LAPIS Lnet/minecraft/class_3620; - FIELD field_15981 ORANGE_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15982 RED_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15983 DIAMOND Lnet/minecraft/class_3620; - FIELD field_15984 BLUE Lnet/minecraft/class_3620; - FIELD field_15985 MAGENTA_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15986 SAND Lnet/minecraft/class_3620; - FIELD field_15987 ORANGE Lnet/minecraft/class_3620; - FIELD field_15988 LIGHT_GRAY_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15989 PINK_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15990 CYAN_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15991 LIGHT_BLUE_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15992 BROWN_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15993 LIGHT_GRAY Lnet/minecraft/class_3620; - FIELD field_15994 GOLD Lnet/minecraft/class_3620; - FIELD field_15995 GREEN Lnet/minecraft/class_3620; - FIELD field_15996 WOOD Lnet/minecraft/class_3620; - FIELD field_15997 LIME Lnet/minecraft/class_3620; - FIELD field_15998 MAGENTA Lnet/minecraft/class_3620; - FIELD field_15999 GRASS Lnet/minecraft/class_3620; - FIELD field_16000 DIRT Lnet/minecraft/class_3620; - FIELD field_16001 EMERALD Lnet/minecraft/class_3620; - FIELD field_16002 LAVA Lnet/minecraft/class_3620; - FIELD field_16003 WHITE_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16004 FOLIAGE Lnet/minecraft/class_3620; - FIELD field_16005 IRON Lnet/minecraft/class_3620; - FIELD field_16006 COLORS [Lnet/minecraft/class_3620; - FIELD field_16007 BLACK_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16008 CLEAR Lnet/minecraft/class_3620; - FIELD field_16009 BLACK Lnet/minecraft/class_3620; - FIELD field_16010 YELLOW Lnet/minecraft/class_3620; - FIELD field_16011 color I - FIELD field_16012 NETHER Lnet/minecraft/class_3620; - FIELD field_16013 YELLOW_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16014 PURPLE Lnet/minecraft/class_3620; - FIELD field_16015 BLUE_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16016 ICE Lnet/minecraft/class_3620; - FIELD field_16017 SPRUCE Lnet/minecraft/class_3620; - FIELD field_16018 LIME_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16019 WATER Lnet/minecraft/class_3620; - FIELD field_16020 RED Lnet/minecraft/class_3620; - FIELD field_16021 id I - FIELD field_16022 WHITE Lnet/minecraft/class_3620; - FIELD field_16023 STONE Lnet/minecraft/class_3620; - FIELD field_16024 LIGHT_BLUE Lnet/minecraft/class_3620; - FIELD field_16025 QUARTZ Lnet/minecraft/class_3620; - FIELD field_16026 CYAN Lnet/minecraft/class_3620; - FIELD field_16027 GRAY_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16028 GREEN_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16029 PURPLE_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16030 PINK Lnet/minecraft/class_3620; - METHOD (II)V - ARG 1 id - ARG 2 color - METHOD method_15820 getRenderColor (I)I - ARG 1 shade diff --git a/mappings/net/minecraft/block/MushroomPlantBlock.mapping b/mappings/net/minecraft/block/MushroomPlantBlock.mapping index a09e4bad86..3968dd2e4e 100644 --- a/mappings/net/minecraft/block/MushroomPlantBlock.mapping +++ b/mappings/net/minecraft/block/MushroomPlantBlock.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2420 net/minecraft/block/MushroomPlantBlock FIELD field_11304 SHAPE Lnet/minecraft/class_265; METHOD method_10349 trySpawningBigMushroom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)Z + ARG 1 world ARG 2 pos ARG 3 state ARG 4 random diff --git a/mappings/net/minecraft/block/PaneBlock.mapping b/mappings/net/minecraft/block/PaneBlock.mapping index f3091f48f2..9474c0fdb4 100644 --- a/mappings/net/minecraft/block/PaneBlock.mapping +++ b/mappings/net/minecraft/block/PaneBlock.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_2389 net/minecraft/block/PaneBlock METHOD method_10281 connectsTo (Lnet/minecraft/class_2680;Z)Z ARG 1 state + ARG 2 sideSolidFullSquare diff --git a/mappings/net/minecraft/block/PistonHeadBlock.mapping b/mappings/net/minecraft/block/PistonHeadBlock.mapping index 54fc46cf19..64930353a1 100644 --- a/mappings/net/minecraft/block/PistonHeadBlock.mapping +++ b/mappings/net/minecraft/block/PistonHeadBlock.mapping @@ -20,3 +20,5 @@ CLASS net/minecraft/class_2671 net/minecraft/block/PistonHeadBlock FIELD field_12230 UP_HEAD_SHAPE Lnet/minecraft/class_265; FIELD field_12231 SHORT_UP_ARM_SHAPE Lnet/minecraft/class_265; METHOD method_11520 getHeadShape (Lnet/minecraft/class_2350;Z)Lnet/minecraft/class_265; + ARG 0 direction + ARG 1 shortHead diff --git a/mappings/net/minecraft/block/PoweredRailBlock.mapping b/mappings/net/minecraft/block/PoweredRailBlock.mapping index ce3e517a74..f15d41fc8c 100644 --- a/mappings/net/minecraft/block/PoweredRailBlock.mapping +++ b/mappings/net/minecraft/block/PoweredRailBlock.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_2442 net/minecraft/block/PoweredRailBlock ARG 1 world ARG 2 pos ARG 3 state - ARG 4 boolean4 ARG 5 distance METHOD method_10414 isPoweredByOtherRails (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ZILnet/minecraft/class_2768;)Z ARG 1 world diff --git a/mappings/net/minecraft/block/RedstoneWireBlock.mapping b/mappings/net/minecraft/block/RedstoneWireBlock.mapping index 49c3ef1c31..237976bb20 100644 --- a/mappings/net/minecraft/block/RedstoneWireBlock.mapping +++ b/mappings/net/minecraft/block/RedstoneWireBlock.mapping @@ -9,6 +9,9 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock FIELD field_24413 DOT_SHAPE Lnet/minecraft/class_265; FIELD field_24733 dotState Lnet/minecraft/class_2680; METHOD method_10477 getRenderConnectionType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2773; + ARG 1 world + ARG 2 pos + ARG 3 direction METHOD method_10479 updateNeighbors (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos @@ -25,7 +28,7 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock ARG 1 state METHOD method_10487 getWireColor (I)I ARG 0 powerLevel - METHOD method_27840 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + METHOD method_27840 getPlacementState (Lnet/minecraft/class_1922;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 1 world ARG 2 state ARG 3 pos @@ -36,10 +39,10 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock ARG 1 world ARG 2 state ARG 3 pos - METHOD method_27844 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + METHOD method_27844 updateOffsetNeighbors (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos - METHOD method_27845 (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; + METHOD method_27845 getShapeForState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; ARG 1 state METHOD method_27846 isFullyConnected (Lnet/minecraft/class_2680;)Z ARG 0 state @@ -51,8 +54,10 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock ARG 1 world ARG 2 pos ARG 3 floor - METHOD method_28482 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V + METHOD method_28482 updateForNewState (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 world ARG 2 pos + ARG 3 oldState + ARG 4 newState METHOD method_28483 isNotConnected (Lnet/minecraft/class_2680;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping index 3fdc61ade3..80f7845e10 100644 --- a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping +++ b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4969 net/minecraft/block/RespawnAnchorBlock FIELD field_23153 CHARGES Lnet/minecraft/class_2758; METHOD method_26156 findRespawnPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 0 entity + ARG 1 world ARG 2 pos METHOD method_26157 getLightLevel (Lnet/minecraft/class_2680;I)I ARG 0 state @@ -11,6 +12,7 @@ CLASS net/minecraft/class_4969 net/minecraft/block/RespawnAnchorBlock ARG 1 pos ARG 2 state METHOD method_27353 isNether (Lnet/minecraft/class_1937;)Z + ARG 0 world METHOD method_29289 isChargeItem (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_29290 canCharge (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/block/SaplingBlock.mapping b/mappings/net/minecraft/block/SaplingBlock.mapping index a11d7d9bb2..ff682b5bc3 100644 --- a/mappings/net/minecraft/block/SaplingBlock.mapping +++ b/mappings/net/minecraft/block/SaplingBlock.mapping @@ -6,3 +6,7 @@ CLASS net/minecraft/class_2473 net/minecraft/block/SaplingBlock ARG 1 generator ARG 2 settings METHOD method_10507 generate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)V + ARG 1 world + ARG 2 pos + ARG 3 state + ARG 4 random diff --git a/mappings/net/minecraft/block/SeaPickleBlock.mapping b/mappings/net/minecraft/block/SeaPickleBlock.mapping index 4361e1f2cb..f7cb9116dc 100644 --- a/mappings/net/minecraft/block/SeaPickleBlock.mapping +++ b/mappings/net/minecraft/block/SeaPickleBlock.mapping @@ -6,3 +6,4 @@ CLASS net/minecraft/class_2472 net/minecraft/block/SeaPickleBlock FIELD field_11474 FOUR_PICKLES_SHAPE Lnet/minecraft/class_265; FIELD field_11475 WATERLOGGED Lnet/minecraft/class_2746; METHOD method_10506 isDry (Lnet/minecraft/class_2680;)Z + ARG 0 state diff --git a/mappings/net/minecraft/block/ShapeContext.mapping b/mappings/net/minecraft/block/ShapeContext.mapping index 78fed65a56..fc8a9ee3f6 100644 --- a/mappings/net/minecraft/block/ShapeContext.mapping +++ b/mappings/net/minecraft/block/ShapeContext.mapping @@ -9,6 +9,6 @@ CLASS net/minecraft/class_3726 net/minecraft/block/ShapeContext ARG 0 entity METHOD method_17785 isHolding (Lnet/minecraft/class_1792;)Z ARG 1 item - METHOD method_27866 (Lnet/minecraft/class_3610;Lnet/minecraft/class_3609;)Z + METHOD method_27866 canWalkOnFluid (Lnet/minecraft/class_3610;Lnet/minecraft/class_3609;)Z ARG 1 state ARG 2 fluid diff --git a/mappings/net/minecraft/block/SpreadableBlock.mapping b/mappings/net/minecraft/block/SpreadableBlock.mapping index 3540f64f00..4d745f59c0 100644 --- a/mappings/net/minecraft/block/SpreadableBlock.mapping +++ b/mappings/net/minecraft/block/SpreadableBlock.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2500 net/minecraft/block/SpreadableBlock METHOD method_10613 canSpread (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 0 state + ARG 1 world ARG 2 pos METHOD method_10614 canSurvive (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z ARG 0 state + ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/StairsBlock.mapping b/mappings/net/minecraft/block/StairsBlock.mapping index 5a878160bb..bb4044a2fa 100644 --- a/mappings/net/minecraft/block/StairsBlock.mapping +++ b/mappings/net/minecraft/block/StairsBlock.mapping @@ -44,7 +44,7 @@ CLASS net/minecraft/class_2510 net/minecraft/block/StairsBlock ARG 2 pos METHOD method_10676 isStairs (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_10678 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + METHOD method_10678 isDifferentOrientation (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 0 state ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/StructureBlock.mapping b/mappings/net/minecraft/block/StructureBlock.mapping index 38d6a6fe28..3bc9befe1b 100644 --- a/mappings/net/minecraft/block/StructureBlock.mapping +++ b/mappings/net/minecraft/block/StructureBlock.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2515 net/minecraft/block/StructureBlock FIELD field_11586 MODE Lnet/minecraft/class_2754; METHOD method_10703 doAction (Lnet/minecraft/class_3218;Lnet/minecraft/class_2633;)V + ARG 1 world + ARG 2 blockEntity diff --git a/mappings/net/minecraft/block/TargetBlock.mapping b/mappings/net/minecraft/block/TargetBlock.mapping index 9a8e7c32a8..1973c5c3da 100644 --- a/mappings/net/minecraft/block/TargetBlock.mapping +++ b/mappings/net/minecraft/block/TargetBlock.mapping @@ -9,5 +9,8 @@ CLASS net/minecraft/class_4850 net/minecraft/block/TargetBlock METHOD method_24858 trigger (Lnet/minecraft/class_1936;Lnet/minecraft/class_2680;Lnet/minecraft/class_3965;Lnet/minecraft/class_1297;)I ARG 0 world ARG 1 state + ARG 2 hitResult + ARG 3 entity METHOD method_24859 calculatePower (Lnet/minecraft/class_3965;Lnet/minecraft/class_243;)I + ARG 0 hitResult ARG 1 pos diff --git a/mappings/net/minecraft/block/TurtleEggBlock.mapping b/mappings/net/minecraft/block/TurtleEggBlock.mapping index a5708ec23a..d67a97473f 100644 --- a/mappings/net/minecraft/block/TurtleEggBlock.mapping +++ b/mappings/net/minecraft/block/TurtleEggBlock.mapping @@ -3,7 +3,9 @@ CLASS net/minecraft/class_2542 net/minecraft/block/TurtleEggBlock FIELD field_11710 EGGS Lnet/minecraft/class_2758; FIELD field_11711 HATCH Lnet/minecraft/class_2758; FIELD field_11712 SMALL_SHAPE Lnet/minecraft/class_265; - METHOD method_10831 isSand (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + METHOD method_10831 isSandBelow (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos METHOD method_10832 shouldHatchProgress (Lnet/minecraft/class_1937;)Z ARG 1 world METHOD method_10833 breakEgg (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V @@ -15,3 +17,5 @@ CLASS net/minecraft/class_2542 net/minecraft/block/TurtleEggBlock ARG 3 entity ARG 4 inverseChance METHOD method_10835 breaksEgg (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;)Z + ARG 1 world + ARG 2 entity diff --git a/mappings/net/minecraft/block/WallMountedBlock.mapping b/mappings/net/minecraft/block/WallMountedBlock.mapping index 58196a65db..d7f6afd9d6 100644 --- a/mappings/net/minecraft/block/WallMountedBlock.mapping +++ b/mappings/net/minecraft/block/WallMountedBlock.mapping @@ -3,5 +3,6 @@ CLASS net/minecraft/class_2341 net/minecraft/block/WallMountedBlock METHOD method_10119 getDirection (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2350; ARG 0 state METHOD method_20046 canPlaceAt (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 0 world ARG 1 pos ARG 2 direction diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index 1fe01b5728..eef42c1341 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn ARG 1 fuel METHOD method_11201 isBurning ()Z METHOD method_11202 addFuel (Ljava/util/Map;Lnet/minecraft/class_1935;I)V + ARG 0 fuelTimes ARG 1 item ARG 2 fuelTime METHOD method_11203 craftRecipe (Lnet/minecraft/class_1860;)V @@ -35,4 +36,6 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn METHOD method_17763 dropExperience (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_26395 isNonFlammableWood (Lnet/minecraft/class_1792;)Z + COMMENT Returns whether the provided {@code item} is in the {@link + COMMENT net.minecraft.tag.ItemTags#NON_FLAMMABLE_WOOD non_flammable_wood} tag. ARG 0 item diff --git a/mappings/net/minecraft/block/entity/BannerPattern.mapping b/mappings/net/minecraft/block/entity/BannerPattern.mapping index 0bc955dafe..c33c93789f 100644 --- a/mappings/net/minecraft/block/entity/BannerPattern.mapping +++ b/mappings/net/minecraft/block/entity/BannerPattern.mapping @@ -10,11 +10,13 @@ CLASS net/minecraft/class_2582 net/minecraft/block/entity/BannerPattern METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Z)V ARG 3 name ARG 4 id + ARG 5 hasPatternItem METHOD method_10945 getId ()Ljava/lang/String; METHOD method_10946 byId (Ljava/lang/String;)Lnet/minecraft/class_2582; ARG 0 id METHOD method_10947 getName ()Ljava/lang/String; METHOD method_22536 getSpriteId (Z)Lnet/minecraft/class_2960; + ARG 1 banner CLASS class_3750 Patterns FIELD field_16548 entries Ljava/util/List; METHOD method_16375 toTag ()Lnet/minecraft/class_2499; diff --git a/mappings/net/minecraft/block/entity/BarrelBlockEntity.mapping b/mappings/net/minecraft/block/entity/BarrelBlockEntity.mapping index c84017349f..22529bb531 100644 --- a/mappings/net/minecraft/block/entity/BarrelBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BarrelBlockEntity.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_3719 net/minecraft/block/entity/BarrelBlockEntity METHOD (Lnet/minecraft/class_2591;)V ARG 1 type METHOD method_17764 playSound (Lnet/minecraft/class_2680;Lnet/minecraft/class_3414;)V + ARG 1 state + ARG 2 soundEvent METHOD method_18318 setOpen (Lnet/minecraft/class_2680;Z)V ARG 1 state ARG 2 open diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index 12047383ed..f043714559 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity METHOD method_10934 getPotionEffectById (I)Lnet/minecraft/class_1291; ARG 0 id METHOD method_10936 setCustomName (Lnet/minecraft/class_2561;)V + ARG 1 customName METHOD method_10937 getBeamSegments ()Ljava/util/List; METHOD method_10938 playSound (Lnet/minecraft/class_3414;)V METHOD method_10939 getLevel ()I diff --git a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping index aee39e1929..faae6354c7 100644 --- a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping @@ -11,8 +11,10 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity METHOD method_21850 angerBees (Lnet/minecraft/class_1657;Lnet/minecraft/class_2680;Lnet/minecraft/class_4482$class_4484;)V ARG 1 player ARG 2 state + ARG 3 beeState METHOD method_21852 tryReleaseBee (Lnet/minecraft/class_2680;Lnet/minecraft/class_4482$class_4484;)Ljava/util/List; ARG 1 state + ARG 2 beeState METHOD method_21854 (Lnet/minecraft/class_2680;Ljava/util/List;Lnet/minecraft/class_4482$class_4484;Lnet/minecraft/class_4482$class_4483;)Z ARG 4 bee METHOD method_21855 releaseBee (Lnet/minecraft/class_2680;Lnet/minecraft/class_4482$class_4483;Ljava/util/List;Lnet/minecraft/class_4482$class_4484;)Z diff --git a/mappings/net/minecraft/block/entity/BellBlockEntity.mapping b/mappings/net/minecraft/block/entity/BellBlockEntity.mapping index 35c641e077..f0d583ae2a 100644 --- a/mappings/net/minecraft/block/entity/BellBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BellBlockEntity.mapping @@ -7,13 +7,16 @@ CLASS net/minecraft/class_3721 net/minecraft/block/entity/BellBlockEntity FIELD field_19157 resonating Z FIELD field_19158 resonateTime I METHOD method_17031 activate (Lnet/minecraft/class_2350;)V + COMMENT Rings the bell in a given direction. ARG 1 direction METHOD method_20218 applyParticlesToRaiders (Lnet/minecraft/class_1937;)V ARG 1 world METHOD method_20219 notifyMemoriesOfBell ()V + COMMENT Makes living entities within 48 blocks remember that they heard a bell at the current world time. METHOD method_20518 isRaiderEntity (Lnet/minecraft/class_1309;)Z ARG 1 entity METHOD method_20520 applyGlowToEntity (Lnet/minecraft/class_1309;)V + COMMENT Gives the {@link net.minecraft.entity.effect.StatusEffects#GLOWING} status effect to the given entity for 3 seconds (60 ticks). ARG 1 entity METHOD method_20521 applyGlowToRaiders (Lnet/minecraft/class_1937;)V ARG 1 world diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 13d56d5d9c..bc4a480eeb 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -13,12 +13,13 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_10998 setPos (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_10999 writeIdentifyingData (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_11000 resetBlock ()V METHOD method_11001 applyMirror (Lnet/minecraft/class_2415;)V ARG 1 mirror METHOD method_11002 hasWorld ()Z METHOD method_11003 populateCrashReport (Lnet/minecraft/class_129;)V + ARG 1 crashReportSection METHOD method_11004 onSyncedBlockEvent (II)Z ARG 1 type ARG 2 data @@ -26,8 +27,8 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity ARG 0 state ARG 1 tag METHOD method_11006 getRenderDistance ()D - METHOD method_11007 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + METHOD method_11007 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt METHOD method_11009 setLocation (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos @@ -43,6 +44,6 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_11016 getPos ()Lnet/minecraft/class_2338; METHOD method_11017 getType ()Lnet/minecraft/class_2591; METHOD method_16886 toUpdatePacket ()Lnet/minecraft/class_2622; - METHOD method_16887 toInitialChunkDataTag ()Lnet/minecraft/class_2487; + METHOD method_16887 toInitialChunkDataNbt ()Lnet/minecraft/class_2487; METHOD method_20525 markInvalid ()V METHOD method_5431 markDirty ()V diff --git a/mappings/net/minecraft/block/entity/BlockEntityType.mapping b/mappings/net/minecraft/block/entity/BlockEntityType.mapping index f54e6fd4a6..702949c2f2 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityType.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityType.mapping @@ -8,8 +8,11 @@ CLASS net/minecraft/class_2591 net/minecraft/block/entity/BlockEntityType ARG 2 blocks ARG 3 type METHOD method_11030 create (Ljava/lang/String;Lnet/minecraft/class_2591$class_2592;)Lnet/minecraft/class_2591; + ARG 0 id + ARG 1 builder METHOD method_11032 instantiate ()Lnet/minecraft/class_2586; METHOD method_11033 getId (Lnet/minecraft/class_2591;)Lnet/minecraft/class_2960; + ARG 0 type METHOD method_20526 supports (Lnet/minecraft/class_2248;)Z ARG 1 block METHOD method_24182 get (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2586; diff --git a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping index 2fb41db815..64d21c7186 100644 --- a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_3924 net/minecraft/block/entity/CampfireBlockEntity METHOD method_17505 getItemsBeingCooked ()Lnet/minecraft/class_2371; METHOD method_17506 spawnItemsBeingCooked ()V METHOD method_17507 saveInitialChunkData (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_17508 updateItemsBeingCooked ()V METHOD method_17509 spawnSmokeParticles ()V METHOD method_17510 updateListeners ()V diff --git a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping index de25bb8321..fe79778623 100644 --- a/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_2643 net/minecraft/block/entity/EndGatewayBlockEntity ARG 0 world ARG 1 pos ARG 2 searchRadius + ARG 3 force METHOD method_11411 startTeleportCooldown ()V METHOD method_11412 getCooldownBeamHeight (F)F ARG 1 tickDelta diff --git a/mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping b/mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping index 2caa821db2..e366165875 100644 --- a/mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping @@ -4,5 +4,6 @@ CLASS net/minecraft/class_2611 net/minecraft/block/entity/EnderChestBlockEntity FIELD field_12006 viewerCount I FIELD field_12007 animationProgress F METHOD method_11218 canPlayerUse (Lnet/minecraft/class_1657;)Z + ARG 1 player METHOD method_11219 onOpen ()V METHOD method_11220 onClose ()V diff --git a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping index 5187667de6..69b6946905 100644 --- a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping @@ -24,6 +24,8 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity METHOD method_11248 getInputInventory (Lnet/minecraft/class_2615;)Lnet/minecraft/class_1263; ARG 0 hopper METHOD method_11250 getInventoryAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1263; + ARG 0 world + ARG 1 pos METHOD method_11251 getInventoryAt (Lnet/minecraft/class_1937;DDD)Lnet/minecraft/class_1263; ARG 0 world ARG 1 x @@ -48,7 +50,8 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity ARG 0 inv ARG 1 facing METHOD method_11258 isInventoryFull (Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;)Z - ARG 1 inv + ARG 0 inventory + ARG 1 direction METHOD method_11260 transfer (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;Lnet/minecraft/class_2350;)Lnet/minecraft/class_1799; ARG 0 from ARG 1 to diff --git a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping index a538c903ce..2a3b160618 100644 --- a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping @@ -5,10 +5,12 @@ CLASS net/minecraft/class_2621 net/minecraft/block/entity/LootableContainerBlock ARG 1 list METHOD method_11282 getInvStackList ()Lnet/minecraft/class_2371; METHOD method_11283 deserializeLootTable (Lnet/minecraft/class_2487;)Z + ARG 1 nbt METHOD method_11285 setLootTable (Lnet/minecraft/class_2960;J)V ARG 1 id ARG 2 seed METHOD method_11286 serializeLootTable (Lnet/minecraft/class_2487;)Z + ARG 1 nbt METHOD method_11287 setLootTable (Lnet/minecraft/class_1922;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V ARG 0 world ARG 1 random diff --git a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping index 33960d8068..27ec5e9e83 100644 --- a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping @@ -12,17 +12,18 @@ CLASS net/minecraft/class_2627 net/minecraft/block/entity/ShulkerBoxBlockEntity METHOD method_11311 getBoundingBox (Lnet/minecraft/class_2350;)Lnet/minecraft/class_238; ARG 1 openDirection METHOD method_11312 getAnimationProgress (F)F + ARG 1 delta METHOD method_11313 getAnimationStage ()Lnet/minecraft/class_2627$class_2628; METHOD method_11314 getBoundingBox (Lnet/minecraft/class_2680;)Lnet/minecraft/class_238; ARG 1 state METHOD method_11315 getCollisionBox (Lnet/minecraft/class_2350;)Lnet/minecraft/class_238; ARG 1 facing METHOD method_11316 pushEntities ()V - METHOD method_11317 serializeInventory (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + METHOD method_11317 writeInventoryNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt METHOD method_11318 updateAnimation ()V - METHOD method_11319 deserializeInventory (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_11319 readInventoryNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_11320 getColor ()Lnet/minecraft/class_1767; METHOD method_20047 updateNeighborStates ()V METHOD method_27093 suffocates ()Z diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping index 348ea9c548..d6132e98ee 100644 --- a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity FIELD field_12046 editor Lnet/minecraft/class_1657; FIELD field_12048 editable Z - FIELD field_12049 textBeingEdited [Lnet/minecraft/class_5481; - FIELD field_12050 text [Lnet/minecraft/class_2561; + FIELD field_12049 textsBeingEdited [Lnet/minecraft/class_5481; + FIELD field_12050 texts [Lnet/minecraft/class_2561; FIELD field_16419 textColor Lnet/minecraft/class_1767; METHOD method_11299 setTextOnRow (ILnet/minecraft/class_2561;)V ARG 1 row @@ -12,6 +12,7 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity METHOD method_11301 onActivate (Lnet/minecraft/class_1657;)Z ARG 1 player METHOD method_11303 setEditable (Z)V + ARG 1 editable METHOD method_11304 getCommandSource (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2168; ARG 1 player METHOD method_11305 getEditor ()Lnet/minecraft/class_1657; diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping index 5abe16d64d..1c0e558320 100644 --- a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping @@ -4,7 +4,8 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity FIELD field_12087 owner Lcom/mojang/authlib/GameProfile; FIELD field_12088 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD field_12089 userCache Lnet/minecraft/class_3312; - METHOD method_11333 setOwnerAndType (Lcom/mojang/authlib/GameProfile;)V + METHOD method_11333 setOwner (Lcom/mojang/authlib/GameProfile;)V + ARG 1 owner METHOD method_11334 getOwner ()Lcom/mojang/authlib/GameProfile; METHOD method_11335 loadProperties (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; ARG 0 profile diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index 41672e1d47..914bf7041f 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt METHOD method_11343 setStructureName (Ljava/lang/String;)V ARG 1 name METHOD method_11344 setStructureName (Lnet/minecraft/class_2960;)V + ARG 1 structureName METHOD method_11345 getMirror ()Lnet/minecraft/class_2415; METHOD method_11346 getIntegrity ()F METHOD method_11347 setShowAir (Z)V @@ -48,6 +49,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt METHOD method_11366 saveStructure (Z)Z METHOD method_11367 shouldIgnoreEntities ()Z METHOD method_11368 loadStructure (Lnet/minecraft/class_3218;Z)Z + ARG 1 world METHOD method_11369 findStructureBlockEntities (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Ljava/util/List; ARG 1 pos1 ARG 2 pos2 @@ -60,6 +62,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt METHOD method_11374 getMode ()Lnet/minecraft/class_2776; METHOD method_11375 shouldShowAir ()Z METHOD method_11376 loadStructure (Lnet/minecraft/class_3218;)Z + ARG 1 world METHOD method_11377 setSize (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_11378 setOffset (Lnet/minecraft/class_2338;)V @@ -78,5 +81,6 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt METHOD method_20048 createRandom (J)Ljava/util/Random; ARG 0 seed METHOD method_21864 place (Lnet/minecraft/class_3218;ZLnet/minecraft/class_3499;)Z + ARG 1 world METHOD method_21865 getStructurePath ()Ljava/lang/String; CLASS class_2634 Action diff --git a/mappings/net/minecraft/block/piston/PistonHandler.mapping b/mappings/net/minecraft/block/piston/PistonHandler.mapping index 694d2d69ea..d01af39578 100644 --- a/mappings/net/minecraft/block/piston/PistonHandler.mapping +++ b/mappings/net/minecraft/block/piston/PistonHandler.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_2674 net/minecraft/block/piston/PistonHandler ARG 4 retracted METHOD method_11536 getBrokenBlocks ()Ljava/util/List; METHOD method_11537 calculatePush ()Z - METHOD method_11538 canMoveAdjacentBlock (Lnet/minecraft/class_2338;)Z + METHOD method_11538 tryMoveAdjacentBlock (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_11539 setMovedBlocks (II)V ARG 1 from diff --git a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping index 3182b566f6..11bc9948e7 100644 --- a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping @@ -6,4 +6,12 @@ CLASS net/minecraft/class_2650 net/minecraft/block/sapling/LargeTreeSaplingGener ARG 3 x ARG 4 z METHOD method_11443 createLargeTreeFeature (Ljava/util/Random;)Lnet/minecraft/class_2975; + ARG 1 random METHOD method_11444 generateLargeTree (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;II)Z + ARG 1 world + ARG 2 chunkGenerator + ARG 3 pos + ARG 4 state + ARG 5 random + ARG 6 x + ARG 7 z diff --git a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping index 0e522ee392..9dd6557d1b 100644 --- a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping @@ -1,3 +1,10 @@ CLASS net/minecraft/class_2647 net/minecraft/block/sapling/SaplingGenerator METHOD method_11430 createTreeFeature (Ljava/util/Random;Z)Lnet/minecraft/class_2975; + ARG 1 random + ARG 2 bees METHOD method_11431 generate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)Z + ARG 1 world + ARG 2 chunkGenerator + ARG 3 pos + ARG 4 state + ARG 5 random diff --git a/mappings/net/minecraft/client/Keyboard.mapping b/mappings/net/minecraft/client/Keyboard.mapping index 0ce14d5fa0..83192c2ee1 100644 --- a/mappings/net/minecraft/client/Keyboard.mapping +++ b/mappings/net/minecraft/client/Keyboard.mapping @@ -9,10 +9,16 @@ CLASS net/minecraft/class_309 net/minecraft/client/Keyboard METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1455 setClipboard (Ljava/lang/String;)V + ARG 1 clipboard METHOD method_1456 debugError (Ljava/lang/String;[Ljava/lang/Object;)V + ARG 1 key + ARG 2 args METHOD method_1457 onChar (JII)V ARG 1 window + ARG 4 modifiers METHOD method_1459 debugWarn (Ljava/lang/String;[Ljava/lang/Object;)V + ARG 1 key + ARG 2 args METHOD method_1460 getClipboard ()Ljava/lang/String; METHOD method_1461 (IJ)V ARG 1 error @@ -24,15 +30,17 @@ CLASS net/minecraft/class_309 net/minecraft/client/Keyboard ARG 1 window ARG 3 key ARG 4 scancode + ARG 6 modifiers METHOD method_1468 processF3 (I)Z ARG 1 key METHOD method_1469 copyEntity (Lnet/minecraft/class_2960;Lnet/minecraft/class_243;Lnet/minecraft/class_2487;)V ARG 1 id ARG 2 pos - ARG 3 tag + ARG 3 nbt METHOD method_1472 setup (J)V + ARG 1 window METHOD method_1474 pollDebugCrash ()V METHOD method_1475 copyBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)V ARG 1 state ARG 2 pos - ARG 3 tag + ARG 3 nbt diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 60bc3bdc97..15ef2c1c34 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -1,4 +1,44 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient + COMMENT Represents a logical Minecraft client. + COMMENT The logical Minecraft client is responsible for rendering, sound playback and control input. + COMMENT The Minecraft client also manages connections to a logical server which may be the client's {@link net.minecraft.server.integrated.IntegratedServer} or a remote server. + COMMENT The Minecraft client instance may be obtained using {@link MinecraftClient#getInstance()}. + COMMENT + COMMENT

Rendering on a Minecraft client is split into several facilities. + COMMENT The primary entrypoint for rendering is {@link net.minecraft.client.render.GameRenderer#render(float, long, boolean)}. + COMMENT

+ COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT
Rendering facilities
Thing to render Rendering facility
World {@link net.minecraft.client.render.WorldRenderer}
Blocks and Fluids {@link net.minecraft.client.render.block.BlockRenderManager}
Entities {@link net.minecraft.client.render.entity.EntityRenderDispatcher}
Block entities {@link net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher}
Items {@link net.minecraft.client.render.item.ItemRenderer}
Items held in hand {@link net.minecraft.client.render.item.HeldItemRenderer}
Text {@link net.minecraft.client.font.TextRenderer}
Game hud (health bar, hunger bar) {@link net.minecraft.client.gui.hud.InGameHud}
+ COMMENT + COMMENT @see net.minecraft.server.integrated.IntegratedServer + COMMENT @see net.minecraft.client.render.GameRenderer FIELD field_16240 profiler Lnet/minecraft/class_3695; FIELD field_16762 game Lnet/minecraft/class_3799; FIELD field_1686 windowProvider Lnet/minecraft/class_3682; @@ -14,6 +54,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1695 windowFocused Z FIELD field_1696 thread Ljava/lang/Thread; FIELD field_1697 runDirectory Ljava/io/File; + COMMENT The directory that stores options, worlds, resource packs, logs, etc. FIELD field_1698 running Z FIELD field_1699 currentServerEntry Lnet/minecraft/class_642; FIELD field_1700 instance Lnet/minecraft/class_310; @@ -61,14 +102,24 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1743 skipGameRender Z FIELD field_1744 connectedToRealms Z FIELD field_1745 resourceManager Lnet/minecraft/class_3296; - FIELD field_1746 connection Lnet/minecraft/class_2535; + FIELD field_1746 integratedServerConnection Lnet/minecraft/class_2535; + COMMENT The client connection to the integrated server. + COMMENT This is only used when connecting to the integrated server. + COMMENT + COMMENT @see net.minecraft.client.gui.screen.ConnectScreen FIELD field_1747 crashReport Lnet/minecraft/class_128; FIELD field_1748 levelStorage Lnet/minecraft/class_32; FIELD field_1749 ALT_TEXT_RENDERER_ID Lnet/minecraft/class_2960; FIELD field_1750 lastMetricsSampleTime J FIELD field_1751 blockColors Lnet/minecraft/class_324; FIELD field_1752 itemUseCooldown I + COMMENT The cooldown for using items when {@linkplain net.minecraft.client.option.GameOptions#keyUse the item use button} is held down. FIELD field_1755 currentScreen Lnet/minecraft/class_437; + COMMENT The Minecraft client's currently open screen. + COMMENT This field should only be used to get the current screen. + COMMENT For changing the screen use {@link MinecraftClient#openScreen(Screen)} + COMMENT + COMMENT @see MinecraftClient#openScreen(Screen) FIELD field_1756 blockRenderManager Lnet/minecraft/class_776; FIELD field_1757 resourcePackDir Ljava/io/File; FIELD field_1758 tutorialManager Lnet/minecraft/class_1156; @@ -139,13 +190,18 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 error ARG 2 description METHOD method_1507 openScreen (Lnet/minecraft/class_437;)V + COMMENT Opens a new screen, changing the current screen if needed. + COMMENT + COMMENT

If the screen being opened is {@code null} and the client is not in game, the title screen will be opened. + COMMENT If the currently opened screen is {@code null} and player is dead then the death screen will be opened. + COMMENT Otherwise the currently open screen will be closed. ARG 1 screen METHOD method_1508 handleInputEvents ()V METHOD method_1511 doItemPick ()V METHOD method_1513 reloadResourcesConcurrently ()Ljava/util/concurrent/CompletableFuture; METHOD method_1514 run ()V METHOD method_1515 getGameVersion ()Ljava/lang/String; - METHOD method_1516 getResourcePackDownloader ()Lnet/minecraft/class_1066; + METHOD method_1516 getResourcePackProvider ()Lnet/minecraft/class_1066; METHOD method_1517 isFancyGraphicsOrBetter ()Z METHOD method_1519 cleanUpAfterCrash ()V METHOD method_1520 getResourcePackManager ()Lnet/minecraft/class_3283; @@ -199,6 +255,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1582 getSkinProvider ()Lnet/minecraft/class_1071; METHOD method_1583 doItemUse ()V METHOD method_1584 setCurrentServerEntry (Lnet/minecraft/class_642;)V + ARG 1 serverEntry METHOD method_1586 getLevelStorage ()Lnet/minecraft/class_32; METHOD method_1587 addDetailsToCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_128; ARG 1 report @@ -242,13 +299,14 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 4 metadata ARG 5 insertionPosition ARG 6 source - METHOD method_24041 resetMipmapLevels (I)V + METHOD method_24041 setMipmapLevels (I)V ARG 1 mipmapLevels METHOD method_24042 createV3ResourcePackFactory (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; ARG 0 packFactory METHOD method_24043 createV4ResourcePackFactory (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; ARG 0 packFactory METHOD method_24226 handleResourceReloadException (Ljava/lang/Throwable;)V + ARG 1 exception METHOD method_24287 getWindowTitle ()Ljava/lang/String; METHOD method_24288 updateWindowTitle ()V METHOD method_24289 isModded ()Z @@ -281,6 +339,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 0 session ARG 1 registryTracker ARG 2 resourceManager + ARG 3 dataPackSettings METHOD method_29603 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_310$class_5367;Lnet/minecraft/class_5219;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Ljava/lang/Thread;)Lnet/minecraft/class_1132; ARG 1 registryTracker ARG 2 session @@ -291,7 +350,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 8 serverThread METHOD method_29606 startIntegratedServer (Ljava/lang/String;)V ARG 1 worldName - METHOD method_29607 (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5285;)V + METHOD method_29607 createWorld (Ljava/lang/String;Lnet/minecraft/class_1940;Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5285;)V ARG 1 worldName ARG 2 levelInfo ARG 3 registryTracker @@ -299,7 +358,10 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_29610 startIntegratedServer (Ljava/lang/String;Lnet/minecraft/class_5455$class_5457;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;ZLnet/minecraft/class_310$class_5366;)V ARG 1 worldName ARG 2 registryTracker + ARG 3 dataPackSettingsGetter + ARG 4 savePropertiesGetter ARG 5 safeMode + ARG 6 worldLoadAction METHOD method_29611 isFabulousGraphicsOrBetter ()Z METHOD method_30049 getVideoWarningManager ()Lnet/minecraft/class_5407; METHOD method_31320 getSocialInteractionsManager ()Lnet/minecraft/class_5520; diff --git a/mappings/net/minecraft/client/Mouse.mapping b/mappings/net/minecraft/client/Mouse.mapping index e4da69b396..34294f8533 100644 --- a/mappings/net/minecraft/client/Mouse.mapping +++ b/mappings/net/minecraft/client/Mouse.mapping @@ -40,6 +40,7 @@ CLASS net/minecraft/class_312 net/minecraft/client/Mouse METHOD method_1604 getY ()D METHOD method_1606 updateMouse ()V METHOD method_1607 setup (J)V + ARG 1 window METHOD method_1608 wasLeftButtonClicked ()Z METHOD method_1609 wasRightButtonClicked ()Z METHOD method_1610 unlockCursor ()V diff --git a/mappings/net/minecraft/client/font/GlyphRenderer.mapping b/mappings/net/minecraft/client/font/GlyphRenderer.mapping index 1357045652..fba61c1949 100644 --- a/mappings/net/minecraft/client/font/GlyphRenderer.mapping +++ b/mappings/net/minecraft/client/font/GlyphRenderer.mapping @@ -1,25 +1,25 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer FIELD field_21692 textLayer Lnet/minecraft/class_1921; FIELD field_21693 seeThroughTextLayer Lnet/minecraft/class_1921; - FIELD field_2272 xMin F - FIELD field_2273 vMax F - FIELD field_2274 vMin F - FIELD field_2275 uMax F - FIELD field_2276 uMin F - FIELD field_2278 yMax F - FIELD field_2279 yMin F - FIELD field_2280 xMax F + FIELD field_2272 minX F + FIELD field_2273 maxV F + FIELD field_2274 minV F + FIELD field_2275 maxU F + FIELD field_2276 minU F + FIELD field_2278 maxY F + FIELD field_2279 minY F + FIELD field_2280 maxX F METHOD (Lnet/minecraft/class_1921;Lnet/minecraft/class_1921;FFFFFFFF)V ARG 1 textLayer ARG 2 seeThroughTextLayer - ARG 3 uMin - ARG 4 uMax - ARG 5 vMin - ARG 6 vMax - ARG 7 xMin - ARG 8 xMax - ARG 9 yMin - ARG 10 yMax + ARG 3 minU + ARG 4 maxU + ARG 5 minV + ARG 6 maxV + ARG 7 minX + ARG 8 maxX + ARG 9 minY + ARG 10 maxY METHOD method_2025 draw (ZFFLnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFI)V ARG 1 italic ARG 2 x diff --git a/mappings/net/minecraft/client/font/TextHandler.mapping b/mappings/net/minecraft/client/font/TextHandler.mapping index 43a4b61905..527d3ff3de 100644 --- a/mappings/net/minecraft/client/font/TextHandler.mapping +++ b/mappings/net/minecraft/client/font/TextHandler.mapping @@ -44,6 +44,7 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler ARG 3 style ARG 4 codePoint METHOD method_27493 (Lorg/apache/commons/lang3/mutable/MutableFloat;ILorg/apache/commons/lang3/mutable/MutableInt;ILnet/minecraft/class_2583;I)Z + ARG 4 index ARG 5 style ARG 6 codePoint METHOD method_27494 trimToWidth (Ljava/lang/String;ILnet/minecraft/class_2583;)Ljava/lang/String; @@ -57,7 +58,9 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler ARG 3 style COMMENT the style of the trimmed string METHOD method_27495 wrapLines (Lnet/minecraft/class_5348;ILnet/minecraft/class_2583;)Ljava/util/List; + ARG 1 text ARG 2 maxWidth + ARG 3 style METHOD method_27496 (Lorg/apache/commons/lang3/mutable/MutableFloat;ILnet/minecraft/class_2583;I)Z ARG 2 unused ARG 3 style diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index fc3ea1a677..a6cf354e78 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer + COMMENT Manages the rendering of text. + COMMENT + COMMENT

The current instance used by the client can be obtained by + COMMENT {@code MinecraftClient.getInstance().textRenderer}. + COMMENT + COMMENT @see net.minecraft.client.MinecraftClient#textRenderer FIELD field_1997 fontStorageAccessor Ljava/util/function/Function; FIELD field_2000 fontHeight I + COMMENT The font height of the text that is rendered by the text renderer. FIELD field_2001 random Ljava/util/Random; FIELD field_24237 FORWARD_SHIFT Lnet/minecraft/class_1160; FIELD field_24238 handler Lnet/minecraft/class_5225; @@ -27,10 +34,18 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 4 maxWidth ARG 5 color COMMENT the text color in the 0xAARRGGBB format - METHOD method_1713 getStringBoundedHeight (Ljava/lang/String;I)I + METHOD method_1713 getWrappedLinesHeight (Ljava/lang/String;I)I + COMMENT Gets the height of the text when it has been wrapped. + COMMENT + COMMENT @return the height of the wrapped text + COMMENT @see TextRenderer#wrapLines(StringVisitable, int) ARG 1 text ARG 2 maxWidth METHOD method_1714 trimToWidth (Lnet/minecraft/class_5348;I)Lnet/minecraft/class_5348; + COMMENT Trims a string to be at most {@code maxWidth} wide. + COMMENT + COMMENT @return the text + COMMENT @see TextHandler#trimToWidth(StringVisitable, int, Style) ARG 1 text ARG 2 width METHOD method_1720 drawWithShadow (Lnet/minecraft/class_4587;Ljava/lang/String;FFI)I @@ -65,9 +80,15 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 9 underlineColor ARG 10 light METHOD method_1726 isRightToLeft ()Z + COMMENT Checks if the currently set language uses right to left writing. METHOD method_1727 getWidth (Ljava/lang/String;)I + COMMENT Gets the width of some text when rendered. ARG 1 text + COMMENT the text METHOD method_1728 wrapLines (Lnet/minecraft/class_5348;I)Ljava/util/List; + COMMENT Wraps text when the rendered width of text exceeds the {@code width}. + COMMENT + COMMENT @return a list of ordered text which has been wrapped ARG 1 text ARG 2 width METHOD method_1729 draw (Lnet/minecraft/class_4587;Ljava/lang/String;FFI)I @@ -141,14 +162,23 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 10 light ARG 11 rightToLeft METHOD method_27523 trimToWidth (Ljava/lang/String;I)Ljava/lang/String; + COMMENT Trims a string to be at most {@code maxWidth} wide. + COMMENT + COMMENT @return the trimmed string + COMMENT @see TextHandler#trimToWidth(String, int, Style) ARG 1 text ARG 2 maxWidth METHOD method_27524 trimToWidth (Ljava/lang/String;IZ)Ljava/lang/String; + COMMENT Trims a string to be at most {@code maxWidth} wide. + COMMENT + COMMENT @return the trimmed string ARG 1 text ARG 2 maxWidth ARG 3 backwards METHOD method_27525 getWidth (Lnet/minecraft/class_5348;)I + COMMENT Gets the width of some text when rendered. ARG 1 text + COMMENT the text METHOD method_27526 getFontStorage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; ARG 1 id METHOD method_27527 getTextHandler ()Lnet/minecraft/class_5225; @@ -191,6 +221,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer COMMENT the text color in the 0xAARRGGBB format ARG 6 rightToLeft METHOD method_30880 getWidth (Lnet/minecraft/class_5481;)I + COMMENT Gets the width of some text when rendered. ARG 1 text METHOD method_30881 drawWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FFI)I ARG 1 matrices diff --git a/mappings/net/minecraft/client/font/TextVisitFactory.mapping b/mappings/net/minecraft/client/font/TextVisitFactory.mapping index ae18481845..747c6b107d 100644 --- a/mappings/net/minecraft/client/font/TextVisitFactory.mapping +++ b/mappings/net/minecraft/client/font/TextVisitFactory.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory METHOD method_27472 visitFormatted (Ljava/lang/String;ILnet/minecraft/class_2583;Lnet/minecraft/class_5224;)Z COMMENT Visits the code points of a string, applying the formatting codes within. COMMENT - COMMENT

The visit is in forward direction.

+ COMMENT

The visit is in forward direction. COMMENT COMMENT @return {@code true} if the full string was visited, or {@code false} indicating COMMENT the {@code visitor} terminated half-way @@ -24,7 +24,7 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory METHOD method_27473 visitFormatted (Ljava/lang/String;ILnet/minecraft/class_2583;Lnet/minecraft/class_2583;Lnet/minecraft/class_5224;)Z COMMENT Visits the code points of a string, applying the formatting codes within. COMMENT - COMMENT

The visit is in forward direction.

+ COMMENT

The visit is in forward direction. COMMENT COMMENT @return {@code true} if the full string was visited, or {@code false} indicating COMMENT the {@code visitor} terminated half-way @@ -53,11 +53,11 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory COMMENT Visits the code points for every literal string and the formatting codes COMMENT supplied by the renderable. COMMENT - COMMENT

The visit is in forward direction.

+ COMMENT

The visit is in forward direction. COMMENT COMMENT @return {@code true} if the full string was visited, or {@code false} indicating COMMENT the {@code visitor} terminated half-way - COMMENT @see StringRenderable#visit(StringRenderable.StyledVisitor, Style) + COMMENT @see StringVisitable#visit(StringVisitable.StyledVisitor, Style) ARG 0 text ARG 1 style ARG 2 visitor @@ -80,7 +80,7 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory METHOD method_27479 visitFormatted (Ljava/lang/String;Lnet/minecraft/class_2583;Lnet/minecraft/class_5224;)Z COMMENT Visits the code points of a string, applying the formatting codes within. COMMENT - COMMENT

The visit is in forward direction.

+ COMMENT

The visit is in forward direction. COMMENT COMMENT @return {@code true} if the full string was visited, or {@code false} indicating COMMENT the {@code visitor} terminated half-way diff --git a/mappings/net/minecraft/client/gl/Framebuffer.mapping b/mappings/net/minecraft/client/gl/Framebuffer.mapping index 31c47ac9e3..14e5573fca 100644 --- a/mappings/net/minecraft/client/gl/Framebuffer.mapping +++ b/mappings/net/minecraft/client/gl/Framebuffer.mapping @@ -53,5 +53,6 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer ARG 2 height ARG 3 getError METHOD method_29329 copyDepthFrom (Lnet/minecraft/class_276;)V + ARG 1 framebuffer METHOD method_30277 getColorAttachment ()I METHOD method_30278 getDepthAttachment ()I diff --git a/mappings/net/minecraft/client/gl/GlDebug.mapping b/mappings/net/minecraft/client/gl/GlDebug.mapping index b3573f84b2..c80116a1d4 100644 --- a/mappings/net/minecraft/client/gl/GlDebug.mapping +++ b/mappings/net/minecraft/client/gl/GlDebug.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_1008 net/minecraft/client/gl/GlDebug ARG 1 type ARG 2 id ARG 3 severity + ARG 4 messageLength + ARG 5 message METHOD method_4225 unknown (I)Ljava/lang/String; ARG 0 opcode METHOD method_4226 getSeverity (I)Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gl/GlProgram.mapping b/mappings/net/minecraft/client/gl/GlProgram.mapping deleted file mode 100644 index 550acbf4fb..0000000000 --- a/mappings/net/minecraft/client/gl/GlProgram.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_3679 net/minecraft/client/gl/GlProgram - METHOD method_1270 getProgramRef ()I - METHOD method_1274 getVertexShader ()Lnet/minecraft/class_281; - METHOD method_1278 getFragmentShader ()Lnet/minecraft/class_281; - METHOD method_1279 markUniformsDirty ()V diff --git a/mappings/net/minecraft/client/gl/GlShader.mapping b/mappings/net/minecraft/client/gl/GlShader.mapping index 8838c9409b..7c491f7d47 100644 --- a/mappings/net/minecraft/client/gl/GlShader.mapping +++ b/mappings/net/minecraft/client/gl/GlShader.mapping @@ -1,27 +1,5 @@ -CLASS net/minecraft/class_281 net/minecraft/client/gl/GlShader - FIELD field_1522 refCount I - FIELD field_1523 shaderRef I - FIELD field_1524 shaderType Lnet/minecraft/class_281$class_282; - FIELD field_1525 name Ljava/lang/String; - METHOD (Lnet/minecraft/class_281$class_282;ILjava/lang/String;)V - ARG 1 shaderType - ARG 2 shaderRef - ARG 3 name - METHOD method_1280 getName ()Ljava/lang/String; - METHOD method_1281 attachTo (Lnet/minecraft/class_3679;)V - METHOD method_1282 release ()V - METHOD method_1283 createFromResource (Lnet/minecraft/class_281$class_282;Ljava/lang/String;Ljava/io/InputStream;Ljava/lang/String;)Lnet/minecraft/class_281; - ARG 0 type - ARG 1 name - ARG 2 sourceCode - CLASS class_282 Type - FIELD field_1526 name Ljava/lang/String; - FIELD field_1527 loadedShaders Ljava/util/Map; - FIELD field_1528 fileExtension Ljava/lang/String; - FIELD field_1529 glType I - FIELD field_1530 VERTEX Lnet/minecraft/class_281$class_282; - FIELD field_1531 FRAGMENT Lnet/minecraft/class_281$class_282; - METHOD method_1284 getFileExtension ()Ljava/lang/String; - METHOD method_1286 getName ()Ljava/lang/String; - METHOD method_1287 getGlType ()I - METHOD method_1289 getLoadedShaders ()Ljava/util/Map; +CLASS net/minecraft/class_3679 net/minecraft/client/gl/GlShader + METHOD method_1270 getProgramRef ()I + METHOD method_1274 getVertexShader ()Lnet/minecraft/class_281; + METHOD method_1278 getFragmentShader ()Lnet/minecraft/class_281; + METHOD method_1279 markUniformsDirty ()V diff --git a/mappings/net/minecraft/client/gl/GlUniform.mapping b/mappings/net/minecraft/client/gl/GlUniform.mapping index 6c9b109882..2ba0ade6b9 100644 --- a/mappings/net/minecraft/client/gl/GlUniform.mapping +++ b/mappings/net/minecraft/client/gl/GlUniform.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_284 net/minecraft/client/gl/GlUniform FIELD field_1542 stateDirty Z FIELD field_1543 dataType I FIELD field_1544 count I - FIELD field_1545 loc I + FIELD field_1545 location I FIELD field_1546 name Ljava/lang/String; FIELD field_1547 intData Ljava/nio/IntBuffer; FIELD field_1548 LOGGER Lorg/apache/logging/log4j/Logger; @@ -15,6 +15,7 @@ CLASS net/minecraft/class_284 net/minecraft/client/gl/GlUniform ARG 4 program METHOD method_1296 uploadMatrix ()V METHOD method_1297 setLoc (I)V + ARG 1 loc METHOD method_1298 getName ()Ljava/lang/String; METHOD method_1299 getTypeIndex (Ljava/lang/String;)I ARG 0 typeName @@ -23,5 +24,11 @@ CLASS net/minecraft/class_284 net/minecraft/client/gl/GlUniform METHOD method_1302 markStateDirty ()V METHOD method_1303 uploadInts ()V METHOD method_22095 uniform1 (II)V + ARG 0 location + ARG 1 value METHOD method_22096 getUniformLocation (ILjava/lang/CharSequence;)I + ARG 0 program + ARG 1 name METHOD method_22097 getAttribLocation (ILjava/lang/CharSequence;)I + ARG 0 program + ARG 1 name diff --git a/mappings/net/minecraft/client/gl/JsonGlProgram.mapping b/mappings/net/minecraft/client/gl/JsonEffectGlShader.mapping similarity index 88% rename from mappings/net/minecraft/client/gl/JsonGlProgram.mapping rename to mappings/net/minecraft/client/gl/JsonEffectGlShader.mapping index 1874141387..7218fbc8e3 100644 --- a/mappings/net/minecraft/client/gl/JsonGlProgram.mapping +++ b/mappings/net/minecraft/client/gl/JsonEffectGlShader.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonGlProgram +CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonEffectGlShader FIELD field_1503 samplerNames Ljava/util/List; FIELD field_1504 attribNames Ljava/util/List; FIELD field_1505 activeProgramRef I @@ -8,14 +8,14 @@ CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonGlProgram FIELD field_1509 name Ljava/lang/String; FIELD field_1510 uniformByName Ljava/util/Map; FIELD field_1511 uniformStateDirty Z - FIELD field_1512 activeProgram Lnet/minecraft/class_280; + FIELD field_1512 activeShader Lnet/minecraft/class_280; FIELD field_1514 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_1515 uniformData Ljava/util/List; FIELD field_1516 samplerBinds Ljava/util/Map; FIELD field_1517 blendState Lnet/minecraft/class_277; FIELD field_1518 attribLocs Ljava/util/List; FIELD field_1519 fragmentShader Lnet/minecraft/class_281; - FIELD field_1520 dummyUniform Lnet/minecraft/class_278; + FIELD field_1520 DEFAULT_UNIFORM Lnet/minecraft/class_278; FIELD field_1521 programRef I METHOD (Lnet/minecraft/class_3300;Ljava/lang/String;)V ARG 1 resource @@ -26,10 +26,12 @@ CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonGlProgram METHOD method_1271 getUniformByName (Ljava/lang/String;)Lnet/minecraft/class_284; ARG 1 name METHOD method_1272 addUniform (Lcom/google/gson/JsonElement;)V + ARG 1 json METHOD method_1273 disable ()V METHOD method_1275 getUniformByNameOrDummy (Ljava/lang/String;)Lnet/minecraft/class_278; ARG 1 name METHOD method_1276 addSampler (Lcom/google/gson/JsonElement;)V + ARG 1 json METHOD method_1277 enable ()V METHOD method_16035 deserializeBlendState (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_277; ARG 0 json diff --git a/mappings/net/minecraft/client/gl/PostProcessShader.mapping b/mappings/net/minecraft/client/gl/PostProcessShader.mapping index f60a1e8c2b..d8defd8897 100644 --- a/mappings/net/minecraft/client/gl/PostProcessShader.mapping +++ b/mappings/net/minecraft/client/gl/PostProcessShader.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_283 net/minecraft/client/gl/PostProcessShader ARG 1 projectionMatrix METHOD method_1292 addAuxTarget (Ljava/lang/String;Ljava/util/function/IntSupplier;II)V ARG 1 name + ARG 2 valueSupplier ARG 3 width ARG 4 height METHOD method_1293 render (F)V diff --git a/mappings/net/minecraft/client/gl/Program.mapping b/mappings/net/minecraft/client/gl/Program.mapping new file mode 100644 index 0000000000..c5f6dc5c64 --- /dev/null +++ b/mappings/net/minecraft/client/gl/Program.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_281 net/minecraft/client/gl/Program + FIELD field_1522 refCount I + FIELD field_1523 shaderRef I + FIELD field_1524 shaderType Lnet/minecraft/class_281$class_282; + FIELD field_1525 name Ljava/lang/String; + METHOD (Lnet/minecraft/class_281$class_282;ILjava/lang/String;)V + ARG 1 shaderType + ARG 2 shaderRef + ARG 3 name + METHOD method_1280 getName ()Ljava/lang/String; + METHOD method_1281 attachTo (Lnet/minecraft/class_3679;)V + ARG 1 program + METHOD method_1282 release ()V + METHOD method_1283 createFromResource (Lnet/minecraft/class_281$class_282;Ljava/lang/String;Ljava/io/InputStream;Ljava/lang/String;)Lnet/minecraft/class_281; + ARG 0 type + ARG 1 name + ARG 2 sourceCode + ARG 3 domain + CLASS class_282 Type + FIELD field_1526 name Ljava/lang/String; + FIELD field_1527 loadedShaders Ljava/util/Map; + FIELD field_1528 fileExtension Ljava/lang/String; + FIELD field_1529 glType I + FIELD field_1530 VERTEX Lnet/minecraft/class_281$class_282; + FIELD field_1531 FRAGMENT Lnet/minecraft/class_281$class_282; + METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;I)V + ARG 3 name + ARG 4 fileExtension + ARG 5 glType + METHOD method_1284 getFileExtension ()Ljava/lang/String; + METHOD method_1286 getName ()Ljava/lang/String; + METHOD method_1287 getGlType ()I + METHOD method_1289 getLoadedShaders ()Ljava/util/Map; diff --git a/mappings/net/minecraft/client/gl/ShaderEffect.mapping b/mappings/net/minecraft/client/gl/ShaderEffect.mapping index 180e7260dc..a530cbac7a 100644 --- a/mappings/net/minecraft/client/gl/ShaderEffect.mapping +++ b/mappings/net/minecraft/client/gl/ShaderEffect.mapping @@ -11,9 +11,12 @@ CLASS net/minecraft/class_279 net/minecraft/client/gl/ShaderEffect FIELD field_1501 time F FIELD field_1502 resourceManager Lnet/minecraft/class_3300; METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_3300;Lnet/minecraft/class_276;Lnet/minecraft/class_2960;)V + ARG 1 textureManager + ARG 2 resourceManager ARG 3 framebuffer ARG 4 location METHOD method_1256 parseEffect (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V + ARG 1 textureManager ARG 2 location METHOD method_1257 parsePass (Lnet/minecraft/class_1060;Lcom/google/gson/JsonElement;)V ARG 2 jsonPass diff --git a/mappings/net/minecraft/client/gl/Uniform.mapping b/mappings/net/minecraft/client/gl/Uniform.mapping index cbdc60a7d9..f499f31372 100644 --- a/mappings/net/minecraft/client/gl/Uniform.mapping +++ b/mappings/net/minecraft/client/gl/Uniform.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_278 net/minecraft/client/gl/Uniform - METHOD method_1248 set (IIII)V + METHOD method_1248 setForDataType (IIII)V ARG 1 value1 ARG 2 value2 ARG 3 value3 diff --git a/mappings/net/minecraft/client/gl/VertexBuffer.mapping b/mappings/net/minecraft/client/gl/VertexBuffer.mapping index b0be01ab7c..64d09c8a20 100644 --- a/mappings/net/minecraft/client/gl/VertexBuffer.mapping +++ b/mappings/net/minecraft/client/gl/VertexBuffer.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_291 net/minecraft/client/gl/VertexBuffer FIELD field_1593 vertexCount I - FIELD field_1594 id I + FIELD field_1594 vertexBufferId I FIELD field_1595 format Lnet/minecraft/class_293; METHOD (Lnet/minecraft/class_293;)V ARG 1 format diff --git a/mappings/net/minecraft/client/gui/ClientChatListener.mapping b/mappings/net/minecraft/client/gui/ClientChatListener.mapping index cbf51ebb22..8a92fec490 100644 --- a/mappings/net/minecraft/client/gui/ClientChatListener.mapping +++ b/mappings/net/minecraft/client/gui/ClientChatListener.mapping @@ -2,4 +2,4 @@ CLASS net/minecraft/class_334 net/minecraft/client/gui/ClientChatListener METHOD method_1794 onChatMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;Ljava/util/UUID;)V ARG 1 messageType ARG 2 message - ARG 3 senderUuid + ARG 3 sender diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping index 84145773ec..af574a0099 100644 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping @@ -105,10 +105,10 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 9 v1 METHOD method_25296 fillGradient (Lnet/minecraft/class_4587;IIIIII)V ARG 1 matrices - ARG 2 xStart - ARG 3 yStart - ARG 4 xEnd - ARG 5 yEnd + ARG 2 startX + ARG 3 startY + ARG 4 endX + ARG 5 endY ARG 6 colorStart ARG 7 colorEnd METHOD method_25297 drawTexture (Lnet/minecraft/class_4587;IIIIIIIFFII)V @@ -139,7 +139,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 3 x2 ARG 4 y2 ARG 5 color - METHOD method_25300 drawCenteredString (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Ljava/lang/String;III)V + METHOD method_25300 drawCenteredText (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Ljava/lang/String;III)V ARG 0 matrices ARG 1 textRenderer ARG 2 text @@ -185,10 +185,10 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper METHOD method_25305 getZOffset ()I METHOD method_27533 fillGradient (Lnet/minecraft/class_1159;Lnet/minecraft/class_287;IIIIIII)V ARG 0 matrix - ARG 2 xStart - ARG 3 yStart - ARG 4 xEnd - ARG 5 yEnd + ARG 2 startX + ARG 3 startY + ARG 4 endX + ARG 5 endY ARG 6 z ARG 7 colorStart ARG 8 colorEnd diff --git a/mappings/net/minecraft/client/gui/Element.mapping b/mappings/net/minecraft/client/gui/Element.mapping index 40c3c9ada9..309af6a25d 100644 --- a/mappings/net/minecraft/client/gui/Element.mapping +++ b/mappings/net/minecraft/client/gui/Element.mapping @@ -27,7 +27,7 @@ CLASS net/minecraft/class_364 net/minecraft/client/gui/Element ARG 2 scanCode COMMENT the unique/platform-specific scan code of the keyboard input ARG 3 modifiers - COMMENT a GLFW bitfield describing the modifier keys that are held down (see {@linkplain https://www.glfw.org/docs/3.3/group__mods.html GLFW Modifier key flags}) + COMMENT a GLFW bitfield describing the modifier keys that are held down (see GLFW Modifier key flags) METHOD method_25400 charTyped (CI)Z COMMENT Callback for when a character input has been captured. COMMENT @@ -105,7 +105,7 @@ CLASS net/minecraft/class_364 net/minecraft/client/gui/Element ARG 2 scanCode COMMENT the unique/platform-specific scan code of the keyboard input ARG 3 modifiers - COMMENT a GLFW bitfield describing the modifier keys that are held down (see {@linkplain https://www.glfw.org/docs/3.3/group__mods.html GLFW Modifier key flags}) + COMMENT a GLFW bitfield describing the modifier keys that are held down (see GLFW Modifier key flags) METHOD method_25405 isMouseOver (DD)Z COMMENT Checks if the mouse position is within the bound COMMENT of the element. diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index bc16baa1b2..f1001510f2 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -77,7 +77,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1755 addChatMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;Ljava/util/UUID;)V ARG 1 type ARG 2 message - ARG 3 senderUuid + ARG 3 sender METHOD method_1756 getFontRenderer ()Lnet/minecraft/class_327; METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_4587;Lnet/minecraft/class_266;)V ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping b/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping index 82fb9d23d6..442960366a 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameOverlayRenderer.mapping @@ -1,7 +1,14 @@ CLASS net/minecraft/class_4603 net/minecraft/client/gui/hud/InGameOverlayRenderer FIELD field_20986 UNDERWATER_TEXTURE Lnet/minecraft/class_2960; METHOD method_23067 renderOverlays (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V + ARG 0 client + ARG 1 matrices METHOD method_23068 renderInWallOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_1058;Lnet/minecraft/class_4587;)V METHOD method_23069 renderUnderwaterOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V + ARG 0 client + ARG 1 matrices METHOD method_23070 renderFireOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V + ARG 0 client + ARG 1 matrices METHOD method_24225 getInWallBlockState (Lnet/minecraft/class_1657;)Lnet/minecraft/class_2680; + ARG 0 player diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping index fefd624b77..22e4c82761 100644 --- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping @@ -7,13 +7,17 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1975 renderSpectatorMenu (Lnet/minecraft/class_4587;FIILnet/minecraft/class_539;)V + ARG 1 matrices METHOD method_1976 cycleSlot (D)V ARG 1 offset METHOD method_1977 selectSlot (I)V ARG 1 slot METHOD method_1978 render (Lnet/minecraft/class_4587;F)V + ARG 1 matrices METHOD method_1979 render (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_1980 isOpen ()Z METHOD method_1981 getSpectatorMenuHeight ()F METHOD method_1982 renderSpectatorCommand (Lnet/minecraft/class_4587;IIFFLnet/minecraft/class_537;)V + ARG 1 matrices METHOD method_1983 useSelectedCommand ()V diff --git a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping b/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping index 7ca3d4d41d..9ab7f129d1 100644 --- a/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AddServerScreen.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_422 net/minecraft/client/gui/screen/AddServerScreen FIELD field_21791 parent Lnet/minecraft/class_437; FIELD field_2469 server Lnet/minecraft/class_642; FIELD field_2471 serverNameField Lnet/minecraft/class_342; - FIELD field_2472 buttonAdd Lnet/minecraft/class_4185; + FIELD field_2472 addButton Lnet/minecraft/class_4185; FIELD field_2473 resourcePackOptionButton Lnet/minecraft/class_4185; FIELD field_2474 addressField Lnet/minecraft/class_342; FIELD field_2475 addressTextFilter Ljava/util/function/Predicate; diff --git a/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping b/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping index 929a3801e2..15e24b4aa4 100644 --- a/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping +++ b/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/CommandSuggestor ARG 2 owner ARG 3 textField ARG 4 textRenderer - ARG 5 slashRequired + ARG 5 slashOptional ARG 6 suggestingWhenEmpty ARG 7 inWindowIndexOffset ARG 8 maxSuggestionSize diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping index 0e59f61f26..ee2e2f404a 100644 --- a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping @@ -13,4 +13,7 @@ CLASS net/minecraft/class_410 net/minecraft/client/gui/screen/ConfirmScreen ARG 1 callback ARG 2 title ARG 3 message + ARG 4 yesTranslated + ARG 5 noTranslated METHOD method_2125 disableButtons (I)V + ARG 1 ticks diff --git a/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping index 2d79c54a0b..fd2cfee2eb 100644 --- a/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/ConnectScreen + COMMENT The connection screen is used to initiate a connection to a remote server. + COMMENT This is only used when connecting over LAN or to a remote dedicated server. FIELD field_19097 narratorTimer J FIELD field_2408 CONNECTOR_THREADS_COUNT Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_2409 connectingCancelled Z FIELD field_2410 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_2411 connection Lnet/minecraft/class_2535; + COMMENT The client connection to the remote server. + COMMENT This is not used when connecting to the client's own integrated server. + COMMENT + COMMENT @see net.minecraft.client.MinecraftClient#integratedServerConnection FIELD field_2412 parent Lnet/minecraft/class_437; FIELD field_2413 status Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_310;Ljava/lang/String;I)V diff --git a/mappings/net/minecraft/client/gui/screen/DemoScreen.mapping b/mappings/net/minecraft/client/gui/screen/DemoScreen.mapping index 20ab76793e..6d4528dc0b 100644 --- a/mappings/net/minecraft/client/gui/screen/DemoScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DemoScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_417 net/minecraft/client/gui/screen/DemoScreen FIELD field_2447 DEMO_BG Lnet/minecraft/class_2960; METHOD method_19810 (Lnet/minecraft/class_4185;)V - ARG 1 buttonWidget + ARG 1 button METHOD method_19811 (Lnet/minecraft/class_4185;)V - ARG 0 buttonWidget + ARG 0 button diff --git a/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping b/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping index afb1e3964c..0558269bea 100644 --- a/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/FatalErrorScreen.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_421 net/minecraft/client/gui/screen/FatalErrorScreen FIELD field_2467 message Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 title + ARG 2 message diff --git a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping index dffbdeac75..7d7500d7ac 100644 --- a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping @@ -6,3 +6,4 @@ CLASS net/minecraft/class_3928 net/minecraft/client/gui/screen/LevelLoadingScree METHOD method_17537 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V ARG 0 map METHOD method_17538 drawChunkMap (Lnet/minecraft/class_4587;Lnet/minecraft/class_3953;IIII)V + ARG 0 matrices diff --git a/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping b/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping index 5279ebcc42..78299b9bb9 100644 --- a/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_403 net/minecraft/client/gui/screen/NoticeScreen FIELD field_2345 actionHandler Ljava/lang/Runnable; FIELD field_2346 notice Lnet/minecraft/class_2561; FIELD field_2348 noticeLines Lnet/minecraft/class_5489; - FIELD field_2349 buttonString Lnet/minecraft/class_2561; + FIELD field_2349 buttonText Lnet/minecraft/class_2561; METHOD (Ljava/lang/Runnable;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 actionHandler ARG 2 title @@ -11,3 +11,4 @@ CLASS net/minecraft/class_403 net/minecraft/client/gui/screen/NoticeScreen ARG 1 actionHandler ARG 2 title ARG 3 notice + ARG 4 buttonText diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index d583fcbcd8..8f3b684311 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -76,17 +76,17 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD method_25426 init ()V COMMENT Called when a screen should be initialized. COMMENT - COMMENT

This method is called when this screen is {@link MinecraftClient#openScreen(Screen) opened} or resized. + COMMENT

This method is called when this screen is {@linkplain net.minecraft.client.MinecraftClient#openScreen(Screen) opened} or resized. METHOD method_25427 sendMessage (Ljava/lang/String;)V ARG 1 message METHOD method_25428 confirmLink (Z)V ARG 1 open METHOD method_25429 addChild (Lnet/minecraft/class_364;)Lnet/minecraft/class_364; COMMENT Adds a child element to this screen. - COMMENT If the child element is an {@link net.minecraft.client.gui.widget.AbstractButtonWidget}, you should use {@link Screen#addButton(AbstractButtonWidget)} instead. + COMMENT If the child element is an {@link net.minecraft.client.gui.widget.ClickableWidget}, you should use {@link Screen#addButton(ClickableWidget)} instead. COMMENT COMMENT

Adding a child element to a screen does not guarantee the widget is rendered or ticked. - COMMENT @see net.minecraft.client.gui.screen.Screen#addButton(AbstractButtonWidget) + COMMENT @see net.minecraft.client.gui.screen.Screen#addButton(ClickableWidget) ARG 1 child METHOD method_25430 handleTextClick (Lnet/minecraft/class_2583;)Z ARG 1 style @@ -100,7 +100,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 2 vOffset COMMENT an offset applied to the V coordinate of the background texture METHOD method_25434 renderBackgroundTexture (I)V - COMMENT Renders the fullscreen {@linkplain #BACKGROUND_TEXTURE background texture} of this screen. + COMMENT Renders the fullscreen {@linkplain net.minecraft.client.gui.DrawableHelper#OPTIONS_BACKGROUND_TEXTURE background texture} of this screen. ARG 1 vOffset COMMENT an offset applied to the V coordinate of the background texture METHOD method_25435 getNarrationMessage ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping b/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping index b72f867606..ebe7c5d5cc 100644 --- a/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping +++ b/mappings/net/minecraft/client/gui/screen/ScreenTexts.mapping @@ -11,4 +11,5 @@ CLASS net/minecraft/class_5244 net/minecraft/client/gui/screen/ScreenTexts METHOD method_27654 getToggleText (Z)Lnet/minecraft/class_2561; ARG 0 value METHOD method_30619 composeToggleText (Lnet/minecraft/class_2561;Z)Lnet/minecraft/class_5250; + ARG 0 text ARG 1 value diff --git a/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping b/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping index 4cb4113b52..35b7eea753 100644 --- a/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/SplashScreen.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_425 net/minecraft/client/gui/screen/SplashScreen - FIELD field_17767 reloadMonitor Lnet/minecraft/class_4011; + FIELD field_17767 reload Lnet/minecraft/class_4011; FIELD field_17770 progress F - FIELD field_17771 applyCompleteTime J + FIELD field_17771 reloadCompleteTime J FIELD field_18217 client Lnet/minecraft/class_310; FIELD field_18218 exceptionHandler Ljava/util/function/Consumer; FIELD field_18219 reloading Z @@ -16,10 +16,6 @@ CLASS net/minecraft/class_425 net/minecraft/client/gui/screen/SplashScreen ARG 4 reloading METHOD method_18103 renderProgressBar (Lnet/minecraft/class_4587;IIIIF)V ARG 1 matrices - ARG 2 x1 - ARG 3 y1 - ARG 4 x2 - ARG 5 y2 ARG 6 opacity METHOD method_18819 init (Lnet/minecraft/class_310;)V ARG 0 client diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping index c96ca41c3e..a4b370c9be 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTab.mapping @@ -29,12 +29,15 @@ CLASS net/minecraft/class_454 net/minecraft/client/gui/screen/advancement/Advanc ARG 1 advancement METHOD method_2309 getTitle ()Lnet/minecraft/class_2561; METHOD method_2310 render (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_2311 drawBackground (Lnet/minecraft/class_4587;IIZ)V + ARG 1 matrices METHOD method_2312 getScreen ()Lnet/minecraft/class_457; METHOD method_2313 move (DD)V ARG 1 offsetX ARG 3 offsetY METHOD method_2314 drawWidgetTooltip (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices METHOD method_2315 drawIcon (IILnet/minecraft/class_918;)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping index fec5b68c77..c7ef96af78 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementTabType.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_453 net/minecraft/client/gui/screen/advancement/Advanc ARG 6 height ARG 7 tabCount METHOD method_2301 drawBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_332;IIZI)V + ARG 1 matrices METHOD method_2302 getTabX (I)I ARG 1 index METHOD method_2303 isClickOnTab (IIIDD)Z diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping index 1f0b1673f4..7394f15de4 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping @@ -6,8 +6,8 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_2706 parent Lnet/minecraft/class_456; FIELD field_2707 children Ljava/util/List; FIELD field_2709 WIDGETS_TEXTURE Lnet/minecraft/class_2960; - FIELD field_2710 yPos I - FIELD field_2711 xPos I + FIELD field_2710 y I + FIELD field_2711 x I FIELD field_2712 display Lnet/minecraft/class_185; FIELD field_2713 title Lnet/minecraft/class_5481; FIELD field_2714 progress Lnet/minecraft/class_167; @@ -45,6 +45,7 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc ARG 3 mouseX ARG 4 mouseY METHOD method_2330 wrapDescription (Lnet/minecraft/class_2561;I)Ljava/util/List; + ARG 1 text ARG 2 width METHOD method_2331 drawTooltip (Lnet/minecraft/class_4587;IIFII)V ARG 1 matrices @@ -55,3 +56,5 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc METHOD method_2333 setProgress (Lnet/minecraft/class_167;)V ARG 1 progress METHOD method_27572 getMaxWidth (Lnet/minecraft/class_5225;Ljava/util/List;)F + ARG 0 textHandler + ARG 1 lines diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping index e6cd21f25e..0021d74fe4 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.mapping @@ -11,10 +11,13 @@ CLASS net/minecraft/class_457 net/minecraft/client/gui/screen/advancement/Advanc METHOD (Lnet/minecraft/class_632;)V ARG 1 advancementHandler METHOD method_2334 drawWidgets (Lnet/minecraft/class_4587;II)V + ARG 1 matrices METHOD method_2335 getAdvancementWidget (Lnet/minecraft/class_161;)Lnet/minecraft/class_456; ARG 1 advancement METHOD method_2336 getTab (Lnet/minecraft/class_161;)Lnet/minecraft/class_454; ARG 1 advancement METHOD method_2337 drawAdvancementTree (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices ARG 2 mouseY METHOD method_2338 drawWidgetTooltip (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping index 4f7afe2789..e774b4be70 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.mapping @@ -10,4 +10,4 @@ CLASS net/minecraft/class_489 net/minecraft/client/gui/screen/ingame/AbstractFur ARG 4 title ARG 5 background METHOD method_19877 (Lnet/minecraft/class_4185;)V - ARG 1 buttonWidget + ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping index c3d1fa378f..902766ca2d 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.mapping @@ -1,7 +1,11 @@ CLASS net/minecraft/class_485 net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen FIELD field_2900 drawStatusEffects Z METHOD method_18642 drawStatusEffectBackgrounds (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V + ARG 1 matrices METHOD method_18643 drawStatusEffectSprites (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V + ARG 1 matrices METHOD method_18644 drawStatusEffectDescriptions (Lnet/minecraft/class_4587;IILjava/lang/Iterable;)V + ARG 1 matrices METHOD method_2476 applyStatusEffectOffset ()V METHOD method_2477 drawStatusEffects (Lnet/minecraft/class_4587;)V + ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping index 71c2310e68..7788ee8080 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping @@ -24,7 +24,7 @@ CLASS net/minecraft/class_3872 net/minecraft/client/gui/screen/ingame/BookScreen METHOD method_17554 setPageProvider (Lnet/minecraft/class_3872$class_3931;)V ARG 1 pageProvider METHOD method_17555 readPages (Lnet/minecraft/class_2487;)Ljava/util/List; - ARG 0 tag + ARG 0 nbt METHOD method_17556 setPage (I)Z ARG 1 index METHOD method_17557 addCloseButton ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping index c3980a92d2..b97eeb9b56 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping @@ -32,10 +32,14 @@ CLASS net/minecraft/class_481 net/minecraft/client/gui/screen/ingame/CreativeInv ARG 1 mouseX ARG 3 mouseY METHOD method_2468 renderTabIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_1761;)V + ARG 1 matrices + ARG 2 group METHOD method_2469 getSelectedTab ()I METHOD method_2470 isCreativeInventorySlot (Lnet/minecraft/class_1735;)Z ARG 1 slot METHOD method_2471 renderTabTooltipIfHovered (Lnet/minecraft/class_4587;Lnet/minecraft/class_1761;II)Z + ARG 1 matrices + ARG 2 group CLASS class_482 LockableSlot CLASS class_483 CreativeScreenHandler FIELD field_2897 itemList Lnet/minecraft/class_2371; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping index 2ef47d7a6b..864f4b9a29 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/FurnaceScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3873 net/minecraft/client/gui/screen/ingame/FurnaceScreen FIELD field_17127 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3858;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping index cea3216ca4..a3aa7158b6 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping @@ -37,8 +37,8 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre ARG 2 inventory ARG 3 title METHOD method_2378 isPointWithinBounds (IIIIDD)Z - ARG 1 xPosition - ARG 2 yPosition + ARG 1 x + ARG 2 y ARG 3 width ARG 4 height ARG 5 pointX @@ -56,14 +56,14 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre ARG 7 button METHOD method_2382 drawItem (Lnet/minecraft/class_1799;IILjava/lang/String;)V ARG 1 stack - ARG 2 xPosition - ARG 3 yPosition + ARG 2 x + ARG 3 y ARG 4 amountText METHOD method_2383 onMouseClick (Lnet/minecraft/class_1735;IILnet/minecraft/class_1713;)V COMMENT @see net.minecraft.screen.ScreenHandler#onSlotClick(int, int, net.minecraft.screen.slot.SlotActionType, net.minecraft.entity.player.PlayerEntity) ARG 1 slot - ARG 2 invSlot - ARG 3 clickData + ARG 2 slotId + ARG 3 button ARG 4 actionType METHOD method_2384 handleHotbarKeyPressed (II)Z ARG 1 keyCode @@ -72,8 +72,8 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre ARG 1 matrices ARG 2 slot METHOD method_2386 getSlotAt (DD)Lnet/minecraft/class_1735; - ARG 1 xPosition - ARG 3 yPosition + ARG 1 x + ARG 3 y METHOD method_2387 isPointOverSlot (Lnet/minecraft/class_1735;DD)Z ARG 1 slot ARG 2 pointX diff --git a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.mapping b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.mapping index 6698d24139..43884a80e7 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/HandledScreens.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3929 net/minecraft/client/gui/screen/ingame/HandledScreens FIELD field_17408 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_17409 PROVIDERS Ljava/util/Map; - METHOD method_17539 validateScreens ()Z + METHOD method_17539 isMissingScreens ()Z METHOD method_17540 getProvider (Lnet/minecraft/class_3917;)Lnet/minecraft/class_3929$class_3930; ARG 0 type METHOD method_17541 open (Lnet/minecraft/class_3917;Lnet/minecraft/class_310;ILnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping index f4b16cc6db..eae629a13a 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/LecternScreen.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_3935 net/minecraft/client/gui/screen/ingame/LecternScreen - FIELD field_17422 container Lnet/minecraft/class_3916; + FIELD field_17422 handler Lnet/minecraft/class_3916; FIELD field_17423 listener Lnet/minecraft/class_1712; METHOD (Lnet/minecraft/class_3916;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 title METHOD method_17572 sendButtonPressPacket (I)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping index 2a0d1b6301..2e8f7d01d4 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr FIELD field_19163 indexStartOffset I FIELD field_19164 scrolling Z FIELD field_26569 TRADES_TEXT Lnet/minecraft/class_2561; - FIELD field_26570 SEPARATOR Lnet/minecraft/class_2561; + FIELD field_26570 SEPARATOR_TEXT Lnet/minecraft/class_2561; FIELD field_26571 DEPRECATED_TEXT Lnet/minecraft/class_2561; FIELD field_2950 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_1728;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping index 88de42e268..15efd474d4 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/SmokerScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3874 net/minecraft/client/gui/screen/ingame/SmokerScreen FIELD field_17128 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_3706;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V - ARG 1 container + ARG 1 handler ARG 2 inventory ARG 3 title diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping index 2f5f6acf26..b7f086f831 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/StonecutterScreen.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_3979 net/minecraft/client/gui/screen/ingame/Stonecutte ARG 2 y ARG 3 scrollOffset METHOD method_17952 renderRecipeBackground (Lnet/minecraft/class_4587;IIIII)V + ARG 1 matrices METHOD method_17953 getMaxScroll ()I METHOD method_17954 shouldScroll ()Z METHOD method_17955 onInventoryChange ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping index 8c5c555490..c91e4b44c3 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping @@ -52,5 +52,6 @@ CLASS net/minecraft/class_497 net/minecraft/client/gui/screen/ingame/StructureBl METHOD method_2514 cancel ()V METHOD method_2515 done ()V METHOD method_2516 updateStructureBlock (Lnet/minecraft/class_2633$class_2634;)Z + ARG 1 action METHOD method_2517 parseInt (Ljava/lang/String;)I METHOD method_2524 updateIgnoreEntitiesButton ()V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping index d2c4b5d642..18a881e3a6 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip METHOD method_20380 directConnect (Z)V ARG 1 confirmedAction METHOD method_2528 setTooltip (Ljava/util/List;)V + ARG 1 tooltipText METHOD method_2529 getServerList ()Lnet/minecraft/class_641; METHOD method_2531 select (Lnet/minecraft/class_4267$class_504;)V ARG 1 entry diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping index db89627c76..55c82a1907 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -40,4 +40,5 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia METHOD method_31335 setOffline (Z)V ARG 1 offline METHOD method_31389 getNarrationMessage (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; + ARG 1 text METHOD method_31390 getStatusText ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/options/AccessibilityOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping similarity index 92% rename from mappings/net/minecraft/client/gui/screen/options/AccessibilityOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping index a46a9dc99b..9a053c13ab 100644 --- a/mappings/net/minecraft/client/gui/screen/options/AccessibilityOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/options/AccessibilityOptionsScreen +CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/option/AccessibilityOptionsScreen FIELD field_18730 OPTIONS [Lnet/minecraft/class_316; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent diff --git a/mappings/net/minecraft/client/gui/screen/options/ChatOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/ChatOptionsScreen.mapping similarity index 90% rename from mappings/net/minecraft/client/gui/screen/options/ChatOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/option/ChatOptionsScreen.mapping index 9dbd9f3f6f..2f4a0a5f75 100644 --- a/mappings/net/minecraft/client/gui/screen/options/ChatOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/ChatOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_404 net/minecraft/client/gui/screen/options/ChatOptionsScreen +CLASS net/minecraft/class_404 net/minecraft/client/gui/screen/option/ChatOptionsScreen FIELD field_2352 OPTIONS [Lnet/minecraft/class_316; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent diff --git a/mappings/net/minecraft/client/gui/screen/options/ControlsListWidget.mapping b/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping similarity index 97% rename from mappings/net/minecraft/client/gui/screen/options/ControlsListWidget.mapping rename to mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping index 0fb6c32046..b910b7718a 100644 --- a/mappings/net/minecraft/client/gui/screen/options/ControlsListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/options/ControlsListWidget +CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/option/ControlsListWidget FIELD field_2733 maxKeyNameLength I FIELD field_2735 parent Lnet/minecraft/class_458; METHOD (Lnet/minecraft/class_458;Lnet/minecraft/class_310;)V diff --git a/mappings/net/minecraft/client/gui/screen/options/ControlsOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/ControlsOptionsScreen.mapping similarity index 95% rename from mappings/net/minecraft/client/gui/screen/options/ControlsOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/option/ControlsOptionsScreen.mapping index 1fbcfb17aa..d448777ab0 100644 --- a/mappings/net/minecraft/client/gui/screen/options/ControlsOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/ControlsOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_458 net/minecraft/client/gui/screen/options/ControlsOptionsScreen +CLASS net/minecraft/class_458 net/minecraft/client/gui/screen/option/ControlsOptionsScreen FIELD field_2723 time J FIELD field_2725 resetButton Lnet/minecraft/class_4185; FIELD field_2727 focusedBinding Lnet/minecraft/class_304; diff --git a/mappings/net/minecraft/client/gui/screen/options/GameOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping similarity index 94% rename from mappings/net/minecraft/client/gui/screen/options/GameOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping index 691ae44408..bced23512d 100644 --- a/mappings/net/minecraft/client/gui/screen/options/GameOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/options/GameOptionsScreen +CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/option/GameOptionsScreen FIELD field_21335 parent Lnet/minecraft/class_437; FIELD field_21336 gameOptions Lnet/minecraft/class_315; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/client/gui/screen/options/LanguageOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping similarity index 91% rename from mappings/net/minecraft/client/gui/screen/options/LanguageOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping index cb77e3b8e8..63b3bec1e9 100644 --- a/mappings/net/minecraft/client/gui/screen/options/LanguageOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.mapping @@ -1,9 +1,9 @@ -CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/options/LanguageOptionsScreen +CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/option/LanguageOptionsScreen FIELD field_2486 languageSelectionList Lnet/minecraft/class_426$class_4195; FIELD field_2487 forceUnicodeButton Lnet/minecraft/class_349; FIELD field_2488 languageManager Lnet/minecraft/class_1076; FIELD field_2491 doneButton Lnet/minecraft/class_4185; - FIELD field_26543 WARNING_TEXT Lnet/minecraft/class_2561; + FIELD field_26543 LANGUAGE_WARNING_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;Lnet/minecraft/class_1076;)V ARG 1 parent ARG 2 options diff --git a/mappings/net/minecraft/client/gui/screen/options/MouseOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping similarity index 92% rename from mappings/net/minecraft/client/gui/screen/options/MouseOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping index 649509307e..df5e0a7e52 100644 --- a/mappings/net/minecraft/client/gui/screen/options/MouseOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/MouseOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/options/MouseOptionsScreen +CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/option/MouseOptionsScreen FIELD field_19246 buttonList Lnet/minecraft/class_353; FIELD field_19247 OPTIONS [Lnet/minecraft/class_316; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V diff --git a/mappings/net/minecraft/client/gui/screen/options/NarratorOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/NarratorOptionsScreen.mapping similarity index 95% rename from mappings/net/minecraft/client/gui/screen/options/NarratorOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/option/NarratorOptionsScreen.mapping index 3c86c6e381..a5c5d05146 100644 --- a/mappings/net/minecraft/client/gui/screen/options/NarratorOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/NarratorOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5500 net/minecraft/client/gui/screen/options/NarratorOptionsScreen +CLASS net/minecraft/class_5500 net/minecraft/client/gui/screen/option/NarratorOptionsScreen FIELD field_26679 options [Lnet/minecraft/class_316; FIELD field_26680 narratorButton Lnet/minecraft/class_339; FIELD field_26681 buttonList Lnet/minecraft/class_353; diff --git a/mappings/net/minecraft/client/gui/screen/options/OptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping similarity index 98% rename from mappings/net/minecraft/client/gui/screen/options/OptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping index 1662241b1b..6cc16509b9 100644 --- a/mappings/net/minecraft/client/gui/screen/options/OptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/options/OptionsScreen +CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/option/OptionsScreen FIELD field_18745 difficulty Lnet/minecraft/class_1267; FIELD field_2500 difficultyButton Lnet/minecraft/class_4185; FIELD field_2501 parent Lnet/minecraft/class_437; diff --git a/mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/SkinOptionsScreen.mapping similarity index 95% rename from mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/option/SkinOptionsScreen.mapping index fd4625b05f..2975a023e6 100644 --- a/mappings/net/minecraft/client/gui/screen/options/SkinOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/SkinOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_440 net/minecraft/client/gui/screen/options/SkinOptionsScreen +CLASS net/minecraft/class_440 net/minecraft/client/gui/screen/option/SkinOptionsScreen METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 gameOptions diff --git a/mappings/net/minecraft/client/gui/screen/options/SoundOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping similarity index 92% rename from mappings/net/minecraft/client/gui/screen/options/SoundOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping index d94e93e0a2..39a51b26b7 100644 --- a/mappings/net/minecraft/client/gui/screen/options/SoundOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/SoundOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/options/SoundOptionsScreen +CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/option/SoundOptionsScreen METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent ARG 2 options diff --git a/mappings/net/minecraft/client/gui/screen/VideoOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping similarity index 91% rename from mappings/net/minecraft/client/gui/screen/VideoOptionsScreen.mapping rename to mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping index bf5ab5690f..d7c9d27cff 100644 --- a/mappings/net/minecraft/client/gui/screen/VideoOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_446 net/minecraft/client/gui/screen/VideoOptionsScreen +CLASS net/minecraft/class_446 net/minecraft/client/gui/screen/option/VideoOptionsScreen FIELD field_19186 mipmapLevels I FIELD field_25682 GRAPHICS_FABULOUS_TEXT Lnet/minecraft/class_2561; FIELD field_25683 GRAPHICS_WARNING_MESSAGE_TEXT Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping b/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping index 7064208bc9..88cf6ed7f3 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/ResourcePackOrganizer.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_5369 net/minecraft/client/gui/screen/pack/ResourcePack FIELD field_25626 resourcePackManager Lnet/minecraft/class_3283; METHOD (Ljava/lang/Runnable;Ljava/util/function/Function;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;)V ARG 1 updateCallback + ARG 3 resourcePackManager METHOD method_29639 getDisabledPacks ()Ljava/util/stream/Stream; METHOD method_29642 apply ()V METHOD method_29643 getEnabledPacks ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping index 1213697081..0776892374 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA ARG 6 areaCenterY ARG 7 delta METHOD method_2618 renderGrid (Lnet/minecraft/class_4587;IIIIII)V + ARG 1 matrices CLASS class_509 AlternativeButtonWidget FIELD field_3114 recipe Lnet/minecraft/class_1860; FIELD field_3115 craftable Z diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping index 413d763c59..902db1abc7 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_505 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 1 recipe METHOD method_2566 getRecipe ()Lnet/minecraft/class_1860; METHOD method_2567 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_310;IIZF)V + ARG 1 matrices + ARG 2 client METHOD method_2569 addSlot (Lnet/minecraft/class_1856;II)V ARG 1 ingredient ARG 2 x diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping index dadd15ec66..2e9ea6c1f3 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookResults.mapping @@ -17,7 +17,9 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2627 setResults (Ljava/util/List;Z)V ARG 2 resetCurrentPage METHOD method_2628 drawTooltip (Lnet/minecraft/class_4587;II)V + ARG 1 matrices METHOD method_2629 onRecipesDisplayed (Ljava/util/List;)V + ARG 1 recipes METHOD method_2630 setGui (Lnet/minecraft/class_507;)V METHOD method_2631 getLastClickedRecipe ()Lnet/minecraft/class_1860; METHOD method_2632 mouseClicked (DDIIIII)Z @@ -30,8 +32,10 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 9 areaHeight METHOD method_2633 getRecipeBook ()Lnet/minecraft/class_3439; METHOD method_2634 draw (Lnet/minecraft/class_4587;IIIIF)V + ARG 1 matrices METHOD method_2635 getLastClickedResults ()Lnet/minecraft/class_516; METHOD method_2636 initialize (Lnet/minecraft/class_310;II)V + ARG 1 client ARG 2 parentLeft ARG 3 parentTop METHOD method_2637 getMinecraftClient ()Lnet/minecraft/class_310; diff --git a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping index 984d81e5bc..5b6b55a535 100644 --- a/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/MoreOptionsDialog.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions FIELD field_24596 mapTypeButton Lnet/minecraft/class_4185; FIELD field_24597 customizeTypeButton Lnet/minecraft/class_4185; FIELD field_24598 generatorOptions Lnet/minecraft/class_5285; - FIELD field_24600 seedText Ljava/util/OptionalLong; + FIELD field_24600 seed Ljava/util/OptionalLong; FIELD field_25046 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_25047 CUSTOM_TEXT Lnet/minecraft/class_2561; FIELD field_25048 importSettingsButton Lnet/minecraft/class_4185; @@ -20,7 +20,7 @@ CLASS net/minecraft/class_5292 net/minecraft/client/gui/screen/world/MoreOptions ARG 1 registryManager ARG 2 generatorOptions ARG 3 generatorType - ARG 4 seedText + ARG 4 seed METHOD method_28085 isDebugWorld ()Z METHOD method_28086 setGeneratorOptions (Lnet/minecraft/class_5285;)V ARG 1 generatorOptions diff --git a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping index b8521d96f3..2b63e2a35a 100644 --- a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping @@ -12,3 +12,4 @@ CLASS net/minecraft/class_526 net/minecraft/client/gui/screen/world/SelectWorldS METHOD method_19940 worldSelected (Z)V ARG 1 active METHOD method_2739 setTooltip (Ljava/util/List;)V + ARG 1 tooltipText diff --git a/mappings/net/minecraft/client/gui/widget/AbstractPressableButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/AbstractPressableButtonWidget.mapping deleted file mode 100644 index 4e632d940b..0000000000 --- a/mappings/net/minecraft/client/gui/widget/AbstractPressableButtonWidget.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_4264 net/minecraft/client/gui/widget/AbstractPressableButtonWidget - METHOD method_25306 onPress ()V diff --git a/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping b/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping index d8d7f5cf8b..94faafcf7a 100644 --- a/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/ButtonListWidget ARG 1 mouseX ARG 3 mouseY METHOD method_31046 getButtonFor (Lnet/minecraft/class_316;)Lnet/minecraft/class_339; + ARG 1 option CLASS class_354 ButtonEntry FIELD field_18214 buttons Ljava/util/List; METHOD (Ljava/util/List;)V diff --git a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping similarity index 79% rename from mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping rename to mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index b807d8ef47..21df50b233 100644 --- a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -1,8 +1,11 @@ -CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidget +CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget + COMMENT A clickable widget is a GUI element that has many methods to handle different + COMMENT mouse actions. In addition, it allows a message to be rendered on the widget + COMMENT and narrated when the widget is selected. FIELD field_22754 message Lnet/minecraft/class_2561; FIELD field_22755 wasHovered Z FIELD field_22756 focused Z - FIELD field_22757 WIDGETS_LOCATION Lnet/minecraft/class_2960; + FIELD field_22757 WIDGETS_TEXTURE Lnet/minecraft/class_2960; FIELD field_22758 width I FIELD field_22759 height I FIELD field_22760 x I @@ -34,7 +37,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidg ARG 1 matrices ARG 2 mouseX ARG 3 mouseY - METHOD method_25353 renderBg (Lnet/minecraft/class_4587;Lnet/minecraft/class_310;II)V + METHOD method_25353 renderBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_310;II)V ARG 1 matrices ARG 2 client ARG 3 mouseX @@ -61,6 +64,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidg METHOD method_25362 queueNarration (I)V ARG 1 delay METHOD method_25363 onFocusedChanged (Z)V + ARG 1 newFocused METHOD method_25364 getHeight ()I METHOD method_25365 setFocused (Z)V ARG 1 focused diff --git a/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping b/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping new file mode 100644 index 0000000000..77524be225 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/PressableWidget.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_4264 net/minecraft/client/gui/widget/PressableWidget + COMMENT A pressable widget has a press action. It is pressed when it is clicked. It is + COMMENT also pressed when enter or space keys are pressed when it is selected. + METHOD method_25306 onPress ()V diff --git a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping index 2ba98be7e5..ec4f1ac562 100644 --- a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_357 net/minecraft/client/gui/widget/SliderWidget ARG 2 y ARG 3 width ARG 4 height + ARG 5 text ARG 6 value METHOD method_25344 applyValue ()V METHOD method_25345 setValueFromMouse (D)V diff --git a/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping index ad2a7f2c4a..fbf4a5206b 100644 --- a/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_344 net/minecraft/client/gui/widget/TexturedButtonWidg ARG 9 textureWidth ARG 10 textureHeight ARG 11 pressAction + ARG 13 text METHOD (IIIIIIILnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping index 17740955c6..2490e0646a 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -24,7 +24,8 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart ARG 1 model ARG 2 textureOffsetU ARG 3 textureOffsetV - METHOD method_17138 copyPositionAndRotation (Lnet/minecraft/class_630;)V + METHOD method_17138 copyTransform (Lnet/minecraft/class_630;)V + ARG 1 part METHOD method_22698 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;II)V ARG 1 matrices ARG 2 vertices @@ -42,7 +43,7 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart METHOD method_22700 getRandomCuboid (Ljava/util/Random;)Lnet/minecraft/class_630$class_628; ARG 1 random METHOD method_22702 renderCuboids (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;IIFFFF)V - ARG 1 matrices + ARG 1 entry ARG 2 vertexConsumer ARG 3 light ARG 4 overlay diff --git a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping index d2d65c0cda..2a5096a12e 100644 --- a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHandler - FIELD field_3706 parentGui Lnet/minecraft/class_437; + FIELD field_3706 parentScreen Lnet/minecraft/class_437; FIELD field_3707 connection Lnet/minecraft/class_2535; FIELD field_3708 client Lnet/minecraft/class_310; FIELD field_3709 profile Lcom/mojang/authlib/GameProfile; diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index ca4746c7c1..960353320d 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -60,6 +60,7 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity ARG 1 x ARG 2 z METHOD method_30674 wouldCollideAt (Lnet/minecraft/class_2338;)Z + ARG 1 pos METHOD method_3130 getRecipeBook ()Lnet/minecraft/class_299; METHOD method_3131 hasJumpingMount ()Z METHOD method_3132 openRidingInventory ()V diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index f01d2c4e7c..40835026c3 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -84,7 +84,9 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 1 slot METHOD method_2917 interactEntityAtLocation (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_3966;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player + ARG 2 entity ARG 3 hitResult + ARG 4 hand METHOD method_2918 attackEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;)V ARG 1 player ARG 2 target diff --git a/mappings/net/minecraft/client/network/DataQueryHandler.mapping b/mappings/net/minecraft/client/network/DataQueryHandler.mapping index f0343bb0f7..b27e935299 100644 --- a/mappings/net/minecraft/client/network/DataQueryHandler.mapping +++ b/mappings/net/minecraft/client/network/DataQueryHandler.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_300 net/minecraft/client/network/DataQueryHandler ARG 2 callback METHOD method_1404 handleQueryResponse (ILnet/minecraft/class_2487;)Z ARG 1 transactionId - ARG 2 tag + ARG 2 nbt METHOD method_1405 queryEntityNbt (ILjava/util/function/Consumer;)V ARG 1 entityNetworkId ARG 2 callback diff --git a/mappings/net/minecraft/client/network/PlayerListEntry.mapping b/mappings/net/minecraft/client/network/PlayerListEntry.mapping index 60a0f051b6..87ba7a050b 100644 --- a/mappings/net/minecraft/client/network/PlayerListEntry.mapping +++ b/mappings/net/minecraft/client/network/PlayerListEntry.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry METHOD method_2962 setDisplayName (Lnet/minecraft/class_2561;)V ARG 1 displayName METHOD method_2963 setGameMode (Lnet/minecraft/class_1934;)V + ARG 1 gameMode METHOD method_2966 getProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_2967 hasSkinTexture ()Z COMMENT Checks if the player represented by this entry has a custom skin. diff --git a/mappings/net/minecraft/network/ServerAddress.mapping b/mappings/net/minecraft/client/network/ServerAddress.mapping similarity index 82% rename from mappings/net/minecraft/network/ServerAddress.mapping rename to mappings/net/minecraft/client/network/ServerAddress.mapping index 56411599ba..1d0919fa04 100644 --- a/mappings/net/minecraft/network/ServerAddress.mapping +++ b/mappings/net/minecraft/client/network/ServerAddress.mapping @@ -1,8 +1,9 @@ -CLASS net/minecraft/class_639 net/minecraft/network/ServerAddress +CLASS net/minecraft/class_639 net/minecraft/client/network/ServerAddress FIELD field_3734 address Ljava/lang/String; FIELD field_3735 port I METHOD (Ljava/lang/String;I)V - ARG 1 address + ARG 1 host + ARG 2 port METHOD method_2950 parse (Ljava/lang/String;)Lnet/minecraft/class_639; ARG 0 address METHOD method_2951 portOrDefault (Ljava/lang/String;I)I diff --git a/mappings/net/minecraft/client/network/ServerInfo.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping index 41bc7d470b..8e4d195c6e 100644 --- a/mappings/net/minecraft/client/network/ServerInfo.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo + COMMENT The information of a server entry in the list of servers available in + COMMENT the multiplayer screen from the menu. The list of these servers is + COMMENT stored in the {@code servers.dat} file within the client game directory. FIELD field_3752 name Ljava/lang/String; FIELD field_3753 playerCountLabel Lnet/minecraft/class_2561; FIELD field_3754 online Z - FIELD field_3755 resourcePackState Lnet/minecraft/class_642$class_643; + FIELD field_3755 resourcePackPolicy Lnet/minecraft/class_642$class_643; FIELD field_3756 protocolVersion I FIELD field_3757 label Lnet/minecraft/class_2561; FIELD field_3758 ping J @@ -16,14 +19,22 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo ARG 2 address ARG 3 local METHOD method_2989 setIcon (Ljava/lang/String;)V - METHOD method_2990 getResourcePack ()Lnet/minecraft/class_642$class_643; + ARG 1 icon + METHOD method_2990 getResourcePackPolicy ()Lnet/minecraft/class_642$class_643; + COMMENT Returns the policy on resource packs sent by this server. METHOD method_2991 getIcon ()Ljava/lang/String; - METHOD method_2992 serialize ()Lnet/minecraft/class_2487; - METHOD method_2993 deserialize (Lnet/minecraft/class_2487;)Lnet/minecraft/class_642; - ARG 0 tag + METHOD method_2992 toNbt ()Lnet/minecraft/class_2487; + METHOD method_2993 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_642; + ARG 0 root METHOD method_2994 isLocal ()Z - METHOD method_2995 setResourcePackState (Lnet/minecraft/class_642$class_643;)V + METHOD method_2995 setResourcePackPolicy (Lnet/minecraft/class_642$class_643;)V + COMMENT Sets the resource pack policy on this server. + COMMENT + COMMENT

This is called when a user has responded to the prompt on whether to + COMMENT accept server resource packs from this server in the future. + ARG 1 policy METHOD method_2996 copyFrom (Lnet/minecraft/class_642;)V + ARG 1 serverInfo CLASS class_643 ResourcePackState FIELD field_3765 name Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/options/AoMode.mapping b/mappings/net/minecraft/client/option/AoMode.mapping similarity index 85% rename from mappings/net/minecraft/client/options/AoMode.mapping rename to mappings/net/minecraft/client/option/AoMode.mapping index 29c0679c4d..c90e8c8fb5 100644 --- a/mappings/net/minecraft/client/options/AoMode.mapping +++ b/mappings/net/minecraft/client/option/AoMode.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4060 net/minecraft/client/options/AoMode +CLASS net/minecraft/class_4060 net/minecraft/client/option/AoMode FIELD field_18147 VALUES [Lnet/minecraft/class_4060; FIELD field_18148 id I FIELD field_18149 translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/AttackIndicator.mapping b/mappings/net/minecraft/client/option/AttackIndicator.mapping similarity index 83% rename from mappings/net/minecraft/client/options/AttackIndicator.mapping rename to mappings/net/minecraft/client/option/AttackIndicator.mapping index 02a8455359..4ce8036afc 100644 --- a/mappings/net/minecraft/client/options/AttackIndicator.mapping +++ b/mappings/net/minecraft/client/option/AttackIndicator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4061 net/minecraft/client/options/AttackIndicator +CLASS net/minecraft/class_4061 net/minecraft/client/option/AttackIndicator FIELD field_18154 VALUES [Lnet/minecraft/class_4061; FIELD field_18155 id I FIELD field_18156 translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/BooleanOption.mapping b/mappings/net/minecraft/client/option/BooleanOption.mapping similarity index 75% rename from mappings/net/minecraft/client/options/BooleanOption.mapping rename to mappings/net/minecraft/client/option/BooleanOption.mapping index 2d80005d8d..41f3dc8596 100644 --- a/mappings/net/minecraft/client/options/BooleanOption.mapping +++ b/mappings/net/minecraft/client/option/BooleanOption.mapping @@ -1,10 +1,15 @@ -CLASS net/minecraft/class_4062 net/minecraft/client/options/BooleanOption +CLASS net/minecraft/class_4062 net/minecraft/client/option/BooleanOption FIELD field_18158 getter Ljava/util/function/Predicate; FIELD field_18159 setter Ljava/util/function/BiConsumer; METHOD (Ljava/lang/String;Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V ARG 1 key ARG 2 getter ARG 3 setter + METHOD (Ljava/lang/String;Lnet/minecraft/class_2561;Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V + ARG 1 key + ARG 2 tooltip + ARG 3 getter + ARG 4 setter METHOD method_18491 toggle (Lnet/minecraft/class_315;)V ARG 1 options METHOD method_18492 set (Lnet/minecraft/class_315;Ljava/lang/String;)V diff --git a/mappings/net/minecraft/client/options/ChatVisibility.mapping b/mappings/net/minecraft/client/option/ChatVisibility.mapping similarity index 83% rename from mappings/net/minecraft/client/options/ChatVisibility.mapping rename to mappings/net/minecraft/client/option/ChatVisibility.mapping index 2a00d65d1e..c03052573a 100644 --- a/mappings/net/minecraft/client/options/ChatVisibility.mapping +++ b/mappings/net/minecraft/client/option/ChatVisibility.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1659 net/minecraft/client/options/ChatVisibility +CLASS net/minecraft/class_1659 net/minecraft/client/option/ChatVisibility FIELD field_7534 VALUES [Lnet/minecraft/class_1659; FIELD field_7535 id I FIELD field_7540 translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/CloudRenderMode.mapping b/mappings/net/minecraft/client/option/CloudRenderMode.mapping similarity index 83% rename from mappings/net/minecraft/client/options/CloudRenderMode.mapping rename to mappings/net/minecraft/client/option/CloudRenderMode.mapping index b56c80ff12..1fddfa86e2 100644 --- a/mappings/net/minecraft/client/options/CloudRenderMode.mapping +++ b/mappings/net/minecraft/client/option/CloudRenderMode.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4063 net/minecraft/client/options/CloudRenderMode +CLASS net/minecraft/class_4063 net/minecraft/client/option/CloudRenderMode FIELD field_18165 VALUES [Lnet/minecraft/class_4063; FIELD field_18166 id I FIELD field_18167 translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/CyclingOption.mapping b/mappings/net/minecraft/client/option/CyclingOption.mapping similarity index 88% rename from mappings/net/minecraft/client/options/CyclingOption.mapping rename to mappings/net/minecraft/client/option/CyclingOption.mapping index 7d94cc117e..5c00494b25 100644 --- a/mappings/net/minecraft/client/options/CyclingOption.mapping +++ b/mappings/net/minecraft/client/option/CyclingOption.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4064 net/minecraft/client/options/CyclingOption +CLASS net/minecraft/class_4064 net/minecraft/client/option/CyclingOption FIELD field_18169 setter Ljava/util/function/BiConsumer; FIELD field_18170 messageProvider Ljava/util/function/BiFunction; METHOD (Ljava/lang/String;Ljava/util/function/BiConsumer;Ljava/util/function/BiFunction;)V diff --git a/mappings/net/minecraft/client/options/DoubleOption.mapping b/mappings/net/minecraft/client/option/DoubleOption.mapping similarity index 93% rename from mappings/net/minecraft/client/options/DoubleOption.mapping rename to mappings/net/minecraft/client/option/DoubleOption.mapping index 8b6e92ca0e..30317a3d41 100644 --- a/mappings/net/minecraft/client/options/DoubleOption.mapping +++ b/mappings/net/minecraft/client/option/DoubleOption.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4067 net/minecraft/client/options/DoubleOption +CLASS net/minecraft/class_4067 net/minecraft/client/option/DoubleOption FIELD field_18204 step F FIELD field_18205 min D FIELD field_18206 max D diff --git a/mappings/net/minecraft/client/option/FullscreenOption.mapping b/mappings/net/minecraft/client/option/FullscreenOption.mapping new file mode 100644 index 0000000000..c9a00fb21e --- /dev/null +++ b/mappings/net/minecraft/client/option/FullscreenOption.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_4454 net/minecraft/client/option/FullscreenOption + METHOD (Lnet/minecraft/class_1041;)V + ARG 1 window + METHOD (Lnet/minecraft/class_1041;Lnet/minecraft/class_313;)V + ARG 1 window + ARG 2 monitor + METHOD method_21588 (Lnet/minecraft/class_313;Lnet/minecraft/class_319;)Ljava/lang/Double; + ARG 1 videoMode + METHOD method_21589 (Lnet/minecraft/class_313;Lnet/minecraft/class_1041;Lnet/minecraft/class_315;)Ljava/lang/Double; + ARG 2 options + METHOD method_21590 (Lnet/minecraft/class_313;Lnet/minecraft/class_1041;Lnet/minecraft/class_315;Ljava/lang/Double;)V + ARG 2 options + ARG 3 newValue + METHOD method_27464 (Lnet/minecraft/class_313;Lnet/minecraft/class_315;Lnet/minecraft/class_4067;)Lnet/minecraft/class_2561; + ARG 1 options + ARG 2 option diff --git a/mappings/net/minecraft/client/options/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping similarity index 94% rename from mappings/net/minecraft/client/options/GameOptions.mapping rename to mappings/net/minecraft/client/option/GameOptions.mapping index c67ebc2bef..c058dc03eb 100644 --- a/mappings/net/minecraft/client/options/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions +CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_1814 cloudRenderMode Lnet/minecraft/class_4063; FIELD field_1815 hideServerAddress Z FIELD field_1816 keySmoothCamera Lnet/minecraft/class_304; @@ -114,7 +114,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions ARG 1 category ARG 2 volume METHOD method_1626 update (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_1627 addResourcePackProfilesToManager (Lnet/minecraft/class_3283;)V ARG 1 manager METHOD method_1630 getSoundVolume (Lnet/minecraft/class_3419;)F @@ -133,7 +133,12 @@ CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions METHOD method_1641 setKeyCode (Lnet/minecraft/class_304;Lnet/minecraft/class_3675$class_306;)V ARG 1 key ARG 2 code - METHOD method_1643 onPlayerModelPartChange ()V + METHOD method_1643 sendClientSettings ()V + COMMENT Sends the current client settings to the server if the client is + COMMENT connected to a server. + COMMENT + COMMENT

Called when a player joins the game or when client settings are + COMMENT changed. METHOD method_19343 getTextBackgroundOpacity (F)F ARG 1 fallback METHOD method_19344 getTextBackgroundColor (I)I diff --git a/mappings/net/minecraft/client/options/GraphicsMode.mapping b/mappings/net/minecraft/client/option/GraphicsMode.mapping similarity index 85% rename from mappings/net/minecraft/client/options/GraphicsMode.mapping rename to mappings/net/minecraft/client/option/GraphicsMode.mapping index 932e0f11e6..4d51122094 100644 --- a/mappings/net/minecraft/client/options/GraphicsMode.mapping +++ b/mappings/net/minecraft/client/option/GraphicsMode.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5365 net/minecraft/client/options/GraphicsMode +CLASS net/minecraft/class_5365 net/minecraft/client/option/GraphicsMode FIELD field_25430 VALUES [Lnet/minecraft/class_5365; FIELD field_25431 id I FIELD field_25432 translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/HotbarStorage.mapping b/mappings/net/minecraft/client/option/HotbarStorage.mapping similarity index 83% rename from mappings/net/minecraft/client/options/HotbarStorage.mapping rename to mappings/net/minecraft/client/option/HotbarStorage.mapping index 4d18b86ca7..591951c16c 100644 --- a/mappings/net/minecraft/client/options/HotbarStorage.mapping +++ b/mappings/net/minecraft/client/option/HotbarStorage.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_302 net/minecraft/client/options/HotbarStorage +CLASS net/minecraft/class_302 net/minecraft/client/option/HotbarStorage FIELD field_1644 entries [Lnet/minecraft/class_748; FIELD field_1645 loaded Z FIELD field_1646 file Ljava/io/File; diff --git a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping new file mode 100644 index 0000000000..c5b3aaf75f --- /dev/null +++ b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_748 net/minecraft/client/option/HotbarStorageEntry + FIELD field_3948 delegate Lnet/minecraft/class_2371; + METHOD method_3152 readNbtList (Lnet/minecraft/class_2499;)V + ARG 1 list + METHOD method_3153 toNbtList ()Lnet/minecraft/class_2499; diff --git a/mappings/net/minecraft/client/options/KeyBinding.mapping b/mappings/net/minecraft/client/option/KeyBinding.mapping similarity index 67% rename from mappings/net/minecraft/client/options/KeyBinding.mapping rename to mappings/net/minecraft/client/option/KeyBinding.mapping index c00d57a43b..d6f287c2b9 100644 --- a/mappings/net/minecraft/client/options/KeyBinding.mapping +++ b/mappings/net/minecraft/client/option/KeyBinding.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_304 net/minecraft/client/options/KeyBinding +CLASS net/minecraft/class_304 net/minecraft/client/option/KeyBinding FIELD field_1652 keyCategories Ljava/util/Set; FIELD field_1653 pressed Z FIELD field_1654 defaultKey Lnet/minecraft/class_3675$class_306; @@ -44,9 +44,33 @@ CLASS net/minecraft/class_304 net/minecraft/client/options/KeyBinding METHOD method_1433 matchesMouse (I)Z ARG 1 code METHOD method_1434 isPressed ()Z + COMMENT {@return if the key is being held down} + COMMENT + COMMENT

Note that if you are continuously calling this method (like every + COMMENT tick), it doesn't always catch all key presses. This is because the key + COMMENT can be pressed and released before the next check. + COMMENT + COMMENT @see #wasPressed() METHOD method_1435 equals (Lnet/minecraft/class_304;)Z ARG 1 other METHOD method_1436 wasPressed ()Z + COMMENT {@return if the key was pressed} + COMMENT + COMMENT

A key binding counts the number of times the key is pressed. This + COMMENT method "consumes" it and returns {@code true} as many times as the key + COMMENT is pressed. + COMMENT + COMMENT

To consume all remaining key presses, while-loop idiom can be used: + COMMENT 

+		COMMENT {@code
+		COMMENT while(keyBinding.wasPressed()) {
+		COMMENT   // do your action
+		COMMENT }
+		COMMENT }
+		COMMENT
+ COMMENT + COMMENT @see #isPressed() + COMMENT @see MC-118107 METHOD method_1437 unpressAll ()V METHOD method_16007 getBoundKeyLocalizedText ()Lnet/minecraft/class_2561; METHOD method_23481 setPressed (Z)V diff --git a/mappings/net/minecraft/client/option/LogarithmicOption.mapping b/mappings/net/minecraft/client/option/LogarithmicOption.mapping new file mode 100644 index 0000000000..753b4655f1 --- /dev/null +++ b/mappings/net/minecraft/client/option/LogarithmicOption.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4287 net/minecraft/client/option/LogarithmicOption diff --git a/mappings/net/minecraft/client/options/NarratorMode.mapping b/mappings/net/minecraft/client/option/NarratorMode.mapping similarity index 83% rename from mappings/net/minecraft/client/options/NarratorMode.mapping rename to mappings/net/minecraft/client/option/NarratorMode.mapping index 945816c01c..d1f94780d6 100644 --- a/mappings/net/minecraft/client/options/NarratorMode.mapping +++ b/mappings/net/minecraft/client/option/NarratorMode.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4065 net/minecraft/client/options/NarratorMode +CLASS net/minecraft/class_4065 net/minecraft/client/option/NarratorMode FIELD field_18180 VALUES [Lnet/minecraft/class_4065; FIELD field_18181 id I FIELD field_24212 name Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/options/Option.mapping b/mappings/net/minecraft/client/option/Option.mapping similarity index 99% rename from mappings/net/minecraft/client/options/Option.mapping rename to mappings/net/minecraft/client/option/Option.mapping index 4626874eeb..77d1cbcbcc 100644 --- a/mappings/net/minecraft/client/options/Option.mapping +++ b/mappings/net/minecraft/client/option/Option.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_316 net/minecraft/client/options/Option +CLASS net/minecraft/class_316 net/minecraft/client/option/Option FIELD field_18184 ENTITY_SHADOWS Lnet/minecraft/class_4062; FIELD field_18185 FORCE_UNICODE_FONT Lnet/minecraft/class_4062; FIELD field_18186 REALMS_NOTIFICATIONS Lnet/minecraft/class_4062; diff --git a/mappings/net/minecraft/client/options/ParticlesMode.mapping b/mappings/net/minecraft/client/option/ParticlesMode.mapping similarity index 83% rename from mappings/net/minecraft/client/options/ParticlesMode.mapping rename to mappings/net/minecraft/client/option/ParticlesMode.mapping index 9281080c38..839e33fbed 100644 --- a/mappings/net/minecraft/client/options/ParticlesMode.mapping +++ b/mappings/net/minecraft/client/option/ParticlesMode.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4066 net/minecraft/client/options/ParticlesMode +CLASS net/minecraft/class_4066 net/minecraft/client/option/ParticlesMode FIELD field_18200 VALUES [Lnet/minecraft/class_4066; FIELD field_18201 id I FIELD field_18202 translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/Perspective.mapping b/mappings/net/minecraft/client/option/Perspective.mapping similarity index 81% rename from mappings/net/minecraft/client/options/Perspective.mapping rename to mappings/net/minecraft/client/option/Perspective.mapping index da1a83c627..74da43ee59 100644 --- a/mappings/net/minecraft/client/options/Perspective.mapping +++ b/mappings/net/minecraft/client/option/Perspective.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5498 net/minecraft/client/options/Perspective +CLASS net/minecraft/class_5498 net/minecraft/client/option/Perspective FIELD field_26667 VALUES [Lnet/minecraft/class_5498; FIELD field_26668 firstPerson Z FIELD field_26669 frontView Z diff --git a/mappings/net/minecraft/client/options/ServerList.mapping b/mappings/net/minecraft/client/option/ServerList.mapping similarity index 81% rename from mappings/net/minecraft/client/options/ServerList.mapping rename to mappings/net/minecraft/client/option/ServerList.mapping index 1def57182d..88af9542fe 100644 --- a/mappings/net/minecraft/client/options/ServerList.mapping +++ b/mappings/net/minecraft/client/option/ServerList.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_641 net/minecraft/client/options/ServerList +CLASS net/minecraft/class_641 net/minecraft/client/option/ServerList FIELD field_3749 servers Ljava/util/List; FIELD field_3750 client Lnet/minecraft/class_310; FIELD field_3751 LOGGER Lorg/apache/logging/log4j/Logger; @@ -6,13 +6,18 @@ CLASS net/minecraft/class_641 net/minecraft/client/options/ServerList ARG 1 client METHOD method_2980 set (ILnet/minecraft/class_642;)V ARG 1 index + ARG 2 serverInfo METHOD method_2981 loadFile ()V METHOD method_2982 get (I)Lnet/minecraft/class_642; + ARG 1 index METHOD method_2983 remove (Lnet/minecraft/class_642;)V + ARG 1 serverInfo METHOD method_2984 size ()I METHOD method_2985 swapEntries (II)V ARG 1 index1 + ARG 2 index2 METHOD method_2986 updateServerListEntry (Lnet/minecraft/class_642;)V ARG 0 e METHOD method_2987 saveFile ()V METHOD method_2988 add (Lnet/minecraft/class_642;)V + ARG 1 serverInfo diff --git a/mappings/net/minecraft/client/options/StickyKeyBinding.mapping b/mappings/net/minecraft/client/option/StickyKeyBinding.mapping similarity index 74% rename from mappings/net/minecraft/client/options/StickyKeyBinding.mapping rename to mappings/net/minecraft/client/option/StickyKeyBinding.mapping index babc16caed..8ac840e182 100644 --- a/mappings/net/minecraft/client/options/StickyKeyBinding.mapping +++ b/mappings/net/minecraft/client/option/StickyKeyBinding.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4666 net/minecraft/client/options/StickyKeyBinding +CLASS net/minecraft/class_4666 net/minecraft/client/option/StickyKeyBinding FIELD field_21334 toggleGetter Ljava/util/function/BooleanSupplier; METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/BooleanSupplier;)V ARG 1 id diff --git a/mappings/net/minecraft/client/options/FullScreenOption.mapping b/mappings/net/minecraft/client/options/FullScreenOption.mapping deleted file mode 100644 index 95ab2d456c..0000000000 --- a/mappings/net/minecraft/client/options/FullScreenOption.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4454 net/minecraft/client/options/FullScreenOption diff --git a/mappings/net/minecraft/client/options/HotbarStorageEntry.mapping b/mappings/net/minecraft/client/options/HotbarStorageEntry.mapping deleted file mode 100644 index b5a380d58f..0000000000 --- a/mappings/net/minecraft/client/options/HotbarStorageEntry.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_748 net/minecraft/client/options/HotbarStorageEntry - FIELD field_3948 delegate Lnet/minecraft/class_2371; - METHOD method_3152 fromListTag (Lnet/minecraft/class_2499;)V - METHOD method_3153 toListTag ()Lnet/minecraft/class_2499; diff --git a/mappings/net/minecraft/client/options/LogarithmicOption.mapping b/mappings/net/minecraft/client/options/LogarithmicOption.mapping deleted file mode 100644 index dedd71e25a..0000000000 --- a/mappings/net/minecraft/client/options/LogarithmicOption.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4287 net/minecraft/client/options/LogarithmicOption diff --git a/mappings/net/minecraft/client/particle/BlockDustParticle.mapping b/mappings/net/minecraft/client/particle/BlockDustParticle.mapping index 1df2a10781..e3f3936d06 100644 --- a/mappings/net/minecraft/client/particle/BlockDustParticle.mapping +++ b/mappings/net/minecraft/client/particle/BlockDustParticle.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_727 net/minecraft/client/particle/BlockDustParticle ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ - ARG 14 blockState + ARG 14 state METHOD method_3106 setBlockPosFromPosition ()Lnet/minecraft/class_727; METHOD method_3107 updateColor (Lnet/minecraft/class_2338;)V ARG 1 blockPos diff --git a/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping b/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping index 03185cc8aa..08ba1fcc64 100644 --- a/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping +++ b/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping @@ -14,5 +14,6 @@ CLASS net/minecraft/class_693 net/minecraft/client/particle/ItemPickupParticle ARG 1 dispatcher ARG 2 bufferStorage ARG 3 world + ARG 4 itemEntity ARG 5 interactingEntity ARG 6 velocity diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index 4d3c0f8852..53489b57e9 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -46,7 +46,8 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle ARG 5 z METHOD method_3064 getBoundingBox ()Lnet/minecraft/class_238; METHOD method_3067 setBoundingBox (Lnet/minecraft/class_238;)V - METHOD method_3068 getColorMultiplier (F)I + ARG 1 boundingBox + METHOD method_3068 getBrightness (F)I ARG 1 tint METHOD method_3069 move (DDD)V ARG 1 dx diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index b14770a8db..b208a116f0 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -14,6 +14,8 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager ARG 2 textureManager METHOD method_18829 clearAtlas ()V METHOD method_18834 registerFactory (Lnet/minecraft/class_2396;Lnet/minecraft/class_702$class_4091;)V + ARG 1 type + ARG 2 factory METHOD method_18836 loadTextureList (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;Ljava/util/Map;)V ARG 1 resourceManager ARG 2 id @@ -27,7 +29,12 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager ARG 1 pos ARG 2 state METHOD method_3048 tickParticles (Ljava/util/Collection;)V + COMMENT Ticks all particles belonging to the same texture sheet. + ARG 1 particles + COMMENT a collection of particles from the same sheet METHOD method_3049 renderParticles (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_765;Lnet/minecraft/class_4184;F)V + ARG 1 matrices + ARG 4 camera METHOD method_3051 addEmitter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2394;I)V ARG 1 entity ARG 2 parameters diff --git a/mappings/net/minecraft/client/realms/FileUpload.mapping b/mappings/net/minecraft/client/realms/FileUpload.mapping index 2cabc4ef06..74786c6ac8 100644 --- a/mappings/net/minecraft/client/realms/FileUpload.mapping +++ b/mappings/net/minecraft/client/realms/FileUpload.mapping @@ -16,7 +16,9 @@ CLASS net/minecraft/class_4337 net/minecraft/client/realms/FileUpload ARG 2 worldId ARG 4 slotId ARG 5 uploadInfo + ARG 6 session ARG 7 clientVersion + ARG 8 uploadStatus METHOD method_20970 cancel ()V METHOD method_20971 requestUpload (I)Lnet/minecraft/class_4429; ARG 1 currentAttempt diff --git a/mappings/net/minecraft/client/realms/RealmsLabel.mapping b/mappings/net/minecraft/client/realms/RealmsLabel.mapping index aee4269218..3643b88297 100644 --- a/mappings/net/minecraft/client/realms/RealmsLabel.mapping +++ b/mappings/net/minecraft/client/realms/RealmsLabel.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_4903 net/minecraft/client/realms/RealmsLabel FIELD field_22821 y I FIELD field_22822 color I METHOD (Lnet/minecraft/class_2561;III)V + ARG 1 text ARG 2 x ARG 3 y ARG 4 color diff --git a/mappings/net/minecraft/client/realms/dto/PlayerInfo.mapping b/mappings/net/minecraft/client/realms/dto/PlayerInfo.mapping index 4478a62aaf..22f426ea43 100644 --- a/mappings/net/minecraft/client/realms/dto/PlayerInfo.mapping +++ b/mappings/net/minecraft/client/realms/dto/PlayerInfo.mapping @@ -17,5 +17,5 @@ CLASS net/minecraft/class_4874 net/minecraft/client/realms/dto/PlayerInfo METHOD method_25048 isOperator ()Z METHOD method_25049 setOnline (Z)V ARG 1 online - METHOD method_25050 getAccepted ()Z - METHOD method_25051 getOnline ()Z + METHOD method_25050 isAccepted ()Z + METHOD method_25051 isOnline ()Z diff --git a/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping b/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping index 26140bade7..dacfed0ee9 100644 --- a/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping +++ b/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_4877 net/minecraft/client/realms/dto/RealmsServer FIELD field_22616 serverPing Lnet/minecraft/class_4880; FIELD field_22617 LOGGER Lorg/apache/logging/log4j/Logger; METHOD equals (Ljava/lang/Object;)Z - ARG 1 obj + ARG 1 o METHOD method_25053 getDescription ()Ljava/lang/String; METHOD method_25054 getWorldName (I)Ljava/lang/String; ARG 1 slotId diff --git a/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping b/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping index 9683e81cde..1bbc7cffeb 100644 --- a/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping +++ b/mappings/net/minecraft/client/realms/gui/RealmsWorldSlotButton.mapping @@ -24,7 +24,15 @@ CLASS net/minecraft/class_4367 net/minecraft/client/realms/gui/RealmsWorldSlotBu ARG 3 y ARG 4 mouseX ARG 5 mouseY - ARG 7 text + ARG 6 active + ARG 7 slotName + ARG 8 slotIndex + ARG 9 imageId + ARG 11 image + ARG 12 empty + ARG 13 minigame + ARG 14 action + ARG 15 actionPrompt METHOD method_25099 getState ()Lnet/minecraft/class_4367$class_4370; CLASS class_4368 Action FIELD field_19678 NOTHING Lnet/minecraft/class_4367$class_4368; diff --git a/mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping index bc2b3be7cc..dd9f8a11f5 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping @@ -6,4 +6,5 @@ CLASS net/minecraft/class_4899 net/minecraft/client/realms/gui/screen/Disconnect FIELD field_22811 textHeight I METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 parent + ARG 2 title ARG 3 reason diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsAcceptRejectButton.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsAcceptRejectButton.mapping index d1e91911b8..0a5db1b524 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsAcceptRejectButton.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsAcceptRejectButton.mapping @@ -14,7 +14,9 @@ CLASS net/minecraft/class_4371 net/minecraft/client/realms/gui/screen/RealmsAcce METHOD method_21111 render (Lnet/minecraft/class_4587;IIII)V ARG 1 matrices METHOD method_21112 render (Lnet/minecraft/class_4587;IIZ)V - ARG 2 y + ARG 1 matrices + ARG 2 x + ARG 3 y METHOD method_21113 render (Lnet/minecraft/class_4587;Ljava/util/List;Lnet/minecraft/class_4904;IIII)V ARG 0 matrices METHOD method_21114 handleClick (Lnet/minecraft/class_4904;Lnet/minecraft/class_4280$class_4281;Ljava/util/List;IDD)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping index bff26c5ac2..26dac37cfc 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupScreen.mapping @@ -21,6 +21,7 @@ CLASS net/minecraft/class_4381 net/minecraft/client/realms/gui/screen/RealmsBack ARG 1 backup ARG 2 key METHOD method_21153 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V + ARG 1 matrices METHOD method_21154 generateChangeList ()V METHOD method_21155 restoreClicked (I)V ARG 1 selectedBackup diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping index 87a68c0bee..7ccd7da595 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_4384 net/minecraft/client/realms/gui/screen/RealmsBrok METHOD method_21179 getFramePositionX (I)I ARG 1 i METHOD method_21180 drawSlotFrame (Lnet/minecraft/class_4587;IIIIZLjava/lang/String;IJLjava/lang/String;Z)V + ARG 1 matrices ARG 2 y ARG 3 xm ARG 4 ym diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping index 16d8535c02..dd914fa008 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping @@ -30,7 +30,9 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 1 i ARG 2 total METHOD method_21201 drawServerStatus (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices METHOD method_21202 drawExpiring (Lnet/minecraft/class_4587;IIIII)V + ARG 1 matrices METHOD method_21203 switchToFullSlot (ILnet/minecraft/class_4877;)V ARG 1 selectedSlot ARG 2 serverData @@ -41,6 +43,7 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf METHOD method_21208 saveSlotSettings (Lnet/minecraft/class_4883;)V ARG 1 options METHOD method_21214 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V + ARG 1 matrices METHOD method_21215 saveSettings (Ljava/lang/String;Ljava/lang/String;)V ARG 1 name ARG 2 desc @@ -53,6 +56,7 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf METHOD method_21220 buttonLeft (I)I ARG 1 i METHOD method_21221 drawExpired (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices METHOD method_21222 switchToEmptySlot (ILnet/minecraft/class_4877;)V ARG 1 selectedSlot ARG 2 serverData @@ -61,6 +65,7 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf METHOD method_21228 frame (I)I ARG 1 ordinal METHOD method_21229 drawOpen (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices METHOD method_21231 backButtonClicked ()V METHOD method_21234 disableButtons ()V METHOD method_21236 switchToMinigame ()V @@ -70,3 +75,4 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf METHOD method_25138 removeButton (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25143 drawClosed (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping index a95f660117..5d3a9bf7f2 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsDownloadLatestWorldScreen.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_4392 net/minecraft/client/realms/gui/screen/RealmsDown FIELD field_19858 extracting Z FIELD field_19859 previousWrittenBytes Ljava/lang/Long; FIELD field_19860 previousTimeSnapshot Ljava/lang/Long; - FIELD field_19861 bytesPersSecond J + FIELD field_19861 bytesPerSecond J FIELD field_19862 animTick I FIELD field_19863 DOTS [Ljava/lang/String; FIELD field_19864 dotIndex I @@ -28,10 +28,14 @@ CLASS net/minecraft/class_4392 net/minecraft/client/realms/gui/screen/RealmsDown ARG 1 downloadLink METHOD method_21265 checkDownloadSize ()V METHOD method_21266 drawDownloadSpeed0 (Lnet/minecraft/class_4587;J)V + ARG 1 matrices METHOD method_21269 backButtonClicked ()V METHOD method_21272 drawDots (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_21274 drawProgressBar (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_21276 drawDownloadSpeed (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_21278 downloadSave ()V METHOD method_21279 downloadCancelled ()V CLASS class_4393 DownloadStatus diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping index be321b2cae..e45435dc0c 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsInviteScreen.mapping @@ -3,10 +3,11 @@ CLASS net/minecraft/class_4395 net/minecraft/client/realms/gui/screen/RealmsInvi FIELD field_19880 serverData Lnet/minecraft/class_4877; FIELD field_19881 configureScreen Lnet/minecraft/class_4388; FIELD field_19882 parent Lnet/minecraft/class_437; - FIELD field_19887 errorMsg Lnet/minecraft/class_2561; + FIELD field_19887 errorMessage Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_437;Lnet/minecraft/class_4877;)V ARG 1 configureScreen ARG 2 parent ARG 3 serverData METHOD method_21284 onInvite ()V METHOD method_21286 showError (Lnet/minecraft/class_2561;)V + ARG 1 errorMessage diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping index 106ff0e7dd..70d7172b42 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongConfirmationScreen.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_4396 net/minecraft/client/realms/gui/screen/RealmsLong FIELD field_19899 yesNoQuestion Z METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_4396$class_4397;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Z)V ARG 2 type + ARG 3 line2 + ARG 4 line3 ARG 5 yesNoQuestion CLASS class_4397 Type FIELD field_19903 Warning Lnet/minecraft/class_4396$class_4397; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping index 8aa782e070..c3f89909d2 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping @@ -13,5 +13,6 @@ CLASS net/minecraft/class_4398 net/minecraft/client/realms/gui/screen/RealmsLong ARG 2 task METHOD method_21291 aborted ()Z METHOD method_21292 setTitle (Lnet/minecraft/class_2561;)V + ARG 1 title METHOD method_21293 cancelOrBackButtonClicked ()V METHOD method_25166 onError ()V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index 0f84bcde66..454516d03a 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -37,7 +37,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_19493 animTick I FIELD field_19494 hasParentalConsent Z FIELD field_19495 checkedParentalConsent Z - FIELD field_19496 checkedClientCompatability Z + FIELD field_19496 checkedClientCompatibility Z FIELD field_19497 hasFetchedServers Z FIELD field_19498 popupOpenedByUser Z FIELD field_19499 justClosedPopup Z @@ -117,7 +117,7 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain METHOD method_20922 pingRegions ()V METHOD method_20924 getOwnedNonExpiredWorldIds ()Ljava/util/List; METHOD method_20928 onRenew ()V - METHOD method_20932 checkClientCompatability ()V + METHOD method_20932 checkClientCompatibility ()V METHOD method_20934 checkUnreadNews ()V METHOD method_20936 checkParentalConsent ()V METHOD method_20938 switchToStage ()V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping index ac6686a1e2..378d8b6e50 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend METHOD method_21300 updateList (I)V ARG 1 slot METHOD method_21306 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V + ARG 1 matrices METHOD method_21307 updateButtonStates ()V METHOD method_21308 reject (I)V ARG 1 slot diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping index aecd57d0c9..c623c04bf8 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay METHOD method_21326 shouldRemoveAndOpdeopButtonBeVisible (I)Z ARG 1 player METHOD method_21327 drawRemoveIcon (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices METHOD method_21328 updateOps (Lnet/minecraft/class_4870;)V ARG 1 ops METHOD method_21332 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V @@ -36,9 +37,11 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay METHOD method_21334 op (I)V ARG 1 index METHOD method_21335 drawOpped (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices METHOD method_21339 deop (I)V ARG 1 index METHOD method_21340 drawNormal (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices METHOD method_21344 uninvite (I)V ARG 1 index METHOD method_21347 deleteFromInvitedList (I)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping index bf9e3588bb..fcd78e54b6 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetWorldScreen.mapping @@ -21,6 +21,13 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsRese ARG 1 parent METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;ILnet/minecraft/class_2561;Ljava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 parent + ARG 2 server + ARG 3 title + ARG 4 subtitle + ARG 5 subtitleColor + ARG 6 buttonTitle + ARG 7 resetCallback + ARG 8 selectFileUploadCallback METHOD method_21370 drawFrame (Lnet/minecraft/class_4587;IILnet/minecraft/class_2561;Lnet/minecraft/class_2960;ZZ)V ARG 2 x ARG 3 y @@ -28,6 +35,7 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsRese METHOD method_21372 resetWorld (Lnet/minecraft/class_4410$class_4413;)V ARG 1 resetWorldInfo METHOD method_21376 setResetTitle (Lnet/minecraft/class_2561;)V + ARG 1 resetTitle METHOD method_21377 switchSlot (Ljava/lang/Runnable;)V ARG 1 callback METHOD method_21378 switchSlot ()V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping index 383fdaf392..7a604dfc10 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping @@ -30,8 +30,10 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele METHOD method_21423 setTitle (Lnet/minecraft/class_2561;)V ARG 1 title METHOD method_21424 renderMousehoverTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V + ARG 1 matrices METHOD method_21425 updateButtonStates ()V METHOD method_21429 setWarning ([Lnet/minecraft/class_2561;)V + ARG 1 warning METHOD method_21430 shouldSelectButtonBeActive ()Z METHOD method_21432 shouldPublisherBeVisible ()Z METHOD method_21436 shouldTrailerBeVisible ()Z diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping index fd9fbf7c0e..a54d08f3e4 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsUploadScreen.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo FIELD field_20191 DOTS [Ljava/lang/String; FIELD field_20193 previousWrittenBytes Ljava/lang/Long; FIELD field_20194 previousTimeSnapshot Ljava/lang/Long; - FIELD field_20195 bytesPersSecond J + FIELD field_20195 bytesPerSecond J FIELD field_20196 UPLOAD_LOCK Ljava/util/concurrent/locks/ReentrantLock; METHOD (JILnet/minecraft/class_4410;Lnet/minecraft/class_34;Ljava/lang/Runnable;)V ARG 1 worldId @@ -35,9 +35,13 @@ CLASS net/minecraft/class_4427 net/minecraft/client/realms/gui/screen/RealmsUplo ARG 1 pathToDirectoryFile METHOD method_21525 onBack ()V METHOD method_21526 drawUploadSpeed0 (Lnet/minecraft/class_4587;J)V + ARG 1 matrices METHOD method_21528 onCancel ()V METHOD method_21530 drawDots (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_21532 drawProgressBar (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_21534 drawUploadSpeed (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_21536 upload ()V METHOD method_21538 uploadCancelled ()V diff --git a/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping b/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping index f4822d8d93..daa0d2e66b 100644 --- a/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping +++ b/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_4358 net/minecraft/client/realms/task/LongRunningTask ARG 1 longRunningMcoTaskScreen METHOD method_21068 tick ()V METHOD method_21069 setTitle (Lnet/minecraft/class_2561;)V + ARG 1 title METHOD method_21070 init ()V METHOD method_21071 abortTask ()V METHOD method_25287 pause (I)V diff --git a/mappings/net/minecraft/client/realms/task/RealmsConnectTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsConnectTask.mapping index 9da64ed3ea..14754ac0d8 100644 --- a/mappings/net/minecraft/client/realms/task/RealmsConnectTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RealmsConnectTask.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_4438 net/minecraft/client/realms/task/RealmsConnectTask FIELD field_20222 realmsConnect Lnet/minecraft/class_4902; - FIELD field_20223 a Lnet/minecraft/class_4878; + FIELD field_20223 address Lnet/minecraft/class_4878; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_4878;)V ARG 1 lastScreen + ARG 2 server + ARG 3 address diff --git a/mappings/net/minecraft/client/realms/util/Errable.mapping b/mappings/net/minecraft/client/realms/util/Errable.mapping index 48c201ea95..71cd8949b6 100644 --- a/mappings/net/minecraft/client/realms/util/Errable.mapping +++ b/mappings/net/minecraft/client/realms/util/Errable.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_5221 net/minecraft/client/realms/util/Errable METHOD method_21067 error (Lnet/minecraft/class_2561;)V + ARG 1 errorMessage METHOD method_27453 error (Ljava/lang/String;)V + ARG 1 errorMessage diff --git a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping index 281e9b3a09..bec1cd8803 100644 --- a/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping +++ b/mappings/net/minecraft/client/realms/util/RealmsUtil.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_4448 net/minecraft/client/realms/util/RealmsUtil FIELD field_20261 authenticationService Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService; FIELD field_20262 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD method_21567 convertToAgePresentation (J)Ljava/lang/String; + ARG 0 milliseconds METHOD method_21568 uuidToName (Ljava/lang/String;)Ljava/lang/String; ARG 0 uuid METHOD method_21569 getTextures (Ljava/lang/String;)Ljava/util/Map; diff --git a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping index 3e9ef904e8..b110e87006 100644 --- a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping +++ b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping @@ -5,4 +5,5 @@ CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook METHOD method_1396 getResultsForGroup (Lnet/minecraft/class_314;)Ljava/util/List; ARG 1 category METHOD method_1400 getGroupForRecipe (Lnet/minecraft/class_1860;)Lnet/minecraft/class_314; + ARG 0 recipe METHOD method_1401 reload (Ljava/lang/Iterable;)V diff --git a/mappings/net/minecraft/client/render/DiffuseLighting.mapping b/mappings/net/minecraft/client/render/DiffuseLighting.mapping index 0d5c336823..a0c9b20028 100644 --- a/mappings/net/minecraft/client/render/DiffuseLighting.mapping +++ b/mappings/net/minecraft/client/render/DiffuseLighting.mapping @@ -5,5 +5,5 @@ CLASS net/minecraft/class_308 net/minecraft/client/render/DiffuseLighting METHOD method_22890 enable ()V METHOD method_24210 disableGuiDepthLighting ()V METHOD method_24211 enableGuiDepthLighting ()V - METHOD method_27869 (Lnet/minecraft/class_1159;)V + METHOD method_27869 disableForLevel (Lnet/minecraft/class_1159;)V ARG 0 modelMatrix diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 184b521fcc..9c7dce09e1 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_4013 shadersEnabled Z FIELD field_4015 client Lnet/minecraft/class_310; FIELD field_4017 lastWorldIconUpdate J - FIELD field_4018 resourceContainer Lnet/minecraft/class_3300; + FIELD field_4018 resourceManager Lnet/minecraft/class_3300; FIELD field_4019 movementFovMultiplier F FIELD field_4023 forcedShaderIndex I FIELD field_4024 shader Lnet/minecraft/class_279; @@ -34,14 +34,20 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_4029 floatingItemWidth F METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_3300;Lnet/minecraft/class_4599;)V ARG 1 client + ARG 2 resourceManager + ARG 3 buffers METHOD method_19418 getCamera ()Lnet/minecraft/class_4184; METHOD method_22709 loadProjectionMatrix (Lnet/minecraft/class_1159;)V METHOD method_22973 getBasicProjectionMatrix (Lnet/minecraft/class_4184;FZ)Lnet/minecraft/class_1159; METHOD method_22974 getLightmapTextureManager ()Lnet/minecraft/class_765; METHOD method_22975 getOverlayTexture ()Lnet/minecraft/class_4608; METHOD method_3167 onCameraEntitySet (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_3168 loadShader (Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_3169 onResized (II)V + ARG 1 width + ARG 2 height METHOD method_3171 renderFloatingItem (IIF)V ARG 1 scaledWidth ARG 2 scaledHeight @@ -51,11 +57,13 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 2 camera ARG 3 tickDelta METHOD method_3174 getNightVisionStrength (Lnet/minecraft/class_1309;F)F + ARG 0 entity METHOD method_3176 updateWorldIcon ()V METHOD method_3182 tick ()V METHOD method_3183 getShader ()Lnet/minecraft/class_279; METHOD method_3184 toggleShadersEnabled ()V METHOD method_3186 bobView (Lnet/minecraft/class_4587;F)V + ARG 1 matrices METHOD method_3188 renderWorld (FJLnet/minecraft/class_4587;)V ARG 1 tickDelta ARG 2 limitTime @@ -77,6 +85,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 2 tickDelta ARG 3 changingFov METHOD method_3198 bobViewWhenHurt (Lnet/minecraft/class_4587;F)V + ARG 1 matrices METHOD method_3199 updateMovementFovMultiplier ()V METHOD method_3202 shouldRenderBlockOutline ()Z METHOD method_3203 reset ()V diff --git a/mappings/net/minecraft/client/gui/MapRenderer.mapping b/mappings/net/minecraft/client/render/MapRenderer.mapping similarity index 95% rename from mappings/net/minecraft/client/gui/MapRenderer.mapping rename to mappings/net/minecraft/client/render/MapRenderer.mapping index 5e3f0cd21d..ee9db67859 100644 --- a/mappings/net/minecraft/client/gui/MapRenderer.mapping +++ b/mappings/net/minecraft/client/render/MapRenderer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_330 net/minecraft/client/gui/MapRenderer +CLASS net/minecraft/class_330 net/minecraft/client/render/MapRenderer FIELD field_2043 textureManager Lnet/minecraft/class_1060; FIELD field_2044 MAP_ICONS_TEXTURE Lnet/minecraft/class_2960; FIELD field_2045 mapTextures Ljava/util/Map; diff --git a/mappings/net/minecraft/client/render/RenderLayers.mapping b/mappings/net/minecraft/client/render/RenderLayers.mapping index bd4cb32fde..ce4145497c 100644 --- a/mappings/net/minecraft/client/render/RenderLayers.mapping +++ b/mappings/net/minecraft/client/render/RenderLayers.mapping @@ -15,3 +15,4 @@ CLASS net/minecraft/class_4696 net/minecraft/client/render/RenderLayers ARG 0 state ARG 1 direct METHOD method_29359 getMovingBlockLayer (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1921; + ARG 0 state diff --git a/mappings/net/minecraft/client/render/SkyProperties.mapping b/mappings/net/minecraft/client/render/SkyProperties.mapping index 9267bd5ff5..459337dc9a 100644 --- a/mappings/net/minecraft/client/render/SkyProperties.mapping +++ b/mappings/net/minecraft/client/render/SkyProperties.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_5294 net/minecraft/client/render/SkyProperties ARG 1 camX ARG 2 camY METHOD method_28111 byDimensionType (Lnet/minecraft/class_2874;)Lnet/minecraft/class_5294; + ARG 0 dimensionType METHOD method_28112 adjustFogColor (Lnet/minecraft/class_243;F)Lnet/minecraft/class_243; COMMENT Transforms the given fog color based on the current height of the sun. This is used in vanilla to darken COMMENT fog during night. diff --git a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping index d2ac67d3e2..cca9003df6 100644 --- a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping +++ b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping @@ -29,7 +29,7 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers ARG 1 single ARG 2 left ARG 3 right - METHOD method_24064 getSignTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; + METHOD method_24064 createSignTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; ARG 0 type METHOD method_24065 getChestTextureId (Ljava/lang/String;)Lnet/minecraft/class_4730; ARG 0 variant diff --git a/mappings/net/minecraft/client/render/VertexConsumers.mapping b/mappings/net/minecraft/client/render/VertexConsumers.mapping index 3ae0cd3c22..2c1c131ca2 100644 --- a/mappings/net/minecraft/client/render/VertexConsumers.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumers.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4720 net/minecraft/client/render/VertexConsumers - METHOD method_24037 dual (Lnet/minecraft/class_4588;Lnet/minecraft/class_4588;)Lnet/minecraft/class_4588; + COMMENT A utility for combining multiple VertexConsumers into one. + METHOD method_24037 union (Lnet/minecraft/class_4588;Lnet/minecraft/class_4588;)Lnet/minecraft/class_4588; ARG 0 first ARG 1 second CLASS class_4589 Dual diff --git a/mappings/net/minecraft/client/render/VertexFormatElement.mapping b/mappings/net/minecraft/client/render/VertexFormatElement.mapping index 1399aa6c20..ade79ffdb2 100644 --- a/mappings/net/minecraft/client/render/VertexFormatElement.mapping +++ b/mappings/net/minecraft/client/render/VertexFormatElement.mapping @@ -1,23 +1,29 @@ CLASS net/minecraft/class_296 net/minecraft/client/render/VertexFormatElement - FIELD field_1612 count I - FIELD field_1613 index I + COMMENT Represents a singular field within a larger vertex format. + COMMENT

+ COMMENT This element comprises a data type, a field length, + COMMENT and the corresponding GL element type to which this field corresponds. + FIELD field_1612 length I + FIELD field_1613 textureIndex I FIELD field_1614 type Lnet/minecraft/class_296$class_298; - FIELD field_1615 format Lnet/minecraft/class_296$class_297; + FIELD field_1615 dataType Lnet/minecraft/class_296$class_297; FIELD field_1616 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_21329 size I + FIELD field_21329 byteLength I + COMMENT The total length of this element (in bytes). METHOD (ILnet/minecraft/class_296$class_297;Lnet/minecraft/class_296$class_298;I)V - ARG 1 index - ARG 2 format + ARG 1 textureIndex + ARG 2 dataType ARG 3 type - ARG 4 count + ARG 4 length METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_1382 getType ()Lnet/minecraft/class_296$class_298; METHOD method_1383 isValidType (ILnet/minecraft/class_296$class_298;)Z ARG 1 index - METHOD method_1385 getIndex ()I - METHOD method_1386 getFormat ()Lnet/minecraft/class_296$class_297; - METHOD method_1387 getSize ()I + ARG 2 type + METHOD method_1385 getTextureIndex ()I + METHOD method_1386 getDataType ()Lnet/minecraft/class_296$class_297; + METHOD method_1387 getByteLength ()I METHOD method_22652 startDrawing (JI)V ARG 1 pointer ARG 3 stride diff --git a/mappings/net/minecraft/client/render/VertexFormats.mapping b/mappings/net/minecraft/client/render/VertexFormats.mapping index 26083c7982..fa180e49a2 100644 --- a/mappings/net/minecraft/client/render/VertexFormats.mapping +++ b/mappings/net/minecraft/client/render/VertexFormats.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_290 net/minecraft/client/render/VertexFormats FIELD field_1586 POSITION_TEXTURE_LIGHT_COLOR Lnet/minecraft/class_293; FIELD field_1587 POSITION_ELEMENT Lnet/minecraft/class_296; FIELD field_1590 POSITION_COLOR_TEXTURE_LIGHT_NORMAL Lnet/minecraft/class_293; - FIELD field_1591 TEXTURE_ELEMENT Lnet/minecraft/class_296; + FIELD field_1591 TEXTURE_0_ELEMENT Lnet/minecraft/class_296; FIELD field_1592 POSITION Lnet/minecraft/class_293; FIELD field_20886 LIGHT_ELEMENT Lnet/minecraft/class_296; FIELD field_20887 POSITION_COLOR_TEXTURE Lnet/minecraft/class_293; diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 5485df68c5..6477ae6566 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4059 entityOutlineShader Lnet/minecraft/class_279; FIELD field_4060 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_4061 END_SKY Lnet/minecraft/class_2960; - FIELD field_4062 renderDistance I + FIELD field_4062 viewDistance I FIELD field_4064 lastCameraYaw D FIELD field_4065 capturedFrustumOrientation [Lnet/minecraft/class_1162; FIELD field_4069 lastCameraX D @@ -95,6 +95,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 6 camera ARG 7 gameRenderer METHOD method_22712 drawBlockOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;DDDLnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 matrices METHOD method_22713 tickRainSplashing (Lnet/minecraft/class_4184;)V ARG 1 camera METHOD method_22714 renderWeather (Lnet/minecraft/class_765;FDDD)V @@ -188,6 +189,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_3243 renderWorldBorder (Lnet/minecraft/class_4184;)V ARG 1 camera METHOD method_3244 setWorld (Lnet/minecraft/class_638;)V + ARG 1 world METHOD method_3245 updateNoCullingBlockEntities (Ljava/util/Collection;Ljava/util/Collection;)V ARG 1 removed ARG 2 added @@ -280,6 +282,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 14 velocityZ METHOD method_3289 getChunksDebugString ()Ljava/lang/String; METHOD method_3291 drawShapeOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_265;DDDFFFF)V + ARG 0 matrices METHOD method_3292 scheduleTerrainUpdate ()V METHOD method_3293 renderStars ()V METHOD method_3295 scheduleChunkRender (IIIZ)V diff --git a/mappings/net/minecraft/client/render/block/BlockModels.mapping b/mappings/net/minecraft/client/render/block/BlockModels.mapping index e77291252c..1a6cdb6647 100644 --- a/mappings/net/minecraft/client/render/block/BlockModels.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModels.mapping @@ -4,8 +4,13 @@ CLASS net/minecraft/class_773 net/minecraft/client/render/block/BlockModels METHOD method_3333 getModelManager ()Lnet/minecraft/class_1092; METHOD method_3334 propertyValueToString (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; METHOD method_3335 getModel (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1087; + ARG 1 state METHOD method_3336 getModelId (Lnet/minecraft/class_2960;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1091; + ARG 0 id + ARG 1 state METHOD method_3338 propertyMapToString (Ljava/util/Map;)Ljava/lang/String; METHOD method_3339 getSprite (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1058; + ARG 1 state METHOD method_3340 getModelId (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1091; + ARG 0 state METHOD method_3341 reload ()V diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping index 76abf41d21..282cd65233 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -19,6 +19,8 @@ CLASS net/minecraft/class_776 net/minecraft/client/render/block/BlockRenderManag METHOD method_3351 getModels ()Lnet/minecraft/class_773; METHOD method_3352 renderFluid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4588;Lnet/minecraft/class_3610;)Z ARG 1 pos + ARG 2 world + ARG 4 state METHOD method_3353 renderBlockAsEntity (Lnet/minecraft/class_2680;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V ARG 1 state ARG 2 matrices diff --git a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping index 8b1ce9e725..ceb8013f8b 100644 --- a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping @@ -11,4 +11,5 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo ARG 5 baseSprite ARG 6 isBanner ARG 7 patterns + ARG 8 glint METHOD method_24080 createBanner ()Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping index b17602bf1b..b691e8f4e7 100644 --- a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping @@ -1,4 +1,22 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer FIELD field_4338 BEAM_TEXTURE Lnet/minecraft/class_2960; - METHOD method_3543 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;FJII[F)V - METHOD method_3545 renderLightBeam (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2960;FFJII[FFF)V + METHOD method_3543 renderBeam (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;FJII[F)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 tickDelta + ARG 3 worldTime + ARG 5 yOffset + ARG 6 maxY + ARG 7 color + METHOD method_3545 renderBeam (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2960;FFJII[FFF)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 textureId + ARG 3 tickDelta + ARG 4 heightScale + ARG 5 worldTime + ARG 7 yOffset + ARG 8 maxY + ARG 9 color + ARG 10 innerRadius + ARG 11 outerRadius diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping index 88256e6244..103e0fc9e4 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping @@ -27,8 +27,11 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti ARG 4 camera ARG 5 crosshairTarget METHOD method_3550 get (Lnet/minecraft/class_2586;)Lnet/minecraft/class_827; + ARG 1 blockEntity METHOD method_3551 setWorld (Lnet/minecraft/class_1937;)V + ARG 1 world METHOD method_3554 runReported (Lnet/minecraft/class_2586;Ljava/lang/Runnable;)V + ARG 0 blockEntity METHOD method_3555 render (Lnet/minecraft/class_2586;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V ARG 1 blockEntity ARG 2 tickDelta diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping index d283959add..42431ebb39 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRendererRegion.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_853 net/minecraft/client/render/chunk/ChunkRendererRegion FIELD field_4481 offset Lnet/minecraft/class_2338; - FIELD field_4482 zSize I + FIELD field_4482 sizeZ I FIELD field_4483 chunks [[Lnet/minecraft/class_2818; - FIELD field_4484 ySize I + FIELD field_4484 sizeY I FIELD field_4485 fluidStates [Lnet/minecraft/class_3610; - FIELD field_4486 xSize I + FIELD field_4486 sizeX I FIELD field_4487 chunkZOffset I FIELD field_4488 chunkXOffset I FIELD field_4489 blockStates [Lnet/minecraft/class_2680; @@ -17,6 +17,7 @@ CLASS net/minecraft/class_853 net/minecraft/client/render/chunk/ChunkRendererReg ARG 5 startPos ARG 6 endPos METHOD method_3688 getBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2818$class_2819;)Lnet/minecraft/class_2586; + ARG 1 pos METHOD method_3689 create (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;I)Lnet/minecraft/class_853; ARG 0 world ARG 1 startPos diff --git a/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping index 8e9cbacdba..f471653a3d 100644 --- a/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4205 net/minecraft/client/render/debug/GoalSelectorDeb FIELD field_18780 client Lnet/minecraft/class_310; FIELD field_18781 goalSelectors Ljava/util/Map; METHOD method_19430 setGoalSelectorList (ILjava/util/List;)V + ARG 1 index CLASS class_4206 GoalSelector FIELD field_18782 pos Lnet/minecraft/class_2338; FIELD field_18784 name Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping index 3e32df48f5..ae451ae912 100644 --- a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping @@ -7,7 +7,9 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen METHOD method_19432 addBrain (Lnet/minecraft/class_4207$class_4232;)V ARG 1 brain METHOD method_19434 removePointOfInterest (Lnet/minecraft/class_2338;)V + ARG 1 pos METHOD method_19701 addPointOfInterest (Lnet/minecraft/class_4207$class_4233;)V + ARG 1 poi METHOD method_19702 setFreeTicketCount (Lnet/minecraft/class_2338;I)V ARG 1 pos ARG 2 freeTicketCount diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index 478834fc88..76d7b39c02 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -8,16 +8,19 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer ARG 1 entity ARG 2 tickDelta METHOD method_24087 getBlockLight (Lnet/minecraft/class_1297;Lnet/minecraft/class_2338;)I + ARG 1 entity + ARG 2 pos METHOD method_24088 getLight (Lnet/minecraft/class_1297;F)I ARG 1 entity ARG 2 tickDelta METHOD method_3921 hasLabel (Lnet/minecraft/class_1297;)Z COMMENT Determines whether the passed entity should render with a nameplate above its head. COMMENT - COMMENT

Checks for a custom nametag on living entities, and for teams/team visibilities for players.

+ COMMENT

Checks for a custom nametag on living entities, and for teams/team visibilities for players. ARG 1 entity METHOD method_3926 renderLabelIfPresent (Lnet/minecraft/class_1297;Lnet/minecraft/class_2561;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V ARG 1 entity + ARG 2 text ARG 3 matrices ARG 4 vertexConsumers ARG 5 light diff --git a/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping index b2fc2541b1..0e57d801bd 100644 --- a/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping @@ -9,7 +9,10 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe ARG 5 arm ARG 6 sleeve METHOD method_4210 getArmPose (Lnet/minecraft/class_742;Lnet/minecraft/class_1268;)Lnet/minecraft/class_572$class_573; + ARG 0 player + ARG 1 hand METHOD method_4218 setModelPose (Lnet/minecraft/class_742;)V + ARG 1 player METHOD method_4220 renderRightArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_742;)V ARG 1 matrices ARG 2 vertexConsumers diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping index b610a4c338..76e97aea5b 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping @@ -7,9 +7,24 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe ARG 2 leggingsModel ARG 3 bodyModel METHOD method_23192 renderArmorParts (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1738;ZLnet/minecraft/class_572;ZFFFLjava/lang/String;)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 light + ARG 4 item + ARG 5 usesSecondLayer + ARG 6 model + ARG 7 legs + ARG 8 red + ARG 9 green + ARG 10 blue + ARG 11 overlay METHOD method_4169 renderArmor (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1309;Lnet/minecraft/class_1304;ILnet/minecraft/class_572;)V ARG 1 matrices ARG 2 vertexConsumers + ARG 3 entity + ARG 4 armorSlot + ARG 5 light + ARG 6 model METHOD method_4170 setVisible (Lnet/minecraft/class_572;Lnet/minecraft/class_1304;)V ARG 1 bipedModel ARG 2 slot @@ -18,3 +33,6 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe METHOD method_4173 usesSecondLayer (Lnet/minecraft/class_1304;)Z ARG 1 slot METHOD method_4174 getArmorTexture (Lnet/minecraft/class_1738;ZLjava/lang/String;)Lnet/minecraft/class_2960; + ARG 1 item + ARG 2 legs + ARG 3 overlay diff --git a/mappings/net/minecraft/client/render/entity/model/AbstractZombieModel.mapping b/mappings/net/minecraft/client/render/entity/model/AbstractZombieModel.mapping index b5c23d4019..46d1cdc6e5 100644 --- a/mappings/net/minecraft/client/render/entity/model/AbstractZombieModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/AbstractZombieModel.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_3968 net/minecraft/client/render/entity/model/AbstractZombieModel METHOD method_17790 isAttacking (Lnet/minecraft/class_1588;)Z + ARG 1 entity diff --git a/mappings/net/minecraft/client/render/entity/model/AnimalModel.mapping b/mappings/net/minecraft/client/render/entity/model/AnimalModel.mapping index 0bd143cf19..06fbb97147 100644 --- a/mappings/net/minecraft/client/render/entity/model/AnimalModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/AnimalModel.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_4592 net/minecraft/client/render/entity/model/AnimalMo FIELD field_20919 invertedChildBodyScale F FIELD field_20920 childBodyYOffset F METHOD (Ljava/util/function/Function;ZFFFFF)V + ARG 1 renderLayerFactory ARG 2 headScaled ARG 3 childHeadYOffset ARG 4 childHeadZOffset diff --git a/mappings/net/minecraft/client/render/entity/model/ArmorStandEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ArmorStandEntityModel.mapping index 90ce729170..3a2113bbbc 100644 --- a/mappings/net/minecraft/client/render/entity/model/ArmorStandEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ArmorStandEntityModel.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_551 net/minecraft/client/render/entity/model/ArmorStandEntityModel - FIELD field_3312 plate Lnet/minecraft/class_630; - FIELD field_3313 hip Lnet/minecraft/class_630; + FIELD field_3312 basePlate Lnet/minecraft/class_630; + FIELD field_3313 shoulderStick Lnet/minecraft/class_630; FIELD field_3314 rightTorso Lnet/minecraft/class_630; FIELD field_3315 leftTorso Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/BeeEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BeeEntityModel.mapping index f9b3d37a2b..7ac1d20c4e 100644 --- a/mappings/net/minecraft/client/render/entity/model/BeeEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BeeEntityModel.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4495 net/minecraft/client/render/entity/model/BeeEntityModel - FIELD field_20504 body Lnet/minecraft/class_630; + FIELD field_20504 bone Lnet/minecraft/class_630; FIELD field_20505 torso Lnet/minecraft/class_630; FIELD field_20506 rightWing Lnet/minecraft/class_630; FIELD field_20507 leftWing Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping index 9979d21404..b279021d9b 100644 --- a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEntityModel FIELD field_3390 leftArm Lnet/minecraft/class_630; - FIELD field_3391 torso Lnet/minecraft/class_630; + FIELD field_3391 body Lnet/minecraft/class_630; FIELD field_3392 rightLeg Lnet/minecraft/class_630; - FIELD field_3394 helmet Lnet/minecraft/class_630; + FIELD field_3394 hat Lnet/minecraft/class_630; FIELD field_3395 rightArmPose Lnet/minecraft/class_572$class_573; FIELD field_3396 leaningPitch F FIELD field_3397 leftLeg Lnet/minecraft/class_630; @@ -24,6 +24,9 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti ARG 4 textureWidth ARG 5 textureHeight METHOD method_2804 lerpAngle (FFF)F + ARG 1 angleOne + ARG 2 angleTwo + ARG 3 magnitude METHOD method_2805 setVisible (Z)V ARG 1 visible METHOD method_2806 getPreferredArm (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1306; @@ -31,6 +34,7 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti METHOD method_2808 getArm (Lnet/minecraft/class_1306;)Lnet/minecraft/class_630; ARG 1 arm METHOD method_2818 setAttributes (Lnet/minecraft/class_572;)V + ARG 1 model CLASS class_573 ArmPose METHOD (Ljava/lang/String;IZ)V ARG 1 name diff --git a/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping index 7c64568dba..7ba29199db 100644 --- a/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_554 net/minecraft/client/render/entity/model/BoatEntityModel FIELD field_20922 parts Lcom/google/common/collect/ImmutableList; FIELD field_3325 paddles [Lnet/minecraft/class_630; - FIELD field_3326 bottom Lnet/minecraft/class_630; + FIELD field_3326 waterPatch Lnet/minecraft/class_630; METHOD method_22954 getBottom ()Lnet/minecraft/class_630; METHOD method_2796 makePaddle (Z)Lnet/minecraft/class_630; ARG 1 isLeft diff --git a/mappings/net/minecraft/client/render/entity/model/BookModel.mapping b/mappings/net/minecraft/client/render/entity/model/BookModel.mapping index f3089b4d10..65717ca0d1 100644 --- a/mappings/net/minecraft/client/render/entity/model/BookModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BookModel.mapping @@ -2,13 +2,17 @@ CLASS net/minecraft/class_557 net/minecraft/client/render/entity/model/BookModel FIELD field_20786 parts Ljava/util/List; FIELD field_3333 spine Lnet/minecraft/class_630; FIELD field_3334 leftPage Lnet/minecraft/class_630; - FIELD field_3335 rightBlock Lnet/minecraft/class_630; + FIELD field_3335 rightPages Lnet/minecraft/class_630; FIELD field_3336 leftCover Lnet/minecraft/class_630; - FIELD field_3337 leftBlock Lnet/minecraft/class_630; + FIELD field_3337 leftPages Lnet/minecraft/class_630; FIELD field_3338 rightCover Lnet/minecraft/class_630; FIELD field_3339 rightPage Lnet/minecraft/class_630; METHOD method_17073 setPageAngles (FFFF)V - METHOD method_24184 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;IIFFFF)V + ARG 1 pageTurnAmount + ARG 2 leftFlipAmount + ARG 3 rightFlipAmount + ARG 4 pageTurnSpeed + METHOD method_24184 renderBook (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;IIFFFF)V ARG 1 matrices ARG 2 vertices ARG 3 light diff --git a/mappings/net/minecraft/client/render/entity/model/ChickenEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ChickenEntityModel.mapping index a79ac62252..6f03955b4e 100644 --- a/mappings/net/minecraft/client/render/entity/model/ChickenEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ChickenEntityModel.mapping @@ -5,5 +5,5 @@ CLASS net/minecraft/class_558 net/minecraft/client/render/entity/model/ChickenEn FIELD field_3343 leftLeg Lnet/minecraft/class_630; FIELD field_3344 head Lnet/minecraft/class_630; FIELD field_3345 rightLeg Lnet/minecraft/class_630; - FIELD field_3346 torso Lnet/minecraft/class_630; + FIELD field_3346 body Lnet/minecraft/class_630; FIELD field_3347 leftWing Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/CodEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CodEntityModel.mapping index b2c7054090..6a6c542394 100644 --- a/mappings/net/minecraft/client/render/entity/model/CodEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/CodEntityModel.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_561 net/minecraft/client/render/entity/model/CodEntityModel - FIELD field_3350 tail Lnet/minecraft/class_630; + FIELD field_3350 tailFin Lnet/minecraft/class_630; FIELD field_3351 rightFin Lnet/minecraft/class_630; FIELD field_3352 face Lnet/minecraft/class_630; FIELD field_3353 body Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/DolphinEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/DolphinEntityModel.mapping index 0f29648855..195c05267e 100644 --- a/mappings/net/minecraft/client/render/entity/model/DolphinEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/DolphinEntityModel.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_889 net/minecraft/client/render/entity/model/DolphinEntityModel - FIELD field_4655 flukes Lnet/minecraft/class_630; + FIELD field_4655 tailFin Lnet/minecraft/class_630; FIELD field_4657 tail Lnet/minecraft/class_630; FIELD field_4658 body Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/FoxEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/FoxEntityModel.mapping index 486ec3fcf6..e65c2c93e5 100644 --- a/mappings/net/minecraft/client/render/entity/model/FoxEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/FoxEntityModel.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_4041 net/minecraft/client/render/entity/model/FoxEntit FIELD field_18016 rightEar Lnet/minecraft/class_630; FIELD field_18017 leftEar Lnet/minecraft/class_630; FIELD field_18018 nose Lnet/minecraft/class_630; - FIELD field_18019 torso Lnet/minecraft/class_630; + FIELD field_18019 body Lnet/minecraft/class_630; FIELD field_18020 rightBackLeg Lnet/minecraft/class_630; FIELD field_18021 leftBackLeg Lnet/minecraft/class_630; FIELD field_18022 rightFrontLeg Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/GuardianEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/GuardianEntityModel.mapping index 2ae922b628..9b20d1fc0f 100644 --- a/mappings/net/minecraft/client/render/entity/model/GuardianEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/GuardianEntityModel.mapping @@ -1,3 +1,14 @@ CLASS net/minecraft/class_570 net/minecraft/client/render/entity/model/GuardianEntityModel - FIELD field_3379 body Lnet/minecraft/class_630; + FIELD field_17131 SPIKE_PITCHES [F + FIELD field_17132 SPIKE_YAWS [F + FIELD field_17133 SPIKE_ROLLS [F + FIELD field_17134 SPIKE_PIVOTS_X [F + FIELD field_17135 SPIKE_PIVOTS_Y [F + FIELD field_17136 SPIKE_PIVOTS_Z [F + FIELD field_3378 tail [Lnet/minecraft/class_630; + FIELD field_3379 head Lnet/minecraft/class_630; + FIELD field_3380 spikes [Lnet/minecraft/class_630; FIELD field_3381 eye Lnet/minecraft/class_630; + METHOD method_24185 updateSpikeExtensions (FF)V + ARG 1 animationProgress + ARG 2 extension diff --git a/mappings/net/minecraft/client/render/entity/model/HoglinEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/HoglinEntityModel.mapping index 068649ef21..e47b890cef 100644 --- a/mappings/net/minecraft/client/render/entity/model/HoglinEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/HoglinEntityModel.mapping @@ -2,4 +2,4 @@ CLASS net/minecraft/class_4791 net/minecraft/client/render/entity/model/HoglinEn FIELD field_22227 head Lnet/minecraft/class_630; FIELD field_22228 rightEar Lnet/minecraft/class_630; FIELD field_22229 leftEar Lnet/minecraft/class_630; - FIELD field_22230 torso Lnet/minecraft/class_630; + FIELD field_22230 body Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/HorseEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/HorseEntityModel.mapping index 962c77799d..36fa91d49f 100644 --- a/mappings/net/minecraft/client/render/entity/model/HorseEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/HorseEntityModel.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_549 net/minecraft/client/render/entity/model/HorseEnti FIELD field_3300 tail Lnet/minecraft/class_630; FIELD field_3302 leftFrontLeg Lnet/minecraft/class_630; FIELD field_3303 rightBackLeg Lnet/minecraft/class_630; - FIELD field_3305 torso Lnet/minecraft/class_630; + FIELD field_3305 body Lnet/minecraft/class_630; FIELD field_3306 leftBackLeg Lnet/minecraft/class_630; FIELD field_3307 head Lnet/minecraft/class_630; FIELD field_3308 rightFrontLeg Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/IllagerEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/IllagerEntityModel.mapping index 56865a119a..a20f4c39a5 100644 --- a/mappings/net/minecraft/client/render/entity/model/IllagerEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/IllagerEntityModel.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_575 net/minecraft/client/render/entity/model/IllagerEntityModel - FIELD field_3417 leftAttackingArm Lnet/minecraft/class_630; - FIELD field_3418 leftLeg Lnet/minecraft/class_630; + FIELD field_3417 leftArm Lnet/minecraft/class_630; + FIELD field_3418 rightLeg Lnet/minecraft/class_630; FIELD field_3419 hat Lnet/minecraft/class_630; - FIELD field_3420 rightLeg Lnet/minecraft/class_630; + FIELD field_3420 leftLeg Lnet/minecraft/class_630; FIELD field_3422 head Lnet/minecraft/class_630; FIELD field_3423 arms Lnet/minecraft/class_630; FIELD field_3425 torso Lnet/minecraft/class_630; - FIELD field_3426 rightAttackingArm Lnet/minecraft/class_630; + FIELD field_3426 rightArm Lnet/minecraft/class_630; METHOD (FFII)V ARG 1 scale ARG 2 pivotY diff --git a/mappings/net/minecraft/client/render/entity/model/LeashKnotEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/LeashKnotEntityModel.mapping index 1fc113cb53..060895f9be 100644 --- a/mappings/net/minecraft/client/render/entity/model/LeashKnotEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/LeashKnotEntityModel.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_579 net/minecraft/client/render/entity/model/LeashKnotEntityModel - FIELD field_3431 leashKnot Lnet/minecraft/class_630; + FIELD field_3431 knot Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/ModelWithHat.mapping b/mappings/net/minecraft/client/render/entity/model/ModelWithHat.mapping index 77a53bb253..69d53c4fcd 100644 --- a/mappings/net/minecraft/client/render/entity/model/ModelWithHat.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ModelWithHat.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_3884 net/minecraft/client/render/entity/model/ModelWithHat + COMMENT Represents a model with a hat. METHOD method_17150 setHatVisible (Z)V + COMMENT Sets whether the hat is visible or not. ARG 1 visible + COMMENT {@code true} if the hat is visible, otherwise {@code false} diff --git a/mappings/net/minecraft/client/render/entity/model/ModelWithHead.mapping b/mappings/net/minecraft/client/render/entity/model/ModelWithHead.mapping index c4c61dba47..4e59da99c5 100644 --- a/mappings/net/minecraft/client/render/entity/model/ModelWithHead.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ModelWithHead.mapping @@ -1,2 +1,6 @@ CLASS net/minecraft/class_3882 net/minecraft/client/render/entity/model/ModelWithHead + COMMENT Represents a model with a head. METHOD method_2838 getHead ()Lnet/minecraft/class_630; + COMMENT Gets the head model part. + COMMENT + COMMENT @return the head diff --git a/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping index c7e7c0d247..a079b66f22 100644 --- a/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_582 net/minecraft/client/render/entity/model/OcelotEnt FIELD field_3434 animationState I FIELD field_3435 head Lnet/minecraft/class_630; FIELD field_3436 upperTail Lnet/minecraft/class_630; - FIELD field_3437 torso Lnet/minecraft/class_630; + FIELD field_3437 body Lnet/minecraft/class_630; FIELD field_3438 rightFrontLeg Lnet/minecraft/class_630; FIELD field_3439 leftBackLeg Lnet/minecraft/class_630; FIELD field_3440 leftFrontLeg Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping index 11c616d6e9..b27b8b63c6 100644 --- a/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping @@ -4,9 +4,9 @@ CLASS net/minecraft/class_584 net/minecraft/client/render/entity/model/ParrotEnt FIELD field_3452 head Lnet/minecraft/class_630; FIELD field_3453 outerBeak Lnet/minecraft/class_630; FIELD field_3455 rightWing Lnet/minecraft/class_630; - FIELD field_3456 headFeathers Lnet/minecraft/class_630; + FIELD field_3456 feather Lnet/minecraft/class_630; FIELD field_3457 rightLeg Lnet/minecraft/class_630; - FIELD field_3458 torso Lnet/minecraft/class_630; + FIELD field_3458 body Lnet/minecraft/class_630; FIELD field_3459 leftWing Lnet/minecraft/class_630; FIELD field_3460 tail Lnet/minecraft/class_630; FIELD field_3461 forehead Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/PhantomEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PhantomEntityModel.mapping index f39a3bdc14..0c973ab535 100644 --- a/mappings/net/minecraft/client/render/entity/model/PhantomEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/PhantomEntityModel.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_588 net/minecraft/client/render/entity/model/PhantomEntityModel - FIELD field_3471 tail Lnet/minecraft/class_630; + FIELD field_3471 tailBase Lnet/minecraft/class_630; FIELD field_3472 rightWingTip Lnet/minecraft/class_630; - FIELD field_3473 lowerTail Lnet/minecraft/class_630; - FIELD field_3474 rightWing Lnet/minecraft/class_630; + FIELD field_3473 tailTip Lnet/minecraft/class_630; + FIELD field_3474 rightWingBase Lnet/minecraft/class_630; FIELD field_3475 body Lnet/minecraft/class_630; FIELD field_3476 leftWingTip Lnet/minecraft/class_630; - FIELD field_3477 leftWing Lnet/minecraft/class_630; + FIELD field_3477 leftWingBase Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping index 952a7e9954..acce5bce2e 100644 --- a/mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_591 net/minecraft/client/render/entity/model/PlayerEntityModel FIELD field_20787 parts Ljava/util/List; - FIELD field_3479 rightPantLeg Lnet/minecraft/class_630; + FIELD field_3479 rightPants Lnet/minecraft/class_630; FIELD field_3480 thinArms Z - FIELD field_3481 ears Lnet/minecraft/class_630; - FIELD field_3482 leftPantLeg Lnet/minecraft/class_630; + FIELD field_3481 ear Lnet/minecraft/class_630; + FIELD field_3482 leftPants Lnet/minecraft/class_630; FIELD field_3483 jacket Lnet/minecraft/class_630; FIELD field_3484 leftSleeve Lnet/minecraft/class_630; - FIELD field_3485 cape Lnet/minecraft/class_630; + FIELD field_3485 cloak Lnet/minecraft/class_630; FIELD field_3486 rightSleeve Lnet/minecraft/class_630; METHOD (FZ)V ARG 1 scale diff --git a/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping index 3c6bc2ceea..09bd34a730 100644 --- a/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_597 net/minecraft/client/render/entity/model/Quadruped FIELD field_3534 backLeftLeg Lnet/minecraft/class_630; FIELD field_3535 head Lnet/minecraft/class_630; FIELD field_3536 backRightLeg Lnet/minecraft/class_630; - FIELD field_3538 torso Lnet/minecraft/class_630; + FIELD field_3538 body Lnet/minecraft/class_630; FIELD field_3539 frontLeftLeg Lnet/minecraft/class_630; METHOD (IFZFFFFI)V ARG 1 legHeight diff --git a/mappings/net/minecraft/client/render/entity/model/RabbitEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/RabbitEntityModel.mapping index 8e615514a2..5a12dd7846 100644 --- a/mappings/net/minecraft/client/render/entity/model/RabbitEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/RabbitEntityModel.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_596 net/minecraft/client/render/entity/model/RabbitEnt FIELD field_3525 leftFoot Lnet/minecraft/class_630; FIELD field_3526 leftBackLeg Lnet/minecraft/class_630; FIELD field_3527 leftFrontLeg Lnet/minecraft/class_630; - FIELD field_3528 torso Lnet/minecraft/class_630; + FIELD field_3528 body Lnet/minecraft/class_630; FIELD field_3529 head Lnet/minecraft/class_630; FIELD field_3530 nose Lnet/minecraft/class_630; FIELD field_3532 rightFoot Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping index 258ea4b27f..7e24daa6a3 100644 --- a/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_602 net/minecraft/client/render/entity/model/ShulkerEntityModel - FIELD field_3553 bottomShell Lnet/minecraft/class_630; + FIELD field_3553 base Lnet/minecraft/class_630; FIELD field_3554 head Lnet/minecraft/class_630; - FIELD field_3555 topShell Lnet/minecraft/class_630; + FIELD field_3555 lid Lnet/minecraft/class_630; METHOD method_2829 getTopShell ()Lnet/minecraft/class_630; METHOD method_2830 getHead ()Lnet/minecraft/class_630; METHOD method_2831 getBottomShell ()Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/SkullEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SkullEntityModel.mapping index 2d5454830a..dd61a4141a 100644 --- a/mappings/net/minecraft/client/render/entity/model/SkullEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SkullEntityModel.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_607 net/minecraft/client/render/entity/model/SkullEntityModel - FIELD field_3564 skull Lnet/minecraft/class_630; + FIELD field_3564 head Lnet/minecraft/class_630; METHOD (IIII)V ARG 1 textureU ARG 2 textureV diff --git a/mappings/net/minecraft/client/render/entity/model/SnowGolemEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SnowGolemEntityModel.mapping index aa7780e027..f78d7d2066 100644 --- a/mappings/net/minecraft/client/render/entity/model/SnowGolemEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SnowGolemEntityModel.mapping @@ -2,6 +2,6 @@ CLASS net/minecraft/class_608 net/minecraft/client/render/entity/model/SnowGolem FIELD field_3565 rightArm Lnet/minecraft/class_630; FIELD field_3566 leftArm Lnet/minecraft/class_630; FIELD field_3567 middleSnowball Lnet/minecraft/class_630; - FIELD field_3568 topSnowball Lnet/minecraft/class_630; + FIELD field_3568 head Lnet/minecraft/class_630; FIELD field_3569 bottomSnowball Lnet/minecraft/class_630; METHOD method_2834 getTopSnowball ()Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/WitchEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/WitchEntityModel.mapping index 3c1df1bee2..b171cb9f60 100644 --- a/mappings/net/minecraft/client/render/entity/model/WitchEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/WitchEntityModel.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_622 net/minecraft/client/render/entity/model/WitchEnti FIELD field_3615 mole Lnet/minecraft/class_630; METHOD method_2839 getNose ()Lnet/minecraft/class_630; METHOD method_2840 setLiftingNose (Z)V + ARG 1 liftingNose diff --git a/mappings/net/minecraft/client/render/entity/model/ZombieVillagerEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ZombieVillagerEntityModel.mapping index ee49627092..37efe8039c 100644 --- a/mappings/net/minecraft/client/render/entity/model/ZombieVillagerEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ZombieVillagerEntityModel.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_619 net/minecraft/client/render/entity/model/ZombieVillagerEntityModel - FIELD field_17144 hat Lnet/minecraft/class_630; + FIELD field_17144 hatRim Lnet/minecraft/class_630; METHOD (FZ)V ARG 1 scale diff --git a/mappings/net/minecraft/client/render/item/ItemModels.mapping b/mappings/net/minecraft/client/render/item/ItemModels.mapping index 785b66a2f0..a68f22734d 100644 --- a/mappings/net/minecraft/client/render/item/ItemModels.mapping +++ b/mappings/net/minecraft/client/render/item/ItemModels.mapping @@ -6,10 +6,13 @@ CLASS net/minecraft/class_763 net/minecraft/client/render/item/ItemModels ARG 1 modelManager METHOD method_3303 getModelManager ()Lnet/minecraft/class_1092; METHOD method_3304 getModel (Lnet/minecraft/class_1792;)Lnet/minecraft/class_1087; + ARG 1 item METHOD method_3305 getSprite (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1058; ARG 1 stack METHOD method_3306 getModelId (Lnet/minecraft/class_1792;)I + ARG 0 item METHOD method_3307 getSprite (Lnet/minecraft/class_1935;)Lnet/minecraft/class_1058; + ARG 1 item METHOD method_3308 getModel (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1087; ARG 1 stack METHOD method_3309 putModel (Lnet/minecraft/class_1792;Lnet/minecraft/class_1091;)V diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping index fc149d248f..14645ec243 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag FIELD field_20278 stateLookup Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_21775 atlasManager Lnet/minecraft/class_4724; FIELD field_21776 textureManager Lnet/minecraft/class_1060; - FIELD field_21777 mipmap I + FIELD field_21777 mipmapLevels I FIELD field_5407 missingModel Lnet/minecraft/class_1087; FIELD field_5408 models Ljava/util/Map; FIELD field_5410 blockModelCache Lnet/minecraft/class_773; @@ -14,7 +14,8 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag METHOD method_21611 shouldRerender (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z ARG 1 from ARG 2 to - METHOD method_24152 resetMipmapLevels (I)V + METHOD method_24152 setMipmapLevels (I)V + ARG 1 mipmapLevels METHOD method_4742 getModel (Lnet/minecraft/class_1091;)Lnet/minecraft/class_1087; ARG 1 id METHOD method_4743 getBlockModels ()Lnet/minecraft/class_773; diff --git a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping index 0ecdd6a714..624ba1ac9d 100644 --- a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping @@ -13,6 +13,9 @@ CLASS net/minecraft/class_1093 net/minecraft/client/render/model/BasicBakedModel ARG 3 usesAo ARG 4 isSideLit ARG 5 hasDepth + ARG 6 sprite + ARG 7 transformation + ARG 8 itemPropertyOverrides CLASS class_1094 Builder FIELD field_21865 hasDepth Z FIELD field_5418 transformation Lnet/minecraft/class_809; diff --git a/mappings/net/minecraft/client/render/model/ModelBakeSettings.mapping b/mappings/net/minecraft/client/render/model/ModelBakeSettings.mapping index 8dd676bec5..6861625554 100644 --- a/mappings/net/minecraft/client/render/model/ModelBakeSettings.mapping +++ b/mappings/net/minecraft/client/render/model/ModelBakeSettings.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_3665 net/minecraft/client/render/model/ModelBakeSettings METHOD method_3509 getRotation ()Lnet/minecraft/class_4590; - METHOD method_3512 isShaded ()Z + METHOD method_3512 isUvLocked ()Z diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index 2fec20b62d..8b1e75d226 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader FIELD field_5371 MISSING_DEFINITION Ljava/lang/String; FIELD field_5372 KEY_VALUE_SPLITTER Lcom/google/common/base/Splitter; FIELD field_5373 COMMA_SPLITTER Lcom/google/common/base/Splitter; - FIELD field_5374 MISSING Lnet/minecraft/class_1091; + FIELD field_5374 MISSING_ID Lnet/minecraft/class_1091; FIELD field_5376 unbakedModels Ljava/util/Map; FIELD field_5378 DEFAULT_TEXTURES Ljava/util/Set; FIELD field_5379 resourceManager Lnet/minecraft/class_3300; @@ -36,7 +36,9 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader FIELD field_5400 GENERATION_MARKER Lnet/minecraft/class_793; METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_324;Lnet/minecraft/class_3695;I)V ARG 1 resourceManager + ARG 2 blockColors METHOD method_15878 bake (Lnet/minecraft/class_2960;Lnet/minecraft/class_3665;)Lnet/minecraft/class_1087; + ARG 1 id ARG 2 settings METHOD method_18177 upload (Lnet/minecraft/class_1060;Lnet/minecraft/class_3695;)Lnet/minecraft/class_4724; METHOD method_21603 addStates (Ljava/lang/Iterable;)V diff --git a/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping b/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping index a73c5977b9..a5e557d4da 100644 --- a/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/ItemModelGenerator FIELD field_4270 LAYERS Ljava/util/List; METHOD method_3476 buildCube (Lnet/minecraft/class_801$class_803;Ljava/util/List;Lnet/minecraft/class_1058;IIIIIZ)V + ARG 1 side ARG 2 cubes ARG 3 sprite ARG 4 frame @@ -26,6 +27,7 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/ItemModelGe ARG 3 layer METHOD method_3482 buildCube (Ljava/util/List;Lnet/minecraft/class_801$class_803;II)V ARG 1 cubes + ARG 2 side ARG 3 x ARG 4 y CLASS class_802 Frame diff --git a/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping b/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping index 31952ed150..53c5142dca 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelOverrideList.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_806 net/minecraft/client/render/model/json/ModelOverri FIELD field_4293 overrides Ljava/util/List; METHOD (Lnet/minecraft/class_1088;Lnet/minecraft/class_793;Ljava/util/function/Function;Ljava/util/List;)V ARG 1 modelLoader - ARG 2 unbakedModel + ARG 2 parent ARG 3 unbakedModelGetter ARG 4 overrides METHOD method_3495 apply (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1087; diff --git a/mappings/net/minecraft/client/render/model/json/ModelVariant.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariant.mapping index 8a836e0761..3a5870b371 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelVariant.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariant.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_813 net/minecraft/client/render/model/json/ModelVarian FIELD field_4328 rotation Lnet/minecraft/class_4590; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_4590;ZI)V ARG 1 location + ARG 2 rotation ARG 3 uvLock ARG 4 weight METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping index f4b33ad4c1..241136af19 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_790 net/minecraft/client/render/model/json/ModelVarian METHOD method_3421 getMultipartModel ()Lnet/minecraft/class_816; METHOD method_3422 hasMultipartModel ()Z METHOD method_3423 getVariantMap ()Ljava/util/Map; - METHOD method_3424 deserialize (Lnet/minecraft/class_790$class_791;Ljava/io/Reader;)Lnet/minecraft/class_790; + METHOD method_3424 fromJson (Lnet/minecraft/class_790$class_791;Ljava/io/Reader;)Lnet/minecraft/class_790; ARG 0 context ARG 1 reader CLASS class_791 DeserializationContext diff --git a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping index 5208e5d138..414c8c8c2f 100644 --- a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping +++ b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResour METHOD method_4636 getDownloadHeaders ()Ljava/util/Map; METHOD method_4638 loadServerPack (Ljava/io/File;Lnet/minecraft/class_5352;)Ljava/util/concurrent/CompletableFuture; ARG 1 packZip + ARG 2 packSource METHOD method_4640 download (Ljava/lang/String;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; METHOD method_4641 verifyFile (Ljava/lang/String;Ljava/io/File;)Z ARG 1 expectedSha1 diff --git a/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping b/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping index 0ec0b515c5..d524876fbc 100644 --- a/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping +++ b/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping @@ -3,4 +3,6 @@ CLASS net/minecraft/class_1073 net/minecraft/client/resource/Format3ResourcePack FIELD field_5317 NEW_TO_OLD_MAP Ljava/util/Map; FIELD field_5318 idMap Ljava/util/Map; METHOD method_4658 getRedirectedId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + ARG 1 id METHOD method_4660 getMetadataLocation (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + ARG 0 id diff --git a/mappings/net/minecraft/client/resource/ResourceIndex.mapping b/mappings/net/minecraft/client/resource/ResourceIndex.mapping index fb0d2dfc5d..12a50e26ae 100644 --- a/mappings/net/minecraft/client/resource/ResourceIndex.mapping +++ b/mappings/net/minecraft/client/resource/ResourceIndex.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1064 net/minecraft/client/resource/ResourceIndex - FIELD field_5289 index Ljava/util/Map; + FIELD field_5289 rootIndex Ljava/util/Map; FIELD field_5290 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/io/File;Ljava/lang/String;)V ARG 1 directory diff --git a/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping b/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping index 9b8dd7415f..ae5f694e1f 100644 --- a/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping +++ b/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_1077 net/minecraft/client/resource/language/LanguageDefinition FIELD field_5326 code Ljava/lang/String; - FIELD field_5327 region Ljava/lang/String; + FIELD field_5327 name Ljava/lang/String; FIELD field_5328 rightToLeft Z - FIELD field_5329 name Ljava/lang/String; + FIELD field_5329 region Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V ARG 1 code - ARG 2 name - ARG 3 region + ARG 2 region + ARG 3 name ARG 4 rightToLeft METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping index 21297aa46a..8c4357e064 100644 --- a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping +++ b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1076 net/minecraft/client/resource/language/LanguageMa FIELD field_5325 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_4665 getAllLanguages ()Ljava/util/SortedSet; METHOD method_4667 setLanguage (Lnet/minecraft/class_1077;)V + ARG 1 language METHOD method_4668 getLanguage (Ljava/lang/String;)Lnet/minecraft/class_1077; ARG 1 code METHOD method_4669 getLanguage ()Lnet/minecraft/class_1077; diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping index fff6e8abe2..f968ec4f68 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping @@ -22,5 +22,7 @@ CLASS net/minecraft/class_1079 net/minecraft/client/resource/metadata/AnimationR METHOD method_4684 getDefaultFrameTime ()I METHOD method_4685 shouldInterpolate ()Z METHOD method_4686 getHeight (I)I + ARG 1 defaultHeight METHOD method_4687 getWidth (I)I + ARG 1 defaultWidth METHOD method_4688 getFrameIndexSet ()Ljava/util/Set; diff --git a/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadata.mapping index dfdc3d911d..22f7ec4ad0 100644 --- a/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/TextureResourceMetadata.mapping @@ -4,5 +4,6 @@ CLASS net/minecraft/class_1084 net/minecraft/client/resource/metadata/TextureRes FIELD field_5346 blur Z METHOD (ZZ)V ARG 1 blur + ARG 2 clamp METHOD method_4696 shouldBlur ()Z METHOD method_4697 shouldClamp ()Z diff --git a/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping b/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping index 5512172703..bf559e65af 100644 --- a/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping +++ b/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_1116 net/minecraft/client/sound/AmbientSoundPlayer FIELD field_5481 player Lnet/minecraft/class_746; METHOD (Lnet/minecraft/class_746;Lnet/minecraft/class_1144;)V ARG 1 player + ARG 2 soundManager diff --git a/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping b/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping index 5d27dbb002..8087fcd517 100644 --- a/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping @@ -2,7 +2,9 @@ CLASS net/minecraft/class_1106 net/minecraft/client/sound/EntityTrackingSoundIns FIELD field_5455 entity Lnet/minecraft/class_1297; METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_1297;)V ARG 1 sound + ARG 2 category ARG 3 volume ARG 4 pitch + ARG 5 entity METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;)V ARG 1 sound diff --git a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping index 13eda9a29b..d86212b99b 100644 --- a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping @@ -7,11 +7,18 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc ARG 5 repeat ARG 6 repeatDelay ARG 7 attenuationType + ARG 8 x + ARG 10 y + ARG 12 z + ARG 14 looping METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFDDD)V ARG 1 sound ARG 2 category ARG 3 volume ARG 4 pitch + ARG 5 x + ARG 7 y + ARG 9 z METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_2338;)V ARG 1 sound ARG 2 category @@ -26,6 +33,9 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc ARG 5 repeat ARG 6 repeatDelay ARG 7 attenuationType + ARG 8 x + ARG 10 y + ARG 12 z METHOD method_24877 ambient (Lnet/minecraft/class_3414;FF)Lnet/minecraft/class_1109; ARG 0 sound ARG 1 pitch @@ -34,6 +44,9 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc ARG 0 sound METHOD method_25467 ambient (Lnet/minecraft/class_3414;DDD)Lnet/minecraft/class_1109; ARG 0 sound + ARG 1 x + ARG 3 y + ARG 5 z METHOD method_4757 master (Lnet/minecraft/class_3414;FF)Lnet/minecraft/class_1109; ARG 0 sound ARG 1 pitch @@ -45,3 +58,6 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc ARG 0 sound METHOD method_4760 record (Lnet/minecraft/class_3414;DDD)Lnet/minecraft/class_1109; ARG 0 sound + ARG 1 x + ARG 3 y + ARG 5 z diff --git a/mappings/net/minecraft/client/sound/SoundManager.mapping b/mappings/net/minecraft/client/sound/SoundManager.mapping index 15544742ac..ccee7de94a 100644 --- a/mappings/net/minecraft/client/sound/SoundManager.mapping +++ b/mappings/net/minecraft/client/sound/SoundManager.mapping @@ -14,18 +14,29 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager ARG 1 category ARG 2 volume METHOD method_4866 unregisterListener (Lnet/minecraft/class_1145;)V + ARG 1 listener METHOD method_4868 isSoundResourcePresent (Lnet/minecraft/class_1111;Lnet/minecraft/class_2960;Lnet/minecraft/class_3300;)Z + ARG 0 sound + ARG 1 id + ARG 2 resourceManager METHOD method_4869 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1146; + ARG 1 id METHOD method_4870 stop (Lnet/minecraft/class_1113;)V + ARG 1 sound METHOD method_4872 play (Lnet/minecraft/class_1113;I)V ARG 1 sound ARG 2 delay METHOD method_4873 play (Lnet/minecraft/class_1113;)V ARG 1 sound METHOD method_4875 stopSounds (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;)V + ARG 1 id + ARG 2 soundCategory METHOD method_4876 updateListenerPosition (Lnet/minecraft/class_4184;)V + ARG 1 camera METHOD method_4877 isPlaying (Lnet/minecraft/class_1113;)Z + ARG 1 sound METHOD method_4878 registerListener (Lnet/minecraft/class_1145;)V + ARG 1 listener METHOD method_4879 pauseAll ()V METHOD method_4880 resumeAll ()V METHOD method_4881 stopAll ()V diff --git a/mappings/net/minecraft/client/sound/SoundSystem.mapping b/mappings/net/minecraft/client/sound/SoundSystem.mapping index 8e6eadc0dc..0f38289e67 100644 --- a/mappings/net/minecraft/client/sound/SoundSystem.mapping +++ b/mappings/net/minecraft/client/sound/SoundSystem.mapping @@ -22,7 +22,9 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem METHOD (Lnet/minecraft/class_1144;Lnet/minecraft/class_315;Lnet/minecraft/class_3300;)V ARG 1 loader ARG 2 settings + ARG 3 resourceManager METHOD method_19753 stop (Lnet/minecraft/class_1113;)V + ARG 1 sound METHOD method_19761 pauseAll ()V METHOD method_19762 resumeAll ()V METHOD method_20185 tick (Z)V @@ -30,26 +32,40 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem METHOD method_22139 playNextTick (Lnet/minecraft/class_1117;)V ARG 1 sound METHOD method_24878 canRepeatInstantly (Lnet/minecraft/class_1113;)Z + ARG 0 sound METHOD method_24879 isRepeatDelayed (Lnet/minecraft/class_1113;)Z + ARG 0 sound METHOD method_24880 shouldRepeatInstantly (Lnet/minecraft/class_1113;)Z + ARG 0 sound METHOD method_4835 isPlaying (Lnet/minecraft/class_1113;)Z + ARG 1 sound METHOD method_4837 reloadSounds ()V METHOD method_4838 stopSounds (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;)V + ARG 1 id + ARG 2 category METHOD method_4840 updateListenerPosition (Lnet/minecraft/class_4184;)V + ARG 1 camera METHOD method_4843 stopAll ()V METHOD method_4844 updateSoundVolume (Lnet/minecraft/class_3419;F)V + ARG 1 category ARG 2 volume METHOD method_4846 start ()V METHOD method_4847 unregisterListener (Lnet/minecraft/class_1145;)V + ARG 1 listener METHOD method_4849 getAdjustedPitch (Lnet/minecraft/class_1113;)F + ARG 1 sound METHOD method_4850 getSoundVolume (Lnet/minecraft/class_3419;)F + ARG 1 category METHOD method_4851 addPreloadedSound (Lnet/minecraft/class_1111;)V ARG 1 sound METHOD method_4852 play (Lnet/minecraft/class_1113;I)V ARG 1 sound ARG 2 delay METHOD method_4853 getAdjustedVolume (Lnet/minecraft/class_1113;)F + ARG 1 sound METHOD method_4854 play (Lnet/minecraft/class_1113;)V + ARG 1 sound METHOD method_4855 registerListener (Lnet/minecraft/class_1145;)V + ARG 1 listener METHOD method_4856 stop ()V METHOD method_4857 tick ()V diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index 6fdd1d3324..e6ddc062b4 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -130,8 +130,8 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage METHOD method_4320 checkAllocated ()V METHOD method_4321 uploadInternal (IIIIIIIZZZZ)V ARG 1 level - ARG 2 xOffset - ARG 3 yOffset + ARG 2 offsetX + ARG 3 offsetY ARG 4 unpackSkipPixels ARG 5 unpackSkipRows ARG 6 width diff --git a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping index e6d6c15c33..1c24774931 100644 --- a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping +++ b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_1071 net/minecraft/client/texture/PlayerSkinProvider ARG 2 callback ARG 3 requireSecure METHOD method_4654 getTextures (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; + ARG 1 profile METHOD method_4656 loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lnet/minecraft/class_2960; ARG 1 profileTexture ARG 2 type diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index 711c15b2c9..3201740d6f 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite COMMENT Resets to 0 on every frame advance. FIELD field_5273 frameIndex I METHOD (Lnet/minecraft/class_1059;Lnet/minecraft/class_1058$class_4727;IIIIILnet/minecraft/class_1011;)V + ARG 1 atlas ARG 3 maxLevel ARG 4 atlasWidth ARG 5 atlasHeight diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping index a92d655e5b..92ba46cdd5 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture METHOD method_24198 applyTextureFilter (Lnet/minecraft/class_1059$class_4007;)V METHOD method_4601 clear ()V METHOD method_4603 getTexturePath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; + ARG 1 id METHOD method_4604 loadSprite (Lnet/minecraft/class_3300;Lnet/minecraft/class_1058$class_4727;IIIII)Lnet/minecraft/class_1058; ARG 1 container ARG 3 atlasWidth diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index 587c14b0c2..641fa2f642 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -17,6 +17,8 @@ CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager METHOD method_4615 destroyTexture (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_4616 registerTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V + ARG 1 id + ARG 2 texture METHOD method_4617 registerDynamicTexture (Ljava/lang/String;Lnet/minecraft/class_1043;)Lnet/minecraft/class_2960; ARG 1 prefix ARG 2 texture diff --git a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping index cdc2d4130a..86ae984f99 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping @@ -6,10 +6,11 @@ CLASS net/minecraft/class_1156 net/minecraft/client/tutorial/TutorialManager METHOD method_4905 getGameMode ()Lnet/minecraft/class_1934; METHOD method_4906 onSlotUpdate (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_4907 onBlockAttacked (Lnet/minecraft/class_638;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;F)V + METHOD method_4907 onBlockBreaking (Lnet/minecraft/class_638;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;F)V ARG 1 world ARG 2 pos ARG 3 state + ARG 4 progress METHOD method_4908 onUpdateMouse (DD)V ARG 1 deltaX ARG 3 deltaY @@ -21,7 +22,8 @@ CLASS net/minecraft/class_1156 net/minecraft/client/tutorial/TutorialManager ARG 1 world ARG 2 hitResult METHOD method_4912 onInventoryOpened ()V - METHOD method_4913 getKeybindName (Ljava/lang/String;)Lnet/minecraft/class_2561; + METHOD method_4913 keyToText (Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 0 name METHOD method_4914 getClient ()Lnet/minecraft/class_310; METHOD method_4915 destroyHandler ()V METHOD method_4916 createHandler ()V diff --git a/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping index 728fb7c7c5..111ded94d1 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping @@ -5,10 +5,11 @@ CLASS net/minecraft/class_1155 net/minecraft/client/tutorial/TutorialStepHandler ARG 1 world ARG 2 hitResult METHOD method_4899 tick ()V - METHOD method_4900 onBlockAttacked (Lnet/minecraft/class_638;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;F)V + METHOD method_4900 onBlockBreaking (Lnet/minecraft/class_638;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;F)V ARG 1 client ARG 2 pos ARG 3 state + ARG 4 progress METHOD method_4901 onMouseUpdate (DD)V ARG 1 deltaX ARG 3 deltaY diff --git a/mappings/net/minecraft/client/util/NetworkUtils.mapping b/mappings/net/minecraft/client/util/NetworkUtils.mapping index 50ccd288e6..1b8401b8a6 100644 --- a/mappings/net/minecraft/client/util/NetworkUtils.mapping +++ b/mappings/net/minecraft/client/util/NetworkUtils.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_3521 net/minecraft/client/util/NetworkUtils - FIELD field_15664 downloadExecutor Lcom/google/common/util/concurrent/ListeningExecutorService; + COMMENT A few client-side networking utilities. + COMMENT + COMMENT @implNote This is not marked as client-only because it's used by the + COMMENT {@code /publish} command, which is only available to integrated servers + COMMENT yet was retained by proguard. + FIELD field_15664 EXECUTOR Lcom/google/common/util/concurrent/ListeningExecutorService; FIELD field_15665 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_15301 download (Ljava/io/File;Ljava/lang/String;Ljava/util/Map;ILnet/minecraft/class_3536;Ljava/net/Proxy;)Ljava/util/concurrent/CompletableFuture; + METHOD method_15301 downloadResourcePack (Ljava/io/File;Ljava/lang/String;Ljava/util/Map;ILnet/minecraft/class_3536;Ljava/net/Proxy;)Ljava/util/concurrent/CompletableFuture; METHOD method_15302 findLocalPort ()I diff --git a/mappings/net/minecraft/client/util/ScreenshotUtils.mapping b/mappings/net/minecraft/client/util/ScreenshotUtils.mapping index ffaf204bbe..191b8b733c 100644 --- a/mappings/net/minecraft/client/util/ScreenshotUtils.mapping +++ b/mappings/net/minecraft/client/util/ScreenshotUtils.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_318 net/minecraft/client/util/ScreenshotUtils + COMMENT A utility class to save screenshots. FIELD field_1973 DATE_FORMAT Ljava/text/DateFormat; FIELD field_1974 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_1659 saveScreenshot (Ljava/io/File;IILnet/minecraft/class_276;Ljava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/client/util/SelectionManager.mapping b/mappings/net/minecraft/client/util/SelectionManager.mapping index aac6b793f0..c2aebccb9c 100644 --- a/mappings/net/minecraft/client/util/SelectionManager.mapping +++ b/mappings/net/minecraft/client/util/SelectionManager.mapping @@ -36,7 +36,7 @@ CLASS net/minecraft/class_3728 net/minecraft/client/util/SelectionManager ARG 0 client METHOD method_27551 setClipboard (Lnet/minecraft/class_310;Ljava/lang/String;)V ARG 0 client - ARG 1 clipboardString + ARG 1 clipboard METHOD method_27552 insert (Ljava/lang/String;Ljava/lang/String;)V ARG 1 string ARG 2 insertion diff --git a/mappings/net/minecraft/client/util/TextCollector.mapping b/mappings/net/minecraft/client/util/TextCollector.mapping index ace45b04ae..9fd8cd7391 100644 --- a/mappings/net/minecraft/client/util/TextCollector.mapping +++ b/mappings/net/minecraft/client/util/TextCollector.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5222 net/minecraft/client/util/TextCollector METHOD method_27461 getRawCombined ()Lnet/minecraft/class_5348; METHOD method_27462 add (Lnet/minecraft/class_5348;)V + ARG 1 text METHOD method_27463 getCombined ()Lnet/minecraft/class_5348; diff --git a/mappings/net/minecraft/client/util/Rect2i.mapping b/mappings/net/minecraft/client/util/math/Rect2i.mapping similarity index 83% rename from mappings/net/minecraft/client/util/Rect2i.mapping rename to mappings/net/minecraft/client/util/math/Rect2i.mapping index 2457906433..5a8dc900bf 100644 --- a/mappings/net/minecraft/client/util/Rect2i.mapping +++ b/mappings/net/minecraft/client/util/math/Rect2i.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_768 net/minecraft/client/util/Rect2i +CLASS net/minecraft/class_768 net/minecraft/client/util/math/Rect2i FIELD field_4142 height I FIELD field_4143 width I FIELD field_4144 y I diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index 11c8750070..872e96d49a 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager METHOD method_20181 positionEquals (Lnet/minecraft/class_2818;II)Z ARG 0 chunk ARG 1 x - ARG 2 y + ARG 2 z METHOD method_20182 getLoadedChunkCount ()I METHOD method_20230 getChunkMapRadius (I)I ARG 0 loadDistance diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 4ab2b247a0..aa9dcf0995 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -80,9 +80,9 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 2 state ARG 3 parameters METHOD method_2941 doRandomBlockDisplayTicks (III)V - ARG 1 xCenter - ARG 2 yCenter - ARG 3 zCenter + ARG 1 centerX + ARG 2 centerY + ARG 3 centerZ METHOD method_2942 addEntity (ILnet/minecraft/class_1297;)V ARG 1 id ARG 2 entity @@ -111,6 +111,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 3 shape ARG 4 y METHOD method_8435 setTimeOfDay (J)V + ARG 1 timeOfDay METHOD method_8441 tick (Ljava/util/function/BooleanSupplier;)V ARG 1 shouldKeepTicking CLASS class_5271 Properties diff --git a/mappings/net/minecraft/command/DataCommandObject.mapping b/mappings/net/minecraft/command/DataCommandObject.mapping index 42a78f5a80..b18582b5ae 100644 --- a/mappings/net/minecraft/command/DataCommandObject.mapping +++ b/mappings/net/minecraft/command/DataCommandObject.mapping @@ -1,10 +1,11 @@ CLASS net/minecraft/class_3162 net/minecraft/command/DataCommandObject METHOD method_13879 feedbackGet (Lnet/minecraft/class_2203$class_2209;DI)Lnet/minecraft/class_2561; + ARG 1 path ARG 2 scale ARG 4 result - METHOD method_13880 setTag (Lnet/minecraft/class_2487;)V - ARG 1 tag - METHOD method_13881 getTag ()Lnet/minecraft/class_2487; + METHOD method_13880 setNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt + METHOD method_13881 getNbt ()Lnet/minecraft/class_2487; METHOD method_13882 feedbackQuery (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2561; - ARG 1 tag + ARG 1 element METHOD method_13883 feedbackModify ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/command/DataCommandStorage.mapping b/mappings/net/minecraft/command/DataCommandStorage.mapping index 738d0d9a90..9e46191b3a 100644 --- a/mappings/net/minecraft/command/DataCommandStorage.mapping +++ b/mappings/net/minecraft/command/DataCommandStorage.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage ARG 1 id METHOD method_22547 set (Lnet/minecraft/class_2960;Lnet/minecraft/class_2487;)V ARG 1 id - ARG 2 tag + ARG 2 nbt CLASS class_4566 PersistentState FIELD field_20749 map Ljava/util/Map; METHOD method_22550 get (Ljava/lang/String;)Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/command/EntitySelectorReader.mapping b/mappings/net/minecraft/command/EntitySelectorReader.mapping index ae7a182b1f..082617778f 100644 --- a/mappings/net/minecraft/command/EntitySelectorReader.mapping +++ b/mappings/net/minecraft/command/EntitySelectorReader.mapping @@ -79,11 +79,14 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader METHOD method_9852 setLocalWorldOnly ()V METHOD method_9853 getYawRange ()Lnet/minecraft/class_2152; METHOD method_9855 setYawRange (Lnet/minecraft/class_2152;)V + ARG 1 yawRange METHOD method_9857 setHasNegatedGameMode (Z)V ARG 1 hasNegatedGameMode METHOD method_9858 suggestNormal (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder METHOD method_9859 rotationPredicate (Lnet/minecraft/class_2152;Ljava/util/function/ToDoubleFunction;)Ljava/util/function/Predicate; + ARG 1 angleRange + ARG 2 entityToAngle METHOD method_9860 setExcludesEntityType ()V METHOD method_9861 selectsAdvancements ()Z METHOD method_9864 setY (D)V @@ -98,6 +101,7 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader METHOD method_9873 getDistance ()Lnet/minecraft/class_2096$class_2099; METHOD method_9874 readArguments ()V METHOD method_9875 setSuggestionProvider (Ljava/util/function/BiFunction;)V + ARG 1 suggestionProvider METHOD method_9877 setHasLimit (Z)V ARG 1 hasLimit METHOD method_9878 buildPredicate ()V @@ -128,6 +132,7 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader METHOD method_9896 suggestSelector (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V ARG 0 builder METHOD method_9898 setPitchRange (Lnet/minecraft/class_2152;)V + ARG 1 pitchRange METHOD method_9899 setSelectsName (Z)V ARG 1 selectsName METHOD method_9900 setLimit (I)V @@ -148,8 +153,10 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader ARG 1 builder METHOD method_9912 selectsName ()Z METHOD method_9913 setExcludesName (Z)V + ARG 1 excludesName METHOD method_9915 readTagCharacter ()Z METHOD method_9916 setPredicate (Ljava/util/function/Predicate;)V + ARG 1 predicate METHOD method_9917 readAtVariable ()V METHOD method_9918 setDz (D)V ARG 1 dz diff --git a/mappings/net/minecraft/command/FloatRangeArgument.mapping b/mappings/net/minecraft/command/FloatRangeArgument.mapping index 48e263f208..4b7f092107 100644 --- a/mappings/net/minecraft/command/FloatRangeArgument.mapping +++ b/mappings/net/minecraft/command/FloatRangeArgument.mapping @@ -11,6 +11,8 @@ CLASS net/minecraft/class_2152 net/minecraft/command/FloatRangeArgument ARG 0 reader ARG 1 allowFloats METHOD method_9174 mapFloat (Ljava/lang/Float;Ljava/util/function/Function;)Ljava/lang/Float; + ARG 0 value + ARG 1 function METHOD method_9175 getMin ()Ljava/lang/Float; METHOD method_9176 parseFloat (Lcom/mojang/brigadier/StringReader;Z)Ljava/lang/Float; ARG 0 reader diff --git a/mappings/net/minecraft/command/argument/ArgumentTypes.mapping b/mappings/net/minecraft/command/argument/ArgumentTypes.mapping index 67706803ea..e7741f227a 100644 --- a/mappings/net/minecraft/command/argument/ArgumentTypes.mapping +++ b/mappings/net/minecraft/command/argument/ArgumentTypes.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_2316 net/minecraft/command/argument/ArgumentTypes ARG 0 id COMMENT the id of the argument type METHOD method_10018 byId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2316$class_2317; + ARG 0 id METHOD method_10019 toPacket (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/arguments/ArgumentType;)V METHOD method_10020 toJson (Lcom/google/gson/JsonObject;Lcom/mojang/brigadier/arguments/ArgumentType;)V METHOD method_30923 hasClass (Lcom/mojang/brigadier/arguments/ArgumentType;)Z diff --git a/mappings/net/minecraft/command/argument/BlockStateArgument.mapping b/mappings/net/minecraft/command/argument/BlockStateArgument.mapping index 64fa6dd731..7d3b04002b 100644 --- a/mappings/net/minecraft/command/argument/BlockStateArgument.mapping +++ b/mappings/net/minecraft/command/argument/BlockStateArgument.mapping @@ -8,5 +8,8 @@ CLASS net/minecraft/class_2247 net/minecraft/command/argument/BlockStateArgument ARG 3 data METHOD method_9494 getBlockState ()Lnet/minecraft/class_2680; METHOD method_9495 setBlockState (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)Z + ARG 1 world + ARG 2 pos + ARG 3 flags METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/command/argument/FunctionArgumentType.mapping b/mappings/net/minecraft/command/argument/CommandFunctionArgumentType.mapping similarity index 87% rename from mappings/net/minecraft/command/argument/FunctionArgumentType.mapping rename to mappings/net/minecraft/command/argument/CommandFunctionArgumentType.mapping index 84f236c3e4..8ceb5e54ef 100644 --- a/mappings/net/minecraft/command/argument/FunctionArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/CommandFunctionArgumentType.mapping @@ -1,8 +1,8 @@ -CLASS net/minecraft/class_2284 net/minecraft/command/argument/FunctionArgumentType +CLASS net/minecraft/class_2284 net/minecraft/command/argument/CommandFunctionArgumentType FIELD field_10782 UNKNOWN_FUNCTION_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_10783 EXAMPLES Ljava/util/Collection; FIELD field_10784 UNKNOWN_FUNCTION_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - METHOD method_9760 function ()Lnet/minecraft/class_2284; + METHOD method_9760 commandFunction ()Lnet/minecraft/class_2284; METHOD method_9761 getFunction (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;)Lnet/minecraft/class_2158; ARG 0 context ARG 1 id diff --git a/mappings/net/minecraft/command/argument/ItemEnchantmentArgumentType.mapping b/mappings/net/minecraft/command/argument/EnchantmentArgumentType.mapping similarity index 76% rename from mappings/net/minecraft/command/argument/ItemEnchantmentArgumentType.mapping rename to mappings/net/minecraft/command/argument/EnchantmentArgumentType.mapping index f3eb59ca21..87b6d15584 100644 --- a/mappings/net/minecraft/command/argument/ItemEnchantmentArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/EnchantmentArgumentType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2194 net/minecraft/command/argument/ItemEnchantmentArgumentType +CLASS net/minecraft/class_2194 net/minecraft/command/argument/EnchantmentArgumentType FIELD field_9871 EXAMPLES Ljava/util/Collection; FIELD field_9872 UNKNOWN_ENCHANTMENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; @@ -7,4 +7,4 @@ CLASS net/minecraft/class_2194 net/minecraft/command/argument/ItemEnchantmentArg METHOD method_9334 getEnchantment (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1887; ARG 0 context ARG 1 name - METHOD method_9336 itemEnchantment ()Lnet/minecraft/class_2194; + METHOD method_9336 enchantment ()Lnet/minecraft/class_2194; diff --git a/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping b/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping index acbd8e3d60..e552a0f69e 100644 --- a/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping @@ -3,8 +3,12 @@ CLASS net/minecraft/class_2232 net/minecraft/command/argument/IdentifierArgument FIELD field_9946 EXAMPLES Ljava/util/Collection; FIELD field_9947 UNKNOWN_RECIPE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD method_9439 getAdvancementArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_161; + ARG 0 context + ARG 1 argumentName METHOD method_9441 identifier ()Lnet/minecraft/class_2232; METHOD method_9442 getRecipeArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1860; + ARG 0 context + ARG 1 argumentName METHOD method_9443 getIdentifier (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 0 context ARG 1 name diff --git a/mappings/net/minecraft/command/argument/ItemStackArgument.mapping b/mappings/net/minecraft/command/argument/ItemStackArgument.mapping index d180c257e4..4ebadbae94 100644 --- a/mappings/net/minecraft/command/argument/ItemStackArgument.mapping +++ b/mappings/net/minecraft/command/argument/ItemStackArgument.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/class_2290 net/minecraft/command/argument/ItemStackArgument FIELD field_10796 item Lnet/minecraft/class_1792; FIELD field_10797 OVERSTACKED_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; - FIELD field_10798 tag Lnet/minecraft/class_2487; + FIELD field_10798 nbt Lnet/minecraft/class_2487; METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_2487;)V - ARG 2 tag + ARG 1 item + ARG 2 nbt METHOD method_9781 createStack (IZ)Lnet/minecraft/class_1799; ARG 1 amount ARG 2 checkOverstack diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping index b837f3d46a..3230fb9dd0 100644 --- a/mappings/net/minecraft/command/argument/ItemStringReader.mapping +++ b/mappings/net/minecraft/command/argument/ItemStringReader.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader FIELD field_10804 allowTag Z FIELD field_10805 suggestions Ljava/util/function/BiFunction; FIELD field_10806 NBT_SUGGESTION_PROVIDER Ljava/util/function/BiFunction; - FIELD field_10807 tag Lnet/minecraft/class_2487; + FIELD field_10807 nbt Lnet/minecraft/class_2487; FIELD field_10808 id Lnet/minecraft/class_2960; FIELD field_10809 cursor I METHOD (Lcom/mojang/brigadier/StringReader;Z)V @@ -24,4 +24,4 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader METHOD method_9795 readItem ()V METHOD method_9796 suggestTag (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; ARG 1 suggestionsBuilder - METHOD method_9797 getTag ()Lnet/minecraft/class_2487; + METHOD method_9797 getNbt ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/command/argument/NbtCompoundTagArgumentType.mapping b/mappings/net/minecraft/command/argument/NbtCompoundArgumentType.mapping similarity index 75% rename from mappings/net/minecraft/command/argument/NbtCompoundTagArgumentType.mapping rename to mappings/net/minecraft/command/argument/NbtCompoundArgumentType.mapping index 0c19bc43df..aac422313e 100644 --- a/mappings/net/minecraft/command/argument/NbtCompoundTagArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/NbtCompoundArgumentType.mapping @@ -1,6 +1,6 @@ -CLASS net/minecraft/class_2179 net/minecraft/command/argument/NbtCompoundTagArgumentType +CLASS net/minecraft/class_2179 net/minecraft/command/argument/NbtCompoundArgumentType FIELD field_9843 EXAMPLES Ljava/util/Collection; METHOD method_9284 nbtCompound ()Lnet/minecraft/class_2179; - METHOD method_9285 getCompoundTag (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2487; + METHOD method_9285 getNbtCompound (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2487; ARG 0 context ARG 1 name diff --git a/mappings/net/minecraft/command/argument/NbtElementArgumentType.mapping b/mappings/net/minecraft/command/argument/NbtElementArgumentType.mapping new file mode 100644 index 0000000000..859cb81209 --- /dev/null +++ b/mappings/net/minecraft/command/argument/NbtElementArgumentType.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_2212 net/minecraft/command/argument/NbtElementArgumentType + FIELD field_9918 EXAMPLES Ljava/util/Collection; + METHOD method_9389 nbtElement ()Lnet/minecraft/class_2212; + METHOD method_9390 getNbtElement (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2520; + ARG 0 context + ARG 1 name diff --git a/mappings/net/minecraft/command/argument/NbtTagArgumentType.mapping b/mappings/net/minecraft/command/argument/NbtTagArgumentType.mapping deleted file mode 100644 index a3d45a875e..0000000000 --- a/mappings/net/minecraft/command/argument/NbtTagArgumentType.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_2212 net/minecraft/command/argument/NbtTagArgumentType - FIELD field_9918 EXAMPLES Ljava/util/Collection; - METHOD method_9389 nbtTag ()Lnet/minecraft/class_2212; - METHOD method_9390 getTag (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2520; - ARG 0 context - ARG 1 name diff --git a/mappings/net/minecraft/command/argument/NumberRangeArgumentType.mapping b/mappings/net/minecraft/command/argument/NumberRangeArgumentType.mapping index b51a2eb076..fd4bef4634 100644 --- a/mappings/net/minecraft/command/argument/NumberRangeArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/NumberRangeArgumentType.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2224 net/minecraft/command/argument/NumberRangeArgumentType - METHOD method_9422 numberRange ()Lnet/minecraft/class_2224$class_2227; + METHOD method_9422 intRange ()Lnet/minecraft/class_2224$class_2227; CLASS class_2225 FloatRangeArgumentType FIELD field_9937 EXAMPLES Ljava/util/Collection; CLASS class_2227 IntRangeArgumentType diff --git a/mappings/net/minecraft/command/argument/ObjectiveCriteriaArgumentType.mapping b/mappings/net/minecraft/command/argument/ObjectiveCriteriaArgumentType.mapping deleted file mode 100644 index 894f1cf3de..0000000000 --- a/mappings/net/minecraft/command/argument/ObjectiveCriteriaArgumentType.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_2216 net/minecraft/command/argument/ObjectiveCriteriaArgumentType - FIELD field_9926 EXAMPLES Ljava/util/Collection; - FIELD field_9927 INVALID_CRITERIA_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 1 context - ARG 2 builder - METHOD method_9399 objectiveCriteria ()Lnet/minecraft/class_2216; - METHOD method_9400 getStatName (Lnet/minecraft/class_3448;Ljava/lang/Object;)Ljava/lang/String; - ARG 1 stat - ARG 2 value - METHOD method_9402 getCriteria (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_274; diff --git a/mappings/net/minecraft/command/argument/ParticleArgumentType.mapping b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping similarity index 90% rename from mappings/net/minecraft/command/argument/ParticleArgumentType.mapping rename to mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping index 8498d928ec..ed189ed517 100644 --- a/mappings/net/minecraft/command/argument/ParticleArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping @@ -1,10 +1,10 @@ -CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleArgumentType +CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgumentType FIELD field_9935 EXAMPLES Ljava/util/Collection; FIELD field_9936 UNKNOWN_PARTICLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder - METHOD method_9417 particle ()Lnet/minecraft/class_2223; + METHOD method_9417 particleEffect ()Lnet/minecraft/class_2223; METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2394; ARG 0 reader METHOD method_9420 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394; diff --git a/mappings/net/minecraft/command/argument/ScoreboardCriterionArgumentType.mapping b/mappings/net/minecraft/command/argument/ScoreboardCriterionArgumentType.mapping new file mode 100644 index 0000000000..f7d965b926 --- /dev/null +++ b/mappings/net/minecraft/command/argument/ScoreboardCriterionArgumentType.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_2216 net/minecraft/command/argument/ScoreboardCriterionArgumentType + FIELD field_9926 EXAMPLES Ljava/util/Collection; + FIELD field_9927 INVALID_CRITERION_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 builder + METHOD method_9399 scoreboardCriterion ()Lnet/minecraft/class_2216; + METHOD method_9400 getStatName (Lnet/minecraft/class_3448;Ljava/lang/Object;)Ljava/lang/String; + ARG 1 stat + ARG 2 value + METHOD method_9402 getCriterion (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_274; diff --git a/mappings/net/minecraft/command/argument/ObjectiveArgumentType.mapping b/mappings/net/minecraft/command/argument/ScoreboardObjectiveArgumentType.mapping similarity index 84% rename from mappings/net/minecraft/command/argument/ObjectiveArgumentType.mapping rename to mappings/net/minecraft/command/argument/ScoreboardObjectiveArgumentType.mapping index 230eedd296..5ad836ad7b 100644 --- a/mappings/net/minecraft/command/argument/ObjectiveArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ScoreboardObjectiveArgumentType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2214 net/minecraft/command/argument/ObjectiveArgumentType +CLASS net/minecraft/class_2214 net/minecraft/command/argument/ScoreboardObjectiveArgumentType FIELD field_9919 EXAMPLES Ljava/util/Collection; FIELD field_9920 LONG_NAME_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_9921 READONLY_OBJECTIVE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2214 net/minecraft/command/argument/ObjectiveArgumentT METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder - METHOD method_9391 objective ()Lnet/minecraft/class_2214; + METHOD method_9391 scoreboardObjective ()Lnet/minecraft/class_2214; METHOD method_9393 getWritableObjective (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_266; ARG 0 context ARG 1 name diff --git a/mappings/net/minecraft/command/argument/MobEffectArgumentType.mapping b/mappings/net/minecraft/command/argument/StatusEffectArgumentType.mapping similarity index 55% rename from mappings/net/minecraft/command/argument/MobEffectArgumentType.mapping rename to mappings/net/minecraft/command/argument/StatusEffectArgumentType.mapping index f6ddf4c760..295af94b94 100644 --- a/mappings/net/minecraft/command/argument/MobEffectArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/StatusEffectArgumentType.mapping @@ -1,8 +1,8 @@ -CLASS net/minecraft/class_2201 net/minecraft/command/argument/MobEffectArgumentType +CLASS net/minecraft/class_2201 net/minecraft/command/argument/StatusEffectArgumentType FIELD field_9895 EXAMPLES Ljava/util/Collection; FIELD field_9896 INVALID_EFFECT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder - METHOD method_9347 getMobEffect (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1291; - METHOD method_9350 mobEffect ()Lnet/minecraft/class_2201; + METHOD method_9347 getStatusEffect (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1291; + METHOD method_9350 statusEffect ()Lnet/minecraft/class_2201; diff --git a/mappings/net/minecraft/data/DataCache.mapping b/mappings/net/minecraft/data/DataCache.mapping index 8f5e86bcc7..802046d716 100644 --- a/mappings/net/minecraft/data/DataCache.mapping +++ b/mappings/net/minecraft/data/DataCache.mapping @@ -7,9 +7,14 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache FIELD field_11287 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_16743 ignores Ljava/util/Set; METHOD method_10323 getOldSha1 (Ljava/nio/file/Path;)Ljava/lang/String; + ARG 1 path METHOD method_10325 updateSha1 (Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 1 path + ARG 2 sha1 METHOD method_10326 write ()V METHOD method_10328 files ()Ljava/util/stream/Stream; METHOD method_10330 contains (Ljava/nio/file/Path;)Z + ARG 1 path METHOD method_10331 deleteAll ()V METHOD method_16674 ignore (Ljava/nio/file/Path;)V + ARG 1 path diff --git a/mappings/net/minecraft/data/DataGenerator.mapping b/mappings/net/minecraft/data/DataGenerator.mapping index a31e4a5f2c..98eb5a1706 100644 --- a/mappings/net/minecraft/data/DataGenerator.mapping +++ b/mappings/net/minecraft/data/DataGenerator.mapping @@ -5,7 +5,9 @@ CLASS net/minecraft/class_2403 net/minecraft/data/DataGenerator FIELD field_11275 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/nio/file/Path;Ljava/util/Collection;)V ARG 1 output + ARG 2 inputs METHOD method_10312 getInputs ()Ljava/util/Collection; METHOD method_10313 getOutput ()Ljava/nio/file/Path; METHOD method_10314 install (Lnet/minecraft/class_2405;)V + ARG 1 provider METHOD method_10315 run ()V diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index 71a5bdd285..4ae0fe3df9 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -6,4 +6,5 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider ARG 0 gson ARG 1 cache ARG 2 output + ARG 3 path METHOD method_10321 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/data/SnbtProvider.mapping b/mappings/net/minecraft/data/SnbtProvider.mapping index 284b83c541..6471e3b0b7 100644 --- a/mappings/net/minecraft/data/SnbtProvider.mapping +++ b/mappings/net/minecraft/data/SnbtProvider.mapping @@ -3,12 +3,19 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider 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 + ARG 1 cache + ARG 2 data + ARG 3 root 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; + ARG 1 tweaker METHOD method_21673 write (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 key + ARG 2 compound METHOD method_22144 toCompressedNbt (Ljava/nio/file/Path;Ljava/lang/String;)Lnet/minecraft/class_2463$class_4511; + ARG 1 path ARG 2 name CLASS class_4460 Tweaker METHOD method_21674 write (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping b/mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping index 6c5263380b..204299a345 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping @@ -4,10 +4,25 @@ CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariant FIELD field_22863 variants Ljava/util/Map; METHOD method_25782 getVariants ()Ljava/util/Map; METHOD method_25783 create (Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4927; + ARG 0 property METHOD method_25784 create (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4928; + ARG 0 first + ARG 1 second METHOD method_25785 create (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4929; + ARG 0 first + ARG 1 second + ARG 2 third METHOD method_25786 create (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4930; + ARG 0 first + ARG 1 second + ARG 2 third + ARG 3 fourth METHOD method_25787 create (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)Lnet/minecraft/class_4926$class_4931; + ARG 0 first + ARG 1 second + ARG 2 third + ARG 3 fourth + ARG 4 fifth METHOD method_25790 register (Lnet/minecraft/class_4934;Ljava/util/List;)V ARG 1 condition ARG 2 possibleVariants diff --git a/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping b/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping index 717df0d88e..a6fc2793af 100644 --- a/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping +++ b/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping @@ -6,10 +6,18 @@ CLASS net/minecraft/class_4922 net/minecraft/data/client/model/MultipartBlockSta METHOD method_25758 create (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4922; ARG 0 block METHOD method_25760 with (Lnet/minecraft/class_4918;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4922; + ARG 1 condition + ARG 2 variant METHOD method_25761 with (Lnet/minecraft/class_4918;Ljava/util/List;)Lnet/minecraft/class_4922; + ARG 1 condition + ARG 2 variants METHOD method_25762 with (Lnet/minecraft/class_4918;[Lnet/minecraft/class_4935;)Lnet/minecraft/class_4922; + ARG 1 condition + ARG 2 variants METHOD method_25763 with (Lnet/minecraft/class_4935;)Lnet/minecraft/class_4922; + ARG 1 variant METHOD method_25764 with (Ljava/util/List;)Lnet/minecraft/class_4922; + ARG 1 variants CLASS class_4923 ConditionalMultipart FIELD field_22857 when Lnet/minecraft/class_4918; METHOD (Lnet/minecraft/class_4918;Ljava/util/List;)V diff --git a/mappings/net/minecraft/data/client/model/PropertiesMap.mapping b/mappings/net/minecraft/data/client/model/PropertiesMap.mapping index 5e116138cc..121f26acfe 100644 --- a/mappings/net/minecraft/data/client/model/PropertiesMap.mapping +++ b/mappings/net/minecraft/data/client/model/PropertiesMap.mapping @@ -5,7 +5,8 @@ CLASS net/minecraft/class_4934 net/minecraft/data/client/model/PropertiesMap COMMENT

This object is immutable. FIELD field_22881 EMPTY Lnet/minecraft/class_4934; FIELD field_22882 COMPARATOR Ljava/util/Comparator; - FIELD field_22883 propertyValues Ljava/util/List; + FIELD field_22883 values Ljava/util/List; METHOD method_25818 empty ()Lnet/minecraft/class_4934; - METHOD method_25820 with (Lnet/minecraft/class_4934;)Lnet/minecraft/class_4934; + METHOD method_25820 copyOf (Lnet/minecraft/class_4934;)Lnet/minecraft/class_4934; + ARG 1 propertiesMap METHOD method_25822 asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/data/client/model/TexturedModel.mapping b/mappings/net/minecraft/data/client/model/TexturedModel.mapping index fe0bc9a4ca..57217ea34b 100644 --- a/mappings/net/minecraft/data/client/model/TexturedModel.mapping +++ b/mappings/net/minecraft/data/client/model/TexturedModel.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_4946 net/minecraft/data/client/model/TexturedModel FIELD field_23054 TEMPLATE_SEAGRASS Lnet/minecraft/class_4946$class_4947; FIELD field_23055 END_FOR_TOP_CUBE_COLUMN Lnet/minecraft/class_4946$class_4947; FIELD field_23056 END_FOR_TOP_CUBE_COLUMN_HORIZONTAL Lnet/minecraft/class_4946$class_4947; - FIELD field_23057 WALL_CUBE_BOTTOM_TOP Lnet/minecraft/class_4946$class_4947; + FIELD field_23057 SIDE_TOP_BOTTOM_WALL Lnet/minecraft/class_4946$class_4947; FIELD field_23058 texture Lnet/minecraft/class_4944; FIELD field_23059 model Lnet/minecraft/class_4942; METHOD (Lnet/minecraft/class_4944;Lnet/minecraft/class_4942;)V diff --git a/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping b/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping index 5763a658e1..33878a4b79 100644 --- a/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping +++ b/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping @@ -28,3 +28,5 @@ CLASS net/minecraft/class_4925 net/minecraft/data/client/model/VariantsBlockStat COMMENT the variant map to contribute property to variant settings COMMENT mappings to the block state file METHOD method_25777 intersect (Ljava/util/List;Ljava/util/List;)Ljava/util/List; + ARG 0 left + ARG 1 right diff --git a/mappings/net/minecraft/data/report/BiomeListProvider.mapping b/mappings/net/minecraft/data/report/BiomeListProvider.mapping index c7124d57e3..55cd429c66 100644 --- a/mappings/net/minecraft/data/report/BiomeListProvider.mapping +++ b/mappings/net/minecraft/data/report/BiomeListProvider.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_5475 net/minecraft/data/report/BiomeListProvider FIELD field_26377 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_26378 GSON Lcom/google/gson/Gson; - FIELD field_26379 dataGenerator Lnet/minecraft/class_2403; + FIELD field_26379 generator Lnet/minecraft/class_2403; METHOD (Lnet/minecraft/class_2403;)V - ARG 1 dataGenerator + ARG 1 generator METHOD method_30682 getPath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;)Ljava/nio/file/Path; + ARG 0 root + ARG 1 id diff --git a/mappings/net/minecraft/data/report/BlockListProvider.mapping b/mappings/net/minecraft/data/report/BlockListProvider.mapping index 41f02d92fd..d550736f8b 100644 --- a/mappings/net/minecraft/data/report/BlockListProvider.mapping +++ b/mappings/net/minecraft/data/report/BlockListProvider.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_2422 net/minecraft/data/report/BlockListProvider - FIELD field_11307 root Lnet/minecraft/class_2403; + FIELD field_11307 generator Lnet/minecraft/class_2403; FIELD field_17168 GSON Lcom/google/gson/Gson; diff --git a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping index c698be2e37..be39835917 100644 --- a/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping +++ b/mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_2425 net/minecraft/data/report/CommandSyntaxProvider - FIELD field_11321 root Lnet/minecraft/class_2403; + FIELD field_11321 generator Lnet/minecraft/class_2403; FIELD field_17169 GSON Lcom/google/gson/Gson; diff --git a/mappings/net/minecraft/data/report/ItemListProvider.mapping b/mappings/net/minecraft/data/report/ItemListProvider.mapping deleted file mode 100644 index 3c6ec5afad..0000000000 --- a/mappings/net/minecraft/data/report/ItemListProvider.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_2427 net/minecraft/data/report/ItemListProvider - FIELD field_11323 root Lnet/minecraft/class_2403; - FIELD field_17170 GSON Lcom/google/gson/Gson; - METHOD method_17175 toJson (Lnet/minecraft/class_2378;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping new file mode 100644 index 0000000000..dd755efc8a --- /dev/null +++ b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_2427 net/minecraft/data/report/RegistryDumpProvider + FIELD field_11323 generator Lnet/minecraft/class_2403; + FIELD field_17170 GSON Lcom/google/gson/Gson; + METHOD method_17175 toJson (Lnet/minecraft/class_2378;)Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping index 83b0be9108..0d104c5cc0 100644 --- a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping +++ b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping @@ -6,8 +6,11 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider FIELD field_11483 root Lnet/minecraft/class_2403; METHOD (Lnet/minecraft/class_2403;Lnet/minecraft/class_2378;)V ARG 1 root + ARG 2 registry METHOD method_10510 getOutput (Lnet/minecraft/class_2960;)Ljava/nio/file/Path; + ARG 1 id METHOD method_10512 getOrCreateTagBuilder (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_2474$class_5124; + ARG 1 tag METHOD method_10514 configure ()V CLASS class_5124 ObjectBuilder METHOD method_26792 addTag (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_2474$class_5124; diff --git a/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping index 4824098583..8109bd173e 100644 --- a/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping @@ -2,4 +2,7 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/AdventureTabAdvancement FIELD field_11293 BIOMES Ljava/util/List; FIELD field_11294 MONSTERS [Lnet/minecraft/class_1299; METHOD method_10336 requireListedMobsKilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 1 task METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;Ljava/util/List;)Lnet/minecraft/class_161$class_162; + ARG 0 task + ARG 1 biomes diff --git a/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping index dce824c3ac..b6764a16a9 100644 --- a/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping @@ -80,13 +80,20 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator ARG 1 block ARG 2 drop METHOD method_16256 addDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_1935;)V + ARG 1 block ARG 2 drop METHOD method_16258 addDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_52$class_53;)V + ARG 1 block ARG 2 lootTable METHOD method_16262 addDropWithSilkTouch (Lnet/minecraft/class_2248;)V + ARG 1 block METHOD method_16285 addPottedPlantDrop (Lnet/minecraft/class_2248;)V + ARG 1 block METHOD method_16293 addDrop (Lnet/minecraft/class_2248;Ljava/util/function/Function;)V + ARG 1 block + ARG 2 lootTableFunction METHOD method_16329 addDrop (Lnet/minecraft/class_2248;)V + ARG 1 block METHOD method_16876 shulkerBoxDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 0 drop METHOD method_16877 bannerDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; @@ -99,6 +106,7 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator ARG 0 stem ARG 1 drop METHOD method_24817 addDoorDrop (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 0 block METHOD method_26000 addVinePlantDrop (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V ARG 1 block ARG 2 drop diff --git a/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping index 40d021acd8..0a47069d19 100644 --- a/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping @@ -3,5 +3,10 @@ CLASS net/minecraft/class_2434 net/minecraft/data/server/EntityLootTableGenerato FIELD field_16543 lootTables Ljava/util/Map; FIELD field_19339 ENTITY_TYPES_IN_MISC_GROUP_TO_CHECK Ljava/util/Set; METHOD method_10401 createForSheep (Lnet/minecraft/class_1935;)Lnet/minecraft/class_52$class_53; + ARG 0 item METHOD method_16368 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_52$class_53;)V + ARG 1 entityType + ARG 2 lootTable METHOD method_16369 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V + ARG 1 entityId + ARG 2 lootTable diff --git a/mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping index 4f4abd1548..bf1ead08fb 100644 --- a/mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping @@ -4,7 +4,12 @@ CLASS net/minecraft/class_2414 net/minecraft/data/server/HusbandryTabAdvancement FIELD field_11297 FISH_BUCKET_ITEMS [Lnet/minecraft/class_1792; FIELD field_11298 FOOD_ITEMS [Lnet/minecraft/class_1792; METHOD method_10339 requireListedFishCaught (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 1 task METHOD method_10340 requireListedFishBucketsFilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 1 task METHOD method_10341 requireFoodItemsEaten (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 1 task METHOD method_10342 requireListedAnimalsBred (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 1 task METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + ARG 1 task diff --git a/mappings/net/minecraft/data/server/ItemTagsProvider.mapping b/mappings/net/minecraft/data/server/ItemTagsProvider.mapping index 6a75fce71d..198c8e6d16 100644 --- a/mappings/net/minecraft/data/server/ItemTagsProvider.mapping +++ b/mappings/net/minecraft/data/server/ItemTagsProvider.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_2471 net/minecraft/data/server/ItemTagsProvider METHOD method_10505 copy (Lnet/minecraft/class_3494$class_5123;Lnet/minecraft/class_3494$class_5123;)V + ARG 1 blockTag + ARG 2 itemTag diff --git a/mappings/net/minecraft/data/server/RecipesProvider.mapping b/mappings/net/minecraft/data/server/RecipesProvider.mapping index 2582a4b855..1080d23efa 100644 --- a/mappings/net/minecraft/data/server/RecipesProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipesProvider.mapping @@ -3,10 +3,25 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider FIELD field_11374 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_11375 GSON Lcom/google/gson/Gson; METHOD method_10419 generate (Ljava/util/function/Consumer;)V + ARG 0 exporter METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2066$class_2068; + ARG 0 tag METHOD method_10422 requireEnteringFluid (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2037$class_2039; + ARG 0 block METHOD method_10423 conditionsFromItemPredicates ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_2066$class_2068; + ARG 0 items METHOD method_10425 saveRecipe (Lnet/minecraft/class_2408;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V + ARG 0 cache + ARG 1 json + ARG 2 path METHOD method_10426 conditionsFromItem (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2066$class_2068; + ARG 0 item METHOD method_10427 saveRecipeAdvancement (Lnet/minecraft/class_2408;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V + ARG 0 cache + ARG 1 json + ARG 2 path METHOD method_17585 generateCookingRecipes (Ljava/util/function/Consumer;Ljava/lang/String;Lnet/minecraft/class_3957;I)V + ARG 0 exporter + ARG 1 cooker + ARG 2 serializer + ARG 3 cookingTime diff --git a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping index 2681d55623..068bf3f0f7 100644 --- a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping @@ -2,13 +2,13 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso FIELD field_11414 experience F FIELD field_11415 cookingTime I FIELD field_11416 builder Lnet/minecraft/class_161$class_162; - FIELD field_11417 result Lnet/minecraft/class_1792; - FIELD field_11418 ingredient Lnet/minecraft/class_1856; + FIELD field_11417 output Lnet/minecraft/class_1792; + FIELD field_11418 input Lnet/minecraft/class_1856; FIELD field_11419 group Ljava/lang/String; FIELD field_17599 serializer Lnet/minecraft/class_3957; METHOD (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;FILnet/minecraft/class_3957;)V - ARG 1 result - ARG 2 ingredient + ARG 1 output + ARG 2 input ARG 3 experience ARG 4 cookingTime ARG 5 serializer diff --git a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping index d57e766fec..9d2f9973f7 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ FIELD field_11397 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_11398 group Ljava/lang/String; METHOD (Lnet/minecraft/class_1935;I)V - ARG 1 itemProvider + ARG 1 output ARG 2 outputCount METHOD method_10442 criterion (Ljava/lang/String;Lnet/minecraft/class_184;)Lnet/minecraft/class_2450; ARG 1 criterionName diff --git a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping index 9275feacaf..6ed44c0159 100644 --- a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping @@ -10,10 +10,10 @@ CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipe ARG 2 input ARG 3 output ARG 4 outputCount - METHOD method_17968 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;)Lnet/minecraft/class_3981; + METHOD method_17968 createStonecutting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;)Lnet/minecraft/class_3981; ARG 0 input ARG 1 output - METHOD method_17969 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;I)Lnet/minecraft/class_3981; + METHOD method_17969 createStonecutting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;I)Lnet/minecraft/class_3981; ARG 0 input ARG 1 output ARG 2 outputCount diff --git a/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping b/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping index e6b8dbdfb2..135f8cf00a 100644 --- a/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping +++ b/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_3843 net/minecraft/data/validate/StructureValidatorProvider - METHOD method_16878 update (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + METHOD method_16878 internalUpdate (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 0 name + ARG 1 nbt METHOD method_16880 addDataVersion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 0 nbt diff --git a/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping index ebdc15c40a..e42bc2008f 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_1180 net/minecraft/datafixer/fix/ItemLoreToTextFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_5005 fixLoreTags (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; - ARG 0 tags + METHOD method_5005 fixLoreNbt (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; + ARG 0 nbt METHOD method_5012 componentize (Ljava/lang/String;)Ljava/lang/String; ARG 0 string diff --git a/mappings/net/minecraft/datafixer/schema/Schema2501.mapping b/mappings/net/minecraft/datafixer/schema/Schema2501.mapping index b1dafd306d..e522c17693 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2501.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2501.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4755 net/minecraft/datafixer/schema/Schema2501 - METHOD method_24330 targetRecipeUsedField (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + METHOD method_24330 registerFurnace (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V ARG 0 schema ARG 1 map ARG 2 name diff --git a/mappings/net/minecraft/datafixer/schema/Schema2502.mapping b/mappings/net/minecraft/datafixer/schema/Schema2502.mapping index 7169eece09..dcf3fa9c22 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2502.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2502.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4756 net/minecraft/datafixer/schema/Schema2502 - METHOD method_24332 targetEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + METHOD method_24332 registerEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V ARG 0 schema ARG 1 map ARG 2 name diff --git a/mappings/net/minecraft/datafixer/schema/Schema2505.mapping b/mappings/net/minecraft/datafixer/schema/Schema2505.mapping index f52e8c9f75..1d7d8b464a 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2505.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2505.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_4804 net/minecraft/datafixer/schema/Schema2505 - METHOD method_24512 updatePiglinItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + METHOD method_24512 registerEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 entityTypes + ARG 2 name diff --git a/mappings/net/minecraft/datafixer/schema/Schema2509.mapping b/mappings/net/minecraft/datafixer/schema/Schema2509.mapping index 47ce4bc1ec..bcfe99a7b3 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2509.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2509.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_4847 net/minecraft/datafixer/schema/Schema2509 - METHOD method_24824 renameZombifiedPiglin (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + METHOD method_24824 registerEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 entityTypes + ARG 2 name diff --git a/mappings/net/minecraft/datafixer/schema/Schema2519.mapping b/mappings/net/minecraft/datafixer/schema/Schema2519.mapping index 171633e79b..ed5ee34d20 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2519.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2519.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4979 net/minecraft/datafixer/schema/Schema2519 - METHOD method_26305 updateStriderItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + METHOD method_26305 registerEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V ARG 0 schema ARG 1 entityTypes ARG 2 name diff --git a/mappings/net/minecraft/datafixer/schema/Schema2522.mapping b/mappings/net/minecraft/datafixer/schema/Schema2522.mapping index 97c2c42220..8e17a717f1 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema2522.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema2522.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5130 net/minecraft/datafixer/schema/Schema2522 - METHOD method_26822 updateZoglinItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + METHOD method_26822 registerEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V ARG 0 schema ARG 1 entityTypes ARG 2 name diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 9bd0b4e17f..59df394f29 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -3,9 +3,9 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 2 enchantment METHOD method_17884 (Ljava/util/Map;Lnet/minecraft/class_2487;Lnet/minecraft/class_1887;)V ARG 2 enchantment - METHOD method_22445 fromTag (Lnet/minecraft/class_2499;)Ljava/util/Map; + METHOD method_22445 fromNbt (Lnet/minecraft/class_2499;)Ljava/util/Map; COMMENT Loads enchantments from an NBT list. - ARG 0 tag + ARG 0 list METHOD method_24365 chooseEquipmentWith (Lnet/minecraft/class_1887;Lnet/minecraft/class_1309;Ljava/util/function/Predicate;)Ljava/util/Map$Entry; COMMENT Returns a pair of an equipment slot and the item stack in the supplied COMMENT entity's slot, indicating the item stack has the enchantment supplied @@ -84,8 +84,8 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper COMMENT

For enchanted books, it sets the enchantments to the item stack's COMMENT stored enchantments than regular enchantments. COMMENT - COMMENT @see net.minecraft.item.ItemStack#getEnchantments() - COMMENT @see net.minecraft.item.EnchantedBookItem#getEnchantmentTag(net.minecraft.item.ItemStack) + COMMENT @see ItemStack#getEnchantments() + COMMENT @see net.minecraft.item.EnchantedBookItem#getEnchantmentNbt(ItemStack) ARG 0 enchantments ARG 1 stack METHOD method_8215 getLure (Lnet/minecraft/class_1799;)I @@ -111,8 +111,8 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper COMMENT

For enchanted books, it retrieves from the item stack's stored than COMMENT regular enchantments. COMMENT - COMMENT @see net.minecraft.item.ItemStack#getEnchantments() - COMMENT @see net.minecraft.item.EnchantedBookItem#getEnchantmentTag(net.minecraft.item.ItemStack) + COMMENT @see ItemStack#getEnchantments() + COMMENT @see net.minecraft.item.EnchantedBookItem#getEnchantmentNbt(ItemStack) ARG 0 stack METHOD method_8223 getLuckOfTheSea (Lnet/minecraft/class_1799;)I ARG 0 stack diff --git a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping index 9a6041d170..e46a95bac1 100644 --- a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_1900 net/minecraft/enchantment/ProtectionEnchantment FIELD field_9133 protectionType Lnet/minecraft/class_1900$class_1901; METHOD (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_1900$class_1901;[Lnet/minecraft/class_1304;)V ARG 1 weight + ARG 2 protectionType + ARG 3 slotTypes METHOD method_8237 transformExplosionKnockback (Lnet/minecraft/class_1309;D)D ARG 0 entity ARG 1 velocity diff --git a/mappings/net/minecraft/enchantment/SweepingEnchantment.mapping b/mappings/net/minecraft/enchantment/SweepingEnchantment.mapping index cf772e8f94..722492da2f 100644 --- a/mappings/net/minecraft/enchantment/SweepingEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/SweepingEnchantment.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_1903 net/minecraft/enchantment/SweepingEnchantment ARG 1 weight ARG 2 slotTypes METHOD method_8241 getMultiplier (I)F + ARG 0 level diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 44ed3b2420..5bce6fc312 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -32,7 +32,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_5974 random Ljava/util/Random; FIELD field_5975 NAME_VISIBLE Lnet/minecraft/class_2940; FIELD field_5976 horizontalCollision Z - FIELD field_5978 MAX_ENTITY_ID Ljava/util/concurrent/atomic/AtomicInteger; + FIELD field_5978 ENTITY_ID_COUNTER Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_5979 passengerList Ljava/util/List; FIELD field_5980 chunkZ I FIELD field_5981 uuidString Ljava/lang/String; @@ -106,10 +106,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT

Compared to {@link #isSneaking()}, it only makes the entity appear COMMENT crouching and does not bring other effects of sneaking, such as no less - COMMENT obvious name label rendering, no dismounting while riding, etc.

+ COMMENT obvious name label rendering, no dismounting while riding, etc. COMMENT COMMENT

This is used by vanilla for non-player entities to crouch, such as - COMMENT for foxes and cats.

+ COMMENT for foxes and cats. METHOD method_18375 detach ()V COMMENT Removes all the passengers and removes this entity from any vehicles it is riding. METHOD method_18376 getPose ()Lnet/minecraft/class_4050; @@ -209,6 +209,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 5 z METHOD method_24201 updatePassengerPosition (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297$class_4738;)V ARG 1 passenger + ARG 2 positionUpdater METHOD method_24203 refreshPositionAfterTeleport (DDD)V ARG 1 x ARG 3 y @@ -216,6 +217,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_24204 streamPassengersRecursively ()Ljava/util/stream/Stream; METHOD method_24515 getBlockPos ()Lnet/minecraft/class_2338; METHOD method_24516 isInRange (Lnet/minecraft/class_1297;D)Z + COMMENT Checks if the distance between this entity and the {@code other} entity is less + COMMENT than {@code radius}. ARG 1 other ARG 2 radius METHOD method_24826 getPassengerDismountOffset (DDF)Lnet/minecraft/class_243; @@ -231,21 +234,25 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_27298 shouldSpawnSprintingParticles ()Z METHOD method_29240 isChunkPosUpdateRequested ()Z METHOD method_29495 refreshPositionAfterTeleport (Lnet/minecraft/class_243;)V + ARG 1 pos 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; + COMMENT Determines a {@link TeleportTarget} for the entity + COMMENT based on its current and destination worlds, plus + COMMENT any portals that may be present. ARG 1 destination - METHOD method_30634 (DDD)V + METHOD method_30634 updatePosition (DDD)V ARG 1 x ARG 3 y ARG 5 z METHOD method_30948 isCollidable ()Z METHOD method_30949 collidesWith (Lnet/minecraft/class_1297;)Z ARG 1 other - METHOD method_31166 (F)Lnet/minecraft/class_243; + METHOD method_31166 getClientCameraPosVec (F)Lnet/minecraft/class_243; ARG 1 tickDelta METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V @@ -273,8 +280,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 y ARG 5 z METHOD method_5634 getSoundCategory ()Lnet/minecraft/class_3419; - METHOD method_5636 setYaw (F)V - ARG 1 yaw + METHOD method_5636 setBodyYaw (F)V + ARG 1 bodyYaw METHOD method_5637 isWet ()Z COMMENT Returns whether this entity is touching water, or is being rained on, or is inside a bubble column... COMMENT @@ -301,8 +308,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5645 isTeamPlayer (Lnet/minecraft/class_270;)Z ARG 1 team METHOD method_5646 extinguish ()V - METHOD method_5647 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + METHOD method_5647 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt METHOD method_5648 setInvisible (Z)V ARG 1 invisible METHOD method_5649 squaredDistanceTo (DDD)D @@ -310,10 +317,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 y ARG 5 z METHOD method_5650 remove ()V - METHOD method_5651 fromTag (Lnet/minecraft/class_2487;)V - ARG 1 tag - METHOD method_5652 writeCustomDataToTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_5651 readNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt + METHOD method_5652 writeCustomDataToNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_5653 getSavedEntityId ()Ljava/lang/String; METHOD method_5654 doesNotCollide (DDD)Z ARG 1 offsetX @@ -326,8 +333,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5660 setSneaking (Z)V ARG 1 sneaking METHOD method_5661 getArmorItems ()Ljava/lang/Iterable; - METHOD method_5662 saveToTag (Lnet/minecraft/class_2487;)Z - ARG 1 tag + METHOD method_5662 saveNbt (Lnet/minecraft/class_2487;)Z + ARG 1 nbt METHOD method_5663 getRotationVecClient ()Lnet/minecraft/class_243; METHOD method_5664 interactAt (Lnet/minecraft/class_1657;Lnet/minecraft/class_243;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player @@ -341,13 +348,14 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5669 getAir ()I METHOD method_5670 baseTick ()V METHOD method_5671 getCommandSource ()Lnet/minecraft/class_2168; + COMMENT Creates a command source which represents this entity. METHOD method_5672 getHighSpeedSplashSound ()Lnet/minecraft/class_3414; METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V ARG 1 data - METHOD method_5675 canFly ()Z + METHOD method_5675 isPushedByFluids ()Z METHOD method_5676 getBurningDuration ()I METHOD method_5678 getHeightOffset ()D METHOD method_5679 isInvulnerableTo (Lnet/minecraft/class_1282;)Z @@ -434,7 +442,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 pos ARG 2 yaw ARG 3 pitch - METHOD method_5726 toListTag ([F)Lnet/minecraft/class_2499; + METHOD method_5726 toNbtList ([F)Lnet/minecraft/class_2499; ARG 1 values METHOD method_5727 shouldRender (DDD)Z ARG 1 cameraX @@ -478,8 +486,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 fallDistance ARG 2 damageMultiplier METHOD method_5748 getMaxAir ()I - METHOD method_5749 readCustomDataFromTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_5749 readCustomDataFromNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_5750 setVelocityClient (DDD)V ARG 1 x ARG 3 y @@ -531,6 +539,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 stack METHOD method_5776 hasWings ()Z METHOD method_5777 isSubmergedIn (Lnet/minecraft/class_3494;)Z + ARG 1 fluidTag METHOD method_5778 isBeingRainedOn ()Z METHOD method_5779 isPartOf (Lnet/minecraft/class_1297;)Z ARG 1 entity @@ -543,11 +552,11 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 2 volume ARG 3 pitch METHOD method_5784 move (Lnet/minecraft/class_1313;Lnet/minecraft/class_243;)V - ARG 1 type + ARG 1 movementType ARG 2 movement METHOD method_5785 scheduleVelocityUpdate ()V - METHOD method_5786 saveSelfToTag (Lnet/minecraft/class_2487;)Z - ARG 1 tag + METHOD method_5786 saveSelfNbt (Lnet/minecraft/class_2487;)Z + ARG 1 nbt METHOD method_5787 isLogicalSideForUpdatingMovement ()Z METHOD method_5788 canBeRiddenInWater ()Z METHOD method_5790 updateSwimming ()V @@ -587,7 +596,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 8 pitch METHOD method_5809 isOnFire ()Z METHOD method_5810 isPushable ()Z - METHOD method_5814 updatePosition (DDD)V + METHOD method_5814 setPosition (DDD)V ARG 1 x ARG 3 y ARG 5 z @@ -603,7 +612,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5822 canUsePortals ()Z METHOD method_5823 afterSpawn ()V METHOD method_5824 getRenderDistanceMultiplier ()D - METHOD method_5825 destroy ()V + METHOD method_5825 tickInVoid ()V + COMMENT Called when the entity is 64 blocks below the world's minimum Y position which is {@code 0}. + COMMENT + COMMENT

{@linkplain LivingEntity Living entities} use this to deal {@linkplain net.minecraft.entity.damage.DamageSource#OUT_OF_WORLD out of world damage}. METHOD method_5826 setUuid (Ljava/util/UUID;)V ARG 1 uuid METHOD method_5828 getRotationVec (F)Lnet/minecraft/class_243; @@ -630,7 +642,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 state ARG 2 multiplier METHOD method_5845 getUuidAsString ()Ljava/lang/String; - METHOD method_5846 toListTag ([D)Lnet/minecraft/class_2499; + METHOD method_5846 toNbtList ([D)Lnet/minecraft/class_2499; ARG 1 values METHOD method_5847 setHeadYaw (F)V ARG 1 headYaw @@ -685,6 +697,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 entity ARG 2 force METHOD method_5874 onKilledOther (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V + ARG 1 world + ARG 2 other METHOD method_5875 setNoGravity (Z)V ARG 1 noGravity METHOD method_5876 updateWaterState ()Z diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 4e6fb2dfb2..7f750536b7 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -20,21 +20,25 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 4 summonable ARG 5 fireImmune ARG 6 spawnableFarFromPlayer + ARG 7 canSpawnInside + ARG 8 dimensions + ARG 9 maxTrackDistance + ARG 10 trackTickInterval METHOD method_16351 getLootTableId ()Lnet/minecraft/class_2960; METHOD method_17683 createSimpleBoundingBox (DDD)Lnet/minecraft/class_238; ARG 1 feetX ARG 3 feetY ARG 5 feetZ - METHOD method_17684 fromTag (Lnet/minecraft/class_2487;)Ljava/util/Optional; - ARG 0 compoundTag + METHOD method_17684 fromNbt (Lnet/minecraft/class_2487;)Ljava/util/Optional; + ARG 0 nbt METHOD method_17685 getWidth ()F METHOD method_17686 getHeight ()F METHOD method_17842 loadEntityWithPassengers (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;Ljava/util/function/Function;)Lnet/minecraft/class_1297; - ARG 0 compoundTag + ARG 0 nbt ARG 1 world ARG 2 entityProcessor - METHOD method_17848 loadEntityFromTag (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;)Ljava/util/Optional; - ARG 0 compoundTag + METHOD method_17848 loadEntityFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;)Ljava/util/Optional; + ARG 0 nbt ARG 1 world METHOD method_18386 getDimensions ()Lnet/minecraft/class_4048; METHOD method_18387 getMaxTrackDistance ()I @@ -54,11 +58,12 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType COMMENT Any mob can't spawn in wither roses, sweet berry bush, or cacti. COMMENT COMMENT

This can be overwritten via {@link EntityType.Builder#allowSpawningInside(Block[])} - METHOD method_5881 loadFromEntityTag (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_2487;)V + ARG 1 state + METHOD method_5881 loadFromEntityNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_2487;)V ARG 0 world ARG 1 player ARG 2 entity - ARG 3 itemTag + ARG 3 itemNbt METHOD method_5882 getTranslationKey ()Ljava/lang/String; METHOD method_5883 create (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world @@ -71,7 +76,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 0 world ARG 1 type METHOD method_5888 create (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_2561;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; - ARG 2 itemTag + ARG 1 world + ARG 2 itemNbt ARG 3 name ARG 4 player ARG 5 pos @@ -84,11 +90,12 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_5890 getId (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2960; ARG 0 type METHOD method_5891 getSpawnGroup ()Lnet/minecraft/class_1311; - METHOD method_5892 getEntityFromTag (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;)Ljava/util/Optional; - ARG 0 tag + METHOD method_5892 getEntityFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;)Ljava/util/Optional; + ARG 0 nbt ARG 1 world METHOD method_5893 isSaveable ()Z METHOD method_5894 spawnFromItemStack (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; + ARG 1 world ARG 2 stack ARG 3 player ARG 4 pos @@ -103,7 +110,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_5898 get (Ljava/lang/String;)Ljava/util/Optional; ARG 0 id METHOD method_5899 spawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_2561;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; - ARG 2 itemTag + ARG 1 world + ARG 2 itemNbt ARG 3 name ARG 4 player ARG 5 pos diff --git a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping index 16c7b73881..1a47247678 100644 --- a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping +++ b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping @@ -18,6 +18,5 @@ CLASS net/minecraft/class_1672 net/minecraft/entity/EyeOfEnderEntity METHOD method_7478 initTargetPos (Lnet/minecraft/class_2338;)V COMMENT Sets where the eye will fly towards. COMMENT If close enough, it will fly directly towards it, otherwise, it will fly upwards, in the direction of the BlockPos. - COMMENT - COMMENT @param pos the block the eye of ender is drawn towards ARG 1 pos + COMMENT the block the eye of ender is drawn towards diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index 2596edcaaa..ab6c29e83c 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -3,8 +3,12 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity FIELD field_7200 thrower Ljava/util/UUID; FIELD field_7201 health I FIELD field_7202 pickupDelay I - FIELD field_7203 hoverHeight F - FIELD field_7204 age I + FIELD field_7203 uniqueOffset F + FIELD field_7204 itemAge I + COMMENT The number of ticks since this item entity has been created. + COMMENT It is a short value with key {@code Age} in the NBT structure. + COMMENT + COMMENT

It differs from {@link Entity#age}. FIELD field_7205 owner Ljava/util/UUID; METHOD (Lnet/minecraft/class_1937;DDD)V ARG 1 world @@ -37,22 +41,55 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity METHOD method_6972 tryMerge (Lnet/minecraft/class_1542;)V ARG 1 other METHOD method_6973 tryMerge ()V - METHOD method_6974 applyBuoyancy ()V + METHOD method_6974 applyWaterBuoyancy ()V METHOD method_6975 resetPickupDelay ()V + COMMENT Sets the number of ticks before this item entity can be picked up + COMMENT to 0. METHOD method_6976 setCovetedItem ()V METHOD method_6977 cannotPickup ()Z + COMMENT Returns whether the pickup delay of this item entity is greater + COMMENT than 0. METHOD method_6978 getThrower ()Ljava/util/UUID; + COMMENT Returns the UUID of the entity which created this item entity + COMMENT by throwing an item, or {@code null} if it was created otherwise. METHOD method_6979 setStack (Lnet/minecraft/class_1799;)V + COMMENT Sets the item stack contained in this item entity to {@code stack}. ARG 1 stack METHOD method_6981 setThrower (Ljava/util/UUID;)V + COMMENT Sets the thrower of this item entity to {@code uuid}. ARG 1 uuid METHOD method_6982 setPickupDelay (I)V + COMMENT Sets the number of ticks before this item entity can be picked up + COMMENT to {@code pickupDelay}. ARG 1 pickupDelay METHOD method_6983 getStack ()Lnet/minecraft/class_1799; + COMMENT Returns the item stack contained in this item entity. METHOD method_6984 setOwner (Ljava/util/UUID;)V + COMMENT Sets the owner of this item entity to {@code uuid}. + COMMENT + COMMENT

Used when an item is given to an entity, but this entity + COMMENT does not have enough space in its inventory. ARG 1 uuid - METHOD method_6985 getAge ()I + METHOD method_6985 getItemAge ()I + COMMENT Returns the number of ticks since this item entity has been created. + COMMENT + COMMENT

Increases every tick. When it equals to 6000 ticks (5 minutes), + COMMENT this item entity disappears. + COMMENT + COMMENT

Unlike {@linkplain Entity#age}, it is persistent and not synchronized + COMMENT between the client and the server. + COMMENT + COMMENT @see #tick() METHOD method_6986 getOwner ()Ljava/util/UUID; + COMMENT Returns the UUID of the entity to which belongs this item entity, + COMMENT or {@code null} if there is not. + COMMENT + COMMENT

If there is one, the owner is the only entity which can pick + COMMENT up this item entity. METHOD method_6987 setDespawnImmediately ()V METHOD method_6988 setToDefaultPickupDelay ()V + COMMENT Sets the number of ticks before this item entity can be picked up + COMMENT to the default value of 10. METHOD method_6989 setPickupDelayInfinite ()V + COMMENT Makes this item entity impossible to be picked up by setting its + COMMENT pickup delay to 32767. diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 2bf70e4a1e..79e1dc6b9d 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -133,6 +133,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 world ARG 2 stack METHOD method_18867 deserializeBrain (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_4095; + ARG 1 dynamic METHOD method_18868 getBrain ()Lnet/minecraft/class_4095; METHOD method_18869 getEatSound (Lnet/minecraft/class_1799;)Lnet/minecraft/class_3414; ARG 1 stack @@ -155,6 +156,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 2 damageMultiplier METHOD method_23667 swingHand (Lnet/minecraft/class_1268;Z)V ARG 1 hand + ARG 2 fromServerPlayer METHOD method_23733 onKilledBy (Lnet/minecraft/class_1309;)V COMMENT Performs secondary effects after this mob has been killed. COMMENT @@ -162,6 +164,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 adversary COMMENT the main adversary responsible for this entity's death METHOD method_23883 dropXp ()V + COMMENT Drops experience when this entity is killed. + COMMENT + COMMENT

To control the details of experience dropping, consider overriding + COMMENT {@link #shouldAlwaysDropXp()}, {@link #shouldDropXp()}, and + COMMENT {@link #getXpToDrop(PlayerEntity)}. METHOD method_24518 isHolding (Lnet/minecraft/class_1792;)Z COMMENT Checks if this entity is holding a certain item. COMMENT @@ -171,6 +178,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT Checks if this entity is holding a certain item. COMMENT COMMENT

This checks both the entity's main and off hand. + ARG 1 predicate METHOD method_24831 getPoses ()Lcom/google/common/collect/ImmutableList; METHOD method_24832 getClimbingPos ()Ljava/util/Optional; METHOD method_24833 getBoundingBox (Lnet/minecraft/class_4050;)Lnet/minecraft/class_238; @@ -237,6 +245,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 type METHOD method_6017 getSoundPitch ()F METHOD method_6018 setRiptideTicks (I)V + ARG 1 riptideTicks METHOD method_6019 setCurrentHand (Lnet/minecraft/class_1268;)V ARG 1 hand METHOD method_6020 onStatusEffectApplied (Lnet/minecraft/class_1293;)V @@ -247,6 +256,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6024 getLeaningPitch (F)F ARG 1 tickDelta METHOD method_6025 heal (F)V + COMMENT Heals this entity by the given {@code amount} of half-hearts. + COMMENT + COMMENT

A dead entity cannot be healed. + COMMENT + COMMENT @see #isDead() ARG 1 amount METHOD method_6026 getStatusEffects ()Ljava/util/Collection; METHOD method_6027 updatePotionVisibility ()V @@ -287,8 +301,18 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6050 tickStatusEffects ()V METHOD method_6051 getRandom ()Ljava/util/Random; METHOD method_6052 getAttacking ()Lnet/minecraft/class_1309; - METHOD method_6053 initAi ()V - METHOD method_6054 canDropLootAndXp ()Z + METHOD method_6053 tickFallFlying ()V + METHOD method_6054 shouldDropXp ()Z + COMMENT Returns if this entity should drop experience on death when the {@linkplain + COMMENT net.minecraft.world.GameRules#DO_MOB_LOOT doMobLoot} game rule is + COMMENT enabled and has been attacked by a player. + COMMENT + COMMENT

If {@link #shouldAlwaysDropXp() shouldAlwaysDropXp()} returns {@code + COMMENT true}, this check is disregarded. + COMMENT + COMMENT @see #dropXp() + COMMENT @see #shouldAlwaysDropXp() + COMMENT @see #getXpToDrop(PlayerEntity) METHOD method_6055 getHandSwingProgress (F)F ARG 1 tickDelta METHOD method_6056 damageShield (F)V @@ -313,6 +337,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6069 clearPotionSwirls ()V METHOD method_6070 tickCramming ()V METHOD method_6071 shouldAlwaysDropXp ()Z + COMMENT Returns if this entity may always drop experience, skipping any + COMMENT other checks. + COMMENT + COMMENT @see #dropXp() + COMMENT @see #getXpToDrop(PlayerEntity) METHOD method_6072 updateLeaningPitch ()V METHOD method_6073 setAbsorptionAmount (F)V ARG 1 amount @@ -381,8 +410,18 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6107 getSoundVolume ()F METHOD method_6108 updatePostDeath ()V METHOD method_6109 isBaby ()Z - METHOD method_6110 getCurrentExperience (Lnet/minecraft/class_1657;)I + METHOD method_6110 getXpToDrop (Lnet/minecraft/class_1657;)I + COMMENT Called when this entity is killed and returns the amount of experience + COMMENT to drop. + COMMENT + COMMENT

{@code player} may be {@code null} if {@linkplain #shouldAlwaysDropXp + COMMENT shouldAlwaysDropXp()} returns {@code true}. + COMMENT + COMMENT @see #dropXp() + COMMENT @see #shouldAlwaysDropXp() + COMMENT @see #shouldDropXp() ARG 1 player + COMMENT the attacking player METHOD method_6111 removeStatusEffectInternal (Lnet/minecraft/class_1291;)Lnet/minecraft/class_1293; COMMENT Removes a status effect from this entity without calling any listener. COMMENT diff --git a/mappings/net/minecraft/entity/SaddledComponent.mapping b/mappings/net/minecraft/entity/SaddledComponent.mapping index 2a20fb7273..0171b8d1cc 100644 --- a/mappings/net/minecraft/entity/SaddledComponent.mapping +++ b/mappings/net/minecraft/entity/SaddledComponent.mapping @@ -10,10 +10,11 @@ CLASS net/minecraft/class_4980 net/minecraft/entity/SaddledComponent ARG 3 saddled METHOD method_26307 boost ()V METHOD method_26308 boost (Ljava/util/Random;)Z - METHOD method_26309 toTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 random + METHOD method_26309 writeNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_26310 setSaddled (Z)V ARG 1 saddled METHOD method_26311 isSaddled ()Z - METHOD method_26312 fromTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_26312 readNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt diff --git a/mappings/net/minecraft/entity/SpawnGroup.mapping b/mappings/net/minecraft/entity/SpawnGroup.mapping index 068d64ef4a..4c82454b8c 100644 --- a/mappings/net/minecraft/entity/SpawnGroup.mapping +++ b/mappings/net/minecraft/entity/SpawnGroup.mapping @@ -1,8 +1,17 @@ CLASS net/minecraft/class_1311 net/minecraft/entity/SpawnGroup + COMMENT A spawn group represents the category of an entity's natural spawning. + COMMENT + COMMENT

Entities that don't support natural spawning belong to the + COMMENT {@link #MISC} group. + COMMENT + COMMENT @see EntityType#getSpawnGroup() + COMMENT @see net.minecraft.world.SpawnHelper FIELD field_24461 despawnStartRange I FIELD field_24462 immediateDespawnRange I FIELD field_24655 CODEC Lcom/mojang/serialization/Codec; - FIELD field_6295 animal Z + COMMENT A codec that encodes and decodes a spawn group from and to its + COMMENT {@linkplain #getName() name} string. + FIELD field_6295 rare Z FIELD field_6296 BY_NAME Ljava/util/Map; FIELD field_6297 capacity I FIELD field_6298 peaceful Z @@ -11,13 +20,52 @@ CLASS net/minecraft/class_1311 net/minecraft/entity/SpawnGroup ARG 3 name ARG 4 spawnCap ARG 5 peaceful + ARG 6 rare + ARG 7 immediateDespawnRange METHOD method_27919 getImmediateDespawnRange ()I + COMMENT Returns the distance, of a mob of this group from a player, at which + COMMENT that mob will despawn immediately. + COMMENT + COMMENT

This is ignored if a mob {@linkplain + COMMENT net.minecraft.entity.mob.MobEntity#canImmediatelyDespawn(double) cannot + COMMENT immediately despawn}. + COMMENT + COMMENT @see net.minecraft.entity.mob.MobEntity#checkDespawn() METHOD method_27920 getDespawnStartRange ()I + COMMENT Returns the distance, of a mob of this group from a player, at which + COMMENT that mob can despawn at chance. + COMMENT + COMMENT

This is ignored if a mob {@linkplain + COMMENT net.minecraft.entity.mob.MobEntity#canImmediatelyDespawn(double) cannot + COMMENT immediately despawn}. + COMMENT + COMMENT @see net.minecraft.entity.mob.MobEntity#checkDespawn() METHOD method_28307 byName (Ljava/lang/String;)Lnet/minecraft/class_1311; + COMMENT Finds the spawn group with the given {@code name}, or {@code null} if no + COMMENT group has the given {@code name}. + COMMENT + COMMENT @see #getName() + COMMENT @return the found group, or {@code null} ARG 0 name + COMMENT the name of the group METHOD method_6133 getName ()Ljava/lang/String; + COMMENT Returns the name of this spawn group. + COMMENT + COMMENT

The names are unique and are in {@code lower_snake_case}. METHOD method_6134 getCapacity ()I - METHOD method_6135 isAnimal ()Z + COMMENT Returns the maximum number of mobs in this group that can be spawned per + COMMENT chunk. + METHOD method_6135 isRare ()Z + COMMENT Returns if this spawn group is spawned only rarely. + COMMENT + COMMENT

A rare spawn only happens when the {@linkplain + COMMENT net.minecraft.world.WorldProperties#getTime() world time} is a multiple + COMMENT of {@code 400} in {@link + COMMENT net.minecraft.server.world.ServerChunkManager#tickChunks()}. METHOD method_6136 isPeaceful ()Z + COMMENT Returns {@code true} if this group is spawned as animals, or {@code false} + COMMENT if this group is spawned as monsters. + COMMENT + COMMENT @see net.minecraft.world.World#setMobSpawnOptions(boolean, boolean) METHOD method_6137 (Lnet/minecraft/class_1311;)Lnet/minecraft/class_1311; ARG 0 spawnGroup diff --git a/mappings/net/minecraft/entity/SpawnRestriction.mapping b/mappings/net/minecraft/entity/SpawnRestriction.mapping index 67a79ae1c7..d161e0f825 100644 --- a/mappings/net/minecraft/entity/SpawnRestriction.mapping +++ b/mappings/net/minecraft/entity/SpawnRestriction.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction ARG 3 predicate METHOD method_20638 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type + ARG 1 world ARG 2 spawnReason ARG 3 pos ARG 4 random diff --git a/mappings/net/minecraft/entity/ai/brain/Brain.mapping b/mappings/net/minecraft/entity/ai/brain/Brain.mapping index 61f9bbc47b..13c7e829c0 100644 --- a/mappings/net/minecraft/entity/ai/brain/Brain.mapping +++ b/mappings/net/minecraft/entity/ai/brain/Brain.mapping @@ -73,7 +73,7 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain ARG 1 value METHOD method_24524 indexTaskList (ILcom/google/common/collect/ImmutableList;)Lcom/google/common/collect/ImmutableList; ARG 1 begin - COMMENT The beginning of the index of tasks, exclusive + COMMENT the beginning of the index of tasks, exclusive ARG 2 tasks METHOD method_24525 remember (Lnet/minecraft/class_4140;Ljava/lang/Object;J)V ARG 1 type @@ -96,6 +96,7 @@ CLASS net/minecraft/class_4095 net/minecraft/entity/ai/brain/Brain ARG 3 requiredMemories ARG 4 forgettingMemories METHOD method_24531 resetPossibleActivities (Ljava/util/List;)V + ARG 1 activities METHOD method_24535 setMemory (Lnet/minecraft/class_4140;Ljava/util/Optional;)V ARG 1 type ARG 2 memory diff --git a/mappings/net/minecraft/entity/ai/brain/EntityLookTarget.mapping b/mappings/net/minecraft/entity/ai/brain/EntityLookTarget.mapping index 1f0760b844..38002b1a0c 100644 --- a/mappings/net/minecraft/entity/ai/brain/EntityLookTarget.mapping +++ b/mappings/net/minecraft/entity/ai/brain/EntityLookTarget.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_4102 net/minecraft/entity/ai/brain/EntityLookTarget FIELD field_18342 entity Lnet/minecraft/class_1297; METHOD (Lnet/minecraft/class_1297;Z)V ARG 1 entity + ARG 2 useEyeHeight diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/GolemLastSeenSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/GolemLastSeenSensor.mapping index cc1804c105..456d1a8ace 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/GolemLastSeenSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/GolemLastSeenSensor.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_4307 net/minecraft/entity/ai/brain/sensor/GolemLastSeenSensor METHOD method_20656 senseIronGolem (Lnet/minecraft/class_1309;)V + ARG 0 entity diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.mapping index cca37efc7c..56e02d868e 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_4834 net/minecraft/entity/ai/brain/sensor/PiglinSpecificSensor - METHOD method_24649 findSoulFire (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Ljava/util/Optional; + METHOD method_24649 findPiglinRepellent (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)Ljava/util/Optional; ARG 0 world ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping index 41986f3b9c..d406225df3 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_4148 net/minecraft/entity/ai/brain/sensor/Sensor ARG 1 senseInterval METHOD method_19099 getOutputMemoryModules ()Ljava/util/Set; METHOD method_19100 tick (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V + ARG 1 world ARG 2 entity METHOD method_19101 sense (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V ARG 1 world diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/SensorType.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/SensorType.mapping index 9945cccd12..932ae78c57 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/SensorType.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/SensorType.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_4149 net/minecraft/entity/ai/brain/sensor/SensorType METHOD method_19102 create ()Lnet/minecraft/class_4148; METHOD method_19103 register (Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/class_4149; ARG 0 id + ARG 1 factory diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/VillagerHostilesSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/VillagerHostilesSensor.mapping index fb51a30f4a..98c24ca22c 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/VillagerHostilesSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/VillagerHostilesSensor.mapping @@ -3,8 +3,8 @@ CLASS net/minecraft/class_4150 net/minecraft/entity/ai/brain/sensor/VillagerHost METHOD method_19104 isHostile (Lnet/minecraft/class_1309;)Z ARG 1 entity METHOD method_19105 isCloseEnoughForDanger (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z - ARG 1 entity - ARG 2 hostile + ARG 1 villager + ARG 2 target METHOD method_19618 getNearestHostile (Lnet/minecraft/class_1309;)Ljava/util/Optional; ARG 1 entity METHOD method_19619 compareDistances (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)I diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping index 006f0856ef..81b61c5f61 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/BreedTask.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_4806 net/minecraft/entity/ai/brain/task/BreedTask FIELD field_22284 breedTime J METHOD (Lnet/minecraft/class_1299;F)V ARG 1 targetType + ARG 2 speed METHOD method_24542 getBreedTarget (Lnet/minecraft/class_1429;)Lnet/minecraft/class_1429; ARG 1 animal METHOD method_24546 hasBreedTarget (Lnet/minecraft/class_1429;)Z diff --git a/mappings/net/minecraft/entity/ai/brain/task/DefeatTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/DefeatTargetTask.mapping index 14e0245872..abb24c1c82 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/DefeatTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/DefeatTargetTask.mapping @@ -2,5 +2,6 @@ CLASS net/minecraft/class_4825 net/minecraft/entity/ai/brain/task/DefeatTargetTa FIELD field_22327 duration I METHOD (ILjava/util/function/BiPredicate;)V ARG 1 duration + ARG 2 predicate METHOD method_24616 getAttackTarget (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1309; ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping index 99643f3307..f1181f0cf0 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping @@ -6,6 +6,10 @@ CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInt FIELD field_20287 targetMemoryModuleType Lnet/minecraft/class_4140; METHOD (Lnet/minecraft/class_4158;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;ZLjava/util/Optional;)V ARG 1 poiType + ARG 2 moduleType + ARG 3 targetMemoryModuleType + ARG 4 onlyRunIfChild + ARG 5 entityStatus CLASS class_5397 RetryMarker FIELD field_25600 random Ljava/util/Random; FIELD field_25601 previousAttemptAt J diff --git a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping index d86e162b24..38da3a26a2 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FollowMobTask.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_4119 net/minecraft/entity/ai/brain/task/FollowMobTask ARG 1 predicate ARG 2 maxDistance METHOD (Lnet/minecraft/class_1299;F)V - ARG 1 type + ARG 1 entityType ARG 2 maxDistance METHOD (Lnet/minecraft/class_1311;F)V ARG 1 group diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping index 9c39e55c0a..0b2219b2ed 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToCelebrateTask.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4814 net/minecraft/entity/ai/brain/task/GoToCelebrateT FIELD field_22304 completionRange I METHOD (IF)V ARG 1 completionRange + ARG 2 speed METHOD method_24576 getCelebrateLocation (Lnet/minecraft/class_1308;)Lnet/minecraft/class_2338; ARG 0 entity METHOD method_24577 fuzz (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.mapping index 4da7ee29a5..7be3b3cab0 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToIfNearbyTask.mapping @@ -4,3 +4,5 @@ CLASS net/minecraft/class_4116 net/minecraft/entity/ai/brain/task/GoToIfNearbyTa FIELD field_18374 maxDistance I METHOD (Lnet/minecraft/class_4140;FI)V ARG 1 target + ARG 2 walkSpeed + ARG 3 maxDistance diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping index 9792ac6fcb..c6fabe58ed 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToNearbyPositionTask.mapping @@ -5,3 +5,6 @@ CLASS net/minecraft/class_4219 net/minecraft/entity/ai/brain/task/GoToNearbyPosi FIELD field_18865 nextRunTime J METHOD (Lnet/minecraft/class_4140;FII)V ARG 1 memoryModuleType + ARG 2 walkSpeed + ARG 3 completionRange + ARG 4 maxDistance diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.mapping index 4d19cedcf6..4daa1ff358 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoToRememberedPositionTask.mapping @@ -21,6 +21,7 @@ CLASS net/minecraft/class_4121 net/minecraft/entity/ai/brain/task/GoToRemembered ARG 2 range ARG 3 requiresWalkTarget METHOD method_24602 isWalkTargetPresentAndFar (Lnet/minecraft/class_1314;)Z + ARG 1 entity METHOD method_24603 toEntity (Lnet/minecraft/class_4140;FIZ)Lnet/minecraft/class_4121; ARG 0 memoryType ARG 1 speed diff --git a/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping index 5d2a8ca68b..61be4a0662 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_4125 net/minecraft/entity/ai/brain/task/StayAboveWaterTask FIELD field_18387 chance F METHOD (F)V - ARG 1 minWaterHeight + ARG 1 chance diff --git a/mappings/net/minecraft/entity/ai/brain/task/Task.mapping b/mappings/net/minecraft/entity/ai/brain/task/Task.mapping index 351a6af609..32e2d4893a 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/Task.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/Task.mapping @@ -48,4 +48,5 @@ CLASS net/minecraft/class_4097 net/minecraft/entity/ai/brain/task/Task ARG 2 entity ARG 3 time METHOD method_19546 hasRequiredMemoryState (Lnet/minecraft/class_1309;)Z + ARG 1 entity CLASS class_4098 Status diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping index ea65b07fd2..b2e9fb405b 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerBreedTask.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_4111 net/minecraft/entity/ai/brain/task/VillagerBreedTask FIELD field_18368 breedEndTime J METHOD method_18970 createChild (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;Lnet/minecraft/class_1646;)Ljava/util/Optional; + ARG 1 world + ARG 2 parent + ARG 3 partner METHOD method_18972 isReadyToBreed (Lnet/minecraft/class_1646;)Z ARG 1 villager METHOD method_19572 setChildHome (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping index 0dc8c84c6b..b323faf6e9 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping @@ -1,19 +1,32 @@ CLASS net/minecraft/class_4129 net/minecraft/entity/ai/brain/task/VillagerTaskListProvider METHOD method_19020 createCoreTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; ARG 0 profession + ARG 1 speed METHOD method_19021 createWorkTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; ARG 0 profession + ARG 1 speed METHOD method_19022 createRestTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; ARG 0 profession + ARG 1 speed METHOD method_19023 createMeetTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; ARG 0 profession + ARG 1 speed METHOD method_19024 createIdleTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; ARG 0 profession + ARG 1 speed METHOD method_19025 createPanicTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; ARG 0 profession + ARG 1 speed METHOD method_19990 createPlayTasks (F)Lcom/google/common/collect/ImmutableList; + ARG 0 speed METHOD method_19991 createPreRaidTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; + ARG 0 profession + ARG 1 speed METHOD method_19992 createRaidTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; + ARG 0 profession + ARG 1 speed METHOD method_19993 createHideTasks (Lnet/minecraft/class_3852;F)Lcom/google/common/collect/ImmutableList; + ARG 0 profession + ARG 1 speed METHOD method_20241 createFreeFollowTask ()Lcom/mojang/datafixers/util/Pair; METHOD method_20242 createBusyFollowTask ()Lcom/mojang/datafixers/util/Pair; diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping index 4a0e9eca5d..691bedc3de 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerWalkTowardsTask.mapping @@ -11,6 +11,8 @@ CLASS net/minecraft/class_4122 net/minecraft/entity/ai/brain/task/VillagerWalkTo ARG 4 maxRange ARG 5 maxRunTime METHOD method_19597 exceedsMaxRange (Lnet/minecraft/class_1646;Lnet/minecraft/class_4208;)Z + ARG 1 villager + ARG 2 pos METHOD method_19988 reachedDestination (Lnet/minecraft/class_3218;Lnet/minecraft/class_1646;Lnet/minecraft/class_4208;)Z ARG 1 world ARG 2 villager diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.mapping index 72316e577d..2b6fa306d8 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_4815 net/minecraft/entity/ai/brain/task/WalkToNearestV FIELD field_22306 radius I METHOD (Ljava/util/function/Predicate;FZI)V ARG 1 startCondition + ARG 2 speed ARG 3 requiresWalkTarget + ARG 4 radius METHOD method_24580 getNearestVisibleWantedItem (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1542; ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping index 7198dc277c..f27570227c 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WanderAroundTask.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_4112 net/minecraft/entity/ai/brain/task/WanderAroundTa FIELD field_18371 speed F FIELD field_18964 pathUpdateCountdownTicks I METHOD method_18977 hasFinishedPath (Lnet/minecraft/class_1308;Lnet/minecraft/class_4142;J)Z + ARG 1 entity ARG 3 time METHOD method_18980 hasReached (Lnet/minecraft/class_1308;Lnet/minecraft/class_4142;)Z ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/control/DolphinLookControl.mapping b/mappings/net/minecraft/entity/ai/control/AquaticLookControl.mapping similarity index 60% rename from mappings/net/minecraft/entity/ai/control/DolphinLookControl.mapping rename to mappings/net/minecraft/entity/ai/control/AquaticLookControl.mapping index b3f58c0ff1..359595e896 100644 --- a/mappings/net/minecraft/entity/ai/control/DolphinLookControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/AquaticLookControl.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1332 net/minecraft/entity/ai/control/DolphinLookControl +CLASS net/minecraft/class_1332 net/minecraft/entity/ai/control/AquaticLookControl FIELD field_6357 maxYawDifference I METHOD (Lnet/minecraft/class_1308;I)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/control/MoveControl.mapping b/mappings/net/minecraft/entity/ai/control/MoveControl.mapping index 492a45f511..e04adf51b1 100644 --- a/mappings/net/minecraft/entity/ai/control/MoveControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/MoveControl.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_1335 net/minecraft/entity/ai/control/MoveControl METHOD method_6235 getTargetY ()D METHOD method_6236 getTargetX ()D METHOD method_6237 getTargetZ ()D - METHOD method_6238 changeAngle (FFF)F + METHOD method_6238 wrapDegrees (FFF)F ARG 1 from ARG 2 to ARG 3 max diff --git a/mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping b/mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping index 35f50e4262..0519738b18 100644 --- a/mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/DolphinJumpGoal.mapping @@ -8,11 +8,11 @@ CLASS net/minecraft/class_1357 net/minecraft/entity/ai/goal/DolphinJumpGoal ARG 2 chance METHOD method_6282 isAirAbove (Lnet/minecraft/class_2338;III)Z ARG 1 pos - ARG 2 xOffset - ARG 3 zOffset + ARG 2 offsetX + ARG 3 offsetZ ARG 4 multiplier METHOD method_6284 isWater (Lnet/minecraft/class_2338;III)Z ARG 1 pos - ARG 2 xOffset - ARG 3 zOffset + ARG 2 offsetX + ARG 3 offsetZ ARG 4 multiplier diff --git a/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping b/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping index 2acf130f6c..5cdb8565df 100644 --- a/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/DoorInteractGoal.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1343 net/minecraft/entity/ai/goal/DoorInteractGoal - FIELD field_6409 zOffset F - FIELD field_6410 xOffset F + FIELD field_6409 offsetZ F + FIELD field_6410 offsetX F FIELD field_6411 shouldStop Z FIELD field_6412 doorValid Z FIELD field_6413 mob Lnet/minecraft/class_1308; diff --git a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping index a1453ef047..e982880dd5 100644 --- a/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping +++ b/mappings/net/minecraft/entity/ai/goal/GoalSelector.mapping @@ -5,11 +5,11 @@ CLASS net/minecraft/class_1355 net/minecraft/entity/ai/goal/GoalSelector COMMENT

A running goal will always be replaced with a goal with a lower priority, if COMMENT such a goal exists, it's competing for the same control and its COMMENT {@link Goal#canStart() canStart()} method returns true. (Note that some goals randomize - COMMENT this method.)

+ COMMENT this method.) COMMENT COMMENT

If two goals have the same priority and are competing for the same control, then one COMMENT goal cannot replace the other if it's running. The goal selector tries to run goals in the order - COMMENT they were added.

+ COMMENT they were added. FIELD field_18410 REPLACEABLE_GOAL Lnet/minecraft/class_4135; FIELD field_18411 goalsByControl Ljava/util/Map; FIELD field_6461 goals Ljava/util/Set; diff --git a/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping index 636cbcfc5c..a408f98caf 100644 --- a/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MoveThroughVillageGoal.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1368 net/minecraft/entity/ai/goal/MoveThroughVillageGo FIELD field_6524 requiresNighttime Z FIELD field_6525 mob Lnet/minecraft/class_1314; METHOD (Lnet/minecraft/class_1314;DZILjava/util/function/BooleanSupplier;)V + ARG 1 entity ARG 2 speed ARG 4 requiresNighttime ARG 5 distance diff --git a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping index d33772ea4b..f3d145f9a3 100644 --- a/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/TemptGoal.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_1391 net/minecraft/entity/ai/goal/TemptGoal FIELD field_6621 lastPlayerZ D FIELD field_6622 food Lnet/minecraft/class_1856; METHOD (Lnet/minecraft/class_1314;DLnet/minecraft/class_1856;Z)V - ARG 1 mob + ARG 1 entity ARG 2 speed ARG 4 food ARG 5 canBeScared diff --git a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping index 8ad97faae8..b37ab63719 100644 --- a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping @@ -1,11 +1,18 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker FIELD field_63 waterPathNodeTypeWeight F - METHOD method_20536 isValidDiagonalSuccessor (Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Z + METHOD method_20536 isValidAdjacentSuccessor (Lnet/minecraft/class_9;Lnet/minecraft/class_9;)Z ARG 1 node ARG 2 successor1 METHOD method_23476 getLandNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338$class_2339;)Lnet/minecraft/class_7; + ARG 0 world + ARG 1 pos METHOD method_58 getCommonNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; + ARG 0 world + ARG 1 pos METHOD method_59 getNodeTypeFromNeighbors (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_7;)Lnet/minecraft/class_7; + ARG 0 world + ARG 1 pos + ARG 2 nodeType METHOD method_60 getFeetY (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)D ARG 0 world ARG 1 pos @@ -22,6 +29,7 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker ARG 4 maxYStep ARG 5 prevFeetY ARG 7 direction + ARG 8 nodeType METHOD method_63 getNodeType (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; ARG 1 entity ARG 2 pos diff --git a/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping index 0cf37b2322..0eefe0be49 100644 --- a/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/MobNavigation.mapping @@ -12,9 +12,9 @@ CLASS net/minecraft/class_1409 net/minecraft/entity/ai/pathing/MobNavigation ARG 1 centerX ARG 2 centerY ARG 3 centerZ - ARG 4 xSize - ARG 5 ySize - ARG 6 zSize + ARG 4 sizeX + ARG 5 sizeY + ARG 6 sizeZ ARG 7 entityPos ARG 8 lookVecX ARG 10 lookVecZ @@ -24,9 +24,9 @@ CLASS net/minecraft/class_1409 net/minecraft/entity/ai/pathing/MobNavigation ARG 1 x ARG 2 y ARG 3 z - ARG 4 xSize - ARG 5 ySize - ARG 6 zSize + ARG 4 sizeX + ARG 5 sizeY + ARG 6 sizeZ ARG 7 entityPos ARG 8 lookVecX ARG 10 lookVecZ diff --git a/mappings/net/minecraft/entity/ai/pathing/Path.mapping b/mappings/net/minecraft/entity/ai/pathing/Path.mapping index a40c39ef74..dd7c36853f 100644 --- a/mappings/net/minecraft/entity/ai/pathing/Path.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/Path.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_11 net/minecraft/entity/ai/pathing/Path METHOD method_40 getNode (I)Lnet/minecraft/class_9; ARG 1 index METHOD method_41 equalsPath (Lnet/minecraft/class_11;)Z + ARG 1 o METHOD method_42 setCurrentNodeIndex (I)V ARG 1 index METHOD method_44 next ()V @@ -32,3 +33,4 @@ CLASS net/minecraft/class_11 net/minecraft/entity/ai/pathing/Path ARG 2 index METHOD method_48 getTarget ()Lnet/minecraft/class_2338; METHOD method_49 getNodePosition (Lnet/minecraft/class_1297;)Lnet/minecraft/class_243; + ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping index ab04e3481f..41abf2d7a6 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping @@ -22,14 +22,14 @@ CLASS net/minecraft/class_9 net/minecraft/entity/ai/pathing/PathNode ARG 1 node METHOD method_21654 getManhattanDistance (Lnet/minecraft/class_2338;)F ARG 1 pos - METHOD method_22879 getPos ()Lnet/minecraft/class_2338; + METHOD method_22879 getBlockPos ()Lnet/minecraft/class_2338; METHOD method_26 copyWithNewPosition (III)Lnet/minecraft/class_9; ARG 1 x ARG 2 y ARG 3 z METHOD method_27 isInHeap ()Z - METHOD method_28 fromBuffer (Lnet/minecraft/class_2540;)Lnet/minecraft/class_9; - ARG 0 buffer + METHOD method_28 readBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_9; + ARG 0 buf METHOD method_30 hash (III)I ARG 0 x ARG 1 y diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping index a513cf7247..fb8a70af95 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping @@ -14,14 +14,14 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer ARG 1 other METHOD method_26847 removeModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers - METHOD method_26850 fromTag (Lnet/minecraft/class_2499;)V - ARG 1 tag + METHOD method_26850 readNbt (Lnet/minecraft/class_2499;)V + ARG 1 nbt METHOD method_26851 getAttributesToSend ()Ljava/util/Collection; METHOD method_26852 getValue (Lnet/minecraft/class_1320;)D ARG 1 attribute METHOD method_26854 addTemporaryModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers - METHOD method_26855 toTag ()Lnet/minecraft/class_2499; + METHOD method_26855 toNbt ()Lnet/minecraft/class_2499; METHOD method_26856 getBaseValue (Lnet/minecraft/class_1320;)D ARG 1 attribute METHOD method_26857 (Lnet/minecraft/class_1324;)Z diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index e93df385e5..13f964fd95 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -19,8 +19,8 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns METHOD method_26832 (Lnet/minecraft/class_1322$class_1323;Ljava/util/Set;)V ARG 1 operation ARG 2 modifiers - METHOD method_26833 fromTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_26833 readNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_26834 getModifiersByOperation (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Collection; ARG 1 operation METHOD method_26835 addTemporaryModifier (Lnet/minecraft/class_1322;)V @@ -32,7 +32,7 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns METHOD method_26837 addPersistentModifier (Lnet/minecraft/class_1322;)V ARG 1 modifier METHOD method_26838 onUpdate ()V - METHOD method_26839 toTag ()Lnet/minecraft/class_2487; + METHOD method_26839 toNbt ()Lnet/minecraft/class_2487; METHOD method_26840 computeValue ()D COMMENT Computes this attribute's value, taking modifiers into account. COMMENT diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index 4df767f6dd..f4d5592469 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -20,9 +20,9 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod ARG 5 operation METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_26859 fromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1322; - ARG 0 tag - METHOD method_26860 toTag ()Lnet/minecraft/class_2487; + METHOD method_26859 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1322; + ARG 0 nbt + METHOD method_26860 toNbt ()Lnet/minecraft/class_2487; METHOD method_6182 getOperation ()Lnet/minecraft/class_1322$class_1323; METHOD method_6185 getName ()Ljava/lang/String; METHOD method_6186 getValue ()D diff --git a/mappings/net/minecraft/entity/boss/BossBar.mapping b/mappings/net/minecraft/entity/boss/BossBar.mapping index dde8c831a7..507b275a16 100644 --- a/mappings/net/minecraft/entity/boss/BossBar.mapping +++ b/mappings/net/minecraft/entity/boss/BossBar.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_1259 net/minecraft/entity/boss/BossBar METHOD method_5407 getUuid ()Ljava/util/UUID; METHOD method_5408 setPercent (F)V ARG 1 percentage - METHOD method_5409 setOverlay (Lnet/minecraft/class_1259$class_1261;)V + METHOD method_5409 setStyle (Lnet/minecraft/class_1259$class_1261;)V ARG 1 style METHOD method_5410 setDragonMusic (Z)Lnet/minecraft/class_1259; ARG 1 dragonMusic @@ -27,12 +27,12 @@ CLASS net/minecraft/class_1259 net/minecraft/entity/boss/BossBar METHOD method_5413 setName (Lnet/minecraft/class_2561;)V ARG 1 name METHOD method_5414 getName ()Lnet/minecraft/class_2561; - METHOD method_5415 getOverlay ()Lnet/minecraft/class_1259$class_1261; + METHOD method_5415 getStyle ()Lnet/minecraft/class_1259$class_1261; METHOD method_5416 setColor (Lnet/minecraft/class_1259$class_1260;)V ARG 1 color - METHOD method_5417 getDarkenSky ()Z + METHOD method_5417 shouldDarkenSky ()Z METHOD method_5418 hasDragonMusic ()Z - METHOD method_5419 getThickenFog ()Z + METHOD method_5419 shouldThickenFog ()Z METHOD method_5420 getColor ()Lnet/minecraft/class_1259$class_1260; CLASS class_1260 Color FIELD field_5781 name Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/boss/BossBarManager.mapping b/mappings/net/minecraft/entity/boss/BossBarManager.mapping index a551e172bc..e0fd3391b9 100644 --- a/mappings/net/minecraft/entity/boss/BossBarManager.mapping +++ b/mappings/net/minecraft/entity/boss/BossBarManager.mapping @@ -7,11 +7,11 @@ CLASS net/minecraft/class_3004 net/minecraft/entity/boss/BossBarManager ARG 2 displayName METHOD method_12971 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3002; ARG 1 id - METHOD method_12972 fromTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_12972 readNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_12973 remove (Lnet/minecraft/class_3002;)V ARG 1 bossBar - METHOD method_12974 toTag ()Lnet/minecraft/class_2487; + METHOD method_12974 toNbt ()Lnet/minecraft/class_2487; METHOD method_12975 onPlayerConnect (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_12976 onPlayerDisconnect (Lnet/minecraft/class_3222;)V diff --git a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping index e4208ee445..96e261bd9b 100644 --- a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping +++ b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping @@ -21,10 +21,10 @@ CLASS net/minecraft/class_3002 net/minecraft/entity/boss/CommandBossBar ARG 1 player METHOD method_12962 addPlayers (Ljava/util/Collection;)Z ARG 1 players - METHOD method_12963 toTag ()Lnet/minecraft/class_2487; + METHOD method_12963 toNbt ()Lnet/minecraft/class_2487; METHOD method_12964 addPlayer (Ljava/util/UUID;)V ARG 1 uuid METHOD method_12965 toHoverableText ()Lnet/minecraft/class_2561; - METHOD method_12966 fromTag (Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3002; - ARG 0 tag + METHOD method_12966 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3002; + ARG 0 nbt ARG 1 id diff --git a/mappings/net/minecraft/entity/boss/WitherEntity.mapping b/mappings/net/minecraft/entity/boss/WitherEntity.mapping index 2cb2ef7b97..8d733bc037 100644 --- a/mappings/net/minecraft/entity/boss/WitherEntity.mapping +++ b/mappings/net/minecraft/entity/boss/WitherEntity.mapping @@ -19,8 +19,12 @@ CLASS net/minecraft/class_1528 net/minecraft/entity/boss/WitherEntity METHOD method_6876 setTrackedEntityId (II)V ARG 1 headIndex ARG 2 id - METHOD method_6877 (IDDDZ)V + METHOD method_6877 shootSkullAt (IDDDZ)V ARG 1 headIndex + ARG 2 targetX + ARG 4 targetY + ARG 6 targetZ + ARG 8 charged METHOD method_6879 getHeadYaw (I)F ARG 1 headIndex METHOD method_6880 getHeadY (I)D diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping index bfbb329a24..d52c791913 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping @@ -1,22 +1,22 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntity FIELD field_18120 CLOSE_PLAYER_PREDICATE Lnet/minecraft/class_4051; FIELD field_7008 pathHeap Lnet/minecraft/class_5; - FIELD field_7009 partTail2 Lnet/minecraft/class_1508; + FIELD field_7009 tail2 Lnet/minecraft/class_1508; FIELD field_7010 latestSegment I - FIELD field_7011 partNeck Lnet/minecraft/class_1508; + FIELD field_7011 neck Lnet/minecraft/class_1508; FIELD field_7012 pathNodes [Lnet/minecraft/class_9; COMMENT The first 12 path nodes are used for end crystals; the others are not tied to them. FIELD field_7013 PHASE_TYPE Lnet/minecraft/class_2940; - FIELD field_7014 partWingLeft Lnet/minecraft/class_1508; - FIELD field_7015 partWingRight Lnet/minecraft/class_1508; + FIELD field_7014 leftWing Lnet/minecraft/class_1508; + FIELD field_7015 rightWing Lnet/minecraft/class_1508; FIELD field_7016 fight Lnet/minecraft/class_2881; - FIELD field_7017 partHead Lnet/minecraft/class_1508; + FIELD field_7017 head Lnet/minecraft/class_1508; FIELD field_7018 ticksUntilNextGrowl I FIELD field_7019 prevWingPosition F - FIELD field_7020 partTail1 Lnet/minecraft/class_1508; + FIELD field_7020 tail1 Lnet/minecraft/class_1508; FIELD field_7021 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_7022 partTail3 Lnet/minecraft/class_1508; - FIELD field_7023 partBody Lnet/minecraft/class_1508; + FIELD field_7022 tail3 Lnet/minecraft/class_1508; + FIELD field_7023 body Lnet/minecraft/class_1508; FIELD field_7024 connectedCrystal Lnet/minecraft/class_1511; FIELD field_7025 pathNodeConnections [I COMMENT An array of 24 bitflags, where node #i leads to #j if and only if @@ -29,6 +29,7 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit FIELD field_7031 ticksSinceDeath I FIELD field_7032 parts [Lnet/minecraft/class_1508; METHOD method_22863 movePart (Lnet/minecraft/class_1508;DDD)V + ARG 1 enderDragonPart ARG 2 dx ARG 4 dy ARG 6 dz @@ -46,11 +47,12 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit ARG 1 source ARG 2 amount METHOD method_6821 destroyBlocks (Lnet/minecraft/class_238;)Z + ARG 1 box METHOD method_6822 getNearestPathNodeIndex (DDD)I ARG 1 x ARG 3 y ARG 5 z - METHOD method_6823 (I[D[D)F + METHOD method_6823 getChangeInNeckPitch (I[D[D)F ARG 1 segmentOffset ARG 2 segment1 ARG 3 segment2 @@ -80,5 +82,6 @@ CLASS net/minecraft/class_1510 net/minecraft/entity/boss/dragon/EnderDragonEntit METHOD method_6833 findPath (IILnet/minecraft/class_9;)Lnet/minecraft/class_11; ARG 1 from ARG 2 to - METHOD method_6834 (F)Lnet/minecraft/class_243; + ARG 3 pathNode + METHOD method_6834 getRotationVectorFromPhase (F)Lnet/minecraft/class_243; ARG 1 tickDelta diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping index 3a5e82ebe5..cc7651b357 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping @@ -19,15 +19,19 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight FIELD field_13122 playerUpdateTimer I METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2487;)V ARG 1 world + ARG 2 gatewaysSeed + ARG 4 nbt METHOD method_12514 worldContainsEndPortal ()Z METHOD method_12515 convertFromLegacy ()V METHOD method_12516 generateEndGateway (Lnet/minecraft/class_2338;)V + ARG 1 pos METHOD method_12517 getAliveEndCrystals ()I METHOD method_12518 generateEndPortal (Z)V ARG 1 previouslyKilled METHOD method_12519 generateNewEndGateway ()V METHOD method_12520 updatePlayers ()V METHOD method_12521 setSpawnState (Lnet/minecraft/class_2876;)V + ARG 1 spawnState METHOD method_12522 respawnDragon ()V METHOD method_12523 createDragon ()Lnet/minecraft/class_1510; METHOD method_12524 resetEndCrystals ()V @@ -39,7 +43,7 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight ARG 1 dragon METHOD method_12529 respawnDragon (Ljava/util/List;)V ARG 1 crystals - METHOD method_12530 toTag ()Lnet/minecraft/class_2487; + METHOD method_12530 toNbt ()Lnet/minecraft/class_2487; METHOD method_12531 findEndPortal ()Lnet/minecraft/class_2700$class_2702; METHOD method_12532 updateFight (Lnet/minecraft/class_1510;)V ARG 1 dragon diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping index 72b05f3f67..ac4fa2f110 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_2876 net/minecraft/entity/boss/dragon/EnderDragonSpawn ARG 1 world ARG 2 fight ARG 3 crystals + ARG 5 pos diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping index 6f33f36745..6712ab5c99 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1513 net/minecraft/entity/boss/dragon/phase/ChargingPlayerPhase - FIELD field_7038 target Lnet/minecraft/class_243; + FIELD field_7038 pathTarget Lnet/minecraft/class_243; FIELD field_7039 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_6840 setTarget (Lnet/minecraft/class_243;)V - ARG 1 target + METHOD method_6840 setPathTarget (Lnet/minecraft/class_243;)V + ARG 1 pathTarget diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping index 0469af242f..6c878467e4 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_1517 net/minecraft/entity/boss/dragon/phase/HoldingPatternPhase FIELD field_18121 PLAYERS_IN_RANGE_PREDICATE Lnet/minecraft/class_4051; - FIELD field_7045 target Lnet/minecraft/class_243; + FIELD field_7045 pathTarget Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping index 476c9106e3..186d8ff480 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/LandingApproachPhase.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_1519 net/minecraft/entity/boss/dragon/phase/LandingApproachPhase FIELD field_18122 PLAYERS_IN_RANGE_PREDICATE Lnet/minecraft/class_4051; - FIELD field_7048 target Lnet/minecraft/class_243; + FIELD field_7048 pathTarget Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping index ca30460bfe..8e7cfe2910 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/Phase.mapping @@ -7,8 +7,10 @@ CLASS net/minecraft/class_1521 net/minecraft/entity/boss/dragon/phase/Phase ARG 2 pos ARG 3 source ARG 4 player - METHOD method_6851 getTarget ()Lnet/minecraft/class_243; + METHOD method_6851 getPathTarget ()Lnet/minecraft/class_243; METHOD method_6852 modifyDamageTaken (Lnet/minecraft/class_1282;F)F + ARG 1 damageSource + ARG 2 damage METHOD method_6853 clientTick ()V METHOD method_6854 endPhase ()V METHOD method_6855 serverTick ()V diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping index 1a11b82b65..81951ed3cc 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_1525 net/minecraft/entity/boss/dragon/phase/StrafePlayerPhase - FIELD field_7057 target Lnet/minecraft/class_243; + FIELD field_7057 pathTarget Lnet/minecraft/class_243; FIELD field_7061 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.mapping index abc3e539ef..7cebfd2eda 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/TakeoffPhase.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_1524 net/minecraft/entity/boss/dragon/phase/TakeoffPhase - FIELD field_7055 target Lnet/minecraft/class_243; + FIELD field_7055 pathTarget Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping index 2af5949c65..913ab15bc7 100644 --- a/mappings/net/minecraft/entity/damage/DamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping @@ -77,7 +77,7 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource ARG 1 attacker METHOD method_5525 getName ()Ljava/lang/String; METHOD method_5526 getSource ()Lnet/minecraft/class_1297; - METHOD method_5527 getMagic ()Z + METHOD method_5527 isMagic ()Z METHOD method_5528 getExhaustion ()F METHOD method_5529 getAttacker ()Lnet/minecraft/class_1297; METHOD method_5530 isSourceCreativePlayer ()Z diff --git a/mappings/net/minecraft/entity/damage/DamageTracker.mapping b/mappings/net/minecraft/entity/damage/DamageTracker.mapping index 6c823d5074..33063a892c 100644 --- a/mappings/net/minecraft/entity/damage/DamageTracker.mapping +++ b/mappings/net/minecraft/entity/damage/DamageTracker.mapping @@ -14,10 +14,12 @@ CLASS net/minecraft/class_1283 net/minecraft/entity/damage/DamageTracker METHOD method_5541 getBiggestAttacker ()Lnet/minecraft/class_1309; METHOD method_5542 setFallDeathSuffix ()V METHOD method_5543 getFallDeathSuffix (Lnet/minecraft/class_1281;)Ljava/lang/String; + ARG 1 damageRecord METHOD method_5544 getBiggestFall ()Lnet/minecraft/class_1281; METHOD method_5545 clearFallDeathSuffix ()V METHOD method_5546 getTimeSinceLastAttack ()I METHOD method_5547 onDamage (Lnet/minecraft/class_1282;FF)V ARG 1 damageSource ARG 2 originalHealth + ARG 3 damage METHOD method_5548 getDeathMessage ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index bff2ea64d9..92c3c8009f 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -10,11 +10,15 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker ARG 1 trackedEntity METHOD method_12776 addTrackedData (Lnet/minecraft/class_2940;Ljava/lang/Object;)V METHOD method_12777 entryFromPacket (Lnet/minecraft/class_2540;ILnet/minecraft/class_2941;)Lnet/minecraft/class_2945$class_2946; + ARG 0 buf METHOD method_12778 set (Lnet/minecraft/class_2940;Ljava/lang/Object;)V ARG 1 key + ARG 2 value METHOD method_12779 writeUpdatedEntries (Ljava/util/List;)V METHOD method_12781 getDirtyEntries ()Ljava/util/List; METHOD method_12782 writeEntryToPacket (Lnet/minecraft/class_2540;Lnet/minecraft/class_2945$class_2946;)V + ARG 0 buf + ARG 1 entry METHOD method_12783 getEntry (Lnet/minecraft/class_2940;)Lnet/minecraft/class_2945$class_2946; METHOD method_12784 startTracking (Lnet/minecraft/class_2940;Ljava/lang/Object;)V ARG 1 key @@ -23,7 +27,9 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker METHOD method_12786 isDirty ()Z METHOD method_12787 entriesToPacket (Ljava/util/List;Lnet/minecraft/class_2540;)V METHOD method_12788 deserializePacket (Lnet/minecraft/class_2540;)Ljava/util/List; + ARG 0 buf METHOD method_12789 get (Lnet/minecraft/class_2940;)Ljava/lang/Object; + ARG 1 data METHOD method_12790 isEmpty ()Z METHOD method_12791 registerData (Ljava/lang/Class;Lnet/minecraft/class_2941;)Lnet/minecraft/class_2940; ARG 0 entityClass diff --git a/mappings/net/minecraft/entity/data/TrackedData.mapping b/mappings/net/minecraft/entity/data/TrackedData.mapping index 101e1772e5..2506b12da7 100644 --- a/mappings/net/minecraft/entity/data/TrackedData.mapping +++ b/mappings/net/minecraft/entity/data/TrackedData.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2940 net/minecraft/entity/data/TrackedData FIELD field_13307 dataType Lnet/minecraft/class_2941; METHOD (ILnet/minecraft/class_2941;)V ARG 1 id + ARG 2 dataType METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_12712 getType ()Lnet/minecraft/class_2941; diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping index 66f690b903..57125e85b0 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_2941 net/minecraft/entity/data/TrackedDataHandler METHOD method_12714 copy (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 value METHOD method_12715 write (Lnet/minecraft/class_2540;Ljava/lang/Object;)V - ARG 1 data + ARG 1 buf + ARG 2 value METHOD method_12716 read (Lnet/minecraft/class_2540;)Ljava/lang/Object; + ARG 1 buf METHOD method_12717 create (I)Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping index 65a9387a67..1b20d970d5 100644 --- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping @@ -53,8 +53,10 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity METHOD method_6908 onBreak (Lnet/minecraft/class_1282;)V ARG 1 damageSource METHOD method_6909 setLeftLegRotation (Lnet/minecraft/class_2379;)V + ARG 1 angle METHOD method_6910 setLeftArmRotation (Lnet/minecraft/class_2379;)V - METHOD method_6911 serializePose ()Lnet/minecraft/class_2487; + ARG 1 angle + METHOD method_6911 poseToNbt ()Lnet/minecraft/class_2487; METHOD method_6912 isMarker ()Z METHOD method_6913 setShowArms (Z)V ARG 1 showArms @@ -62,8 +64,10 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity METHOD method_6915 isSlotDisabled (Lnet/minecraft/class_1304;)Z ARG 1 slot METHOD method_6916 slotFromPosition (Lnet/minecraft/class_243;)Lnet/minecraft/class_1304; + ARG 1 hitPos METHOD method_6917 getLeftLegRotation ()Lnet/minecraft/class_2379; METHOD method_6919 setHeadRotation (Lnet/minecraft/class_2379;)V + ARG 1 angle METHOD method_6920 playBreakSound ()V METHOD method_6921 getHeadRotation ()Lnet/minecraft/class_2379; METHOD method_6922 setSmall (Z)V @@ -72,8 +76,12 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity METHOD method_6924 breakAndDropItem (Lnet/minecraft/class_1282;)V ARG 1 damageSource METHOD method_6925 setRightArmRotation (Lnet/minecraft/class_2379;)V + ARG 1 angle METHOD method_6926 setRightLegRotation (Lnet/minecraft/class_2379;)V + ARG 1 angle METHOD method_6927 setBodyRotation (Lnet/minecraft/class_2379;)V - METHOD method_6928 deserializePose (Lnet/minecraft/class_2487;)V + ARG 1 angle + METHOD method_6928 readPoseNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_6929 shouldShowArms ()Z METHOD method_6930 getLeftArmRotation ()Lnet/minecraft/class_2379; diff --git a/mappings/net/minecraft/entity/decoration/EndCrystalEntity.mapping b/mappings/net/minecraft/entity/decoration/EndCrystalEntity.mapping index 532cdd3d01..8d3a8b8054 100644 --- a/mappings/net/minecraft/entity/decoration/EndCrystalEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/EndCrystalEntity.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_1511 net/minecraft/entity/decoration/EndCrystalEntity ARG 6 z METHOD method_6835 crystalDestroyed (Lnet/minecraft/class_1282;)V ARG 1 source - METHOD method_6836 getShowBottom ()Z + METHOD method_6836 shouldShowBottom ()Z METHOD method_6837 setBeamTarget (Lnet/minecraft/class_2338;)V ARG 1 beamTarget METHOD method_6838 getBeamTarget ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping index edbea4d67a..37c763f05e 100644 --- a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V ARG 1 world ARG 2 pos - ARG 3 direction + ARG 3 facing METHOD method_6933 setHeldItemStack (Lnet/minecraft/class_1799;Z)V ARG 1 value ARG 2 update @@ -24,3 +24,4 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity METHOD method_6940 getHeldItemStack ()Lnet/minecraft/class_1799; METHOD method_6941 setRotation (IZ)V ARG 1 value + ARG 2 updateComparators diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 2f933ec8c4..9acadaab13 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -46,22 +46,22 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 1 that METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_24275 fromTag (Lnet/minecraft/class_1291;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; + METHOD method_24275 fromNbt (Lnet/minecraft/class_1291;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; ARG 0 type - ARG 1 tag + ARG 1 nbt METHOD method_24276 copyFrom (Lnet/minecraft/class_1293;)V ARG 1 that - METHOD method_24277 typelessToTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_24277 writeTypelessNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_5578 getAmplifier ()I METHOD method_5579 getEffectType ()Lnet/minecraft/class_1291; METHOD method_5580 setPermanent (Z)V ARG 1 permanent METHOD method_5581 shouldShowParticles ()Z - METHOD method_5582 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag - METHOD method_5583 fromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; - ARG 0 tag + METHOD method_5582 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt + METHOD method_5583 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; + ARG 0 nbt METHOD method_5584 getDuration ()I METHOD method_5585 update (Lnet/minecraft/class_1309;Ljava/lang/Runnable;)Z ARG 1 entity diff --git a/mappings/net/minecraft/entity/mob/Angerable.mapping b/mappings/net/minecraft/entity/mob/Angerable.mapping index 6acb0cfc0b..174bb4aa28 100644 --- a/mappings/net/minecraft/entity/mob/Angerable.mapping +++ b/mappings/net/minecraft/entity/mob/Angerable.mapping @@ -18,8 +18,8 @@ CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable ARG 1 entity METHOD method_29516 forgive (Lnet/minecraft/class_1657;)V ARG 1 player - METHOD method_29517 angerToTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_29517 writeAngerToNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_29921 universallyAnger ()V METHOD method_29922 stopAnger ()V METHOD method_29923 isUniversallyAngry (Lnet/minecraft/class_1937;)Z diff --git a/mappings/net/minecraft/entity/mob/BlazeEntity.mapping b/mappings/net/minecraft/entity/mob/BlazeEntity.mapping index ac508c879c..c1ef1cd140 100644 --- a/mappings/net/minecraft/entity/mob/BlazeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BlazeEntity.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_1545 net/minecraft/entity/mob/BlazeEntity FIELD field_7214 eyeOffset F FIELD field_7215 eyeOffsetCooldown I FIELD field_7216 BLAZE_FLAGS Lnet/minecraft/class_2940; + COMMENT The tracked flags of blazes. Only has the {@code 1} bit for {@linkplain + COMMENT #isFireActive() fire activation}. METHOD method_26906 createBlazeAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6993 setFireActive (Z)V ARG 1 fireActive diff --git a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping index c4272dcb41..6cea3cb6cb 100644 --- a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping +++ b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_1548 net/minecraft/entity/mob/CreeperEntity FIELD field_7230 FUSE_SPEED Lnet/minecraft/class_2940; FIELD field_7231 IGNITED Lnet/minecraft/class_2940; METHOD method_26908 createCreeperAttributes ()Lnet/minecraft/class_5132$class_5133; - METHOD method_7000 getIgnited ()Z + METHOD method_7000 isIgnited ()Z METHOD method_7001 spawnEffectsCloud ()V METHOD method_7002 onHeadDropped ()V METHOD method_7003 getClientFuseTime (F)F diff --git a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping index 2518b44e07..54b512610e 100644 --- a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping +++ b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping @@ -3,10 +3,10 @@ CLASS net/minecraft/class_1577 net/minecraft/entity/mob/GuardianEntity FIELD field_7281 spikesExtensionRate F FIELD field_7282 beamTicks I FIELD field_7283 flopping Z - FIELD field_7284 prevSpikesExtension F - FIELD field_7285 tailAngle F - FIELD field_7286 spikesExtension F - FIELD field_7287 prevTailAngle F + FIELD field_7284 prevTailAngle F + FIELD field_7285 spikesExtension F + FIELD field_7286 tailAngle F + FIELD field_7287 prevSpikesExtension F FIELD field_7288 cachedBeamTarget Lnet/minecraft/class_1309; FIELD field_7289 wanderGoal Lnet/minecraft/class_1379; FIELD field_7290 BEAM_TARGET_ID Lnet/minecraft/class_2940; @@ -18,12 +18,12 @@ CLASS net/minecraft/class_1577 net/minecraft/entity/mob/GuardianEntity ARG 4 random METHOD method_26915 createGuardianAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_7052 getBeamTarget ()Lnet/minecraft/class_1309; - METHOD method_7053 getTailAngle (F)F + METHOD method_7053 getSpikesExtension (F)F ARG 1 tickDelta METHOD method_7054 setSpikesRetracted (Z)V ARG 1 retracted METHOD method_7055 getWarmupTime ()I - METHOD method_7057 getSpikesExtension (F)F + METHOD method_7057 getTailAngle (F)F ARG 1 tickDelta METHOD method_7058 areSpikesRetracted ()Z METHOD method_7060 setBeamTarget (I)V diff --git a/mappings/net/minecraft/entity/mob/HostileEntity.mapping b/mappings/net/minecraft/entity/mob/HostileEntity.mapping index f1d3c9739d..71569e78b1 100644 --- a/mappings/net/minecraft/entity/mob/HostileEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HostileEntity.mapping @@ -1,10 +1,12 @@ CLASS net/minecraft/class_1588 net/minecraft/entity/mob/HostileEntity METHOD method_16827 updateDespawnCounter ()V METHOD method_20679 isSpawnDark (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Ljava/util/Random;)Z + ARG 0 world ARG 1 pos ARG 2 random METHOD method_20680 canSpawnInDark (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type + ARG 1 world ARG 2 spawnReason ARG 3 pos ARG 4 random diff --git a/mappings/net/minecraft/entity/mob/HuskEntity.mapping b/mappings/net/minecraft/entity/mob/HuskEntity.mapping index 107db4f026..e2b5d845f2 100644 --- a/mappings/net/minecraft/entity/mob/HuskEntity.mapping +++ b/mappings/net/minecraft/entity/mob/HuskEntity.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1576 net/minecraft/entity/mob/HuskEntity METHOD method_20677 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type + ARG 1 world ARG 2 spawnReason ARG 3 pos ARG 4 random diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 43cc9c9649..90f9e2d9f4 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity FIELD field_6189 navigation Lnet/minecraft/class_1408; FIELD field_6190 visibilityCache Lnet/minecraft/class_1413; FIELD field_6191 ambientSoundChance I - FIELD field_6192 leashTag Lnet/minecraft/class_2487; + FIELD field_6192 leashNbt Lnet/minecraft/class_2487; FIELD field_6193 MOB_FLAGS Lnet/minecraft/class_2940; FIELD field_6194 experiencePoints I FIELD field_6195 handItems Lnet/minecraft/class_2371; @@ -94,7 +94,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 1 sidewaysMovement METHOD method_5939 canPickupItem (Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_5940 deserializeLeashTag ()V + METHOD method_5940 readLeashNbt ()V METHOD method_5941 setPathfindingPenalty (Lnet/minecraft/class_7;F)V ARG 1 nodeType ARG 2 penalty @@ -104,7 +104,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 2 difficulty ARG 3 spawnReason ARG 4 entityData - ARG 5 entityTag + ARG 5 entityNbt METHOD method_5944 getPathfindingPenalty (Lnet/minecraft/class_7;)F ARG 1 nodeType METHOD method_5945 getLimitPerChunk ()I diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping index 646f930940..d31f39c708 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping @@ -56,6 +56,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain ARG 0 target METHOD method_24741 consumeOffHandItem (Lnet/minecraft/class_4836;Z)V ARG 0 piglin + ARG 1 barter METHOD method_24742 angerAtCloserTargets (Lnet/minecraft/class_5418;Lnet/minecraft/class_1309;)V ARG 0 piglin ARG 1 target @@ -88,6 +89,8 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain METHOD method_24758 rememberGroupHunting (Lnet/minecraft/class_4836;)V ARG 0 piglin METHOD method_24759 tryRevenge (Lnet/minecraft/class_5418;Lnet/minecraft/class_1309;)V + ARG 0 piglin + ARG 1 target METHOD method_24760 addAdmireItemActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_24761 hasPlayerHoldingWantedItemNearby (Lnet/minecraft/class_1309;)Z @@ -177,11 +180,11 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain ARG 1 player METHOD method_29947 getNearestDetectedPlayer (Lnet/minecraft/class_5418;)Ljava/util/Optional; ARG 0 piglin - METHOD method_30087 (Lnet/minecraft/class_4836;Lnet/minecraft/class_4168;)Lnet/minecraft/class_3414; + METHOD method_30087 getSound (Lnet/minecraft/class_4836;Lnet/minecraft/class_4168;)Lnet/minecraft/class_3414; ARG 0 piglin ARG 1 activity METHOD method_30089 swapItemWithOffHand (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)V ARG 0 piglin ARG 1 stack - METHOD method_30091 (Lnet/minecraft/class_4836;)Ljava/util/Optional; + METHOD method_30091 getCurrentActivitySound (Lnet/minecraft/class_4836;)Ljava/util/Optional; ARG 0 piglin diff --git a/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping index a6e1a79463..d96425b788 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBruteBrain.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_5420 net/minecraft/entity/mob/PiglinBruteBrain METHOD method_30252 create (Lnet/minecraft/class_5419;Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; + ARG 0 piglinBrute + ARG 1 brain diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index 64c3971a23..b9345e9224 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -25,7 +25,8 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity ARG 1 stack METHOD method_24845 equipToOffHand (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_24846 (Lnet/minecraft/class_1799;)Z + METHOD method_24846 canEquipStack (Lnet/minecraft/class_1799;)Z + COMMENT Returns whether this piglin can equip into or replace current equipment slot. ARG 1 stack METHOD method_26953 createPiglinAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_26954 setCannotHunt (Z)V diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index 89216d507f..96577fe9fa 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity FIELD field_7346 PEEK_AMOUNT Lnet/minecraft/class_2940; METHOD method_24350 canStay (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 pos - ARG 2 attachSide + ARG 2 direction METHOD method_24351 findAttachSide (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350; ARG 1 pos METHOD method_26921 createShulkerAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping index bc51482214..e27e4596b9 100644 --- a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_1628 net/minecraft/entity/mob/SpiderEntity FIELD field_7403 SPIDER_FLAGS Lnet/minecraft/class_2940; + COMMENT The tracked flags of spiders. Only has the {@code 1} bit for {@linkplain + COMMENT #isClimbingWall() wall climbing}. METHOD method_26923 createSpiderAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_7166 setClimbingWall (Z)V ARG 1 climbing diff --git a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping index eb9b3f139d..a993c5d98c 100644 --- a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1429 net/minecraft/entity/passive/AnimalEntity ARG 3 pos ARG 4 random METHOD method_24650 breed (Lnet/minecraft/class_3218;Lnet/minecraft/class_1429;)V + ARG 1 world ARG 2 other METHOD method_29270 getLoveTicks ()I METHOD method_6474 canBreedWith (Lnet/minecraft/class_1429;)Z diff --git a/mappings/net/minecraft/entity/passive/BatEntity.mapping b/mappings/net/minecraft/entity/passive/BatEntity.mapping index d15d03b01a..6bb980b49a 100644 --- a/mappings/net/minecraft/entity/passive/BatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BatEntity.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_1420 net/minecraft/entity/passive/BatEntity FIELD field_18100 CLOSE_PLAYER_PREDICATE Lnet/minecraft/class_4051; FIELD field_6728 BAT_FLAGS Lnet/minecraft/class_2940; - COMMENT Equals 0 when the bat is flying, and 1 when it's roosting. + COMMENT The tracked flags of bats. Only has the {@code 1} bit for {@linkplain + COMMENT #isRoosting() roosting}. FIELD field_6729 hangingPosition Lnet/minecraft/class_2338; METHOD method_20661 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index 859e75d48f..e83d657455 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity - FIELD field_20353 STATUS_TRACKER Lnet/minecraft/class_2940; + FIELD field_20353 BEE_FLAGS Lnet/minecraft/class_2940; FIELD field_20354 ANGER Lnet/minecraft/class_2940; FIELD field_20356 currentPitch F FIELD field_20357 lastPitch F diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index aa3841052d..08df9a5b0e 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -46,10 +46,10 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity COMMENT

In the item slot argument type, the slot is referred to as COMMENT horse.armor. In this horse's screen, it appears in the middle of COMMENT the left side, and right below the saddle slot if this horse has a saddle - COMMENT slot.

+ COMMENT slot. COMMENT COMMENT

This is used by horse armors and llama carpets, but can be - COMMENT refitted to any purpose.

+ COMMENT refitted to any purpose. METHOD method_6736 isAngry ()Z METHOD method_6737 setAngry (Z)V ARG 1 angry diff --git a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping index 3c68bdb701..befbe9f370 100644 --- a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_1439 net/minecraft/entity/passive/IronGolemEntity FIELD field_6759 lookingAtVillagerTicksLeft I FIELD field_6762 attackTicksLeft I FIELD field_6763 IRON_GOLEM_FLAGS Lnet/minecraft/class_2940; + COMMENT The tracked flags of iron golems. Only has the {@code 1} bit for whether a + COMMENT golem is {@linkplain #isPlayerCreated() created by a player}. METHOD method_22328 getAttackDamage ()F METHOD method_23347 getCrack ()Lnet/minecraft/class_1439$class_4621; METHOD method_26886 createIronGolemAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index 0e21ecad02..2b69a8430e 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -22,9 +22,10 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity METHOD method_6580 getSoundPitch (Ljava/util/Random;)F ARG 0 random METHOD method_6581 isInAir ()Z - METHOD method_6582 getSongPlaying ()Z + METHOD method_6582 isSongPlaying ()Z METHOD method_6583 getRandomSound (Lnet/minecraft/class_1937;Ljava/util/Random;)Lnet/minecraft/class_3414; ARG 0 world + ARG 1 random METHOD method_6584 getVariant ()I METHOD method_6585 setVariant (I)V ARG 1 variant diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping index b13e80c531..4d5d7a7a87 100644 --- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity METHOD method_6631 setColor (Lnet/minecraft/class_1767;)V ARG 1 color METHOD method_6632 generateDefaultColor (Ljava/util/Random;)Lnet/minecraft/class_1767; + ARG 0 random METHOD method_6633 getColor ()Lnet/minecraft/class_1767; METHOD method_6634 getRgbColor (Lnet/minecraft/class_1767;)[F ARG 0 dyeColor diff --git a/mappings/net/minecraft/entity/passive/TameableEntity.mapping b/mappings/net/minecraft/entity/passive/TameableEntity.mapping index 053d09c50a..050185bc8d 100644 --- a/mappings/net/minecraft/entity/passive/TameableEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TameableEntity.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_1321 net/minecraft/entity/passive/TameableEntity FIELD field_21974 sitting Z FIELD field_6320 OWNER_UUID Lnet/minecraft/class_2940; FIELD field_6322 TAMEABLE_FLAGS Lnet/minecraft/class_2940; + COMMENT The tracked flags of tameable entities. Has the {@code 1} flag for {@linkplain + COMMENT #isInSittingPose() sitting pose} and the {@code 4} flag for {@linkplain + COMMENT #isTamed() tamed}. METHOD method_24345 isSitting ()Z METHOD method_24346 setSitting (Z)V ARG 1 sitting diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 26648574e8..b6c6f0887b 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -36,14 +36,15 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity METHOD method_19182 restock ()V METHOD method_19183 playWorkSound ()V METHOD method_19185 consumeAvailableFood ()V - METHOD method_19187 clearCurrentBonus ()V + METHOD method_19187 clearSpecialPrices ()V + COMMENT Resets the special price of all the trade offers of this villager. METHOD method_19188 canLevelUp ()Z METHOD method_19189 getAvailableFood ()I METHOD method_19190 spawnIronGolem (Lnet/minecraft/class_3218;)Lnet/minecraft/class_1439; ARG 1 world METHOD method_19191 beginTradeWith (Lnet/minecraft/class_1657;)V ARG 1 customer - METHOD method_19192 prepareRecipesFor (Lnet/minecraft/class_1657;)V + METHOD method_19192 prepareOffersFor (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_19193 depleteFood (I)V ARG 1 amount @@ -58,21 +59,26 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity METHOD method_20688 summonGolem (Lnet/minecraft/class_3218;JI)V ARG 1 world ARG 2 time + ARG 4 requiredCount METHOD method_20690 notifyDeath (Lnet/minecraft/class_1297;)V ARG 1 killer METHOD method_20696 decayGossip ()V METHOD method_20697 eatForBreeding ()V METHOD method_20698 lacksFood ()Z - METHOD method_20741 hasRecentlyWorkedAndSlept (J)Z + METHOD method_20741 hasRecentlySlept (J)Z ARG 1 worldTime METHOD method_20821 clearDailyRestockCount ()V METHOD method_20822 shouldRestock ()Z - METHOD method_20823 needRestock ()Z + METHOD method_20823 needsRestock ()Z + COMMENT Returns whether this villager needs restock. + COMMENT + COMMENT

Checks if at least one of its trade offers has been used. METHOD method_20824 canRestock ()Z - METHOD method_21650 setGossipDataFromTag (Lnet/minecraft/class_2520;)V - ARG 1 tag + METHOD method_21650 readGossipDataNbt (Lnet/minecraft/class_2520;)V + ARG 1 nbt METHOD method_21651 getGossip ()Lnet/minecraft/class_4136; - METHOD method_21724 updatePricesOnDemand ()V + METHOD method_21724 updateDemandBonus ()V + COMMENT Updates the demand bonus of all the trade offers of this villager. METHOD method_26955 createVillagerAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_29279 isNatural ()Z METHOD method_7221 setVillagerData (Lnet/minecraft/class_3850;)V diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 6bc58c6c07..3d9125f791 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -17,10 +17,10 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity COMMENT

COMMENT The brightness multiplier represents how much darker the wolf gets while its fur is wet. The multiplier changes (from 0.75 to 1.0 incrementally) when a wolf shakes. COMMENT - COMMENT @param tickDelta Progress for linearly interpolating between the previous and current game state. COMMENT @return Brightness as a float value between 0.75 and 1.0. COMMENT @see net.minecraft.client.render.entity.model.TintableAnimalModel#setColorMultiplier(float, float, float) ARG 1 tickDelta + COMMENT progress for linearly interpolating between the previous and current game state METHOD method_6708 setCollarColor (Lnet/minecraft/class_1767;)V ARG 1 color METHOD method_6710 isBegging ()Z diff --git a/mappings/net/minecraft/entity/player/HungerManager.mapping b/mappings/net/minecraft/entity/player/HungerManager.mapping index 24e4ae0050..ce3c9eec06 100644 --- a/mappings/net/minecraft/entity/player/HungerManager.mapping +++ b/mappings/net/minecraft/entity/player/HungerManager.mapping @@ -2,23 +2,24 @@ CLASS net/minecraft/class_1702 net/minecraft/entity/player/HungerManager FIELD field_7752 exhaustion F FIELD field_7753 foodSaturationLevel F FIELD field_7754 prevFoodLevel I - FIELD field_7755 foodStarvationTimer I + FIELD field_7755 foodTickTimer I FIELD field_7756 foodLevel I METHOD method_7579 eat (Lnet/minecraft/class_1792;Lnet/minecraft/class_1799;)V ARG 1 item ARG 2 stack METHOD method_7580 setFoodLevel (I)V ARG 1 foodLevel - METHOD method_7581 setSaturationLevelClient (F)V + METHOD method_7581 setSaturationLevel (F)V ARG 1 saturationLevel - METHOD method_7582 toTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_7582 writeNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_7583 addExhaustion (F)V ARG 1 exhaustion - METHOD method_7584 fromTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_7584 readNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_7585 add (IF)V ARG 1 food + ARG 2 saturationModifier METHOD method_7586 getFoodLevel ()I METHOD method_7587 isNotFull ()Z METHOD method_7588 update (Lnet/minecraft/class_1657;)V diff --git a/mappings/net/minecraft/entity/player/PlayerAbilities.mapping b/mappings/net/minecraft/entity/player/PlayerAbilities.mapping index 5492d6ea39..2285a27dd7 100644 --- a/mappings/net/minecraft/entity/player/PlayerAbilities.mapping +++ b/mappings/net/minecraft/entity/player/PlayerAbilities.mapping @@ -8,9 +8,11 @@ CLASS net/minecraft/class_1656 net/minecraft/entity/player/PlayerAbilities FIELD field_7482 walkSpeed F METHOD method_7248 setFlySpeed (F)V ARG 1 flySpeed - METHOD method_7249 deserialize (Lnet/minecraft/class_2487;)V + METHOD method_7249 readNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_7250 setWalkSpeed (F)V ARG 1 walkSpeed - METHOD method_7251 serialize (Lnet/minecraft/class_2487;)V + METHOD method_7251 writeNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_7252 getFlySpeed ()F METHOD method_7253 getWalkSpeed ()F diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 1df6e68b2a..d717884832 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -95,6 +95,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7266 resetStat (Lnet/minecraft/class_3445;)V ARG 1 stat METHOD method_7267 updateShoulderEntity (Lnet/minecraft/class_2487;)V + ARG 1 entityNbt METHOD method_7268 setReducedDebugInfo (Z)V ARG 1 reducedDebugInfo METHOD method_7269 trySleep (Lnet/minecraft/class_2338;)Lcom/mojang/datafixers/util/Either; @@ -105,9 +106,11 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 0 profile METHOD method_7272 getScore ()I METHOD method_7273 setShoulderEntityLeft (Lnet/minecraft/class_2487;)V - ARG 1 entityTag + ARG 1 entityNbt METHOD method_7274 getEnderChestInventory ()Lnet/minecraft/class_1730; METHOD method_7276 isSleepingLongEnough ()Z + COMMENT Returns whether this player has been sleeping long enough to count towards + COMMENT resetting the time of day and weather of the server. METHOD method_7277 addCritParticles (Lnet/minecraft/class_1297;)V ARG 1 target METHOD method_7278 getEnchantmentTableSeed ()I @@ -143,29 +146,50 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 1 entityNbt METHOD method_7297 getSleepTimer ()I METHOD method_7298 addShoulderEntity (Lnet/minecraft/class_2487;)Z - ARG 1 tag + ARG 1 entityNbt METHOD method_7299 addTellClickEvent (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; ARG 1 component - METHOD method_7302 getReducedDebugInfo ()Z + METHOD method_7302 hasReducedDebugInfo ()Z METHOD method_7303 openStructureBlockScreen (Lnet/minecraft/class_2633;)V ARG 1 structureBlock METHOD method_7304 addEnchantedHitParticles (Lnet/minecraft/class_1297;)V ARG 1 target - METHOD method_7305 isUsingEffectiveTool (Lnet/minecraft/class_2680;)Z - ARG 1 block + METHOD method_7305 canHarvest (Lnet/minecraft/class_2680;)Z + COMMENT Determines whether the player is able to harvest drops from the specified block state. + COMMENT If a block requires a special tool, it will check + COMMENT whether the held item is effective for that block, otherwise + COMMENT it returns {@code true}. + COMMENT + COMMENT @see net.minecraft.item.Item#isSuitableFor(BlockState) + ARG 1 state METHOD method_7308 getShoulderEntityRight ()Lnet/minecraft/class_2487; METHOD method_7310 getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID; ARG 0 nickname METHOD method_7311 openEditSignScreen (Lnet/minecraft/class_2625;)V ARG 1 sign METHOD method_7313 updateCapeAngles ()V - METHOD method_7315 openEditBookScreen (Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)V + METHOD method_7315 useBook (Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)V + COMMENT Called when the player uses (defaults to right click) a writable or written + COMMENT book item. + COMMENT + COMMENT

This can be called either on the client or the server player. Check {@code + COMMENT book} for whether this is a written or a writable book. + COMMENT + COMMENT @implNote The writing of a writable book in vanilla is totally controlled by + COMMENT the client; the server cannot make the client open a book edit screen by + COMMENT making a server player use a writable book. Only when the client finishes + COMMENT writing a book it will send a {@linkplain net.minecraft.network.packet.c2s.play.BookUpdateC2SPacket book update C2S packet}. + COMMENT + COMMENT

Meanwhile, the reading of a written book is totally controlled and initiated + COMMENT by the server. ARG 1 book + COMMENT the book ARG 2 hand + COMMENT the hand holding the book METHOD method_7316 addExperienceLevels (I)V ARG 1 levels METHOD method_7317 canFoodHeal ()Z - METHOD method_7318 updateSize ()V + METHOD method_7318 updatePose ()V METHOD method_7320 setScore (I)V ARG 1 score METHOD method_7322 addExhaustion (F)V @@ -183,7 +207,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7329 dropItem (Lnet/minecraft/class_1799;ZZ)Lnet/minecraft/class_1542; ARG 1 stack ARG 2 throwRandomly - COMMENT If true, the item will be thrown in a random direction from the entity regardless of which direction the entity is facing + COMMENT if true, the item will be thrown in a random direction from the entity regardless of which direction the entity is facing ARG 3 retainOwnership METHOD method_7330 updateTurtleHelmet ()V METHOD method_7331 requestRespawn ()V @@ -197,6 +221,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7336 setGameMode (Lnet/minecraft/class_1934;)V ARG 1 gameMode METHOD method_7337 isCreative ()Z + COMMENT Returns whether this player is in creative mode. METHOD method_7338 isCreativeLevelTwoOp ()Z METHOD method_7339 increaseStat (Lnet/minecraft/class_2960;I)V ARG 1 stat @@ -213,7 +238,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 3 stack METHOD method_7344 getHungerManager ()Lnet/minecraft/class_1702; METHOD method_7345 setShoulderEntityRight (Lnet/minecraft/class_2487;)V - ARG 1 entityTag + ARG 1 entityNbt METHOD method_7346 closeHandledScreen ()V METHOD method_7348 isPartVisible (Lnet/minecraft/class_1664;)Z ARG 1 modelPart diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 548c13c605..57afa418c5 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory ARG 3 craftingInventory METHOD method_7364 getChangeCount ()I METHOD method_7365 swapSlotWithHotbar (I)V - ARG 1 hotbarSlot + ARG 1 slot METHOD method_7366 addStack (Lnet/minecraft/class_1799;)I ARG 1 stack METHOD method_7367 insertStack (ILnet/minecraft/class_1799;)Z @@ -44,8 +44,8 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory METHOD method_7381 updateItems ()V METHOD method_7382 contains (Lnet/minecraft/class_3494;)Z ARG 1 tag - METHOD method_7384 serialize (Lnet/minecraft/class_2499;)Lnet/minecraft/class_2499; - ARG 1 tag + METHOD method_7384 writeNbt (Lnet/minecraft/class_2499;)Lnet/minecraft/class_2499; + ARG 1 nbtList METHOD method_7385 addStack (ILnet/minecraft/class_1799;)I ARG 1 slot ARG 2 stack @@ -68,8 +68,8 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory ARG 1 stack METHOD method_7396 setCursorStack (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_7397 deserialize (Lnet/minecraft/class_2499;)V - ARG 1 tag + METHOD method_7397 readNbt (Lnet/minecraft/class_2499;)V + ARG 1 nbtList METHOD method_7398 offerOrDrop (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)V ARG 1 world ARG 2 stack diff --git a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping index d5406da9c6..e79736fa99 100644 --- a/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ArrowEntity.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_1667 net/minecraft/entity/projectile/ArrowEntity ARG 1 stack METHOD method_7460 getColor ()I METHOD method_7461 spawnParticles (I)V + ARG 1 amount METHOD method_7462 initColor ()V METHOD method_7463 addEffect (Lnet/minecraft/class_1293;)V ARG 1 effect diff --git a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping index 53056395bd..fa67515f91 100644 --- a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_1668 net/minecraft/entity/projectile/ExplosiveProjectileEntity - FIELD field_7599 posZ D - FIELD field_7600 posY D - FIELD field_7601 posX D + FIELD field_7599 powerZ D + FIELD field_7600 powerY D + FIELD field_7601 powerX D METHOD (Lnet/minecraft/class_1299;DDDDDDLnet/minecraft/class_1937;)V ARG 1 type ARG 2 x diff --git a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping index f6a8bae941..759a9da3ec 100644 --- a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping @@ -48,5 +48,6 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/projectile/FishingBobberEnti ARG 1 usedItem METHOD method_6958 checkForCollision ()V METHOD method_6959 removeIfInvalid (Lnet/minecraft/class_1657;)Z + ARG 1 player CLASS class_1537 State CLASS class_4984 PositionType diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index e5ffaa03be..971c667d07 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity ARG 1 blockHitResult METHOD method_24921 getOwner ()Lnet/minecraft/class_1297; METHOD method_26960 updateRotation (FF)F + ARG 0 prevRot + ARG 1 newRot METHOD method_7432 setOwner (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_7454 onEntityHit (Lnet/minecraft/class_3966;)V diff --git a/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping b/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping index acfeac8276..9c33222cf7 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping @@ -1,7 +1,11 @@ CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil METHOD method_18074 getCollision (Lnet/minecraft/class_1297;Ljava/util/function/Predicate;)Lnet/minecraft/class_239; + ARG 0 entity METHOD method_18075 raycast (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/function/Predicate;D)Lnet/minecraft/class_3966; + ARG 0 entity METHOD method_18077 getEntityCollision (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Lnet/minecraft/class_3966; + ARG 0 world + ARG 1 entity METHOD method_18812 getHandPossiblyHolding (Lnet/minecraft/class_1309;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1268; ARG 0 entity ARG 1 item diff --git a/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping index 2398c0b074..0af3b865f1 100644 --- a/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ShulkerBulletEntity.mapping @@ -18,4 +18,6 @@ CLASS net/minecraft/class_1678 net/minecraft/entity/projectile/ShulkerBulletEnti ARG 1 world ARG 2 owner ARG 3 target + ARG 4 axis METHOD method_7487 setDirection (Lnet/minecraft/class_2350;)V + ARG 1 direction diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index 83904eef52..b46da93454 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -62,6 +62,7 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti METHOD method_7518 getMinecartType ()Lnet/minecraft/class_1688$class_1689; METHOD method_7519 getContainedBlock ()Lnet/minecraft/class_2680; METHOD method_7520 setDamageWobbleStrength (F)V + ARG 1 damageWobbleStrength METHOD method_7521 getDamageWobbleStrength ()F METHOD method_7522 getDamageWobbleSide ()I METHOD method_7523 create (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1688$class_1689;)Lnet/minecraft/class_1688; diff --git a/mappings/net/minecraft/fluid/FlowableFluid.mapping b/mappings/net/minecraft/fluid/FlowableFluid.mapping index 37ae5e4175..5ea980ba37 100644 --- a/mappings/net/minecraft/fluid/FlowableFluid.mapping +++ b/mappings/net/minecraft/fluid/FlowableFluid.mapping @@ -48,12 +48,14 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 4 flowDirection ARG 5 flowTo ARG 6 flowToBlockState + ARG 7 fluidState + ARG 8 fluid METHOD method_15739 getLevelDecreasePerBlock (Lnet/minecraft/class_4538;)I ARG 1 world METHOD method_15740 (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)I ARG 1 world ARG 2 pos - METHOD method_15741 (Lnet/minecraft/class_3610;)I + METHOD method_15741 getBlockStateLevel (Lnet/minecraft/class_3610;)I ARG 0 state METHOD method_15742 (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;ILnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lit/unimi/dsi/fastutil/shorts/Short2ObjectMap;Lit/unimi/dsi/fastutil/shorts/Short2BooleanMap;)I ARG 1 world diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 065d1617e0..8100db9727 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid FIELD field_15905 stateManager Lnet/minecraft/class_2689; METHOD method_15774 getBucketItem ()Lnet/minecraft/class_1792; METHOD method_15775 appendProperties (Lnet/minecraft/class_2689$class_2690;)V + ARG 1 builder METHOD method_15776 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V ARG 1 world ARG 2 pos @@ -47,6 +48,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid ARG 1 world ARG 2 pos ARG 3 state + ARG 4 random METHOD method_15793 isStill (Lnet/minecraft/class_3610;)Z ARG 1 state METHOD method_15794 isEmpty ()Z diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 7eb4bcf56d..17dc516a81 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState METHOD (Lnet/minecraft/class_3611;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V ARG 1 fluid ARG 2 propertiesMap + ARG 3 codec METHOD method_15756 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/inventory/ContainerLock.mapping b/mappings/net/minecraft/inventory/ContainerLock.mapping index 7dcfd996c4..574848455a 100644 --- a/mappings/net/minecraft/inventory/ContainerLock.mapping +++ b/mappings/net/minecraft/inventory/ContainerLock.mapping @@ -11,11 +11,11 @@ CLASS net/minecraft/class_1273 net/minecraft/inventory/ContainerLock COMMENT or if the key string is empty. ARG 1 stack COMMENT the key item stack - METHOD method_5473 fromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1273; - COMMENT Creates a new {@code ContainerLock} from the {@code Lock} key of the compound tag. + METHOD method_5473 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1273; + COMMENT Creates a new {@code ContainerLock} from the {@code Lock} key of the NBT compound. COMMENT

COMMENT If the {@code Lock} key is not present, returns an empty lock. - ARG 0 tag - METHOD method_5474 toTag (Lnet/minecraft/class_2487;)V - COMMENT Inserts the key string of this lock into the {@code Lock} key of the compound tag. - ARG 1 tag + ARG 0 nbt + METHOD method_5474 writeNbt (Lnet/minecraft/class_2487;)V + COMMENT Inserts the key string of this lock into the {@code Lock} key of the NBT compound. + ARG 1 nbt diff --git a/mappings/net/minecraft/inventory/Inventories.mapping b/mappings/net/minecraft/inventory/Inventories.mapping index 77713a4fa3..3f96df7d2c 100644 --- a/mappings/net/minecraft/inventory/Inventories.mapping +++ b/mappings/net/minecraft/inventory/Inventories.mapping @@ -15,18 +15,18 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories ARG 2 maxCount ARG 3 dryRun COMMENT whether to return the number of items which would have been removed without actually removing them - METHOD method_5426 toTag (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;)Lnet/minecraft/class_2487; - ARG 0 tag + METHOD method_5426 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;)Lnet/minecraft/class_2487; + ARG 0 nbt ARG 1 stacks - METHOD method_5427 toTag (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;Z)Lnet/minecraft/class_2487; - ARG 0 tag + METHOD method_5427 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;Z)Lnet/minecraft/class_2487; + ARG 0 nbt ARG 1 stacks ARG 2 setIfEmpty METHOD method_5428 removeStack (Ljava/util/List;I)Lnet/minecraft/class_1799; ARG 0 stacks ARG 1 slot - METHOD method_5429 fromTag (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;)V - ARG 0 tag + METHOD method_5429 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;)V + ARG 0 nbt ARG 1 stacks METHOD method_5430 splitStack (Ljava/util/List;II)Lnet/minecraft/class_1799; ARG 0 stacks diff --git a/mappings/net/minecraft/inventory/SimpleInventory.mapping b/mappings/net/minecraft/inventory/SimpleInventory.mapping index 2ae570597e..456d313bb1 100644 --- a/mappings/net/minecraft/inventory/SimpleInventory.mapping +++ b/mappings/net/minecraft/inventory/SimpleInventory.mapping @@ -32,6 +32,6 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/SimpleInventory ARG 1 listener METHOD method_5491 addStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 stack - METHOD method_7659 readTags (Lnet/minecraft/class_2499;)V - ARG 1 tags - METHOD method_7660 getTags ()Lnet/minecraft/class_2499; + METHOD method_7659 readNbtList (Lnet/minecraft/class_2499;)V + ARG 1 nbtList + METHOD method_7660 toNbtList ()Lnet/minecraft/class_2499; diff --git a/mappings/net/minecraft/item/CompassItem.mapping b/mappings/net/minecraft/item/CompassItem.mapping index cd9a227eae..7861c173e8 100644 --- a/mappings/net/minecraft/item/CompassItem.mapping +++ b/mappings/net/minecraft/item/CompassItem.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1759 net/minecraft/item/CompassItem METHOD method_26364 getLodestoneDimension (Lnet/minecraft/class_2487;)Ljava/util/Optional; - ARG 0 tag + ARG 0 nbt METHOD method_26365 hasLodestone (Lnet/minecraft/class_1799;)Z ARG 0 stack diff --git a/mappings/net/minecraft/item/EnchantedBookItem.mapping b/mappings/net/minecraft/item/EnchantedBookItem.mapping index 09de138183..af41b76725 100644 --- a/mappings/net/minecraft/item/EnchantedBookItem.mapping +++ b/mappings/net/minecraft/item/EnchantedBookItem.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1772 net/minecraft/item/EnchantedBookItem - METHOD method_7806 getEnchantmentTag (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2499; + METHOD method_7806 getEnchantmentNbt (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2499; ARG 0 stack METHOD method_7807 addEnchantment (Lnet/minecraft/class_1799;Lnet/minecraft/class_1889;)V ARG 0 stack diff --git a/mappings/net/minecraft/item/EntityBucketItem.mapping b/mappings/net/minecraft/item/EntityBucketItem.mapping new file mode 100644 index 0000000000..a665396256 --- /dev/null +++ b/mappings/net/minecraft/item/EntityBucketItem.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_1785 net/minecraft/item/EntityBucketItem + FIELD field_7991 entityType Lnet/minecraft/class_1299; + METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_3611;Lnet/minecraft/class_1792$class_1793;)V + ARG 1 type + ARG 2 fluid + ARG 3 settings + METHOD method_7824 spawnEntity (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 stack + ARG 3 pos diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index 8621f80fed..66665b9e72 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 0 map ARG 1 world METHOD method_8002 fillExplorationMap (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)V + ARG 0 world ARG 1 map METHOD method_8003 getMapId (Lnet/minecraft/class_1799;)I ARG 0 stack diff --git a/mappings/net/minecraft/item/FireworkChargeItem.mapping b/mappings/net/minecraft/item/FireworkChargeItem.mapping index 8c1d6eb667..01a03fb1f9 100644 --- a/mappings/net/minecraft/item/FireworkChargeItem.mapping +++ b/mappings/net/minecraft/item/FireworkChargeItem.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1780 net/minecraft/item/FireworkChargeItem METHOD method_7809 appendFireworkTooltip (Lnet/minecraft/class_2487;Ljava/util/List;)V - ARG 0 tag + ARG 0 nbt ARG 1 tooltip METHOD method_7810 getColorText (I)Lnet/minecraft/class_2561; ARG 0 color diff --git a/mappings/net/minecraft/item/FishBucketItem.mapping b/mappings/net/minecraft/item/FishBucketItem.mapping deleted file mode 100644 index b6490d405c..0000000000 --- a/mappings/net/minecraft/item/FishBucketItem.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_1785 net/minecraft/item/FishBucketItem - FIELD field_7991 fishType Lnet/minecraft/class_1299; - METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_3611;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 type - ARG 2 fluid - ARG 3 settings - METHOD method_7824 spawnFish (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)V - ARG 2 stack - ARG 3 pos diff --git a/mappings/net/minecraft/item/GlassBottleItem.mapping b/mappings/net/minecraft/item/GlassBottleItem.mapping index 36c0b034cd..ad105874c5 100644 --- a/mappings/net/minecraft/item/GlassBottleItem.mapping +++ b/mappings/net/minecraft/item/GlassBottleItem.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1754 net/minecraft/item/GlassBottleItem METHOD method_7725 fill (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + ARG 1 stack + ARG 2 player + ARG 3 outputStack METHOD method_7726 (Lnet/minecraft/class_1295;)Z ARG 0 entity diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 5cb270f189..5458b52455 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -83,15 +83,22 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item METHOD method_7854 getDefaultStack ()Lnet/minecraft/class_1799; METHOD method_7855 isIn (Lnet/minecraft/class_3494;)Z ARG 1 tag - METHOD method_7856 isEffectiveOn (Lnet/minecraft/class_2680;)Z + METHOD method_7856 isSuitableFor (Lnet/minecraft/class_2680;)Z + COMMENT Determines whether this item can be used as a suitable tool for mining the specified block. + COMMENT Depending on block implementation, when combined together, the correct item and block may achieve a better mining speed and yield + COMMENT drops that would not be obtained when mining otherwise. + COMMENT

+ COMMENT Note that this is not the only way to achieve "effectiveness" when mining. + COMMENT Other items, such as shears on string, may use their own logic + COMMENT and calls to this method might not return a value consistent to this rule for those items. ARG 1 state METHOD method_7857 hasRecipeRemainder ()Z COMMENT Checks if this item has a remainder item that is left behind when used as a crafting ingredient. METHOD method_7858 getRecipeRemainder ()Lnet/minecraft/class_1792; COMMENT Gets the remainder item that should be left behind when this item is used as a crafting ingredient. METHOD method_7859 getGroup ()Lnet/minecraft/class_1761; - METHOD method_7860 postProcessTag (Lnet/minecraft/class_2487;)Z - ARG 1 tag + METHOD method_7860 postProcessNbt (Lnet/minecraft/class_2487;)Z + ARG 1 nbt METHOD method_7861 finishUsing (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1799; ARG 1 stack ARG 2 world @@ -107,6 +114,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT Gets the translation key of this item using the provided item stack for context. ARG 1 stack METHOD method_7867 fromBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; + COMMENT @deprecated Please use {@link Block#asItem} ARG 0 block METHOD method_7869 getOrCreateTranslationKey ()Ljava/lang/String; METHOD method_7870 isEnchantable (Lnet/minecraft/class_1799;)Z @@ -163,7 +171,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT

By default, returns true if the item has enchantments. ARG 1 stack METHOD method_7887 shouldSyncTagToClient ()Z - COMMENT Checks if an item should have its NBT data stored in {@link #tag} sent to the client. + COMMENT Checks if an item should have its NBT data stored in {@link ItemStack#tag} sent to the client. COMMENT COMMENT

If an item is damageable, this method is ignored and data is always synced to client. METHOD method_7888 inventoryTick (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;IZ)V diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 50579fbc37..2496369942 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -20,7 +20,9 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 item ARG 2 count METHOD (Lnet/minecraft/class_1935;ILjava/util/Optional;)V + ARG 1 item ARG 2 count + ARG 3 tag METHOD (Lnet/minecraft/class_2487;)V ARG 1 tag METHOD method_17869 (Ljava/util/List;Lnet/minecraft/class_2487;Lnet/minecraft/class_1887;)V @@ -35,9 +37,12 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_27320 setHolder (Lnet/minecraft/class_1297;)V ARG 1 holder METHOD method_30266 getHideFlags ()I - METHOD method_30267 isSectionHidden (ILnet/minecraft/class_1799$class_5422;)Z + METHOD method_30267 isSectionVisible (ILnet/minecraft/class_1799$class_5422;)Z + COMMENT Determines whether the given tooltip section will be visible according to the given flags. ARG 0 flags + ARG 1 tooltipSection METHOD method_30268 addHideFlag (Lnet/minecraft/class_1799$class_5422;)V + ARG 1 tooltipSection METHOD method_7909 getItem ()Lnet/minecraft/class_1792; METHOD method_7910 finishUsing (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1799; ARG 1 world @@ -51,9 +56,10 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 2 user ARG 3 hand METHOD method_7914 getMaxCount ()I - METHOD method_7915 fromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1799; - ARG 0 tag + METHOD method_7915 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1799; + ARG 0 nbt METHOD method_7916 addAttributeModifier (Lnet/minecraft/class_1320;Lnet/minecraft/class_1322;Lnet/minecraft/class_1304;)V + ARG 1 attribute ARG 2 modifier ARG 3 slot METHOD method_7917 inventoryTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;IZ)V @@ -76,6 +82,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 state METHOD method_7925 removeCustomName ()V METHOD method_7926 getAttributeModifiers (Lnet/minecraft/class_1304;)Lcom/google/common/collect/Multimap; + ARG 1 slot METHOD method_7927 setRepairCost (I)V ARG 1 repairCost METHOD method_7928 getRepairCost ()I @@ -98,11 +105,13 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7939 setCount (I)V ARG 1 count METHOD method_7940 canDestroy (Lnet/minecraft/class_5415;Lnet/minecraft/class_2694;)Z + ARG 1 tagManager ARG 2 pos METHOD method_7941 getSubTag (Ljava/lang/String;)Lnet/minecraft/class_2487; ARG 1 key METHOD method_7942 hasEnchantments ()Z METHOD method_7944 canPlaceOn (Lnet/minecraft/class_5415;Lnet/minecraft/class_2694;)Z + ARG 1 tagManager ARG 2 pos METHOD method_7945 getFrame ()Lnet/minecraft/class_1533; METHOD method_7946 isStackable ()Z @@ -115,15 +124,22 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7950 getTooltip (Lnet/minecraft/class_1657;Lnet/minecraft/class_1836;)Ljava/util/List; ARG 1 player ARG 2 context - METHOD method_7951 isEffectiveOn (Lnet/minecraft/class_2680;)Z + METHOD method_7951 isSuitableFor (Lnet/minecraft/class_2680;)Z + COMMENT Determines whether this item can be used as a suitable tool for mining the specified block. + COMMENT

+ COMMENT Depending on block implementation, when combined together, the correct item and block may achieve a better mining speed and yield + COMMENT drops that would not be obtained when mining otherwise. + COMMENT + COMMENT @return values consistent with calls to {@link Item#isSuitableFor} + COMMENT @see Item#isSuitableFor(BlockState) ARG 1 state METHOD method_7952 postMine (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V ARG 1 world ARG 2 state ARG 3 pos ARG 4 miner - METHOD method_7953 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + METHOD method_7953 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt METHOD method_7954 toHoverableText ()Lnet/minecraft/class_2561; METHOD method_7955 (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; ARG 0 text diff --git a/mappings/net/minecraft/item/ItemUsage.mapping b/mappings/net/minecraft/item/ItemUsage.mapping index de3411daa8..70bc0a13b6 100644 --- a/mappings/net/minecraft/item/ItemUsage.mapping +++ b/mappings/net/minecraft/item/ItemUsage.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_5328 net/minecraft/item/ItemUsage METHOD method_29282 consumeHeldItem (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271; + ARG 0 world + ARG 1 player + ARG 2 hand diff --git a/mappings/net/minecraft/item/LeadItem.mapping b/mappings/net/minecraft/item/LeadItem.mapping index f210dfc7a7..eddae05092 100644 --- a/mappings/net/minecraft/item/LeadItem.mapping +++ b/mappings/net/minecraft/item/LeadItem.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_1804 net/minecraft/item/LeadItem METHOD method_7994 attachHeldMobsToBlock (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1269; + ARG 0 player + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/item/SpawnEggItem.mapping b/mappings/net/minecraft/item/SpawnEggItem.mapping index 093b015d65..fcf75b27c2 100644 --- a/mappings/net/minecraft/item/SpawnEggItem.mapping +++ b/mappings/net/minecraft/item/SpawnEggItem.mapping @@ -10,13 +10,18 @@ CLASS net/minecraft/class_1826 net/minecraft/item/SpawnEggItem ARG 4 settings METHOD method_24793 spawnBaby (Lnet/minecraft/class_1657;Lnet/minecraft/class_1308;Lnet/minecraft/class_1299;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 1 user + ARG 2 entity + ARG 3 entityType + ARG 4 world + ARG 5 pos + ARG 6 stack METHOD method_8015 getEntityType (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1299; - ARG 1 tag + ARG 1 nbt METHOD method_8016 getColor (I)I ARG 1 num METHOD method_8017 getAll ()Ljava/lang/Iterable; METHOD method_8018 isOfSameEntityType (Lnet/minecraft/class_2487;Lnet/minecraft/class_1299;)Z - ARG 1 tag + ARG 1 nbt ARG 2 type METHOD method_8019 forEntity (Lnet/minecraft/class_1299;)Lnet/minecraft/class_1826; ARG 0 type diff --git a/mappings/net/minecraft/item/SwordItem.mapping b/mappings/net/minecraft/item/SwordItem.mapping index b928644eb0..fc46bd46da 100644 --- a/mappings/net/minecraft/item/SwordItem.mapping +++ b/mappings/net/minecraft/item/SwordItem.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1829 net/minecraft/item/SwordItem FIELD field_23745 attributeModifiers Lcom/google/common/collect/Multimap; FIELD field_8920 attackDamage F METHOD (Lnet/minecraft/class_1832;IFLnet/minecraft/class_1792$class_1793;)V + ARG 1 toolMaterial ARG 2 attackDamage ARG 3 attackSpeed ARG 4 settings diff --git a/mappings/net/minecraft/item/Wearable.mapping b/mappings/net/minecraft/item/Wearable.mapping index 520bd2bc6d..2921ee4e8f 100644 --- a/mappings/net/minecraft/item/Wearable.mapping +++ b/mappings/net/minecraft/item/Wearable.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_5151 net/minecraft/item/Wearable COMMENT Represents a type of item that is wearable in an armor equipment slot. COMMENT - COMMENT

This type of item can be targeted by the {@code minecraft:binding_curse} enchantment.

+ COMMENT

This type of item can be targeted by the {@code minecraft:binding_curse} enchantment. diff --git a/mappings/net/minecraft/item/WritableBookItem.mapping b/mappings/net/minecraft/item/WritableBookItem.mapping index 09a2e8c3fc..0d09d0a111 100644 --- a/mappings/net/minecraft/item/WritableBookItem.mapping +++ b/mappings/net/minecraft/item/WritableBookItem.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_1840 net/minecraft/item/WritableBookItem METHOD method_8047 isValid (Lnet/minecraft/class_2487;)Z - ARG 0 tag + ARG 0 nbt diff --git a/mappings/net/minecraft/item/WrittenBookItem.mapping b/mappings/net/minecraft/item/WrittenBookItem.mapping index 5c15a873e0..e0b99abd75 100644 --- a/mappings/net/minecraft/item/WrittenBookItem.mapping +++ b/mappings/net/minecraft/item/WrittenBookItem.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_1843 net/minecraft/item/WrittenBookItem METHOD method_8052 getGeneration (Lnet/minecraft/class_1799;)I ARG 0 stack METHOD method_8053 isValid (Lnet/minecraft/class_2487;)Z - ARG 0 tag + ARG 0 nbt METHOD method_8054 resolve (Lnet/minecraft/class_1799;Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;)Z ARG 0 book ARG 1 commandSource diff --git a/mappings/net/minecraft/item/map/MapBannerMarker.mapping b/mappings/net/minecraft/item/map/MapBannerMarker.mapping index 8bba6d899b..51efe0fd61 100644 --- a/mappings/net/minecraft/item/map/MapBannerMarker.mapping +++ b/mappings/net/minecraft/item/map/MapBannerMarker.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker + COMMENT Represents a banner marker in world. + COMMENT

+ COMMENT Used to track banners in a map state. FIELD field_67 name Lnet/minecraft/class_2561; FIELD field_68 color Lnet/minecraft/class_1767; FIELD field_69 pos Lnet/minecraft/class_2338; @@ -9,7 +12,7 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_67 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_17; - ARG 0 tag + ARG 0 nbt METHOD method_68 getName ()Lnet/minecraft/class_2561; METHOD method_70 getPos ()Lnet/minecraft/class_2338; METHOD method_71 getKey ()Ljava/lang/String; diff --git a/mappings/net/minecraft/item/map/MapFrameMarker.mapping b/mappings/net/minecraft/item/map/MapFrameMarker.mapping index a3e5a7a055..cbfd18eae9 100644 --- a/mappings/net/minecraft/item/map/MapFrameMarker.mapping +++ b/mappings/net/minecraft/item/map/MapFrameMarker.mapping @@ -10,8 +10,8 @@ CLASS net/minecraft/class_19 net/minecraft/item/map/MapFrameMarker ARG 0 pos METHOD method_82 getKey ()Ljava/lang/String; METHOD method_83 getRotation ()I - METHOD method_84 toTag ()Lnet/minecraft/class_2487; + METHOD method_84 toNbt ()Lnet/minecraft/class_2487; METHOD method_85 getEntityId ()I METHOD method_86 getPos ()Lnet/minecraft/class_2338; - METHOD method_87 fromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_19; - ARG 0 tag + METHOD method_87 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_19; + ARG 0 nbt diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index b526da7b4f..ce4891605e 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -2,8 +2,14 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState FIELD field_112 updateTrackers Ljava/util/List; FIELD field_113 unlimitedTracking Z FIELD field_114 showIcons Z - FIELD field_115 zCenter I - FIELD field_116 xCenter I + FIELD field_115 centerZ I + COMMENT The scaled center coordinate of the map state on the Z axis. + COMMENT

+ COMMENT Always {@code 0} for the client. + FIELD field_116 centerX I + COMMENT The scaled center coordinate of the map state on the X axis. + COMMENT

+ COMMENT Always {@code 0} for the client. FIELD field_117 icons Ljava/util/Map; FIELD field_118 dimension Lnet/minecraft/class_5321; FIELD field_119 scale B @@ -11,6 +17,9 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState FIELD field_121 frames Ljava/util/Map; FIELD field_122 colors [B FIELD field_123 banners Ljava/util/Map; + COMMENT The banner markers to track in world. + COMMENT

+ COMMENT Empty for the client. FIELD field_17403 locked Z METHOD method_100 getPlayerMarkerPacket (Lnet/minecraft/class_1799;Lnet/minecraft/class_1922;Lnet/minecraft/class_1657;)Lnet/minecraft/class_2596; ARG 1 map @@ -53,7 +62,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 1 world ARG 2 x ARG 3 z - METHOD method_110 addDecorationsTag (Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;Ljava/lang/String;Lnet/minecraft/class_20$class_21;)V + METHOD method_110 addDecorationsNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;Ljava/lang/String;Lnet/minecraft/class_20$class_21;)V ARG 0 stack ARG 1 pos ARG 2 id diff --git a/mappings/net/minecraft/loot/LootPool.mapping b/mappings/net/minecraft/loot/LootPool.mapping index 1425052a9c..3dec1c39c5 100644 --- a/mappings/net/minecraft/loot/LootPool.mapping +++ b/mappings/net/minecraft/loot/LootPool.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool ARG 2 context METHOD method_347 builder ()Lnet/minecraft/class_55$class_56; METHOD method_349 validate (Lnet/minecraft/class_58;)V + ARG 1 reporter CLASS class_56 Builder FIELD field_959 rolls Lnet/minecraft/class_59; FIELD field_960 entries Ljava/util/List; diff --git a/mappings/net/minecraft/loot/entry/CombinedEntry.mapping b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping index b0046f7c16..1d775c911e 100644 --- a/mappings/net/minecraft/loot/entry/CombinedEntry.mapping +++ b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_69 net/minecraft/loot/entry/CombinedEntry METHOD method_394 combine ([Lnet/minecraft/class_64;)Lnet/minecraft/class_64; ARG 1 children METHOD method_395 createSerializer (Lnet/minecraft/class_69$class_70;)Lnet/minecraft/class_79$class_5337; + ARG 0 factory CLASS class_70 Factory METHOD create ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_69; ARG 1 children diff --git a/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping index 5ea0bf9ddc..29bbbb5a42 100644 --- a/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping +++ b/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_75 net/minecraft/loot/entry/LootPoolEntryTypes METHOD method_29316 createGsonSerializer ()Ljava/lang/Object; METHOD method_29317 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5338; ARG 0 id + ARG 1 jsonSerializer diff --git a/mappings/net/minecraft/loot/entry/TagEntry.mapping b/mappings/net/minecraft/loot/entry/TagEntry.mapping index 6dbe611f06..2842a2d5fc 100644 --- a/mappings/net/minecraft/loot/entry/TagEntry.mapping +++ b/mappings/net/minecraft/loot/entry/TagEntry.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_91 net/minecraft/loot/entry/TagEntry ARG 2 quality ARG 3 conditions ARG 4 functions - METHOD method_445 builder (Lnet/minecraft/class_3494;)Lnet/minecraft/class_85$class_86; + METHOD method_445 expandBuilder (Lnet/minecraft/class_3494;)Lnet/minecraft/class_85$class_86; ARG 0 name METHOD method_447 grow (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping index cf04a3fd36..3cb9cedc35 100644 --- a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_4488 net/minecraft/loot/function/CopyStateFunction METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2248;Ljava/util/Set;)V ARG 3 properties METHOD method_21892 getBuilder (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4488$class_4489; + ARG 0 block CLASS class_4489 Builder FIELD field_20451 block Lnet/minecraft/class_2248; FIELD field_20452 properties Ljava/util/Set; diff --git a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping index c60735af68..3a4e5da8fa 100644 --- a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_131 net/minecraft/loot/function/LootFunctionTypes METHOD method_29322 createGsonSerializer ()Ljava/lang/Object; METHOD method_29323 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5339; ARG 0 id + ARG 1 jsonSerializer METHOD method_591 (Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; ARG 2 stack ARG 3 context diff --git a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping index 655c61409d..63d01a999f 100644 --- a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_159 net/minecraft/loot/function/SetNbtLootFunction - FIELD field_1138 tag Lnet/minecraft/class_2487; + FIELD field_1138 nbt Lnet/minecraft/class_2487; METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2487;)V ARG 1 conditions ARG 2 tag METHOD method_675 (Lnet/minecraft/class_2487;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_677 builder (Lnet/minecraft/class_2487;)Lnet/minecraft/class_120$class_121; - ARG 0 tag + ARG 0 nbt CLASS class_160 Serializer diff --git a/mappings/net/minecraft/nbt/AbstractListTag.mapping b/mappings/net/minecraft/nbt/AbstractListTag.mapping deleted file mode 100644 index 694c46b12e..0000000000 --- a/mappings/net/minecraft/nbt/AbstractListTag.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/class_2483 net/minecraft/nbt/AbstractListTag - METHOD add (ILjava/lang/Object;)V - ARG 1 index - ARG 2 value - METHOD method_10533 addTag (ILnet/minecraft/class_2520;)Z - ARG 1 index - ARG 2 tag - METHOD method_10535 setTag (ILnet/minecraft/class_2520;)Z - ARG 1 index - ARG 2 tag - METHOD method_10601 getElementType ()B - METHOD remove (I)Ljava/lang/Object; - ARG 1 index - METHOD set (ILjava/lang/Object;)Ljava/lang/Object; - ARG 1 index - ARG 2 value diff --git a/mappings/net/minecraft/nbt/AbstractNbtList.mapping b/mappings/net/minecraft/nbt/AbstractNbtList.mapping new file mode 100644 index 0000000000..1d2787c87b --- /dev/null +++ b/mappings/net/minecraft/nbt/AbstractNbtList.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_2483 net/minecraft/nbt/AbstractNbtList + COMMENT Represents an abstraction of a mutable NBT list which holds elements of the same type. + METHOD add (ILjava/lang/Object;)V + ARG 1 index + ARG 2 value + METHOD method_10533 addElement (ILnet/minecraft/class_2520;)Z + ARG 1 index + ARG 2 element + METHOD method_10535 setElement (ILnet/minecraft/class_2520;)Z + ARG 1 index + ARG 2 element + METHOD method_10601 getHeldType ()B + COMMENT Gets the {@linkplain NbtElement#getType type} of element that this list holds. + COMMENT + COMMENT @return the type of element that this list holds + METHOD remove (I)Ljava/lang/Object; + ARG 1 index + METHOD set (ILjava/lang/Object;)Ljava/lang/Object; + ARG 1 index + ARG 2 value diff --git a/mappings/net/minecraft/nbt/AbstractNbtNumber.mapping b/mappings/net/minecraft/nbt/AbstractNbtNumber.mapping new file mode 100644 index 0000000000..7bd5485210 --- /dev/null +++ b/mappings/net/minecraft/nbt/AbstractNbtNumber.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_2514 net/minecraft/nbt/AbstractNbtNumber + COMMENT Represents an NBT number. + COMMENT

+ COMMENT The type {@code 99} can be used to + COMMENT {@linkplain NbtCompound#contains check for the existence of any numeric element in a NBT compound object}. + METHOD method_10696 shortValue ()S + COMMENT Gets the value as a 16-bit integer. + COMMENT + COMMENT @return the value as a short + METHOD method_10697 doubleValue ()D + COMMENT Gets the value as a 64-bit floating-point number. + COMMENT + COMMENT @return the value as a double + METHOD method_10698 byteValue ()B + COMMENT Gets the value as an 8-bit integer. + COMMENT + COMMENT @return the value as a byte + METHOD method_10699 longValue ()J + COMMENT Gets the value as a 64-bit integer. + COMMENT + COMMENT @return the value as a long + METHOD method_10700 floatValue ()F + COMMENT Gets the value as a 32-bit floating-point number. + COMMENT + COMMENT @return the value as a float + METHOD method_10701 intValue ()I + COMMENT Gets the value as a 32-bit integer. + COMMENT + COMMENT @return the value as an int + METHOD method_10702 numberValue ()Ljava/lang/Number; + COMMENT Gets the value as a generic number. + COMMENT + COMMENT @return the value as a {@link Number} diff --git a/mappings/net/minecraft/nbt/AbstractNumberTag.mapping b/mappings/net/minecraft/nbt/AbstractNumberTag.mapping deleted file mode 100644 index b21be3d7f2..0000000000 --- a/mappings/net/minecraft/nbt/AbstractNumberTag.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_2514 net/minecraft/nbt/AbstractNumberTag - METHOD method_10696 getShort ()S - METHOD method_10697 getDouble ()D - METHOD method_10698 getByte ()B - METHOD method_10699 getLong ()J - METHOD method_10700 getFloat ()F - METHOD method_10701 getInt ()I - METHOD method_10702 getNumber ()Ljava/lang/Number; diff --git a/mappings/net/minecraft/nbt/EndTag.mapping b/mappings/net/minecraft/nbt/EndTag.mapping deleted file mode 100644 index 9a4b8e75be..0000000000 --- a/mappings/net/minecraft/nbt/EndTag.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2491 net/minecraft/nbt/EndTag - FIELD field_21032 READER Lnet/minecraft/class_4614; - FIELD field_21033 INSTANCE Lnet/minecraft/class_2491; diff --git a/mappings/net/minecraft/nbt/ByteTag.mapping b/mappings/net/minecraft/nbt/NbtByte.mapping similarity index 75% rename from mappings/net/minecraft/nbt/ByteTag.mapping rename to mappings/net/minecraft/nbt/NbtByte.mapping index bcab21bd6f..5fcbe07db7 100644 --- a/mappings/net/minecraft/nbt/ByteTag.mapping +++ b/mappings/net/minecraft/nbt/NbtByte.mapping @@ -1,6 +1,7 @@ -CLASS net/minecraft/class_2481 net/minecraft/nbt/ByteTag +CLASS net/minecraft/class_2481 net/minecraft/nbt/NbtByte + COMMENT Represents an NBT byte. FIELD field_11498 value B - FIELD field_21025 READER Lnet/minecraft/class_4614; + FIELD field_21025 TYPE Lnet/minecraft/class_4614; FIELD field_21026 ZERO Lnet/minecraft/class_2481; FIELD field_21027 ONE Lnet/minecraft/class_2481; METHOD (B)V diff --git a/mappings/net/minecraft/nbt/ByteArrayTag.mapping b/mappings/net/minecraft/nbt/NbtByteArray.mapping similarity index 63% rename from mappings/net/minecraft/nbt/ByteArrayTag.mapping rename to mappings/net/minecraft/nbt/NbtByteArray.mapping index 8c811f4274..3b1eef8798 100644 --- a/mappings/net/minecraft/nbt/ByteArrayTag.mapping +++ b/mappings/net/minecraft/nbt/NbtByteArray.mapping @@ -1,6 +1,7 @@ -CLASS net/minecraft/class_2479 net/minecraft/nbt/ByteArrayTag +CLASS net/minecraft/class_2479 net/minecraft/nbt/NbtByteArray + COMMENT Represents an NBT byte array. FIELD field_11493 value [B - FIELD field_21024 READER Lnet/minecraft/class_4614; + FIELD field_21024 TYPE Lnet/minecraft/class_4614; METHOD (Ljava/util/List;)V ARG 1 value METHOD ([B)V diff --git a/mappings/net/minecraft/nbt/CompoundTag.mapping b/mappings/net/minecraft/nbt/NbtCompound.mapping similarity index 79% rename from mappings/net/minecraft/nbt/CompoundTag.mapping rename to mappings/net/minecraft/nbt/NbtCompound.mapping index 8b590651a6..00b0d3d783 100644 --- a/mappings/net/minecraft/nbt/CompoundTag.mapping +++ b/mappings/net/minecraft/nbt/NbtCompound.mapping @@ -1,11 +1,12 @@ -CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag +CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound + COMMENT Represents an NBT compound object which holds unordered key-value pairs with distinct case-sensitive string keys. FIELD field_11514 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_11515 tags Ljava/util/Map; + FIELD field_11515 entries Ljava/util/Map; FIELD field_11516 PATTERN Ljava/util/regex/Pattern; - FIELD field_21029 READER Lnet/minecraft/class_4614; + FIELD field_21029 TYPE Lnet/minecraft/class_4614; FIELD field_25128 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Map;)V - ARG 1 tags + ARG 1 entries METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_10537 getLong (Ljava/lang/String;)J @@ -17,6 +18,9 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 1 key ARG 2 value METHOD method_10540 getType (Ljava/lang/String;)B + COMMENT Gets the {@linkplain NbtElement#getType NBT type} of the element stored at the specified key. + COMMENT + COMMENT @return the element NBT type, or {@code 0} if it does not exist ARG 1 key METHOD method_10541 getKeys ()Ljava/util/Set; METHOD method_10542 readByte (Ljava/io/DataInput;Lnet/minecraft/class_2505;)B @@ -28,6 +32,9 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 1 key ARG 2 value METHOD method_10545 contains (Ljava/lang/String;)Z + COMMENT Determines whether the NBT compound object contains the specified key. + COMMENT + COMMENT @return {@code true} if the key exists, else {@code false} ARG 1 key METHOD method_10546 getSize ()I METHOD method_10547 getByteArray (Ljava/lang/String;)[B @@ -50,7 +57,7 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 2 type METHOD method_10555 write (Ljava/lang/String;Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V ARG 0 key - ARG 1 tag + ARG 1 element ARG 2 output METHOD method_10556 putBoolean (Ljava/lang/String;Z)V ARG 1 key @@ -61,6 +68,7 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 1 key METHOD method_10559 createCrashReport (Ljava/lang/String;Lnet/minecraft/class_4614;Ljava/lang/ClassCastException;)Lnet/minecraft/class_128; ARG 1 key + ARG 2 reader METHOD method_10561 getIntArray (Ljava/lang/String;)[I ARG 1 key METHOD method_10562 getCompound (Ljava/lang/String;)Lnet/minecraft/class_2487; @@ -72,7 +80,7 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 1 key METHOD method_10566 put (Ljava/lang/String;Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520; ARG 1 key - ARG 2 tag + ARG 2 element METHOD method_10567 putByte (Ljava/lang/String;B)V ARG 1 key ARG 2 value @@ -90,6 +98,11 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag ARG 1 key ARG 2 value METHOD method_10573 contains (Ljava/lang/String;I)Z + COMMENT Returns whether the NBT compound object contains an element of the specified type at the specified key. + COMMENT

+ COMMENT The type restriction can also be {@code 99}, which only allows any type of number. + COMMENT + COMMENT @return {@code true} if the key exists and the element type is equivalent to the given {@code type}, else {@code false} ARG 1 key ARG 2 type METHOD method_10574 getDouble (Ljava/lang/String;)D @@ -115,14 +128,14 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/CompoundTag METHOD method_10583 getFloat (Ljava/lang/String;)F ARG 1 key METHOD method_25926 getUuid (Ljava/lang/String;)Ljava/util/UUID; - COMMENT Reads a {@link UUID} from its NBT representation in this {@code CompoundTag}. + COMMENT Reads a {@link UUID} from its NBT representation in this {@code NbtCompound}. ARG 1 key METHOD method_25927 putUuid (Ljava/lang/String;Ljava/util/UUID;)V - COMMENT Writes a {@link UUID} to its NBT representation in this {@code CompoundTag}. + COMMENT Writes a {@link UUID} to its NBT representation in this {@code NbtCompound}. ARG 1 key ARG 2 value METHOD method_25928 containsUuid (Ljava/lang/String;)Z - COMMENT Returns {@code true} if this {@code CompoundTag} contains a valid UUID representation associated with the given key. + COMMENT Returns {@code true} if this {@code NbtCompound} contains a valid UUID representation associated with the given key. COMMENT A valid UUID is represented by an int array of length 4. ARG 1 key METHOD method_29143 toMap ()Ljava/util/Map; diff --git a/mappings/net/minecraft/nbt/DoubleTag.mapping b/mappings/net/minecraft/nbt/NbtDouble.mapping similarity index 57% rename from mappings/net/minecraft/nbt/DoubleTag.mapping rename to mappings/net/minecraft/nbt/NbtDouble.mapping index f224526908..2bd78af501 100644 --- a/mappings/net/minecraft/nbt/DoubleTag.mapping +++ b/mappings/net/minecraft/nbt/NbtDouble.mapping @@ -1,7 +1,8 @@ -CLASS net/minecraft/class_2489 net/minecraft/nbt/DoubleTag +CLASS net/minecraft/class_2489 net/minecraft/nbt/NbtDouble + COMMENT Represents an NBT 64-bit floating-point number. FIELD field_11520 value D FIELD field_21030 ZERO Lnet/minecraft/class_2489; - FIELD field_21031 READER Lnet/minecraft/class_4614; + FIELD field_21031 TYPE Lnet/minecraft/class_4614; METHOD (D)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/Tag.mapping b/mappings/net/minecraft/nbt/NbtElement.mapping similarity index 56% rename from mappings/net/minecraft/nbt/Tag.mapping rename to mappings/net/minecraft/nbt/NbtElement.mapping index 975ed38920..59cd294593 100644 --- a/mappings/net/minecraft/nbt/Tag.mapping +++ b/mappings/net/minecraft/nbt/NbtElement.mapping @@ -1,15 +1,25 @@ -CLASS net/minecraft/class_2520 net/minecraft/nbt/Tag +CLASS net/minecraft/class_2520 net/minecraft/nbt/NbtElement + COMMENT Represents an NBT element. FIELD field_11591 AQUA Lnet/minecraft/class_124; FIELD field_11593 GOLD Lnet/minecraft/class_124; FIELD field_11594 GREEN Lnet/minecraft/class_124; FIELD field_11595 RED Lnet/minecraft/class_124; METHOD method_10707 copy ()Lnet/minecraft/class_2520; + COMMENT Copies this NBT element. + COMMENT + COMMENT @return the copied element METHOD method_10710 toText (Ljava/lang/String;I)Lnet/minecraft/class_2561; ARG 1 indent ARG 2 depth METHOD method_10711 getType ()B + COMMENT Gets the type of this NBT element. + COMMENT + COMMENT @return the type METHOD method_10713 write (Ljava/io/DataOutput;)V ARG 1 output METHOD method_10714 asString ()Ljava/lang/String; METHOD method_10715 toText ()Lnet/minecraft/class_2561; - METHOD method_23258 getReader ()Lnet/minecraft/class_4614; + METHOD method_23258 getNbtType ()Lnet/minecraft/class_4614; + COMMENT Gets the NBT type definition of this NBT element. + COMMENT + COMMENT @return the element type definition diff --git a/mappings/net/minecraft/nbt/FloatTag.mapping b/mappings/net/minecraft/nbt/NbtFloat.mapping similarity index 57% rename from mappings/net/minecraft/nbt/FloatTag.mapping rename to mappings/net/minecraft/nbt/NbtFloat.mapping index 26f17a02c6..a67f3d4048 100644 --- a/mappings/net/minecraft/nbt/FloatTag.mapping +++ b/mappings/net/minecraft/nbt/NbtFloat.mapping @@ -1,7 +1,8 @@ -CLASS net/minecraft/class_2494 net/minecraft/nbt/FloatTag +CLASS net/minecraft/class_2494 net/minecraft/nbt/NbtFloat + COMMENT Represents an NBT 32-bit floating-point number. FIELD field_11523 value F FIELD field_21034 ZERO Lnet/minecraft/class_2494; - FIELD field_21035 READER Lnet/minecraft/class_4614; + FIELD field_21035 TYPE Lnet/minecraft/class_4614; METHOD (F)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping index 3bcb027f08..365d056f2b 100644 --- a/mappings/net/minecraft/nbt/NbtHelper.mapping +++ b/mappings/net/minecraft/nbt/NbtHelper.mapping @@ -1,17 +1,17 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper FIELD field_11582 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_10681 toBlockState (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2680; - ARG 0 tag + ARG 0 compound METHOD method_10682 withProperty (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2688; ARG 0 state ARG 1 property ARG 2 key - ARG 3 propertiesTag - ARG 4 mainTag + ARG 3 properties + ARG 4 root METHOD method_10683 toGameProfile (Lnet/minecraft/class_2487;)Lcom/mojang/authlib/GameProfile; - ARG 0 tag - METHOD method_10684 fromGameProfile (Lnet/minecraft/class_2487;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2487; - ARG 0 tag + ARG 0 compound + METHOD method_10684 writeGameProfile (Lnet/minecraft/class_2487;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2487; + ARG 0 compound ARG 1 profile METHOD method_10685 nameValue (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; ARG 0 property @@ -23,40 +23,40 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper ARG 1 subject ARG 2 equalValue METHOD method_10688 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2487; - COMMENT Uses the data fixer to update a tag to the latest data version. + COMMENT Uses the data fixer to update an NBT compound object to the latest data version. ARG 0 fixer COMMENT the data fixer ARG 1 fixTypes COMMENT the fix types - ARG 2 tag - COMMENT the tag to fix + ARG 2 compound + COMMENT the NBT compound object to fix ARG 3 oldVersion - COMMENT the data version of the compound tag + COMMENT the data version of the NBT compound object METHOD method_10691 toBlockPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2338; - ARG 0 tag + ARG 0 compound METHOD method_10692 fromBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; ARG 0 pos METHOD method_10693 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Lnet/minecraft/class_2487;II)Lnet/minecraft/class_2487; - COMMENT Uses the data fixer to update a tag. + COMMENT Uses the data fixer to update an NBT compound object. ARG 0 fixer COMMENT the data fixer ARG 1 fixTypes COMMENT the fix types - ARG 2 tag - COMMENT the tag to fix + ARG 2 compound + COMMENT the NBT compound object to fix ARG 3 oldVersion - COMMENT the data version of the compound tag + COMMENT the data version of the NBT compound object ARG 4 targetVersion - COMMENT the data version to update the tag to + COMMENT the data version to update the NBT compound object to METHOD method_25929 fromUuid (Ljava/util/UUID;)Lnet/minecraft/class_2495; COMMENT Serializes a {@link UUID} into its equivalent NBT representation. COMMENT COMMENT @since 20w10a ARG 0 uuid METHOD method_25930 toUuid (Lnet/minecraft/class_2520;)Ljava/util/UUID; - COMMENT Deserializes a tag into a {@link UUID}. - COMMENT The tag's data must have the same structure as the output of {@link #fromUuid}. + COMMENT Deserializes an NBT element into a {@link UUID}. + COMMENT The NBT element's data must have the same structure as the output of {@link #fromUuid}. COMMENT - COMMENT @throws IllegalArgumentException if {@code tag} is not a valid representation of a UUID + COMMENT @throws IllegalArgumentException if {@code element} is not a valid representation of a UUID COMMENT @since 20w10a - ARG 0 tag + ARG 0 element diff --git a/mappings/net/minecraft/nbt/IntTag.mapping b/mappings/net/minecraft/nbt/NbtInt.mapping similarity index 62% rename from mappings/net/minecraft/nbt/IntTag.mapping rename to mappings/net/minecraft/nbt/NbtInt.mapping index c709aab27c..07a2949eb3 100644 --- a/mappings/net/minecraft/nbt/IntTag.mapping +++ b/mappings/net/minecraft/nbt/NbtInt.mapping @@ -1,6 +1,7 @@ -CLASS net/minecraft/class_2497 net/minecraft/nbt/IntTag +CLASS net/minecraft/class_2497 net/minecraft/nbt/NbtInt + COMMENT Represents an NBT 32-bit integer. FIELD field_11525 value I - FIELD field_21037 READER Lnet/minecraft/class_4614; + FIELD field_21037 TYPE Lnet/minecraft/class_4614; METHOD (I)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/IntArrayTag.mapping b/mappings/net/minecraft/nbt/NbtIntArray.mapping similarity index 61% rename from mappings/net/minecraft/nbt/IntArrayTag.mapping rename to mappings/net/minecraft/nbt/NbtIntArray.mapping index 76486191ed..a0acc5e23f 100644 --- a/mappings/net/minecraft/nbt/IntArrayTag.mapping +++ b/mappings/net/minecraft/nbt/NbtIntArray.mapping @@ -1,6 +1,7 @@ -CLASS net/minecraft/class_2495 net/minecraft/nbt/IntArrayTag +CLASS net/minecraft/class_2495 net/minecraft/nbt/NbtIntArray + COMMENT Represents an NBT 32-bit integer array. FIELD field_11524 value [I - FIELD field_21036 READER Lnet/minecraft/class_4614; + FIELD field_21036 TYPE Lnet/minecraft/class_4614; METHOD (Ljava/util/List;)V ARG 1 value METHOD ([I)V diff --git a/mappings/net/minecraft/nbt/NbtIo.mapping b/mappings/net/minecraft/nbt/NbtIo.mapping index 9adfe0a5ad..d9fc8dcdaf 100644 --- a/mappings/net/minecraft/nbt/NbtIo.mapping +++ b/mappings/net/minecraft/nbt/NbtIo.mapping @@ -9,23 +9,23 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo METHOD method_10627 read (Ljava/io/DataInput;)Lnet/minecraft/class_2487; ARG 0 input METHOD method_10628 write (Lnet/minecraft/class_2487;Ljava/io/DataOutput;)V - ARG 0 tag + ARG 0 compound ARG 1 output METHOD method_10629 readCompressed (Ljava/io/InputStream;)Lnet/minecraft/class_2487; ARG 0 stream METHOD method_10630 write (Lnet/minecraft/class_2487;Ljava/io/File;)V - ARG 0 tag + ARG 0 compound ARG 1 file METHOD method_10631 write (Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V - ARG 0 tag + ARG 0 element ARG 1 output METHOD method_10633 read (Ljava/io/File;)Lnet/minecraft/class_2487; ARG 0 file METHOD method_10634 writeCompressed (Lnet/minecraft/class_2487;Ljava/io/OutputStream;)V - ARG 0 tag + ARG 0 compound ARG 1 stream METHOD method_30613 readCompressed (Ljava/io/File;)Lnet/minecraft/class_2487; ARG 0 file METHOD method_30614 writeCompressed (Lnet/minecraft/class_2487;Ljava/io/File;)V - ARG 0 tag + ARG 0 compound ARG 1 file diff --git a/mappings/net/minecraft/nbt/ListTag.mapping b/mappings/net/minecraft/nbt/NbtList.mapping similarity index 61% rename from mappings/net/minecraft/nbt/ListTag.mapping rename to mappings/net/minecraft/nbt/NbtList.mapping index 2510094788..5639989b48 100644 --- a/mappings/net/minecraft/nbt/ListTag.mapping +++ b/mappings/net/minecraft/nbt/NbtList.mapping @@ -1,7 +1,12 @@ -CLASS net/minecraft/class_2499 net/minecraft/nbt/ListTag +CLASS net/minecraft/class_2499 net/minecraft/nbt/NbtList + COMMENT Represents an NBT list. + COMMENT

+ COMMENT An NBT list holds values of the same {@linkplain NbtElement#getType NBT type}. + COMMENT The {@linkplain AbstractNbtList#getHeldType NBT type} of an NBT list is determined + COMMENT once its first element is inserted; empty NBT lists return {@code 0} as their held {@linkplain AbstractNbtList#getHeldType NBT type}. FIELD field_11550 value Ljava/util/List; FIELD field_11551 type B - FIELD field_21039 READER Lnet/minecraft/class_4614; + FIELD field_21039 TYPE Lnet/minecraft/class_4614; FIELD field_21461 NBT_NUMBER_TYPES Lit/unimi/dsi/fastutil/bytes/ByteSet; METHOD (Ljava/util/List;B)V ARG 1 list @@ -9,6 +14,7 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/ListTag METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_10600 getInt (I)I + ARG 1 index METHOD method_10602 getCompound (I)Lnet/minecraft/class_2487; ARG 1 index METHOD method_10603 getList (I)Lnet/minecraft/class_2499; @@ -16,7 +22,7 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/ListTag METHOD method_10604 getFloat (I)F ARG 1 index METHOD method_10605 canAdd (Lnet/minecraft/class_2520;)Z - ARG 1 tag + ARG 1 element METHOD method_10608 getString (I)Ljava/lang/String; ARG 1 index METHOD method_10609 getShort (I)S diff --git a/mappings/net/minecraft/nbt/LongTag.mapping b/mappings/net/minecraft/nbt/NbtLong.mapping similarity index 62% rename from mappings/net/minecraft/nbt/LongTag.mapping rename to mappings/net/minecraft/nbt/NbtLong.mapping index 230e29be19..4ed4ce4205 100644 --- a/mappings/net/minecraft/nbt/LongTag.mapping +++ b/mappings/net/minecraft/nbt/NbtLong.mapping @@ -1,6 +1,7 @@ -CLASS net/minecraft/class_2503 net/minecraft/nbt/LongTag +CLASS net/minecraft/class_2503 net/minecraft/nbt/NbtLong + COMMENT Represents an NBT 64-bit integer. FIELD field_11553 value J - FIELD field_21041 READER Lnet/minecraft/class_4614; + FIELD field_21041 TYPE Lnet/minecraft/class_4614; METHOD (J)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/LongArrayTag.mapping b/mappings/net/minecraft/nbt/NbtLongArray.mapping similarity index 67% rename from mappings/net/minecraft/nbt/LongArrayTag.mapping rename to mappings/net/minecraft/nbt/NbtLongArray.mapping index bb075df2de..9950ce6250 100644 --- a/mappings/net/minecraft/nbt/LongArrayTag.mapping +++ b/mappings/net/minecraft/nbt/NbtLongArray.mapping @@ -1,6 +1,7 @@ -CLASS net/minecraft/class_2501 net/minecraft/nbt/LongArrayTag +CLASS net/minecraft/class_2501 net/minecraft/nbt/NbtLongArray + COMMENT Represents an NBT 64-bit integer array. FIELD field_11552 value [J - FIELD field_21040 READER Lnet/minecraft/class_4614; + FIELD field_21040 TYPE Lnet/minecraft/class_4614; METHOD (Lit/unimi/dsi/fastutil/longs/LongSet;)V ARG 1 value METHOD (Ljava/util/List;)V diff --git a/mappings/net/minecraft/nbt/NbtNull.mapping b/mappings/net/minecraft/nbt/NbtNull.mapping new file mode 100644 index 0000000000..b03ca371f7 --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtNull.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_2491 net/minecraft/nbt/NbtNull + COMMENT Represents the NBT null value. + COMMENT Defines the end of an NBT compound object, + COMMENT represents nonexistent values in an NBT compound object, + COMMENT and is the type of empty NBT lists. + FIELD field_21032 TYPE Lnet/minecraft/class_4614; + FIELD field_21033 INSTANCE Lnet/minecraft/class_2491; diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping index acaaf9b262..5b7ac24b49 100644 --- a/mappings/net/minecraft/nbt/NbtOps.mapping +++ b/mappings/net/minecraft/nbt/NbtOps.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps COMMENT they will be transported in packets as NBT. DataFixerUpper allows COMMENT generalizing the dimension serialization logic to prevent duplicate code, COMMENT where the NBT ops allow the DataFixerUpper dimension serialization logic - COMMENT to interact with Minecraft NBTs.

+ COMMENT to interact with Minecraft NBTs. COMMENT COMMENT @see NbtOps#INSTANCE FIELD field_11560 INSTANCE Lnet/minecraft/class_2509; @@ -17,5 +17,5 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps COMMENT

This ops does not compress maps (replace field name to value pairs COMMENT with an ordered list of values in serialization). In fact, since COMMENT Minecraft NBT lists can only contain elements of the same type, this op - COMMENT cannot compress maps.

+ COMMENT cannot compress maps. CLASS class_5320 MapBuilder diff --git a/mappings/net/minecraft/nbt/ShortTag.mapping b/mappings/net/minecraft/nbt/NbtShort.mapping similarity index 62% rename from mappings/net/minecraft/nbt/ShortTag.mapping rename to mappings/net/minecraft/nbt/NbtShort.mapping index eb3a2224d3..61a2979ef2 100644 --- a/mappings/net/minecraft/nbt/ShortTag.mapping +++ b/mappings/net/minecraft/nbt/NbtShort.mapping @@ -1,6 +1,7 @@ -CLASS net/minecraft/class_2516 net/minecraft/nbt/ShortTag +CLASS net/minecraft/class_2516 net/minecraft/nbt/NbtShort + COMMENT Represents an NBT 16-bit integer. FIELD field_11588 value S - FIELD field_21043 READER Lnet/minecraft/class_4614; + FIELD field_21043 TYPE Lnet/minecraft/class_4614; METHOD (S)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/StringTag.mapping b/mappings/net/minecraft/nbt/NbtString.mapping similarity index 71% rename from mappings/net/minecraft/nbt/StringTag.mapping rename to mappings/net/minecraft/nbt/NbtString.mapping index c02cc7c195..28084e7646 100644 --- a/mappings/net/minecraft/nbt/StringTag.mapping +++ b/mappings/net/minecraft/nbt/NbtString.mapping @@ -1,6 +1,7 @@ -CLASS net/minecraft/class_2519 net/minecraft/nbt/StringTag +CLASS net/minecraft/class_2519 net/minecraft/nbt/NbtString + COMMENT Represents an NBT string. FIELD field_11590 value Ljava/lang/String; - FIELD field_21045 READER Lnet/minecraft/class_4614; + FIELD field_21045 TYPE Lnet/minecraft/class_4614; FIELD field_21046 EMPTY Lnet/minecraft/class_2519; METHOD (Ljava/lang/String;)V ARG 1 value diff --git a/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping b/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping new file mode 100644 index 0000000000..e7c75f8a73 --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_2505 net/minecraft/nbt/NbtTagSizeTracker + FIELD field_11555 allocatedBytes J + FIELD field_11556 EMPTY Lnet/minecraft/class_2505; + FIELD field_11557 maxBytes J + METHOD (J)V + ARG 1 maxBytes + METHOD method_10623 add (J)V + ARG 1 bits diff --git a/mappings/net/minecraft/nbt/TagReader.mapping b/mappings/net/minecraft/nbt/NbtType.mapping similarity index 50% rename from mappings/net/minecraft/nbt/TagReader.mapping rename to mappings/net/minecraft/nbt/NbtType.mapping index dd2ba13989..49d485bb37 100644 --- a/mappings/net/minecraft/nbt/TagReader.mapping +++ b/mappings/net/minecraft/nbt/NbtType.mapping @@ -1,4 +1,5 @@ -CLASS net/minecraft/class_4614 net/minecraft/nbt/TagReader +CLASS net/minecraft/class_4614 net/minecraft/nbt/NbtType + COMMENT Represents an NBT type. METHOD method_23259 getCrashReportName ()Ljava/lang/String; METHOD method_23260 createInvalid (I)Lnet/minecraft/class_4614; ARG 0 type @@ -8,3 +9,9 @@ CLASS net/minecraft/class_4614 net/minecraft/nbt/TagReader ARG 2 depth ARG 3 tracker METHOD method_23263 isImmutable ()Z + COMMENT Determines the immutability of this type. + COMMENT

+ COMMENT The mutability of an NBT type means the held value can be modified + COMMENT after the NBT element is instantiated. + COMMENT + COMMENT @return {@code true} if this NBT type is immutable, else {@code false} diff --git a/mappings/net/minecraft/nbt/NbtTypes.mapping b/mappings/net/minecraft/nbt/NbtTypes.mapping new file mode 100644 index 0000000000..7d855d3ee1 --- /dev/null +++ b/mappings/net/minecraft/nbt/NbtTypes.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_4615 net/minecraft/nbt/NbtTypes + FIELD field_21048 VALUES [Lnet/minecraft/class_4614; + METHOD method_23265 byId (I)Lnet/minecraft/class_4614; + COMMENT Gets the associated {@linkplain NbtType NBT type} for a given {@code id}. + COMMENT

+ COMMENT This method does not support id aliases. + COMMENT + COMMENT @return the NBT type, or {@linkplain NbtType#createInvalid an invalid type} if there is no type with the given {@code id} + ARG 0 id diff --git a/mappings/net/minecraft/nbt/PositionTracker.mapping b/mappings/net/minecraft/nbt/PositionTracker.mapping deleted file mode 100644 index ea6a0e8c53..0000000000 --- a/mappings/net/minecraft/nbt/PositionTracker.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_2505 net/minecraft/nbt/PositionTracker - FIELD field_11555 pos J - FIELD field_11556 DEFAULT Lnet/minecraft/class_2505; - FIELD field_11557 max J - METHOD (J)V - ARG 1 max - METHOD method_10623 add (J)V - ARG 1 bits diff --git a/mappings/net/minecraft/nbt/StringNbtReader.mapping b/mappings/net/minecraft/nbt/StringNbtReader.mapping index 640e8ab448..56875bce47 100644 --- a/mappings/net/minecraft/nbt/StringNbtReader.mapping +++ b/mappings/net/minecraft/nbt/StringNbtReader.mapping @@ -16,19 +16,19 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader METHOD (Lcom/mojang/brigadier/StringReader;)V ARG 1 reader METHOD method_10716 readComma ()Z - METHOD method_10717 parseTagArray ()Lnet/minecraft/class_2520; + METHOD method_10717 parseArray ()Lnet/minecraft/class_2520; METHOD method_10718 parse (Ljava/lang/String;)Lnet/minecraft/class_2487; ARG 0 string METHOD method_10719 expect (C)V - METHOD method_10721 readCompoundTag ()Lnet/minecraft/class_2487; - METHOD method_10722 parseTagPrimitive ()Lnet/minecraft/class_2520; - METHOD method_10723 parseTag ()Lnet/minecraft/class_2520; + METHOD method_10721 readCompound ()Lnet/minecraft/class_2487; + METHOD method_10722 parseElementPrimitive ()Lnet/minecraft/class_2520; + METHOD method_10723 parseElement ()Lnet/minecraft/class_2520; METHOD method_10725 readString ()Ljava/lang/String; - METHOD method_10726 parseTagPrimitiveArray ()Lnet/minecraft/class_2520; - METHOD method_10727 parseCompoundTag ()Lnet/minecraft/class_2487; + METHOD method_10726 parseElementPrimitiveArray ()Lnet/minecraft/class_2520; + METHOD method_10727 parseCompound ()Lnet/minecraft/class_2487; METHOD method_10728 readArray (Lnet/minecraft/class_4614;Lnet/minecraft/class_4614;)Ljava/util/List; ARG 1 arrayTypeReader ARG 2 typeReader - METHOD method_10729 parseListTag ()Lnet/minecraft/class_2520; + METHOD method_10729 parseList ()Lnet/minecraft/class_2520; METHOD method_10731 parsePrimitive (Ljava/lang/String;)Lnet/minecraft/class_2520; ARG 1 input diff --git a/mappings/net/minecraft/nbt/TagReaders.mapping b/mappings/net/minecraft/nbt/TagReaders.mapping deleted file mode 100644 index b880d3d7ed..0000000000 --- a/mappings/net/minecraft/nbt/TagReaders.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_4615 net/minecraft/nbt/TagReaders - FIELD field_21048 VALUES [Lnet/minecraft/class_4614; - METHOD method_23265 of (I)Lnet/minecraft/class_4614; - ARG 0 type diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index 84125fa5ec..e62b9a58e0 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -1,23 +1,28 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection - FIELD field_11639 MARKER_NETWORK_PACKETS Lorg/apache/logging/log4j/Marker; + COMMENT A connection backed by a netty channel. It can be one to a client on the + COMMENT server or one to a server on a client. + FIELD field_11639 NETWORK_PACKETS_MARKER Lorg/apache/logging/log4j/Marker; FIELD field_11640 errored Z - FIELD field_11641 MARKER_NETWORK Lorg/apache/logging/log4j/Marker; + FIELD field_11641 NETWORK_MARKER Lorg/apache/logging/log4j/Marker; FIELD field_11642 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_11643 side Lnet/minecraft/class_2598; + COMMENT The side this connection is to. FIELD field_11644 packetQueue Ljava/util/Queue; FIELD field_11645 address Ljava/net/SocketAddress; FIELD field_11646 disconnected Z FIELD field_11647 encrypted Z - FIELD field_11648 ATTR_KEY_PROTOCOL Lio/netty/util/AttributeKey; - FIELD field_11649 CLIENT_IO_GROUP_LOCAL Lnet/minecraft/class_3528; + FIELD field_11648 PROTOCOL_ATTRIBUTE_KEY Lio/netty/util/AttributeKey; + COMMENT The attribute key for the current network state of the backing netty + COMMENT channel. + FIELD field_11649 LOCAL_CLIENT_IO_GROUP Lnet/minecraft/class_3528; FIELD field_11650 CLIENT_IO_GROUP Lnet/minecraft/class_3528; FIELD field_11651 channel Lio/netty/channel/Channel; FIELD field_11652 packetListener Lnet/minecraft/class_2547; - FIELD field_11653 avgPacketsSent F - FIELD field_11654 avgPacketsReceived F + FIELD field_11653 averagePacketsSent F + FIELD field_11654 averagePacketsReceived F FIELD field_11655 ticks I FIELD field_11656 packetsSentCounter I - FIELD field_11657 CLIENT_IO_GROUP_EPOLL Lnet/minecraft/class_3528; + FIELD field_11657 EPOLL_CLIENT_IO_GROUP Lnet/minecraft/class_3528; FIELD field_11658 packetsReceivedCounter I FIELD field_11660 disconnectReason Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2598;)V @@ -27,6 +32,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_10744 getPacketListener ()Lnet/minecraft/class_2547; METHOD method_10745 getAveragePacketsSent ()F METHOD method_10746 setupEncryption (Ljavax/crypto/Cipher;Ljavax/crypto/Cipher;)V + ARG 1 decryptionCipher + ARG 2 encryptionCipher METHOD method_10747 disconnect (Lnet/minecraft/class_2561;)V ARG 1 disconnectReason METHOD method_10748 getDisconnectReason ()Lnet/minecraft/class_2561; @@ -52,6 +59,11 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 1 compressionThreshold METHOD method_10762 getAveragePacketsReceived ()F METHOD method_10763 setPacketListener (Lnet/minecraft/class_2547;)V + COMMENT Sets the packet listener that will handle oncoming packets, including + COMMENT ones that are not yet handled by the current packet listener. + COMMENT + COMMENT @apiNote This may be called from the {@linkplain #packetListener} stored + COMMENT in this connection. ARG 1 listener METHOD method_10764 sendImmediately (Lnet/minecraft/class_2596;Lio/netty/util/concurrent/GenericFutureListener;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/OffThreadException.mapping b/mappings/net/minecraft/network/OffThreadException.mapping index eefeb3dd35..2215041de9 100644 --- a/mappings/net/minecraft/network/OffThreadException.mapping +++ b/mappings/net/minecraft/network/OffThreadException.mapping @@ -1,2 +1,11 @@ CLASS net/minecraft/class_2987 net/minecraft/network/OffThreadException + COMMENT An exception thrown on netty's event loop to quit handling of one packet, + COMMENT usually as it is scheduled to be handled on the game engine thread. + COMMENT + COMMENT

This is a {@linkplain #INSTANCE singleton}. It ignores stack traces + COMMENT in order to be efficient. + COMMENT + COMMENT @see NetworkThreadUtils + COMMENT @see ClientConnection#channelRead0 FIELD field_13400 INSTANCE Lnet/minecraft/class_2987; + COMMENT The singleton instance, to reduce object allocations. diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 57f571c194..2246c94a96 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -1,43 +1,469 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf + COMMENT A packet byte buf is a specialized byte buf with utility methods adapted + COMMENT to Minecraft's protocol. It has serialization and deserialization of + COMMENT custom objects. + COMMENT + COMMENT

+ COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT
Custom object handling
Object Type read method write method
Codec-based{@link #decode(Codec)}{@link #encode(Codec, Object)}
{@code byte[]}{@link #readByteArray()}{@link #writeByteArray(byte[])}
{@code int[]}{@link #readIntArray()}{@link #writeIntArray(int[])}
{@code long[]}{@link #readLongArray(long[])}{@link #writeLongArray(long[])}
{@link BlockPos}{@link #readBlockPos()}{@link #writeBlockPos(BlockPos)}
{@link ChunkSectionPos}{@link #readChunkSectionPos()}No write method is available
{@link Text}{@link #readText()}{@link #writeText(Text)}
{@link Enum}{@link #readEnumConstant(Class)}{@link #writeEnumConstant(Enum)}
{@index VarInt}{@link #readVarInt()}{@link #writeVarInt(int)}
{@index VarLong}{@link #readVarLong()}{@link #writeVarLong(long)}
{@link UUID}{@link #readUuid()}{@link #writeUuid(UUID)}
{@link NbtCompound}{@link #readNbt()}{@link #writeNbt(NbtCompound)}
{@link ItemStack}{@link #readItemStack()}{@link #writeItemStack(ItemStack)}
{@link String}{@link #readString()}{@link #writeString(String)}
{@link Identifier}{@link #readIdentifier()}{@link #writeIdentifier(Identifier)}
{@link Date}{@link #readDate()}{@link #writeDate(Date)}
{@link BlockHitResult}{@link #readBlockHitResult()}{@link #writeBlockHitResult(BlockHitResult)}
+ COMMENT + COMMENT

All {@code read} and {@code write} methods throw {@link + COMMENT IndexOutOfBoundsException} if there is not enough bytes to be read or + COMMENT not enough space to write. FIELD field_11695 parent Lio/netty/buffer/ByteBuf; METHOD method_10787 readIntArray ()[I + COMMENT Reads an array of primitive ints from this buf. The array first has a + COMMENT var int indicating its length, followed by the var int entries. The array + COMMENT does not have a length limit. + COMMENT + COMMENT @implNote An int array has the same format as a list of ints. + COMMENT + COMMENT @see #readIntArray(int) + COMMENT @see #writeIntArray(int[]) + COMMENT @return the read byte array METHOD method_10788 writeString (Ljava/lang/String;I)Lnet/minecraft/class_2540; + COMMENT Writes a string to this buf. A string is represented by a byte array of + COMMENT its UTF-8 data. That byte array can have a maximum length of + COMMENT {@code maxLength}. + COMMENT + COMMENT @return this buf, for chaining + COMMENT @throws io.netty.handler.codec.EncoderException if the byte array of the + COMMENT string to write is longer than {@code maxLength} + COMMENT @see #readString() + COMMENT @see #readString(int) + COMMENT @see #writeString(String) + ARG 1 string + COMMENT the string to write + ARG 2 maxLength + COMMENT the max length of the byte array METHOD method_10789 writeLongArray ([J)Lnet/minecraft/class_2540; + COMMENT Writes an array of primitive longs to this buf. The array first has a + COMMENT var int indicating its length, followed by the regular long (not var + COMMENT long) values. + COMMENT + COMMENT @see #readLongArray(long[]) + COMMENT @return this buf, for chaining + ARG 1 array + COMMENT the array to write METHOD method_10790 readUuid ()Ljava/util/UUID; + COMMENT Reads a UUID (universally unique identifier) from this buf. A UUID is + COMMENT represented by two regular longs. + COMMENT + COMMENT @return the read UUID + COMMENT @see #writeUuid(UUID) METHOD method_10791 writeVarLong (J)Lnet/minecraft/class_2540; + COMMENT Writes a single var long to this buf. + COMMENT + COMMENT

Compared to regular longs, var longs may use less bytes when + COMMENT representing smaller positive numbers. + COMMENT + COMMENT @return this buf, for chaining + COMMENT @see #readVarLong() + ARG 1 value + COMMENT the value to write METHOD method_10792 readVarLong ()J + COMMENT Reads a single var long from this buf. + COMMENT + COMMENT @return the value read + COMMENT @see #writeVarLong(long) METHOD method_10793 writeItemStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2540; - METHOD method_10794 writeCompoundTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2540; + COMMENT Writes an item stack to this buf. An item stack is represented by a + COMMENT boolean indicating whether it exists; if it exists, it is followed by + COMMENT a var int for its raw id, a byte for its count, and an NBT compound for + COMMENT its tag. + COMMENT + COMMENT @return this buf, for chaining + COMMENT @see #readItemStack() + ARG 1 stack + COMMENT the stack to write + METHOD method_10794 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2540; + COMMENT Writes an NBT compound to this buf. The binary representation of NBT is + COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If {@code compound} is {@code + COMMENT null}, it is treated as an NBT null. + COMMENT + COMMENT @return this buf, for chaining + COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be + COMMENT written + COMMENT @see #readNbt() + COMMENT @see #readUnlimitedNbt() + COMMENT @see #readNbt(NbtTagSizeTracker) + ARG 1 compound + COMMENT the compound to write METHOD method_10795 readByteArray ()[B + COMMENT Reads an array of primitive bytes from this buf. The array first has a + COMMENT var int indicating its length, followed by the actual bytes. The array + COMMENT does not have a length limit. + COMMENT + COMMENT @see #readByteArray(int) + COMMENT @see #writeByteArray(byte[]) + COMMENT @return the read byte array METHOD method_10796 writeDate (Ljava/util/Date;)Lnet/minecraft/class_2540; + COMMENT Writes a date to this buf. A date is represented by its time, a regular + COMMENT long. + COMMENT + COMMENT @return this buf, for chaining + COMMENT @see #readDate() + ARG 1 date + COMMENT the date to write METHOD method_10797 writeUuid (Ljava/util/UUID;)Lnet/minecraft/class_2540; - METHOD method_10798 readCompoundTag ()Lnet/minecraft/class_2487; + COMMENT Writes a UUID (universally unique identifier) to this buf. A UUID is + COMMENT represented by two regular longs. + COMMENT + COMMENT @return this buf, for chaining + COMMENT @see #readUuid() + ARG 1 uuid + COMMENT the UUID to write + METHOD method_10798 readNbt ()Lnet/minecraft/class_2487; + COMMENT Reads an NBT compound from this buf. The binary representation of NBT is + COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If an NBT null is encountered, + COMMENT this method returns {@code null}. The compound can have a maximum size of + COMMENT {@code 2097152} bytes. + COMMENT + COMMENT @return the read compound, may be {@code null} + COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read + COMMENT @throws RuntimeException if the compound exceeds the allowed maximum size + COMMENT @see #writeNbt(NbtCompound) + COMMENT @see #readUnlimitedNbt() + COMMENT @see #readNbt(NbtTagSizeTracker) METHOD method_10799 readIntArray (I)[I + COMMENT Reads an array of primitive ints from this buf. The array first has a + COMMENT var int indicating its length, followed by the var int entries. The array + COMMENT has a length limit given by {@code maxSize}. + COMMENT + COMMENT @implNote An int array has the same format as a list of ints. + COMMENT + COMMENT @see #readIntArray() + COMMENT @see #writeIntArray(int[]) + COMMENT @return the read byte array + COMMENT @throws io.netty.handler.codec.DecoderException if the read array has a + COMMENT length over {@code maxSize} + ARG 1 maxSize + COMMENT the max length of the read array METHOD method_10800 readString (I)Ljava/lang/String; + COMMENT Reads a string from this buf. A string is represented by a byte array of + COMMENT its UTF-8 data. The string can have a maximum length of {@code maxLength}. + COMMENT + COMMENT @return the string read + COMMENT @throws io.netty.handler.codec.DecoderException if the string read + COMMENT is longer than {@code maxLength} + COMMENT @see #readString() + COMMENT @see #writeString(String) + COMMENT @see #writeString(String, int) + ARG 1 maxLength + COMMENT the maximum length of the string read METHOD method_10801 readLongArray ([J)[J - METHOD method_10802 readDate ()Ljava/util/Date; - METHOD method_10803 readByteArray (I)[B - METHOD method_10804 writeVarInt (I)Lnet/minecraft/class_2540; - METHOD method_10805 writeText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2540; - ARG 1 text - METHOD method_10806 writeIntArray ([I)Lnet/minecraft/class_2540; - METHOD method_10807 writeBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2540; - METHOD method_10808 readText ()Lnet/minecraft/class_2561; - METHOD method_10809 readLongArray ([JI)[J + COMMENT Reads an array of primitive longs from this buf. The array first has a + COMMENT var int indicating its length, followed by the regular long (not var + COMMENT long) values. The array does not have a length limit. + COMMENT + COMMENT

Only when {@code toArray} is not {@code null} and {@code + COMMENT toArray.length} equals to the length var int read will the {@code + COMMENT toArray} be reused and returned; otherwise, a new array + COMMENT of proper size is created. + COMMENT + COMMENT @see #writeLongArray(long[]) + COMMENT @see #readLongArray(long[], int) + COMMENT @return the read long array ARG 1 toArray + COMMENT the array to reuse + METHOD method_10802 readDate ()Ljava/util/Date; + COMMENT Reads a date from this buf. A date is represented by its time, a regular + COMMENT long. + COMMENT + COMMENT @return the read date + COMMENT @see #writeDate(Date) + METHOD method_10803 readByteArray (I)[B + COMMENT Reads an array of primitive bytes from this buf. The array first has a + COMMENT var int indicating its length, followed by the actual bytes. The array + COMMENT has a length limit given by {@code maxSize}. + COMMENT + COMMENT @see #readByteArray() + COMMENT @see #writeByteArray(byte[]) + COMMENT @return the read byte array + COMMENT @throws io.netty.handler.codec.DecoderException if the read array has a + COMMENT length over {@code maxSize} + ARG 1 maxSize + COMMENT the max length of the read array + METHOD method_10804 writeVarInt (I)Lnet/minecraft/class_2540; + COMMENT Writes a single var int to this buf. + COMMENT + COMMENT

Compared to regular ints, var ints may use less bytes (ranging from 1 + COMMENT to 5, where regular ints use 4) when representing smaller positive + COMMENT numbers. + COMMENT + COMMENT @return this buf, for chaining + COMMENT @see #readVarInt() + COMMENT @see #getVarIntLength(int) + ARG 1 value + COMMENT the value to write + METHOD method_10805 writeText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2540; + COMMENT Writes a text to this buf. A text is represented by a JSON string with + COMMENT max length {@code 262144}. + COMMENT + COMMENT @return this buf, for chaining + COMMENT @throws io.netty.handler.codec.EncoderException if the JSON string + COMMENT written exceeds {@code 262144} in length + COMMENT @see #readText() + ARG 1 text + COMMENT the text to write + METHOD method_10806 writeIntArray ([I)Lnet/minecraft/class_2540; + COMMENT Writes an array of primitive ints to this buf. The array first has a + COMMENT var int indicating its length, followed by the var int entries. + COMMENT + COMMENT @implNote An int array has the same format as a list of ints. + COMMENT + COMMENT @see #readIntArray(int) + COMMENT @see #writeIntArray(int[]) + COMMENT @return this buf, for chaining + ARG 1 array + COMMENT the array to write + METHOD method_10807 writeBlockPos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2540; + COMMENT Writes a block position to this buf. A block position is represented by + COMMENT a regular long. + COMMENT + COMMENT @return this buf, for chaining + COMMENT @see #readBlockPos() + ARG 1 pos + COMMENT the pos to write + METHOD method_10808 readText ()Lnet/minecraft/class_2561; + COMMENT Reads a text from this buf. A text is represented by a JSON string with + COMMENT max length {@code 262144}. + COMMENT + COMMENT @return the read text + COMMENT @throws io.netty.handler.codec.DecoderException if the JSON string read + COMMENT exceeds {@code 262144} in length + COMMENT @see #writeText(Text) + METHOD method_10809 readLongArray ([JI)[J + COMMENT Reads an array of primitive longs from this buf. The array first has a + COMMENT var int indicating its length, followed by the regular long (not var + COMMENT long) values. The array has a length limit of {@code maxSize}. + COMMENT + COMMENT

Only when {@code toArray} is not {@code null} and {@code + COMMENT toArray.length} equals to the length var int read will the {@code + COMMENT toArray} be reused and returned; otherwise, a new array + COMMENT of proper size is created. + COMMENT + COMMENT @see #writeLongArray(long[]) + COMMENT @see #readLongArray(long[]) + COMMENT @return the read long array + COMMENT @throws io.netty.handler.codec.DecoderException if the read array has a + COMMENT length over {@code maxSize} + ARG 1 toArray + COMMENT the array to reuse + ARG 2 maxSize + COMMENT the max length of the read array METHOD method_10810 readIdentifier ()Lnet/minecraft/class_2960; + COMMENT Reads an identifier from this buf. An identifier is represented by its + COMMENT string form. The read identifier's string form can have a max length of + COMMENT {@code 32767}. + COMMENT + COMMENT @return the read identifier + COMMENT @throws io.netty.handler.codec.DecoderException if the identifier's + COMMENT string form is longer than {@code 32767} + COMMENT @see #writeIdentifier(Identifier) METHOD method_10811 readBlockPos ()Lnet/minecraft/class_2338; + COMMENT Reads a block position from this buf. A block position is represented by + COMMENT a regular long. + COMMENT + COMMENT @return the read block pos + COMMENT @see #writeBlockPos(BlockPos) METHOD method_10812 writeIdentifier (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2540; + COMMENT Writes an identifier to this buf. An identifier is represented by its + COMMENT string form. The written identifier's byte array can have a max length of + COMMENT {@code 32767}. + COMMENT + COMMENT @return the read identifier + COMMENT @throws io.netty.handler.codec.EncoderException if the {@code id}'s + COMMENT byte array is longer than {@code 32767} + COMMENT @see #readIdentifier() + ARG 1 id + COMMENT the identifier to write METHOD method_10813 writeByteArray ([B)Lnet/minecraft/class_2540; + COMMENT Writes an array of primitive bytes to this buf. The array first has a + COMMENT var int indicating its length, followed by the actual bytes. + COMMENT + COMMENT @see #readByteArray() + COMMENT @return this buf, for chaining + ARG 1 array + COMMENT the array to write METHOD method_10814 writeString (Ljava/lang/String;)Lnet/minecraft/class_2540; - METHOD method_10815 getVarIntSizeBytes (I)I + COMMENT Writes a string to this buf. A string is represented by a byte array of + COMMENT its UTF-8 data. That byte array can have a maximum length of + COMMENT {@code 32767}. + COMMENT + COMMENT @return this buf, for chaining + COMMENT @throws io.netty.handler.codec.EncoderException if the byte array of the + COMMENT string to write is longer than {@code 32767} + COMMENT @see #readString() + COMMENT @see #readString(int) + COMMENT @see #writeString(String, int) + ARG 1 string + COMMENT the string to write + METHOD method_10815 getVarIntLength (I)I + COMMENT Returns the number of bytes needed to encode {@code value} as a + COMMENT {@linkplain #writeVarInt(int) var int}. Guaranteed to be between {@code + COMMENT 1} and {@code 5}. + COMMENT + COMMENT @return the number of bytes a var int {@code value} uses + ARG 0 value + COMMENT the value to encode METHOD method_10816 readVarInt ()I + COMMENT Reads a single var int from this buf. + COMMENT + COMMENT @return the value read + COMMENT @see #writeVarInt(int) METHOD method_10817 writeEnumConstant (Ljava/lang/Enum;)Lnet/minecraft/class_2540; + COMMENT Writes an enum constant to this buf. An enum constant is represented + COMMENT by a var int indicating its ordinal. + COMMENT + COMMENT @return this buf, for chaining + COMMENT @see #readEnumConstant(Class) + ARG 1 instance + COMMENT the enum constant to write METHOD method_10818 readEnumConstant (Ljava/lang/Class;)Ljava/lang/Enum; + COMMENT Reads an enum constant from this buf. An enum constant is represented + COMMENT by a var int indicating its ordinal. + COMMENT + COMMENT @return the read enum constant + COMMENT @see #writeEnumConstant(Enum) + ARG 1 enumClass + COMMENT the enum class, for constant lookup METHOD method_10819 readItemStack ()Lnet/minecraft/class_1799; + COMMENT Reads an item stack from this buf. An item stack is represented by a + COMMENT boolean indicating whether it exists; if it exists, it is followed by + COMMENT a var int for its raw id, a byte for its count, and an NBT compound for + COMMENT its tag. + COMMENT + COMMENT @return the read item stack + COMMENT @see #writeItemStack(ItemStack) METHOD method_17813 writeBlockHitResult (Lnet/minecraft/class_3965;)V + COMMENT Writes a block hit result to this buf. A block hit result is represented + COMMENT by a block position, a direction enum constant, 3 floats for the hit + COMMENT offset position, and a boolean for whether the hit was inside a block. + COMMENT + COMMENT @see #readBlockHitResult() + ARG 1 hitResult + COMMENT the block hit result to write METHOD method_17814 readBlockHitResult ()Lnet/minecraft/class_3965; + COMMENT Reads a block hit result from this buf. A block hit result is represented + COMMENT by a block position, a direction enum constant, 3 floats for the hit + COMMENT offset position, and a boolean for whether the hit was inside a block. + COMMENT + COMMENT @return the read block hit result + COMMENT @see #writeBlockHitResult(BlockHitResult) METHOD method_19456 readChunkSectionPos ()Lnet/minecraft/class_4076; + COMMENT Reads a chunk section position from this buf. A chunk section position is + COMMENT represented by a regular long. + COMMENT + COMMENT @return the read chunk section pos METHOD method_19772 readString ()Ljava/lang/String; + COMMENT Reads a string from this buf. A string is represented by a byte array of + COMMENT its UTF-8 data. The string can have a maximum length of {@code 32767}. + COMMENT + COMMENT @return the string read + COMMENT @throws io.netty.handler.codec.DecoderException if the string read + COMMENT exceeds the maximum length + COMMENT @see #readString(int) + COMMENT @see #writeString(String) + COMMENT @see #writeString(String, int) METHOD method_29171 decode (Lcom/mojang/serialization/Codec;)Ljava/lang/Object; + COMMENT Reads an object from this buf as a compound NBT with the given codec. + COMMENT + COMMENT @param the decoded object's type + COMMENT @return the read object + COMMENT @throws io.netty.handler.codec.EncoderException if the {@code codec} fails + COMMENT to decode the compound NBT + COMMENT @see #encode(Codec, Object) + ARG 1 codec + COMMENT the codec to decode the object METHOD method_29172 encode (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)V + COMMENT Writes an object to this buf as a compound NBT with the given codec. + COMMENT + COMMENT @param the encoded object's type + COMMENT @throws io.netty.handler.codec.EncoderException if the {@code codec} fails + COMMENT to encode the compound NBT + COMMENT @see #decode(Codec) + ARG 1 codec + COMMENT the codec to encode the object + ARG 2 object + COMMENT the object to write to this buf + METHOD method_30616 readNbt (Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; + COMMENT Reads an NBT compound from this buf. The binary representation of NBT is + COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If an NBT null is encountered, + COMMENT this method returns {@code null}. The compound can have a maximum size + COMMENT controlled by the {@code sizeTracker}. + COMMENT + COMMENT @return the read compound, may be {@code null} + COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read + COMMENT @throws RuntimeException if the compound exceeds the allowed maximum size + COMMENT @see #writeNbt(NbtCompound) + COMMENT @see #readNbt() + COMMENT @see #readUnlimitedNbt() + ARG 1 sizeTracker + METHOD method_30617 readUnlimitedNbt ()Lnet/minecraft/class_2487; + COMMENT Reads an NBT compound from this buf. The binary representation of NBT is + COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If an NBT null is encountered, + COMMENT this method returns {@code null}. The compound does not have a size limit. + COMMENT + COMMENT @apiNote Since this version does not have a size limit, it may be + COMMENT vulnerable to malicious NBT spam attacks. + COMMENT + COMMENT @return the read compound, may be {@code null} + COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read + COMMENT @see #writeNbt(NbtCompound) + COMMENT @see #readNbt() + COMMENT @see #readNbt(NbtTagSizeTracker) diff --git a/mappings/net/minecraft/network/RateLimitedConnection.mapping b/mappings/net/minecraft/network/RateLimitedConnection.mapping index 761e89bcb3..78f2e987a2 100644 --- a/mappings/net/minecraft/network/RateLimitedConnection.mapping +++ b/mappings/net/minecraft/network/RateLimitedConnection.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_5472 net/minecraft/network/RateLimitedConnection + COMMENT A connection that disconnects from the backing netty channel if too + COMMENT many packets are received. FIELD field_26342 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_26343 RATE_LIMIT_EXCEEDED_MESSAGE Lnet/minecraft/class_2561; FIELD field_26344 rateLimit I diff --git a/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping b/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping similarity index 92% rename from mappings/net/minecraft/network/NetworkEncryptionUtils.mapping rename to mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping index 6d21ba32a8..2091e7bd70 100644 --- a/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping +++ b/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3515 net/minecraft/network/NetworkEncryptionUtils +CLASS net/minecraft/class_3515 net/minecraft/network/encryption/NetworkEncryptionUtils METHOD method_15234 decryptSecretKey (Ljava/security/PrivateKey;[B)Ljavax/crypto/SecretKey; ARG 0 privateKey ARG 1 encryptedSecretKey diff --git a/mappings/net/minecraft/network/encryption/PacketEncryptionManager.mapping b/mappings/net/minecraft/network/encryption/PacketEncryptionManager.mapping index a4e85d3b1f..27ef8b6a4d 100644 --- a/mappings/net/minecraft/network/encryption/PacketEncryptionManager.mapping +++ b/mappings/net/minecraft/network/encryption/PacketEncryptionManager.mapping @@ -3,7 +3,10 @@ CLASS net/minecraft/class_2524 net/minecraft/network/encryption/PacketEncryption FIELD field_11613 conversionBuffer [B FIELD field_11614 encryptionBuffer [B METHOD method_10732 encrypt (Lio/netty/buffer/ByteBuf;Lio/netty/buffer/ByteBuf;)V - ARG 1 buffer + ARG 1 buf + ARG 2 result METHOD method_10733 toByteArray (Lio/netty/buffer/ByteBuf;)[B + ARG 1 buf METHOD method_10734 decrypt (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;)Lio/netty/buffer/ByteBuf; ARG 1 context + ARG 2 buf diff --git a/mappings/net/minecraft/network/listener/PacketListener.mapping b/mappings/net/minecraft/network/listener/PacketListener.mapping index e950173f76..8c444bbad5 100644 --- a/mappings/net/minecraft/network/listener/PacketListener.mapping +++ b/mappings/net/minecraft/network/listener/PacketListener.mapping @@ -1,4 +1,18 @@ CLASS net/minecraft/class_2547 net/minecraft/network/listener/PacketListener + COMMENT A packet listener listens to packets on a {@linkplain ClientConnection + COMMENT connection}. + COMMENT + COMMENT

Its listener methods will be called on the netty event loop than the + COMMENT client or server game engine threads. METHOD method_10839 onDisconnected (Lnet/minecraft/class_2561;)V + COMMENT Called when the connection this listener listens to has disconnected. + COMMENT Can be used to display the disconnection reason. ARG 1 reason + COMMENT the reason of disconnection; may be a generic message METHOD method_2872 getConnection ()Lnet/minecraft/class_2535; + COMMENT Returns the connection this packet listener intends to listen to. + COMMENT + COMMENT @apiNote The returned connection may or may not have this listener as + COMMENT its current packet listener. + COMMENT + COMMENT @see ClientConnection#getPacketListener() diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping index fffcfb207c..cdeea7dbd9 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2SPacket FIELD field_12815 actionType Lnet/minecraft/class_1713; FIELD field_12816 stack Lnet/minecraft/class_1799; - FIELD field_12817 clickData I + FIELD field_12817 button I FIELD field_12818 slot I FIELD field_12819 syncId I FIELD field_12820 actionId S @@ -15,6 +15,6 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2 METHOD method_12189 getActionId ()S METHOD method_12190 getStack ()Lnet/minecraft/class_1799; METHOD method_12192 getSlot ()I - METHOD method_12193 getClickData ()I + METHOD method_12193 getButton ()I METHOD method_12194 getSyncId ()I METHOD method_12195 getActionType ()Lnet/minecraft/class_1713; diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping index feb3428d6a..d467a4ea6c 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateStructureBlockC2SPacket.mapping @@ -41,4 +41,4 @@ CLASS net/minecraft/class_2875 net/minecraft/network/packet/c2s/play/UpdateStruc METHOD method_12503 shouldShowAir ()Z METHOD method_12504 getMode ()Lnet/minecraft/class_2776; METHOD method_12505 shouldShowBoundingBox ()Z - METHOD method_12506 getIgnoreEntities ()Z + METHOD method_12506 shouldIgnoreEntities ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping index 5d4b1994da..4e4d38ec8c 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginHelloS2CPacket.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2905 net/minecraft/network/packet/s2c/login/LoginHello FIELD field_13211 publicKey [B METHOD (Ljava/lang/String;[B[B)V ARG 1 serverId + ARG 2 publicKey ARG 3 nonce METHOD method_12610 getServerId ()Ljava/lang/String; METHOD method_12611 getPublicKey ()Ljava/security/PublicKey; diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping index 05ec79bdb4..b0784513d6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_2622 net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket FIELD field_12038 blockEntityType I - FIELD field_12039 tag Lnet/minecraft/class_2487; + FIELD field_12039 nbt Lnet/minecraft/class_2487; FIELD field_12040 pos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_2338;ILnet/minecraft/class_2487;)V ARG 1 pos ARG 2 blockEntityType - ARG 3 tag - METHOD method_11290 getCompoundTag ()Lnet/minecraft/class_2487; + ARG 3 nbt + METHOD method_11290 getNbt ()Lnet/minecraft/class_2487; METHOD method_11291 getBlockEntityType ()I METHOD method_11293 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping index c7d165c0e0..89b07eb699 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping @@ -1,12 +1,16 @@ CLASS net/minecraft/class_2637 net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket FIELD field_26345 sectionPos Lnet/minecraft/class_4076; FIELD field_26346 positions [S - COMMENT The packed local positions {@see ChunkSectionPos#getPackedLocalPos} for each entry in {@see #blockStates}. + COMMENT The packed local positions for each entry in {@link #blockStates}. + COMMENT + COMMENT @see ChunkSectionPos#packLocal(BlockPos) FIELD field_26347 blockStates [Lnet/minecraft/class_2680; METHOD (Lnet/minecraft/class_4076;Lit/unimi/dsi/fastutil/shorts/ShortSet;Lnet/minecraft/class_2826;Z)V ARG 1 sectionPos COMMENT the position of the given chunk section that will be sent to the client + ARG 2 positions ARG 3 section + ARG 4 noLightingUpdates METHOD method_30620 allocateBuffers (I)V ARG 1 positionCount METHOD method_30621 visitUpdates (Ljava/util/function/BiConsumer;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping index 6aabc3dc9b..91be0c6ad9 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeS2CPacket.mapping @@ -3,9 +3,14 @@ CLASS net/minecraft/class_2641 net/minecraft/network/packet/s2c/play/CommandTree METHOD (Lcom/mojang/brigadier/tree/RootCommandNode;)V ARG 1 commandTree METHOD method_11401 writeNode (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/tree/CommandNode;Ljava/util/Map;)V + ARG 0 buf + ARG 1 node + ARG 2 nodeToIndex METHOD method_11402 readArgumentBuilder (Lnet/minecraft/class_2540;B)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 buf METHOD method_11403 getCommandTree ()Lcom/mojang/brigadier/tree/RootCommandNode; METHOD method_11405 readCommandNode (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2641$class_2642; + ARG 0 buf CLASS class_2642 CommandNodeData FIELD field_12124 flags B FIELD field_12125 childNodeIndices [I diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping index 2e3dd21c54..1ab7996793 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_2635 net/minecraft/network/packet/s2c/play/GameMessageS2CPacket FIELD field_12112 message Lnet/minecraft/class_2561; FIELD field_12113 location Lnet/minecraft/class_2556; - FIELD field_25133 senderUuid Ljava/util/UUID; + FIELD field_25133 sender Ljava/util/UUID; METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Ljava/util/UUID;)V ARG 1 message ARG 2 location - ARG 3 senderUuid + ARG 3 sender METHOD method_11387 isNonChat ()Z METHOD method_11388 getMessage ()Lnet/minecraft/class_2561; METHOD method_11389 getLocation ()Lnet/minecraft/class_2556; - METHOD method_29175 getSenderUuid ()Ljava/util/UUID; + METHOD method_29175 getSender ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping index 9a791c73a6..a899c93648 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LookAtS2CPacket.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2707 net/minecraft/network/packet/s2c/play/LookAtS2CPa FIELD field_12388 entityId I FIELD field_12389 targetAnchor Lnet/minecraft/class_2183$class_2184; METHOD (Lnet/minecraft/class_2183$class_2184;DDD)V + ARG 1 selfAnchor ARG 2 targetX ARG 4 targetY ARG 6 targetZ diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping index b7dbee8487..ff2ef522ff 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping @@ -21,4 +21,5 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2 ARG 9 width ARG 10 height METHOD method_11642 apply (Lnet/minecraft/class_22;)V + ARG 1 mapState METHOD method_11644 getId ()I diff --git a/mappings/net/minecraft/network/packet/s2c/play/TagQueryResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping similarity index 58% rename from mappings/net/minecraft/network/packet/s2c/play/TagQueryResponseS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping index 7805ff164d..804546beba 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TagQueryResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping @@ -1,8 +1,8 @@ -CLASS net/minecraft/class_2774 net/minecraft/network/packet/s2c/play/TagQueryResponseS2CPacket - FIELD field_12690 tag Lnet/minecraft/class_2487; +CLASS net/minecraft/class_2774 net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket + FIELD field_12690 nbt Lnet/minecraft/class_2487; FIELD field_12691 transactionId I METHOD (ILnet/minecraft/class_2487;)V ARG 1 transactionId - ARG 2 tag + ARG 2 nbt METHOD method_11910 getTransactionId ()I - METHOD method_11911 getTag ()Lnet/minecraft/class_2487; + METHOD method_11911 getNbt ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping index 7b30fbb825..6994be7087 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping @@ -7,8 +7,14 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespa FIELD field_24621 flatWorld Z FIELD field_25714 previousGameMode Lnet/minecraft/class_1934; METHOD (Lnet/minecraft/class_2874;Lnet/minecraft/class_5321;JLnet/minecraft/class_1934;Lnet/minecraft/class_1934;ZZZ)V + ARG 1 dimensionType + ARG 2 dimension + ARG 3 sha256Seed ARG 5 gameMode ARG 6 previousGameMode + ARG 7 debugWorld + ARG 8 flatWorld + ARG 9 keepPlayerAttributes METHOD method_11779 getDimension ()Lnet/minecraft/class_5321; METHOD method_11780 getGameMode ()Lnet/minecraft/class_1934; METHOD method_22425 getSha256Seed ()J diff --git a/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping index 8abaa02c64..de672ff314 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UnlockRecipesS2CPacket.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_2713 net/minecraft/network/packet/s2c/play/UnlockRecip FIELD field_12414 recipeIdsToChange Ljava/util/List; FIELD field_25797 options Lnet/minecraft/class_5411; METHOD (Lnet/minecraft/class_2713$class_2714;Ljava/util/Collection;Ljava/util/Collection;Lnet/minecraft/class_5411;)V + ARG 1 action + ARG 2 recipeIdsToChange + ARG 3 recipeIdsToInit ARG 4 options METHOD method_11750 getRecipeIdsToChange ()Ljava/util/List; METHOD method_11751 getAction ()Lnet/minecraft/class_2713$class_2714; diff --git a/mappings/net/minecraft/network/packet/s2c/play/HeldItemChangeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping similarity index 65% rename from mappings/net/minecraft/network/packet/s2c/play/HeldItemChangeS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping index 660ed2ec0f..0c335b82e4 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/HeldItemChangeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_2735 net/minecraft/network/packet/s2c/play/HeldItemChangeS2CPacket - FIELD field_12463 slot I +CLASS net/minecraft/class_2735 net/minecraft/network/packet/s2c/play/UpdateSelectedSlotS2CPacket + FIELD field_12463 selectedSlot I METHOD (I)V ARG 1 slot METHOD method_11803 getSlot ()I diff --git a/mappings/net/minecraft/particle/DustParticleEffect.mapping b/mappings/net/minecraft/particle/DustParticleEffect.mapping index 7c39ea96bb..9834f4a20f 100644 --- a/mappings/net/minecraft/particle/DustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustParticleEffect.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2390 net/minecraft/particle/DustParticleEffect FIELD field_11185 blue F FIELD field_11186 green F FIELD field_11187 red F - FIELD field_11188 RED Lnet/minecraft/class_2390; + FIELD field_11188 DEFAULT Lnet/minecraft/class_2390; FIELD field_11189 PARAMETERS_FACTORY Lnet/minecraft/class_2394$class_2395; FIELD field_25124 CODEC Lcom/mojang/serialization/Codec; METHOD (FFFF)V diff --git a/mappings/net/minecraft/particle/ParticleType.mapping b/mappings/net/minecraft/particle/ParticleType.mapping index 49c17e6b17..e695bb03c6 100644 --- a/mappings/net/minecraft/particle/ParticleType.mapping +++ b/mappings/net/minecraft/particle/ParticleType.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2396 net/minecraft/particle/ParticleType FIELD field_11197 parametersFactory Lnet/minecraft/class_2394$class_2395; METHOD (ZLnet/minecraft/class_2394$class_2395;)V ARG 1 alwaysShow - COMMENT whether this particle type should appear regardless of {@linkplain GameOptions#particles particle mode} + COMMENT whether this particle type should appear regardless of {@linkplain net.minecraft.client.option.GameOptions#particles particle mode} ARG 2 parametersFactory METHOD method_10298 getParametersFactory ()Lnet/minecraft/class_2394$class_2395; METHOD method_10299 shouldAlwaysSpawn ()Z diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index 5d555c314b..d9cbdfba71 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -7,13 +7,13 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil METHOD method_8057 getPotion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1842; ARG 0 compound METHOD method_8058 getCustomPotionEffects (Lnet/minecraft/class_2487;Ljava/util/List;)V - ARG 0 tag + ARG 0 nbt ARG 1 list METHOD method_8059 getPotionEffects (Lnet/minecraft/class_1842;Ljava/util/Collection;)Ljava/util/List; ARG 0 potion ARG 1 custom METHOD method_8060 getCustomPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; - ARG 0 tag + ARG 0 nbt METHOD method_8061 setPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_1842;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 potion @@ -27,7 +27,7 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil ARG 0 stack ARG 1 list METHOD method_8066 getPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; - ARG 0 tag + ARG 0 nbt METHOD method_8067 getPotionEffects (Lnet/minecraft/class_1799;)Ljava/util/List; ARG 0 stack METHOD method_8068 getCustomPotionEffects (Lnet/minecraft/class_1799;)Ljava/util/List; diff --git a/mappings/net/minecraft/predicate/NbtPredicate.mapping b/mappings/net/minecraft/predicate/NbtPredicate.mapping index 896b967b3d..5ead80183f 100644 --- a/mappings/net/minecraft/predicate/NbtPredicate.mapping +++ b/mappings/net/minecraft/predicate/NbtPredicate.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate - FIELD field_9715 tag Lnet/minecraft/class_2487; + FIELD field_9715 nbt Lnet/minecraft/class_2487; FIELD field_9716 ANY Lnet/minecraft/class_2105; METHOD (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_9072 test (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_9073 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2105; @@ -10,7 +10,7 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate METHOD method_9074 test (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_9075 toJson ()Lcom/google/gson/JsonElement; - METHOD method_9076 entityToTag (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2487; + METHOD method_9076 entityToNbt (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2487; ARG 0 entity METHOD method_9077 test (Lnet/minecraft/class_2520;)Z - ARG 1 tag + ARG 1 element diff --git a/mappings/net/minecraft/predicate/PlayerPredicate.mapping b/mappings/net/minecraft/predicate/PlayerPredicate.mapping index 9e397cb625..c553f2f948 100644 --- a/mappings/net/minecraft/predicate/PlayerPredicate.mapping +++ b/mappings/net/minecraft/predicate/PlayerPredicate.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_4553 net/minecraft/predicate/PlayerPredicate FIELD field_20722 ANY Lnet/minecraft/class_4553; FIELD field_20723 experienceLevel Lnet/minecraft/class_2096$class_2100; - FIELD field_20724 gamemode Lnet/minecraft/class_1934; + FIELD field_20724 gameMode Lnet/minecraft/class_1934; FIELD field_20725 stats Ljava/util/Map; FIELD field_20726 recipes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; FIELD field_20727 advancements Ljava/util/Map; METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1934;Ljava/util/Map;Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;Ljava/util/Map;)V ARG 1 experienceLevel - ARG 2 gamemode + ARG 2 gameMode ARG 3 stats ARG 4 recipes ARG 5 advancements diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping index f15b83f7e8..15aceb173b 100644 --- a/mappings/net/minecraft/predicate/StatePredicate.mapping +++ b/mappings/net/minecraft/predicate/StatePredicate.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate FIELD field_20736 ANY Lnet/minecraft/class_4559; FIELD field_20737 conditions Ljava/util/List; METHOD (Ljava/util/List;)V - ARG 1 testers + ARG 1 conditions METHOD method_22513 toJson ()Lcom/google/gson/JsonElement; METHOD method_22514 test (Lnet/minecraft/class_2680;)Z ARG 1 state diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping index 92210df079..5cb8474c19 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping @@ -37,6 +37,7 @@ CLASS net/minecraft/class_1301 net/minecraft/predicate/entity/EntityPredicates ARG 0 x ARG 2 y ARG 4 z + ARG 6 max METHOD method_5911 canBePushedBy (Lnet/minecraft/class_1297;)Ljava/util/function/Predicate; ARG 0 entity METHOD method_5913 rides (Lnet/minecraft/class_1297;)Ljava/util/function/Predicate; diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index 617170053d..bf15b698cb 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 1 x ARG 2 y ARG 3 z + ARG 4 biome ARG 5 feature ARG 6 dimension ARG 7 smokey @@ -38,6 +39,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate METHOD method_9021 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2090; ARG 0 json METHOD method_9022 biome (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090; + ARG 0 biome CLASS class_2091 Builder FIELD field_20717 light Lnet/minecraft/class_4552; FIELD field_20718 block Lnet/minecraft/class_4550; diff --git a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping index d6f1777c73..5220866aa8 100644 --- a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_2035 net/minecraft/predicate/item/EnchantmentPredicate METHOD method_8879 deserializeAll (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2035; ARG 0 el METHOD method_8880 test (Ljava/util/Map;)Z + ARG 1 enchantments METHOD method_8881 serialize ()Lcom/google/gson/JsonElement; METHOD method_8882 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2035; ARG 0 el diff --git a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping index ab95f0b2e1..af8ab15d8f 100644 --- a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping +++ b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry ARG 1 ingredient METHOD method_8074 registerPotionRecipe (Lnet/minecraft/class_1842;Lnet/minecraft/class_1792;Lnet/minecraft/class_1842;)V ARG 0 input + ARG 1 item ARG 2 output METHOD method_8075 hasPotionRecipe (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 0 input diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index 60fae3d0a4..bf2f568f58 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient METHOD method_8094 (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1856$class_1857; ARG 0 stack METHOD method_8096 cacheMatchingStacks ()V - METHOD method_8100 getIds ()Lit/unimi/dsi/fastutil/ints/IntList; + METHOD method_8100 getMatchingItemIds ()Lit/unimi/dsi/fastutil/ints/IntList; METHOD method_8101 ofStacks ([Lnet/minecraft/class_1799;)Lnet/minecraft/class_1856; ARG 0 stacks METHOD method_8102 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_1856; diff --git a/mappings/net/minecraft/recipe/InputSlotFiller.mapping b/mappings/net/minecraft/recipe/InputSlotFiller.mapping index c36c3ac277..97874b996f 100644 --- a/mappings/net/minecraft/recipe/InputSlotFiller.mapping +++ b/mappings/net/minecraft/recipe/InputSlotFiller.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2955 net/minecraft/recipe/InputSlotFiller - FIELD field_13347 recipeFinder Lnet/minecraft/class_1662; - FIELD field_13348 craftingScreenHandler Lnet/minecraft/class_1729; + FIELD field_13347 matcher Lnet/minecraft/class_1662; + FIELD field_13348 handler Lnet/minecraft/class_1729; FIELD field_13349 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_13350 inventory Lnet/minecraft/class_1661; METHOD method_12819 getAmountToFill (ZIZ)I @@ -9,10 +9,13 @@ CLASS net/minecraft/class_2955 net/minecraft/recipe/InputSlotFiller ARG 3 recipeInCraftingSlots METHOD method_12820 returnSlot (I)V METHOD method_12821 fillInputSlots (Lnet/minecraft/class_1860;Z)V + ARG 1 recipe ARG 2 craftAll METHOD method_12822 returnInputs ()V METHOD method_12823 getFreeInventorySlots ()I METHOD method_12824 fillInputSlot (Lnet/minecraft/class_1735;Lnet/minecraft/class_1799;)V + ARG 1 slot + ARG 2 stack METHOD method_12825 canReturnInputs ()Z METHOD method_12826 fillInputSlots (Lnet/minecraft/class_3222;Lnet/minecraft/class_1860;Z)V ARG 1 entity diff --git a/mappings/net/minecraft/recipe/Recipe.mapping b/mappings/net/minecraft/recipe/Recipe.mapping index 40b1d21eb6..79b75c0dff 100644 --- a/mappings/net/minecraft/recipe/Recipe.mapping +++ b/mappings/net/minecraft/recipe/Recipe.mapping @@ -1,18 +1,40 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe - METHOD method_17447 getRecipeKindIcon ()Lnet/minecraft/class_1799; + METHOD method_17447 createIcon ()Lnet/minecraft/class_1799; + COMMENT Creates the stack that is displayed on the recipe book tab containing this recipe, and on a toast when a recipe of this type is unlocked. + COMMENT Used in conjunction with {@link #getGroup()}. METHOD method_17716 getType ()Lnet/minecraft/class_3956; METHOD method_8110 getOutput ()Lnet/minecraft/class_1799; - METHOD method_8111 getRemainingStacks (Lnet/minecraft/class_1263;)Lnet/minecraft/class_2371; + METHOD method_8111 getRemainder (Lnet/minecraft/class_1263;)Lnet/minecraft/class_2371; + COMMENT Returns the remaining stacks to be left in the crafting grid after crafting is complete. + COMMENT Should return the same number of items as the input grid contains in the same order they're expected + COMMENT to appear in that grid. + COMMENT + COMMENT @implSpec Default implementation simply returns a grid of all empty stacks where all stacks from the + COMMENT input grid have been replaced with the result of calling {@link net.minecraft.item.Item#getRecipeRemainder()} on them. + ARG 1 inventory METHOD method_8112 getGroup ()Ljava/lang/String; + COMMENT Optional group this recipe belongs in. Used to group recipes into different categories by the recipe book. METHOD method_8113 fits (II)Z + COMMENT Determines whether this recipe's pattern will fit into the available crafting area. ARG 1 width ARG 2 height METHOD method_8114 getId ()Lnet/minecraft/class_2960; METHOD method_8115 matches (Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Z - ARG 1 inv + COMMENT Determines whether this recipe matches the contents currently placed inside the available crafting grid. + ARG 1 inventory ARG 2 world METHOD method_8116 craft (Lnet/minecraft/class_1263;)Lnet/minecraft/class_1799; - ARG 1 inv - METHOD method_8117 getPreviewInputs ()Lnet/minecraft/class_2371; + COMMENT Crafts this recipe. + COMMENT + COMMENT

This method may perform side effects on the {@code inventory} argument.

+ COMMENT + COMMENT

This method should return a new item stack on each call.

+ COMMENT + COMMENT @return the resulting item stack + ARG 1 inventory + METHOD method_8117 getIngredients ()Lnet/minecraft/class_2371; + COMMENT The ingredients accepted as inputs for this recipe. Used by the recipe book + COMMENT when displaying a ghost form of this recipe on the crafting grid as well as for + COMMENT previewing the possible inputs in the book itself. METHOD method_8118 isIgnoredInRecipeBook ()Z METHOD method_8119 getSerializer ()Lnet/minecraft/class_1865; diff --git a/mappings/net/minecraft/recipe/RecipeFinder.mapping b/mappings/net/minecraft/recipe/RecipeFinder.mapping deleted file mode 100644 index cb5eaa052c..0000000000 --- a/mappings/net/minecraft/recipe/RecipeFinder.mapping +++ /dev/null @@ -1,37 +0,0 @@ -CLASS net/minecraft/class_1662 net/minecraft/recipe/RecipeFinder - FIELD field_7550 idToAmountMap Lit/unimi/dsi/fastutil/ints/Int2IntMap; - METHOD method_7400 addItem (Lnet/minecraft/class_1799;)V - METHOD method_7401 addItem (II)V - ARG 1 id - ARG 2 amount - METHOD method_7402 findRecipe (Lnet/minecraft/class_1860;Lit/unimi/dsi/fastutil/ints/IntList;)Z - ARG 2 outMatchingInputIds - METHOD method_7403 countRecipeCrafts (Lnet/minecraft/class_1860;ILit/unimi/dsi/fastutil/ints/IntList;)I - ARG 2 limit - ARG 3 outMatchingInputIds - METHOD method_7404 addNormalItem (Lnet/minecraft/class_1799;)V - ARG 1 stack - METHOD method_7405 getStackFromId (I)Lnet/minecraft/class_1799; - METHOD method_7406 findRecipe (Lnet/minecraft/class_1860;Lit/unimi/dsi/fastutil/ints/IntList;I)Z - ARG 2 outMatchingInputIds - ARG 3 amount - METHOD method_7407 countRecipeCrafts (Lnet/minecraft/class_1860;Lit/unimi/dsi/fastutil/ints/IntList;)I - ARG 2 outMatchingInputIds - METHOD method_7408 getItemId (Lnet/minecraft/class_1799;)I - METHOD method_7409 clear ()V - METHOD method_7410 contains (I)Z - METHOD method_7411 take (II)I - ARG 1 id - ARG 2 amount - CLASS class_1663 Filter - FIELD field_7552 ingredients Ljava/util/List; - FIELD field_7555 recipe Lnet/minecraft/class_1860; - FIELD field_7556 ingredientCount I - METHOD (Lnet/minecraft/class_1662;Lnet/minecraft/class_1860;)V - ARG 1 recipe - METHOD method_7417 find (ILit/unimi/dsi/fastutil/ints/IntList;)Z - ARG 1 amount - ARG 2 outMatchingInputIds - METHOD method_7427 countCrafts (ILit/unimi/dsi/fastutil/ints/IntList;)I - ARG 1 limit - ARG 2 outMatchingInputIds diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index b85c77243d..2d039a0744 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -17,9 +17,13 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager METHOD method_30027 listAllOfType (Lnet/minecraft/class_3956;)Ljava/util/List; COMMENT Creates a list of all recipes of the given type. COMMENT Modifications to the returned list do not affect the manager. + ARG 1 recipeType METHOD method_8126 values ()Ljava/util/Collection; METHOD method_8127 keys ()Ljava/util/stream/Stream; METHOD method_8128 getRemainingStacks (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Lnet/minecraft/class_2371; + ARG 1 recipeType + ARG 2 inventory + ARG 3 world METHOD method_8130 get (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id METHOD method_8132 getFirstMatch (Lnet/minecraft/class_3956;Lnet/minecraft/class_1263;Lnet/minecraft/class_1937;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/recipe/RecipeMatcher.mapping b/mappings/net/minecraft/recipe/RecipeMatcher.mapping new file mode 100644 index 0000000000..fc04833162 --- /dev/null +++ b/mappings/net/minecraft/recipe/RecipeMatcher.mapping @@ -0,0 +1,77 @@ +CLASS net/minecraft/class_1662 net/minecraft/recipe/RecipeMatcher + COMMENT Matching class that matches a recipe to its required resources. + COMMENT This specifically does not check patterns (See {@link ShapedRecipe} for that). + FIELD field_7550 inputs Lit/unimi/dsi/fastutil/ints/Int2IntMap; + METHOD method_7400 addInput (Lnet/minecraft/class_1799;)V + COMMENT Adds a full item stack to the pool of available resources. + COMMENT + COMMENT

This is equivalent to calling {@code addInput(stack, Item.DEFAULT_MAX_COUNT)}.

+ ARG 1 stack + METHOD method_7401 addInput (II)V + COMMENT Adds an input to be used for recipe matching. + ARG 1 itemId + COMMENT the raw ID of the item to match + ARG 2 count + COMMENT the item's count + METHOD method_7402 match (Lnet/minecraft/class_1860;Lit/unimi/dsi/fastutil/ints/IntList;)Z + COMMENT Attempts to match the recipe against the collected inputs. + COMMENT Assumes only one output is required. + ARG 1 recipe + COMMENT the recipe to match against + ARG 2 output + COMMENT optional output list of item ids that were matched whilst evaluating the recipe conditions + METHOD method_7403 countCrafts (Lnet/minecraft/class_1860;ILit/unimi/dsi/fastutil/ints/IntList;)I + COMMENT Determines the number of crafts that can be produced for a recipe using the + COMMENT collected resources available to this crafter. + ARG 1 recipe + COMMENT the recipe to match against + ARG 2 limit + ARG 3 output + COMMENT optional output list of item ids that were matched whilst evaluating the recipe conditions + METHOD method_7404 addUnenchantedInput (Lnet/minecraft/class_1799;)V + COMMENT Adds a full item stack to the pool of available resources. + COMMENT + COMMENT

This is equivalent to calling {@code addInput(stack, Item.DEFAULT_MAX_COUNT)}.

+ ARG 1 stack + METHOD method_7405 getStackFromId (I)Lnet/minecraft/class_1799; + ARG 0 itemId + METHOD method_7406 match (Lnet/minecraft/class_1860;Lit/unimi/dsi/fastutil/ints/IntList;I)Z + COMMENT Attempts to match the recipe against the collected inputs. Will only succeed if there has been enough + COMMENT resources gathered to produce the requested number of outputs. + ARG 1 recipe + COMMENT the recipe to match against + ARG 2 output + COMMENT optional output list of item ids that were matched whilst evaluating the recipe conditions + ARG 3 multiplier + COMMENT the number of expected outputs + METHOD method_7407 countCrafts (Lnet/minecraft/class_1860;Lit/unimi/dsi/fastutil/ints/IntList;)I + COMMENT Determines the number of crafts that can be produced for a recipe using the + COMMENT collected resources available to this crafter. + ARG 1 recipe + COMMENT the recipe to match against + ARG 2 output + COMMENT optional output list of item ids that were matched whilst evaluating the recipe conditions + METHOD method_7408 getItemId (Lnet/minecraft/class_1799;)I + ARG 0 stack + METHOD method_7409 clear ()V + METHOD method_7410 contains (I)Z + COMMENT Determines whether a raw item id is present in the pool of crafting resources. + ARG 1 itemId + METHOD method_7411 consume (II)I + COMMENT Consumes a resource from the pool of available items. + ARG 1 itemId + COMMENT the raw id of the item being consumed + ARG 2 count + COMMENT the number of times that item must be consumed + CLASS class_1663 Filter + FIELD field_7552 ingredients Ljava/util/List; + FIELD field_7555 recipe Lnet/minecraft/class_1860; + FIELD field_7556 ingredientCount I + METHOD (Lnet/minecraft/class_1662;Lnet/minecraft/class_1860;)V + ARG 1 recipe + METHOD method_7417 find (ILit/unimi/dsi/fastutil/ints/IntList;)Z + ARG 1 amount + ARG 2 outMatchingInputIds + METHOD method_7427 countCrafts (ILit/unimi/dsi/fastutil/ints/IntList;)I + ARG 1 limit + ARG 2 outMatchingInputIds diff --git a/mappings/net/minecraft/recipe/RecipeType.mapping b/mappings/net/minecraft/recipe/RecipeType.mapping index 2252a79d56..21bda7a822 100644 --- a/mappings/net/minecraft/recipe/RecipeType.mapping +++ b/mappings/net/minecraft/recipe/RecipeType.mapping @@ -9,3 +9,4 @@ CLASS net/minecraft/class_3956 net/minecraft/recipe/RecipeType ARG 2 world ARG 3 inventory METHOD method_17726 register (Ljava/lang/String;)Lnet/minecraft/class_3956; + ARG 0 id diff --git a/mappings/net/minecraft/recipe/RecipeUnlocker.mapping b/mappings/net/minecraft/recipe/RecipeUnlocker.mapping index d15b9d74f4..e03041706e 100644 --- a/mappings/net/minecraft/recipe/RecipeUnlocker.mapping +++ b/mappings/net/minecraft/recipe/RecipeUnlocker.mapping @@ -5,4 +5,6 @@ CLASS net/minecraft/class_1732 net/minecraft/recipe/RecipeUnlocker METHOD method_7664 unlockLastRecipe (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_7665 shouldCraftRecipe (Lnet/minecraft/class_1937;Lnet/minecraft/class_3222;Lnet/minecraft/class_1860;)Z + ARG 1 world ARG 2 player + ARG 3 recipe diff --git a/mappings/net/minecraft/recipe/ShapedRecipe.mapping b/mappings/net/minecraft/recipe/ShapedRecipe.mapping index ab6d323813..291e8b811e 100644 --- a/mappings/net/minecraft/recipe/ShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapedRecipe.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe FIELD field_9051 id Lnet/minecraft/class_2960; - FIELD field_9052 inputs Lnet/minecraft/class_2371; + FIELD field_9052 input Lnet/minecraft/class_2371; FIELD field_9053 output Lnet/minecraft/class_1799; FIELD field_9054 height I FIELD field_9055 width I @@ -10,29 +10,54 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe ARG 2 group ARG 3 width ARG 4 height - ARG 5 ingredients + ARG 5 input ARG 6 output METHOD method_8145 getPattern (Lcom/google/gson/JsonArray;)[Ljava/lang/String; ARG 0 json - METHOD method_8146 combinePattern ([Ljava/lang/String;)[Ljava/lang/String; - ARG 0 lines - METHOD method_8148 getIngredients ([Ljava/lang/String;Ljava/util/Map;II)Lnet/minecraft/class_2371; + METHOD method_8146 removePadding ([Ljava/lang/String;)[Ljava/lang/String; + COMMENT Removes empty space from around the recipe pattern. + COMMENT + COMMENT

Turns patterns such as:

+ COMMENT 
+		COMMENT {@code
+		COMMENT "   o"
+		COMMENT "   a"
+		COMMENT "    "
+		COMMENT }
+		COMMENT
+ COMMENT Into: + COMMENT 
+		COMMENT {@code
+		COMMENT "o"
+		COMMENT "a"
+		COMMENT }
+		COMMENT
+ COMMENT + COMMENT @return a new recipe pattern with all leading and trailing empty rows/columns removed ARG 0 pattern - ARG 1 key + METHOD method_8148 createPatternMatrix ([Ljava/lang/String;Ljava/util/Map;II)Lnet/minecraft/class_2371; + COMMENT Compiles a pattern and series of symbols into a list of ingredients (the matrix) suitable for matching + COMMENT against a crafting grid. + ARG 0 pattern + ARG 1 symbols ARG 2 width ARG 3 height METHOD method_8150 getWidth ()I - METHOD method_8151 findNextIngredient (Ljava/lang/String;)I - ARG 0 pattern - METHOD method_8153 findNextIngredientReverse (Ljava/lang/String;)I + METHOD method_8151 findFirstSymbol (Ljava/lang/String;)I + ARG 0 line + METHOD method_8153 findLastSymbol (Ljava/lang/String;)I ARG 0 pattern METHOD method_8155 getItemStack (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1799; ARG 0 json - METHOD method_8157 getComponents (Lcom/google/gson/JsonObject;)Ljava/util/Map; + METHOD method_8157 readSymbols (Lcom/google/gson/JsonObject;)Ljava/util/Map; + COMMENT Reads the pattern symbols. + COMMENT + COMMENT @return a mapping from a symbol to the ingredient it represents ARG 0 json METHOD method_8158 getHeight ()I - METHOD method_8161 matchesSmall (Lnet/minecraft/class_1715;IIZ)Z + METHOD method_8161 matchesPattern (Lnet/minecraft/class_1715;IIZ)Z ARG 1 inv ARG 2 offsetX ARG 3 offsetY + ARG 4 flipped CLASS class_1870 Serializer diff --git a/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping b/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping index 7548d25599..c9a1a5830b 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping @@ -11,8 +11,8 @@ CLASS net/minecraft/class_5411 net/minecraft/recipe/book/RecipeBookOptions METHOD method_30181 setGuiOpen (Lnet/minecraft/class_5421;Z)V ARG 1 category ARG 2 open - METHOD method_30183 fromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_5411; - ARG 0 tag + METHOD method_30183 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_5411; + ARG 0 nbt METHOD method_30186 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5411; ARG 0 buf METHOD method_30187 isFilteringCraftable (Lnet/minecraft/class_5421;)Z @@ -20,8 +20,8 @@ CLASS net/minecraft/class_5411 net/minecraft/recipe/book/RecipeBookOptions METHOD method_30188 setFilteringCraftable (Lnet/minecraft/class_5421;Z)V ARG 1 category ARG 2 filtering - METHOD method_30189 toTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_30189 writeNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_30190 toPacket (Lnet/minecraft/class_2540;)V ARG 1 buf CLASS class_5412 CategoryOption diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping index 28518bf9d6..b65be28c58 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -12,9 +12,12 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack METHOD method_14417 getInputStream (Ljava/lang/String;)Ljava/io/InputStream; ARG 1 path METHOD method_14418 getIdentifiers (Ljava/util/Collection;ILjava/lang/String;Ljava/nio/file/Path;Ljava/lang/String;Ljava/util/function/Predicate;)V + ARG 0 results ARG 1 maxDepth ARG 2 namespace - ARG 4 searchLocation + ARG 3 root + ARG 4 prefix + ARG 5 pathFilter METHOD method_20728 isValidUrl (Ljava/lang/String;Ljava/net/URL;)Z ARG 0 fileName ARG 1 url diff --git a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping index d4e949fcc1..b66c561cc6 100644 --- a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping +++ b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping @@ -3,5 +3,6 @@ CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider FIELD field_14218 packsFolder Ljava/io/File; METHOD (Ljava/io/File;Lnet/minecraft/class_5352;)V ARG 1 packsFolder + ARG 2 source METHOD method_14432 createResourcePack (Ljava/io/File;)Ljava/util/function/Supplier; ARG 1 file diff --git a/mappings/net/minecraft/resource/JsonDataLoader.mapping b/mappings/net/minecraft/resource/JsonDataLoader.mapping index 4c60362442..e272ecaee6 100644 --- a/mappings/net/minecraft/resource/JsonDataLoader.mapping +++ b/mappings/net/minecraft/resource/JsonDataLoader.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_4309 net/minecraft/resource/JsonDataLoader + COMMENT An abstract implementation of resource reloader that reads JSON files + COMMENT into Gson representations in the prepare stage. FIELD field_19377 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_19378 FILE_SUFFIX_LENGTH I FIELD field_19379 gson Lcom/google/gson/Gson; diff --git a/mappings/net/minecraft/resource/ProfilingResourceReloader.mapping b/mappings/net/minecraft/resource/ProfiledResourceReload.mapping similarity index 79% rename from mappings/net/minecraft/resource/ProfilingResourceReloader.mapping rename to mappings/net/minecraft/resource/ProfiledResourceReload.mapping index 5295d7fed7..b842b8d3b8 100644 --- a/mappings/net/minecraft/resource/ProfilingResourceReloader.mapping +++ b/mappings/net/minecraft/resource/ProfiledResourceReload.mapping @@ -1,16 +1,22 @@ -CLASS net/minecraft/class_4010 net/minecraft/resource/ProfilingResourceReloader +CLASS net/minecraft/class_4010 net/minecraft/resource/ProfiledResourceReload + COMMENT An implementation of resource reload that includes an additional profiling + COMMENT summary for each reloader. FIELD field_17918 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_17919 reloadTimer Lcom/google/common/base/Stopwatch; METHOD (Lnet/minecraft/class_3300;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)V ARG 1 manager - ARG 2 listeners + ARG 2 reloaders ARG 3 prepareExecutor ARG 4 applyExecutor + ARG 5 initialStage METHOD method_18238 finish (Ljava/util/List;)V ARG 1 summaries METHOD method_18355 (Ljava/util/concurrent/Executor;Lnet/minecraft/class_3302$class_4045;Lnet/minecraft/class_3300;Lnet/minecraft/class_3302;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 4 prepareExecutor - ARG 5 applyExecutor + ARG 1 synchronizer + ARG 2 resourceManager + ARG 3 reloader + ARG 4 prepare + ARG 5 apply CLASS class_4046 Summary FIELD field_18037 name Ljava/lang/String; FIELD field_18038 prepareProfile Lnet/minecraft/class_3696; diff --git a/mappings/net/minecraft/resource/ReloadableResourceManager.mapping b/mappings/net/minecraft/resource/ReloadableResourceManager.mapping index cba3e427ee..a5f7a0abe8 100644 --- a/mappings/net/minecraft/resource/ReloadableResourceManager.mapping +++ b/mappings/net/minecraft/resource/ReloadableResourceManager.mapping @@ -1,13 +1,46 @@ CLASS net/minecraft/class_3296 net/minecraft/resource/ReloadableResourceManager - METHOD method_14477 registerListener (Lnet/minecraft/class_3302;)V - ARG 1 listener - METHOD method_14478 beginReload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture; + COMMENT A resource manager that has a reload mechanism. Reloading allows + COMMENT reloaders to update when resources change. Accessing resources in + COMMENT reloads can reduce impact on game performance as well. + COMMENT + COMMENT

In each reload, all reloaders in this resource manager will have + COMMENT their {@linkplain ResourceReloader#reload reload} called. + COMMENT + COMMENT @see ResourceReloader + METHOD method_14477 registerReloader (Lnet/minecraft/class_3302;)V + COMMENT Registers a resource reloader to this manager. + ARG 1 reloader + COMMENT the reloader + METHOD method_14478 reload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture; + COMMENT Performs a reload. This returns a future that is completed when the + COMMENT reload is completed. + COMMENT + COMMENT @return the future of the reload + COMMENT @see #reload(Executor, Executor, CompletableFuture, List) ARG 1 prepareExecutor + COMMENT an executor for the prepare stage ARG 2 applyExecutor + COMMENT an executor for the apply stage ARG 3 packs + COMMENT a list of resource packs providing resources ARG 4 initialStage - METHOD method_18232 beginMonitoredReload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)Lnet/minecraft/class_4011; + COMMENT a completable future to be completed before this reload + METHOD method_18232 reload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)Lnet/minecraft/class_4011; + COMMENT Performs a reload. Returns an object that yields some insights to the + COMMENT reload. + COMMENT + COMMENT

{@code prepareExecutor} may be asynchronous. {@code applyExecutor} must + COMMENT synchronize with the game engine so changes are properly made to it. + COMMENT The reload will only begin after {@code initialStage} has completed. + COMMENT Earlier elements in {@code packs} have lower priorities. + COMMENT + COMMENT @return the reload + COMMENT @see ResourceReloader#reload ARG 1 prepareExecutor + COMMENT an executor for the prepare stage ARG 2 applyExecutor + COMMENT an executor for the apply stage ARG 3 initialStage + COMMENT a completable future to be completed before this reload ARG 4 packs + COMMENT a list of resource packs providing resources diff --git a/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping b/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping index d5acd5916b..c9eb9d0f8d 100644 --- a/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping +++ b/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping @@ -3,11 +3,12 @@ CLASS net/minecraft/class_3304 net/minecraft/resource/ReloadableResourceManagerI FIELD field_14293 namespaceManagers Ljava/util/Map; FIELD field_14294 type Lnet/minecraft/class_3264; FIELD field_14295 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_17935 listeners Ljava/util/List; + FIELD field_17935 reloaders Ljava/util/List; FIELD field_17936 initialListeners Ljava/util/List; METHOD (Lnet/minecraft/class_3264;)V ARG 1 type METHOD method_14475 addPack (Lnet/minecraft/class_3262;)V + ARG 1 pack METHOD method_14495 clear ()V METHOD method_18240 beginReloadInner (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_4011; ARG 1 prepareExecutor diff --git a/mappings/net/minecraft/resource/Resource.mapping b/mappings/net/minecraft/resource/Resource.mapping index 73ada02352..5468e73e26 100644 --- a/mappings/net/minecraft/resource/Resource.mapping +++ b/mappings/net/minecraft/resource/Resource.mapping @@ -1,6 +1,24 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource + COMMENT A resource of binary data. + COMMENT + COMMENT

The resource must be closed before disposal to avoid resource leaks. + COMMENT + COMMENT @see ResourceManager#getResource(Identifier) + COMMENT @see ResourceManager#getAllResources(Identifier) METHOD method_14480 getResourcePackName ()Ljava/lang/String; + COMMENT Returns the user-friendly name of the pack this resource is from. METHOD method_14481 getMetadata (Lnet/minecraft/class_3270;)Ljava/lang/Object; + COMMENT Returns a metadata of this resource by the {@code metaReader}, or {@code null} + COMMENT if no such metadata exists. ARG 1 metaReader + COMMENT the metadata reader METHOD method_14482 getInputStream ()Ljava/io/InputStream; + COMMENT Returns the input stream of this resource. + COMMENT + COMMENT

This input stream is closed when this resource is closed. METHOD method_14483 getId ()Lnet/minecraft/class_2960; + COMMENT Returns the location of this resource. + COMMENT + COMMENT

Within each resource pack, this location is a unique identifer for a + COMMENT resource; however, in a resource manager, there may be multiple resources + COMMENT with the same location available. diff --git a/mappings/net/minecraft/resource/ResourceManager.mapping b/mappings/net/minecraft/resource/ResourceManager.mapping index 6544c92106..16bbde6f8d 100644 --- a/mappings/net/minecraft/resource/ResourceManager.mapping +++ b/mappings/net/minecraft/resource/ResourceManager.mapping @@ -1,13 +1,52 @@ CLASS net/minecraft/class_3300 net/minecraft/resource/ResourceManager + COMMENT Provides resource loading capabilities to Minecraft. METHOD method_14486 getResource (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3298; + COMMENT Finds and returns the corresponding resource for a resource's identifier. + COMMENT + COMMENT

Starts by scanning each resource pack from highest priority to lowest. If no resource packs were found + COMMENT to contain the requested entry, will throw a {@code FileNotFoundException}. + COMMENT + COMMENT

The returned resource must be closed to avoid resource leaks. + COMMENT + COMMENT @throws java.io.FileNotFoundException if the identified resource could not be found, or could not be loaded. + COMMENT @throws IOException if the identified resource was found but a stream to it could not be opened. ARG 1 id + COMMENT the resource identifier to search for METHOD method_14487 getAllNamespaces ()Ljava/util/Set; + COMMENT Gets a set of all namespaces offered by the resource packs loaded by this manager. METHOD method_14488 findResources (Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection; - ARG 1 resourceType + COMMENT Returns a sorted list of identifiers matching a path predicate. + COMMENT + COMMENT

Scanning begins in {@code startingPath} and each candidate file present under that directory + COMMENT will be offered up to the predicate to decide whether it should be included or not. + COMMENT + COMMENT

Elements in the returned list may not, necessarily be unique. Additional effort is advised to ensure that + COMMENT duplicates in the returned list are discarded before loading. + COMMENT + COMMENT @return the list matching identifiers + ARG 1 startingPath + COMMENT the starting path to begin scanning from ARG 2 pathPredicate + COMMENT a predicate to determine whether a path should be included or not METHOD method_14489 getAllResources (Lnet/minecraft/class_2960;)Ljava/util/List; + COMMENT Gets all of the available resources to the corresponding resource identifier. + COMMENT + COMMENT

Resources are returned in load order, or ascending order of priority, so the last element in the returned + COMMENT list is what would be returned normally by {@link #getResource} + COMMENT + COMMENT

Each resource in this returned list must be closed to avoid resource leaks. + COMMENT + COMMENT @throws java.io.FileNotFoundException if no matching resources could be found (i.e. if the list would be empty) + COMMENT @throws IOException if resources were found, but any one of them could not be opened to be read. ARG 1 id + COMMENT the resource identifier to search for METHOD method_18234 containsResource (Lnet/minecraft/class_2960;)Z + COMMENT Checks whether any of the currently-loaded resource packs contain an entry for the given id. + COMMENT + COMMENT

Starts by querying the resource pack with the highest priority to lowest until it finds one that + COMMENT responds to the requested identifier. ARG 1 id + COMMENT the resource identifier to search for METHOD method_29213 streamResourcePacks ()Ljava/util/stream/Stream; + COMMENT Gets a stream of loaded resource packs in increasing order of priority. CLASS class_5353 Empty diff --git a/mappings/net/minecraft/resource/ResourcePack.mapping b/mappings/net/minecraft/resource/ResourcePack.mapping index ce6322cbed..d08e9b0405 100644 --- a/mappings/net/minecraft/resource/ResourcePack.mapping +++ b/mappings/net/minecraft/resource/ResourcePack.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_3262 net/minecraft/resource/ResourcePack + COMMENT A resource pack, providing resources to resource managers. + COMMENT + COMMENT

They are single-use in each reload cycle of a reloadable resource manager. + COMMENT {@link ResourcePackProfile} is a persistent version of the resource packs. METHOD method_14405 open (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/io/InputStream; ARG 1 type ARG 2 id diff --git a/mappings/net/minecraft/resource/ResourcePackManager.mapping b/mappings/net/minecraft/resource/ResourcePackManager.mapping index 1761713c45..a6e8988f69 100644 --- a/mappings/net/minecraft/resource/ResourcePackManager.mapping +++ b/mappings/net/minecraft/resource/ResourcePackManager.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager + COMMENT A resource pack manager manages a list of {@link ResourcePackProfile}s and + COMMENT builds {@linkplain #createResourcePacks() a list of resource packs} when the + COMMENT resource manager reloads. FIELD field_14225 enabled Ljava/util/List; FIELD field_14226 profiles Ljava/util/Map; FIELD field_14227 providers Ljava/util/Set; diff --git a/mappings/net/minecraft/resource/ResourcePackProfile.mapping b/mappings/net/minecraft/resource/ResourcePackProfile.mapping index b1733358cf..4bf79bc4b2 100644 --- a/mappings/net/minecraft/resource/ResourcePackProfile.mapping +++ b/mappings/net/minecraft/resource/ResourcePackProfile.mapping @@ -1,8 +1,17 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile + COMMENT Represents a resource pack in a {@link ResourcePackManager}. + COMMENT + COMMENT

Compared to a single-use {@link ResourcePack}, a profile is persistent + COMMENT and serves as {@linkplain #createResourcePack a factory} for the single-use + COMMENT packs. It also contains user-friendly information about resource packs. + COMMENT + COMMENT

The profiles are registered by {@link ResourcePackProvider}s. + COMMENT + COMMENT

Closing the profile doesn't have any effect. FIELD field_14270 pinned Z FIELD field_14271 alwaysEnabled Z FIELD field_14272 name Ljava/lang/String; - FIELD field_14273 packGetter Ljava/util/function/Supplier; + FIELD field_14273 packFactory Ljava/util/function/Supplier; FIELD field_14274 displayName Lnet/minecraft/class_2561; FIELD field_14275 description Lnet/minecraft/class_2561; FIELD field_14276 BROKEN_PACK_META Lnet/minecraft/class_3272; @@ -31,11 +40,20 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_14456 of (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_3288$class_5351;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288; + COMMENT Creates a resource pack profile from the given parameters. + COMMENT + COMMENT

Compared to calling the factory directly, this utility method obtains the + COMMENT pack's metadata information from the pack created by the {@code packFactory}. + COMMENT If the created pack doesn't have metadata information, this method returns + COMMENT {@code null}. + COMMENT + COMMENT @return the created profile, or {@code null} if missing metadata ARG 0 name ARG 1 alwaysEnabled ARG 2 packFactory - ARG 3 containerFactory + ARG 3 profileFactory ARG 4 insertionPosition + ARG 5 packSource METHOD method_14457 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_14458 createResourcePack ()Lnet/minecraft/class_3262; METHOD method_14459 getDescription ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/resource/ResourcePackProvider.mapping b/mappings/net/minecraft/resource/ResourcePackProvider.mapping index a7b0c239d5..0b3293efcf 100644 --- a/mappings/net/minecraft/resource/ResourcePackProvider.mapping +++ b/mappings/net/minecraft/resource/ResourcePackProvider.mapping @@ -1,3 +1,12 @@ CLASS net/minecraft/class_3285 net/minecraft/resource/ResourcePackProvider + COMMENT A resource pack provider provides {@link ResourcePackProfile}s, usually to + COMMENT {@link ResourcePackManager}s. METHOD method_14453 register (Ljava/util/function/Consumer;Lnet/minecraft/class_3288$class_5351;)V + COMMENT Register resource pack profiles created with the {@code factory} to the + COMMENT {@code profileAdder}. + COMMENT + COMMENT @see ResourcePackProfile#of + ARG 1 profileAdder + COMMENT the profile adder that accepts created resource pack profiles ARG 2 factory + COMMENT the factory that creates the resource pack profiles diff --git a/mappings/net/minecraft/resource/ResourceReload.mapping b/mappings/net/minecraft/resource/ResourceReload.mapping new file mode 100644 index 0000000000..e35e0f7440 --- /dev/null +++ b/mappings/net/minecraft/resource/ResourceReload.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_4011 net/minecraft/resource/ResourceReload + COMMENT Represents a resource reload. + COMMENT + COMMENT @see ReloadableResourceManager#reload(java.util.concurrent.Executor, + COMMENT java.util.concurrent.Executor, CompletableFuture, java.util.List) + METHOD method_18229 getProgress ()F + COMMENT Returns a fraction between 0 and 1 indicating the progress of this + COMMENT reload. + METHOD method_18364 whenComplete ()Ljava/util/concurrent/CompletableFuture; + COMMENT Returns a future for the reload. The returned future is completed when + COMMENT the reload completes. + METHOD method_18786 isPrepareStageComplete ()Z + METHOD method_18787 isComplete ()Z + COMMENT Returns if this reload has completed, either normally or abnormally. + METHOD method_18849 throwException ()V + COMMENT Throws an unchecked exception from this reload, if there is any. Does + COMMENT nothing if the reload has not completed or terminated. diff --git a/mappings/net/minecraft/resource/ResourceReloadListener.mapping b/mappings/net/minecraft/resource/ResourceReloadListener.mapping deleted file mode 100644 index ed81219cf8..0000000000 --- a/mappings/net/minecraft/resource/ResourceReloadListener.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_3302 net/minecraft/resource/ResourceReloadListener - METHOD method_22322 getName ()Ljava/lang/String; - METHOD method_25931 reload (Lnet/minecraft/class_3302$class_4045;Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;Lnet/minecraft/class_3695;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 synchronizer - ARG 2 manager - ARG 3 prepareProfiler - ARG 4 applyProfiler - ARG 5 prepareExecutor - ARG 6 applyExecutor - CLASS class_4045 Synchronizer - METHOD method_18352 whenPrepared (Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; - ARG 1 preparedObject diff --git a/mappings/net/minecraft/resource/ResourceReloadMonitor.mapping b/mappings/net/minecraft/resource/ResourceReloadMonitor.mapping deleted file mode 100644 index e0fc083473..0000000000 --- a/mappings/net/minecraft/resource/ResourceReloadMonitor.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_4011 net/minecraft/resource/ResourceReloadMonitor - METHOD method_18229 getProgress ()F - METHOD method_18364 whenComplete ()Ljava/util/concurrent/CompletableFuture; - METHOD method_18786 isPrepareStageComplete ()Z - METHOD method_18787 isApplyStageComplete ()Z - METHOD method_18849 throwExceptions ()V diff --git a/mappings/net/minecraft/resource/ResourceReloader.mapping b/mappings/net/minecraft/resource/ResourceReloader.mapping index ef26024d40..86eb39aab4 100644 --- a/mappings/net/minecraft/resource/ResourceReloader.mapping +++ b/mappings/net/minecraft/resource/ResourceReloader.mapping @@ -1,30 +1,65 @@ -CLASS net/minecraft/class_4014 net/minecraft/resource/ResourceReloader - FIELD field_17927 manager Lnet/minecraft/class_3300; - FIELD field_18042 prepareStageFuture Ljava/util/concurrent/CompletableFuture; - FIELD field_18043 applyStageFuture Ljava/util/concurrent/CompletableFuture; - FIELD field_18044 waitingListeners Ljava/util/Set; - FIELD field_18045 listenerCount I - FIELD field_18046 applyingCount I - FIELD field_18047 appliedCount I - FIELD field_18048 preparingCount Ljava/util/concurrent/atomic/AtomicInteger; - FIELD field_18049 preparedCount Ljava/util/concurrent/atomic/AtomicInteger; - METHOD (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3300;Ljava/util/List;Lnet/minecraft/class_4014$class_4047;Ljava/util/concurrent/CompletableFuture;)V - ARG 1 prepareExecutor - ARG 2 applyExecutor - ARG 3 manager - ARG 4 listeners - ARG 5 creator - ARG 6 initialStage - METHOD method_18369 create (Lnet/minecraft/class_3300;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_4014; - ARG 0 manager - ARG 1 listeners - ARG 2 prepareExecutor - ARG 3 applyExecutor - ARG 4 initialStage - CLASS class_4047 Factory - METHOD create (Lnet/minecraft/class_3302$class_4045;Lnet/minecraft/class_3300;Lnet/minecraft/class_3302;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 helper - ARG 2 manager - ARG 3 listener - ARG 4 prepareExecutor - ARG 5 applyExecutor +CLASS net/minecraft/class_3302 net/minecraft/resource/ResourceReloader + COMMENT A resource reloader performs actual reloading in its {@linkplain #reload + COMMENT reload} in a reloadable resource manager it is registered to. + COMMENT + COMMENT @see ReloadableResourceManager + COMMENT @see SinglePreparationResourceReloader SinglePreparationResourceReloader + COMMENT (completes preparation in one method) + COMMENT @see SynchronousResourceReloader SynchronousResourceReloader + COMMENT (performs all reloading in the apply executor) + METHOD method_22322 getName ()Ljava/lang/String; + COMMENT Returns a user-friendly name for logging. + METHOD method_25931 reload (Lnet/minecraft/class_3302$class_4045;Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;Lnet/minecraft/class_3695;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + COMMENT Performs a reload. Returns a future that is completed when the reload + COMMENT is completed. + COMMENT + COMMENT

In a reload, there is a prepare stage and an apply stage. For the + COMMENT prepare stage, you should create completable futures with {@linkplain + COMMENT CompletableFuture#supplyAsync(Supplier, Executor) + COMMENT CompletableFuture.supplyAsync(..., prepareExecutor)} + COMMENT to ensure the prepare actions are done with the prepare executor. Then, + COMMENT you should have a completable future for all the prepared actions, and + COMMENT call {@linkplain CompletableFuture#thenCompose(Function) + COMMENT combinedPrepare.thenCompose(synchronizer::waitFor)} + COMMENT to notify the {@code synchronizer}. Finally, you should run {@linkplain + COMMENT CompletableFuture#thenAcceptAsync(Consumer, Executor) + COMMENT CompletableFuture.thenAcceptAsync(..., applyExecutor)} for apply actions. + COMMENT In the end, returns the result of {@code thenAcceptAsync}. + COMMENT + COMMENT @return a future for the reload + COMMENT @see net.minecraft.resource.ReloadableResourceManager#reload(Executor, Executor, + COMMENT CompletableFuture, List) + ARG 1 synchronizer + COMMENT the synchronizer + ARG 2 manager + COMMENT the resource manager + ARG 3 prepareProfiler + COMMENT the profiler for prepare stage + ARG 4 applyProfiler + COMMENT the profiler for apply stage + ARG 5 prepareExecutor + COMMENT the executor for prepare stage + ARG 6 applyExecutor + COMMENT the executor for apply stage + CLASS class_4045 Synchronizer + COMMENT A synchronizer to indicate completion of a reloader's prepare stage and + COMMENT to allow start of the apply stage only if all reloaders have finished + COMMENT the prepare stage. + METHOD method_18352 whenPrepared (Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; + COMMENT Indicates, to the ongoing reload, that this reloader has finished its + COMMENT preparation stage with the {@code preparedObject} as its result. + COMMENT + COMMENT

Returns a completable future that the apply stage depends on. This + COMMENT returned future is completed when all the reloaders have completed their + COMMENT prepare stages in the reload. + COMMENT + COMMENT

Example: + COMMENT {@code + COMMENT CompletableFuture prepareStage = ...; + COMMENT prepareStage.thenCompose(synchronizer::whenPrepared) + COMMENT .thenAcceptAsync(..., applyExecutor); + COMMENT } + COMMENT + COMMENT @return a completable future as the precondition for the apply stage + ARG 1 preparedObject + COMMENT the result of the prepare stage diff --git a/mappings/net/minecraft/resource/SimpleResourceReload.mapping b/mappings/net/minecraft/resource/SimpleResourceReload.mapping new file mode 100644 index 0000000000..2257969368 --- /dev/null +++ b/mappings/net/minecraft/resource/SimpleResourceReload.mapping @@ -0,0 +1,34 @@ +CLASS net/minecraft/class_4014 net/minecraft/resource/SimpleResourceReload + COMMENT A simple implementation of resource reload. + COMMENT + COMMENT @param the result type for each reloader in the reload + FIELD field_17927 manager Lnet/minecraft/class_3300; + FIELD field_18042 prepareStageFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_18043 applyStageFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_18044 waitingReloaders Ljava/util/Set; + FIELD field_18045 reloaderCount I + FIELD field_18046 toApplyCount I + FIELD field_18047 appliedCount I + FIELD field_18048 toPrepareCount Ljava/util/concurrent/atomic/AtomicInteger; + FIELD field_18049 preparedCount Ljava/util/concurrent/atomic/AtomicInteger; + METHOD (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3300;Ljava/util/List;Lnet/minecraft/class_4014$class_4047;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 prepareExecutor + ARG 2 applyExecutor + ARG 3 manager + ARG 4 reloaders + ARG 5 factory + ARG 6 initialStage + METHOD method_18369 create (Lnet/minecraft/class_3300;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_4014; + COMMENT Creates a simple resource reload without additional results. + ARG 0 manager + ARG 1 reloaders + ARG 2 prepareExecutor + ARG 3 applyExecutor + ARG 4 initialStage + CLASS class_4047 Factory + METHOD create (Lnet/minecraft/class_3302$class_4045;Lnet/minecraft/class_3300;Lnet/minecraft/class_3302;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 helper + ARG 2 manager + ARG 3 listener + ARG 4 prepareExecutor + ARG 5 applyExecutor diff --git a/mappings/net/minecraft/resource/SinglePreparationResourceReloadListener.mapping b/mappings/net/minecraft/resource/SinglePreparationResourceReloadListener.mapping deleted file mode 100644 index 9f597527f9..0000000000 --- a/mappings/net/minecraft/resource/SinglePreparationResourceReloadListener.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_4080 net/minecraft/resource/SinglePreparationResourceReloadListener - METHOD method_18788 apply (Ljava/lang/Object;Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)V - ARG 1 loader - ARG 2 manager - ARG 3 profiler - METHOD method_18789 prepare (Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)Ljava/lang/Object; - ARG 1 manager - ARG 2 profiler diff --git a/mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping b/mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping new file mode 100644 index 0000000000..57d5b32b09 --- /dev/null +++ b/mappings/net/minecraft/resource/SinglePreparationResourceReloader.mapping @@ -0,0 +1,27 @@ +CLASS net/minecraft/class_4080 net/minecraft/resource/SinglePreparationResourceReloader + COMMENT A base resource reloader implementation that prepares an object in a + COMMENT single call (as opposed to in multiple concurrent tasks) and handles + COMMENT the prepared object in the apply stage. + COMMENT + COMMENT @param the intermediate object type + METHOD method_18788 apply (Ljava/lang/Object;Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)V + COMMENT Handles the prepared intermediate object. + COMMENT + COMMENT

This method is called in the apply executor, or the game engine, in a + COMMENT reload. + ARG 1 prepared + COMMENT the prepared object + ARG 2 manager + COMMENT the resource manager + ARG 3 profiler + COMMENT the apply profiler + METHOD method_18789 prepare (Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)Ljava/lang/Object; + COMMENT Prepares the intermediate object. + COMMENT + COMMENT

This method is called in the prepare executor in a reload. + COMMENT + COMMENT @return the prepared object + ARG 1 manager + COMMENT the resource manager + ARG 2 profiler + COMMENT the prepare profiler diff --git a/mappings/net/minecraft/resource/SynchronousResourceReloadListener.mapping b/mappings/net/minecraft/resource/SynchronousResourceReloadListener.mapping deleted file mode 100644 index bf156b47c6..0000000000 --- a/mappings/net/minecraft/resource/SynchronousResourceReloadListener.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4013 net/minecraft/resource/SynchronousResourceReloadListener - METHOD method_14491 apply (Lnet/minecraft/class_3300;)V - ARG 1 manager diff --git a/mappings/net/minecraft/resource/SynchronousResourceReloader.mapping b/mappings/net/minecraft/resource/SynchronousResourceReloader.mapping new file mode 100644 index 0000000000..49e5e0394b --- /dev/null +++ b/mappings/net/minecraft/resource/SynchronousResourceReloader.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_4013 net/minecraft/resource/SynchronousResourceReloader + COMMENT A base resource reloader that does all its work in the apply executor, + COMMENT or the game engine's thread. + COMMENT + COMMENT @apiNote This resource reloader is useful as a resource reload callback + COMMENT that doesn't need resource manager access. If you access the resource + COMMENT manager, consider writing resource reloaders that have a proper prepare + COMMENT stage instead by moving resource manager access to the prepare stage. + COMMENT That can speed up resource reloaders significantly. + METHOD method_14491 reload (Lnet/minecraft/class_3300;)V + COMMENT Performs the reload in the apply executor, or the game engine. + ARG 1 manager + COMMENT the resource manager diff --git a/mappings/net/minecraft/scoreboard/AbstractTeam.mapping b/mappings/net/minecraft/scoreboard/AbstractTeam.mapping index a237409772..9a788d2cf3 100644 --- a/mappings/net/minecraft/scoreboard/AbstractTeam.mapping +++ b/mappings/net/minecraft/scoreboard/AbstractTeam.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_270 net/minecraft/scoreboard/AbstractTeam METHOD method_1197 getName ()Ljava/lang/String; - METHOD method_1198 modifyText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; + METHOD method_1198 decorateName (Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; + COMMENT Decorates the name of an entity with the prefix, suffix and color of this team. + ARG 1 name + COMMENT the name to be decorated METHOD method_1199 shouldShowFriendlyInvisibles ()Z METHOD method_1200 getDeathMessageVisibilityRule ()Lnet/minecraft/class_270$class_272; METHOD method_1201 getNameTagVisibilityRule ()Lnet/minecraft/class_270$class_272; diff --git a/mappings/net/minecraft/scoreboard/Scoreboard.mapping b/mappings/net/minecraft/scoreboard/Scoreboard.mapping index 3bd3746d3a..c1625dcdb9 100644 --- a/mappings/net/minecraft/scoreboard/Scoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/Scoreboard.mapping @@ -7,21 +7,26 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard FIELD field_1431 playerObjectives Ljava/util/Map; FIELD field_1432 objectiveSlots [Lnet/minecraft/class_266; METHOD method_1150 resetEntityScore (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_1151 getObjectives ()Ljava/util/Collection; METHOD method_1152 updatePlayerScore (Ljava/lang/String;)V ARG 1 playerName METHOD method_1153 getTeam (Ljava/lang/String;)Lnet/minecraft/class_268; + ARG 1 name METHOD method_1154 updateScoreboardTeam (Lnet/minecraft/class_268;)V + ARG 1 team METHOD method_1155 resetPlayerScore (Ljava/lang/String;Lnet/minecraft/class_266;)V ARG 1 playerName ARG 2 objective METHOD method_1157 removePlayerFromTeam (Ljava/lang/String;Lnet/minecraft/class_268;)V ARG 1 playerName + ARG 2 team METHOD method_1158 setObjectiveSlot (ILnet/minecraft/class_266;)V ARG 1 slot ARG 2 objective METHOD method_1159 getTeams ()Ljava/util/Collection; METHOD method_1160 updateScoreboardTeamAndPlayers (Lnet/minecraft/class_268;)V + ARG 1 team METHOD method_1161 (Lnet/minecraft/class_2499;Lnet/minecraft/class_267;)V ARG 1 score METHOD method_1162 forEachScore (Lnet/minecraft/class_274;Ljava/lang/String;Ljava/util/function/Consumer;)V @@ -30,6 +35,7 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 3 action METHOD method_1163 getObjectiveNames ()Ljava/util/Collection; METHOD method_1164 getPlayerTeam (Ljava/lang/String;)Lnet/minecraft/class_268; + ARG 1 playerName METHOD method_1165 getObjective (Ljava/lang/String;)Lnet/minecraft/class_266; ARG 1 name METHOD method_1166 getPlayerObjectives (Ljava/lang/String;)Ljava/util/Map; @@ -40,12 +46,14 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 2 criterion ARG 3 displayName ARG 4 renderType - METHOD method_1169 toTag ()Lnet/minecraft/class_2499; + METHOD method_1169 toNbt ()Lnet/minecraft/class_2499; METHOD method_1170 getNullableObjective (Ljava/lang/String;)Lnet/minecraft/class_266; ARG 1 name METHOD method_1171 addTeam (Ljava/lang/String;)Lnet/minecraft/class_268; + ARG 1 name METHOD method_1172 addPlayerToTeam (Ljava/lang/String;Lnet/minecraft/class_268;)Z ARG 1 playerName + ARG 2 team METHOD method_1173 updateRemovedObjective (Lnet/minecraft/class_266;)V ARG 1 objective METHOD method_1175 updateExistingObjective (Lnet/minecraft/class_266;)V @@ -74,16 +82,21 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard METHOD method_1186 getDisplaySlotNames ()[Ljava/lang/String; METHOD method_1187 (Ljava/lang/String;Lnet/minecraft/class_266;)Lnet/minecraft/class_267; ARG 2 objective - METHOD method_1188 fromTag (Lnet/minecraft/class_2499;)V + METHOD method_1188 readNbt (Lnet/minecraft/class_2499;)V + ARG 1 list METHOD method_1189 getObjectiveForSlot (I)Lnet/minecraft/class_266; + ARG 1 slot METHOD method_1190 updatePlayerScore (Ljava/lang/String;Lnet/minecraft/class_266;)V ARG 1 playerName ARG 2 objective METHOD method_1191 removeTeam (Lnet/minecraft/class_268;)V + ARG 1 team METHOD method_1192 getDisplaySlotId (Ljava/lang/String;)I ARG 0 slotName METHOD method_1193 updateRemovedTeam (Lnet/minecraft/class_268;)V + ARG 1 team METHOD method_1194 removeObjective (Lnet/minecraft/class_266;)V ARG 1 objective METHOD method_1195 clearPlayerTeam (Ljava/lang/String;)Z + ARG 1 playerName METHOD method_1196 getTeamNames ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping index 303f221a67..9b94c02e03 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping @@ -1,23 +1,26 @@ CLASS net/minecraft/class_274 net/minecraft/scoreboard/ScoreboardCriterion FIELD field_1454 name Ljava/lang/String; - FIELD field_1455 OBJECTIVES Ljava/util/Map; + FIELD field_1455 CRITERIA Ljava/util/Map; + COMMENT A map of all scoreboard criteria by their names. + COMMENT Updated automatically in the constructor. FIELD field_1458 KILLED_BY_TEAMS [Lnet/minecraft/class_274; FIELD field_1461 readOnly Z FIELD field_1466 TEAM_KILLS [Lnet/minecraft/class_274; - FIELD field_1467 criterionType Lnet/minecraft/class_274$class_275; + FIELD field_1467 defaultRenderType Lnet/minecraft/class_274$class_275; METHOD (Ljava/lang/String;)V ARG 1 name METHOD (Ljava/lang/String;ZLnet/minecraft/class_274$class_275;)V ARG 1 name ARG 2 readOnly - METHOD method_1223 createStatCriterion (Lnet/minecraft/class_3448;Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 3 defaultRenderType + METHOD method_1223 getOrCreateStatCriterion (Lnet/minecraft/class_3448;Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 0 statType ARG 1 id - METHOD method_1224 createStatCriterion (Ljava/lang/String;)Ljava/util/Optional; + METHOD method_1224 getOrCreateStatCriterion (Ljava/lang/String;)Ljava/util/Optional; ARG 0 name METHOD method_1225 getName ()Ljava/lang/String; METHOD method_1226 isReadOnly ()Z - METHOD method_1227 getCriterionType ()Lnet/minecraft/class_274$class_275; + METHOD method_1227 getDefaultRenderType ()Lnet/minecraft/class_274$class_275; CLASS class_275 RenderType FIELD field_1469 name Ljava/lang/String; FIELD field_1470 CRITERION_TYPES Ljava/util/Map; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping index b435774922..e69c03fc83 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_266 net/minecraft/scoreboard/ScoreboardObjective ARG 2 name ARG 3 criterion ARG 4 displayName + ARG 5 renderType METHOD method_1113 getName ()Ljava/lang/String; METHOD method_1114 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_1115 setRenderType (Lnet/minecraft/class_274$class_275;)V diff --git a/mappings/net/minecraft/scoreboard/ScoreboardPlayerScore.mapping b/mappings/net/minecraft/scoreboard/ScoreboardPlayerScore.mapping index 06e091cdd5..79b36e6da4 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardPlayerScore.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardPlayerScore.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_267 net/minecraft/scoreboard/ScoreboardPlayerScore ARG 3 playerName METHOD method_1122 getScoreboard ()Lnet/minecraft/class_269; METHOD method_1124 incrementScore (I)V + ARG 1 amount METHOD method_1125 setLocked (Z)V ARG 1 locked METHOD method_1126 getScore ()I diff --git a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping index a5fda3c8a0..a0872b12f0 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping @@ -2,12 +2,17 @@ CLASS net/minecraft/class_273 net/minecraft/scoreboard/ScoreboardState FIELD field_1449 scoreboard Lnet/minecraft/class_269; FIELD field_1450 tag Lnet/minecraft/class_2487; FIELD field_1451 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_1215 deserializeTeamPlayers (Lnet/minecraft/class_268;Lnet/minecraft/class_2499;)V + METHOD method_1215 readTeamPlayersNbt (Lnet/minecraft/class_268;Lnet/minecraft/class_2499;)V ARG 1 team - METHOD method_1216 serializeObjectives ()Lnet/minecraft/class_2499; - METHOD method_1217 serializeTeams ()Lnet/minecraft/class_2499; + ARG 2 nbt + METHOD method_1216 objectivesToNbt ()Lnet/minecraft/class_2499; + METHOD method_1217 teamsToNbt ()Lnet/minecraft/class_2499; METHOD method_1218 setScoreboard (Lnet/minecraft/class_269;)V - METHOD method_1219 deserializeTeams (Lnet/minecraft/class_2499;)V - METHOD method_1220 deserializeObjectives (Lnet/minecraft/class_2499;)V - METHOD method_1221 deserializeDisplaySlots (Lnet/minecraft/class_2487;)V - METHOD method_1222 serializeSlots (Lnet/minecraft/class_2487;)V + METHOD method_1219 readTeamsNbt (Lnet/minecraft/class_2499;)V + ARG 1 nbt + METHOD method_1220 readObjectivesNbt (Lnet/minecraft/class_2499;)V + ARG 1 nbt + METHOD method_1221 readDisplaySlotsNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt + METHOD method_1222 writeDisplaySlotsNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt diff --git a/mappings/net/minecraft/scoreboard/Team.mapping b/mappings/net/minecraft/scoreboard/Team.mapping index 31776b2356..ef9b825adc 100644 --- a/mappings/net/minecraft/scoreboard/Team.mapping +++ b/mappings/net/minecraft/scoreboard/Team.mapping @@ -15,21 +15,34 @@ CLASS net/minecraft/class_268 net/minecraft/scoreboard/Team ARG 1 scoreboard ARG 2 name METHOD method_1133 setDeathMessageVisibilityRule (Lnet/minecraft/class_270$class_272;)V + ARG 1 deathMessageVisibilityRule METHOD method_1135 setFriendlyFireAllowed (Z)V ARG 1 friendlyFire METHOD method_1136 getSuffix ()Lnet/minecraft/class_2561; METHOD method_1137 setDisplayName (Lnet/minecraft/class_2561;)V + ARG 1 displayName METHOD method_1138 setPrefix (Lnet/minecraft/class_2561;)V + ARG 1 prefix METHOD method_1139 setSuffix (Lnet/minecraft/class_2561;)V + ARG 1 suffix METHOD method_1140 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_1141 setColor (Lnet/minecraft/class_124;)V ARG 1 color - METHOD method_1142 modifyText (Lnet/minecraft/class_270;Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; + METHOD method_1142 decorateName (Lnet/minecraft/class_270;Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; + COMMENT Decorates the name of an entity with the prefix, suffix and color of the team. + COMMENT If the team is null, returns a copy of the name. + ARG 0 team + COMMENT the team, can be null + ARG 1 name + COMMENT the name to be decorated METHOD method_1143 setShowFriendlyInvisibles (Z)V ARG 1 showFriendlyInvisible METHOD method_1144 getPrefix ()Lnet/minecraft/class_2561; METHOD method_1145 setCollisionRule (Lnet/minecraft/class_270$class_271;)V + ARG 1 collisionRule METHOD method_1146 setFriendlyFlagsBitwise (I)V + ARG 1 flags METHOD method_1147 getFriendlyFlagsBitwise ()I METHOD method_1148 getFormattedName ()Lnet/minecraft/class_5250; METHOD method_1149 setNameTagVisibilityRule (Lnet/minecraft/class_270$class_272;)V + ARG 1 nameTagVisibilityRule diff --git a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping index e04627d3ea..b6e40b313f 100644 --- a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping @@ -14,3 +14,4 @@ CLASS net/minecraft/class_1706 net/minecraft/screen/AnvilScreenHandler METHOD method_20398 getNextCost (I)I ARG 0 cost METHOD method_7625 setNewItemName (Ljava/lang/String;)V + ARG 1 newItemName diff --git a/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping b/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping index 570b43b0d6..0c83601436 100644 --- a/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping +++ b/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3910 net/minecraft/screen/CartographyTableScreenHandler FIELD field_17293 inventory Lnet/minecraft/class_1263; FIELD field_17294 context Lnet/minecraft/class_3914; - FIELD field_19272 resultSlot Lnet/minecraft/class_1731; + FIELD field_19272 resultInventory Lnet/minecraft/class_1731; FIELD field_20382 lastTakeResultTime J METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index 733ea6b658..9aa9b6ad55 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -3,10 +3,10 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler FIELD field_17493 type Lnet/minecraft/class_3917; FIELD field_7757 quickCraftSlots Ljava/util/Set; FIELD field_7758 actionId S - FIELD field_7759 quickCraftButton I + FIELD field_7759 quickCraftStage I FIELD field_7760 restrictedPlayers Ljava/util/Set; FIELD field_7761 slots Ljava/util/List; - FIELD field_7762 quickCraftStage I + FIELD field_7762 quickCraftButton I FIELD field_7763 syncId I FIELD field_7764 trackedStacks Lnet/minecraft/class_2371; COMMENT A list of item stacks that is used for tracking changes in {@link #sendContentUpdates()}. @@ -22,6 +22,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 0 inventory ARG 1 expectedSize METHOD method_17360 addProperties (Lnet/minecraft/class_3913;)V + ARG 1 propertyDelegate METHOD method_17361 checkDataCount (Lnet/minecraft/class_3913;I)V COMMENT Checks that the size of the {@code data} is at least as large as the {@code expectedCount}. COMMENT @@ -29,6 +30,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 0 data ARG 1 expectedCount METHOD method_17362 addProperty (Lnet/minecraft/class_3915;)Lnet/minecraft/class_3915; + ARG 1 property METHOD method_17695 canUse (Lnet/minecraft/class_3914;Lnet/minecraft/class_1657;Lnet/minecraft/class_2248;)Z ARG 0 context ARG 1 player diff --git a/mappings/net/minecraft/screen/ScreenHandlerContext.mapping b/mappings/net/minecraft/screen/ScreenHandlerContext.mapping index 395f94f3f8..fc7dcee90d 100644 --- a/mappings/net/minecraft/screen/ScreenHandlerContext.mapping +++ b/mappings/net/minecraft/screen/ScreenHandlerContext.mapping @@ -8,9 +8,24 @@ CLASS net/minecraft/class_3914 net/minecraft/screen/ScreenHandlerContext ARG 0 world ARG 1 pos METHOD method_17393 run (Ljava/util/function/BiConsumer;)V + COMMENT Runs a {@link BiConsumer} with this context's world and position + COMMENT if this context is active. ARG 1 function - METHOD method_17395 run (Ljava/util/function/BiFunction;)Ljava/util/Optional; - ARG 1 function - METHOD method_17396 run (Ljava/util/function/BiFunction;Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 function + METHOD method_17395 get (Ljava/util/function/BiFunction;)Ljava/util/Optional; + COMMENT Gets an optional value from this context's world and position + COMMENT with a {@link BiFunction} getter. + COMMENT + COMMENT @return a present {@link Optional} with the getter's return value, + COMMENT or {@link Optional#empty()} if this context is empty + ARG 1 getter + COMMENT a function that gets a non-null value from this context's world and position + METHOD method_17396 get (Ljava/util/function/BiFunction;Ljava/lang/Object;)Ljava/lang/Object; + COMMENT Gets a value from this context's world and position + COMMENT with a {@link BiFunction} getter. + COMMENT + COMMENT @return the getter's return value if this context is active, + COMMENT the default value otherwise + ARG 1 getter + COMMENT a function that gets a non-null value from this context's world and position ARG 2 defaultValue + COMMENT a fallback default value, used if this context is empty diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping index a902736db5..7d6597b95f 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -15,8 +15,9 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot METHOD method_7668 markDirty ()V METHOD method_7669 onCrafted (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_7670 onStackChanged (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V - ARG 1 originalItem + METHOD method_7670 onQuickTransfer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V + ARG 1 newItem + ARG 2 original METHOD method_7671 takeStack (I)Lnet/minecraft/class_1799; ARG 1 amount METHOD method_7672 onTake (I)V diff --git a/mappings/net/minecraft/screen/slot/SlotActionType.mapping b/mappings/net/minecraft/screen/slot/SlotActionType.mapping index 8e291b45fd..304359b496 100644 --- a/mappings/net/minecraft/screen/slot/SlotActionType.mapping +++ b/mappings/net/minecraft/screen/slot/SlotActionType.mapping @@ -2,15 +2,15 @@ CLASS net/minecraft/class_1713 net/minecraft/screen/slot/SlotActionType FIELD field_7789 QUICK_CRAFT Lnet/minecraft/class_1713; COMMENT Drags items between multiple slots. This is usually triggered by the player clicking and dragging between slots. COMMENT - COMMENT

This action happens in 3 stages. Stage 0 signals that the drag has begun, and stage 2 signals that the drag has ended. In between multiple stage 1s signal which slots were dragged on.

+ COMMENT

This action happens in 3 stages. Stage 0 signals that the drag has begun, and stage 2 signals that the drag has ended. In between multiple stage 1s signal which slots were dragged on. COMMENT - COMMENT

The stage is packed into the click data along with the mouse button that was clicked. See {@link net.minecraft.screen.ScreenHandler#packQuickCraftData(int, int) ScreenHandler.packQuickCraftData(int, int)} for details.

+ COMMENT

The stage is packed into the click data along with the mouse button that was clicked. See {@link net.minecraft.screen.ScreenHandler#packQuickCraftData(int, int) ScreenHandler.packQuickCraftData(int, int)} for details. FIELD field_7790 PICKUP Lnet/minecraft/class_1713; COMMENT Performs a normal slot click. This can pickup or place items in the slot, possibly merging the cursor stack into the slot, or swapping the slot stack with the cursor stack if they can't be merged. FIELD field_7791 SWAP Lnet/minecraft/class_1713; COMMENT Exchanges items between a slot and a hotbar slot. This is usually triggered by the player pressing a 1-9 number key while hovering over a slot. COMMENT - COMMENT

When the action type is swap, the click data is the hotbar slot to swap with (0-8).

+ COMMENT

When the action type is swap, the click data is the hotbar slot to swap with (0-8). FIELD field_7793 PICKUP_ALL Lnet/minecraft/class_1713; COMMENT Replenishes the cursor stack with items from the screen handler. This is usually triggered by the player double clicking. FIELD field_7794 QUICK_MOVE Lnet/minecraft/class_1713; @@ -18,6 +18,6 @@ CLASS net/minecraft/class_1713 net/minecraft/screen/slot/SlotActionType FIELD field_7795 THROW Lnet/minecraft/class_1713; COMMENT Throws the item out of the inventory. This is usually triggered by the player pressing Q while hovering over a slot, or clicking outside the window. COMMENT - COMMENT

When the action type is throw, the click data determines whether to throw a whole stack (1) or a single item from that stack (0).

+ COMMENT

When the action type is throw, the click data determines whether to throw a whole stack (1) or a single item from that stack (0). FIELD field_7796 CLONE Lnet/minecraft/class_1713; COMMENT Clones the item in the slot. Usually triggered by middle clicking an item in creative mode. diff --git a/mappings/net/minecraft/server/BannedIpList.mapping b/mappings/net/minecraft/server/BannedIpList.mapping index c7345c3e89..7329c5b333 100644 --- a/mappings/net/minecraft/server/BannedIpList.mapping +++ b/mappings/net/minecraft/server/BannedIpList.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_3317 net/minecraft/server/BannedIpList METHOD method_14526 stringifyAddress (Ljava/net/SocketAddress;)Ljava/lang/String; + ARG 1 address METHOD method_14527 isBanned (Ljava/net/SocketAddress;)Z ARG 1 ip METHOD method_14528 get (Ljava/net/SocketAddress;)Lnet/minecraft/class_3320; + ARG 1 address METHOD method_14529 isBanned (Ljava/lang/String;)Z ARG 1 ip diff --git a/mappings/net/minecraft/server/BannedPlayerList.mapping b/mappings/net/minecraft/server/BannedPlayerList.mapping index c714db15a7..e1d4889bd7 100644 --- a/mappings/net/minecraft/server/BannedPlayerList.mapping +++ b/mappings/net/minecraft/server/BannedPlayerList.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_3335 net/minecraft/server/BannedPlayerList METHOD method_14650 contains (Lcom/mojang/authlib/GameProfile;)Z + ARG 1 profile diff --git a/mappings/net/minecraft/server/LanServerPinger.mapping b/mappings/net/minecraft/server/LanServerPinger.mapping index 10b1737bd7..898606c7b8 100644 --- a/mappings/net/minecraft/server/LanServerPinger.mapping +++ b/mappings/net/minecraft/server/LanServerPinger.mapping @@ -15,12 +15,12 @@ CLASS net/minecraft/class_1133 net/minecraft/server/LanServerPinger COMMENT Creates a server announcement. COMMENT COMMENT 

-		COMMENT 
[MOTD]
 // Specifies the beginning of the message of the day
-		COMMENT 
A message of the day
 // The message of the day
-		COMMENT 
[/MOTD]
 // Specifies the end of the message of the day.
-		COMMENT 
[AD]
 // Specifies the beginning of the address and the port of the local server.
-		COMMENT 
the address of the local server.
 // Such as {@code 192.146.2.1:23132}
-		COMMENT 
[/AD]
 // Specifies the end of the address and port of the local server.
+		COMMENT {@code [MOTD]} // Specifies the beginning of the message of the day
+		COMMENT {@code A message of the day} // The message of the day
+		COMMENT {@code [/MOTD]} // Specifies the end of the message of the day.
+		COMMENT {@code [AD]} // Specifies the beginning of the address and the port of the local server.
+		COMMENT {@code the address of the local server.} // Such as {@code 192.146.2.1:23132}
+		COMMENT {@code [/AD]} // Specifies the end of the address and port of the local server.
 		COMMENT
COMMENT COMMENT

An example of a complete announcement: diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 9e5a2f98ce..ae1bba8143 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -137,7 +137,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager METHOD method_14616 broadcastChatMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Ljava/util/UUID;)V ARG 1 message ARG 2 type - ARG 3 senderUuid + ARG 3 sender METHOD method_14617 saveAllPlayerData ()V METHOD method_18241 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; ARG 1 vehicle diff --git a/mappings/net/minecraft/server/command/CommandOutput.mapping b/mappings/net/minecraft/server/command/CommandOutput.mapping index 699cb36a25..a123e7893a 100644 --- a/mappings/net/minecraft/server/command/CommandOutput.mapping +++ b/mappings/net/minecraft/server/command/CommandOutput.mapping @@ -6,4 +6,4 @@ CLASS net/minecraft/class_2165 net/minecraft/server/command/CommandOutput METHOD method_9202 shouldTrackOutput ()Z METHOD method_9203 sendSystemMessage (Lnet/minecraft/class_2561;Ljava/util/UUID;)V ARG 1 message - ARG 2 senderUuid + ARG 2 sender diff --git a/mappings/net/minecraft/server/command/DataCommand.mapping b/mappings/net/minecraft/server/command/DataCommand.mapping index 1f509703b3..cb28e730d9 100644 --- a/mappings/net/minecraft/server/command/DataCommand.mapping +++ b/mappings/net/minecraft/server/command/DataCommand.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand METHOD method_13901 executeMerge (Lnet/minecraft/class_2168;Lnet/minecraft/class_3162;Lnet/minecraft/class_2487;)I ARG 0 source ARG 1 object - ARG 2 tag + ARG 2 nbt METHOD method_13903 executeGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_3162;Lnet/minecraft/class_2203$class_2209;D)I ARG 0 source ARG 1 object @@ -31,9 +31,9 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 1 object METHOD method_13910 executeInsert (ILnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I ARG 0 integer - ARG 1 sourceTag + ARG 1 sourceNbt ARG 2 path - ARG 3 tags + ARG 3 elements METHOD method_13916 executeGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_3162;Lnet/minecraft/class_2203$class_2209;)I ARG 0 source ARG 1 object @@ -42,8 +42,8 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 0 context ARG 1 objectType ARG 2 modifier - ARG 3 tags - METHOD method_13921 getTag (Lnet/minecraft/class_2203$class_2209;Lnet/minecraft/class_3162;)Lnet/minecraft/class_2520; + ARG 3 elements + METHOD method_13921 getNbt (Lnet/minecraft/class_2203$class_2209;Lnet/minecraft/class_3162;)Lnet/minecraft/class_2520; ARG 0 path ARG 1 object CLASS class_3165 ModifyOperation diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 6b62af67e1..7202568623 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 source ARG 1 object ARG 2 path - ARG 3 tagSetter + ARG 3 nbtSetter ARG 4 requestResult METHOD method_13271 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher @@ -72,6 +72,8 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 positive ARG 1 condition METHOD method_22829 testLootCondition (Lnet/minecraft/class_2168;Lnet/minecraft/class_5341;)Z + ARG 0 source + ARG 1 condition CLASS class_3051 ExistsCondition METHOD test (Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context diff --git a/mappings/net/minecraft/server/command/GameModeCommand.mapping b/mappings/net/minecraft/server/command/GameModeCommand.mapping index 9208926a04..4c86d7aa2c 100644 --- a/mappings/net/minecraft/server/command/GameModeCommand.mapping +++ b/mappings/net/minecraft/server/command/GameModeCommand.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_3064 net/minecraft/server/command/GameModeCommand ARG 2 gameMode METHOD method_13388 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher - METHOD method_13390 setGameMode (Lnet/minecraft/class_2168;Lnet/minecraft/class_3222;Lnet/minecraft/class_1934;)V + METHOD method_13390 sendFeedback (Lnet/minecraft/class_2168;Lnet/minecraft/class_3222;Lnet/minecraft/class_1934;)V ARG 0 source ARG 1 player ARG 2 gameMode diff --git a/mappings/net/minecraft/server/command/LocateBiomeCommand.mapping b/mappings/net/minecraft/server/command/LocateBiomeCommand.mapping index 03cf3db814..1947a60791 100644 --- a/mappings/net/minecraft/server/command/LocateBiomeCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateBiomeCommand.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_4799 net/minecraft/server/command/LocateBiomeCommand ARG 0 dispatcher METHOD method_24495 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;)I ARG 0 source + ARG 1 id diff --git a/mappings/net/minecraft/server/command/LocateCommand.mapping b/mappings/net/minecraft/server/command/LocateCommand.mapping index 9ac29ba961..86bbf50792 100644 --- a/mappings/net/minecraft/server/command/LocateCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateCommand.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 0 dispatcher METHOD method_13457 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_3195;)I ARG 0 source + ARG 1 structure METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/lang/String;)I ARG 0 source ARG 1 structure diff --git a/mappings/net/minecraft/server/command/ScheduleCommand.mapping b/mappings/net/minecraft/server/command/ScheduleCommand.mapping index 87e398bf36..d709197e26 100644 --- a/mappings/net/minecraft/server/command/ScheduleCommand.mapping +++ b/mappings/net/minecraft/server/command/ScheduleCommand.mapping @@ -4,5 +4,8 @@ CLASS net/minecraft/class_3112 net/minecraft/server/command/ScheduleCommand FIELD field_20854 SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; METHOD method_13566 execute (Lnet/minecraft/class_2168;Lcom/mojang/datafixers/util/Pair;IZ)I ARG 0 source + ARG 1 function + ARG 2 time + ARG 3 replace METHOD method_13567 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 8bedee46a8..2486c9feb7 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource + COMMENT Represents a command source used on server side. + COMMENT + COMMENT @see MinecraftServer#getCommandSource() + COMMENT @see Entity#getCommandSource() FIELD field_9815 level I FIELD field_9816 entityAnchor Lnet/minecraft/class_2183$class_2184; FIELD field_9817 position Lnet/minecraft/class_243; @@ -79,6 +83,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource METHOD method_9227 withWorld (Lnet/minecraft/class_3218;)Lnet/minecraft/class_2168; ARG 1 world METHOD method_9228 getEntity ()Lnet/minecraft/class_1297; + COMMENT Gets the entity from this command source or returns null if this command source is not an entity. METHOD method_9229 getEntityOrThrow ()Lnet/minecraft/class_1297; COMMENT Gets the entity from this command source or throws a command syntax exception if this command source is not an entity. METHOD method_9230 withMaxLevel (I)Lnet/minecraft/class_2168; diff --git a/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping b/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping index f43a7ef365..e67906a7e9 100644 --- a/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping +++ b/mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping @@ -17,10 +17,15 @@ CLASS net/minecraft/class_3131 net/minecraft/server/command/SpreadPlayersCommand ARG 1 center ARG 2 spreadDistance ARG 3 maxRange + ARG 4 maxY + ARG 5 respectTeams + ARG 6 players METHOD method_13657 getMinDistance (Ljava/util/Collection;Lnet/minecraft/class_3218;[Lnet/minecraft/class_3131$class_3132;IZ)D ARG 0 entities ARG 1 world ARG 2 piles + ARG 3 maxY + ARG 4 respectTeams METHOD method_13661 spread (Lnet/minecraft/class_241;DLnet/minecraft/class_3218;Ljava/util/Random;DDDDI[Lnet/minecraft/class_3131$class_3132;Z)V ARG 0 center ARG 1 spreadDistance @@ -30,6 +35,9 @@ CLASS net/minecraft/class_3131 net/minecraft/server/command/SpreadPlayersCommand ARG 7 minZ ARG 9 maxX ARG 11 maxZ + ARG 13 maxY + ARG 14 piles + ARG 15 respectTeams CLASS class_3132 Pile FIELD field_13736 z D FIELD field_13737 x D diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 211287b889..9e794209b7 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -8,9 +8,12 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand METHOD method_22266 executeRun (Lnet/minecraft/class_2168;Lnet/minecraft/class_4529;I)I ARG 0 source ARG 1 testFunction + ARG 2 rotationSteps METHOD method_22267 executeRunAll (Lnet/minecraft/class_2168;Ljava/lang/String;II)I ARG 0 source ARG 1 testClass + ARG 2 rotationSteps + ARG 3 sizeZ METHOD method_22268 executeCreate (Lnet/minecraft/class_2168;Ljava/lang/String;III)I ARG 0 source ARG 1 structure @@ -20,6 +23,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand METHOD method_22269 run (Lnet/minecraft/class_2168;Ljava/util/Collection;II)V ARG 0 source ARG 1 testFunctions + ARG 2 rotationSteps METHOD method_22270 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_22272 run (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_4524;)V @@ -45,6 +49,8 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 1 structure METHOD method_22284 executeRunAll (Lnet/minecraft/class_2168;II)I ARG 0 source + ARG 1 rotationSteps + ARG 2 sizeZ METHOD method_22285 executeImport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 1 structure METHOD method_23647 setWorld (Lnet/minecraft/class_4529;Lnet/minecraft/class_3218;)V diff --git a/mappings/net/minecraft/server/dedicated/AbstractPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/AbstractPropertiesHandler.mapping index 4370df8df3..64aca23eb8 100644 --- a/mappings/net/minecraft/server/dedicated/AbstractPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/AbstractPropertiesHandler.mapping @@ -56,6 +56,8 @@ CLASS net/minecraft/class_3808 net/minecraft/server/dedicated/AbstractProperties METHOD method_16739 create (Lnet/minecraft/class_5455;Ljava/util/Properties;)Lnet/minecraft/class_3808; COMMENT Creates another property handler with the same type as this one from the COMMENT passed new map of properties. + ARG 1 registryManager + ARG 2 properties METHOD method_16740 parseBoolean (Ljava/lang/String;Z)Z ARG 1 key ARG 2 fallback diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping index 5324fe66e2..c1a4c8dafd 100644 --- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -18,3 +18,4 @@ CLASS net/minecraft/class_3176 net/minecraft/server/dedicated/MinecraftDedicated METHOD method_13950 createResourcePackHash ()Ljava/lang/String; METHOD method_13951 convertData ()Z METHOD method_16712 setUseWhitelist (Z)V + ARG 1 useWhitelist diff --git a/mappings/net/minecraft/server/dedicated/ServerMBean.mapping b/mappings/net/minecraft/server/dedicated/ServerMBean.mapping index 32a8f0c8b3..2bb1bc7ff6 100644 --- a/mappings/net/minecraft/server/dedicated/ServerMBean.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerMBean.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_5169 net/minecraft/server/dedicated/ServerMBean COMMENT A dynamic management object for a Minecraft Server. COMMENT COMMENT

It exposes the average tick time and the historical tick times of the - COMMENT Minecraft Server.

+ COMMENT Minecraft Server. COMMENT COMMENT @see javax.management.DynamicMBean FIELD field_23970 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index 3b5ec4a192..5d18f6975f 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -49,3 +49,4 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_25802 rateLimit I FIELD field_26899 textFilteringConfig Ljava/lang/String; METHOD method_16714 load (Lnet/minecraft/class_5455;Ljava/nio/file/Path;)Lnet/minecraft/class_3806; + ARG 0 registryManager diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index cd3451f773..ceb254e4f5 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -7,7 +7,14 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction METHOD method_9193 getElements ()[Lnet/minecraft/class_2158$class_2161; METHOD method_9194 getId ()Lnet/minecraft/class_2960; METHOD method_9195 create (Lnet/minecraft/class_2960;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2168;Ljava/util/List;)Lnet/minecraft/class_2158; + COMMENT Parses a function in the context of {@code source}. + COMMENT + COMMENT

Any syntax errors, such as improper comment lines or unknown commands, will be thrown at this point. ARG 0 id + ARG 1 dispatcher + ARG 2 source + ARG 3 lines + COMMENT the raw lines (including comments) read from a function file CLASS class_2159 LazyContainer FIELD field_9807 id Lnet/minecraft/class_2960; FIELD field_9808 function Ljava/util/Optional; diff --git a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping index 4910d2b03a..b3db68814e 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping @@ -10,5 +10,12 @@ CLASS net/minecraft/class_1132 net/minecraft/server/integrated/IntegratedServer ARG 2 client ARG 3 registryManager ARG 4 session + ARG 5 dataPackManager + ARG 6 serverResourceManager + ARG 7 saveProperties + ARG 8 sessionService + ARG 9 gameProfileRepo + ARG 10 userCache + ARG 11 worldGenerationProgressListenerFactory METHOD method_4817 setLocalPlayerUuid (Ljava/util/UUID;)V ARG 1 localPlayerUuid diff --git a/mappings/net/minecraft/server/network/DebugInfoSender.mapping b/mappings/net/minecraft/server/network/DebugInfoSender.mapping index 5919d0e5d1..d813b85287 100644 --- a/mappings/net/minecraft/server/network/DebugInfoSender.mapping +++ b/mappings/net/minecraft/server/network/DebugInfoSender.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_4209 net/minecraft/server/network/DebugInfoSender ARG 0 world ARG 1 pos METHOD method_19474 sendStructureStart (Lnet/minecraft/class_5281;Lnet/minecraft/class_3449;)V + ARG 0 world ARG 1 structureStart METHOD method_19774 sendBrainDebugData (Lnet/minecraft/class_1309;)V ARG 0 living diff --git a/mappings/net/minecraft/server/network/IntegratedServerHandshakeNetworkHandler.mapping b/mappings/net/minecraft/server/network/IntegratedServerHandshakeNetworkHandler.mapping deleted file mode 100644 index 62c3237dc3..0000000000 --- a/mappings/net/minecraft/server/network/IntegratedServerHandshakeNetworkHandler.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_3240 net/minecraft/server/network/IntegratedServerHandshakeNetworkHandler - FIELD field_14103 connection Lnet/minecraft/class_2535; - FIELD field_14104 server Lnet/minecraft/server/MinecraftServer; - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V - ARG 1 server - ARG 2 connection diff --git a/mappings/net/minecraft/server/network/LocalServerHandshakeNetworkHandler.mapping b/mappings/net/minecraft/server/network/LocalServerHandshakeNetworkHandler.mapping new file mode 100644 index 0000000000..5350ecf9d0 --- /dev/null +++ b/mappings/net/minecraft/server/network/LocalServerHandshakeNetworkHandler.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_3240 net/minecraft/server/network/LocalServerHandshakeNetworkHandler + COMMENT A server handshake network handler that exclusively handles local + COMMENT connections. + COMMENT + COMMENT

A local connection is one between a Minecraft client and the + COMMENT Integrated Server it is running. + COMMENT + COMMENT @see net.minecraft.server.ServerNetworkIo#bindLocal() + FIELD field_14103 connection Lnet/minecraft/class_2535; + FIELD field_14104 server Lnet/minecraft/server/MinecraftServer; + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V + ARG 1 server + ARG 2 connection diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 9e1195b303..b10a0e3bf0 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -1,10 +1,27 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHandler + COMMENT The server login network handler. + COMMENT + COMMENT

It listens to packets on the netty event loop and is ticked on the + COMMENT server thread simultaneously. + COMMENT + COMMENT @implSpec The vanilla implementation is created by a handshake network + COMMENT handler. It first receives a hello packet from the client. If it's in + COMMENT online mode, it goes through an additional authentication process. Then + COMMENT it optionally sends a network compression packet next. Finally, when it + COMMENT can accept the player (no player UUID conflicts), it will accept the + COMMENT player by sending a login success packet and then transitions the + COMMENT connection's packet listener to a server play network handler. FIELD field_14156 loginTicks I - FIELD field_14157 authenticatorThreadId Ljava/util/concurrent/atomic/AtomicInteger; + FIELD field_14157 NEXT_AUTHENTICATOR_THREAD_ID Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_14158 connection Lnet/minecraft/class_2535; FIELD field_14159 secretKey Ljavax/crypto/SecretKey; FIELD field_14160 profile Lcom/mojang/authlib/GameProfile; - FIELD field_14161 player Lnet/minecraft/class_3222; + FIELD field_14161 delayedPlayer Lnet/minecraft/class_3222; + COMMENT The delayed player, waiting to join the server once the existing player + COMMENT with the same UUID is gone. + COMMENT + COMMENT

This will only be non-{@code null} if the state is delay-accept, and is reset + COMMENT to {@code null} once the player is accepted. FIELD field_14162 server Lnet/minecraft/server/MinecraftServer; FIELD field_14163 state Lnet/minecraft/class_3248$class_3249; FIELD field_14164 RANDOM Ljava/util/Random; @@ -20,7 +37,20 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa ARG 1 reason METHOD method_14383 getConnectionInfo ()Ljava/lang/String; METHOD method_14384 acceptPlayer ()V + COMMENT Creates the player to be added to the server and adds it to the server. + COMMENT + COMMENT

If a player with the same UUID is in the world, it will create the + COMMENT player and transition to the delay accept state. + COMMENT + COMMENT @apiNote This method should only be called on the server thread. METHOD method_18785 tick ()V + COMMENT Ticks this login network handler. + COMMENT + COMMENT

This accepts the player to the server if ready. If the state is delay + COMMENT accept, it checks if the old player with the same UUID is gone and + COMMENT admits the player. + COMMENT + COMMENT @apiNote This should only be called on the server thread. CLASS 1 METHOD method_14386 getClientAddress ()Ljava/net/InetAddress; CLASS class_3249 State diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index c627eba385..2d7d2e1c1f 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_14126 updatedY D FIELD field_14127 connection Lnet/minecraft/class_2535; FIELD field_14128 lastTickZ D - FIELD field_14129 ridingEntity Z + FIELD field_14129 vehicleFloating Z FIELD field_14130 lastTickX D FIELD field_14131 floating Z FIELD field_14132 transactions Lit/unimi/dsi/fastutil/ints/Int2ShortMap; @@ -36,12 +36,13 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 1 server ARG 2 connection ARG 3 player - METHOD method_14360 teleportRequest (DDDFFLjava/util/Set;)V + METHOD method_14360 requestTeleport (DDDFFLjava/util/Set;)V ARG 1 x ARG 3 y ARG 5 z ARG 7 yaw ARG 8 pitch + ARG 9 flags METHOD method_14362 validatePlayerMove (Lnet/minecraft/class_2828;)Z ARG 0 packet METHOD method_14363 requestTeleport (DDDFF)V @@ -65,6 +66,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_18784 tick ()V METHOD method_19507 isHost ()Z METHOD method_20630 isPlayerNotCollidingWithBlocks (Lnet/minecraft/class_4538;Lnet/minecraft/class_238;)Z + ARG 1 world + ARG 2 box METHOD method_27913 canPlace (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;)Z COMMENT Checks if a player can place a block or fluid from a bucket. COMMENT diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 382f5a5d3d..6148108b42 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -24,7 +24,13 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_13987 networkHandler Lnet/minecraft/class_3244; FIELD field_13988 removedEntities Ljava/util/List; FIELD field_13989 notInAnyWorld Z - FIELD field_13990 cameraPosition Lnet/minecraft/class_4076; + FIELD field_13990 watchedSection Lnet/minecraft/class_4076; + COMMENT A chunk section position indicating where the player's client is currently + COMMENT watching chunks from. Used referentially for the game to update the chunks + COMMENT watched by this player. + COMMENT + COMMENT @see #getWatchedSection() + COMMENT @see #setWatchedSection(ChunkSectionPos) FIELD field_13991 skipPacketSlotUpdates Z FIELD field_13992 levitationStartPos Lnet/minecraft/class_243; FIELD field_13993 clientChatVisibility Lnet/minecraft/class_1659; @@ -75,9 +81,18 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 playerName ARG 2 team METHOD method_14228 setExperiencePoints (I)V + ARG 1 points METHOD method_14230 isPvpEnabled ()Z METHOD method_14231 onDisconnect ()V - METHOD method_14232 getCameraPosition ()Lnet/minecraft/class_4076; + METHOD method_14232 getWatchedSection ()Lnet/minecraft/class_4076; + COMMENT Returns the chunk section position the player's client is currently watching + COMMENT from. This may differ from the chunk section the player is currently in. + COMMENT + COMMENT

This is only for chunk loading (watching) purpose. This is updated together + COMMENT with entity tracking, but they are separate mechanisms. + COMMENT + COMMENT @see #watchedSection + COMMENT @see #setWatchedSection(ChunkSectionPos) METHOD method_14234 updateLastActionTime ()V METHOD method_14235 onSpawn ()V METHOD method_14236 getAdvancementTracker ()Lnet/minecraft/class_2985; @@ -92,6 +107,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14245 moveToSpawn (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_14246 sendUnloadChunkPacket (Lnet/minecraft/class_1923;)V + ARG 1 chunkPos METHOD method_14247 closeScreenHandler ()V COMMENT Runs closing tasks for the current screen handler and COMMENT sets it to the {@code playerScreenHandler}. @@ -111,12 +127,18 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14254 sendMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Ljava/util/UUID;)V ARG 1 message ARG 2 type - ARG 3 senderUuid + ARG 3 sender METHOD method_14255 sendResourcePackUrl (Ljava/lang/String;Ljava/lang/String;)V ARG 1 url ARG 2 hash - METHOD method_17668 setCameraPosition (Lnet/minecraft/class_4076;)V - ARG 1 cameraPosition + METHOD method_17668 setWatchedSection (Lnet/minecraft/class_4076;)V + COMMENT Sets the chunk section position the player's client is currently watching + COMMENT from. This is usually called when the player moves to a new chunk section. + COMMENT + COMMENT @see #watchedSection + COMMENT @see #getWatchedSection() + ARG 1 section + COMMENT the updated section position METHOD method_18783 worldChanged (Lnet/minecraft/class_3218;)V ARG 1 origin METHOD method_26280 getSpawnPointPosition ()Lnet/minecraft/class_2338; @@ -141,5 +163,3 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 2 centerPos METHOD method_30631 getSpawnAngle ()F METHOD method_31273 getTextStream ()Lnet/minecraft/class_5513; - METHOD method_7346 ()V - COMMENT Closes the current handled screen and sends a screen closing packet to the client. diff --git a/mappings/net/minecraft/server/network/ServerRecipeBook.mapping b/mappings/net/minecraft/server/network/ServerRecipeBook.mapping index 776ce55da6..446d148036 100644 --- a/mappings/net/minecraft/server/network/ServerRecipeBook.mapping +++ b/mappings/net/minecraft/server/network/ServerRecipeBook.mapping @@ -7,9 +7,10 @@ CLASS net/minecraft/class_3441 net/minecraft/server/network/ServerRecipeBook METHOD method_14900 lockRecipes (Ljava/util/Collection;Lnet/minecraft/class_3222;)I ARG 1 recipes ARG 2 player - METHOD method_14901 fromTag (Lnet/minecraft/class_2487;Lnet/minecraft/class_1863;)V - ARG 1 tag - METHOD method_14902 toTag ()Lnet/minecraft/class_2487; + METHOD method_14901 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_1863;)V + ARG 1 nbt + ARG 2 recipeManager + METHOD method_14902 toNbt ()Lnet/minecraft/class_2487; METHOD method_14903 unlockRecipes (Ljava/util/Collection;Lnet/minecraft/class_3222;)I ARG 1 recipes ARG 2 player @@ -18,3 +19,4 @@ CLASS net/minecraft/class_3441 net/minecraft/server/network/ServerRecipeBook METHOD method_20732 handleList (Lnet/minecraft/class_2499;Ljava/util/function/Consumer;Lnet/minecraft/class_1863;)V ARG 1 list ARG 2 handler + ARG 3 recipeManager diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index cf76bea1c4..431206c5b4 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 4 levelUpdateListener ARG 5 playersWatchingChunkProvider METHOD method_13992 sendPacketToPlayersWatching (Lnet/minecraft/class_2596;Z)V + ARG 1 packet ARG 2 onlyOnWatchDistanceEdge METHOD method_13993 getChunkAt (Lnet/minecraft/class_2806;Lnet/minecraft/class_3898;)Ljava/util/concurrent/CompletableFuture; ARG 1 targetStatus @@ -41,6 +42,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder METHOD method_13994 getPos ()Lnet/minecraft/class_1923; METHOD method_14000 getSavingFuture ()Ljava/util/concurrent/CompletableFuture; METHOD method_14002 markForBlockUpdate (Lnet/minecraft/class_2338;)V + ARG 1 pos METHOD method_14003 getEntityTickingFuture ()Ljava/util/concurrent/CompletableFuture; METHOD method_14005 getLevel ()I METHOD method_14006 flushUpdates (Lnet/minecraft/class_2818;)V @@ -56,7 +58,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder METHOD method_14011 getTargetStatusForLevel (I)Lnet/minecraft/class_2806; ARG 0 level METHOD method_14012 markForLightUpdate (Lnet/minecraft/class_1944;I)V - ARG 1 type + ARG 1 lightType ARG 2 y COMMENT chunk section y coordinate METHOD method_15890 setLevel (I)V @@ -73,12 +75,16 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder METHOD method_20384 isAccessible ()Z METHOD method_20385 updateAccessibleStatus ()V METHOD method_20456 setCompletedChunk (Lnet/minecraft/class_2821;)V + ARG 1 chunk METHOD method_20725 getAccessibleFuture ()Ljava/util/concurrent/CompletableFuture; METHOD method_21737 getValidFutureFor (Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture; ARG 1 leastStatus METHOD method_23270 getCurrentStatus ()Lnet/minecraft/class_2806; METHOD method_23271 getLevelType ()Lnet/minecraft/class_3193$class_3194; METHOD method_30311 tryUpdateBlockEntityAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 world + ARG 2 pos + ARG 3 state CLASS class_3194 LevelType METHOD method_14014 isAfter (Lnet/minecraft/class_3193$class_3194;)Z ARG 1 levelType diff --git a/mappings/net/minecraft/server/world/ChunkTicket.mapping b/mappings/net/minecraft/server/world/ChunkTicket.mapping index d7ff93a2c5..a58f1c1365 100644 --- a/mappings/net/minecraft/server/world/ChunkTicket.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicket.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_3228 net/minecraft/server/world/ChunkTicket METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z - ARG 1 obj + ARG 1 o METHOD method_14281 getType ()Lnet/minecraft/class_3230; METHOD method_14283 getLevel ()I METHOD method_20627 isExpired (J)Z diff --git a/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping b/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping index f9afe511f5..3c2a6b8fc7 100644 --- a/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping +++ b/mappings/net/minecraft/server/world/PlayerChunkWatchingManager.mapping @@ -3,10 +3,16 @@ CLASS net/minecraft/class_3210 net/minecraft/server/world/PlayerChunkWatchingMan METHOD method_14081 movePlayer (JJLnet/minecraft/class_3222;)V ARG 1 prevPos ARG 3 currentPos + ARG 5 player METHOD method_14082 isWatchDisabled (Lnet/minecraft/class_3222;)Z + ARG 1 player METHOD method_14083 getPlayersWatchingChunk (J)Ljava/util/stream/Stream; METHOD method_14084 remove (JLnet/minecraft/class_3222;)V + ARG 3 player METHOD method_14085 add (JLnet/minecraft/class_3222;Z)V + ARG 3 player ARG 4 watchDisabled METHOD method_14086 disableWatch (Lnet/minecraft/class_3222;)V + ARG 1 player METHOD method_14087 enableWatch (Lnet/minecraft/class_3222;)V + ARG 1 player diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index be2e9017a0..ebc385119e 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -24,7 +24,12 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager METHOD method_12127 tick (Ljava/util/function/BooleanSupplier;)V ARG 1 shouldKeepTicking METHOD method_12129 getChunkGenerator ()Lnet/minecraft/class_2794; - METHOD method_14096 updateCameraPosition (Lnet/minecraft/class_3222;)V + METHOD method_14096 updatePosition (Lnet/minecraft/class_3222;)V + COMMENT Updates the chunk section position of the {@code player}. This can either be a + COMMENT result of the player's movement or its camera entity's movement. + COMMENT + COMMENT

This updates the section position player's client is currently watching and + COMMENT the player's position in its entity tracker. ARG 1 player METHOD method_14128 markForUpdate (Lnet/minecraft/class_2338;)V ARG 1 pos @@ -72,8 +77,12 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager ARG 1 holder ARG 2 maxLevel METHOD method_18753 unloadEntity (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_18754 sendToOtherNearbyPlayers (Lnet/minecraft/class_1297;Lnet/minecraft/class_2596;)V + ARG 1 entity + ARG 2 packet METHOD method_18755 loadEntity (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_19492 executeQueuedTasks ()Z METHOD method_19493 getPointOfInterestStorage ()Lnet/minecraft/class_4153; METHOD method_20585 isFutureReady (JLjava/util/function/Function;)Z @@ -86,6 +95,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager ARG 3 chunk ARG 4 status METHOD method_23273 getChunkLoadingDebugInfo (Lnet/minecraft/class_1923;)Ljava/lang/String; + ARG 1 pos METHOD method_27907 ifChunkLoaded (JLjava/util/function/Consumer;)V ARG 1 pos ARG 3 chunkConsumer diff --git a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping b/mappings/net/minecraft/server/world/ServerTickScheduler.mapping index 6715544703..214f2ce149 100644 --- a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping +++ b/mappings/net/minecraft/server/world/ServerTickScheduler.mapping @@ -11,11 +11,13 @@ CLASS net/minecraft/class_1949 net/minecraft/server/world/ServerTickScheduler ARG 1 world ARG 2 invalidObjPredicate ARG 3 idToName + ARG 4 tickConsumer METHOD method_20469 serializeScheduledTicks (Ljava/util/function/Function;Ljava/lang/Iterable;J)Lnet/minecraft/class_2499; ARG 0 identifierProvider ARG 1 scheduledTicks ARG 2 time METHOD method_20514 addScheduledTick (Lnet/minecraft/class_1954;)V + ARG 1 tick METHOD method_20596 transferTicksInBounds (Ljava/util/List;Ljava/util/Collection;Lnet/minecraft/class_3341;Z)Ljava/util/List; ARG 1 dst ARG 2 src @@ -25,9 +27,10 @@ CLASS net/minecraft/class_1949 net/minecraft/server/world/ServerTickScheduler METHOD method_8666 copyScheduledTicks (Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V ARG 1 box ARG 2 offset - METHOD method_8669 toTag (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2499; + METHOD method_8669 toNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2499; METHOD method_8670 tick ()V METHOD method_8671 getScheduledTicksInChunk (Lnet/minecraft/class_1923;ZZ)Ljava/util/List; + ARG 1 pos ARG 2 updateState ARG 3 getStaleTicks METHOD method_8672 getScheduledTicks (Lnet/minecraft/class_3341;ZZ)Ljava/util/List; diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index b5d0868fa8..960f850cd1 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -28,7 +28,14 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 2 workerExecutor ARG 3 session ARG 4 properties + ARG 5 worldKey + ARG 6 dimensionType + ARG 7 worldGenerationProgressListener + ARG 8 chunkGenerator ARG 9 debugWorld + ARG 10 seed + ARG 12 spawners + ARG 13 shouldTickTime METHOD method_14166 spawnParticles (Lnet/minecraft/class_3222;Lnet/minecraft/class_2394;ZDDDIDDDD)Z ARG 1 viewer ARG 2 particle @@ -57,6 +64,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_14189 tickBlock (Lnet/minecraft/class_1954;)V ARG 1 tick METHOD method_14190 getEntity (Ljava/util/UUID;)Lnet/minecraft/class_1297; + ARG 1 uuid METHOD method_14191 sendToPlayerIfNearby (Lnet/minecraft/class_3222;ZDDDLnet/minecraft/class_2596;)Z ARG 1 player ARG 2 force @@ -202,6 +210,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_30630 getSpawnAngle ()F METHOD method_30735 checkIfUuidExists (Ljava/util/UUID;)Lnet/minecraft/class_1297; METHOD method_30736 shouldCreateNewEntityWithPassenger (Lnet/minecraft/class_1297;)Z + ARG 1 entity METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_3195;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; ARG 1 feature diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 365e51c59a..1c431725fb 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -79,7 +79,7 @@ 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 getUpdatedChunkTag (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; + METHOD method_17979 getUpdatedChunkNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; ARG 1 pos METHOD method_18701 loadEntity (Lnet/minecraft/class_1297;)V METHOD method_18702 sendToOtherNearbyPlayers (Lnet/minecraft/class_1297;Lnet/minecraft/class_2596;)V @@ -92,7 +92,11 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_18704 getSquaredDistance (Lnet/minecraft/class_1923;Lnet/minecraft/class_1297;)D ARG 0 pos ARG 1 entity - METHOD method_18713 updateCameraPosition (Lnet/minecraft/class_3222;)V + METHOD method_18713 updatePosition (Lnet/minecraft/class_3222;)V + COMMENT Updates the chunk section position of the {@code player}. This updates the player + COMMENT position for both entity tracking and chunk loading (watching) logic. + COMMENT + COMMENT @see ServerChunkManager#updatePosition(ServerPlayerEntity) ARG 1 player METHOD method_18714 handlePlayerAddedOrRemoved (Lnet/minecraft/class_3222;Z)V ARG 1 player @@ -108,11 +112,17 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_18719 getChebyshevDistance (Lnet/minecraft/class_1923;Lnet/minecraft/class_3222;Z)I ARG 0 pos ARG 1 player - ARG 2 useCameraPosition + ARG 2 useWatchedPosition METHOD method_18722 doesNotGenerateChunks (Lnet/minecraft/class_3222;)Z ARG 1 player METHOD method_18724 isTooFarFromPlayersToSpawnMobs (Lnet/minecraft/class_1923;)Z - METHOD method_18727 tickPlayerMovement ()V + METHOD method_18727 tickEntityMovement ()V + COMMENT Ticks and updates the tracked status of each tracker. + COMMENT + COMMENT

This first checks if entities have changed chunk sections, and updates + COMMENT tracking status of those entities to all players. It then checks if any player + COMMENT has changed chunk sections, and updates all entities tracking status to those + COMMENT players. This ensures all possible updates are accounted for. METHOD method_19488 getPointOfInterestStorage ()Lnet/minecraft/class_4153; METHOD method_20441 releaseLightTicket (Lnet/minecraft/class_1923;)V ARG 1 pos diff --git a/mappings/net/minecraft/stat/ServerStatHandler.mapping b/mappings/net/minecraft/stat/ServerStatHandler.mapping index b7468dddaa..a03190032e 100644 --- a/mappings/net/minecraft/stat/ServerStatHandler.mapping +++ b/mappings/net/minecraft/stat/ServerStatHandler.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_3442 net/minecraft/stat/ServerStatHandler FIELD field_15309 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/io/File;)V ARG 1 server + ARG 2 file METHOD method_14905 createStat (Lnet/minecraft/class_3448;Ljava/lang/String;)Ljava/util/Optional; ARG 1 type ARG 2 id @@ -13,7 +14,9 @@ CLASS net/minecraft/class_3442 net/minecraft/stat/ServerStatHandler ARG 1 dataFixer ARG 2 json METHOD method_14907 getStatId (Lnet/minecraft/class_3445;)Lnet/minecraft/class_2960; + ARG 0 stat METHOD method_14908 jsonToCompound (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2487; + ARG 0 json METHOD method_14909 takePendingStats ()Ljava/util/Set; METHOD method_14910 sendStats (Lnet/minecraft/class_3222;)V ARG 1 player diff --git a/mappings/net/minecraft/stat/Stats.mapping b/mappings/net/minecraft/stat/Stats.mapping index 227dd9668e..269a78e003 100644 --- a/mappings/net/minecraft/stat/Stats.mapping +++ b/mappings/net/minecraft/stat/Stats.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_3468 net/minecraft/stat/Stats METHOD method_15020 registerType (Ljava/lang/String;Lnet/minecraft/class_2378;)Lnet/minecraft/class_3448; + ARG 0 id + ARG 1 registry METHOD method_15021 register (Ljava/lang/String;Lnet/minecraft/class_3446;)Lnet/minecraft/class_2960; + ARG 0 id + ARG 1 formatter diff --git a/mappings/net/minecraft/state/State.mapping b/mappings/net/minecraft/state/State.mapping index de9ed29b8a..047a8bd3b4 100644 --- a/mappings/net/minecraft/state/State.mapping +++ b/mappings/net/minecraft/state/State.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_2688 net/minecraft/state/State METHOD method_28499 toMapWith (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/util/Map; ARG 1 property ARG 2 value - METHOD method_28500 (Lnet/minecraft/class_2769;)Ljava/util/Optional; + METHOD method_28500 getOrEmpty (Lnet/minecraft/class_2769;)Ljava/util/Optional; ARG 1 property METHOD method_28501 getProperties ()Ljava/util/Collection; CLASS 1 diff --git a/mappings/net/minecraft/state/property/BooleanProperty.mapping b/mappings/net/minecraft/state/property/BooleanProperty.mapping index 44860cf7fb..cca2a7c935 100644 --- a/mappings/net/minecraft/state/property/BooleanProperty.mapping +++ b/mappings/net/minecraft/state/property/BooleanProperty.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_2746 net/minecraft/state/property/BooleanProperty + COMMENT Represents a property that has boolean values. + COMMENT + COMMENT

See {@link net.minecraft.state.property.Properties} for example + COMMENT usages. FIELD field_12575 values Lcom/google/common/collect/ImmutableSet; METHOD (Ljava/lang/String;)V ARG 1 name METHOD method_11825 of (Ljava/lang/String;)Lnet/minecraft/class_2746; + COMMENT Creates a boolean property. ARG 0 name + COMMENT the name of the property; see {@linkplain Property#name the note on the + COMMENT name} diff --git a/mappings/net/minecraft/state/property/DirectionProperty.mapping b/mappings/net/minecraft/state/property/DirectionProperty.mapping index 0e2a609d99..0f25caf98d 100644 --- a/mappings/net/minecraft/state/property/DirectionProperty.mapping +++ b/mappings/net/minecraft/state/property/DirectionProperty.mapping @@ -1,22 +1,31 @@ CLASS net/minecraft/class_2753 net/minecraft/state/property/DirectionProperty + COMMENT Represents a property that has direction values. + COMMENT + COMMENT

See {@link net.minecraft.state.property.Properties} for example + COMMENT usages. METHOD (Ljava/lang/String;Ljava/util/Collection;)V ARG 1 name ARG 2 values METHOD method_11843 of (Ljava/lang/String;Ljava/util/Collection;)Lnet/minecraft/class_2753; - COMMENT Creates a direction property which only supports specific values + COMMENT Creates a direction property with the given values. ARG 0 name - COMMENT the name of this property + COMMENT the name of the property; see {@linkplain Property#name the note on the + COMMENT name} ARG 1 values - COMMENT the values this property can have + COMMENT the values the property contains; required to have 2 or more values METHOD method_11844 of (Ljava/lang/String;Ljava/util/function/Predicate;)Lnet/minecraft/class_2753; - COMMENT Creates a direction property. + COMMENT Creates a direction property with the values allowed by the given + COMMENT filter out of all 6 directions. ARG 0 name - COMMENT the name of this property + COMMENT the name of the property; see {@linkplain Property#name the note on the + COMMENT name} ARG 1 filter - COMMENT a filter which specifies if a value is allowed + COMMENT the filter which specifies if a value is allowed; required to allow + COMMENT 2 or more values METHOD method_11845 of (Ljava/lang/String;[Lnet/minecraft/class_2350;)Lnet/minecraft/class_2753; - COMMENT Creates a direction property which only supports specific values + COMMENT Creates a direction property with the given values. ARG 0 name - COMMENT the name of this property + COMMENT the name of the property; see {@linkplain Property#name the note on the + COMMENT name} ARG 1 values - COMMENT the values this property can have + COMMENT the values the property contains; required to have 2 or more values diff --git a/mappings/net/minecraft/state/property/EnumProperty.mapping b/mappings/net/minecraft/state/property/EnumProperty.mapping index 3c3deaedbc..ad04975cb6 100644 --- a/mappings/net/minecraft/state/property/EnumProperty.mapping +++ b/mappings/net/minecraft/state/property/EnumProperty.mapping @@ -1,4 +1,20 @@ CLASS net/minecraft/class_2754 net/minecraft/state/property/EnumProperty + COMMENT Represents a property that has enum values. + COMMENT + COMMENT

Notes on the enum class: + COMMENT

    + COMMENT
  • The enum class is required to have 2 or more values. + COMMENT
  • The enum class is required to provide a name for each value by + COMMENT overriding {@link StringIdentifiable#asString()}. + COMMENT
  • The names of the values are required to match the {@linkplain + COMMENT net.minecraft.state.StateManager#VALID_NAME_PATTERN valid name pattern}. + COMMENT Otherwise, {@link IllegalArgumentException} will be thrown during the + COMMENT {@linkplain net.minecraft.state.StateManager.Builder#validate(Property) + COMMENT validation of a property}. + COMMENT
+ COMMENT + COMMENT

See {@link net.minecraft.state.property.Properties} for example + COMMENT usages. FIELD field_12595 values Lcom/google/common/collect/ImmutableSet; FIELD field_12596 byName Ljava/util/Map; METHOD (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)V @@ -6,28 +22,59 @@ CLASS net/minecraft/class_2754 net/minecraft/state/property/EnumProperty ARG 2 type ARG 3 values METHOD method_11847 of (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)Lnet/minecraft/class_2754; - COMMENT Creates an enum property. + COMMENT Creates an enum property with the given values. + COMMENT + COMMENT

See notes on the enum class. + COMMENT + COMMENT @throws IllegalArgumentException if multiple values have the same name + COMMENT + COMMENT @see #of(String, Class) ARG 0 name - COMMENT the name of this property + COMMENT the name of the property; see {@linkplain Property#name the note on the + COMMENT name} ARG 1 type - COMMENT the type this property contains + COMMENT the type of the values the property contains ARG 2 values - COMMENT the values this property could contain + COMMENT the values the property contains; required to have 2 or more values METHOD method_11848 of (Ljava/lang/String;Ljava/lang/Class;Ljava/util/function/Predicate;)Lnet/minecraft/class_2754; - COMMENT Creates an enum property. + COMMENT Creates an enum property with the values allowed by the given filter. + COMMENT + COMMENT

See notes on the enum class. + COMMENT + COMMENT @throws IllegalArgumentException if multiple values have the same name + COMMENT + COMMENT @see #of(String, Class) ARG 0 name - COMMENT the name of this property + COMMENT the name of the property; see {@linkplain Property#name the note on the + COMMENT name} ARG 1 type - COMMENT the type this property contains + COMMENT the type of the values the property contains ARG 2 filter - COMMENT a filter that specifies if a value is allowed + COMMENT the filter which specifies if a value is allowed; required to allow 2 + COMMENT or more values METHOD method_11849 of (Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Enum;)Lnet/minecraft/class_2754; + COMMENT Creates an enum property with the given values. + COMMENT + COMMENT

See notes on the enum class. + COMMENT + COMMENT @throws IllegalArgumentException if multiple values have the same name + COMMENT + COMMENT @see #of(String, Class) ARG 0 name + COMMENT the name of the property; see {@linkplain Property#name the note on the + COMMENT name} ARG 1 type + COMMENT the type of the values the property contains ARG 2 values + COMMENT the values the property contains; required to have 2 or more values METHOD method_11850 of (Ljava/lang/String;Ljava/lang/Class;)Lnet/minecraft/class_2754; - COMMENT Creates an enum property. + COMMENT Creates an enum property with all values of the given enum class. + COMMENT + COMMENT

See notes on the enum class. + COMMENT + COMMENT @throws IllegalArgumentException if multiple values have the same name ARG 0 name - COMMENT the name of this property + COMMENT the name of the property; see {@linkplain Property#name the note on the + COMMENT name} ARG 1 type - COMMENT the type this property contains + COMMENT the type of the values the property contains diff --git a/mappings/net/minecraft/state/property/IntProperty.mapping b/mappings/net/minecraft/state/property/IntProperty.mapping index 5f6902a8ee..1ab957b3c5 100644 --- a/mappings/net/minecraft/state/property/IntProperty.mapping +++ b/mappings/net/minecraft/state/property/IntProperty.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_2758 net/minecraft/state/property/IntProperty + COMMENT Represents a property that has integer values. + COMMENT + COMMENT

See {@link net.minecraft.state.property.Properties} for example + COMMENT usages. FIELD field_12614 values Lcom/google/common/collect/ImmutableSet; METHOD (Ljava/lang/String;II)V ARG 1 name @@ -7,12 +11,14 @@ CLASS net/minecraft/class_2758 net/minecraft/state/property/IntProperty METHOD method_11867 of (Ljava/lang/String;II)Lnet/minecraft/class_2758; COMMENT Creates an integer property. COMMENT - COMMENT

{@code min} must be non-negative and {@code max} must be greater than {@code min}. + COMMENT

Note that this method computes all possible values. COMMENT - COMMENT

Note that this method takes O({@code max} - {@code min}) time as it computes all possible values during instantiation. + COMMENT @throws IllegalArgumentException if {@code 0 <= min < max} is not + COMMENT satisfied ARG 0 name - COMMENT the name of the property + COMMENT the name of the property; see {@linkplain Property#name the note on the + COMMENT name} ARG 1 min - COMMENT the minimum value the property can take + COMMENT the minimum value the property contains ARG 2 max - COMMENT the maximum value the property can take + COMMENT the maximum value the property contains diff --git a/mappings/net/minecraft/state/property/Property.mapping b/mappings/net/minecraft/state/property/Property.mapping index 07f6e4af33..a0e904a701 100644 --- a/mappings/net/minecraft/state/property/Property.mapping +++ b/mappings/net/minecraft/state/property/Property.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_2769 net/minecraft/state/property/Property FIELD field_24742 type Ljava/lang/Class; FIELD field_24743 name Ljava/lang/String; + COMMENT The name of this property. + COMMENT + COMMENT

Note that the name is required to match the {@linkplain + COMMENT net.minecraft.state.StateManager#VALID_NAME_PATTERN valid name pattern}. + COMMENT Otherwise, {@link IllegalArgumentException} will be thrown during the + COMMENT {@linkplain net.minecraft.state.StateManager.Builder#validate(Property) + COMMENT validation of a property}. FIELD field_24744 hashCodeCache Ljava/lang/Integer; FIELD field_24745 codec Lcom/mojang/serialization/Codec; FIELD field_25670 valueCodec Lcom/mojang/serialization/Codec; @@ -9,16 +16,20 @@ CLASS net/minecraft/class_2769 net/minecraft/state/property/Property ARG 2 type METHOD method_11799 computeHashCode ()I METHOD method_11898 getValues ()Ljava/util/Collection; - COMMENT Returns all possible values the property can take. + COMMENT Returns all possible values of this property. METHOD method_11899 getName ()Ljava/lang/String; + COMMENT Returns the name of this property. METHOD method_11900 parse (Ljava/lang/String;)Ljava/util/Optional; ARG 1 name METHOD method_11901 name (Ljava/lang/Comparable;)Ljava/lang/String; + COMMENT Returns the name of the given value of this property. ARG 1 value METHOD method_11902 getType ()Ljava/lang/Class; + COMMENT Returns the type of the values of this property. METHOD method_28504 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 1 value METHOD method_30041 createValue (Lnet/minecraft/class_2688;)Lnet/minecraft/class_2769$class_4933; + ARG 1 state METHOD method_30042 createValue (Ljava/lang/Comparable;)Lnet/minecraft/class_2769$class_4933; ARG 1 value METHOD method_30043 stream ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/structure/PoolStructurePiece.mapping b/mappings/net/minecraft/structure/PoolStructurePiece.mapping index c3e02c3c5a..127b4b9f51 100644 --- a/mappings/net/minecraft/structure/PoolStructurePiece.mapping +++ b/mappings/net/minecraft/structure/PoolStructurePiece.mapping @@ -14,5 +14,11 @@ CLASS net/minecraft/class_3790 net/minecraft/structure/PoolStructurePiece METHOD method_16647 addJunction (Lnet/minecraft/class_3780;)V ARG 1 junction METHOD method_16648 getPos ()Lnet/minecraft/class_2338; - METHOD method_27236 (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;Z)Z + METHOD method_27236 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;Z)Z + ARG 1 world + ARG 2 structureAccessor + ARG 3 chunkGenerator + ARG 4 random + ARG 5 boundingBox + ARG 6 pos ARG 7 keepJigsaws diff --git a/mappings/net/minecraft/structure/SimpleStructurePiece.mapping b/mappings/net/minecraft/structure/SimpleStructurePiece.mapping index 5a7e13ce3c..56da64deac 100644 --- a/mappings/net/minecraft/structure/SimpleStructurePiece.mapping +++ b/mappings/net/minecraft/structure/SimpleStructurePiece.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_3470 net/minecraft/structure/SimpleStructurePiece METHOD method_15026 handleMetadata (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_5425;Ljava/util/Random;Lnet/minecraft/class_3341;)V ARG 1 metadata ARG 2 pos + ARG 3 world ARG 4 random ARG 5 boundingBox METHOD method_15027 setStructureData (Lnet/minecraft/class_3499;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;)V diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index 57694db080..bc90923146 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -7,6 +7,9 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure METHOD method_15161 setAuthor (Ljava/lang/String;)V ARG 1 name METHOD method_15162 applyTransformedOffset (Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;II)Lnet/minecraft/class_2338; + ARG 0 pos + ARG 1 mirror + ARG 2 rotation ARG 3 offsetX ARG 4 offsetZ METHOD method_15164 addEntitiesFromWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)V @@ -20,35 +23,48 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure ARG 4 transformed METHOD method_15166 getRotatedSize (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; METHOD method_15167 offsetByTransformedSize (Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; + ARG 1 pos + ARG 2 mirror + ARG 3 rotation METHOD method_15168 transformAround (Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 0 pos + ARG 1 mirror + ARG 2 rotation ARG 3 pivot - METHOD method_15169 createIntListTag ([I)Lnet/minecraft/class_2499; + METHOD method_15169 createNbtIntList ([I)Lnet/minecraft/class_2499; + ARG 1 ints METHOD method_15171 transform (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 0 placementData ARG 1 pos METHOD method_15172 place (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Ljava/util/Random;I)Z + ARG 1 world ARG 2 pos ARG 4 placementData + ARG 5 random METHOD method_15174 saveFromWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLnet/minecraft/class_2248;)V ARG 1 world ARG 2 start ARG 3 size ARG 4 includeEntities ARG 5 ignoredBlock - METHOD method_15175 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + METHOD method_15175 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt METHOD method_15176 transformAround (Lnet/minecraft/class_243;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243; ARG 0 point + ARG 1 mirror + ARG 2 rotation ARG 3 pivot METHOD method_15177 loadPalettedBlockInfo (Lnet/minecraft/class_2499;Lnet/minecraft/class_2499;)V - ARG 1 paletteTag - ARG 2 blocksTag + ARG 1 paletteNbt + ARG 2 blocksNbt METHOD method_15178 placeAndNotifyListeners (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Ljava/util/Random;)V ARG 2 pos ARG 3 data METHOD method_15179 spawnEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3341;Z)V + ARG 1 world ARG 2 pos + ARG 3 mirror + ARG 4 rotation ARG 5 pivot ARG 6 area METHOD method_15180 transformBox (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; @@ -60,15 +76,17 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure METHOD method_15182 place (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Ljava/util/Random;)V ARG 2 pos ARG 3 placementData - METHOD method_15183 fromTag (Lnet/minecraft/class_2487;)V - ARG 1 tag - METHOD method_15184 createDoubleListTag ([D)Lnet/minecraft/class_2499; + METHOD method_15183 readNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt + METHOD method_15184 createNbtDoubleList ([D)Lnet/minecraft/class_2499; + ARG 1 doubles METHOD method_16186 mirrorBoundingBox (Lnet/minecraft/class_2470;IILnet/minecraft/class_3341;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)V ARG 1 rotation ARG 2 offsetX ARG 3 offsetZ ARG 4 boundingBox METHOD method_16187 calculateBoundingBox (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3341; + ARG 1 placementData ARG 2 pos METHOD method_16445 getInfosForBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Lnet/minecraft/class_2248;)Ljava/util/List; ARG 1 pos @@ -77,7 +95,10 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure METHOD method_16446 process (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Ljava/util/List;)Ljava/util/List; ARG 0 world ARG 1 pos + ARG 3 placementData METHOD method_17916 getEntity (Lnet/minecraft/class_5425;Lnet/minecraft/class_2487;)Ljava/util/Optional; + ARG 0 world + ARG 1 nbt METHOD method_20532 updateCorner (Lnet/minecraft/class_1936;ILnet/minecraft/class_251;III)V ARG 0 world ARG 1 flags diff --git a/mappings/net/minecraft/structure/StructureManager.mapping b/mappings/net/minecraft/structure/StructureManager.mapping index 96ca6022e1..002ee08ba2 100644 --- a/mappings/net/minecraft/structure/StructureManager.mapping +++ b/mappings/net/minecraft/structure/StructureManager.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureManager FIELD field_15514 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_15515 dataFixer Lcom/mojang/datafixers/DataFixer; METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;)V + ARG 1 resourceManager + ARG 2 session ARG 3 dataFixer METHOD method_15085 getStructurePath (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 id @@ -26,4 +28,4 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureManager METHOD method_15094 getStructure (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3499; ARG 1 identifier METHOD method_21891 createStructure (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3499; - ARG 1 tag + ARG 1 nbt diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index d8947489f3..a1e6c0afdc 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -12,8 +12,9 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 2 length METHOD (Lnet/minecraft/class_3773;Lnet/minecraft/class_2487;)V ARG 1 type - ARG 2 tag + ARG 2 nbt METHOD method_14915 addChest (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;IIILnet/minecraft/class_2960;)Z + ARG 1 world ARG 2 boundingBox ARG 3 random ARG 4 x @@ -21,16 +22,20 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 6 z ARG 7 lootTableId METHOD method_14916 orientateChest (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 0 world + ARG 1 pos + ARG 2 state METHOD method_14917 addBlock (Lnet/minecraft/class_5281;Lnet/minecraft/class_2680;IIILnet/minecraft/class_3341;)V + ARG 1 world ARG 2 block ARG 3 x - ARG 4 y - ARG 5 z + ARG 6 box METHOD method_14918 fillOpenings (Lnet/minecraft/class_3443;Ljava/util/List;Ljava/util/Random;)V ARG 1 start ARG 2 pieces ARG 3 random METHOD method_14919 fillHalfEllipsoid (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIIILnet/minecraft/class_2680;Z)V + ARG 1 world ARG 2 bounds ARG 3 minX ARG 4 minY @@ -41,6 +46,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 9 block ARG 10 cantReplaceAir METHOD method_14921 addChest (Lnet/minecraft/class_5425;Lnet/minecraft/class_3341;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;Lnet/minecraft/class_2680;)Z + ARG 1 world ARG 2 boundingBox ARG 3 random ARG 4 pos @@ -59,10 +65,11 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 1 x ARG 2 z METHOD method_14929 getBlockAt (Lnet/minecraft/class_1922;IIILnet/minecraft/class_3341;)Lnet/minecraft/class_2680; + ARG 1 world ARG 2 x - ARG 3 y - ARG 4 z + ARG 5 box METHOD method_14930 addDispenser (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;IIILnet/minecraft/class_2350;Lnet/minecraft/class_2960;)Z + ARG 1 world ARG 2 boundingBox ARG 3 random ARG 4 x @@ -71,13 +78,18 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 7 facing ARG 8 lootTableId METHOD method_14931 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)Z + ARG 1 world ARG 2 structureAccessor ARG 3 chunkGenerator ARG 4 random ARG 5 boundingBox + ARG 6 chunkPos + ARG 7 pos METHOD method_14932 getOverlappingPiece (Ljava/util/List;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3443; ARG 0 pieces METHOD method_14933 fillWithOutlineUnderSeaLevel (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIIIIIILnet/minecraft/class_2680;Lnet/minecraft/class_2680;ZZ)V + ARG 1 world + ARG 2 box ARG 3 random ARG 4 blockChance ARG 5 minX @@ -93,11 +105,14 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece METHOD method_14934 getFacing ()Lnet/minecraft/class_2350; METHOD method_14935 getBoundingBox ()Lnet/minecraft/class_3341; METHOD method_14936 fillDownwards (Lnet/minecraft/class_5281;Lnet/minecraft/class_2680;IIILnet/minecraft/class_3341;)V + ARG 1 world + ARG 2 state ARG 3 x - ARG 4 y - ARG 5 z + ARG 6 box METHOD method_14937 isTouchingLiquid (Lnet/minecraft/class_1922;Lnet/minecraft/class_3341;)Z METHOD method_14938 fillWithOutline (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIIIZLjava/util/Random;Lnet/minecraft/class_3443$class_3444;)V + ARG 1 world + ARG 2 box ARG 3 minX ARG 4 minY ARG 5 minZ @@ -106,11 +121,16 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 8 maxZ ARG 9 cantReplaceAir ARG 10 random + ARG 11 randomizer METHOD method_14939 isUnderSeaLevel (Lnet/minecraft/class_4538;IIILnet/minecraft/class_3341;)Z + ARG 1 world ARG 2 x ARG 3 z ARG 4 y + ARG 5 box METHOD method_14940 fillWithOutline (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIIILnet/minecraft/class_2680;Lnet/minecraft/class_2680;Z)V + ARG 1 world + ARG 2 box ARG 3 minX ARG 4 minY ARG 5 minZ @@ -124,6 +144,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 1 x ARG 2 z METHOD method_14942 fill (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIII)V + ARG 1 world ARG 2 bounds ARG 3 minX ARG 4 minY @@ -134,15 +155,18 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece METHOD method_14943 toNbt (Lnet/minecraft/class_2487;)V ARG 1 tag METHOD method_14945 addBlockWithRandomThreshold (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIIILnet/minecraft/class_2680;)V + ARG 1 world ARG 2 bounds ARG 3 random ARG 4 threshold ARG 5 x ARG 6 y ARG 7 z + ARG 8 state METHOD method_14946 getTag ()Lnet/minecraft/class_2487; METHOD method_16653 getType ()Lnet/minecraft/class_3773; METHOD method_16654 intersectsChunk (Lnet/minecraft/class_1923;I)Z + ARG 1 pos ARG 2 offset METHOD method_16888 getRotation ()Lnet/minecraft/class_2470; CLASS class_3444 BlockRandomizer diff --git a/mappings/net/minecraft/structure/StructureStart.mapping b/mappings/net/minecraft/structure/StructureStart.mapping index bf82d849a4..b8913dc135 100644 --- a/mappings/net/minecraft/structure/StructureStart.mapping +++ b/mappings/net/minecraft/structure/StructureStart.mapping @@ -24,7 +24,7 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart ARG 4 box ARG 5 references ARG 6 seed - METHOD method_14962 getPos ()Lnet/minecraft/class_2338; + METHOD method_14962 getBlockPos ()Lnet/minecraft/class_2338; METHOD method_14963 getChildren ()Ljava/util/List; METHOD method_14964 incrementReferences ()V METHOD method_14966 getChunkZ ()I diff --git a/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping b/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping index 79dbb1f2d6..511adba617 100644 --- a/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_3776 net/minecraft/structure/pool/FeaturePoolElement FIELD field_16661 feature Ljava/util/function/Supplier; - FIELD field_16662 tag Lnet/minecraft/class_2487; + FIELD field_16662 nbt Lnet/minecraft/class_2487; FIELD field_24948 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/function/Supplier;Lnet/minecraft/class_3785$class_3786;)V ARG 1 feature ARG 2 projection METHOD method_16601 getStart (Lnet/minecraft/class_3485;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2338; - METHOD method_19299 createDefaultJigsawTag ()Lnet/minecraft/class_2487; + METHOD method_19299 createDefaultJigsawNbt ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping index 00e57b1374..814c6d173f 100644 --- a/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/SinglePoolElement.mapping @@ -1,6 +1,11 @@ CLASS net/minecraft/class_3781 net/minecraft/structure/pool/SinglePoolElement FIELD field_16674 processors Ljava/util/function/Supplier; METHOD method_16614 getDataStructureBlocks (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Z)Ljava/util/List; + ARG 1 structureManager + ARG 2 pos + ARG 3 rotation ARG 4 mirroredAndRotated METHOD method_16616 createPlacementData (Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Z)Lnet/minecraft/class_3492; + ARG 1 rotation + ARG 2 box ARG 3 keepJigsaws diff --git a/mappings/net/minecraft/structure/pool/StructurePool.mapping b/mappings/net/minecraft/structure/pool/StructurePool.mapping index 519f495adf..74b3c32f6e 100644 --- a/mappings/net/minecraft/structure/pool/StructurePool.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePool.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_3785 net/minecraft/structure/pool/StructurePool ARG 1 random METHOD method_16634 getTerminatorsId ()Lnet/minecraft/class_2960; METHOD method_19309 getHighestY (Lnet/minecraft/class_3485;)I + ARG 1 structureManager CLASS class_3786 Projection FIELD field_16682 id Ljava/lang/String; FIELD field_16684 PROJECTIONS_BY_ID Ljava/util/Map; diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping index b3cd6924f8..61e069aa11 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping @@ -8,6 +8,13 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement METHOD method_16624 getProjection ()Lnet/minecraft/class_3785$class_3786; METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;Z)Z ARG 1 structureManager + ARG 2 world + ARG 3 structureAccessor + ARG 4 chunkGenerator + ARG 5 pos + ARG 7 rotation + ARG 8 box + ARG 9 random ARG 10 keepJigsaws METHOD method_16627 getStructureBlockInfos (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/Random;)Ljava/util/List; ARG 1 structureManager diff --git a/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping index 213332b74a..36ca3bb078 100644 --- a/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping @@ -4,15 +4,23 @@ CLASS net/minecraft/class_5193 net/minecraft/structure/processor/BlockAgeStructu METHOD (F)V ARG 1 mossiness METHOD method_27256 processBlocks (Ljava/util/Random;)Lnet/minecraft/class_2680; + ARG 1 random METHOD method_27257 randomStairProperties (Ljava/util/Random;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; + ARG 0 random ARG 1 stairs METHOD method_27258 processStairs (Ljava/util/Random;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 1 random ARG 2 state METHOD method_27259 randomState (Ljava/util/Random;[Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 0 random ARG 1 states METHOD method_27260 process (Ljava/util/Random;[Lnet/minecraft/class_2680;[Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 1 random ARG 2 regularStates ARG 3 mossyStates METHOD method_27261 processSlabs (Ljava/util/Random;)Lnet/minecraft/class_2680; + ARG 1 random METHOD method_27262 processWalls (Ljava/util/Random;)Lnet/minecraft/class_2680; + ARG 1 random METHOD method_27263 processObsidian (Ljava/util/Random;)Lnet/minecraft/class_2680; + ARG 1 random diff --git a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping index 58f4d1f519..3904da5a47 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessor.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3491 net/minecraft/structure/processor/StructureProcessor METHOD method_15110 process (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_3492;)Lnet/minecraft/class_3499$class_3501; + ARG 1 world ARG 2 pos METHOD method_16772 getType ()Lnet/minecraft/class_3828; diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping index d1627748e3..ae539ae845 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping @@ -2,10 +2,10 @@ CLASS net/minecraft/class_3821 net/minecraft/structure/processor/StructureProces FIELD field_16872 inputPredicate Lnet/minecraft/class_3825; FIELD field_16873 locationPredicate Lnet/minecraft/class_3825; FIELD field_16874 outputState Lnet/minecraft/class_2680; - FIELD field_16875 tag Lnet/minecraft/class_2487; + FIELD field_16875 outputNbt Lnet/minecraft/class_2487; FIELD field_23347 positionPredicate Lnet/minecraft/class_4995; FIELD field_25008 CODEC Lcom/mojang/serialization/Codec; - METHOD method_16760 getTag ()Lnet/minecraft/class_2487; + METHOD method_16760 getOutputNbt ()Lnet/minecraft/class_2487; METHOD method_16762 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 1 input ARG 2 location diff --git a/mappings/net/minecraft/structure/rule/PosRuleTest.mapping b/mappings/net/minecraft/structure/rule/PosRuleTest.mapping index 8bc6c6e67d..f932f435c6 100644 --- a/mappings/net/minecraft/structure/rule/PosRuleTest.mapping +++ b/mappings/net/minecraft/structure/rule/PosRuleTest.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_4995 net/minecraft/structure/rule/PosRuleTest METHOD method_26404 getType ()Lnet/minecraft/class_4996; METHOD method_26406 test (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/Random;)Z + ARG 4 random diff --git a/mappings/net/minecraft/tag/RequiredTagList.mapping b/mappings/net/minecraft/tag/RequiredTagList.mapping index a1cd28e0c6..b6d057a270 100644 --- a/mappings/net/minecraft/tag/RequiredTagList.mapping +++ b/mappings/net/minecraft/tag/RequiredTagList.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_5120 net/minecraft/tag/RequiredTagList ARG 1 managerGetter METHOD method_26770 getGroup ()Lnet/minecraft/class_5414; METHOD method_26771 updateTagManager (Lnet/minecraft/class_5415;)V - ARG 1 manager + ARG 1 tagManager METHOD method_26772 (Lnet/minecraft/class_5414;Lnet/minecraft/class_5120$class_5121;)V ARG 1 tag METHOD method_26773 add (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; @@ -19,7 +19,7 @@ CLASS net/minecraft/class_5120 net/minecraft/tag/RequiredTagList ARG 1 id METHOD method_29224 getMissingTags (Lnet/minecraft/class_5415;)Ljava/util/Set; COMMENT Gets the required tags which are not supplied by the current datapacks. - ARG 1 manager + ARG 1 tagManager METHOD method_29902 getTags ()Ljava/util/List; CLASS class_5121 TagWrapper FIELD field_23684 id Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/tag/TagGroupLoader.mapping b/mappings/net/minecraft/tag/TagGroupLoader.mapping index c27d26104d..766dd406a5 100644 --- a/mappings/net/minecraft/tag/TagGroupLoader.mapping +++ b/mappings/net/minecraft/tag/TagGroupLoader.mapping @@ -12,5 +12,5 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader METHOD method_15192 prepareReload (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 manager ARG 2 prepareExecutor - METHOD method_18242 applyReload (Ljava/util/Map;)Lnet/minecraft/class_5414; + METHOD method_18242 buildGroup (Ljava/util/Map;)Lnet/minecraft/class_5414; ARG 1 tags diff --git a/mappings/net/minecraft/test/GameTestBatch.mapping b/mappings/net/minecraft/test/GameTestBatch.mapping index 9cf816b18d..b87fbdb518 100644 --- a/mappings/net/minecraft/test/GameTestBatch.mapping +++ b/mappings/net/minecraft/test/GameTestBatch.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_4514 net/minecraft/test/GameTestBatch FIELD field_20543 id Ljava/lang/String; FIELD field_20544 testFunctions Ljava/util/Collection; - FIELD field_20545 worldSetter Ljava/util/function/Consumer; + FIELD field_20545 beforeBatchConsumer Ljava/util/function/Consumer; METHOD (Ljava/lang/String;Ljava/util/Collection;Ljava/util/function/Consumer;)V ARG 1 id ARG 2 testFunctions ARG 3 worldSetter METHOD method_22152 getId ()Ljava/lang/String; - METHOD method_22153 setWorld (Lnet/minecraft/class_3218;)V + METHOD method_22153 startBatch (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_22154 getTestFunctions ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/test/GameTestException.mapping b/mappings/net/minecraft/test/GameTestException.mapping new file mode 100644 index 0000000000..33de015f60 --- /dev/null +++ b/mappings/net/minecraft/test/GameTestException.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4512 net/minecraft/test/GameTestException diff --git a/mappings/net/minecraft/test/GameTest.mapping b/mappings/net/minecraft/test/GameTestState.mapping similarity index 94% rename from mappings/net/minecraft/test/GameTest.mapping rename to mappings/net/minecraft/test/GameTestState.mapping index 35834c6371..94ead360f1 100644 --- a/mappings/net/minecraft/test/GameTest.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4517 net/minecraft/test/GameTest +CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState FIELD field_20559 testFunction Lnet/minecraft/class_4529; FIELD field_20560 pos Lnet/minecraft/class_2338; FIELD field_20561 world Lnet/minecraft/class_3218; @@ -11,6 +11,7 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTest FIELD field_21456 stopwatch Lcom/google/common/base/Stopwatch; METHOD method_22165 tick ()V METHOD method_22166 init (Lnet/minecraft/class_2338;I)V + ARG 1 pos METHOD method_22167 addListener (Lnet/minecraft/class_4518;)V ARG 1 listener METHOD method_22168 fail (Ljava/lang/Throwable;)V diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 556563ec30..405ab5945e 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -8,12 +8,17 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 2 world METHOD method_22246 clearArea (Lnet/minecraft/class_3341;ILnet/minecraft/class_3218;)V ARG 0 area + ARG 1 altitude ARG 2 world METHOD method_22247 isInStructureBounds (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)Z ARG 0 structureBlockPos ARG 1 pos ARG 2 world METHOD method_22248 placeStartButton (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V + ARG 0 pos + ARG 1 relativePos + ARG 2 rotation + ARG 3 world METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V ARG 0 structure ARG 1 pos @@ -22,6 +27,8 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil METHOD method_22252 placeStructure (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; ARG 0 name ARG 1 pos + ARG 2 rotation + ARG 3 world METHOD method_22253 loadSnbt (Ljava/nio/file/Path;)Lnet/minecraft/class_2487; ARG 0 path METHOD method_22255 findNearestStructureBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Lnet/minecraft/class_2338; @@ -35,7 +42,7 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 pos ARG 1 radius ARG 2 world - METHOD method_22368 (ILnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V + METHOD method_22368 resetBlock (ILnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V ARG 0 altitude ARG 1 pos ARG 2 world diff --git a/mappings/net/minecraft/test/TestCompletionListener.mapping b/mappings/net/minecraft/test/TestCompletionListener.mapping index 8539f95cc9..3dde0eba19 100644 --- a/mappings/net/minecraft/test/TestCompletionListener.mapping +++ b/mappings/net/minecraft/test/TestCompletionListener.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_4531 net/minecraft/test/TestCompletionListener METHOD method_22304 onTestFailed (Lnet/minecraft/class_4517;)V + ARG 1 test diff --git a/mappings/net/minecraft/test/StartupParameter.mapping b/mappings/net/minecraft/test/TestContext.mapping similarity index 61% rename from mappings/net/minecraft/test/StartupParameter.mapping rename to mappings/net/minecraft/test/TestContext.mapping index e3c29ed89a..ff7594feaa 100644 --- a/mappings/net/minecraft/test/StartupParameter.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4516 net/minecraft/test/StartupParameter +CLASS net/minecraft/class_4516 net/minecraft/test/TestContext 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 91ca4c7a38..c24f3fd880 100644 --- a/mappings/net/minecraft/test/TestFunction.mapping +++ b/mappings/net/minecraft/test/TestFunction.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_4529 net/minecraft/test/TestFunction FIELD field_21460 duration J METHOD method_22296 getStructurePath ()Ljava/lang/String; METHOD method_22297 start (Lnet/minecraft/class_4516;)V + ARG 1 parameter METHOD method_22298 getStructureName ()Ljava/lang/String; METHOD method_22299 getTickLimit ()I METHOD method_22300 isRequired ()Z diff --git a/mappings/net/minecraft/test/TestFunctions.mapping b/mappings/net/minecraft/test/TestFunctions.mapping index 46bef9dc52..473ddb5af6 100644 --- a/mappings/net/minecraft/test/TestFunctions.mapping +++ b/mappings/net/minecraft/test/TestFunctions.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions FIELD field_20570 TEST_FUNCTIONS Ljava/util/Collection; FIELD field_20571 testClasses Ljava/util/Set; - FIELD field_20572 WORLD_SETTERS Ljava/util/Map; + FIELD field_20572 BEFORE_BATCH_CONSUMERS Ljava/util/Map; METHOD method_22191 getTestFunctions ()Ljava/util/Collection; METHOD method_22192 isInClass (Lnet/minecraft/class_4529;Ljava/lang/String;)Z ARG 0 testFunction @@ -11,7 +11,7 @@ CLASS net/minecraft/class_4519 net/minecraft/test/TestFunctions METHOD method_22195 getTestClasses ()Ljava/util/Collection; METHOD method_22196 testClassExists (Ljava/lang/String;)Z ARG 0 testClass - METHOD method_22198 getWorldSetter (Ljava/lang/String;)Ljava/util/function/Consumer; + METHOD method_22198 getAfterBatchConsumer (Ljava/lang/String;)Ljava/util/function/Consumer; ARG 0 batchId METHOD method_22199 getTestFunction (Ljava/lang/String;)Ljava/util/Optional; ARG 0 structurePath diff --git a/mappings/net/minecraft/test/TestRunner.mapping b/mappings/net/minecraft/test/TestRunner.mapping index d09294a7b6..f7d4290a5a 100644 --- a/mappings/net/minecraft/test/TestRunner.mapping +++ b/mappings/net/minecraft/test/TestRunner.mapping @@ -10,7 +10,12 @@ CLASS net/minecraft/class_4515 net/minecraft/test/TestRunner FIELD field_20555 reusablePos Lnet/minecraft/class_2338$class_2339; FIELD field_20556 sizeZ I METHOD (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)V + ARG 1 batches ARG 2 pos + ARG 3 rotation + ARG 4 world + ARG 5 testManager + ARG 6 sizeZ METHOD method_22155 getTests ()Ljava/util/List; METHOD method_22156 runBatch (I)V ARG 1 index diff --git a/mappings/net/minecraft/test/TestUtil.mapping b/mappings/net/minecraft/test/TestUtil.mapping index e67c842f9f..ca0ebc2914 100644 --- a/mappings/net/minecraft/test/TestUtil.mapping +++ b/mappings/net/minecraft/test/TestUtil.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil METHOD method_22203 startTest (Lnet/minecraft/class_4517;Lnet/minecraft/class_2338;Lnet/minecraft/class_4521;)V + ARG 0 test + ARG 1 pos + ARG 2 testManager METHOD method_22207 createBook (Ljava/lang/String;ZLjava/lang/String;)Lnet/minecraft/class_1799; ARG 0 structureName ARG 1 required @@ -9,6 +12,10 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil METHOD method_22210 runTestBatches (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)Ljava/util/Collection; ARG 0 batches ARG 1 pos + ARG 2 rotation + ARG 3 world + ARG 4 testManager + ARG 5 sizeZ METHOD method_22213 clearDebugMarkers (Lnet/minecraft/class_3218;)V ARG 0 world METHOD method_22214 sendMessage (Lnet/minecraft/class_3218;Lnet/minecraft/class_124;Ljava/lang/String;)V @@ -33,5 +40,9 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil METHOD method_22222 runTestFunctions (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)Ljava/util/Collection; ARG 0 testFunctions ARG 1 pos + ARG 2 rotation + ARG 3 world + ARG 4 testManager + ARG 5 sizeZ METHOD method_22224 handleTestFail (Lnet/minecraft/class_4517;)V ARG 0 test diff --git a/mappings/net/minecraft/test/TimeMismatchException.mapping b/mappings/net/minecraft/test/TimeMismatchException.mapping deleted file mode 100644 index 4d0134bbd7..0000000000 --- a/mappings/net/minecraft/test/TimeMismatchException.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4512 net/minecraft/test/TimeMismatchException diff --git a/mappings/net/minecraft/text/BaseText.mapping b/mappings/net/minecraft/text/BaseText.mapping index c12825a119..93dddb5cd5 100644 --- a/mappings/net/minecraft/text/BaseText.mapping +++ b/mappings/net/minecraft/text/BaseText.mapping @@ -4,4 +4,4 @@ CLASS net/minecraft/class_2554 net/minecraft/text/BaseText FIELD field_26623 orderedText Lnet/minecraft/class_5481; FIELD field_26624 previousLanguage Lnet/minecraft/class_2477; METHOD equals (Ljava/lang/Object;)Z - ARG 1 obj + ARG 1 o diff --git a/mappings/net/minecraft/text/CharacterVisitor.mapping b/mappings/net/minecraft/text/CharacterVisitor.mapping index 012f700e61..3821174c5b 100644 --- a/mappings/net/minecraft/text/CharacterVisitor.mapping +++ b/mappings/net/minecraft/text/CharacterVisitor.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_5224 net/minecraft/text/CharacterVisitor COMMENT Visits a single character. COMMENT COMMENT

Multiple surrogate characters are converted into one single {@code - COMMENT codePoint} when passed into this method.

+ COMMENT codePoint} when passed into this method. COMMENT COMMENT @return {@code true} to continue visiting other characters, or {@code false} to terminate the visit ARG 1 index diff --git a/mappings/net/minecraft/text/ClickEvent.mapping b/mappings/net/minecraft/text/ClickEvent.mapping index c8845a3af8..94b3d30fb9 100644 --- a/mappings/net/minecraft/text/ClickEvent.mapping +++ b/mappings/net/minecraft/text/ClickEvent.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2558 net/minecraft/text/ClickEvent ARG 1 action ARG 2 value METHOD equals (Ljava/lang/Object;)Z - ARG 1 obj + ARG 1 o METHOD method_10844 getValue ()Ljava/lang/String; METHOD method_10845 getAction ()Lnet/minecraft/class_2558$class_2559; CLASS class_2559 Action diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/HoverEvent.mapping index 03a7f799fc..6375d33d25 100644 --- a/mappings/net/minecraft/text/HoverEvent.mapping +++ b/mappings/net/minecraft/text/HoverEvent.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent ARG 1 action ARG 2 contents METHOD equals (Ljava/lang/Object;)Z - ARG 1 obj + ARG 1 o METHOD method_10891 getValue (Lnet/minecraft/class_2568$class_5247;)Ljava/lang/Object; ARG 1 action METHOD method_10892 getAction ()Lnet/minecraft/class_2568$class_5247; diff --git a/mappings/net/minecraft/text/OrderedText.mapping b/mappings/net/minecraft/text/OrderedText.mapping index 09d9a3d385..0140df6dc6 100644 --- a/mappings/net/minecraft/text/OrderedText.mapping +++ b/mappings/net/minecraft/text/OrderedText.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_5481 net/minecraft/text/OrderedText ARG 2 charIndex ARG 3 style ARG 4 charPoint - METHOD method_30747 styledString (Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_5481; + METHOD method_30747 styledForwardsVisitedString (Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_5481; ARG 0 string ARG 1 style METHOD method_30748 (Ljava/lang/String;Lnet/minecraft/class_2583;Lit/unimi/dsi/fastutil/ints/Int2IntFunction;Lnet/minecraft/class_5224;)Z @@ -36,7 +36,7 @@ CLASS net/minecraft/class_5481 net/minecraft/text/OrderedText ARG 1 text2 METHOD method_30753 (Ljava/lang/String;Lnet/minecraft/class_2583;Lnet/minecraft/class_5224;)Z ARG 2 visitor - METHOD method_30754 styledStringMapped (Ljava/lang/String;Lnet/minecraft/class_2583;Lit/unimi/dsi/fastutil/ints/Int2IntFunction;)Lnet/minecraft/class_5481; + METHOD method_30754 styledBackwardsVisitedString (Ljava/lang/String;Lnet/minecraft/class_2583;Lit/unimi/dsi/fastutil/ints/Int2IntFunction;)Lnet/minecraft/class_5481; ARG 0 string ARG 1 style ARG 2 codePointMapper diff --git a/mappings/net/minecraft/text/StringVisitable.mapping b/mappings/net/minecraft/text/StringVisitable.mapping index d4d71db03c..f091fdbd94 100644 --- a/mappings/net/minecraft/text/StringVisitable.mapping +++ b/mappings/net/minecraft/text/StringVisitable.mapping @@ -47,7 +47,7 @@ CLASS net/minecraft/class_5348 net/minecraft/text/StringVisitable COMMENT COMMENT

When a {@link Optional#isPresent() present optional} is returned, COMMENT the visit is terminated before visiting all text. Can return {@link - COMMENT StringRenderable#TERMINATE_VISIT} for convenience.

+ COMMENT StringVisitable#TERMINATE_VISIT} for convenience.

COMMENT COMMENT @return {@code Optional.empty()} to continue, a non-empty result to terminate ARG 1 asString @@ -63,7 +63,7 @@ CLASS net/minecraft/class_5348 net/minecraft/text/StringVisitable COMMENT COMMENT

When a {@link Optional#isPresent() present optional} is returned, COMMENT the visit is terminated before visiting all text. Can return {@link - COMMENT StringRenderable#TERMINATE_VISIT} for convenience.

+ COMMENT StringVisitable#TERMINATE_VISIT} for convenience.

COMMENT COMMENT @return {@code Optional.empty()} to continue, a non-empty result to terminate ARG 1 style diff --git a/mappings/net/minecraft/text/Style.mapping b/mappings/net/minecraft/text/Style.mapping index 4a305f9ff1..85b4e6bdc6 100644 --- a/mappings/net/minecraft/text/Style.mapping +++ b/mappings/net/minecraft/text/Style.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style COMMENT The style of a {@link Text}, representing cosmetic attributes. It includes COMMENT font, formatting, click/hover events (actions), color, etc. COMMENT - COMMENT

A style is immutable.

+ COMMENT

A style is immutable. COMMENT COMMENT @see Text FIELD field_11851 underlined Ljava/lang/Boolean; @@ -31,7 +31,7 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style ARG 9 insertion ARG 10 font METHOD equals (Ljava/lang/Object;)Z - ARG 1 obj + ARG 1 o METHOD method_10949 withHoverEvent (Lnet/minecraft/class_2568;)Lnet/minecraft/class_2583; COMMENT Returns a new style with the hover event provided and all other COMMENT attributes of this style. @@ -41,7 +41,7 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style COMMENT Returns the insertion text of the style. COMMENT COMMENT

An insertion is inserted when a piece of text clicked while shift key - COMMENT is down in the chat HUD.

+ COMMENT is down in the chat HUD. METHOD method_10958 withClickEvent (Lnet/minecraft/class_2558;)Lnet/minecraft/class_2583; COMMENT Returns a new style with the click event provided and all other COMMENT attributes of this style. @@ -128,7 +128,7 @@ CLASS net/minecraft/class_2583 net/minecraft/text/Style COMMENT COMMENT

When a color formatting is passed for {@code formatting}, the other COMMENT formattings, including bold, italic, strikethrough, underlined, and - COMMENT obfuscated, are all removed.

+ COMMENT obfuscated, are all removed. ARG 1 formatting COMMENT the new formatting METHOD method_27708 getFont ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index 7701eb8d16..bb7fd4e9a8 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -3,10 +3,10 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text COMMENT COMMENT

Each text has a tree structure, embodying all its {@link COMMENT #getSiblings() siblings}. To iterate contents in the text and all - COMMENT its siblings, call {@code visit} methods.

+ COMMENT its siblings, call {@code visit} methods. COMMENT COMMENT

This interface does not expose mutation operations. For mutation, - COMMENT refer to {@link MutableText}.

+ COMMENT refer to {@link MutableText}. COMMENT COMMENT @see MutableText METHOD method_10851 asString ()Ljava/lang/String; @@ -39,7 +39,7 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text METHOD method_27661 shallowCopy ()Lnet/minecraft/class_5250; COMMENT Copies the text itself, the style, and the siblings. COMMENT - COMMENT

A shallow copy is made for the siblings.

+ COMMENT

A shallow copy is made for the siblings. METHOD method_27662 copy ()Lnet/minecraft/class_5250; COMMENT Copies the text itself, excluding the styles or siblings. METHOD method_30163 of (Ljava/lang/String;)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/text/TextColor.mapping b/mappings/net/minecraft/text/TextColor.mapping index 145406bffa..1298c1a3ff 100644 --- a/mappings/net/minecraft/text/TextColor.mapping +++ b/mappings/net/minecraft/text/TextColor.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_5251 net/minecraft/text/TextColor COMMENT Represents an RGB color of a {@link Text}. COMMENT - COMMENT

This is immutable, and part of a {@link Style}.

+ COMMENT

This is immutable, and part of a {@link Style}. COMMENT COMMENT @see Style FIELD field_24362 FORMATTING_TO_COLOR Ljava/util/Map; @@ -17,7 +17,7 @@ CLASS net/minecraft/class_5251 net/minecraft/text/TextColor COMMENT Gets the RGB value of this color. COMMENT COMMENT

The red bits can be obtained by {@code (rgb >> 16) & 0xFF}, green bits - COMMENT by {@code (rgb >> 8) & 0xFF}, blue bits by {@code rgb & 0xFF}.

+ COMMENT by {@code (rgb >> 8) & 0xFF}, blue bits by {@code rgb & 0xFF}. METHOD method_27717 fromRgb (I)Lnet/minecraft/class_5251; COMMENT Obtains a text color from an RGB value. ARG 0 rgb diff --git a/mappings/net/minecraft/util/ChatUtil.mapping b/mappings/net/minecraft/util/ChatUtil.mapping index ab2f3f3e86..be55744c99 100644 --- a/mappings/net/minecraft/util/ChatUtil.mapping +++ b/mappings/net/minecraft/util/ChatUtil.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3544 net/minecraft/util/ChatUtil FIELD field_15771 PATTERN Ljava/util/regex/Pattern; METHOD method_15438 isEmpty (Ljava/lang/String;)Z + ARG 0 text METHOD method_15439 ticksToString (I)Ljava/lang/String; ARG 0 ticks METHOD method_15440 stripTextFormat (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index 8e02d60afc..3a38536ff8 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor FIELD field_7948 name Ljava/lang/String; FIELD field_7949 color I FIELD field_7950 BY_FIREWORK_COLOR Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap; - FIELD field_7956 materialColor Lnet/minecraft/class_3620; + FIELD field_7956 mapColor Lnet/minecraft/class_3620; FIELD field_7959 VALUES [Lnet/minecraft/class_1767; FIELD field_7960 fireworkColor I FIELD field_7962 colorSwapped I @@ -13,13 +13,16 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor ARG 3 woolId ARG 4 name ARG 5 color - ARG 6 materialColor + ARG 6 mapColor ARG 7 fireworkColor ARG 8 signColor METHOD method_16357 getSignColor ()I METHOD method_7786 byFireworkColor (I)Lnet/minecraft/class_1767; ARG 0 color METHOD method_7787 getColorComponents ()[F + COMMENT Returns the red, blue and green components of this dye color. + COMMENT + COMMENT @return an array composed of the red, blue and green floats METHOD method_7789 getId ()I METHOD method_7790 getFireworkColor ()I METHOD method_7791 byId (I)Lnet/minecraft/class_1767; @@ -28,4 +31,4 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor METHOD method_7793 byName (Ljava/lang/String;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1767; ARG 0 name ARG 1 defaultColor - METHOD method_7794 getMaterialColor ()Lnet/minecraft/class_3620; + METHOD method_7794 getMapColor ()Lnet/minecraft/class_3620; diff --git a/mappings/net/minecraft/util/FileNameUtil.mapping b/mappings/net/minecraft/util/FileNameUtil.mapping index ae32f45b83..ca1c001caa 100644 --- a/mappings/net/minecraft/util/FileNameUtil.mapping +++ b/mappings/net/minecraft/util/FileNameUtil.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_4239 net/minecraft/util/FileNameUtil METHOD method_20200 isNormal (Ljava/nio/file/Path;)Z ARG 0 path METHOD method_20201 isAllowedName (Ljava/nio/file/Path;)Z + ARG 0 path METHOD method_20202 getResourcePath (Ljava/nio/file/Path;Ljava/lang/String;Ljava/lang/String;)Ljava/nio/file/Path; ARG 0 path ARG 1 resourceName diff --git a/mappings/net/minecraft/util/Identifier.mapping b/mappings/net/minecraft/util/Identifier.mapping index 8f896b5b2f..c3849f78ce 100644 --- a/mappings/net/minecraft/util/Identifier.mapping +++ b/mappings/net/minecraft/util/Identifier.mapping @@ -5,9 +5,9 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier FIELD field_13355 path Ljava/lang/String; FIELD field_25139 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;)V - COMMENT

Takes a string of the form {@code :}, for example {@code minecraft:iron_ingot}.

- COMMENT

The string will be split (on the {@code :}) into an identifier with the specified path and namespace.

- COMMENT Prefer using the {@link #Identifier(java.lang.String, java.lang.String)} constructor that takes the namespace and path as individual parameters to avoid mistakes. + COMMENT

Takes a string of the form {@code :}, for example {@code minecraft:iron_ingot}. + COMMENT

The string will be split (on the {@code :}) into an identifier with the specified path and namespace. + COMMENT Prefer using the {@link net.minecraft.util.Identifier#Identifier(java.lang.String, java.lang.String) Identifier(java.lang.String, java.lang.String)} constructor that takes the namespace and path as individual parameters to avoid mistakes. COMMENT @throws InvalidIdentifierException if the string cannot be parsed as an identifier. ARG 1 id METHOD (Ljava/lang/String;Ljava/lang/String;)V @@ -16,7 +16,7 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier METHOD ([Ljava/lang/String;)V ARG 1 id METHOD method_12829 tryParse (Ljava/lang/String;)Lnet/minecraft/class_2960; - COMMENT

Parses a string into an {@code Identifier}.

+ COMMENT

Parses a string into an {@code Identifier}. COMMENT Takes a string of the form {@code :}, for example {@code minecraft:iron_ingot}. COMMENT @return resulting identifier, or {@code null} if the string couldn't be parsed as an identifier ARG 0 id @@ -39,7 +39,9 @@ CLASS net/minecraft/class_2960 net/minecraft/util/Identifier METHOD method_20209 isNamespaceValid (Ljava/lang/String;)Z ARG 0 namespace METHOD method_29184 isPathCharacterValid (C)Z + ARG 0 character METHOD method_29185 isNamespaceCharacterValid (C)Z + ARG 0 character CLASS class_2961 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/util/ItemScatterer.mapping b/mappings/net/minecraft/util/ItemScatterer.mapping index 3e95adacf3..ddb4b08a41 100644 --- a/mappings/net/minecraft/util/ItemScatterer.mapping +++ b/mappings/net/minecraft/util/ItemScatterer.mapping @@ -3,12 +3,13 @@ CLASS net/minecraft/class_1264 net/minecraft/util/ItemScatterer METHOD method_17349 spawn (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2371;)V ARG 0 world ARG 1 pos - ARG 2 items + ARG 2 stacks METHOD method_5449 spawn (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V + ARG 0 world ARG 1 x ARG 3 y ARG 5 z - ARG 7 item + ARG 7 stack METHOD method_5450 spawn (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1263;)V ARG 0 world ARG 1 x @@ -16,4 +17,10 @@ CLASS net/minecraft/class_1264 net/minecraft/util/ItemScatterer ARG 5 z ARG 7 inventory METHOD method_5451 spawn (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1263;)V + ARG 0 world + ARG 1 pos + ARG 2 inventory METHOD method_5452 spawn (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_1263;)V + ARG 0 world + ARG 1 entity + ARG 2 inventory diff --git a/mappings/net/minecraft/util/ProgressListener.mapping b/mappings/net/minecraft/util/ProgressListener.mapping index 0cae65bf3d..6a3023b8af 100644 --- a/mappings/net/minecraft/util/ProgressListener.mapping +++ b/mappings/net/minecraft/util/ProgressListener.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_3536 net/minecraft/util/ProgressListener METHOD method_15410 progressStagePercentage (I)V + ARG 1 percentage METHOD method_15411 setDone ()V diff --git a/mappings/net/minecraft/util/UserCache.mapping b/mappings/net/minecraft/util/UserCache.mapping index 105bfc1bca..e40b1efef4 100644 --- a/mappings/net/minecraft/util/UserCache.mapping +++ b/mappings/net/minecraft/util/UserCache.mapping @@ -9,15 +9,19 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache ARG 1 profileRepository ARG 2 cacheFile METHOD method_14508 add (Lcom/mojang/authlib/GameProfile;)V + ARG 1 profile METHOD method_14509 findProfileByName (Lcom/mojang/authlib/GameProfileRepository;Ljava/lang/String;)Lcom/mojang/authlib/GameProfile; ARG 0 repository ARG 1 name METHOD method_14510 setUseRemote (Z)V ARG 0 value METHOD method_14512 getByUuid (Ljava/util/UUID;)Lcom/mojang/authlib/GameProfile; + ARG 1 uuid METHOD method_14514 shouldUseRemote ()Z METHOD method_14515 findByName (Ljava/lang/String;)Lcom/mojang/authlib/GameProfile; + ARG 1 name METHOD method_14516 getLastAccessedEntries (I)Ljava/util/stream/Stream; + ARG 1 limit METHOD method_14517 load ()Ljava/util/List; METHOD method_14518 save ()V CLASS 1 diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index b195594c24..379847e7bc 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -7,13 +7,18 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util FIELD field_24622 BOOTSTRAP_EXECUTOR Ljava/util/concurrent/ExecutorService; FIELD field_25140 NIL_UUID Ljava/util/UUID; METHOD method_17815 stream (Ljava/util/Optional;)Ljava/util/stream/Stream; + ARG 0 optional METHOD method_17974 ifPresentOrElse (Ljava/util/Optional;Ljava/util/function/Consumer;Ljava/lang/Runnable;)Ljava/util/Optional; + ARG 0 optional + ARG 1 presentAction + ARG 2 elseAction METHOD method_18349 getMainWorkerExecutor ()Ljava/util/concurrent/Executor; METHOD method_18350 shutdownExecutors ()V METHOD method_18839 debugRunnable (Ljava/lang/Runnable;Ljava/util/function/Supplier;)Ljava/lang/Runnable; ARG 0 runnable ARG 1 messageSupplier METHOD method_19483 completeExceptionally (Ljava/lang/Throwable;)Ljava/util/concurrent/CompletableFuture; + ARG 0 throwable METHOD method_20793 getLast (Ljava/util/List;)Ljava/lang/Object; ARG 0 list METHOD method_22320 throwOrPause (Ljava/lang/Throwable;)Ljava/lang/Throwable; @@ -21,6 +26,7 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_22321 getInnermostMessage (Ljava/lang/Throwable;)Ljava/lang/String; ARG 0 t METHOD method_24155 throwUnchecked (Ljava/lang/Throwable;)V + ARG 0 t METHOD method_27172 getRandom ([ILjava/util/Random;)I ARG 0 array ARG 1 random @@ -47,8 +53,8 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_29187 getChoiceType (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)Lcom/mojang/datafixers/types/Type; ARG 0 typeReference ARG 1 id - METHOD method_29190 toIntArray (Ljava/util/stream/IntStream;I)Lcom/mojang/serialization/DataResult; - ARG 0 intStream + METHOD method_29190 toArray (Ljava/util/stream/IntStream;I)Lcom/mojang/serialization/DataResult; + ARG 0 stream ARG 1 length METHOD method_29191 getChoiceTypeInternal (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)Lcom/mojang/datafixers/types/Type; ARG 0 typeReference @@ -61,12 +67,14 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 1 dest ARG 2 toCopy METHOD method_30309 replaceInvalidChars (Ljava/lang/String;Lnet/minecraft/class_5462;)Ljava/lang/String; + ARG 0 string ARG 1 predicate METHOD method_30622 attemptTasks (ILjava/lang/String;[Ljava/util/function/BooleanSupplier;)Z ARG 0 retries ARG 1 taskName ARG 2 tasks METHOD method_30624 deleteTask (Ljava/nio/file/Path;)Ljava/util/function/BooleanSupplier; + ARG 0 path METHOD method_30625 renameTask (Ljava/nio/file/Path;Ljava/nio/file/Path;)Ljava/util/function/BooleanSupplier; ARG 0 src ARG 1 dest @@ -76,19 +84,33 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 1 newPath ARG 2 backup METHOD method_30627 attemptTasks ([Ljava/util/function/BooleanSupplier;)Z + ARG 0 tasks METHOD method_30628 deletionVerifyTask (Ljava/nio/file/Path;)Ljava/util/function/BooleanSupplier; ARG 0 path METHOD method_30629 existenceCheckTask (Ljava/nio/file/Path;)Ljava/util/function/BooleanSupplier; ARG 0 path METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 iterable + ARG 1 object METHOD method_646 createTranslationKey (Ljava/lang/String;Lnet/minecraft/class_2960;)Ljava/lang/String; ARG 0 type ARG 1 id METHOD method_648 getMeasuringTimeNano ()J METHOD method_650 getValueAsString (Lnet/minecraft/class_2769;Ljava/lang/Object;)Ljava/lang/String; + ARG 0 property + ARG 1 value METHOD method_651 getJVMFlags ()Ljava/util/stream/Stream; METHOD method_652 combine (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + COMMENT Combines a list of {@code futures} into one future that holds a list + COMMENT of their results. + COMMENT + COMMENT

The returned future is fail-fast; if any of the input futures fails, + COMMENT this returned future will be immediately completed exceptionally than + COMMENT waiting for other input futures. + COMMENT + COMMENT @return the combined future ARG 0 futures + COMMENT the completable futures to combine METHOD method_654 make (Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object; ARG 0 object ARG 1 initializer @@ -98,6 +120,8 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_658 getMeasuringTimeMs ()J METHOD method_659 getEpochTimeMs ()J METHOD method_660 next (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 iterable + ARG 1 object METHOD method_664 toMap ()Ljava/util/stream/Collector; METHOD method_667 getLogger ()Lorg/apache/logging/log4j/Logger; METHOD method_668 getOperatingSystem ()Lnet/minecraft/class_156$class_158; diff --git a/mappings/net/minecraft/util/collection/TypeFilterableList.mapping b/mappings/net/minecraft/util/collection/TypeFilterableList.mapping index ec4a004e77..fe484e2e2e 100644 --- a/mappings/net/minecraft/util/collection/TypeFilterableList.mapping +++ b/mappings/net/minecraft/util/collection/TypeFilterableList.mapping @@ -1,4 +1,12 @@ CLASS net/minecraft/class_3509 net/minecraft/util/collection/TypeFilterableList + COMMENT A collection allowing getting all elements of a specific type. Backed + COMMENT by {@link java.util.ArrayList}s. + COMMENT + COMMENT

This implementation is not efficient for frequent modifications. You + COMMENT shouldn't use this if you don't call {@link #getAllOfType(Class)}. + COMMENT + COMMENT @see #getAllOfType(Class) + COMMENT @param the {@link #elementType common element type} FIELD field_15635 allElements Ljava/util/List; FIELD field_15636 elementsByType Ljava/util/Map; FIELD field_15637 elementType Ljava/lang/Class; @@ -7,8 +15,22 @@ CLASS net/minecraft/class_3509 net/minecraft/util/collection/TypeFilterableList METHOD add (Ljava/lang/Object;)Z ARG 1 e METHOD contains (Ljava/lang/Object;)Z + COMMENT {@inheritDoc} + COMMENT + COMMENT @throws IllegalArgumentException if {@code o} is not an instance of + COMMENT {@link #elementType} ARG 1 o METHOD method_15216 getAllOfType (Ljava/lang/Class;)Ljava/util/Collection; + COMMENT Returns all elements in this collection that are instances of {@code type}. + COMMENT The result is unmodifiable. + COMMENT + COMMENT

The {@code type}, or {@code S}, must extend the class' type parameter {@code T}. + COMMENT + COMMENT @param the specialized type, effectively {@code S extends T} + COMMENT @throws IllegalArgumentException when {@code type} does not extend + COMMENT {@link #elementType} + COMMENT @return this collection's elements that are instances of {@code type} ARG 1 type + COMMENT the specialized type, must extend {@link #elementType} METHOD remove (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/util/crash/CrashReport.mapping b/mappings/net/minecraft/util/crash/CrashReport.mapping index 09a08c9b9f..2f638a0cf7 100644 --- a/mappings/net/minecraft/util/crash/CrashReport.mapping +++ b/mappings/net/minecraft/util/crash/CrashReport.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_128 net/minecraft/util/crash/CrashReport ARG 2 cause METHOD method_24305 initCrashReport ()V METHOD method_555 addStackTrace (Ljava/lang/StringBuilder;)V + ARG 1 crashReportBuilder METHOD method_556 addElement (Ljava/lang/String;I)Lnet/minecraft/class_129; ARG 1 name ARG 2 ignoredStackTraceCallCount @@ -27,5 +28,6 @@ CLASS net/minecraft/class_128 net/minecraft/util/crash/CrashReport METHOD method_567 getSystemDetailsSection ()Lnet/minecraft/class_129; METHOD method_568 asString ()Ljava/lang/String; METHOD method_569 writeToFile (Ljava/io/File;)Z + ARG 1 file METHOD method_572 getFile ()Ljava/io/File; METHOD method_573 generateWittyComment ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/crash/CrashReportSection.mapping b/mappings/net/minecraft/util/crash/CrashReportSection.mapping index 1bb0e833c9..204dbb9163 100644 --- a/mappings/net/minecraft/util/crash/CrashReportSection.mapping +++ b/mappings/net/minecraft/util/crash/CrashReportSection.mapping @@ -7,10 +7,13 @@ CLASS net/minecraft/class_129 net/minecraft/util/crash/CrashReportSection ARG 1 report ARG 2 title METHOD method_574 addStackTrace (Ljava/lang/StringBuilder;)V + ARG 1 crashReportBuilder METHOD method_575 getStackTrace ()[Ljava/lang/StackTraceElement; METHOD method_577 add (Ljava/lang/String;Lnet/minecraft/class_133;)Lnet/minecraft/class_129; + ARG 1 name METHOD method_578 add (Ljava/lang/String;Ljava/lang/Object;)Lnet/minecraft/class_129; ARG 1 name + ARG 2 detail METHOD method_579 initStackTrace (I)I ARG 1 ignoredCallCount METHOD method_580 trimStackTraceEnd (I)V @@ -27,6 +30,7 @@ CLASS net/minecraft/class_129 net/minecraft/util/crash/CrashReportSection ARG 4 z METHOD method_585 add (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 name + ARG 2 throwable METHOD method_586 addBlockInfo (Lnet/minecraft/class_129;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 0 element ARG 1 pos diff --git a/mappings/net/minecraft/util/dynamic/RegistryCodec.mapping b/mappings/net/minecraft/util/dynamic/RegistryCodec.mapping index f25c8acc35..988f898de4 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryCodec.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryCodec.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_5380 net/minecraft/util/dynamic/RegistryCodec COMMENT COMMENT

Compared to regular codec, this codec performs additional work when COMMENT decoding, loading its elements from the given resource manager's JSON - COMMENT files.

+ COMMENT files. COMMENT COMMENT @param the registry's element type COMMENT @see RegistryElementCodec diff --git a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping index 8f193f47ce..2ed63edd20 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryElementCodec.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec COMMENT decoding behavior if it cannot do so. COMMENT COMMENT

The codec's saves and loads {@code Supplier} in order to avoid early - COMMENT loading from registry before a registry is fully loaded from a codec.

+ COMMENT loading from registry before a registry is fully loaded from a codec. COMMENT COMMENT @param the element type COMMENT @see RegistryCodec @@ -14,6 +14,8 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec FIELD field_25508 elementCodec Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Z)V ARG 1 registryRef + ARG 2 elementCodec + ARG 3 allowInlineDefinitions METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input @@ -23,4 +25,4 @@ CLASS net/minecraft/class_5381 net/minecraft/util/dynamic/RegistryElementCodec ARG 3 prefix METHOD method_29749 of (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5381; ARG 0 registryRef - ARG 1 codec + ARG 1 elementCodec diff --git a/mappings/net/minecraft/util/registry/RegistryLookupCodec.mapping b/mappings/net/minecraft/util/dynamic/RegistryLookupCodec.mapping similarity index 73% rename from mappings/net/minecraft/util/registry/RegistryLookupCodec.mapping rename to mappings/net/minecraft/util/dynamic/RegistryLookupCodec.mapping index 1872819d54..0d7fc49994 100644 --- a/mappings/net/minecraft/util/registry/RegistryLookupCodec.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryLookupCodec.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5505 net/minecraft/util/registry/RegistryLookupCodec +CLASS net/minecraft/class_5505 net/minecraft/util/dynamic/RegistryLookupCodec FIELD field_26737 registryKey Lnet/minecraft/class_5321; METHOD (Lnet/minecraft/class_5321;)V ARG 1 registryKey diff --git a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping index 35aed25e11..ee819c2b05 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping @@ -12,20 +12,27 @@ CLASS net/minecraft/class_5382 net/minecraft/util/dynamic/RegistryOps METHOD method_29755 loadToRegistry (Lnet/minecraft/class_2370;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/DataResult; COMMENT Loads elements into a registry just loaded from a decoder. ARG 1 registry + ARG 2 key + ARG 3 codec METHOD method_29759 decodeOrId (Ljava/lang/Object;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Z)Lcom/mojang/serialization/DataResult; COMMENT Encode an id for a registry element than a full object if possible. COMMENT COMMENT

This method is called by casting an arbitrary dynamic ops to a registry - COMMENT reading ops.

+ COMMENT reading ops. COMMENT - COMMENT @see RegistryReadingOps#encodeOrId(Object, Object, RegistryKey, MapCodec) + COMMENT @see RegistryReadingOps#encodeOrId(Object, Object, RegistryKey, Codec) + ARG 2 key + ARG 3 codec ARG 4 allowInlineDefinitions METHOD method_29761 getValueHolder (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5382$class_5383; ARG 1 registryRef METHOD method_29763 readSupplier (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; COMMENT Reads a supplier for a registry element. COMMENT - COMMENT

This logic is used by both {@code decodeOrId} and {@code loadToRegistry}.

+ COMMENT

This logic is used by both {@code decodeOrId} and {@code loadToRegistry}. + ARG 1 key + ARG 2 registry + ARG 3 codec ARG 4 elementId METHOD method_31150 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5382$class_5506;Lnet/minecraft/class_5455$class_5457;)Lnet/minecraft/class_5382; CLASS class_5383 ValueHolder diff --git a/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping b/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping index 4a1116c94a..7e40f61ad4 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryReadingOps.mapping @@ -13,9 +13,9 @@ CLASS net/minecraft/class_5384 net/minecraft/util/dynamic/RegistryReadingOps COMMENT Encode an id for a registry element than a full object if possible. COMMENT COMMENT

This method is called by casting an arbitrary dynamic ops to a registry - COMMENT reading ops.

+ COMMENT reading ops. COMMENT - COMMENT @see RegistryOps#decodeOrId(Object, RegistryKey, MapCodec) + COMMENT @see RegistryOps#decodeOrId(Object, RegistryKey, Codec, boolean) ARG 1 input ARG 2 prefix ARG 3 registryReference diff --git a/mappings/net/minecraft/client/util/math/AffineTransformation.mapping b/mappings/net/minecraft/util/math/AffineTransformation.mapping similarity index 70% rename from mappings/net/minecraft/client/util/math/AffineTransformation.mapping rename to mappings/net/minecraft/util/math/AffineTransformation.mapping index edcff5141e..242e624ad4 100644 --- a/mappings/net/minecraft/client/util/math/AffineTransformation.mapping +++ b/mappings/net/minecraft/util/math/AffineTransformation.mapping @@ -1,4 +1,11 @@ -CLASS net/minecraft/class_4590 net/minecraft/client/util/math/AffineTransformation +CLASS net/minecraft/class_4590 net/minecraft/util/math/AffineTransformation + COMMENT An affine transformation is a decomposition of a 4×4 real matrix into + COMMENT a {@linkplain #rotation1 rotation} quaternion, a {@linkplain #scale scale} + COMMENT 3-vector, a second {@linkplain #rotation2 rotation} quaternion, and a + COMMENT {@linkplain #translation translation} 3-vector. It is also known as "TRSR" + COMMENT transformation, meaning "translation rotation scale rotation". + COMMENT + COMMENT

This class is immutable; its matrix is lazily decomposed upon demand. FIELD field_20900 matrix Lnet/minecraft/class_1159; FIELD field_20901 initialized Z FIELD field_20902 translation Lnet/minecraft/class_1160; diff --git a/mappings/net/minecraft/client/util/math/AffineTransformations.mapping b/mappings/net/minecraft/util/math/AffineTransformations.mapping similarity index 83% rename from mappings/net/minecraft/client/util/math/AffineTransformations.mapping rename to mappings/net/minecraft/util/math/AffineTransformations.mapping index ca86a49ebd..ed10ea508b 100644 --- a/mappings/net/minecraft/client/util/math/AffineTransformations.mapping +++ b/mappings/net/minecraft/util/math/AffineTransformations.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4609 net/minecraft/client/util/math/AffineTransformations +CLASS net/minecraft/class_4609 net/minecraft/util/math/AffineTransformations FIELD field_21021 DIRECTION_ROTATIONS Ljava/util/EnumMap; FIELD field_21022 INVERTED_DIRECTION_ROTATIONS Ljava/util/EnumMap; FIELD field_21023 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/util/math/BlockBox.mapping b/mappings/net/minecraft/util/math/BlockBox.mapping index d501b9899b..a8239ff0a3 100644 --- a/mappings/net/minecraft/util/math/BlockBox.mapping +++ b/mappings/net/minecraft/util/math/BlockBox.mapping @@ -1,4 +1,12 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox + COMMENT A mutable box with integer coordinates. The box is axis-aligned and the + COMMENT coordinates are inclusive. + COMMENT + COMMENT

This box, though mutable, has proper {@code hashCode} and {@code + COMMENT equals} implementations and can be used as map keys if user can ensure + COMMENT they are not modified. + COMMENT + COMMENT @see Box FIELD field_14376 maxZ I FIELD field_14377 maxY I FIELD field_14378 maxX I @@ -38,6 +46,7 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox METHOD method_14663 getBlockCountY ()I METHOD method_14664 getBlockCountZ ()I METHOD method_14665 empty ()Lnet/minecraft/class_3341; + COMMENT Creates an empty box. METHOD method_14666 create (IIIIII)Lnet/minecraft/class_3341; ARG 0 x1 ARG 1 y1 @@ -64,6 +73,11 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox ARG 3 maxX ARG 4 maxZ METHOD method_19311 offset (III)Lnet/minecraft/class_3341; + COMMENT Creates a new box that is translated by {@code x}, {@code y}, {@code z} + COMMENT on each axis from this box. + COMMENT + COMMENT @return the new box created + COMMENT @see #move(int, int, int) ARG 1 x ARG 2 y ARG 3 z diff --git a/mappings/net/minecraft/util/math/BlockPointerImpl.mapping b/mappings/net/minecraft/util/math/BlockPointerImpl.mapping index 2efb4e4f52..dbddf432e8 100644 --- a/mappings/net/minecraft/util/math/BlockPointerImpl.mapping +++ b/mappings/net/minecraft/util/math/BlockPointerImpl.mapping @@ -2,4 +2,5 @@ CLASS net/minecraft/class_2345 net/minecraft/util/math/BlockPointerImpl FIELD field_11011 world Lnet/minecraft/class_3218; FIELD field_11012 pos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index be40329a96..c51281c8ee 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -126,11 +126,11 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos COMMENT negative z offset. ARG 0 center COMMENT the center of iteration - ARG 1 xRange + ARG 1 rangeX COMMENT the maximum x difference from the center - ARG 2 yRange + ARG 2 rangeY COMMENT the maximum y difference from the center - ARG 3 zRange + ARG 3 rangeZ COMMENT the maximum z difference from the center METHOD method_25997 findClosest (Lnet/minecraft/class_2338;IILjava/util/function/Predicate;)Ljava/util/Optional; ARG 0 pos diff --git a/mappings/net/minecraft/util/math/Box.mapping b/mappings/net/minecraft/util/math/Box.mapping index e9a8ccdf33..7695036fb9 100644 --- a/mappings/net/minecraft/util/math/Box.mapping +++ b/mappings/net/minecraft/util/math/Box.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box + COMMENT An immutable box with double-valued coordinates. The box is axis-aligned + COMMENT and the coordinates are minimum inclusive and maximum exclusive. + COMMENT + COMMENT

This box has proper {@link #hashCode()} and {@link #equals(Object)} + COMMENT implementations and can be used as a map key. + COMMENT + COMMENT @see BlockBox FIELD field_1320 maxX D FIELD field_1321 minZ D FIELD field_1322 minY D @@ -6,6 +13,7 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box FIELD field_1324 maxZ D FIELD field_1325 maxY D METHOD (DDDDDD)V + COMMENT Creates a box of the given positions as corners. ARG 1 x1 ARG 3 y1 ARG 5 z1 @@ -13,11 +21,14 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box ARG 9 y2 ARG 11 z2 METHOD (Lnet/minecraft/class_2338;)V + COMMENT Creates a box that only contains the given block position. ARG 1 pos METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)V + COMMENT Creates a box of the given positions as corners. ARG 1 pos1 ARG 2 pos2 METHOD (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V + COMMENT Creates a box of the given positions as corners. ARG 1 pos1 ARG 2 pos2 METHOD equals (Ljava/lang/Object;)Z @@ -29,6 +40,7 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box ARG 3 y ARG 5 z METHOD method_1003 intersects (DDDDDD)Z + COMMENT Checks if this box intersects the box of the given coordinates. ARG 1 minX ARG 3 minY ARG 5 minZ @@ -36,17 +48,20 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box ARG 9 maxY ARG 11 maxZ METHOD method_1005 getCenter ()Lnet/minecraft/class_243; + COMMENT Returns the center position of this box. METHOD method_1006 contains (Lnet/minecraft/class_243;)Z - ARG 1 vec + COMMENT Checks if the given position is in this box. + ARG 1 pos METHOD method_1007 traceCollisionSide (Lnet/minecraft/class_238;Lnet/minecraft/class_243;[DLnet/minecraft/class_2350;DDD)Lnet/minecraft/class_2350; ARG 0 box ARG 1 intersectingVector ARG 2 traceDistanceResult ARG 3 approachDirection - ARG 4 xDelta - ARG 6 yDelta - ARG 8 zDelta + ARG 4 deltaX + ARG 6 deltaY + ARG 8 deltaZ METHOD method_1008 contains (DDD)Z + COMMENT Checks if the given position is in this box. ARG 1 x ARG 3 y ARG 5 z @@ -60,13 +75,17 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box ARG 2 to ARG 3 pos METHOD method_1011 contract (D)Lnet/minecraft/class_238; + COMMENT @see #expand(double) ARG 1 value METHOD method_1012 stretch (DDD)Lnet/minecraft/class_238; ARG 1 x ARG 3 y ARG 5 z METHOD method_1013 isValid ()Z + COMMENT Checks if any of the coordinates of this box is {@linkplain + COMMENT Double#isNaN(double) not a number}. METHOD method_1014 expand (D)Lnet/minecraft/class_238; + COMMENT @see #contract(double) ARG 1 value METHOD method_17939 getXLength ()D METHOD method_17940 getYLength ()D @@ -76,32 +95,46 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box METHOD method_19316 from (Lnet/minecraft/class_3341;)Lnet/minecraft/class_238; ARG 0 mutable METHOD method_989 offset (DDD)Lnet/minecraft/class_238; + COMMENT Creates a box that is translated by {@code x}, {@code y}, {@code z} on + COMMENT each axis from this box. ARG 1 x ARG 3 y ARG 5 z METHOD method_990 getMax (Lnet/minecraft/class_2350$class_2351;)D ARG 1 axis METHOD method_991 union (Lnet/minecraft/class_238;)Lnet/minecraft/class_238; + COMMENT Creates the minimum box that contains this box and the given box. ARG 1 box METHOD method_992 raycast (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Ljava/util/Optional; ARG 1 min ARG 2 max METHOD method_993 intersects (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z - ARG 1 from - ARG 2 to + COMMENT Checks if this box intersects the box of the given positions as + COMMENT corners. + ARG 1 pos1 + ARG 2 pos2 METHOD method_994 intersects (Lnet/minecraft/class_238;)Z + COMMENT Checks if this box intersects the given box. ARG 1 box METHOD method_995 getAverageSideLength ()D METHOD method_996 offset (Lnet/minecraft/class_2338;)Lnet/minecraft/class_238; + COMMENT Creates a box that is translated by {@code blockPos.getX()}, {@code + COMMENT blockPos.getY()}, {@code blockPos.getZ()} on each axis from this box. + COMMENT + COMMENT @see #offset(double, double, double) ARG 1 blockPos METHOD method_997 offset (Lnet/minecraft/class_243;)Lnet/minecraft/class_238; - ARG 1 vec3d + COMMENT Creates a box that is translated by {@code vec.x}, {@code vec.y}, {@code + COMMENT vec.z} on each axis from this box. + COMMENT + COMMENT @see #offset(double, double, double) + ARG 1 vec METHOD method_998 traceCollisionSide ([DLnet/minecraft/class_2350;DDDDDDDDLnet/minecraft/class_2350;DDD)Lnet/minecraft/class_2350; ARG 0 traceDistanceResult ARG 1 approachDirection - ARG 2 xDelta - ARG 4 yDelta - ARG 6 zDelta + ARG 2 deltaX + ARG 4 deltaY + ARG 6 deltaZ ARG 8 begin ARG 10 minX ARG 12 maxX @@ -112,4 +145,5 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box ARG 21 startY ARG 23 startZ METHOD method_999 intersection (Lnet/minecraft/class_238;)Lnet/minecraft/class_238; + COMMENT Creates the maximum box that this box and the given box contain. ARG 1 box diff --git a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping index f86166952b..ef1124ea2b 100644 --- a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos METHOD method_18674 getSectionX ()I METHOD method_18675 getSectionCoord (I)I COMMENT Converts a world coordinate to the corresponding chunk-section coordinate. + COMMENT + COMMENT @implNote This implementation returns {@code coord / 16}. ARG 0 coord METHOD method_18676 from (III)Lnet/minecraft/class_4076; COMMENT Creates a chunk section position from its x-, y- and z-coordinates. diff --git a/mappings/net/minecraft/util/math/EulerAngle.mapping b/mappings/net/minecraft/util/math/EulerAngle.mapping index ce5336bcc3..cd731873ec 100644 --- a/mappings/net/minecraft/util/math/EulerAngle.mapping +++ b/mappings/net/minecraft/util/math/EulerAngle.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_2379 net/minecraft/util/math/EulerAngle ARG 1 serialized METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_10255 serialize ()Lnet/minecraft/class_2499; + METHOD method_10255 toNbt ()Lnet/minecraft/class_2499; METHOD method_10256 getPitch ()F METHOD method_10257 getYaw ()F METHOD method_10258 getRoll ()F diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 2b88a72b65..41ba574dca 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper FIELD field_15727 ARCSINE_TABLE [D FIELD field_15728 SMALLEST_FRACTION_FREE_DOUBLE D METHOD method_15338 wrapDegrees (D)D + COMMENT Wraps an angle in degrees to the interval {@code [-180, 180)}. + ARG 0 degrees METHOD method_15339 smallestEncompassingPowerOfTwo (I)I ARG 0 value METHOD method_15340 clamp (III)I @@ -14,7 +16,10 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 1 min ARG 2 max METHOD method_15341 floorMod (FF)F + ARG 0 dividend + ARG 1 divisor METHOD method_15342 log2DeBruijn (I)I + ARG 0 value METHOD method_15343 parseInt (Ljava/lang/String;I)I ARG 0 string ARG 1 fallback @@ -25,6 +30,8 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper METHOD method_15345 fastInverseSqrt (D)D ARG 0 x METHOD method_15346 floorDiv (II)I + ARG 0 dividend + ARG 1 divisor METHOD method_15347 approximatelyEquals (FF)Z ARG 0 a ARG 1 b @@ -41,33 +48,43 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 2 min ARG 4 max METHOD method_15351 log2 (I)I + ARG 0 value METHOD method_15352 isPowerOfTwo (I)Z + ARG 0 value METHOD method_15353 packRgb (FFF)I ARG 0 r ARG 1 g ARG 2 b METHOD method_15354 idealHash (I)I + ARG 0 value METHOD method_15355 sqrt (F)F + ARG 0 value METHOD method_15356 angleBetween (FF)F ARG 0 first ARG 1 second METHOD method_15357 floor (D)I + ARG 0 value METHOD method_15360 binarySearch (IILjava/util/function/IntPredicate;)I ARG 0 start ARG 1 end ARG 2 leftPredicate METHOD method_15362 cos (F)F + ARG 0 value METHOD method_15363 clamp (FFF)F ARG 0 value ARG 1 min ARG 2 max METHOD method_15365 fastFloor (D)I + ARG 0 value METHOD method_15366 nextDouble (Ljava/util/Random;DD)D ARG 0 random ARG 1 min ARG 3 max METHOD method_15367 floorMod (DD)D + ARG 0 dividend + ARG 2 divisor METHOD method_15368 sqrt (D)F + ARG 0 value METHOD method_15369 hsvToRgb (FFF)I ARG 0 hue ARG 1 saturation @@ -77,40 +94,49 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper COMMENT This is the delta value needed to lerp between {@code start} and {@code end} to get {@code value}. COMMENT In other words, {@code getLerpProgress(lerp(delta, start, end), start, end) == delta}. ARG 0 value - COMMENT The result of the lerp function + COMMENT the result of the lerp function ARG 2 start - COMMENT The value interpolated from + COMMENT the value interpolated from ARG 4 end - COMMENT The value interpolated to + COMMENT the value interpolated to METHOD method_15371 hashCode (III)J ARG 0 x ARG 1 y ARG 2 z METHOD method_15372 lfloor (D)J + ARG 0 value METHOD method_15373 average ([J)D ARG 0 array METHOD method_15374 sin (F)F + ARG 0 value METHOD method_15375 floor (F)I + ARG 0 value METHOD method_15378 randomUuid (Ljava/util/Random;)Ljava/util/UUID; ARG 0 random METHOD method_15379 abs (F)F + ARG 0 value METHOD method_15381 subtractAngles (FF)F ARG 0 start ARG 1 end METHOD method_15382 abs (I)I + ARG 0 value METHOD method_15383 packRgb (III)I ARG 0 r ARG 1 g ARG 2 b METHOD method_15384 ceil (D)I + ARG 0 value METHOD method_15385 fractionalPart (D)D ARG 0 value METHOD method_15386 ceil (F)I + ARG 0 value METHOD method_15387 floorMod (II)I + ARG 0 dividend + ARG 1 divisor METHOD method_15388 stepUnwrappedAngleTowards (FFF)F COMMENT Steps from {@code from} degrees towards {@code to} degrees, changing the value by at most {@code step} degrees. COMMENT - COMMENT

This method does not wrap the resulting angle, so {@link #stepAngleTowards(float, float, float)} should be used in preference.

+ COMMENT

This method does not wrap the resulting angle, so {@link #stepAngleTowards(float, float, float)} should be used in preference. ARG 0 from ARG 1 to ARG 2 step @@ -121,14 +147,21 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 2 end ARG 4 delta METHOD method_15391 absMax (DD)D + ARG 0 a + ARG 2 b METHOD method_15392 wrapDegrees (I)I + COMMENT Wraps an angle in degrees to the interval {@code [-180, 180)}. + ARG 0 degrees METHOD method_15393 wrapDegrees (F)F + COMMENT Wraps an angle in degrees to the interval {@code [-180, 180)}. + ARG 0 degrees METHOD method_15394 randomUuid ()Ljava/util/UUID; METHOD method_15395 nextInt (Ljava/util/Random;II)I ARG 0 random ARG 1 min ARG 2 max METHOD method_16435 perlinFade (D)D + ARG 0 value METHOD method_16436 lerp (DDD)D ARG 0 delta ARG 2 start @@ -136,41 +169,41 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper METHOD method_16437 lerp2 (DDDDDD)D COMMENT A two-dimensional lerp between values on the 4 corners of the unit square. Arbitrary values are specified for the corners and the output is interpolated between them. ARG 0 deltaX - COMMENT The x-coordinate on the unit square + COMMENT the x-coordinate on the unit square ARG 2 deltaY - COMMENT The y-coordinate on the unit square - ARG 4 val00 - COMMENT The output if {@code deltaX} is 0 and {@code deltaY} is 0 - ARG 6 val10 - COMMENT The output if {@code deltaX} is 1 and {@code deltaY} is 0 - ARG 8 val01 - COMMENT The output if {@code deltaX} is 0 and {@code deltaY} is 1 - ARG 10 val11 - COMMENT The output if {@code deltaX} is 1 and {@code deltaY} is 1 + COMMENT the y-coordinate on the unit square + ARG 4 x0y0 + COMMENT the output if {@code deltaX} is 0 and {@code deltaY} is 0 + ARG 6 x1y0 + COMMENT the output if {@code deltaX} is 1 and {@code deltaY} is 0 + ARG 8 x0y1 + COMMENT the output if {@code deltaX} is 0 and {@code deltaY} is 1 + ARG 10 x1y1 + COMMENT the output if {@code deltaX} is 1 and {@code deltaY} is 1 METHOD method_16438 lerp3 (DDDDDDDDDDD)D COMMENT A three-dimensional lerp between values on the 8 corners of the unit cube. Arbitrary values are specified for the corners and the output is interpolated between them. ARG 0 deltaX - COMMENT The x-coordinate on the unit cube + COMMENT the x-coordinate on the unit cube ARG 2 deltaY - COMMENT The y-coordinate on the unit cube + COMMENT the y-coordinate on the unit cube ARG 4 deltaZ - COMMENT The z-coordinate on the unit cube - ARG 6 val000 - COMMENT The output if {@code deltaX} is 0, {@code deltaY} is 0 and {@code deltaZ} is 0 - ARG 8 val100 - COMMENT The output if {@code deltaX} is 1, {@code deltaY} is 0 and {@code deltaZ} is 0 - ARG 10 val010 - COMMENT The output if {@code deltaX} is 0, {@code deltaY} is 1 and {@code deltaZ} is 0 - ARG 12 val110 - COMMENT The output if {@code deltaX} is 1, {@code deltaY} is 1 and {@code deltaZ} is 0 - ARG 14 val001 - COMMENT The output if {@code deltaX} is 0, {@code deltaY} is 0 and {@code deltaZ} is 1 - ARG 16 val101 - COMMENT The output if {@code deltaX} is 1, {@code deltaY} is 0 and {@code deltaZ} is 1 - ARG 18 val011 - COMMENT The output if {@code deltaX} is 0, {@code deltaY} is 1 and {@code deltaZ} is 1 - ARG 20 val111 - COMMENT The output if {@code deltaX} is 1, {@code deltaY} is 1 and {@code deltaZ} is 1 + COMMENT the z-coordinate on the unit cube + ARG 6 x0y0z0 + COMMENT the output if {@code deltaX} is 0, {@code deltaY} is 0 and {@code deltaZ} is 0 + ARG 8 x1y0z0 + COMMENT the output if {@code deltaX} is 1, {@code deltaY} is 0 and {@code deltaZ} is 0 + ARG 10 x0y1z0 + COMMENT the output if {@code deltaX} is 0, {@code deltaY} is 1 and {@code deltaZ} is 0 + ARG 12 x1y1z0 + COMMENT the output if {@code deltaX} is 1, {@code deltaY} is 1 and {@code deltaZ} is 0 + ARG 14 x0y0z1 + COMMENT the output if {@code deltaX} is 0, {@code deltaY} is 0 and {@code deltaZ} is 1 + ARG 16 x1y0z1 + COMMENT the output if {@code deltaX} is 1, {@code deltaY} is 0 and {@code deltaZ} is 1 + ARG 18 x0y1z1 + COMMENT the output if {@code deltaX} is 0, {@code deltaY} is 1 and {@code deltaZ} is 1 + ARG 20 x1y1z1 + COMMENT the output if {@code deltaX} is 1, {@code deltaY} is 1 and {@code deltaZ} is 1 METHOD method_16439 lerp (FFF)F ARG 0 delta ARG 1 start @@ -180,6 +213,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 1 start ARG 2 end METHOD method_17822 sign (D)I + ARG 0 value METHOD method_20306 stepAngleTowards (FFF)F COMMENT Steps from {@code from} degrees towards {@code to} degrees, changing the value by at most {@code step} degrees. ARG 0 from diff --git a/mappings/net/minecraft/util/math/Matrix3f.mapping b/mappings/net/minecraft/util/math/Matrix3f.mapping index d2e9d0600c..23d29866d6 100644 --- a/mappings/net/minecraft/util/math/Matrix3f.mapping +++ b/mappings/net/minecraft/util/math/Matrix3f.mapping @@ -13,9 +13,9 @@ CLASS net/minecraft/class_4581 net/minecraft/util/math/Matrix3f FIELD field_21640 a21 F FIELD field_21641 a22 F METHOD (Lnet/minecraft/class_1158;)V - ARG 1 source + ARG 1 quaternion METHOD (Lnet/minecraft/class_1159;)V - ARG 1 source + ARG 1 matrix METHOD (Lnet/minecraft/class_4581;)V ARG 1 source METHOD method_22847 transpose ()V @@ -30,6 +30,7 @@ CLASS net/minecraft/class_4581 net/minecraft/util/math/Matrix3f ARG 1 other METHOD method_22856 loadIdentity ()V METHOD method_23274 multiply (Lnet/minecraft/class_1158;)V + ARG 1 quaternion METHOD method_23296 copy ()Lnet/minecraft/class_4581; METHOD method_23729 multiply (F)V ARG 1 scalar diff --git a/mappings/net/minecraft/util/math/Matrix4f.mapping b/mappings/net/minecraft/util/math/Matrix4f.mapping index cd547562b9..fbc6d2008d 100644 --- a/mappings/net/minecraft/util/math/Matrix4f.mapping +++ b/mappings/net/minecraft/util/math/Matrix4f.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_1159 net/minecraft/util/math/Matrix4f METHOD (Lnet/minecraft/class_1158;)V ARG 1 quaternion METHOD (Lnet/minecraft/class_1159;)V - ARG 1 source + ARG 1 matrix METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_22668 loadIdentity ()V @@ -50,7 +50,9 @@ CLASS net/minecraft/class_1159 net/minecraft/util/math/Matrix4f ARG 2 aspectRatio ARG 3 cameraDepth ARG 4 viewDistance - METHOD method_4932 writeToBuffer (Ljava/nio/FloatBuffer;)V + METHOD method_4932 writeRowFirst (Ljava/nio/FloatBuffer;)V + COMMENT Writes this matrix to the buffer in row-major order. + ARG 1 buf METHOD method_4933 projectionMatrix (FFFF)Lnet/minecraft/class_1159; ARG 0 width ARG 1 height diff --git a/mappings/net/minecraft/util/math/Position.mapping b/mappings/net/minecraft/util/math/Position.mapping index 8f31f1776c..921534ab24 100644 --- a/mappings/net/minecraft/util/math/Position.mapping +++ b/mappings/net/minecraft/util/math/Position.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_2374 net/minecraft/util/math/Position METHOD method_10214 getY ()D + COMMENT Returns the Y coordinate. METHOD method_10215 getZ ()D + COMMENT Returns the Z coordinate. METHOD method_10216 getX ()D + COMMENT Returns the X coordinate. diff --git a/mappings/net/minecraft/util/math/Vec2f.mapping b/mappings/net/minecraft/util/math/Vec2f.mapping index 6949adb8dc..5b5201b315 100644 --- a/mappings/net/minecraft/util/math/Vec2f.mapping +++ b/mappings/net/minecraft/util/math/Vec2f.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_241 net/minecraft/util/math/Vec2f + COMMENT An immutable vector composed of 2 floats. FIELD field_1335 SOUTH_EAST_UNIT Lnet/minecraft/class_241; FIELD field_1336 SOUTH_UNIT Lnet/minecraft/class_241; FIELD field_1337 MAX_SOUTH_EAST Lnet/minecraft/class_241; diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index 7ac26d9684..f78518a11a 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -1,79 +1,202 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d + COMMENT An immutable vector composed of 3 doubles. + COMMENT + COMMENT

This vector class is used for representing position, velocity, + COMMENT rotation, color, etc. + COMMENT + COMMENT

This vector has proper {@link #hashCode()} and {@link #equals(Object)} + COMMENT implementations and can be used as a map key. + COMMENT + COMMENT @see Vec3i + COMMENT @see Vec3f FIELD field_1350 z D + COMMENT The Z coordinate of this vector. FIELD field_1351 y D + COMMENT The Y coordinate of this vector. FIELD field_1352 x D + COMMENT The X coordinate of this vector. FIELD field_1353 ZERO Lnet/minecraft/class_243; + COMMENT The zero vector (0, 0, 0). METHOD (DDD)V + COMMENT Creates a vector of the given coordinates. ARG 1 x ARG 3 y ARG 5 z METHOD (Lnet/minecraft/class_1160;)V + COMMENT Copies the given vector. ARG 1 vec METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_1019 add (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + COMMENT Returns the sum of this vector and the given vector. + COMMENT + COMMENT @see #add(double, double, double) ARG 1 vec METHOD method_1020 subtract (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + COMMENT Subtracts the given vector from this vector. + COMMENT + COMMENT @see #subtract(double, double, double) + COMMENT @see #relativize(Vec3d) + COMMENT @return the difference between this vector and the given vector ARG 1 vec METHOD method_1021 multiply (D)Lnet/minecraft/class_243; - ARG 1 mult + COMMENT Return a vector whose coordinates are the coordinates of this vector + COMMENT each multiplied by the given scalar value. + COMMENT + COMMENT @see #multiply(Vec3d) + COMMENT @see #multiply(double, double, double) + ARG 1 value METHOD method_1022 distanceTo (Lnet/minecraft/class_243;)D + COMMENT Returns the distance between this vector and the given vector. + COMMENT + COMMENT @see #squaredDistanceTo(Vec3d) ARG 1 vec METHOD method_1023 subtract (DDD)Lnet/minecraft/class_243; + COMMENT Subtracts the given vector from this vector. + COMMENT + COMMENT @see #relativize(Vec3d) + COMMENT @return the difference between this vector and the given vector ARG 1 x ARG 3 y ARG 5 z METHOD method_1024 rotateY (F)Lnet/minecraft/class_243; + COMMENT Rotates this vector by the given angle counterclockwise around the Y axis. ARG 1 angle + COMMENT the angle in radians METHOD method_1025 squaredDistanceTo (Lnet/minecraft/class_243;)D + COMMENT Returns the squared distance between this vector and the given vector. + COMMENT + COMMENT

Can be used for fast comparison between distances. + COMMENT + COMMENT @see #squaredDistanceTo(double, double, double) + COMMENT @see #distanceTo(Vec3d) ARG 1 vec METHOD method_1026 dotProduct (Lnet/minecraft/class_243;)D + COMMENT Returns the dot product of this vector and the given vector. ARG 1 vec METHOD method_1027 lengthSquared ()D + COMMENT Returns the squared length of this vector. + COMMENT + COMMENT

Can be used for fast comparison between lengths. + COMMENT + COMMENT @see #length() METHOD method_1028 squaredDistanceTo (DDD)D + COMMENT Returns the squared distance between this vector and the given vector. + COMMENT + COMMENT

Can be used for fast comparison between distances. + COMMENT + COMMENT @see #squaredDistanceTo(Vec3d) + COMMENT @see #distanceTo(Vec3d) ARG 1 x ARG 3 y ARG 5 z METHOD method_1029 normalize ()Lnet/minecraft/class_243; + COMMENT Normalizes this vector. + COMMENT + COMMENT

Normalized vector is a vector with the same direction but with + COMMENT length 1. Each coordinate of normalized vector has value between 0 + COMMENT and 1. + COMMENT + COMMENT @return the normalized vector of this vector METHOD method_1030 fromPolar (FF)Lnet/minecraft/class_243; + COMMENT Converts pitch and yaw into a direction vector. + COMMENT + COMMENT @see #fromPolar(Vec2f) ARG 0 pitch ARG 1 yaw METHOD method_1031 add (DDD)Lnet/minecraft/class_243; + COMMENT Returns the sum of this vector and the given vector. + COMMENT + COMMENT @see #add(Vec3d) ARG 1 x ARG 3 y ARG 5 z METHOD method_1032 floorAlongAxes (Ljava/util/EnumSet;)Lnet/minecraft/class_243; + COMMENT Applies the floor function to the coordinates chosen by the given axes. ARG 1 axes METHOD method_1033 length ()D + COMMENT Returns the length of this vector. + COMMENT + COMMENT

The length of a vector is equivalent to the distance between that + COMMENT vector and the {@linkplain #ZERO} vector. + COMMENT + COMMENT @see #lengthSquared() METHOD method_1034 fromPolar (Lnet/minecraft/class_241;)Lnet/minecraft/class_243; + COMMENT Converts pitch and yaw into a direction vector. + COMMENT + COMMENT @see #fromPolar(float, float) ARG 0 polar - METHOD method_1035 reverseSubtract (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + COMMENT the vector composed of pitch and yaw + METHOD method_1035 relativize (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + COMMENT Subtracts this vector from the given vector. + COMMENT + COMMENT @see #subtract(Vec3d) + COMMENT @return the difference between the given vector and this vector ARG 1 vec METHOD method_1036 crossProduct (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + COMMENT Returns the cross product of this vector and the given vector. ARG 1 vec METHOD method_1037 rotateX (F)Lnet/minecraft/class_243; + COMMENT Rotates this vector by the given angle counterclockwise around the X axis. ARG 1 angle + COMMENT the angle in radians METHOD method_18043 getComponentAlongAxis (Lnet/minecraft/class_2350$class_2351;)D + COMMENT Returns the coordinate chosen by the given axis. + ARG 1 axis METHOD method_18805 multiply (DDD)Lnet/minecraft/class_243; - ARG 1 multX - ARG 3 multY - ARG 5 multZ + COMMENT Returns a vector whose coordinates are the product of each pair of + COMMENT coordinates in this vector and the given vector. + COMMENT + COMMENT @see #multiply(Vec3d) + COMMENT @see #multiply(double) + ARG 1 x + ARG 3 y + ARG 5 z METHOD method_18806 multiply (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; - ARG 1 mult + COMMENT Returns a vector whose coordinates are the product of each pair of + COMMENT coordinates in this vector and the given vector. + COMMENT + COMMENT @see #multiply(double, double, double) + COMMENT @see #multiply(double) + ARG 1 vec METHOD method_22882 negate ()Lnet/minecraft/class_243; + COMMENT Creates a vector with the same length but with the opposite direction. METHOD method_24457 unpackRgb (I)Lnet/minecraft/class_243; + COMMENT Converts a packed RGB color into a vector of (red, green, blue). + COMMENT + COMMENT @return the vector representing the given color; each coordinate has + COMMENT value between 0 and 1 ARG 0 rgb + COMMENT the color in the 0xRRGGBB format METHOD method_24802 isInRange (Lnet/minecraft/class_2374;D)Z + COMMENT Checks if the distance between this vector and the given position is + COMMENT less than {@code radius}. ARG 1 pos ARG 2 radius METHOD method_24953 ofCenter (Lnet/minecraft/class_2382;)Lnet/minecraft/class_243; + COMMENT Creates a vector representing the center of the given block position. ARG 0 vec METHOD method_24954 of (Lnet/minecraft/class_2382;)Lnet/minecraft/class_243; + COMMENT Copies the given vector. ARG 0 vec METHOD method_24955 ofBottomCenter (Lnet/minecraft/class_2382;)Lnet/minecraft/class_243; + COMMENT Creates a vector representing the bottom center of the given block + COMMENT position. + COMMENT + COMMENT

The bottom center of a block position {@code pos} is + COMMENT {@code (pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5)}. + COMMENT + COMMENT @see #ofCenter(Vec3i) ARG 0 vec METHOD method_26410 ofCenter (Lnet/minecraft/class_2382;D)Lnet/minecraft/class_243; + COMMENT Creates a vector representing the center of the given block position but + COMMENT with the given offset for the Y coordinate. + COMMENT + COMMENT @return a vector of {@code (vec.getX() + 0.5, vec.getY() + deltaY, + COMMENT vec.getZ() + 0.5)} ARG 0 vec ARG 1 deltaY METHOD method_31033 rotateZ (F)Lnet/minecraft/class_243; + COMMENT Rotates this vector by the given angle counterclockwise around the Z axis. ARG 1 angle + COMMENT the angle in radians diff --git a/mappings/net/minecraft/client/util/math/Vector3f.mapping b/mappings/net/minecraft/util/math/Vec3f.mapping similarity index 93% rename from mappings/net/minecraft/client/util/math/Vector3f.mapping rename to mappings/net/minecraft/util/math/Vec3f.mapping index 0e32fe12f7..a21a0f571b 100644 --- a/mappings/net/minecraft/client/util/math/Vector3f.mapping +++ b/mappings/net/minecraft/util/math/Vec3f.mapping @@ -1,4 +1,5 @@ -CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f +CLASS net/minecraft/class_1160 net/minecraft/util/math/Vec3f + COMMENT A mutable vector composed of 3 floats. FIELD field_20702 NEGATIVE_X Lnet/minecraft/class_1160; FIELD field_20703 POSITIVE_X Lnet/minecraft/class_1160; FIELD field_20704 NEGATIVE_Y Lnet/minecraft/class_1160; @@ -21,6 +22,7 @@ CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f METHOD method_23214 getDegreesQuaternion (F)Lnet/minecraft/class_1158; ARG 1 angle METHOD method_23215 transform (Lnet/minecraft/class_4581;)V + ARG 1 matrix METHOD method_23626 getRadialQuaternion (F)Lnet/minecraft/class_1158; ARG 1 angle METHOD method_23846 add (Lnet/minecraft/class_1160;)V diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index 2f7296177f..5d3e2c5e9e 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i + COMMENT A publicly read-only but mutable vector composed of 3 integers. FIELD field_11173 z I FIELD field_11174 y I FIELD field_11175 x I @@ -49,6 +50,7 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i METHOD method_23228 down ()Lnet/minecraft/class_2382; METHOD method_23854 toShortString ()Ljava/lang/String; METHOD method_30558 getComponentAlongAxis (Lnet/minecraft/class_2350$class_2351;)I + ARG 1 axis METHOD method_30930 up (I)Lnet/minecraft/class_2382; ARG 1 distance METHOD method_30931 up ()Lnet/minecraft/class_2382; diff --git a/mappings/net/minecraft/client/util/math/Vector4f.mapping b/mappings/net/minecraft/util/math/Vector4f.mapping similarity index 78% rename from mappings/net/minecraft/client/util/math/Vector4f.mapping rename to mappings/net/minecraft/util/math/Vector4f.mapping index 1b2c38dfb3..2c2e1f8f93 100644 --- a/mappings/net/minecraft/client/util/math/Vector4f.mapping +++ b/mappings/net/minecraft/util/math/Vector4f.mapping @@ -1,4 +1,6 @@ -CLASS net/minecraft/class_1162 net/minecraft/client/util/math/Vector4f +CLASS net/minecraft/class_1162 net/minecraft/util/math/Vector4f + COMMENT @implNote Even though this is used only on the client, it accesses protected + COMMENT fields from {@link Matrix4f}, which requires them to be in the same package. FIELD field_21486 x F FIELD field_21487 y F FIELD field_21488 z F diff --git a/mappings/net/minecraft/util/math/noise/NoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/NoiseSampler.mapping index 0567a59733..80cde99157 100644 --- a/mappings/net/minecraft/util/math/noise/NoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/NoiseSampler.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_3757 net/minecraft/util/math/noise/NoiseSampler METHOD method_16454 sample (DDDD)D ARG 1 x ARG 3 y + ARG 5 yScale + ARG 7 yMax diff --git a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping index b033ec3bea..684d31cfdb 100644 --- a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping @@ -14,9 +14,13 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa ARG 3 y ARG 5 z METHOD method_16452 maintainPrecision (D)D + ARG 0 value METHOD method_16453 sample (DDDDDZ)D ARG 1 x ARG 3 y ARG 5 z + ARG 7 yScale + ARG 9 yMax + ARG 11 useOrigin METHOD method_16668 getOctave (I)Lnet/minecraft/class_3756; ARG 1 octave diff --git a/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping index 9d5e7227b1..29a3f1da0c 100644 --- a/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctaveSimplexNoiseSampler.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_3543 net/minecraft/util/math/noise/OctaveSimplexNoiseS METHOD method_16451 sample (DDZ)D ARG 1 x ARG 3 y + ARG 5 useOrigin diff --git a/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping index c0662fdcfe..74ebdf0672 100644 --- a/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/PerlinNoiseSampler.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_3756 net/minecraft/util/math/noise/PerlinNoiseSampler ARG 1 x ARG 3 y ARG 5 z + ARG 7 yScale + ARG 9 yMax METHOD method_16448 grad (IDDD)D ARG 0 hash ARG 1 x diff --git a/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping index a9bd119680..8623e36fab 100644 --- a/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_3541 net/minecraft/util/math/noise/SimplexNoiseSampler FIELD field_15763 originX D FIELD field_15764 SQRT_3 D FIELD field_15765 permutations [I - FIELD field_15766 gradients [[I + FIELD field_15766 GRADIENTS [[I FIELD field_15767 UNSKEW_FACTOR_2D D FIELD field_15768 SKEW_FACTOR_2D D METHOD (Ljava/util/Random;)V @@ -22,5 +22,6 @@ CLASS net/minecraft/class_3541 net/minecraft/util/math/noise/SimplexNoiseSampler ARG 2 x ARG 4 y ARG 6 z + ARG 8 distance METHOD method_16456 getGradient (I)I ARG 1 hash diff --git a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping index 13435d066c..fb8d1ece90 100644 --- a/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping +++ b/mappings/net/minecraft/util/registry/BuiltinRegistries.mapping @@ -15,7 +15,9 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries FIELD field_26375 CHUNK_GENERATOR_SETTINGS Lnet/minecraft/class_2378; METHOD method_30559 init ()V METHOD method_30560 set (Lnet/minecraft/class_2378;ILnet/minecraft/class_5321;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 registry ARG 1 rawId + ARG 2 key ARG 3 object METHOD method_30561 add (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry @@ -33,6 +35,7 @@ CLASS net/minecraft/class_5458 net/minecraft/util/registry/BuiltinRegistries ARG 0 registryRef ARG 1 registry ARG 2 defaultValueSupplier + ARG 3 lifecycle METHOD method_30565 addRegistry (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; ARG 0 registryRef ARG 1 defaultValueSupplier diff --git a/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping b/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping index 53b5ebe62a..7dfbafe033 100644 --- a/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping +++ b/mappings/net/minecraft/util/registry/DefaultedRegistry.mapping @@ -3,4 +3,6 @@ CLASS net/minecraft/class_2348 net/minecraft/util/registry/DefaultedRegistry FIELD field_11015 defaultValue Ljava/lang/Object; METHOD (Ljava/lang/String;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V ARG 1 defaultId + ARG 2 key + ARG 3 lifecycle METHOD method_10137 getDefaultId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping index 6c3351983b..23d6850dc7 100644 --- a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping +++ b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping @@ -4,11 +4,11 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage COMMENT COMMENT

Each minecraft server has a dynamic registry manager for file-loaded COMMENT registries, while each client play network handler has a dynamic registry - COMMENT manager for server-sent dynamic registries.

+ COMMENT manager for server-sent dynamic registries. COMMENT COMMENT

The {@link DynamicRegistryManager.Impl} COMMENT class serves as an immutable implementation of any particular collection - COMMENT or configuration of dynamic registries.

+ COMMENT or configuration of dynamic registries. FIELD field_25918 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_25919 INFOS Ljava/util/Map; FIELD field_26733 BUILTIN Lnet/minecraft/class_5455$class_5457; @@ -36,7 +36,7 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage ARG 0 ops ARG 1 manager ARG 2 info - METHOD method_30527 getOptional (Lnet/minecraft/class_5321;)Ljava/util/Optional; + METHOD method_30527 getOptionalMutable (Lnet/minecraft/class_5321;)Ljava/util/Optional; COMMENT Retrieves a registry optionally from this manager. ARG 1 key METHOD method_30528 create ()Lnet/minecraft/class_5455$class_5457; diff --git a/mappings/net/minecraft/util/registry/MutableRegistry.mapping b/mappings/net/minecraft/util/registry/MutableRegistry.mapping index 4368fc6579..bfb918601b 100644 --- a/mappings/net/minecraft/util/registry/MutableRegistry.mapping +++ b/mappings/net/minecraft/util/registry/MutableRegistry.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2385 net/minecraft/util/registry/MutableRegistry ARG 1 rawId ARG 2 key ARG 3 entry + ARG 4 lifecycle METHOD method_31062 replace (Ljava/util/OptionalInt;Lnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Ljava/lang/Object; COMMENT If the given key is already present in the registry, replaces the entry associated with the given COMMENT key with the new entry. This method asserts that the raw ID is equal to the value already in @@ -14,7 +15,8 @@ CLASS net/minecraft/class_2385 net/minecraft/util/registry/MutableRegistry COMMENT COMMENT

If the given key is not already present in the registry, adds the entry to the registry. If COMMENT {@code rawId} is present, then this method gives the entry this raw ID. Otherwise, uses the - COMMENT next available ID.

+ COMMENT next available ID. ARG 1 rawId ARG 2 key ARG 3 newEntry + ARG 4 lifecycle diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index be7963a522..bc0fa18479 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -74,7 +74,8 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_25096 BIOME_SOURCE Lnet/minecraft/class_2378; FIELD field_25097 CHUNK_GENERATOR Lnet/minecraft/class_2378; FIELD field_25098 registryKey Lnet/minecraft/class_5321; - COMMENT The {@linkplain RegistryKey} representing the ID of the actual registry. + COMMENT The key representing the type of elements held by this registry. It is also the + COMMENT key of this registry within the root registry. FIELD field_25099 lifecycle Lcom/mojang/serialization/Lifecycle; FIELD field_25100 ROOT_KEY Lnet/minecraft/class_2960; FIELD field_25101 ROOT Lnet/minecraft/class_2385; @@ -100,8 +101,22 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_25295 LOOT_POOL_ENTRY_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_25296 LOOT_FUNCTION_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_25297 LOOT_CONDITION_TYPE_KEY Lnet/minecraft/class_5321; + FIELD field_25298 WORLD_KEY Lnet/minecraft/class_5321; + COMMENT A registry key representing the {@link World} type. Can be used to obtain + COMMENT registry keys with the {@link World} type, such as that for the overworld. + COMMENT + COMMENT

Notice that {@code this == Registry.DIMENSION_KEY}. + COMMENT + COMMENT @see #DIMENSION_KEY + COMMENT @see World#OVERWORLD + COMMENT @see net.minecraft.server.MinecraftServer#worlds FIELD field_25299 LOOT_CONDITION_TYPE Lnet/minecraft/class_2378; - FIELD field_25490 DIMENSION_OPTIONS Lnet/minecraft/class_5321; + FIELD field_25490 DIMENSION_KEY Lnet/minecraft/class_5321; + COMMENT A registry key representing the {@link DimensionOptions} type. + COMMENT + COMMENT

Notice that {@code this == Registry.WORLD_KEY}. + COMMENT + COMMENT @see #WORLD_KEY METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V ARG 1 key ARG 2 lifecycle @@ -111,6 +126,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry METHOD method_10223 get (Lnet/minecraft/class_2960;)Ljava/lang/Object; ARG 1 id METHOD method_10224 create (Lnet/minecraft/class_5321;Ljava/lang/String;Ljava/util/function/Supplier;)Lnet/minecraft/class_2348; + ARG 0 key ARG 1 defaultId ARG 2 defaultEntry METHOD method_10226 register (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; @@ -118,8 +134,10 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 1 id ARG 2 entry METHOD method_10227 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Ljava/util/function/Supplier;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_2385; + ARG 0 key ARG 1 registry ARG 2 defaultEntry + ARG 3 lifecycle METHOD method_10230 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry ARG 1 id @@ -131,6 +149,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 3 entry METHOD method_10235 getIds ()Ljava/util/Set; METHOD method_10247 create (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; + ARG 0 key ARG 1 defaultEntry METHOD method_10250 containsId (Lnet/minecraft/class_2960;)Z ARG 1 id @@ -143,9 +162,13 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry METHOD method_29107 get (Lnet/minecraft/class_5321;)Ljava/lang/Object; ARG 1 key METHOD method_29108 create (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Supplier;)Lnet/minecraft/class_2378; + ARG 0 key + ARG 1 lifecycle ARG 2 defaultEntry METHOD method_29109 create (Lnet/minecraft/class_5321;Ljava/lang/String;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Supplier;)Lnet/minecraft/class_2348; + ARG 0 key ARG 1 defaultId + ARG 2 lifecycle ARG 3 defaultEntry METHOD method_29113 getKey (Ljava/lang/Object;)Ljava/util/Optional; ARG 1 entry @@ -154,6 +177,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry METHOD method_31138 getLifecycle ()Lcom/mojang/serialization/Lifecycle; METHOD method_31139 getEntryLifecycle (Ljava/lang/Object;)Lcom/mojang/serialization/Lifecycle; COMMENT Gets the lifecycle of a registry entry. + ARG 1 entry METHOD method_31140 getOrThrow (Lnet/minecraft/class_5321;)Ljava/lang/Object; COMMENT Gets an entry from the registry. COMMENT diff --git a/mappings/net/minecraft/util/registry/RegistryKey.mapping b/mappings/net/minecraft/util/registry/RegistryKey.mapping index 884bc4804d..b6d631d8f9 100644 --- a/mappings/net/minecraft/util/registry/RegistryKey.mapping +++ b/mappings/net/minecraft/util/registry/RegistryKey.mapping @@ -25,7 +25,7 @@ CLASS net/minecraft/class_5321 net/minecraft/util/registry/RegistryKey COMMENT value. COMMENT COMMENT

You can call it like {@code RegistryKey.of(Registry.ITEM_KEY, new Identifier("iron_ingot"))} - COMMENT to create a registry key for iron ingot.

+ COMMENT to create a registry key for iron ingot. COMMENT COMMENT @param the type of the value ARG 0 registry @@ -37,7 +37,7 @@ CLASS net/minecraft/class_5321 net/minecraft/util/registry/RegistryKey COMMENT all registries) with an identifier for the registry. COMMENT COMMENT

You can call it like {@code RegistryKey.of(new Identifier("block"))} - COMMENT to create a registry key for the block registry.

+ COMMENT to create a registry key for the block registry. COMMENT COMMENT @param the element type of the registry ARG 0 registry diff --git a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping index 7810c47c06..a0279dda25 100644 --- a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping @@ -10,19 +10,25 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry FIELD field_26732 lifecycle Lcom/mojang/serialization/Lifecycle; METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/lang/Object; METHOD method_29098 createRegistryManagerCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 key + ARG 1 lifecycle ARG 2 entryCodec METHOD method_29721 createRegistryCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 registryRef ARG 1 lifecycle ARG 2 entryCodec METHOD method_30929 createRegistryManagerEntryCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec; + ARG 0 key ARG 1 entryCodec METHOD method_31051 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;Z)Ljava/lang/Object; ARG 1 rawId ARG 2 key ARG 3 entry + ARG 4 lifecycle ARG 5 checkDuplicateKeys METHOD method_31059 createCodec (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 key + ARG 1 lifecycle ARG 2 entryCodec CLASS class_5501 RegistryManagerEntry FIELD field_26684 key Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping b/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping index dba66f2650..13cef7c833 100644 --- a/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_244 net/minecraft/util/shape/BitSetVoxelSet - FIELD field_1354 yMax I - FIELD field_1355 xMax I - FIELD field_1356 zMin I - FIELD field_1357 yMin I - FIELD field_1358 xMin I + FIELD field_1354 maxY I + FIELD field_1355 maxX I + FIELD field_1356 minZ I + FIELD field_1357 minY I + FIELD field_1358 minX I FIELD field_1359 storage Ljava/util/BitSet; - FIELD field_1360 zMax I + FIELD field_1360 maxZ I METHOD (IIIIIIIII)V ARG 1 xMask ARG 2 yMask diff --git a/mappings/net/minecraft/util/shape/CroppedVoxelSet.mapping b/mappings/net/minecraft/util/shape/CroppedVoxelSet.mapping index 018eb488ab..a99dd8ba52 100644 --- a/mappings/net/minecraft/util/shape/CroppedVoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/CroppedVoxelSet.mapping @@ -1,16 +1,16 @@ CLASS net/minecraft/class_262 net/minecraft/util/shape/CroppedVoxelSet - FIELD field_1388 yMax I - FIELD field_1389 xMax I - FIELD field_1390 zMin I - FIELD field_1391 yMin I - FIELD field_1392 xMin I + FIELD field_1388 maxY I + FIELD field_1389 maxX I + FIELD field_1390 minZ I + FIELD field_1391 minY I + FIELD field_1392 minX I FIELD field_1393 parent Lnet/minecraft/class_251; - FIELD field_1394 zMax I + FIELD field_1394 maxZ I METHOD (Lnet/minecraft/class_251;IIIIII)V ARG 1 parent - ARG 2 xMin - ARG 3 yMin - ARG 4 zMin - ARG 5 xMax - ARG 6 yMax - ARG 7 zMax + ARG 2 minX + ARG 3 minY + ARG 4 minZ + ARG 5 maxX + ARG 6 maxY + ARG 7 maxZ diff --git a/mappings/net/minecraft/util/shape/SlicedVoxelShape.mapping b/mappings/net/minecraft/util/shape/SlicedVoxelShape.mapping index 8160307da0..442d7c7e9e 100644 --- a/mappings/net/minecraft/util/shape/SlicedVoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/SlicedVoxelShape.mapping @@ -8,4 +8,5 @@ CLASS net/minecraft/class_263 net/minecraft/util/shape/SlicedVoxelShape ARG 3 sliceWidth METHOD method_1088 createVoxelSet (Lnet/minecraft/class_251;Lnet/minecraft/class_2350$class_2351;I)Lnet/minecraft/class_251; ARG 0 voxelSet + ARG 1 axis ARG 2 sliceWidth diff --git a/mappings/net/minecraft/util/shape/VoxelSet.mapping b/mappings/net/minecraft/util/shape/VoxelSet.mapping index 06b9c6e1e0..fc9ee1abea 100644 --- a/mappings/net/minecraft/util/shape/VoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/VoxelSet.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_251 net/minecraft/util/shape/VoxelSet - FIELD field_1372 zSize I - FIELD field_1373 ySize I - FIELD field_1374 xSize I + FIELD field_1372 sizeZ I + FIELD field_1373 sizeY I + FIELD field_1374 sizeX I FIELD field_1375 AXES [Lnet/minecraft/class_2350$class_2351; METHOD (III)V - ARG 1 xSize - ARG 2 ySize - ARG 3 zSize + ARG 1 sizeX + ARG 2 sizeY + ARG 3 sizeZ METHOD method_1044 inBoundsAndContains (III)Z ARG 1 x ARG 2 y @@ -45,6 +45,7 @@ CLASS net/minecraft/class_251 net/minecraft/util/shape/VoxelSet ARG 3 y ARG 4 z METHOD method_1058 getEndingAxisCoord (Lnet/minecraft/class_2350$class_2351;II)I + ARG 1 axis ARG 2 from ARG 3 to METHOD method_1059 isColumnFull (IIII)Z diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index aa9d508ba3..2d06342be1 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -21,13 +21,15 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape ARG 5 z METHOD method_1097 simplify ()Lnet/minecraft/class_265; METHOD method_1098 getUncachedFace (Lnet/minecraft/class_2350;)Lnet/minecraft/class_265; - ARG 1 facing + ARG 1 direction METHOD method_1099 getPointPosition (Lnet/minecraft/class_2350$class_2351;I)D ARG 1 axis ARG 2 index METHOD method_1100 getCoordIndex (Lnet/minecraft/class_2350$class_2351;D)I + ARG 1 axis ARG 2 coord METHOD method_1102 getEndingCoord (Lnet/minecraft/class_2350$class_2351;DD)D + ARG 1 axis ARG 2 from ARG 4 to METHOD method_1103 calculateMaxDistance (Lnet/minecraft/class_2335;Lnet/minecraft/class_238;D)D diff --git a/mappings/net/minecraft/util/shape/VoxelShapes.mapping b/mappings/net/minecraft/util/shape/VoxelShapes.mapping index 7952decf5c..ecc3a4f406 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapes.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShapes.mapping @@ -47,12 +47,12 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes ARG 1 two ARG 2 direction METHOD method_1081 cuboid (DDDDDD)Lnet/minecraft/class_265; - ARG 0 xMin - ARG 2 yMin - ARG 4 zMin - ARG 6 xMax - ARG 8 yMax - ARG 10 zMax + ARG 0 minX + ARG 2 minY + ARG 4 minZ + ARG 6 maxX + ARG 8 maxY + ARG 10 maxZ METHOD method_1082 combine (Lnet/minecraft/class_265;Lnet/minecraft/class_265;Lnet/minecraft/class_247;)Lnet/minecraft/class_265; ARG 0 one ARG 1 two @@ -90,6 +90,7 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes ARG 5 direction ARG 6 shapes METHOD method_17945 calculatePushVelocity (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;DLnet/minecraft/class_3726;Ljava/util/stream/Stream;)D + ARG 0 axis ARG 1 box ARG 2 world ARG 3 initial diff --git a/mappings/net/minecraft/util/thread/MessageListener.mapping b/mappings/net/minecraft/util/thread/MessageListener.mapping index 78823e7f2b..d754c02601 100644 --- a/mappings/net/minecraft/util/thread/MessageListener.mapping +++ b/mappings/net/minecraft/util/thread/MessageListener.mapping @@ -6,4 +6,9 @@ CLASS net/minecraft/class_3906 net/minecraft/util/thread/MessageListener ARG 0 name ARG 1 action METHOD method_17345 ask (Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; + COMMENT Asks a message provider for a message. + COMMENT + COMMENT The {@link CompletableFuture} returned from this function will never complete exceptionally. + COMMENT + COMMENT @return CompletableFuture future that completes with the received message ARG 1 messageProvider diff --git a/mappings/net/minecraft/village/Merchant.mapping b/mappings/net/minecraft/village/Merchant.mapping index 00b1da8f59..9ff218e5e8 100644 --- a/mappings/net/minecraft/village/Merchant.mapping +++ b/mappings/net/minecraft/village/Merchant.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1915 net/minecraft/village/Merchant METHOD method_17449 sendOffers (Lnet/minecraft/class_1657;Lnet/minecraft/class_2561;I)V + ARG 1 player + ARG 2 test + ARG 3 levelProgress METHOD method_18010 getYesSound ()Lnet/minecraft/class_3414; METHOD method_19269 getExperience ()I METHOD method_19270 isLeveledMerchant ()Z diff --git a/mappings/net/minecraft/village/MerchantInventory.mapping b/mappings/net/minecraft/village/MerchantInventory.mapping index 06f46c80f4..287cd46ef2 100644 --- a/mappings/net/minecraft/village/MerchantInventory.mapping +++ b/mappings/net/minecraft/village/MerchantInventory.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_1725 net/minecraft/village/MerchantInventory FIELD field_18668 merchantRewardedExperience I - FIELD field_7842 recipeIndex I + FIELD field_7842 offerIndex I FIELD field_7843 tradeOffer Lnet/minecraft/class_1914; FIELD field_7844 merchant Lnet/minecraft/class_1915; FIELD field_7845 inventory Lnet/minecraft/class_2371; METHOD method_19252 getMerchantRewardedExperience ()I METHOD method_7642 getTradeOffer ()Lnet/minecraft/class_1914; - METHOD method_7643 setRecipeIndex (I)V + METHOD method_7643 setOfferIndex (I)V ARG 1 index - METHOD method_7644 needRecipeUpdate (I)Z + METHOD method_7644 needsOfferUpdate (I)Z ARG 1 slot - METHOD method_7645 updateRecipes ()V + METHOD method_7645 updateOffers ()V diff --git a/mappings/net/minecraft/village/SimpleMerchant.mapping b/mappings/net/minecraft/village/SimpleMerchant.mapping index 978ee322df..f5fd0aeac1 100644 --- a/mappings/net/minecraft/village/SimpleMerchant.mapping +++ b/mappings/net/minecraft/village/SimpleMerchant.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1645 net/minecraft/village/SimpleMerchant FIELD field_18525 experience I FIELD field_7441 player Lnet/minecraft/class_1657; - FIELD field_7442 recipeList Lnet/minecraft/class_1916; + FIELD field_7442 offers Lnet/minecraft/class_1916; FIELD field_7443 merchantInventory Lnet/minecraft/class_1725; diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index 64294f570d..9fd2a86c3c 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -13,14 +13,14 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 1 buyItem ARG 2 sellItem ARG 3 maxUses - ARG 4 rewardedExp + ARG 4 merchantExperience ARG 5 priceMultiplier METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIF)V ARG 1 firstBuyItem ARG 2 secondBuyItem ARG 3 sellItem ARG 4 maxUses - ARG 5 rewardedExp + ARG 5 merchantExperience ARG 6 priceMultiplier METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIF)V ARG 1 firstBuyItem @@ -28,33 +28,83 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 3 sellItem ARG 4 uses ARG 5 maxUses - ARG 6 rewardedExp + ARG 6 merchantExperience ARG 7 priceMultiplier METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 first ARG 2 second METHOD method_16953 depleteBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 1 firstBuyStack + ARG 2 secondBuyStack METHOD method_16954 acceptsBuy (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 given ARG 2 sample - METHOD method_18019 getSellItem ()Lnet/minecraft/class_1799; + METHOD method_18019 copySellItem ()Lnet/minecraft/class_1799; + COMMENT Returns a copy of the sell item of this trade offer. METHOD method_19272 getAdjustedFirstBuyItem ()Lnet/minecraft/class_1799; + COMMENT Returns a copy of the first buy item of this trade offer, + COMMENT with its price adjusted depending on the demand bonus, the + COMMENT special price and the price multiplier. METHOD method_19273 setSpecialPrice (I)V - METHOD method_19274 updatePriceOnDemand ()V + COMMENT Sets the special price of this trade offer to {@code specialPrice}. + ARG 1 specialPrice + METHOD method_19274 updateDemandBonus ()V + COMMENT Updates the demand bonus of this trade offer depending on its + COMMENT previous demand bonus, the number of times it has been used and + COMMENT its remaining uses. METHOD method_19275 resetUses ()V + COMMENT Resets the number of times this trade offer has been used. METHOD method_19276 clearSpecialPrice ()V + COMMENT Resets the special price of this trade offer. METHOD method_19277 getSpecialPrice ()I + COMMENT Returns the special price of this trade offer. It is used to + COMMENT adjust the price of its first buy item. + COMMENT + COMMENT

The less the special price is, the more the price will be low. METHOD method_19278 getPriceMultiplier ()F + COMMENT Returns the price multiplier of this trade offer. It is used to + COMMENT adjust the price of its first buy item. METHOD method_19279 getMerchantExperience ()I + COMMENT Returns the amount of experience that will be given to a merchant + COMMENT after this trade offer has been used. METHOD method_21725 getDemandBonus ()I + COMMENT Returns the demand bonus of this trade offer. It is used to + COMMENT adjust the price of its first buy item. + COMMENT + COMMENT

The more the demand bonus is, the more the price will be high. + COMMENT + COMMENT

It is updated when a villager restocks. + COMMENT + COMMENT @see #updateDemandBonus() METHOD method_8244 use ()V + COMMENT Increments the number of times this trade offer has been used. METHOD method_8245 increaseSpecialPrice (I)V + COMMENT Increases the special price of this trade offer by {@code increment}. + COMMENT + COMMENT

A negative {@code increment} value will decrease the special price. + ARG 1 increment METHOD method_8246 getOriginalFirstBuyItem ()Lnet/minecraft/class_1799; + COMMENT Returns the first buy item of this trade offer. METHOD method_8247 getSecondBuyItem ()Lnet/minecraft/class_1799; + COMMENT Returns the second buy item of this trade offer. + COMMENT + COMMENT

If there is no second buy item, this returns the {@linkplain ItemStack#EMPTY empty + COMMENT item stack}. METHOD method_8248 getMaxUses ()I + COMMENT Returns the maximum number of times this trade offer can be used. METHOD method_8249 getUses ()I - METHOD method_8250 getMutableSellItem ()Lnet/minecraft/class_1799; - METHOD method_8251 toTag ()Lnet/minecraft/class_2487; - METHOD method_8254 clearUses ()V + COMMENT Returns the number of times this trade offer has been used. + METHOD method_8250 getSellItem ()Lnet/minecraft/class_1799; + COMMENT Returns the sell item of this trade offer. + METHOD method_8251 toNbt ()Lnet/minecraft/class_2487; + METHOD method_8254 disable ()V + COMMENT Sets the number of times this trade offer has been used to + COMMENT its maximum uses, making it disabled. METHOD method_8255 isDisabled ()Z + COMMENT Returns whether this trade offer is disabled. + COMMENT + COMMENT

Checks if the number of times this trade offer has been used + COMMENT is greater or equal to its maximum uses. METHOD method_8256 shouldRewardPlayerExperience ()Z + COMMENT Returns whether experience should be given to a player when + COMMENT they use this trade offer. diff --git a/mappings/net/minecraft/village/TradeOfferList.mapping b/mappings/net/minecraft/village/TradeOfferList.mapping index 013cad0665..7e242a2d83 100644 --- a/mappings/net/minecraft/village/TradeOfferList.mapping +++ b/mappings/net/minecraft/village/TradeOfferList.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_1916 net/minecraft/village/TradeOfferList METHOD method_8265 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1916; - ARG 0 byteBuf + ARG 0 buf METHOD method_8267 getValidOffer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1914; ARG 1 firstBuyItem ARG 2 secondBuyItem ARG 3 index - METHOD method_8268 toTag ()Lnet/minecraft/class_2487; + METHOD method_8268 toNbt ()Lnet/minecraft/class_2487; METHOD method_8270 toPacket (Lnet/minecraft/class_2540;)V - ARG 1 buffer + ARG 1 buf diff --git a/mappings/net/minecraft/village/VillagerData.mapping b/mappings/net/minecraft/village/VillagerData.mapping index 3570bb8109..68ffee469f 100644 --- a/mappings/net/minecraft/village/VillagerData.mapping +++ b/mappings/net/minecraft/village/VillagerData.mapping @@ -8,7 +8,9 @@ CLASS net/minecraft/class_3850 net/minecraft/village/VillagerData METHOD method_16920 withLevel (I)Lnet/minecraft/class_3850; ARG 1 level METHOD method_16921 withProfession (Lnet/minecraft/class_3852;)Lnet/minecraft/class_3850; + ARG 1 profession METHOD method_16922 withType (Lnet/minecraft/class_3854;)Lnet/minecraft/class_3850; + ARG 1 type METHOD method_16924 getProfession ()Lnet/minecraft/class_3852; METHOD method_16925 getLevel ()I METHOD method_19194 getLowerLevelExperience (I)I diff --git a/mappings/net/minecraft/village/VillagerGossips.mapping b/mappings/net/minecraft/village/VillagerGossips.mapping index c9523f640e..41276772d2 100644 --- a/mappings/net/minecraft/village/VillagerGossips.mapping +++ b/mappings/net/minecraft/village/VillagerGossips.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips ARG 1 right METHOD method_19061 shareGossipFrom (Lnet/minecraft/class_4136;Ljava/util/Random;I)V ARG 1 from + ARG 2 random ARG 3 count METHOD method_19063 mergeReputation (Lnet/minecraft/class_4139;II)I ARG 1 type @@ -13,6 +14,7 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips METHOD method_19066 deserialize (Lcom/mojang/serialization/Dynamic;)V METHOD method_19067 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; METHOD method_19070 pickGossips (Ljava/util/Random;I)Ljava/util/Collection; + ARG 1 random ARG 2 count METHOD method_19071 getReputationFor (Ljava/util/UUID;)Lnet/minecraft/class_4136$class_4137; ARG 1 target diff --git a/mappings/net/minecraft/village/VillagerType.mapping b/mappings/net/minecraft/village/VillagerType.mapping index 9a2e27dd99..a3e1c85c3e 100644 --- a/mappings/net/minecraft/village/VillagerType.mapping +++ b/mappings/net/minecraft/village/VillagerType.mapping @@ -8,5 +8,6 @@ CLASS net/minecraft/class_3854 net/minecraft/village/VillagerType FIELD field_17077 TAIGA Lnet/minecraft/class_3854; FIELD field_17078 BIOME_TO_TYPE Ljava/util/Map; METHOD method_16930 forBiome (Ljava/util/Optional;)Lnet/minecraft/class_3854; + ARG 0 biomeKey METHOD method_16931 create (Ljava/lang/String;)Lnet/minecraft/class_3854; ARG 0 id diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping index 78daa194d9..12ae71e529 100644 --- a/mappings/net/minecraft/village/raid/Raid.mapping +++ b/mappings/net/minecraft/village/raid/Raid.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid ARG 3 pos METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V ARG 1 world - ARG 2 tag + ARG 2 nbt METHOD method_16487 addToWave (ILnet/minecraft/class_3763;Z)Z ARG 1 wave ARG 2 entity @@ -48,8 +48,8 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid METHOD method_16500 removeLeader (I)V ARG 1 wave METHOD method_16501 isInRaidDistance ()Ljava/util/function/Predicate; - METHOD method_16502 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + METHOD method_16502 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt METHOD method_16504 isActive ()Z METHOD method_16505 addToWave (ILnet/minecraft/class_3763;)Z ARG 1 wave diff --git a/mappings/net/minecraft/village/raid/RaidManager.mapping b/mappings/net/minecraft/village/raid/RaidManager.mapping index 9ccab5f4f3..26a367f3ff 100644 --- a/mappings/net/minecraft/village/raid/RaidManager.mapping +++ b/mappings/net/minecraft/village/raid/RaidManager.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager ARG 1 world ARG 2 pos METHOD method_16533 nameFor (Lnet/minecraft/class_2874;)Ljava/lang/String; + ARG 0 dimensionType METHOD method_16534 nextId ()I METHOD method_16539 tick ()V METHOD method_16540 startRaid (Lnet/minecraft/class_3222;)Lnet/minecraft/class_3765; @@ -20,3 +21,4 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager ARG 1 raid METHOD method_19209 getRaidAt (Lnet/minecraft/class_2338;I)Lnet/minecraft/class_3765; ARG 1 pos + ARG 2 searchDistance diff --git a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping index d0f2ec878e..8f2eb08493 100644 --- a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping +++ b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping @@ -13,6 +13,9 @@ CLASS net/minecraft/class_5329 net/minecraft/world/BlockCollisionSpliterator ARG 2 entity ARG 3 box METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/BiPredicate;)V + ARG 1 world + ARG 2 entity + ARG 3 box ARG 4 blockPredicate METHOD method_29283 getChunk (II)Lnet/minecraft/class_1922; ARG 1 x diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index 51c9a77d70..7e8875ee76 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer METHOD method_12376 (ILnet/minecraft/class_2826;)Z ARG 1 chunkSection METHOD method_12377 getChunkType (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2806$class_2808; - ARG 0 tag + ARG 0 nbt METHOD method_12385 writeStructures (Lnet/minecraft/class_1923;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/class_2487; ARG 0 pos ARG 1 structureStarts @@ -13,7 +13,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer ARG 1 chunk METHOD method_12387 readStructureReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/Map; ARG 0 pos - ARG 1 tag + ARG 1 nbt METHOD method_12388 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2818;)V ARG 1 chunk METHOD method_12391 (Lnet/minecraft/class_3611;)Z @@ -28,7 +28,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer ARG 1 structureManager ARG 2 poiStorage ARG 3 pos - ARG 4 tag + ARG 4 nbt METHOD method_12396 (Lnet/minecraft/class_2248;)Z ARG 0 block METHOD method_12410 serialize (Lnet/minecraft/class_3218;Lnet/minecraft/class_2791;)Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/world/CollisionView.mapping b/mappings/net/minecraft/world/CollisionView.mapping index 64348ed247..019dd6a6dd 100644 --- a/mappings/net/minecraft/world/CollisionView.mapping +++ b/mappings/net/minecraft/world/CollisionView.mapping @@ -4,19 +4,31 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView METHOD method_18026 isSpaceEmpty (Lnet/minecraft/class_238;)Z ARG 1 box METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/stream/Stream; + ARG 1 entity + ARG 2 box + ARG 3 predicate METHOD method_20812 getBlockCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/stream/Stream; ARG 1 entity ARG 2 box - METHOD method_22338 getExistingChunk (II)Lnet/minecraft/class_1922; + METHOD method_22338 getChunkAsView (II)Lnet/minecraft/class_1922; ARG 1 chunkX ARG 2 chunkZ METHOD method_30030 getBlockCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/BiPredicate;)Ljava/util/stream/Stream; + ARG 1 entity + ARG 2 box METHOD method_30635 isBlockSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/BiPredicate;)Z + ARG 1 entity + ARG 2 box METHOD method_8587 isSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z ARG 1 entity ARG 2 box METHOD method_8590 isSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Z + ARG 1 entity + ARG 2 box METHOD method_8600 getCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/stream/Stream; + ARG 1 entity + ARG 2 box + ARG 3 predicate METHOD method_8606 intersectsEntities (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_8611 intersectsEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_265;)Z diff --git a/mappings/net/minecraft/world/CommandBlockExecutor.mapping b/mappings/net/minecraft/world/CommandBlockExecutor.mapping index 2adad2e386..ae52d3bcb0 100644 --- a/mappings/net/minecraft/world/CommandBlockExecutor.mapping +++ b/mappings/net/minecraft/world/CommandBlockExecutor.mapping @@ -1,4 +1,10 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor + COMMENT A common logic for command-block behaviors shared by + COMMENT {@linkplain net.minecraft.block.entity.CommandBlockBlockEntity + COMMENT command blocks} and {@linkplain net.minecraft.entity.vehicle.CommandBlockMinecartEntity + COMMENT command block minecarts}. + COMMENT + COMMENT @see MobSpawnerLogic FIELD field_21515 DEFAULT_NAME Lnet/minecraft/class_2561; FIELD field_9162 customName Lnet/minecraft/class_2561; FIELD field_9163 successCount I @@ -10,7 +16,7 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor FIELD field_9169 DATE_FORMAT Ljava/text/SimpleDateFormat; METHOD method_8286 setCommand (Ljava/lang/String;)V ARG 1 command - METHOD method_8287 shouldTrackOutput (Z)V + METHOD method_8287 setTrackingOutput (Z)V ARG 1 trackOutput METHOD method_8288 interact (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; ARG 1 player @@ -23,8 +29,8 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor METHOD method_8293 getWorld ()Lnet/minecraft/class_3218; METHOD method_8295 markDirty ()V METHOD method_8296 isTrackingOutput ()Z - METHOD method_8297 serialize (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + METHOD method_8297 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt METHOD method_8298 setSuccessCount (I)V ARG 1 successCount METHOD method_8299 getCustomName ()Lnet/minecraft/class_2561; @@ -33,5 +39,5 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor ARG 1 world METHOD method_8303 getSource ()Lnet/minecraft/class_2168; METHOD method_8304 getSuccessCount ()I - METHOD method_8305 deserialize (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_8305 readNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt diff --git a/mappings/net/minecraft/world/EntityView.mapping b/mappings/net/minecraft/world/EntityView.mapping index c1829c7396..062d2627b3 100644 --- a/mappings/net/minecraft/world/EntityView.mapping +++ b/mappings/net/minecraft/world/EntityView.mapping @@ -81,19 +81,19 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView COMMENT COMMENT @return a list of entities within a box, excluding the given entity, all satisfying the given predicate ARG 1 except - COMMENT the entity the box logically surrounds. This entity is ignored if it is inside the box. + COMMENT the entity the box logically surrounds; this entity is ignored if it is inside the box ARG 2 box COMMENT the box in which to search for entities ARG 3 predicate - COMMENT a predicate which entities must satisfy in order to be included in the returned list. + COMMENT a predicate which entities must satisfy in order to be included in the returned list METHOD method_8335 getOtherEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/List; COMMENT Computes a list of entities within some box, excluding the given entity, that are not spectators. COMMENT COMMENT @return a list of entities within a box, excluding the given entity - COMMENT @see #getSurroundingEntities(Entity, Box, Predicate) + COMMENT @see #getOtherEntities(Entity, Box, Predicate) COMMENT @see Entity#isSpectator() ARG 1 except - COMMENT the entity the box logically surrounds. This entity is ignored if it is inside the box. + COMMENT the entity the box logically surrounds; this entity is ignored if it is inside the box ARG 2 box COMMENT the box in which to search for entities METHOD method_8338 (Lnet/minecraft/class_238;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/world/FeatureUpdater.mapping b/mappings/net/minecraft/world/FeatureUpdater.mapping index 4296a94e25..1ea9760f5e 100644 --- a/mappings/net/minecraft/world/FeatureUpdater.mapping +++ b/mappings/net/minecraft/world/FeatureUpdater.mapping @@ -1,11 +1,12 @@ CLASS net/minecraft/class_3360 net/minecraft/world/FeatureUpdater - FIELD field_14432 featureIdToChunkTag Ljava/util/Map; + FIELD field_14432 featureIdToChunkNbt Ljava/util/Map; FIELD field_14433 updateStates Ljava/util/Map; FIELD field_14434 needsUpdate Z FIELD field_14435 OLD_TO_NEW Ljava/util/Map; FIELD field_14436 ANCIENT_TO_OLD Ljava/util/Map; METHOD method_14734 init (Lnet/minecraft/class_26;)V METHOD method_14735 getUpdatedReferences (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt METHOD method_14737 needsUpdate (II)Z ARG 1 chunkX ARG 2 chunkZ @@ -14,5 +15,8 @@ CLASS net/minecraft/class_3360 net/minecraft/world/FeatureUpdater ARG 2 chunkZ ARG 3 id METHOD method_14741 getUpdatedStarts (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; + ARG 1 nbt + ARG 2 pos METHOD method_14744 markResolved (J)V METHOD method_14745 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_26;)Lnet/minecraft/class_3360; + ARG 0 world diff --git a/mappings/net/minecraft/world/Heightmap.mapping b/mappings/net/minecraft/world/Heightmap.mapping index 0c9a99f590..24befec4c6 100644 --- a/mappings/net/minecraft/world/Heightmap.mapping +++ b/mappings/net/minecraft/world/Heightmap.mapping @@ -2,9 +2,10 @@ CLASS net/minecraft/class_2902 net/minecraft/world/Heightmap FIELD field_13191 chunk Lnet/minecraft/class_2791; FIELD field_13192 storage Lnet/minecraft/class_3508; FIELD field_13193 blockPredicate Ljava/util/function/Predicate; - FIELD field_16744 ALWAYS_TRUE Ljava/util/function/Predicate; + FIELD field_16744 NOT_AIR Ljava/util/function/Predicate; FIELD field_16745 SUFFOCATES Ljava/util/function/Predicate; METHOD (Lnet/minecraft/class_2791;Lnet/minecraft/class_2902$class_2903;)V + ARG 1 chunk ARG 2 type METHOD method_12595 toIndex (II)I ARG 0 x @@ -27,6 +28,7 @@ CLASS net/minecraft/class_2902 net/minecraft/world/Heightmap ARG 1 x ARG 2 z METHOD method_16684 populateHeightmaps (Lnet/minecraft/class_2791;Ljava/util/Set;)V + ARG 0 chunk ARG 1 types CLASS class_2903 Type FIELD field_13198 purpose Lnet/minecraft/class_2902$class_2904; diff --git a/mappings/net/minecraft/world/MobSpawnerEntry.mapping b/mappings/net/minecraft/world/MobSpawnerEntry.mapping index 0cb6f2f6b5..6f74e07694 100644 --- a/mappings/net/minecraft/world/MobSpawnerEntry.mapping +++ b/mappings/net/minecraft/world/MobSpawnerEntry.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_1952 net/minecraft/world/MobSpawnerEntry - FIELD field_9307 entityTag Lnet/minecraft/class_2487; + FIELD field_9307 entityNbt Lnet/minecraft/class_2487; METHOD (ILnet/minecraft/class_2487;)V ARG 1 weight - ARG 2 entityTag + ARG 2 entityNbt METHOD (Lnet/minecraft/class_2487;)V - ARG 1 tag - METHOD method_8678 getEntityTag ()Lnet/minecraft/class_2487; - METHOD method_8679 serialize ()Lnet/minecraft/class_2487; + ARG 1 nbt + METHOD method_8678 getEntityNbt ()Lnet/minecraft/class_2487; + METHOD method_8679 toNbt ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/world/ModifiableWorld.mapping b/mappings/net/minecraft/world/ModifiableWorld.mapping index 70d6799571..240daa3f92 100644 --- a/mappings/net/minecraft/world/ModifiableWorld.mapping +++ b/mappings/net/minecraft/world/ModifiableWorld.mapping @@ -9,18 +9,9 @@ CLASS net/minecraft/class_1945 net/minecraft/world/ModifiableWorld COMMENT

When called on the server, the new block state is stored and propagated to clients and listeners as dictated COMMENT by the supplied flags. Note that calling this on the client will update the world locally, but may not see the COMMENT change persisted across loads. It's recommended to check whether this world is client before - COMMENT interacting with the world in this way.

+ COMMENT interacting with the world in this way. COMMENT - COMMENT

Accepted values of the flags are a bitset combination of the following:

- COMMENT
    - COMMENT
  • 0b0000001 // 1 - PROPAGATE_CHANGE - Propagates a change event to surrounding blocks.
    • - COMMENT
  • 0b0000010 // 2 - NOTIFY_LISTENERS - Notifies listeners and clients who need to react when the block changes
    • - COMMENT
  • 0b0000100 // 4 - NO_REDRAW - Used in conjunction with NOTIFY_LISTENERS to suppress the render pass on clients.
    • - COMMENT
  • 0b0001000 // 8 - REDRAW_ON_MAIN_THREAD - Forces a synchronous redraw on clients.
    • - COMMENT
  • 0b0010000 // 16 - FORCE_STATE - Bypass virtual block state changes and forces the passed state to be stored as-is.
    • - COMMENT
  • 0b0100000 // 32 - SKIP_DROPS - Prevents the previous block (container) from dropping items when destroyed.
    • - COMMENT
  • 0b1000000 // 64 - MOVED - Signals that the current block is being moved to a different location, usually because of a piston.
    • - COMMENT
+ COMMENT

See {@link #setBlockState(BlockPos, BlockState, int)} for a list of accepted flags. ARG 1 pos COMMENT the target position ARG 2 state @@ -49,9 +40,9 @@ CLASS net/minecraft/class_1945 net/minecraft/world/ModifiableWorld COMMENT

When called on the server, the new block state is stored and propagated to clients and listeners as dictated COMMENT by the supplied flags. Note that calling this on the client will update the world locally, but may not see the COMMENT change persisted across loads. It's recommended to check whether this world is client before - COMMENT interacting with the world in this way.

+ COMMENT interacting with the world in this way. COMMENT - COMMENT

Accepted values of the flags are a bitset combination of the following:

+ COMMENT

The accepted values of these flags are: COMMENT

    COMMENT
  • 0b0000001 // 1 - PROPAGATE_CHANGE - Propagates a change event to surrounding blocks.
    • COMMENT
  • 0b0000010 // 2 - NOTIFY_LISTENERS - Notifies listeners and clients who need to react when the block changes
    • @@ -61,6 +52,8 @@ CLASS net/minecraft/class_1945 net/minecraft/world/ModifiableWorld COMMENT
  • 0b0100000 // 32 - SKIP_DROPS - Prevents the previous block (container) from dropping items when destroyed.
    • COMMENT
  • 0b1000000 // 64 - MOVED - Signals that the current block is being moved to a different location, usually because of a piston.
    • COMMENT
+ COMMENT + COMMENT @see #setBlockState(BlockPos, BlockState, int, int) ARG 1 pos COMMENT the target position ARG 2 state diff --git a/mappings/net/minecraft/world/PersistentState.mapping b/mappings/net/minecraft/world/PersistentState.mapping index 7cb97138d2..fb97cafa86 100644 --- a/mappings/net/minecraft/world/PersistentState.mapping +++ b/mappings/net/minecraft/world/PersistentState.mapping @@ -5,8 +5,8 @@ CLASS net/minecraft/class_18 net/minecraft/world/PersistentState METHOD (Ljava/lang/String;)V ARG 1 key METHOD method_17919 save (Ljava/io/File;)V - METHOD method_75 toTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + METHOD method_75 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt METHOD method_76 getId ()Ljava/lang/String; METHOD method_77 fromTag (Lnet/minecraft/class_2487;)V ARG 1 tag diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping index 18936d0ab0..d516af97e0 100644 --- a/mappings/net/minecraft/world/PersistentStateManager.mapping +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager METHOD method_17921 isCompressed (Ljava/io/PushbackInputStream;)Z METHOD method_17922 getFile (Ljava/lang/String;)Ljava/io/File; ARG 1 id - METHOD method_17923 readTag (Ljava/lang/String;I)Lnet/minecraft/class_2487; + METHOD method_17923 readNbt (Ljava/lang/String;I)Lnet/minecraft/class_2487; ARG 1 id ARG 2 dataVersion METHOD method_17924 getOrCreate (Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; diff --git a/mappings/net/minecraft/world/SaveProperties.mapping b/mappings/net/minecraft/world/SaveProperties.mapping index b1f5eaebd8..19e6204a42 100644 --- a/mappings/net/minecraft/world/SaveProperties.mapping +++ b/mappings/net/minecraft/world/SaveProperties.mapping @@ -3,7 +3,9 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties METHOD method_150 getLevelName ()Ljava/lang/String; METHOD method_151 populateCrashReport (Lnet/minecraft/class_129;)V METHOD method_152 isHardcore ()Z - METHOD method_163 cloneWorldTag (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + METHOD method_163 cloneWorldNbt (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 registryManager + ARG 2 playerNbt METHOD method_168 getVersion ()I METHOD method_186 setDifficultyLocked (Z)V ARG 1 locked @@ -16,7 +18,7 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties ARG 1 difficulty METHOD method_210 getGameMode ()Lnet/minecraft/class_1934; METHOD method_221 setCustomBossEvents (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_226 getPlayerData ()Lnet/minecraft/class_2487; METHOD method_228 getCustomBossEvents ()Lnet/minecraft/class_2487; METHOD method_24285 addServerBrand (Ljava/lang/String;Z)V @@ -31,7 +33,7 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties METHOD method_28057 getGeneratorOptions ()Lnet/minecraft/class_5285; METHOD method_29036 getDragonFight ()Lnet/minecraft/class_2487; METHOD method_29037 setDragonFight (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_29588 getLifecycle ()Lcom/mojang/serialization/Lifecycle; METHOD method_29589 getDataPackSettings ()Lnet/minecraft/class_5359; METHOD method_29590 updateLevelInfo (Lnet/minecraft/class_5359;)V diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index 411b727926..1a13ed7761 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -39,7 +39,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 2 info ARG 3 spawnAnimals ARG 4 spawnMonsters - ARG 5 shouldSpawnAnimals + ARG 5 rareSpawn METHOD method_27822 getBiomeDirectly (Lnet/minecraft/class_2338;Lnet/minecraft/class_2791;)Lnet/minecraft/class_1959; ARG 0 pos ARG 1 chunk @@ -52,6 +52,12 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 2 x ARG 3 z METHOD method_8659 containsSpawnEntry (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_5483$class_1964;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 structureAccessor + ARG 2 chunkGenerator + ARG 3 spawnGroup + ARG 4 spawnEntry + ARG 5 pos METHOD method_8660 canSpawn (Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z ARG 0 location ARG 1 world @@ -66,6 +72,7 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 1 pos ARG 2 state ARG 3 fluidState + ARG 4 entityType METHOD method_8663 spawnEntitiesInChunk (Lnet/minecraft/class_1311;Lnet/minecraft/class_3218;Lnet/minecraft/class_2818;Lnet/minecraft/class_1948$class_5261;Lnet/minecraft/class_1948$class_5259;)V ARG 0 group ARG 1 world diff --git a/mappings/net/minecraft/world/TeleportTarget.mapping b/mappings/net/minecraft/world/TeleportTarget.mapping index b13a89d16f..ca7dbf51ed 100644 --- a/mappings/net/minecraft/world/TeleportTarget.mapping +++ b/mappings/net/minecraft/world/TeleportTarget.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_5454 net/minecraft/world/TeleportTarget + COMMENT Represents the position that an entity takes after being + COMMENT {@linkplain net.minecraft.entity.Entity#moveToWorld moved between worlds}. FIELD field_25879 position Lnet/minecraft/class_243; FIELD field_25880 velocity Lnet/minecraft/class_243; FIELD field_25881 yaw F diff --git a/mappings/net/minecraft/world/WanderingTraderManager.mapping b/mappings/net/minecraft/world/WanderingTraderManager.mapping index f836c3c406..ff2a8599a6 100644 --- a/mappings/net/minecraft/world/WanderingTraderManager.mapping +++ b/mappings/net/minecraft/world/WanderingTraderManager.mapping @@ -7,5 +7,13 @@ CLASS net/minecraft/class_3990 net/minecraft/world/WanderingTraderManager METHOD (Lnet/minecraft/class_5268;)V ARG 1 properties METHOD method_18016 spawnLlama (Lnet/minecraft/class_3218;Lnet/minecraft/class_3989;I)V + ARG 1 world + ARG 2 wanderingTrader + ARG 3 range METHOD method_18017 getNearbySpawnPos (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;I)Lnet/minecraft/class_2338; + ARG 1 world + ARG 2 pos + ARG 3 range METHOD method_23279 doesNotSuffocateAt (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index afe65cdce5..32589604c3 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_9234 thunderGradient F FIELD field_9235 rainGradient F FIELD field_9236 isClient Z - FIELD field_9238 unusedIncrement I + FIELD field_9238 lcgBlockSeedIncrement I FIELD field_9241 pendingBlockEntities Ljava/util/List; FIELD field_9246 tickingBlockEntities Ljava/util/List; FIELD field_9247 dimension Lnet/minecraft/class_2874; @@ -83,7 +83,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 2 entity ARG 3 direction METHOD method_24794 isInBuildLimit (Lnet/minecraft/class_2338;)Z - ARG 0 pos + ARG 1 pos METHOD method_25952 isInvalidVertically (I)Z ARG 0 y METHOD method_25953 isValid (Lnet/minecraft/class_2338;)Z @@ -144,6 +144,13 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8454 createExplosion (Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1927$class_4179;)Lnet/minecraft/class_1927; ARG 1 entity ARG 2 damageSource + ARG 3 behavior + ARG 4 x + ARG 6 y + ARG 8 z + ARG 10 power + ARG 11 createFire + ARG 12 destructionType METHOD method_8455 updateComparators (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V ARG 1 pos ARG 2 block @@ -196,10 +203,11 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 8 category ARG 9 volume ARG 10 pitch + ARG 11 useDistance METHOD method_8488 getReceivedStrongRedstonePower (Lnet/minecraft/class_2338;)I ARG 1 pos METHOD method_8492 updateNeighbor (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)V - ARG 1 sourcePos + ARG 1 pos ARG 2 sourceBlock ARG 3 neighborPos METHOD method_8494 addImportantParticle (Lnet/minecraft/class_2394;DDDDDD)V @@ -282,6 +290,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 7 velocityX ARG 9 velocityY ARG 11 velocityZ - ARG 13 tag + ARG 13 nbt METHOD method_8558 isValidHorizontally (Lnet/minecraft/class_2338;)Z ARG 0 pos diff --git a/mappings/net/minecraft/world/WorldSaveHandler.mapping b/mappings/net/minecraft/world/WorldSaveHandler.mapping index 1b3c177866..9c9d522da2 100644 --- a/mappings/net/minecraft/world/WorldSaveHandler.mapping +++ b/mappings/net/minecraft/world/WorldSaveHandler.mapping @@ -3,5 +3,7 @@ CLASS net/minecraft/class_29 net/minecraft/world/WorldSaveHandler FIELD field_148 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_149 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_261 loadPlayerData (Lnet/minecraft/class_1657;)Lnet/minecraft/class_2487; + ARG 1 player METHOD method_262 savePlayerData (Lnet/minecraft/class_1657;)V + ARG 1 player METHOD method_263 getSavedPlayerIds ()[Ljava/lang/String; diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 97b7a26e46..716da8237e 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -55,7 +55,7 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome ARG 3 region ARG 4 populationSeed ARG 6 random - ARG 7 pos + ARG 7 origin METHOD method_8703 buildSurface (Ljava/util/Random;Lnet/minecraft/class_2791;IIIDLnet/minecraft/class_2680;Lnet/minecraft/class_2680;IJ)V ARG 1 random ARG 2 chunk diff --git a/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping b/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping index 7e3a3bd40f..2117d7493b 100644 --- a/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping +++ b/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/DefaultBiomeCreator ARG 1 scale ARG 2 temperature ARG 3 waterColor + ARG 4 frozen METHOD method_30687 createGiantTreeTaiga (FFFZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale @@ -42,6 +43,7 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/DefaultBiomeCreator ARG 1 scale ARG 2 tallTrees METHOD method_30692 createOcean (Lnet/minecraft/class_5483$class_5496;IIZLnet/minecraft/class_5485$class_5495;)Lnet/minecraft/class_1959; + ARG 0 spawnSettings ARG 1 waterColor ARG 2 waterFogColor ARG 3 deep @@ -52,26 +54,44 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/DefaultBiomeCreator ARG 0 depth ARG 1 scale ARG 2 temperature + ARG 3 mountain + ARG 4 shattered METHOD method_30695 createJungleFeatures (FFFZZZLnet/minecraft/class_5483$class_5496;)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale ARG 2 downfall + ARG 3 bamboo + ARG 4 edge + ARG 5 modified METHOD method_30696 createNormalBadlands (FFZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 plateau METHOD method_30697 createSnowyTundra (FFZZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 iceSpikes + ARG 3 mountains METHOD method_30698 createDesert (FFZZZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 villages + ARG 3 pyramids + ARG 4 fossils METHOD method_30699 createTaiga (FFZZZZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 snowy + ARG 3 mountains + ARG 4 villages + ARG 5 igloos METHOD method_30700 createBadlands (Lnet/minecraft/class_3504;FFZZ)Lnet/minecraft/class_1959; ARG 1 depth ARG 2 scale + ARG 3 plateau + ARG 4 wooded METHOD method_30701 createPlains (Z)Lnet/minecraft/class_1959; + ARG 0 sunflower METHOD method_30702 createColdOcean (Z)Lnet/minecraft/class_1959; ARG 0 deep METHOD method_30703 createJungleEdge ()Lnet/minecraft/class_1959; @@ -81,18 +101,22 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/DefaultBiomeCreator METHOD method_30705 createDarkForest (FFZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 hills METHOD method_30706 createNormalOcean (Z)Lnet/minecraft/class_1959; ARG 0 deep METHOD method_30707 createModifiedJungleEdge ()Lnet/minecraft/class_1959; METHOD method_30708 createSwamp (FFZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 hills METHOD method_30709 createLukewarmOcean (Z)Lnet/minecraft/class_1959; ARG 0 deep METHOD method_30710 createModifiedJungle ()Lnet/minecraft/class_1959; METHOD method_30711 createForest (FFZLnet/minecraft/class_5483$class_5496;)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 flower + ARG 3 spawnSettings METHOD method_30712 createFrozenOcean (Z)Lnet/minecraft/class_1959; ARG 0 monument METHOD method_30713 createJungleHills ()Lnet/minecraft/class_1959; @@ -117,10 +141,16 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/DefaultBiomeCreator METHOD method_30932 getSkyColor (F)I ARG 0 temperature METHOD method_31065 composeEndSpawnSettings (Lnet/minecraft/class_5485$class_5495;)Lnet/minecraft/class_1959; + ARG 0 builder METHOD method_31066 createOceanGenerationSettings (Lnet/minecraft/class_3504;ZZZ)Lnet/minecraft/class_5485$class_5495; + ARG 1 deep + ARG 2 warm METHOD method_31067 composeSavannaGenerationSettings (FFFZZLnet/minecraft/class_5483$class_5496;)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale ARG 2 temperature + ARG 3 plateau + ARG 4 shattered + ARG 5 spawnSettings METHOD method_31068 createSavannaSpawnSettings ()Lnet/minecraft/class_5483$class_5496; METHOD method_31069 createForestSpawnSettings ()Lnet/minecraft/class_5483$class_5496; diff --git a/mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping b/mappings/net/minecraft/world/biome/layer/AddBaseBiomesLayer.mapping similarity index 74% rename from mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping rename to mappings/net/minecraft/world/biome/layer/AddBaseBiomesLayer.mapping index da29922ac6..d7ba404645 100644 --- a/mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/AddBaseBiomesLayer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_3640 net/minecraft/world/biome/layer/SetBaseBiomesLayer +CLASS net/minecraft/class_3640 net/minecraft/world/biome/layer/AddBaseBiomesLayer FIELD field_16062 TEMPERATE_BIOMES [I FIELD field_16064 DRY_BIOMES [I FIELD field_16066 SNOWY_BIOMES [I diff --git a/mappings/net/minecraft/world/biome/layer/AddRiversLayer.mapping b/mappings/net/minecraft/world/biome/layer/ApplyRiverLayer.mapping similarity index 81% rename from mappings/net/minecraft/world/biome/layer/AddRiversLayer.mapping rename to mappings/net/minecraft/world/biome/layer/ApplyRiverLayer.mapping index 5683855491..e13c24dc6b 100644 --- a/mappings/net/minecraft/world/biome/layer/AddRiversLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/ApplyRiverLayer.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_3652 net/minecraft/world/biome/layer/AddRiversLayer +CLASS net/minecraft/class_3652 net/minecraft/world/biome/layer/ApplyRiverLayer diff --git a/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping b/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping index b9bf129d6e..01663a3a6b 100644 --- a/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_3656 net/minecraft/world/biome/layer/ScaleLayer METHOD method_15853 sample (Lnet/minecraft/class_3628;IIII)I ARG 1 context + ARG 2 tl + ARG 3 tr + ARG 4 bl + ARG 5 br diff --git a/mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping b/mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping index 38aa6834c4..67ef08544e 100644 --- a/mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping +++ b/mappings/net/minecraft/world/biome/layer/util/LayerSampleContext.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_3628 net/minecraft/world/biome/layer/util/LayerSampleContext METHOD method_15828 createSampler (Lnet/minecraft/class_4;Lnet/minecraft/class_3625;Lnet/minecraft/class_3625;)Lnet/minecraft/class_3625; ARG 1 operator + ARG 2 firstParent + ARG 3 secondParent METHOD method_15830 initSeed (JJ)V ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping index eeb8415331..890190b634 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping @@ -14,11 +14,11 @@ CLASS net/minecraft/class_4543 net/minecraft/world/biome/source/BiomeAccess ARG 1 biomeX ARG 2 biomeY ARG 3 biomeZ - METHOD method_24938 getBiome (DDD)Lnet/minecraft/class_1959; + METHOD method_24938 getBiomeForNoiseGen (DDD)Lnet/minecraft/class_1959; ARG 1 x ARG 3 y ARG 5 z - METHOD method_27344 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; + METHOD method_27344 getBiomeForNoiseGen (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959; ARG 1 pos METHOD method_27984 hashSeed (J)J ARG 0 seed diff --git a/mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping b/mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping index 085c97704a..ba5e783668 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeLayerSampler.mapping @@ -4,3 +4,6 @@ CLASS net/minecraft/class_3642 net/minecraft/world/biome/source/BiomeLayerSample METHOD (Lnet/minecraft/class_3627;)V ARG 1 layerFactory METHOD method_16341 sample (Lnet/minecraft/class_2378;II)Lnet/minecraft/class_1959; + ARG 1 biomeRegistry + ARG 2 x + ARG 3 z diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index 2b4f8afa76..a424ef6c35 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource ARG 2 y ARG 3 z ARG 4 radius + ARG 6 predicate ARG 7 random METHOD method_27985 withSeed (J)Lnet/minecraft/class_1966; ARG 1 seed @@ -23,6 +24,7 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource ARG 2 y ARG 3 z ARG 4 radius + ARG 5 predicate ARG 6 random METHOD method_8763 getBiomesInArea (IIII)Ljava/util/Set; ARG 1 x diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping index 3c4d705506..e852c1954d 100644 --- a/mappings/net/minecraft/world/border/WorldBorder.mapping +++ b/mappings/net/minecraft/world/border/WorldBorder.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder FIELD field_12730 listeners Ljava/util/List; - FIELD field_12731 buffer D - FIELD field_12732 maxWorldBorderRadius I + FIELD field_12731 safeZone D + FIELD field_12732 maxRadius I FIELD field_12733 damagePerBlock D FIELD field_12734 warningBlocks I FIELD field_12735 warningTime I @@ -14,48 +14,80 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder METHOD method_11952 contains (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_11953 getDamagePerBlock ()D - METHOD method_11954 getTargetSize ()D + COMMENT Returns the damage increase per block beyond this border, in hearts. + COMMENT

Once an entity goes beyond the border and the safe zone, damage will be + COMMENT applied depending on the distance traveled multiplied by this damage increase. + COMMENT + COMMENT

The default value is 0.2. + COMMENT + COMMENT @see net.minecraft.entity.LivingEntity#baseTick() + METHOD method_11954 getSizeLerpTarget ()D METHOD method_11955 setDamagePerBlock (D)V + COMMENT Sets the damage per block of this border and notifies all listeners. ARG 1 damagePerBlock METHOD method_11956 getWarningTime ()I + COMMENT Returns the warning time of this border, in ticks. + COMMENT

Once a player goes beyond the border, this is the time before a message + COMMENT is displayed to them. + COMMENT + COMMENT

The default value is 15. METHOD method_11957 interpolateSize (DDJ)V ARG 1 fromSize ARG 3 toSize ARG 5 time METHOD method_11958 getBoundNorth ()D - METHOD method_11959 getMaxWorldBorderRadius ()I + METHOD method_11959 getMaxRadius ()I + COMMENT Returns the maximum radius of this border, in blocks. + COMMENT + COMMENT

The default value is 29999984. METHOD method_11961 getDistanceInsideBorder (DD)D ARG 1 x ARG 3 z - METHOD method_11962 getTargetRemainingTime ()J + METHOD method_11962 getSizeLerpTime ()J METHOD method_11963 getBoundEast ()D METHOD method_11964 getCenterX ()D METHOD method_11965 getSize ()D METHOD method_11966 contains (Lnet/minecraft/class_238;)Z ARG 1 box METHOD method_11967 setWarningBlocks (I)V + COMMENT Sets the warning blocks of this border and notifies all listeners. ARG 1 warningBlocks METHOD method_11968 getStage ()Lnet/minecraft/class_2789; METHOD method_11969 setSize (D)V + COMMENT Sets the area of this border to a static area with the given {@code size}, + COMMENT and notifies all listeners. ARG 1 size METHOD method_11970 getListeners ()Ljava/util/List; - METHOD method_11971 getBuffer ()D + METHOD method_11971 getSafeZone ()D + COMMENT Returns the safe zone of this border. + COMMENT + COMMENT

The default value is 5.0. METHOD method_11972 getWarningBlocks ()I - METHOD method_11973 setMaxWorldBorderRadius (I)V - ARG 1 radius + COMMENT Returns the warning distance of this border, in blocks. + COMMENT

When an entity approaches the border, this is the distance from which + COMMENT a warning will be displayed. + COMMENT + COMMENT

The default value is 5. + METHOD method_11973 setMaxRadius (I)V + COMMENT Sets the maximum radius of this border and notifies its area. + ARG 1 maxRadius METHOD method_11974 getShrinkingSpeed ()D METHOD method_11975 setWarningTime (I)V + COMMENT Sets the warning time of this border and notifies all listeners. ARG 1 warningTime METHOD method_11976 getBoundWest ()D METHOD method_11977 getBoundSouth ()D METHOD method_11978 setCenter (DD)V + COMMENT Sets the {@code x} and {@code z} coordinates of the center of this border, + COMMENT and notifies its area and all listeners. ARG 1 x ARG 3 z METHOD method_11979 getDistanceInsideBorder (Lnet/minecraft/class_1297;)D ARG 1 entity METHOD method_11980 getCenterZ ()D - METHOD method_11981 setBuffer (D)V - ARG 1 buffer + METHOD method_11981 setSafeZone (D)V + COMMENT Sets the safe zone of this border and notifies all listeners. + ARG 1 safeZone METHOD method_11982 tick ()V METHOD method_11983 addListener (Lnet/minecraft/class_2780;)V ARG 1 listener diff --git a/mappings/net/minecraft/world/chunk/ArrayPalette.mapping b/mappings/net/minecraft/world/chunk/ArrayPalette.mapping index 396773f552..b5302001a3 100644 --- a/mappings/net/minecraft/world/chunk/ArrayPalette.mapping +++ b/mappings/net/minecraft/world/chunk/ArrayPalette.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2834 net/minecraft/world/chunk/ArrayPalette FIELD field_12904 array [Ljava/lang/Object; FIELD field_12905 resizeListener Lnet/minecraft/class_2835; METHOD (Lnet/minecraft/class_2361;ILnet/minecraft/class_2835;Ljava/util/function/Function;)V + ARG 1 idList ARG 2 integer ARG 3 resizeListener ARG 4 valueDeserializer diff --git a/mappings/net/minecraft/world/chunk/BiMapPalette.mapping b/mappings/net/minecraft/world/chunk/BiMapPalette.mapping index 36346408f3..8dc70ae8dd 100644 --- a/mappings/net/minecraft/world/chunk/BiMapPalette.mapping +++ b/mappings/net/minecraft/world/chunk/BiMapPalette.mapping @@ -11,6 +11,6 @@ CLASS net/minecraft/class_2814 net/minecraft/world/chunk/BiMapPalette ARG 3 resizeHandler ARG 4 elementDeserializer ARG 5 elementSerializer - METHOD method_12196 toTag (Lnet/minecraft/class_2499;)V - ARG 1 tag + METHOD method_12196 writeNbt (Lnet/minecraft/class_2499;)V + ARG 1 nbt METHOD method_12197 getIndexBits ()I diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 704ae628ff..dbac037a75 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12020 setLightOn (Z)V ARG 1 lightOn METHOD method_12021 getBlockEntityPositions ()Ljava/util/Set; - METHOD method_12024 getBlockEntityTag (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; + METHOD method_12024 getBlockEntityNbt (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; ARG 1 pos METHOD method_12026 getList ([Lit/unimi/dsi/fastutil/shorts/ShortList;I)Lit/unimi/dsi/fastutil/shorts/ShortList; ARG 0 lists @@ -36,6 +36,8 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12028 setInhabitedTime (J)V ARG 1 inhabitedTime METHOD method_12029 markBlockForPostProcessing (SI)V + ARG 1 packedPos + ARG 2 index METHOD method_12031 getHighestNonEmptySectionYOffset ()I METHOD method_12032 getHeightmap (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2902; ARG 1 type @@ -52,13 +54,13 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12040 getHighestNonEmptySection ()Lnet/minecraft/class_2826; METHOD method_12041 removeBlockEntity (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_12042 addPendingBlockEntityTag (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_12042 addPendingBlockEntityNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_12043 setLastSaveTime (J)V ARG 1 lastSaveTime METHOD method_12044 needsSaving ()Z METHOD method_12228 areSectionsEmptyBetween (II)Z ARG 1 lowerHeight ARG 2 upperHeight - METHOD method_20598 getPackedBlockEntityTag (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; + METHOD method_20598 getPackedBlockEntityNbt (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; ARG 1 pos diff --git a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping index d33ccb8a0d..c33bd3f897 100644 --- a/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2804 net/minecraft/world/chunk/ChunkNibbleArray - FIELD field_12783 byteArray [B + FIELD field_12783 bytes [B METHOD method_12137 asByteArray ()[B METHOD method_12138 divideByTwo (I)I ARG 1 n @@ -12,6 +12,7 @@ CLASS net/minecraft/class_2804 net/minecraft/world/chunk/ChunkNibbleArray ARG 2 y ARG 3 z METHOD method_12141 get (I)I + ARG 1 index METHOD method_12142 set (II)V ARG 1 index ARG 2 value diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping index 091370a7c7..baba5acb15 100644 --- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -28,7 +28,9 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection ARG 4 state ARG 5 lock METHOD method_12257 toPacket (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_12258 fromPacket (Lnet/minecraft/class_2540;)V + ARG 1 buf METHOD method_12259 getYOffset ()I METHOD method_12260 getPacketSize ()I METHOD method_12261 isEmpty ()Z @@ -46,3 +48,4 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection METHOD method_18090 isEmpty (Lnet/minecraft/class_2826;)Z ARG 0 section METHOD method_19523 hasAny (Ljava/util/function/Predicate;)Z + ARG 1 predicate diff --git a/mappings/net/minecraft/world/chunk/Palette.mapping b/mappings/net/minecraft/world/chunk/Palette.mapping index 798936e669..a06fd06ca9 100644 --- a/mappings/net/minecraft/world/chunk/Palette.mapping +++ b/mappings/net/minecraft/world/chunk/Palette.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2837 net/minecraft/world/chunk/Palette - METHOD method_12286 fromTag (Lnet/minecraft/class_2499;)V - ARG 1 tag + METHOD method_12286 readNbt (Lnet/minecraft/class_2499;)V + ARG 1 nbt METHOD method_12287 toPacket (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12288 getByIndex (I)Ljava/lang/Object; diff --git a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping index 551c741fd2..0304b12e0f 100644 --- a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping +++ b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer ARG 2 y ARG 3 z METHOD method_12322 set (ILjava/lang/Object;)V + ARG 1 index METHOD method_12323 toIndex (III)I ARG 0 x ARG 1 y @@ -37,9 +38,12 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer ARG 3 z ARG 4 value METHOD method_12329 read (Lnet/minecraft/class_2499;[J)V - ARG 1 paletteTag + ARG 1 paletteNbt ARG 2 data METHOD method_12330 write (Lnet/minecraft/class_2487;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 nbt + ARG 2 paletteKey + ARG 3 dataKey METHOD method_12331 get (I)Ljava/lang/Object; ARG 1 index METHOD method_12332 (Ljava/lang/Thread;)Ljava/lang/String; diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index cf8bbd2c7d..23c8a1b591 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -65,7 +65,7 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk ARG 2 chunkPos METHOD method_12315 addLightSource (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_12316 getBlockEntityTags ()Ljava/util/Map; + METHOD method_12316 getBlockEntityNbts ()Ljava/util/Map; METHOD method_16679 getSection (I)Lnet/minecraft/class_2826; ARG 1 y METHOD method_17032 setLightingProvider (Lnet/minecraft/class_3568;)V diff --git a/mappings/net/minecraft/world/chunk/UpgradeData.mapping b/mappings/net/minecraft/world/chunk/UpgradeData.mapping index 1d3e0f1cbb..3d052c549d 100644 --- a/mappings/net/minecraft/world/chunk/UpgradeData.mapping +++ b/mappings/net/minecraft/world/chunk/UpgradeData.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_2843 net/minecraft/world/chunk/UpgradeData METHOD method_12348 upgradeCenter (Lnet/minecraft/class_2818;)V ARG 1 chunk METHOD method_12349 isDone ()Z - METHOD method_12350 toTag ()Lnet/minecraft/class_2487; + METHOD method_12350 toNbt ()Lnet/minecraft/class_2487; METHOD method_12351 applyAdjacentBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 0 oldState ARG 1 dir diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index c3aa5b3004..6d655d9214 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk FIELD field_12843 inhabitedTime J FIELD field_12844 lastSaveTime J FIELD field_12845 structureReferences Ljava/util/Map; - FIELD field_12846 pendingBlockEntityTags Ljava/util/Map; + FIELD field_12846 pendingBlockEntityNbts Ljava/util/Map; FIELD field_12847 lightOn Z FIELD field_12848 pos Lnet/minecraft/class_1923; FIELD field_12849 upgradeData Lnet/minecraft/class_2843; @@ -49,7 +49,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 1 entity METHOD method_12204 loadBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2586; ARG 1 pos - ARG 2 tag + ARG 2 nbt METHOD method_12205 collectOtherEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V ARG 1 except ARG 2 box diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping index 0f7de5affc..dd4786060e 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_3562 net/minecraft/world/chunk/light/ChunkLightingView METHOD method_15543 getLightLevel (Lnet/minecraft/class_2338;)I + ARG 1 pos METHOD method_15544 getLightSection (Lnet/minecraft/class_4076;)Lnet/minecraft/class_2804; ARG 1 pos CLASS class_3563 Empty diff --git a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping index 3e754dfa34..b7cacde5e4 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingProvider.mapping @@ -31,3 +31,4 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider ARG 1 pos ARG 2 ambientDarkness METHOD method_22876 displaySectionLevel (Lnet/minecraft/class_1944;Lnet/minecraft/class_4076;)Ljava/lang/String; + ARG 1 lightType diff --git a/mappings/net/minecraft/world/dimension/AreaHelper.mapping b/mappings/net/minecraft/world/dimension/AreaHelper.mapping index 366ca5f7ed..e78fd3126a 100644 --- a/mappings/net/minecraft/world/dimension/AreaHelper.mapping +++ b/mappings/net/minecraft/world/dimension/AreaHelper.mapping @@ -9,7 +9,10 @@ CLASS net/minecraft/class_2424 net/minecraft/world/dimension/AreaHelper FIELD field_25883 IS_VALID_FRAME_BLOCK Lnet/minecraft/class_4970$class_4973; METHOD (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2351;)V ARG 1 world + ARG 2 pos + ARG 3 axis METHOD method_10359 validStateInsidePortal (Lnet/minecraft/class_2680;)Z + ARG 0 state METHOD method_10360 isValid ()Z METHOD method_10362 wasAlreadyValid ()Z METHOD method_10363 createPortal ()V diff --git a/mappings/net/minecraft/world/dimension/DimensionOptions.mapping b/mappings/net/minecraft/world/dimension/DimensionOptions.mapping index 4c27f6196e..ff0685408a 100644 --- a/mappings/net/minecraft/world/dimension/DimensionOptions.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionOptions.mapping @@ -8,8 +8,10 @@ CLASS net/minecraft/class_5363 net/minecraft/world/dimension/DimensionOptions FIELD field_25417 chunkGenerator Lnet/minecraft/class_2794; METHOD (Ljava/util/function/Supplier;Lnet/minecraft/class_2794;)V ARG 1 typeSupplier + ARG 2 chunkGenerator METHOD method_29566 getDimensionTypeSupplier ()Ljava/util/function/Supplier; - METHOD method_29567 (JLnet/minecraft/class_2370;)Z + METHOD method_29567 hasDefaultSettings (JLnet/minecraft/class_2370;)Z ARG 0 seed + ARG 2 options METHOD method_29570 getDimensionType ()Lnet/minecraft/class_2874; METHOD method_29571 getChunkGenerator ()Lnet/minecraft/class_2794; diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index 7994ec2c69..c63509e55e 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -33,6 +33,14 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_1282;Lnet/minecraft/class_5362;DDDFZLnet/minecraft/class_1927$class_4179;)V ARG 1 world ARG 2 entity + ARG 3 damageSource + ARG 4 behavior + ARG 5 x + ARG 7 y + ARG 9 z + ARG 11 power + ARG 12 createFire + ARG 13 destructionType METHOD method_17752 getExposure (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)F ARG 0 source ARG 1 entity @@ -43,6 +51,8 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion METHOD method_8348 collectBlocksAndDamageEntities ()V METHOD method_8349 getDamageSource ()Lnet/minecraft/class_1282; METHOD method_8350 affectWorld (Z)V + ARG 1 particles + COMMENT whether this explosion should emit explosion or explosion emitter particles around the source of the explosion METHOD method_8351 getAffectedPlayers ()Ljava/util/Map; METHOD method_8352 clearAffectedBlocks ()V CLASS class_4179 DestructionType diff --git a/mappings/net/minecraft/world/gen/ChunkRandom.mapping b/mappings/net/minecraft/world/gen/ChunkRandom.mapping index 15a0da6f6a..5d2769b4b1 100644 --- a/mappings/net/minecraft/world/gen/ChunkRandom.mapping +++ b/mappings/net/minecraft/world/gen/ChunkRandom.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2919 net/minecraft/world/gen/ChunkRandom COMMENT and the bedrock patterns. COMMENT COMMENT

Note that the terrain seed does not depend on the world seed and only gets affected by - COMMENT chunk coordinates.

+ COMMENT chunk coordinates. ARG 1 chunkX ARG 2 chunkZ METHOD method_12660 consume (I)V @@ -24,12 +24,12 @@ CLASS net/minecraft/class_2919 net/minecraft/world/gen/ChunkRandom COMMENT

This method takes in the world seed and the negative-most block coordinates of the COMMENT chunk. The coordinate pair provided is equivalent to (chunkX * 16, chunkZ * 16). The COMMENT three values are mixed together through some layers of hashing to produce the - COMMENT population seed.

+ COMMENT population seed. COMMENT COMMENT

This function has been proved to be reversible through some exploitation of the underlying COMMENT nextLong() weaknesses. It is also important to remember that since setSeed() COMMENT truncates the 16 upper bits of world seed, only the 48 lowest bits affect the population - COMMENT seed output.

+ COMMENT seed output. ARG 1 worldSeed ARG 3 blockX ARG 4 blockZ @@ -43,7 +43,7 @@ CLASS net/minecraft/class_2919 net/minecraft/world/gen/ChunkRandom COMMENT and strongholds. It is also used to initiate structure start behavior such as rotation. COMMENT COMMENT

Similar to the population seed, only the 48 lowest bits of the world seed affect the - COMMENT output since it the upper 16 bits are truncated in the setSeed() call.

+ COMMENT output since it the upper 16 bits are truncated in the setSeed() call. ARG 1 worldSeed ARG 3 chunkX ARG 4 chunkZ @@ -55,24 +55,24 @@ CLASS net/minecraft/class_2919 net/minecraft/world/gen/ChunkRandom COMMENT at doing so, many entropy issues arise from the salt being so small and result in COMMENT weird alignments between features that have an index close apart. ARG 1 populationSeed - COMMENT The population seed computed in setPopulationSeed(). + COMMENT the population seed computed in {@link #setPopulationSeed(long, int, int)} ARG 3 index - COMMENT The index of the feature in the feature list. + COMMENT the index of the feature in the feature list ARG 4 step - COMMENT The generation step's ordinal for this feature. + COMMENT the generation step's ordinal for this feature METHOD method_12665 setRegionSeed (JIII)J COMMENT Seeds the randomizer to determine the start position of structure features such as COMMENT temples, monuments and buried treasures within a region. COMMENT COMMENT

The region coordinates pair corresponds to the coordinates of the region the seeded COMMENT chunk lies in. For example, a swamp hut region is 32 by 32 chunks meaning that all - COMMENT chunks that lie within that region get seeded the same way.

+ COMMENT chunks that lie within that region get seeded the same way. COMMENT COMMENT

Similarly, the upper 16 bits of world seed also do not affect the region seed because - COMMENT they get truncated in the setSeed() call.

+ COMMENT they get truncated in the setSeed() call. ARG 1 worldSeed ARG 3 regionX ARG 4 regionZ ARG 5 salt METHOD next (I)I - ARG 1 bound + ARG 1 count diff --git a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping index aef6eb356c..90d0f109b7 100644 --- a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping +++ b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping @@ -10,13 +10,17 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions ARG 1 seed ARG 3 generateStructures ARG 4 bonusChest + ARG 5 options METHOD (JZZLnet/minecraft/class_2370;Ljava/util/Optional;)V ARG 1 seed ARG 3 generateStructures ARG 4 bonusChest + ARG 5 options ARG 6 legacyCustomOptions METHOD method_28009 getDefaultOptions (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)Lnet/minecraft/class_5285; METHOD method_28021 fromProperties (Lnet/minecraft/class_5455;Ljava/util/Properties;)Lnet/minecraft/class_5285; + ARG 0 registryManager + ARG 1 properties METHOD method_28024 withHardcore (ZLjava/util/OptionalLong;)Lnet/minecraft/class_5285; ARG 1 hardcore ARG 2 seed diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index 2163aba50f..af3a4e152c 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -24,6 +24,8 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 1 state ARG 2 stateAbove METHOD method_12704 register (Ljava/lang/String;Lnet/minecraft/class_2939;)Lnet/minecraft/class_2939; + ARG 0 name + ARG 1 carver METHOD method_12705 shouldCarve (Ljava/util/Random;IILnet/minecraft/class_2920;)Z ARG 1 random ARG 2 chunkX diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index c7e89927a7..f3223f47cb 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator COMMENT as well as populating the generated chunks with {@linkplain net.minecraft.world.gen.feature.Feature features} and {@linkplain net.minecraft.entity.Entity entities}. COMMENT Biome placement starts here, however all vanilla and most modded chunk generators delegate this to a {@linkplain net.minecraft.world.biome.source.BiomeSource biome source}. FIELD field_12761 populationSource Lnet/minecraft/class_1966; - COMMENT Used to control the population step without replacing the actual biome that comes from the original {@link biomeSource}. + COMMENT Used to control the population step without replacing the actual biome that comes from the original {@link #biomeSource}. COMMENT COMMENT

This is used by {@link FlatChunkGenerator} to overwrite biome properties like whether lakes generate, while preserving the original biome ID. FIELD field_16567 structuresConfig Lnet/minecraft/class_5311; @@ -33,14 +33,15 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator COMMENT Tries to find the closest structure of a given type near a given block. COMMENT

COMMENT New chunks will only be generated up to the {@link net.minecraft.world.chunk.ChunkStatus#STRUCTURE_STARTS} phase by this method. + COMMENT

+ COMMENT The radius is ignored for strongholds. COMMENT COMMENT @return {@code null} if no structure could be found within the given search radius ARG 1 world ARG 2 feature ARG 3 center ARG 4 radius - COMMENT The search radius in chunks around the chunk the given block position is in. A radius of 0 will only search in the given chunk. - COMMENT This is ignored for strongholds. + COMMENT the search radius in chunks around the chunk the given block position is in; a radius of 0 will only search in the given chunk ARG 5 skipExistingChunks COMMENT whether only structures that are not referenced by generated chunks (chunks past the STRUCTURE_STARTS stage) are returned, excluding strongholds METHOD method_12104 getWorldHeight ()I @@ -50,12 +51,14 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator METHOD method_12107 populateEntities (Lnet/minecraft/class_3233;)V ARG 1 region METHOD method_12108 carve (JLnet/minecraft/class_4543;Lnet/minecraft/class_2791;Lnet/minecraft/class_2893$class_2894;)V + COMMENT Generates caves for the given chunk. ARG 1 seed ARG 3 access ARG 4 chunk ARG 5 carver METHOD method_12109 getStructuresConfig ()Lnet/minecraft/class_5311; METHOD method_12110 buildSurface (Lnet/minecraft/class_3233;Lnet/minecraft/class_2791;)V + COMMENT Places the surface blocks of the biomes after the noise has been generated. ARG 1 region ARG 2 chunk METHOD method_12113 getEntitySpawnList (Lnet/minecraft/class_1959;Lnet/minecraft/class_5138;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;)Ljava/util/List; @@ -65,6 +68,10 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 4 pos METHOD method_16129 setStructureStarts (Lnet/minecraft/class_5455;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;J)V COMMENT Determines which structures should start in the given chunk and creates their starting points. + ARG 1 registryManager + ARG 2 accessor + ARG 3 chunk + ARG 4 structureManager ARG 5 worldSeed METHOD method_16130 addStructureReferences (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V COMMENT Finds all structures that the given chunk intersects, and adds references to their starting chunks to it. @@ -92,6 +99,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator ARG 1 seed METHOD method_28506 getCodec ()Lcom/mojang/serialization/Codec; METHOD method_28507 isStrongholdStartingChunk (Lnet/minecraft/class_1923;)Z + ARG 1 pos METHOD method_28508 setStructureStart (Lnet/minecraft/class_5312;Lnet/minecraft/class_5455;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_1959;)V ARG 6 worldSeed METHOD method_28509 generateStrongholdPositions ()V diff --git a/mappings/net/minecraft/world/gen/decorator/HeightmapSpreadDoubleDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/SpreadDoubleHeightmapDecorator.mapping similarity index 66% rename from mappings/net/minecraft/world/gen/decorator/HeightmapSpreadDoubleDecorator.mapping rename to mappings/net/minecraft/world/gen/decorator/SpreadDoubleHeightmapDecorator.mapping index 1a83edd0d2..6d4cf123f7 100644 --- a/mappings/net/minecraft/world/gen/decorator/HeightmapSpreadDoubleDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/SpreadDoubleHeightmapDecorator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_5448 net/minecraft/world/gen/decorator/HeightmapSpreadDoubleDecorator +CLASS net/minecraft/class_5448 net/minecraft/world/gen/decorator/SpreadDoubleHeightmapDecorator diff --git a/mappings/net/minecraft/world/gen/feature/AbstractPileFeature.mapping b/mappings/net/minecraft/world/gen/feature/BlockPileFeature.mapping similarity index 54% rename from mappings/net/minecraft/world/gen/feature/AbstractPileFeature.mapping rename to mappings/net/minecraft/world/gen/feature/BlockPileFeature.mapping index 46b6cb07f1..06303869b3 100644 --- a/mappings/net/minecraft/world/gen/feature/AbstractPileFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/BlockPileFeature.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_3805 net/minecraft/world/gen/feature/AbstractPileFeature - METHOD method_16707 canPlacePileBlock (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;)Z +CLASS net/minecraft/class_3805 net/minecraft/world/gen/feature/BlockPileFeature + METHOD method_16707 canPlace (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 1 world ARG 2 pos ARG 3 random diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping index 8a5fea9c91..d9442a2405 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature ARG 1 world ARG 2 chunkGenerator ARG 3 random - ARG 4 pos + ARG 4 origin METHOD method_23387 withChance (F)Lnet/minecraft/class_3226; ARG 1 chance METHOD method_30380 getFeature ()Lnet/minecraft/class_3031; diff --git a/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping b/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping index 1441b2f0e1..6f0c3e91d9 100644 --- a/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/CoralFeature.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_2978 net/minecraft/world/gen/feature/CoralFeature - METHOD method_12863 spawnCoral (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + METHOD method_12863 generateCoral (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 random ARG 3 pos ARG 4 state - METHOD method_12864 spawnCoralPiece (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + METHOD method_12864 generateCoralPiece (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 random ARG 3 pos diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index 511ca45862..4cb7a290df 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -1,89 +1,168 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatures METHOD method_16957 addMountainTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16958 addExtraMountainTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16959 addJungleTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16960 addJungleEdgeTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16961 addBadlandsPlateauTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16962 addSnowySpruceTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16965 addJungleGrass (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16966 addSavannaTallGrass (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16967 addShatteredSavannaGrass (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16968 addSavannaGrass (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16969 addBadlandsGrass (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16970 addForestFlowers (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16971 addForestGrass (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16972 addSwampFeatures (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16973 addMushroomFieldsFeatures (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16974 addPlainsFeatures (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16975 addDesertDeadBushes (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16976 addGiantTaigaGrass (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16977 addDefaultFlowers (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16978 addExtraDefaultFlowers (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16979 addDefaultGrass (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16980 addTaigaGrass (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16981 addPlainsTallGrass (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16982 addDefaultMushrooms (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16983 addLandCarvers (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16984 addDefaultVegetation (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16985 addBadlandsVegetation (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16986 addJungleVegetation (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16987 addDesertVegetation (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16988 addSwampVegetation (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16989 addDesertFeatures (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16990 addFossils (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16991 addKelp (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16992 addSeagrassOnStone (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16995 addLessKelp (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16996 addSprings (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16997 addIcebergs (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16998 addBlueIce (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_16999 addFrozenTopLayer (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17000 addOceanCarvers (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17002 addDefaultLakes (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17003 addDesertLakes (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17004 addDungeons (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17005 addMineables (Lnet/minecraft/class_5485$class_5495;)V METHOD method_17006 addDefaultOres (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17007 addExtraGoldOre (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17008 addEmeraldOre (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17009 addInfestedStone (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17010 addDefaultDisks (Lnet/minecraft/class_5485$class_5495;)V - METHOD method_17011 addClay (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder + METHOD method_17011 addClayDisk (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17012 addMossyRocks (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17013 addLargeFerns (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17014 addSweetBerryBushesSnowy (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17015 addSweetBerryBushes (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17016 addBamboo (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17017 addBambooJungleTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17018 addTaigaTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17019 addWaterBiomeOakTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17020 addBirchTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17021 addForestTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17022 addTallBirchTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17023 addSavannaTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_17024 addExtraSavannaTrees (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_24382 addNetherMineables (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_28437 addBadlandsUndergroundStructures (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_28439 addAncientDebris (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_28440 addDefaultUndergroundStructures (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_28441 addOceanStructures (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder METHOD method_30578 addMonsters (Lnet/minecraft/class_5483$class_5496;III)V + ARG 0 builder ARG 1 zombieWeight ARG 2 zombieVillagerWeight ARG 3 skeletonWeight - METHOD method_30579 addBats (Lnet/minecraft/class_5483$class_5496;)V + METHOD method_30579 addCaveMobs (Lnet/minecraft/class_5483$class_5496;)V + ARG 0 builder METHOD method_30580 addFarmAnimals (Lnet/minecraft/class_5483$class_5496;)V + ARG 0 builder METHOD method_30581 addBatsAndMonsters (Lnet/minecraft/class_5483$class_5496;)V + ARG 0 builder METHOD method_30582 addSnowyMobs (Lnet/minecraft/class_5483$class_5496;)V + ARG 0 builder METHOD method_30583 addDesertMobs (Lnet/minecraft/class_5483$class_5496;)V + ARG 0 builder METHOD method_30585 addMushroomMobs (Lnet/minecraft/class_5483$class_5496;)V + ARG 0 builder METHOD method_30586 addJungleMobs (Lnet/minecraft/class_5483$class_5496;)V + ARG 0 builder METHOD method_30587 addEndMobs (Lnet/minecraft/class_5483$class_5496;)V + ARG 0 builder METHOD method_30678 addWarmOceanMobs (Lnet/minecraft/class_5483$class_5496;II)V + ARG 0 builder ARG 1 squidWeight ARG 2 squidMinGroupSize METHOD method_30679 addOceanMobs (Lnet/minecraft/class_5483$class_5496;III)V + ARG 0 builder ARG 1 squidWeight ARG 2 squidMaxGroupSize ARG 3 codWeight METHOD method_30680 addPlainsMobs (Lnet/minecraft/class_5483$class_5496;)V + ARG 0 builder diff --git a/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping b/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping index 0fe91abfec..5f5f8ade7d 100644 --- a/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/FlowerFeature.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4624 net/minecraft/world/gen/feature/FlowerFeature METHOD method_13175 getFlowerState (Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Lnet/minecraft/class_2680; + ARG 1 random ARG 2 pos ARG 3 config METHOD method_23369 isPosValid (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Z @@ -9,5 +10,6 @@ CLASS net/minecraft/class_4624 net/minecraft/world/gen/feature/FlowerFeature METHOD method_23370 getFlowerAmount (Lnet/minecraft/class_3037;)I ARG 1 config METHOD method_23371 getPos (Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)Lnet/minecraft/class_2338; + ARG 1 random ARG 2 pos ARG 3 config diff --git a/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping index 2295433e0b..8fb8d57c2b 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_4781 net/minecraft/world/gen/feature/HugeFungusFeature ARG 1 world ARG 2 random ARG 3 config + ARG 4 pos ARG 5 stemHeight ARG 6 thickStem METHOD method_24441 tryGenerateVines (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V @@ -26,5 +27,6 @@ CLASS net/minecraft/class_4781 net/minecraft/world/gen/feature/HugeFungusFeature ARG 1 world ARG 2 random ARG 3 config + ARG 4 pos ARG 5 hatHeight ARG 6 thickStem diff --git a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping index e7797592e0..f9cde08026 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_4625 net/minecraft/world/gen/feature/HugeMushroomFeatu ARG 6 config METHOD method_23376 generateStem (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4635;ILnet/minecraft/class_2338$class_2339;)V ARG 1 world + ARG 2 random ARG 3 pos ARG 4 config ARG 5 height diff --git a/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping b/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping index 91e2a837c3..9866509acf 100644 --- a/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature METHOD method_13418 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;IIZI)V ARG 1 world ARG 2 pos + ARG 4 height METHOD method_13420 isSnowyOrIcy (Lnet/minecraft/class_2248;)Z ARG 1 block METHOD method_13422 clearSnowAbove (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeature.mapping b/mappings/net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeature.mapping deleted file mode 100644 index 64816163c9..0000000000 --- a/mappings/net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeature.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5155 net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeature diff --git a/mappings/net/minecraft/world/gen/feature/OreFeature.mapping b/mappings/net/minecraft/world/gen/feature/OreFeature.mapping index 66bcc9589c..dde8e2745a 100644 --- a/mappings/net/minecraft/world/gen/feature/OreFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreFeature.mapping @@ -12,4 +12,5 @@ CLASS net/minecraft/class_3122 net/minecraft/world/gen/feature/OreFeature ARG 16 x ARG 17 y ARG 18 z - ARG 19 size + ARG 19 horizontalSize + ARG 20 verticalSize diff --git a/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping index b2945bcf22..ad430f47ca 100644 --- a/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_3124 net/minecraft/world/gen/feature/OreFeatureConfig FIELD field_13725 target Lnet/minecraft/class_3825; FIELD field_24896 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_3825;Lnet/minecraft/class_2680;I)V - ARG 1 target + ARG 1 test ARG 2 state ARG 3 size CLASS class_5436 Rules diff --git a/mappings/net/minecraft/world/gen/feature/ReplaceBlobsFeature.mapping b/mappings/net/minecraft/world/gen/feature/ReplaceBlobsFeature.mapping new file mode 100644 index 0000000000..f15f64089d --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/ReplaceBlobsFeature.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_5155 net/minecraft/world/gen/feature/ReplaceBlobsFeature diff --git a/mappings/net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/ReplaceBlobsFeatureConfig.mapping similarity index 80% rename from mappings/net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeatureConfig.mapping rename to mappings/net/minecraft/world/gen/feature/ReplaceBlobsFeatureConfig.mapping index 52830ea0dd..f9792f96a7 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/ReplaceBlobsFeatureConfig.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5437 net/minecraft/world/gen/feature/NetherrackReplaceBlobsFeatureConfig +CLASS net/minecraft/class_5437 net/minecraft/world/gen/feature/ReplaceBlobsFeatureConfig FIELD field_25848 CODEC Lcom/mojang/serialization/Codec; FIELD field_25849 target Lnet/minecraft/class_2680; FIELD field_25850 state Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping index 3d4676e886..d83bf53701 100644 --- a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/feature/RuinedPortalFeatu ARG 1 min ARG 2 max METHOD method_27210 choosePlacementHeight (Ljava/util/Random;II)I + ARG 0 random ARG 1 min ARG 2 max METHOD method_27211 (Ljava/util/Random;Lnet/minecraft/class_2794;Lnet/minecraft/class_5189$class_5191;ZIILnet/minecraft/class_3341;)I diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index 762ff42de8..88f2fef782 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 2 structureAccessor ARG 3 searchStartPos ARG 4 searchRadius - COMMENT The search radius in chunks around the chunk the given block position is in. A radius of 0 will only search in the given chunk. + COMMENT the search radius in chunks around the chunk the given block position is in; a radius of 0 will only search in the given chunk ARG 5 skipExistingChunks ARG 6 worldSeed ARG 8 config @@ -48,8 +48,10 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature COMMENT

COMMENT If the {@link StructureConfig} uses a separation setting greater than 0, the COMMENT placement will be constrained to [0, spacing - separation] within the grid cell. - COMMENT If a non-uniform distribution is used for placement {@see #isUniformDistribution()}, - COMMENT then this also moves the center towards the origin. + COMMENT If a non-uniform distribution is used for placement, then this also moves + COMMENT the center towards the origin. + COMMENT + COMMENT @see #isUniformDistribution() ARG 1 config ARG 2 worldSeed ARG 4 placementRandom @@ -68,7 +70,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature METHOD method_28657 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_1959;ILnet/minecraft/class_2919;Lnet/minecraft/class_5314;Lnet/minecraft/class_3037;)Lnet/minecraft/class_3449; COMMENT Tries to place a starting point for this type of structure in the given chunk. COMMENT

- COMMENT If this structure doesn't have a starting point in the chunk, {@link StructureStart.DEFAULT} + COMMENT If this structure doesn't have a starting point in the chunk, {@link StructureStart#DEFAULT} COMMENT will be returned. ARG 5 worldSeed ARG 9 referenceCount diff --git a/mappings/net/minecraft/world/gen/feature/StructurePoolFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/StructurePoolFeatureConfig.mapping index 3369f78f17..3b85c7332c 100644 --- a/mappings/net/minecraft/world/gen/feature/StructurePoolFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructurePoolFeatureConfig.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3812 net/minecraft/world/gen/feature/StructurePoolFeatureConfig - COMMENT A feature config that specifies a starting pool and a size for the first two parameters of - COMMENT {@link net.minecraft.structure.pool.StructurePoolBasedGenerator#addPieces(net.minecraft.util.Identifier, int, net.minecraft.structure.pool.StructurePoolBasedGenerator.PieceFactory, net.minecraft.world.gen.chunk.ChunkGenerator, net.minecraft.structure.StructureManager, net.minecraft.util.math.BlockPos, java.util.List, java.util.Random, boolean, boolean)}. + COMMENT A feature config that specifies a starting pool and a size for {@linkplain + COMMENT net.minecraft.structure.pool.StructurePoolBasedGenerator#method_30419 + COMMENT method_30419}. FIELD field_16860 size I FIELD field_16861 startPool Ljava/util/function/Supplier; FIELD field_24886 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping index a6cbd73fb9..93b9e599c1 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping @@ -36,7 +36,7 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature METHOD method_16432 canTreeReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_16433 isDirtOrGrass (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z + METHOD method_16433 canPlaceTreeOn (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos METHOD method_23380 placeLogsAndLeaves (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;Ljava/util/Set;Ljava/util/Set;)Lnet/minecraft/class_251; diff --git a/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping b/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping index 3de38c87d1..8499f2e07f 100644 --- a/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_4953 net/minecraft/world/gen/feature/TwistingVinesFeature METHOD method_25986 isNotSuitable (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos METHOD method_25987 generateVineColumn (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;III)V ARG 0 world ARG 1 random @@ -8,3 +10,9 @@ CLASS net/minecraft/class_4953 net/minecraft/world/gen/feature/TwistingVinesFeat ARG 4 minAge ARG 5 maxAge METHOD method_25988 generateVinesInArea (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;III)V + ARG 0 world + ARG 1 random + ARG 2 pos + ARG 3 horizontalSpread + ARG 4 verticalSpread + ARG 5 length diff --git a/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping b/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping index 18fc572edd..48cc355f1c 100644 --- a/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping +++ b/mappings/net/minecraft/world/gen/feature/size/FeatureSize.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/class_5201 net/minecraft/world/gen/feature/size/FeatureSize + COMMENT In charge of determining the amount of space needed by a tree to generate. FIELD field_24146 minClippedHeight Ljava/util/OptionalInt; FIELD field_24922 TYPE_CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/OptionalInt;)V ARG 1 minClippedHeight METHOD method_27377 getMinClippedHeight ()Ljava/util/OptionalInt; - METHOD method_28820 createCodecBuilder ()Lcom/mojang/serialization/codecs/RecordCodecBuilder; + METHOD method_28820 createCodec ()Lcom/mojang/serialization/codecs/RecordCodecBuilder; METHOD method_28824 getType ()Lnet/minecraft/class_5202; diff --git a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping index 16fb3caf4e..eee6d0954e 100644 --- a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping @@ -31,10 +31,10 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer METHOD method_23451 isInvalidForLeaves (Ljava/util/Random;IIIIZ)Z COMMENT Used to exclude certain positions such as corners when creating a square of leaves. ARG 1 random - ARG 2 baseHeight - ARG 3 dx - ARG 4 y - ARG 5 dz + ARG 2 dx + ARG 3 y + ARG 4 dz + ARG 5 radius ARG 6 giantTrunk METHOD method_23452 getRandomRadius (Ljava/util/Random;I)I ARG 1 random diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index e8ba77659f..c8376d6654 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3523 net/minecraft/world/gen/surfacebuilder/SurfaceBuilder + COMMENT Places the top blocks of a biome during chunk generation. FIELD field_15667 END_STONE Lnet/minecraft/class_2680; FIELD field_15668 COARSE_DIRT Lnet/minecraft/class_2680; FIELD field_15669 PODZOL Lnet/minecraft/class_2680; @@ -52,6 +53,7 @@ CLASS net/minecraft/class_3523 net/minecraft/world/gen/surfacebuilder/SurfaceBui ARG 12 seed ARG 14 surfaceBlocks METHOD method_15306 initSeed (J)V + COMMENT Runs before {@link #generate} and allows for custom noise to be initialized. ARG 1 seed METHOD method_15307 register (Ljava/lang/String;Lnet/minecraft/class_3523;)Lnet/minecraft/class_3523; ARG 0 id diff --git a/mappings/net/minecraft/world/gen/tree/AlterGroundTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping similarity index 65% rename from mappings/net/minecraft/world/gen/tree/AlterGroundTreeDecorator.mapping rename to mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping index e38d7b4dd8..90aa8dc878 100644 --- a/mappings/net/minecraft/world/gen/tree/AlterGroundTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4658 net/minecraft/world/gen/tree/AlterGroundTreeDecorator +CLASS net/minecraft/class_4658 net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator FIELD field_21316 provider Lnet/minecraft/class_4651; FIELD field_24957 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_4651;)V diff --git a/mappings/net/minecraft/world/gen/tree/BeehiveTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping similarity index 75% rename from mappings/net/minecraft/world/gen/tree/BeehiveTreeDecorator.mapping rename to mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping index 7b5dac1a31..8c7b51d2e9 100644 --- a/mappings/net/minecraft/world/gen/tree/BeehiveTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4659 net/minecraft/world/gen/tree/BeehiveTreeDecorator +CLASS net/minecraft/class_4659 net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator FIELD field_21317 probability F FIELD field_24958 CODEC Lcom/mojang/serialization/Codec; METHOD (F)V diff --git a/mappings/net/minecraft/world/gen/tree/CocoaBeansTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping similarity index 78% rename from mappings/net/minecraft/world/gen/tree/CocoaBeansTreeDecorator.mapping rename to mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping index 7cc22601db..eadf88c22f 100644 --- a/mappings/net/minecraft/world/gen/tree/CocoaBeansTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4660 net/minecraft/world/gen/tree/CocoaBeansTreeDecorator +CLASS net/minecraft/class_4660 net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator FIELD field_21318 probability F FIELD field_24959 CODEC Lcom/mojang/serialization/Codec; METHOD (F)V diff --git a/mappings/net/minecraft/world/gen/tree/LeaveVineTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping similarity index 86% rename from mappings/net/minecraft/world/gen/tree/LeaveVineTreeDecorator.mapping rename to mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping index 8352a56101..7b77b00997 100644 --- a/mappings/net/minecraft/world/gen/tree/LeaveVineTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4661 net/minecraft/world/gen/tree/LeaveVineTreeDecorator +CLASS net/minecraft/class_4661 net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator FIELD field_24960 CODEC Lcom/mojang/serialization/Codec; FIELD field_24961 INSTANCE Lnet/minecraft/class_4661; METHOD method_23467 placeVines (Lnet/minecraft/class_3747;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;Ljava/util/Set;Lnet/minecraft/class_3341;)V diff --git a/mappings/net/minecraft/world/gen/tree/TreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping similarity index 92% rename from mappings/net/minecraft/world/gen/tree/TreeDecorator.mapping rename to mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping index 43fd29871d..bf1542d8e9 100644 --- a/mappings/net/minecraft/world/gen/tree/TreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4662 net/minecraft/world/gen/tree/TreeDecorator +CLASS net/minecraft/class_4662 net/minecraft/world/gen/treedecorator/TreeDecorator COMMENT Tree decorators can add additional blocks to trees, such as vines or beehives. FIELD field_24962 TYPE_CODEC Lcom/mojang/serialization/Codec; METHOD method_23469 generate (Lnet/minecraft/class_5281;Ljava/util/Random;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_3341;)V diff --git a/mappings/net/minecraft/world/gen/tree/TreeDecoratorType.mapping b/mappings/net/minecraft/world/gen/treedecorator/TreeDecoratorType.mapping similarity index 78% rename from mappings/net/minecraft/world/gen/tree/TreeDecoratorType.mapping rename to mappings/net/minecraft/world/gen/treedecorator/TreeDecoratorType.mapping index 4b957718a7..4f2232f4e6 100644 --- a/mappings/net/minecraft/world/gen/tree/TreeDecoratorType.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/TreeDecoratorType.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4663 net/minecraft/world/gen/tree/TreeDecoratorType +CLASS net/minecraft/class_4663 net/minecraft/world/gen/treedecorator/TreeDecoratorType FIELD field_24963 codec Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/serialization/Codec;)V ARG 1 codec diff --git a/mappings/net/minecraft/world/gen/tree/TrunkVineTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping similarity index 73% rename from mappings/net/minecraft/world/gen/tree/TrunkVineTreeDecorator.mapping rename to mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping index 6caf013688..0fdb839c84 100644 --- a/mappings/net/minecraft/world/gen/tree/TrunkVineTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4664 net/minecraft/world/gen/tree/TrunkVineTreeDecorator +CLASS net/minecraft/class_4664 net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator FIELD field_24964 CODEC Lcom/mojang/serialization/Codec; FIELD field_24965 INSTANCE Lnet/minecraft/class_4664; METHOD method_23474 (Ljava/util/Random;Lnet/minecraft/class_5281;Ljava/util/Set;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping index 7927991e3f..d07ec841a3 100644 --- a/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping +++ b/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_5141 net/minecraft/world/gen/trunk/TrunkPlacer FIELD field_23760 baseHeight I FIELD field_23761 firstRandomHeight I FIELD field_23762 secondRandomHeight I - FIELD field_24972 CODEC Lcom/mojang/serialization/Codec; + FIELD field_24972 TYPE_CODEC Lcom/mojang/serialization/Codec; METHOD (III)V ARG 1 baseHeight ARG 2 firstRandomHeight diff --git a/mappings/net/minecraft/world/gen/trunk/TrunkPlacerType.mapping b/mappings/net/minecraft/world/gen/trunk/TrunkPlacerType.mapping index d226202fd4..405867f3a6 100644 --- a/mappings/net/minecraft/world/gen/trunk/TrunkPlacerType.mapping +++ b/mappings/net/minecraft/world/gen/trunk/TrunkPlacerType.mapping @@ -2,4 +2,5 @@ CLASS net/minecraft/class_5142 net/minecraft/world/gen/trunk/TrunkPlacerType FIELD field_24973 codec Lcom/mojang/serialization/Codec; METHOD method_26995 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5142; ARG 0 id + ARG 1 codec METHOD method_28908 getCodec ()Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/world/level/LevelInfo.mapping b/mappings/net/minecraft/world/level/LevelInfo.mapping index c506296017..1d9502177d 100644 --- a/mappings/net/minecraft/world/level/LevelInfo.mapping +++ b/mappings/net/minecraft/world/level/LevelInfo.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_1940 net/minecraft/world/level/LevelInfo METHOD method_28382 withGameMode (Lnet/minecraft/class_1934;)Lnet/minecraft/class_1940; ARG 1 mode METHOD method_28383 fromDynamic (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_5359;)Lnet/minecraft/class_1940; + ARG 1 dataPackSettings METHOD method_28385 withCopiedGameRules ()Lnet/minecraft/class_1940; METHOD method_29557 withDataPackSettings (Lnet/minecraft/class_5359;)Lnet/minecraft/class_1940; ARG 1 dataPackSettings diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index 92f8e1475f..93f01fac7d 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -65,6 +65,9 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties ARG 2 generatorOptions ARG 3 lifecycle METHOD method_158 updateProperties (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V + ARG 1 registryManager + ARG 2 levelTag + ARG 3 playerTag METHOD method_185 loadPlayerData ()V METHOD method_29029 readProperties (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;Lnet/minecraft/class_1940;Lnet/minecraft/class_5315;Lnet/minecraft/class_5285;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_31; ARG 0 dynamic diff --git a/mappings/net/minecraft/world/level/UnmodifiableLevelProperties.mapping b/mappings/net/minecraft/world/level/UnmodifiableLevelProperties.mapping index a33148f061..5b8a5e5967 100644 --- a/mappings/net/minecraft/world/level/UnmodifiableLevelProperties.mapping +++ b/mappings/net/minecraft/world/level/UnmodifiableLevelProperties.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_27 net/minecraft/world/level/UnmodifiableLevelProperties - FIELD field_139 properties Lnet/minecraft/class_5268; + FIELD field_139 worldProperties Lnet/minecraft/class_5268; diff --git a/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping b/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping index b4b480bd02..e2d8f89538 100644 --- a/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping +++ b/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_2864 net/minecraft/world/level/storage/AlphaChunkIo METHOD method_12432 convertAlphaChunk (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_2864$class_2865;Lnet/minecraft/class_2487;Lnet/minecraft/class_1966;)V + ARG 1 alphaChunk + ARG 2 nbt + ARG 3 biomeSource METHOD method_12433 readAlphaChunk (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2864$class_2865; - ARG 0 tag + ARG 0 nbt CLASS class_2865 AlphaChunk FIELD field_13037 entities Lnet/minecraft/class_2499; FIELD field_13038 blockLight Lnet/minecraft/class_2832; diff --git a/mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping b/mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping index 4a7edb4588..3b2a10ebf3 100644 --- a/mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping @@ -1,7 +1,22 @@ CLASS net/minecraft/class_24 net/minecraft/world/level/storage/AnvilLevelStorage FIELD field_133 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_113 convertRegions (Lnet/minecraft/class_5455$class_5457;Ljava/io/File;Ljava/lang/Iterable;Lnet/minecraft/class_1966;IILnet/minecraft/class_3536;)V + ARG 0 registryManager + ARG 1 directory + ARG 2 files + ARG 3 biomeSource + ARG 6 progressListener METHOD method_116 convertRegion (Lnet/minecraft/class_5455$class_5457;Ljava/io/File;Ljava/io/File;Lnet/minecraft/class_1966;IILnet/minecraft/class_3536;)V + ARG 0 registryManager + ARG 1 directory + ARG 2 file + ARG 3 biomeSource + ARG 6 progressListener METHOD method_117 addRegionFiles (Ljava/io/File;Ljava/util/Collection;)V + ARG 0 worldDirectory + ARG 1 files METHOD method_118 makeMcrLevelDatBackup (Lnet/minecraft/class_32$class_5143;)V + ARG 0 storageSession METHOD method_234 convertLevel (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3536;)Z + ARG 0 storageSession + ARG 1 progressListener diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index fb078865f7..2b5f3f2911 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -26,7 +26,11 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 1 directoryName METHOD method_27004 getTimeFormatter ()Ljava/time/format/DateTimeFormatter; METHOD method_29010 readGeneratorProperties (Lcom/mojang/serialization/Dynamic;Lcom/mojang/datafixers/DataFixer;I)Lcom/mojang/datafixers/util/Pair; + ARG 0 levelData + ARG 1 dataFixer + ARG 2 version METHOD method_29014 createLevelDataParser (Ljava/io/File;Z)Ljava/util/function/BiFunction; + ARG 1 file ARG 2 locked METHOD method_29580 parseDataPackSettings (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_5359; METHOD method_29583 readDataPackSettings (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_5359; diff --git a/mappings/net/minecraft/world/poi/PointOfInterest.mapping b/mappings/net/minecraft/world/poi/PointOfInterest.mapping index 64d7502aa5..27c075cf84 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterest.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterest.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_4156 net/minecraft/world/poi/PointOfInterest ARG 2 type ARG 3 updateListener METHOD equals (Ljava/lang/Object;)Z - ARG 1 obj + ARG 1 o METHOD method_19137 reserveTicket ()Z METHOD method_19138 releaseTicket ()Z METHOD method_19139 hasSpace ()Z diff --git a/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping index c6f131e7cf..835488a40c 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_4157 net/minecraft/world/poi/PointOfInterestSet ARG 1 updateListener METHOD (Ljava/lang/Runnable;ZLjava/util/List;)V ARG 1 updateListener + ARG 2 valid METHOD method_19145 remove (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_19146 add (Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V @@ -17,6 +18,7 @@ CLASS net/minecraft/class_4157 net/minecraft/world/poi/PointOfInterestSet ARG 1 pos ARG 2 predicate METHOD method_19150 get (Ljava/util/function/Predicate;Lnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; + ARG 2 occupationStatus METHOD method_19153 releaseTicket (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_19154 getType (Lnet/minecraft/class_2338;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index 4eaea47c0e..6b63c8354c 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage METHOD method_19118 getDistanceFromNearestOccupied (Lnet/minecraft/class_4076;)I ARG 1 pos METHOD method_19123 getInChunk (Ljava/util/function/Predicate;Lnet/minecraft/class_1923;Lnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; + ARG 2 chunkPos ARG 3 occupationStatus METHOD method_19125 getInCircle (Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; ARG 1 typePredicate @@ -45,6 +46,9 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 6 random METHOD method_20006 getNearestPosition (Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/Optional; ARG 1 typePredicate + ARG 2 pos + ARG 3 radius + ARG 4 occupationStatus METHOD method_20252 count (Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)J ARG 1 typePredicate ARG 2 pos @@ -62,12 +66,13 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 1 typePredicate ARG 2 pos ARG 3 radius + ARG 4 occupationStatus METHOD method_22439 preloadChunks (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;I)V COMMENT Preloads chunks in a square area with the given radius. Loads the chunks with {@code ChunkStatus.EMPTY}. ARG 1 world ARG 2 pos ARG 3 radius - COMMENT The radius in blocks + COMMENT the radius in blocks METHOD method_26339 hasTypeAt (Lnet/minecraft/class_4158;Lnet/minecraft/class_2338;)Z ARG 1 type ARG 2 pos diff --git a/mappings/net/minecraft/world/poi/PointOfInterestType.mapping b/mappings/net/minecraft/world/poi/PointOfInterestType.mapping index 3dcfb7f5c6..7debda54ed 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestType.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestType.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_4158 net/minecraft/world/poi/PointOfInterestType METHOD method_19516 from (Lnet/minecraft/class_2680;)Ljava/util/Optional; ARG 0 state METHOD method_20354 setup (Lnet/minecraft/class_4158;)Lnet/minecraft/class_4158; + ARG 0 poiType METHOD method_20356 getAllStatesOf (Lnet/minecraft/class_2248;)Ljava/util/Set; ARG 0 block METHOD method_20357 register (Ljava/lang/String;Ljava/util/Set;II)Lnet/minecraft/class_4158; diff --git a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping index 040bd1740f..0e1f24a75c 100644 --- a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping @@ -11,4 +11,4 @@ CLASS net/minecraft/class_2867 net/minecraft/world/storage/RegionBasedStorage ARG 1 pos METHOD method_23726 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)V ARG 1 pos - ARG 2 tag + ARG 2 nbt diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping index 630e0b8f8c..e93abe3fae 100644 --- a/mappings/net/minecraft/world/storage/RegionFile.mapping +++ b/mappings/net/minecraft/world/storage/RegionFile.mapping @@ -49,6 +49,7 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile 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; + ARG 1 chunkPos CLASS class_2862 ChunkBuffer FIELD field_17656 pos Lnet/minecraft/class_1923; CLASS class_4549 OutputAction diff --git a/mappings/net/minecraft/world/storage/SectorMap.mapping b/mappings/net/minecraft/world/storage/SectorMap.mapping index ce3aed9a99..30d94fc365 100644 --- a/mappings/net/minecraft/world/storage/SectorMap.mapping +++ b/mappings/net/minecraft/world/storage/SectorMap.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_4485 net/minecraft/world/storage/SectorMap METHOD method_21867 allocate (I)I + ARG 1 size METHOD method_21868 allocate (II)V + ARG 1 start + ARG 2 size METHOD method_21869 free (II)V + ARG 1 start + ARG 2 size diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping index c367ccc858..c6dd7f4c46 100644 --- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase FIELD field_18693 unsavedElements Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet; 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_19229 dataFixTypes Lnet/minecraft/class_4284; FIELD field_21505 worker Lnet/minecraft/class_4698; FIELD field_24750 codecFactory Ljava/util/function/Function; METHOD (Ljava/io/File;Ljava/util/function/Function;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Z)V @@ -14,6 +14,7 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase METHOD method_19288 onUpdate (J)V ARG 1 pos METHOD method_19289 loadDataAt (Lnet/minecraft/class_1923;)V + ARG 1 chunkPos METHOD method_19290 tick (Ljava/util/function/BooleanSupplier;)V ARG 1 shouldKeepTicking METHOD method_19291 onLoad (J)V diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping index ae8330f3f9..571158b97c 100644 --- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping +++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping @@ -8,10 +8,12 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker ARG 1 pos METHOD method_23701 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_4698$class_4699;)V ARG 1 pos + ARG 2 result 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/Supplier;)Ljava/util/concurrent/CompletableFuture; + ARG 1 task METHOD method_23719 writeResult ()V CLASS class_4699 Result FIELD field_21503 nbt Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index 47f0945f6c..100abdce6c 100644 --- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -2,11 +2,15 @@ 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_5321;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + METHOD method_17907 updateChunkNbt (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 worldKey ARG 2 persistentStateManagerFactory - ARG 3 tag + ARG 3 nbt 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 + ARG 0 nbt + 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; + ARG 1 chunkPos METHOD method_23697 completeAll ()V diff --git a/mappings/net/minecraft/world/timer/Timer.mapping b/mappings/net/minecraft/world/timer/Timer.mapping index 071a2101df..f3fb8d28c5 100644 --- a/mappings/net/minecraft/world/timer/Timer.mapping +++ b/mappings/net/minecraft/world/timer/Timer.mapping @@ -8,13 +8,13 @@ CLASS net/minecraft/class_236 net/minecraft/world/timer/Timer ARG 1 timerCallbackSerializer METHOD method_980 serialize (Lnet/minecraft/class_236$class_237;)Lnet/minecraft/class_2487; ARG 1 event - METHOD method_982 toTag ()Lnet/minecraft/class_2499; + METHOD method_982 toNbt ()Lnet/minecraft/class_2499; METHOD method_985 setEvent (Ljava/lang/String;JLnet/minecraft/class_234;)V ARG 1 name ARG 2 triggerTime ARG 4 callback METHOD method_986 addEvent (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_987 createEventComparator ()Ljava/util/Comparator; METHOD method_988 processEvents (Ljava/lang/Object;J)V ARG 1 server diff --git a/mappings/net/minecraft/world/timer/TimerCallbackSerializer.mapping b/mappings/net/minecraft/world/timer/TimerCallbackSerializer.mapping index 60f5bc2a82..c9c097387f 100644 --- a/mappings/net/minecraft/world/timer/TimerCallbackSerializer.mapping +++ b/mappings/net/minecraft/world/timer/TimerCallbackSerializer.mapping @@ -7,6 +7,6 @@ CLASS net/minecraft/class_233 net/minecraft/world/timer/TimerCallbackSerializer METHOD method_971 registerSerializer (Lnet/minecraft/class_234$class_235;)Lnet/minecraft/class_233; ARG 1 serializer METHOD method_972 deserialize (Lnet/minecraft/class_2487;)Lnet/minecraft/class_234; - ARG 1 tag + ARG 1 nbt METHOD method_973 serialize (Lnet/minecraft/class_234;)Lnet/minecraft/class_2487; ARG 1 callback diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 3951d5c158..301fe936e8 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -22,7 +22,9 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater ARG 3 worlds ARG 4 eraseCache METHOD method_17830 getChunkPositions (Lnet/minecraft/class_5321;)Ljava/util/List; + ARG 1 world METHOD method_5393 getProgress (Lnet/minecraft/class_5321;)F + ARG 1 world METHOD method_5394 getStatus ()Lnet/minecraft/class_2561; METHOD method_5397 getTotalChunkCount ()I METHOD method_5399 getSkippedChunkCount ()I